iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

introduce new shift signup state for not arrived angels

This commit is contained in:
msquare 2017-12-20 23:12:17 +01:00
parent 2c04e35bed
commit a1c032642f
6 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/pages/user_shifts.php
View File

@ -200,9 +200,8 @@ function view_user_shifts()
$end_day = date('Y-m-d', $shiftsFilter->getEndTime()); $end_day = date('Y-m-d', $shiftsFilter->getEndTime());
$end_time = date('H:i', $shiftsFilter->getEndTime()); $end_time = date('H:i', $shiftsFilter->getEndTime());
$assignNotice = '';
if (config('signup_requires_arrival') && !$user['Gekommen']) { if (config('signup_requires_arrival') && !$user['Gekommen']) {
$assignNotice = info(render_user_arrived_hint(), true); info(render_user_arrived_hint());
} }
return page([ return page([
@ -228,7 +227,6 @@ function view_user_shifts()
. ' <a href="' . page_link_to('angeltypes', ['action' => 'about']) . '">' . ' <a href="' . page_link_to('angeltypes', ['action' => 'about']) . '">'
. _('Description of the jobs.') . _('Description of the jobs.')
. '</a>', . '</a>',
'assign_notice' => $assignNotice,
'shifts_table' => msg() . $shiftCalendarRenderer->render(), 'shifts_table' => msg() . $shiftCalendarRenderer->render(),
'ical_text' => '<h2>' . _('iCal export') . '</h2><p>' . sprintf( 'ical_text' => '<h2>' . _('iCal export') . '</h2><p>' . sprintf(
_('Export of shown shifts. <a href="%s">iCal format</a> or <a href="%s">JSON format</a> available (please keep secret, otherwise <a href="%s">reset the api key</a>).'), _('Export of shown shifts. <a href="%s">iCal format</a> or <a href="%s">JSON format</a> available (please keep secret, otherwise <a href="%s">reset the api key</a>).'),

2
includes/view/ShiftCalendarRenderer.php
View File

@ -305,7 +305,7 @@ class ShiftCalendarRenderer
label(_('Help needed'), 'danger'), label(_('Help needed'), 'danger'),
label(_('Other angeltype needed / collides with my shifts'), 'warning'), label(_('Other angeltype needed / collides with my shifts'), 'warning'),
label(_('Shift is full'), 'success'), label(_('Shift is full'), 'success'),
label(_('Shift running/ended'), 'default') label(_('Shift running/ended or user not arrived'), 'default')
]); ]);
} }
} }

2
includes/view/ShiftCalendarShiftRenderer.php
View File

@ -189,7 +189,7 @@ class ShiftCalendarShiftRenderer
case ShiftSignupState::NOT_ARRIVED: case ShiftSignupState::NOT_ARRIVED:
// No link and add a text hint, when the shift ended // 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; break;
case ShiftSignupState::ANGELTYPE: case ShiftSignupState::ANGELTYPE:

BIN
locale/de_DE.UTF-8/LC_MESSAGES/default.mo
View File

Binary file not shown.

80
locale/de_DE.UTF-8/LC_MESSAGES/default.po
View File

@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Engelsystem 2.0\n" "Project-Id-Version: Engelsystem 2.0\n"
"POT-Creation-Date: 2017-12-20 00:47+0100\n" "POT-Creation-Date: 2017-12-20 23:11+0100\n"
"PO-Revision-Date: 2017-12-20 00:49+0100\n" "PO-Revision-Date: 2017-12-20 23:12+0100\n"
"Last-Translator: msquare <msquare@notrademark.de>\n" "Last-Translator: msquare <msquare@notrademark.de>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: de_DE\n" "Language: de_DE\n"
@ -22,7 +22,7 @@ msgid "Please select..."
msgstr "Bitte auswählen..." msgstr "Bitte auswählen..."
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:12 #: /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:77
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:130 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:130
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:514 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:514
@ -159,7 +159,7 @@ msgid "Settings saved."
msgstr "Einstellungen gespeichert." msgstr "Einstellungen gespeichert."
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/public_dashboard_controller.php:18 #: /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 #: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:42
msgid "Public Dashboard" msgid "Public Dashboard"
msgstr "Public Dashboard" msgstr "Public Dashboard"
@ -175,37 +175,41 @@ msgid "User is not in angeltype."
msgstr "User ist nicht im Engeltyp." 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: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." msgid "This shift is already occupied."
msgstr "Die Schicht ist schon voll." 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." msgid "You need be accepted member of the angeltype."
msgstr "Du musst bestätigtes Mitglied des Engeltyps sein." 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 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:126
msgid "This shift collides with one of your shifts." msgid "This shift collides with one of your shifts."
msgstr "Diese Schicht kollidiert mit deinen Schichten." 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." msgid "This shift ended already."
msgstr "Die Schicht ist schon vorbei." 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 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:129
msgid "You are signed up for this shift." msgid "You are signed up for this shift."
msgstr "Du bist für diese Schicht eingetragen." 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!" msgid "You are subscribed. Thank you!"
msgstr "Du bist eingetragen. Danke!" 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." msgid "Shift entry not found."
msgstr "Schichteintrag nicht gefunden." 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 "" msgid ""
"You are not allowed to remove this shift entry. If neccessary, ask your " "You are not allowed to remove this shift entry. If neccessary, ask your "
"supporter or heaven to do so." "supporter or heaven to do so."
@ -213,7 +217,7 @@ msgstr ""
"Du darfst diesen Schichteintrag nicht entfernen. Falls notwendig, frage " "Du darfst diesen Schichteintrag nicht entfernen. Falls notwendig, frage "
"deinen Supporter oder im Himmel danach." "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." msgid "Shift entry removed."
msgstr "Schichteintrag gelöscht." msgstr "Schichteintrag gelöscht."
@ -1275,7 +1279,7 @@ msgid "Answered by"
msgstr "Antwort von" msgstr "Antwort von"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:7 #: /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 #: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:201
msgid "Rooms" msgid "Rooms"
msgstr "Räume" msgstr "Räume"
@ -1852,26 +1856,26 @@ msgstr "belegt"
msgid "free" msgid "free"
msgstr "frei" 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" msgid "Occupancy"
msgstr "Belegung" 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 "" msgid ""
"The tasks shown here are influenced by the angeltypes you joined already!" "The tasks shown here are influenced by the angeltypes you joined already!"
msgstr "" msgstr ""
"Die Schichten, die hier angezeigt werden, sind von Deinen Einstellungen " "Die Schichten, die hier angezeigt werden, sind von Deinen Einstellungen "
"(Engeltypen/Aufgaben) abhängig!" "(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." msgid "Description of the jobs."
msgstr "Beschreibung der Aufgaben." 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" msgid "iCal export"
msgstr "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 #, php-format
msgid "" msgid ""
"Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s" "Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s"
@ -1882,44 +1886,44 @@ msgstr ""
"\">JSON Format</a> verfügbar (Link bitte geheimhalten, sonst <a href=\"%s" "\">JSON Format</a> verfügbar (Link bitte geheimhalten, sonst <a href=\"%s"
"\">API-Key zurücksetzen</a>)." "\">API-Key zurücksetzen</a>)."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:239 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:237
msgid "Filter" msgid "Filter"
msgstr "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" msgid "Yesterday"
msgstr "Gestern" 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" msgid "Today"
msgstr "Heute" 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" msgid "Tomorrow"
msgstr "Morgen" 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" msgid "last 8h"
msgstr "letzte 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" msgid "last 4h"
msgstr "letzte 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" msgid "next 4h"
msgstr "nächste 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" msgid "next 8h"
msgstr "nächste 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 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:49
msgid "All" msgid "All"
msgstr "Alle" 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" msgid "None"
msgstr "Keine" msgstr "Keine"
@ -2261,30 +2265,34 @@ msgid "Shift is full"
msgstr "Schicht ist voll" msgstr "Schicht ist voll"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:308 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:308
msgid "Shift running/ended" msgid "Shift running/ended or user not arrived"
msgstr "Schicht läuft/vorbei" 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" msgid "Add more angels"
msgstr "Neue Engel hinzufügen" 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 #, php-format
msgid "%d helper needed" msgid "%d helper needed"
msgid_plural "%d helpers needed" msgid_plural "%d helpers needed"
msgstr[0] "%d Helfer benötigt" msgstr[0] "%d Helfer benötigt"
msgstr[1] "%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 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:81
msgid "Sign up" msgid "Sign up"
msgstr "Eintragen" msgstr "Eintragen"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:186 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:187
msgid "ended" msgid "ended"
msgstr "vorbei" 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 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:85
#, php-format #, php-format
msgid "Become %s" msgid "Become %s"

5
templates/user_shifts.html
View File

@ -65,10 +65,7 @@
<div class="col-md-2">%filled_select%</div> <div class="col-md-2">%filled_select%</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-12">
<div>%assign_notice%</div>
</div>
<div class="col-md-6">
<div><p>%task_notice%</p></div> <div><p>%task_notice%</p></div>
<input class="btn btn-primary" type="submit" style="width:75%; margin-bottom: 20px" value="%filter%"> <input class="btn btn-primary" type="submit" style="width:75%; margin-bottom: 20px" value="%filter%">
</div> </div>