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

Merge pull request #2240 from genezys/develop

Browse Source 
Add support for configurable first day of week
This commit is contained in:
Laurent Destailleur 2015-01-16 12:09:21 +01:00
commit c5df4fd9b8
1 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/core/datepicker.php
View File

@ -27,7 +27,7 @@
*/ */
if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled cause need to load personalized language //if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled cause need to load personalized language
if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Not disabled cause need to do translations //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Not disabled cause need to do translations
if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK',1); if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK',1);
@ -186,27 +186,13 @@ function displayBox($selectedDate,$month,$year)
</tr> </tr>
<tr class="dpDayNames"> <tr class="dpDayNames">
<?php <?php
$startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1; $first_day_of_week = isset($conf->global->MAIN_START_WEEK) ? (int) $conf->global->MAIN_START_WEEK : 0;
if($startday==1) $day_names = array('ShortSunday', 'ShortMonday', 'ShortTuesday', 'ShortWednesday', 'ShortThursday', 'ShortFriday', 'ShortSaturday');
{?> for( $i=0; $i < 7; $i++ )
<td width="14%"><?php echo $langs->trans("ShortMonday") ?></td> {
<td width="15%"><?php echo $langs->trans("ShortTuesday") ?></td> echo '<td width="', (int) (($i+1)*100/7) - (int) ($i*100/7), '%">', $langs->trans($day_names[($i + $first_day_of_week) % 7]), '</td>', "\n";
<td width="14%"><?php echo $langs->trans("ShortWednesday") ?></td> }
<td width="15%"><?php echo $langs->trans("ShortThursday") ?></td> ?>
<td width="14%"><?php echo $langs->trans("ShortFriday") ?></td>
<td width="14%"><?php echo $langs->trans("ShortSaturday") ?></td>
<td width="14%"><?php echo $langs->trans("ShortSunday") ?></td>
<?php
}else {?>
<td width="14%"><?php echo $langs->trans("ShortSunday") ?></td>
<td width="14%"><?php echo $langs->trans("ShortMonday") ?></td>
<td width="15%"><?php echo $langs->trans("ShortTuesday") ?></td>
<td width="14%"><?php echo $langs->trans("ShortWednesday") ?></td>
<td width="15%"><?php echo $langs->trans("ShortThursday") ?></td>
<td width="14%"><?php echo $langs->trans("ShortFriday") ?></td>
<td width="14%"><?php echo $langs->trans("ShortSaturday") ?></td>
<?php
}?>
</tr> </tr>
<?php <?php
//print "x ".$thedate." y"; //print "x ".$thedate." y";
@ -222,7 +208,7 @@ function displayBox($selectedDate,$month,$year)
{ {
echo "<TR class=\"dpWeek\">"; echo "<TR class=\"dpWeek\">";
$cols=0; $cols=0;
for($i=0;$i< $mydate["wday"];$i++) for($i=0;$i< ($mydate["wday"]+7-$first_day_of_week)%7;$i++)
{ {
echo "<TD>&nbsp;</TD>"; echo "<TD>&nbsp;</TD>";
$cols++; $cols++;
@ -230,7 +216,7 @@ function displayBox($selectedDate,$month,$year)
} }
else else
{ {
if ($mydate["wday"]==0) if ($mydate["wday"]==$first_day_of_week)
{ {
echo "<TR class=\"dpWeek\">"; echo "<TR class=\"dpWeek\">";
$cols=0; $cols=0;
@ -254,7 +240,7 @@ function displayBox($selectedDate,$month,$year)
echo ">".sprintf("%02s",$mydate["mday"])."</TD>"; echo ">".sprintf("%02s",$mydate["mday"])."</TD>";
$cols++; $cols++;
if ($mydate["wday"]==6) echo "</TR>\n"; if ($mydate != $firstdate && $mydate["wday"]==(($first_day_of_week + 6)%7)) echo "</TR>\n";
//$thedate=strtotime("tomorrow",$thedate); //$thedate=strtotime("tomorrow",$thedate);
$day++; $day++;