lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add possibility to defined duration of a workday (MAIN_DURATION_OF_WORKDAY)

Browse Source
This commit is contained in:
Regis Houssin 2009-10-29 08:57:05 +00:00
parent 084afa6a7f
commit 1691e4ef5e
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/fichinter/fiche.php
View File

@ -584,7 +584,7 @@ elseif ($fichinterid)
} }
// Duration // Duration
print '<tr><td>'.$langs->trans("TotalDuration").'</td><td>'.ConvertSecondToTime($fichinter->duree).'</td></tr>'; print '<tr><td>'.$langs->trans("TotalDuration").'</td><td>'.ConvertSecondToTime($fichinter->duree,'all',$conf->global->MAIN_DURATION_OF_WORKDAY).'</td></tr>';
// Description (must be a textarea and not html must be allowed (used in list view) // Description (must be a textarea and not html must be allowed (used in list view)
print '<tr><td>'; print '<tr><td>';

17
htdocs/lib/date.lib.php
View File

@ -40,20 +40,27 @@ function ConvertTime2Seconds($iHours=0,$iMinutes=0,$iSeconds=0)
/** \brief Return, in clear text, value of a number of seconds in days, hours and minutes /** \brief Return, in clear text, value of a number of seconds in days, hours and minutes
* \param iSecond Number of seconds * \param iSecond Number of seconds
* \param format Output format (all:affichage complet, hour: n'affiche que les heures, min: n'affiche que les minutes) * \param format Output format (all: complete display, hour: displays only hours, min: displays only minutes)
* \param lengthOfDay Length of day (default 86400 seconds)
* \return sTime Formated text of duration * \return sTime Formated text of duration
*/ */
function ConvertSecondToTime($iSecond,$format='all') function ConvertSecondToTime($iSecond,$format='all',$lengthOfDay=86400)
{ {
global $langs; global $langs;
if (empty($lengthOfDay)) $lengthOfDay = 86400;
if ($format == 'all') if ($format == 'all')
{ {
if ($iSecond >= 86400) if ($iSecond >= $lengthOfDay)
{ {
$sDay=date("d",$iSecond)-1; $sDay=0;
for( $i = $iSecond; $i > $lengthOfDay; $i -= $lengthOfDay )
{
$sDay++;
}
$dayTranslate = $langs->trans("Day"); $dayTranslate = $langs->trans("Day");
if ($iSecond >= 172800) $dayTranslate = $langs->trans("Days"); if ($iSecond >= ($lengthOfDay*2)) $dayTranslate = $langs->trans("Days");
} }
$sTime=''; $sTime='';
if ($sDay) $sTime.=$sDay.' '.$dayTranslate.' '; if ($sDay) $sTime.=$sDay.' '.$dayTranslate.' ';