From 0b45d2a88febf2aac299fe504bb68b2fafcef068 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Wed, 29 Nov 2017 13:23:38 +0100 Subject: [PATCH 1/2] #366 Feature: Time Interval Buttons (on Shifts page), closes #366 --- includes/pages/user_shifts.php | 9 +++- locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 41242 -> 41508 bytes locale/de_DE.UTF-8/LC_MESSAGES/default.po | 30 +++++++++++- public/js/forms.js | 57 ++++++++++++++++++++++ templates/user_shifts.html | 13 +++++ 5 files changed, 107 insertions(+), 2 deletions(-) diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index f8cf71cd..ef21ff1b 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -242,7 +242,14 @@ function view_user_shifts() page_link_to('shifts_json_export', ['key' => $user['api_key']]), page_link_to('user_myshifts', ['reset' => 1]) ) . '

', - 'filter' => _('Filter') + 'filter' => _('Filter'), + 'set_yesterday' => _('Yesterday'), + 'set_today' => _('Today'), + 'set_tomorrow' => _('Tomorrow'), + 'set_last_8h' => _('last 8h'), + 'set_last_4h' => _('last 4h'), + 'set_next_4h' => _('next 4h'), + 'set_next_8h' => _('next 8h'), ]) ]) ]); diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo index bfe3aa4240bfc2f5c01576bb47ec944db91552b0..fd3f822a3c08970824677dea172ac960f7caf70e 100644 GIT binary patch delta 11584 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 diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po index c8319882..6963cbe6 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Engelsystem 2.0\n" "POT-Creation-Date: 2017-11-24 11:59+0100\n" -"PO-Revision-Date: 2017-11-24 12:00+0100\n" +"PO-Revision-Date: 2017-11-29 13:20+0100\n" "Last-Translator: msquare \n" "Language-Team: \n" "Language: de_DE\n" @@ -1837,6 +1837,34 @@ msgstr "" msgid "Filter" msgstr "Filter" +#: engelsystem/includes/pages/user_shifts.php:246 +msgid "Yesterday" +msgstr "Gestern" + +#: engelsystem/includes/pages/user_shifts.php:247 +msgid "Today" +msgstr "Heute" + +#: engelsystem/includes/pages/user_shifts.php:248 +msgid "Tomorrow" +msgstr "Morgen" + +#: engelsystem/includes/pages/user_shifts.php:249 +msgid "last 8h" +msgstr "letzte 8h" + +#: engelsystem/includes/pages/user_shifts.php:250 +msgid "last 4h" +msgstr "letzte 4h" + +#: engelsystem/includes/pages/user_shifts.php:251 +msgid "next 4h" +msgstr "nächste 4h" + +#: engelsystem/includes/pages/user_shifts.php:252 +msgid "next 8h" +msgstr "nächste 8h" + #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:278 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:49 msgid "All" diff --git a/public/js/forms.js b/public/js/forms.js index c4eb68df..d75a4391 100644 --- a/public/js/forms.js +++ b/public/js/forms.js @@ -17,6 +17,63 @@ function checkAll(id, checked) { } } +/** + * @param {moment} date + */ +function formatDay(date) { + return date.format('YYYY-MM-DD') +} + +/** + * @param {moment} date + */ +function formatTime(date) { + return date.format('HH:mm') +} + +/** + * @param {moment} from + * @param {moment} to + */ +function setInput(from, to) { + var from_day = $('#start_day'), from_time = $('#start_time'), to_day = $('#end_day'), to_time = $('#end_time'); + + from_day.val(formatDay(from)); + from_time.val(formatTime(from)); + + to_day.val(formatDay(to)); + to_time.val(formatTime(to)); +} + +function setDay(days) { + days = days || 0; + + var from = moment(); + from.hours(0).minutes(0).seconds(0); + + from.add(days, 'd'); + + var to = from.clone(); + to.hours(23).minutes(59); + + setInput(from, to) +} + +function setHours(hours) { + hours = hours || 1; + + var from = moment(); + var to = from.clone(); + + to.add(hours, 'h'); + if (to < from) { + setInput(to, from); + return; + } + + setInput(from, to); +} + $(function () { /** * Disable every submit button after clicking (to prevent double-clicking) diff --git a/templates/user_shifts.html b/templates/user_shifts.html index c3fb7718..446c4b82 100644 --- a/templates/user_shifts.html +++ b/templates/user_shifts.html @@ -41,6 +41,19 @@ +
+
+ %set_yesterday% + %set_today% + %set_tomorrow% +
+
+ %set_last_8h% + %set_last_4h% + %set_next_4h% + %set_next_8h% +
+
%room_select%
%type_select%
From b29e23f0864edad3c20716581de73e81c335b615 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Wed, 29 Nov 2017 13:49:21 +0100 Subject: [PATCH 2/2] #366 Feature: Time Interval Buttons (on Shifts page): Formatting mimimi --- public/js/forms.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/public/js/forms.js b/public/js/forms.js index d75a4391..97a89465 100644 --- a/public/js/forms.js +++ b/public/js/forms.js @@ -21,14 +21,14 @@ function checkAll(id, checked) { * @param {moment} date */ function formatDay(date) { - return date.format('YYYY-MM-DD') + return date.format("YYYY-MM-DD"); } /** * @param {moment} date */ function formatTime(date) { - return date.format('HH:mm') + return date.format("HH:mm"); } /** @@ -36,13 +36,13 @@ function formatTime(date) { * @param {moment} to */ function setInput(from, to) { - var from_day = $('#start_day'), from_time = $('#start_time'), to_day = $('#end_day'), to_time = $('#end_time'); + var fromDay = $("#start_day"), fromTime = $("#start_time"), toDay = $("#end_day"), toTime = $("#end_time"); - from_day.val(formatDay(from)); - from_time.val(formatTime(from)); + fromDay.val(formatDay(from)); + fromTime.val(formatTime(from)); - to_day.val(formatDay(to)); - to_time.val(formatTime(to)); + toDay.val(formatDay(to)); + toTime.val(formatTime(to)); } function setDay(days) { @@ -51,12 +51,12 @@ function setDay(days) { var from = moment(); from.hours(0).minutes(0).seconds(0); - from.add(days, 'd'); + from.add(days, "d"); var to = from.clone(); to.hours(23).minutes(59); - setInput(from, to) + setInput(from, to); } function setHours(hours) { @@ -65,7 +65,7 @@ function setHours(hours) { var from = moment(); var to = from.clone(); - to.add(hours, 'h'); + to.add(hours, "h"); if (to < from) { setInput(to, from); return;