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

Using month selector instead of direct input

Browse Source
This commit is contained in:
Marcos García 2013-04-29 22:50:58 +02:00
parent f4973d5aa9
commit 05be90a220
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/holiday/month_report.php
View File

@ -54,7 +54,7 @@ $month = GETPOST('month_start');
$year = GETPOST('year_start'); $year = GETPOST('year_start');
if(empty($month)) { if(empty($month)) {
$month = date('m'); $month = date('n');
} }
if(empty($year)) { if(empty($year)) {
$year = date('Y'); $year = date('Y');
@ -65,7 +65,7 @@ $sql.= " FROM llx_holiday cp";
$sql.= " LEFT JOIN llx_user u ON cp.fk_user = u.rowid"; $sql.= " LEFT JOIN llx_user u ON cp.fk_user = u.rowid";
$sql.= " WHERE cp.statut = 3"; // Approved $sql.= " WHERE cp.statut = 3"; // Approved
// TODO Use BETWEEN instead of date_format // TODO Use BETWEEN instead of date_format
$sql.= " AND (date_format(cp.date_debut, '%Y-%m') = '$year-$month' OR date_format(cp.date_fin, '%Y-%m') = '$year-$month')"; $sql.= " AND (date_format(cp.date_debut, '%Y-%c') = '$year-$month' OR date_format(cp.date_fin, '%Y-%c') = '$year-$month')";
$sql.= " ORDER BY u.lastname,cp.date_debut"; $sql.= " ORDER BY u.lastname,cp.date_debut";
$result = $db->query($sql); $result = $db->query($sql);
@ -77,8 +77,9 @@ print '<div class="tabBar">';
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n"; print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
print $langs->trans('Month').': <input class="flat" type="text" size="1" maxlength="2" name="month_start" value="'.$month.'">&nbsp;'; print $langs->trans('Month').': ';
$htmlother->select_year($year,'year_start',1,10,3); print $htmlother->select_month($month, 'month_start').' ';
print $htmlother->select_year($year,'year_start',1,10,3);
print '<input type="submit" value="'.$langs->trans("Refresh").'" class="button" />'; print '<input type="submit" value="'.$langs->trans("Refresh").'" class="button" />';
@ -126,7 +127,7 @@ if($num == '0') {
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td>'.$holidaystatic->getNomUrl(1).'</td>'; print '<td>'.$holidaystatic->getNomUrl(1).'</td>';
print '<td>'.$user->lastname.' '.$user->firstname.'</td>'; print '<td>'.$user->getNomUrl(1).'</td>';
print '<td>'.dol_print_date($start_date,'day'); print '<td>'.dol_print_date($start_date,'day');
print '</td>'; print '</td>';
print '<td>'.dol_print_date($end_date,'day'); print '<td>'.dol_print_date($end_date,'day');