diff --git a/admin/addshift.php b/admin/addshift.php index d77a4d73..0c34f3dd 100644 --- a/admin/addshift.php +++ b/admin/addshift.php @@ -184,7 +184,7 @@ if ($questionnaire_id != false) $sql = "SELECT shift_id, dt, dta,start,end FROM ( ( - SELECT shift_id, DATE_FORMAT( CONVERT_TZ( s.start, 'UTC', o.Time_zone_name ) , '%W %d %M %Y' ) AS dt, + SELECT shift_id, DATE_FORMAT( CONVERT_TZ( s.start, 'UTC', o.Time_zone_name ) , '%W %d %m %Y' ) AS dt, DATE( CONVERT_TZ( s.start, 'UTC', o.Time_zone_name ) ) AS dta, TIME( CONVERT_TZ( s.start, 'UTC', o.Time_zone_name ) ) AS start, TIME( CONVERT_TZ( s.end, 'UTC', o.Time_zone_name ) ) AS end @@ -196,7 +196,7 @@ if ($questionnaire_id != false) ) UNION ( SELECT NULL AS shift_id, - DATE_FORMAT( STR_TO_DATE( CONCAT( '$year', ' ', '$woy', ' ', day_of_week -1 ) , '%x %v %w' ) , '%W %d %M %Y' ) AS dt, + DATE_FORMAT( STR_TO_DATE( CONCAT( '$year', ' ', '$woy', ' ', day_of_week -1 ) , '%x %v %w' ) , '%W %d %m %Y' ) AS dt, STR_TO_DATE( CONCAT( '$year', ' ', '$woy', ' ', day_of_week -1 ) , '%x %v %w' ) AS dta, start,end FROM shift_template @@ -208,13 +208,17 @@ if ($questionnaire_id != false) $shifts = $db->GetAll($sql); - $sql = "SELECT DATE_FORMAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ',day_of_week - 1),'%x %v %w'), '%W %d %M %Y') as dt, day_of_week - 1 as dow + $sql = "SELECT DATE_FORMAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ',day_of_week - 1),'%x %v %w'), '%W %d %m %Y') as dt, + DATE_FORMAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ',day_of_week - 1),'%x %v %w'), '%W') as dtd, + DATE_FORMAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ',day_of_week - 1),'%x %v %w'), '%d %m %Y') as dto, + day_of_week - 1 as value FROM day_of_week - GROUP BY dow"; - - $daysofweek = $db->Execute($sql); - + GROUP BY value"; + $daysofweek = $db->GetAll($sql); + translate_array($daysofweek,array("dtd")); + foreach($daysofweek as $key => $val) + $daysofweek[$key]['description'] = $val['dtd'] . " " . $val['dto']; ?>
@@ -236,8 +240,9 @@ if ($questionnaire_id != false) $shift_id = $count; $prefix = "NEW_"; } - print "" . $daysofweek->GetMenu($prefix . "dow_$shift_id",$shift['dt']) . ""; - $daysofweek->MoveFirst(); + print ""; + display_chooser($daysofweek, $prefix . "dow_$shift_id", false, true, false, false, false, array("dt",$shift['dt'])); + print ""; $count++; } ?> diff --git a/admin/callrestrict.php b/admin/callrestrict.php index 187bcd94..ee1065bd 100644 --- a/admin/callrestrict.php +++ b/admin/callrestrict.php @@ -103,13 +103,13 @@ $sql = "SELECT DATE_FORMAT( STR_TO_DATE( CONCAT( '$year', ' ', '$woy', ' ', day_ FROM call_restrict"; $shifts = $db->GetAll($sql); +translate_array($shifts,array("dt")); - -$sql = "SELECT DATE_FORMAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ',day_of_week - 1),'%x %v %w'), '%W') as dt, day_of_week as dow +$sql = "SELECT DATE_FORMAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ',day_of_week - 1),'%x %v %w'), '%W') as description, day_of_week as value, '' as selected FROM day_of_week"; -$daysofweek = $db->Execute($sql); - +$daysofweek = $db->GetAll($sql); +translate_array($daysofweek,array("description")); ?> @@ -119,11 +119,14 @@ $daysofweek = $db->Execute($sql); $count = 0; foreach($shifts as $shift) { - print "" . $daysofweek->GetMenu("day[$count]",T_($shift['dt'])) . ""; - $daysofweek->MoveFirst(); + print ""; + display_chooser($daysofweek, "day[$count]", false, true, false, false, false, array("description",$shift['dt'])); + print ""; $count++; } - print "" . $daysofweek->GetMenu("day[$count]") . ""; + print ""; + display_chooser($daysofweek, "day[$count]", false, true, false, false, false, false); + print ""; ?> diff --git a/admin/shifttemplate.php b/admin/shifttemplate.php index 11c2e374..6b77efa2 100644 --- a/admin/shifttemplate.php +++ b/admin/shifttemplate.php @@ -103,12 +103,13 @@ $sql = "SELECT DATE_FORMAT( STR_TO_DATE( CONCAT( '$year', ' ', '$woy', ' ', day_ FROM shift_template"; $shifts = $db->GetAll($sql); +translate_array($shifts,array("dt")); - -$sql = "SELECT DATE_FORMAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ',day_of_week - 1),'%x %v %w'), '%W') as dt, day_of_week as dow +$sql = "SELECT DATE_FORMAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ',day_of_week - 1),'%x %v %w'), '%W') as description, day_of_week as value, '' as selected FROM day_of_week"; -$daysofweek = $db->Execute($sql); +$daysofweek = $db->GetAll($sql); +translate_array($daysofweek,array("description")); ?> @@ -118,11 +119,14 @@ $daysofweek = $db->Execute($sql); $count = 0; foreach($shifts as $shift) { - print "" . $daysofweek->GetMenu("day[$count]",T_($shift['dt'])) . ""; - $daysofweek->MoveFirst(); + print ""; + display_chooser($daysofweek, "day[$count]", false, true, false, false, false, array("description",$shift['dt'])); + print ""; $count++; } - print "" . $daysofweek->GetMenu("day[$count]") . ""; + print ""; + display_chooser($daysofweek, "day[$count]", false, true, false, false, false, false); + print ""; ?> diff --git a/functions/functions.xhtml.php b/functions/functions.xhtml.php index b8d1d385..63986737 100644 --- a/functions/functions.xhtml.php +++ b/functions/functions.xhtml.php @@ -136,9 +136,10 @@ function xhtml_table($content,$fields,$head = false,$class = "tclass",$highlight * @param string|bool $pass Anything to pass along in the return string (remember to separate with &) * @param bool $js Whether to use JS or not * @param bool $indiv Whether to display in a div or not + * @param array|bool $select The element to select manually (element,string) (not using selected=\'selected\' in array) * */ -function display_chooser($elements, $selectid, $var, $useblank = true, $pass = false, $js = true, $indiv = true) +function display_chooser($elements, $selectid, $var, $useblank = true, $pass = false, $js = true, $indiv = true, $selected = false) { if ($indiv) print "
"; print "";