From a1c032642fb1ca16779de125c690a77b8e25e737 Mon Sep 17 00:00:00 2001 From: msquare Date: Wed, 20 Dec 2017 23:12:17 +0100 Subject: [PATCH] introduce new shift signup state for not arrived angels --- includes/pages/user_shifts.php | 4 +- includes/view/ShiftCalendarRenderer.php | 2 +- includes/view/ShiftCalendarShiftRenderer.php | 2 +- locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 43080 -> 43309 bytes locale/de_DE.UTF-8/LC_MESSAGES/default.po | 80 ++++++++++--------- templates/user_shifts.html | 5 +- 6 files changed, 48 insertions(+), 45 deletions(-) diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index 39dcc101..b3db0391 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -200,9 +200,8 @@ function view_user_shifts() $end_day = date('Y-m-d', $shiftsFilter->getEndTime()); $end_time = date('H:i', $shiftsFilter->getEndTime()); - $assignNotice = ''; if (config('signup_requires_arrival') && !$user['Gekommen']) { - $assignNotice = info(render_user_arrived_hint(), true); + info(render_user_arrived_hint()); } return page([ @@ -228,7 +227,6 @@ function view_user_shifts() . ' ' . _('Description of the jobs.') . '', - 'assign_notice' => $assignNotice, 'shifts_table' => msg() . $shiftCalendarRenderer->render(), 'ical_text' => '

' . _('iCal export') . '

' . sprintf( _('Export of shown shifts. iCal format or JSON format available (please keep secret, otherwise reset the api key).'), diff --git a/includes/view/ShiftCalendarRenderer.php b/includes/view/ShiftCalendarRenderer.php index 354d0336..40642947 100644 --- a/includes/view/ShiftCalendarRenderer.php +++ b/includes/view/ShiftCalendarRenderer.php @@ -305,7 +305,7 @@ class ShiftCalendarRenderer label(_('Help needed'), 'danger'), label(_('Other angeltype needed / collides with my shifts'), 'warning'), label(_('Shift is full'), 'success'), - label(_('Shift running/ended'), 'default') + label(_('Shift running/ended or user not arrived'), 'default') ]); } } diff --git a/includes/view/ShiftCalendarShiftRenderer.php b/includes/view/ShiftCalendarShiftRenderer.php index 61e3ecec..97a40ed9 100644 --- a/includes/view/ShiftCalendarShiftRenderer.php +++ b/includes/view/ShiftCalendarShiftRenderer.php @@ -189,7 +189,7 @@ class ShiftCalendarShiftRenderer case ShiftSignupState::NOT_ARRIVED: // No link and add a text hint, when the shift ended - $entry_list[] = $inner_text . ' (' . _('not arrived') . ')'; + $entry_list[] = $inner_text . ' (' . _('please arrive for signup') . ')'; break; case ShiftSignupState::ANGELTYPE: diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo index e87cbb734ec8e55160e967b0f9a97c999e46a371..538fe0e3786deaac3e74bb01ed3172b0c09e8c99 100644 GIT binary patch delta 11965 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 ZOHls_@mn^|JsrGd(~3U>7HnNR^8e!Dm7@Rv diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po index 4eb0f146..5fe64ee7 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Engelsystem 2.0\n" -"POT-Creation-Date: 2017-12-20 00:47+0100\n" -"PO-Revision-Date: 2017-12-20 00:49+0100\n" +"POT-Creation-Date: 2017-12-20 23:11+0100\n" +"PO-Revision-Date: 2017-12-20 23:12+0100\n" "Last-Translator: msquare \n" "Language-Team: \n" "Language: de_DE\n" @@ -22,7 +22,7 @@ msgid "Please select..." msgstr "Bitte auswählen..." #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:12 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:222 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:221 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:77 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:130 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:514 @@ -159,7 +159,7 @@ msgid "Settings saved." msgstr "Einstellungen gespeichert." #: /Users/msquare/workspace/projects/engelsystem/includes/controller/public_dashboard_controller.php:18 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:247 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:245 #: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:42 msgid "Public Dashboard" msgstr "Public Dashboard" @@ -175,37 +175,41 @@ msgid "User is not in angeltype." msgstr "User ist nicht im Engeltyp." #: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:149 -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:205 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:191 msgid "This shift is already occupied." msgstr "Die Schicht ist schon voll." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:201 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:187 msgid "You need be accepted member of the angeltype." msgstr "Du musst bestätigtes Mitglied des Engeltyps sein." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:203 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:189 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:126 msgid "This shift collides with one of your shifts." msgstr "Diese Schicht kollidiert mit deinen Schichten." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:207 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:193 msgid "This shift ended already." msgstr "Die Schicht ist schon vorbei." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:209 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:195 +msgid "You are not marked as arrived." +msgstr "Du bist nicht als angekommen markiert." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:197 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:129 msgid "You are signed up for this shift." msgstr "Du bist für diese Schicht eingetragen." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:230 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:238 msgid "You are subscribed. Thank you!" msgstr "Du bist eingetragen. Danke!" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:282 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:290 msgid "Shift entry not found." msgstr "Schichteintrag nicht gefunden." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:302 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:310 msgid "" "You are not allowed to remove this shift entry. If neccessary, ask your " "supporter or heaven to do so." @@ -213,7 +217,7 @@ msgstr "" "Du darfst diesen Schichteintrag nicht entfernen. Falls notwendig, frage " "deinen Supporter oder im Himmel danach." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:308 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:316 msgid "Shift entry removed." msgstr "Schichteintrag gelöscht." @@ -1275,7 +1279,7 @@ msgid "Answered by" msgstr "Antwort von" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:7 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:213 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:212 #: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:201 msgid "Rooms" msgstr "Räume" @@ -1852,26 +1856,26 @@ msgstr "belegt" msgid "free" msgstr "frei" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:224 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:223 msgid "Occupancy" msgstr "Belegung" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:227 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:226 msgid "" "The tasks shown here are influenced by the angeltypes you joined already!" msgstr "" "Die Schichten, die hier angezeigt werden, sind von Deinen Einstellungen " "(Engeltypen/Aufgaben) abhängig!" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:229 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:228 msgid "Description of the jobs." msgstr "Beschreibung der Aufgaben." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:233 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:231 msgid "iCal export" msgstr "iCal Export" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:234 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:232 #, php-format msgid "" "Export of shown shifts. iCal format or JSON Format verfügbar (Link bitte geheimhalten, sonst API-Key zurücksetzen)." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:239 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:237 msgid "Filter" msgstr "Filter" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:240 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:238 msgid "Yesterday" msgstr "Gestern" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:241 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:239 msgid "Today" msgstr "Heute" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:242 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:240 msgid "Tomorrow" msgstr "Morgen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:243 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:241 msgid "last 8h" msgstr "letzte 8h" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:244 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:242 msgid "last 4h" msgstr "letzte 4h" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:245 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:243 msgid "next 4h" msgstr "nächste 4h" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:246 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:244 msgid "next 8h" msgstr "nächste 8h" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:280 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:278 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:49 msgid "All" msgstr "Alle" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:281 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:279 msgid "None" msgstr "Keine" @@ -2261,30 +2265,34 @@ msgid "Shift is full" msgstr "Schicht ist voll" #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:308 -msgid "Shift running/ended" -msgstr "Schicht läuft/vorbei" +msgid "Shift running/ended or user not arrived" +msgstr "Schicht läuft/vorbei oder du bist noch nicht angekommen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:129 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:130 msgid "Add more angels" msgstr "Neue Engel hinzufügen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:165 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:166 #, php-format msgid "%d helper needed" msgid_plural "%d helpers needed" msgstr[0] "%d Helfer benötigt" msgstr[1] "%d Helfer benötigt" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:180 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:181 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:81 msgid "Sign up" msgstr "Eintragen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:186 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:187 msgid "ended" msgstr "vorbei" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:198 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:192 +msgid "please arrive for signup" +msgstr "Ankommen zum Eintragen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:204 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:85 #, php-format msgid "Become %s" diff --git a/templates/user_shifts.html b/templates/user_shifts.html index b1bbba56..e137210c 100644 --- a/templates/user_shifts.html +++ b/templates/user_shifts.html @@ -65,10 +65,7 @@

%filled_select%
-
-
%assign_notice%
-
-
+

%task_notice%