From a007a23d758709d1b7210b2c79f4ce17fb6c18f0 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Wed, 12 Dec 2012 00:22:30 +0100 Subject: fix #91 (SQL error in shift filter) and translate "shifts" and "my shifts" a lot --- includes/pages/user_shifts.php | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) (limited to 'includes/pages/user_shifts.php') diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index c144733d..59168436 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -268,6 +268,8 @@ function view_user_shifts() { $types = sql_select("SELECT `id`, `name` FROM `AngelTypes`"); else $types = sql_select("SELECT `AngelTypes`.`id`, `AngelTypes`.`name` FROM `UserAngelTypes` JOIN `AngelTypes` ON (`UserAngelTypes`.`angeltype_id` = `AngelTypes`.`id`) WHERE `UserAngelTypes`.`user_id` = " . sql_escape($user['UID']) . " AND (`AngelTypes`.`restricted` = 0 OR NOT `UserAngelTypes`.`confirm_user_id` IS NULL)"); + if (empty($types)) + $types = sql_select("SELECT `id`, `name` FROM `AngelTypes` WHERE `restricted` = 0"); $filled = array ( array ( 'id' => '1', @@ -347,9 +349,10 @@ function view_user_shifts() { $query .= "`shift_id` = " . sql_escape($shift['SID']); else $query .= "`room_id` = " . sql_escape($shift['RID']); - $query .= " AND `count` > 0 - AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") - ORDER BY `AngelTypes`.`name`"; + $query .= " AND `count` > 0 "; + if (!empty($_SESSION['user_shifts']['types'])) + $query .= "AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") "; + $query .= "ORDER BY `AngelTypes`.`name`"; $angeltypes = sql_select($query); if (count($angeltypes) > 0) { @@ -363,12 +366,15 @@ function view_user_shifts() { else $entry_list[] = $entry['Nick']; } + // do we need more angles of this type? if ($angeltype['count'] - count($entries) > 0) { - if ((time() < $shift['end'] && !$my_shift) || in_array('user_shifts_admin', $privileges)) { - $entry_list[] = '' . ($angeltype['count'] - count($entries)) . ' Helfer' . ($angeltype['count'] - count($entries) != 1 ? '' : '') . ' gebraucht »'; - } else { - $entry_list[] = ($angeltype['count'] - count($entries)) . ' Helfer gebraucht'; - } + $inner_text = ($angeltype['count'] - count($entries)) . ' ' . Get_Text($angeltype['count'] - count($entries) == 1 ? 'helper' : 'helpers') . ' ' . Get_Text('needed'); + // is the shift still running or alternatively is the user shift admin? + if ((time() < $shift['end'] && !$my_shift) || in_array('user_shifts_admin', $privileges)) + $entry_list[] = '' . $inner_text . ' »'; + else + $entry_list[] = $inner_text; + unset($inner_text); $is_free = true; } @@ -391,13 +397,15 @@ function view_user_shifts() { user_reset_ical_key($user); return msg() . template_render('../templates/user_shifts.html', array ( - 'room_select' => make_select($rooms, $_SESSION['user_shifts']['rooms'], "rooms", "Räume"), - 'day_select' => make_select($days, $_SESSION['user_shifts']['days'], "days", "Tage"), - 'type_select' => make_select($types, $_SESSION['user_shifts']['types'], "types", "Aufgaben"), - 'filled_select' => make_select($filled, $_SESSION['user_shifts']['filled'], "filled", "Besetzung"), + 'room_select' => make_select($rooms, $_SESSION['user_shifts']['rooms'], "rooms", ucfirst(Get_Text("rooms"))), + 'day_select' => make_select($days, $_SESSION['user_shifts']['days'], "days", ucfirst(Get_Text("days"))), + 'type_select' => make_select($types, $_SESSION['user_shifts']['types'], "types", ucfirst(Get_Text("tasks"))) . Get_Text("pub_schichtplan_tasks_notice"), + 'filled_select' => make_select($filled, $_SESSION['user_shifts']['filled'], "filled", ucfirst(Get_Text("occupancy"))), 'shifts_table' => $shifts_table, - 'ical_link' => make_user_shifts_ical_link($user['ical_key']), - 'reset_link' => page_link_to('user_myshifts') . '&reset' + 'ical_text' => sprintf(Get_Text('pub_schichtplan_ical_text'), make_user_shifts_ical_link($user['ical_key']), page_link_to('user_myshifts') . '&reset'), + 'header1' => ucfirst(Get_Text("time")) . "/" . ucfirst(Get_Text("room")), + 'header2' => ucfirst(Get_Text("entries")), + 'filter' => ucfirst(Get_Text("to_filter")), )); } @@ -430,8 +438,8 @@ function make_select($items, $selected, $name, $title = null) { $html .= implode("\n", $html_items); $html .= '' . "\n"; $html .= buttons(array ( - button("javascript: check_all('selection_" . $name . "')", "Alle", ""), - button("javascript: uncheck_all('selection_" . $name . "')", "Keine", "") + button("javascript: check_all('selection_" . $name . "')", Get_Text("all"), ""), + button("javascript: uncheck_all('selection_" . $name . "')", Get_Text("none"), "") )); $html .= '' . "\n"; return $html; -- cgit v1.2.3-70-g09d2 From 910af3eaf725845f19c134805433533220113ae4 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Wed, 12 Dec 2012 00:45:29 +0100 Subject: fixes for the last commit --- db/update.d/17_translations.php | 7 +++---- includes/pages/user_myshifts.php | 2 +- includes/pages/user_shifts.php | 5 +++-- templates/user_shifts.html | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) (limited to 'includes/pages/user_shifts.php') diff --git a/db/update.d/17_translations.php b/db/update.d/17_translations.php index 05b520d3..962b6052 100644 --- a/db/update.d/17_translations.php +++ b/db/update.d/17_translations.php @@ -21,11 +21,11 @@ $res = mysql_query("INSERT IGNORE INTO `Sprache` (`TextID`, `Sprache`, `Text`) V ('tasks', 'DE', 'Aufgaben'), ('tasks', 'EN', 'tasks'), ('occupancy', 'DE', 'Belegung'), -('occupancy' ,'EN', 'occupancy') +('occupancy' ,'EN', 'occupancy'), ('all', 'DE', 'alle'), ('all', 'EN', 'all'), ('none', 'DE', 'keine'), -('none', 'EN', 'none') +('none', 'EN', 'none'), ('entries', 'DE', 'Einträge'), ('entries', 'EN', 'entries'), ('time', 'DE', 'Zeit'), @@ -53,8 +53,7 @@ $res = mysql_query("INSERT IGNORE INTO `Sprache` (`TextID`, `Sprache`, `Text`) V ('pub_myshifts_too_late', 'DE', 'Es ist zu spät um sich aus der Schicht auszutragen. Frage ggf. den Schichtkoordinator, ob er dich austragen kann.'), ('pub_myshifts_too_late', 'EN', 'It\'s too late to sign yourself off the shift. If neccessary, as the dispatcher to do so.'), ('sign_off', 'DE', 'austragen'), -('sign_off', 'EN', 'sign off'), -;"); +('sign_off', 'EN', 'sign off');"); if(mysql_affected_rows() > 0) $applied = true; diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php index a4022666..390b3b01 100644 --- a/includes/pages/user_myshifts.php +++ b/includes/pages/user_myshifts.php @@ -94,7 +94,7 @@ function user_myshifts() { 'intro' => sprintf(Get_Text('pub_myshifts_intro'), $LETZTES_AUSTRAGEN), 'shifts' => $html, 'msg' => $msg, - 'ical_text' => sprintf(Get_Text('pub_schichtplan_ical_text'), + 'ical_text' => sprintf(Get_Text('inc_schicht_ical_text'), page_link_to_absolute('ical') . '&key=' . $shifts_user['ical_key'], page_link_to('user_myshifts') . '&reset'), )); diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index 59168436..d5751756 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -399,10 +399,11 @@ function view_user_shifts() { return msg() . template_render('../templates/user_shifts.html', array ( 'room_select' => make_select($rooms, $_SESSION['user_shifts']['rooms'], "rooms", ucfirst(Get_Text("rooms"))), 'day_select' => make_select($days, $_SESSION['user_shifts']['days'], "days", ucfirst(Get_Text("days"))), - 'type_select' => make_select($types, $_SESSION['user_shifts']['types'], "types", ucfirst(Get_Text("tasks"))) . Get_Text("pub_schichtplan_tasks_notice"), + 'type_select' => make_select($types, $_SESSION['user_shifts']['types'], "types", ucfirst(Get_Text("tasks")) . '1'), 'filled_select' => make_select($filled, $_SESSION['user_shifts']['filled'], "filled", ucfirst(Get_Text("occupancy"))), + 'task_notice' => '1' . Get_Text("pub_schichtplan_tasks_notice"), 'shifts_table' => $shifts_table, - 'ical_text' => sprintf(Get_Text('pub_schichtplan_ical_text'), make_user_shifts_ical_link($user['ical_key']), page_link_to('user_myshifts') . '&reset'), + 'ical_text' => sprintf(Get_Text('inc_schicht_ical_text'), make_user_shifts_ical_link($user['ical_key']), page_link_to('user_myshifts') . '&reset'), 'header1' => ucfirst(Get_Text("time")) . "/" . ucfirst(Get_Text("room")), 'header2' => ucfirst(Get_Text("entries")), 'filter' => ucfirst(Get_Text("to_filter")), diff --git a/templates/user_shifts.html b/templates/user_shifts.html index 8bd42e45..b035d23b 100644 --- a/templates/user_shifts.html +++ b/templates/user_shifts.html @@ -5,6 +5,7 @@ %type_select% %day_select% %filled_select% +
%task_notice%
-- cgit v1.2.3-70-g09d2 From 697b756c4ea5925ebb23e31b08ff851d024ae26d Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Wed, 12 Dec 2012 00:58:44 +0100 Subject: more translations and fixes --- db/update.d/18_translations.php | 17 +++++++++++++++++ includes/pages/user_shifts.php | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 db/update.d/18_translations.php (limited to 'includes/pages/user_shifts.php') diff --git a/db/update.d/18_translations.php b/db/update.d/18_translations.php new file mode 100644 index 00000000..995a2450 --- /dev/null +++ b/db/update.d/18_translations.php @@ -0,0 +1,17 @@ + 0; + +// more translations +$res = mysql_query("INSERT IGNORE INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES +('occupied', 'DE', 'belegt'), +('occupied', 'EN', 'occupied'), +('free', 'DE', 'frei'), +('free', 'EN', 'free');"); + +$applied |= mysql_affected_rows() > 0; diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index d5751756..785fc8ab 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -273,11 +273,11 @@ function view_user_shifts() { $filled = array ( array ( 'id' => '1', - 'name' => 'Volle' + 'name' => Get_Text('occupied') ), array ( 'id' => '0', - 'name' => 'Freie' + 'name' => Get_Text('free') ) ); -- cgit v1.2.3-70-g09d2