From 1e8f0c484588882e01bc173f7f60e2cf1376f790 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Wed, 27 Dec 2017 12:24:55 +0100
Subject: [PATCH] =?UTF-8?q?fixes=20#208,=20fixes=20#310:=20T-Shirt=20Score?=
 =?UTF-8?q?=E2=84=A2=20should=20be=20shown=20on=20the=20user=20view=20page?=
 =?UTF-8?q?=20below=20your=20shifts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/controller/users_controller.php  |   6 +-
 includes/model/User_model.php             |  24 +++
 includes/view/User_view.php               |  24 ++-
 locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 43607 -> 43684 bytes
 locale/de_DE.UTF-8/LC_MESSAGES/default.po | 247 +++++++++++-----------
 5 files changed, 173 insertions(+), 128 deletions(-)

diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php
index e206176f..ae297851 100644
--- a/includes/controller/users_controller.php
+++ b/includes/controller/users_controller.php
@@ -220,7 +220,7 @@ function user_controller()
             );
         }
     }
-
+    
     if ($user_source['api_key'] == '') {
         User_reset_api_key($user_source, false);
     }
@@ -234,7 +234,9 @@ function user_controller()
             User_angeltypes($user_source),
             User_groups($user_source),
             $shifts,
-            $user['UID'] == $user_source['UID']
+            $user['UID'] == $user_source['UID'],
+            User_tshirt_score($user_source),
+            in_array('admin_active', $privileges)
         )
     ];
 }
diff --git a/includes/model/User_model.php b/includes/model/User_model.php
index 33fca639..fa24aac1 100644
--- a/includes/model/User_model.php
+++ b/includes/model/User_model.php
@@ -17,6 +17,30 @@ function User_delete($user_id)
     DB::delete('DELETE FROM `User` WHERE `UID`=?', [$user_id]);
 }
 
+/**
+ * Returns the tshirt score (number of hours counted for tshirt).
+ * Accounts only ended shifts.
+ * 
+ * @param array[] $user
+ */
+function User_tshirt_score($user) {
+    $shift_sum_formula = config('shift_sum_formula');
+    
+    $result = DB::selectOne('
+        SELECT ROUND((' . $shift_sum_formula . ') / 3600, 2) AS `tshirt_score`
+        FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID`
+        LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` 
+        WHERE `User`.`UID` = ?
+        AND `Shifts`.`end` < ?
+        GROUP BY `User`.`UID`
+    ',[
+        $user['UID'],
+        time()
+    ]);
+    
+    return $result['tshirt_score'];
+}
+
 /**
  * Update user.
  *
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index a80eb096..7a36aafe 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -401,16 +401,14 @@ function User_view_myshift($shift, $user_source, $its_me)
  * @param bool    $its_me
  * @return array
  */
-function User_view_myshifts($shifts, $user_source, $its_me)
+function User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshirt_admin)
 {
     $myshifts_table = [];
     $timesum = 0;
     foreach ($shifts as $shift) {
         $myshifts_table[] = User_view_myshift($shift, $user_source, $its_me);
 
-        if ($shift['freeloaded']) {
-            $timesum += (-2 * ($shift['end'] - $shift['start']));
-        } else {
+        if (!$shift['freeloaded']) {
             $timesum += ($shift['end'] - $shift['start']);
         }
     }
@@ -418,12 +416,22 @@ function User_view_myshifts($shifts, $user_source, $its_me)
     if (count($myshifts_table) > 0) {
         $myshifts_table[] = [
             'date'       => '<b>' . _('Sum:') . '</b>',
-            'time'       => '<b>' . round($timesum / 3600, 1) . ' h</b>',
+            'time'       => '<b>' . round($timesum / 3600, 2) . ' h</b>',
             'room'       => '',
             'shift_info' => '',
             'comment'    => '',
             'actions'    => ''
         ];
+        if($its_me || $tshirt_admin) {
+            $myshifts_table[] = [
+                'date'       => '<b>' . _('Your t-shirt score') . '&trade;:</b>',
+                'time'       => '<b>' . round($tshirt_score, 2) . ' h</b>',
+                'room'       => '',
+                'shift_info' => '',
+                'comment'    => '',
+                'actions'    => ''
+            ];
+        }
     }
     return $myshifts_table;
 }
@@ -438,12 +446,14 @@ function User_view_myshifts($shifts, $user_source, $its_me)
  * @param array[] $user_groups
  * @param array[] $shifts
  * @param bool    $its_me
+ * @param int     $tshirt_score
+ * @param bool    $tshirt_admin
  * @return string
  */
-function User_view($user_source, $admin_user_privilege, $freeloader, $user_angeltypes, $user_groups, $shifts, $its_me)
+function User_view($user_source, $admin_user_privilege, $freeloader, $user_angeltypes, $user_groups, $shifts, $its_me, $tshirt_score, $tshirt_admin)
 {
     $user_name = htmlspecialchars($user_source['Vorname']) . ' ' . htmlspecialchars($user_source['Name']);
-    $myshifts_table = User_view_myshifts($shifts, $user_source, $its_me);
+    $myshifts_table = User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshirt_admin);
 
     return page_with_title(
         '<span class="icon-icon_angel"></span> '
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index 6cb4b88562cee1b7d9f7dffb87cd0a02fd3d0508..a58c3a058f222f5f8b1c408670462b33c8e978a7 100644
GIT binary patch
delta 11975
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

delta 11907
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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 d14b6265..a093149f 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-26 10:48+0100\n"
-"PO-Revision-Date: 2017-12-26 10:48+0100\n"
+"POT-Creation-Date: 2017-12-27 12:17+0100\n"
+"PO-Revision-Date: 2017-12-27 12:17+0100\n"
 "Last-Translator: msquare <msquare@notrademark.de>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -25,7 +25,7 @@ msgstr "Bitte auswählen..."
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:241
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:80
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:138
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:673
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:682
 msgid "Angeltypes"
 msgstr "Engeltypen"
 
@@ -76,9 +76,9 @@ msgstr "ansehen"
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:174
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:92
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:124
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:136
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:138
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:380
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:459
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:467
 msgid "edit"
 msgstr "bearbeiten"
 
@@ -97,7 +97,7 @@ msgstr "bearbeiten"
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:31
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:97
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:129
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:139
 msgid "delete"
 msgstr "löschen"
 
@@ -159,57 +159,57 @@ msgid "Settings saved."
 msgstr "Einstellungen gespeichert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/public_dashboard_controller.php:27
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:267
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:262
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:55
 msgid "Public Dashboard"
 msgstr "Public Dashboard"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:105
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:109
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:181
 #, php-format
 msgid "%s has been subscribed to the shift."
 msgstr "%s wurde in die Schicht eingetragen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:145
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:149
 msgid "User is not in angeltype."
 msgstr "User ist nicht im Engeltyp."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:162
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:206
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:210
 msgid "This shift is already occupied."
 msgstr "Die Schicht ist schon voll."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:202
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:206
 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:204
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:130
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:208
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:128
 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:208
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:212
 msgid "This shift ended already."
 msgstr "Die Schicht ist schon vorbei."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:210
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:214
 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:212
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:133
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:216
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:132
 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:262
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:266
 msgid "You are subscribed. Thank you!"
 msgstr "Du bist eingetragen. Danke!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:321
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:325
 msgid "Shift entry not found."
 msgstr "Schichteintrag nicht gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:343
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:347
 msgid ""
 "You are not allowed to remove this shift entry. If necessary, ask your "
 "supporter or heaven to do so."
@@ -217,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:349
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:353
 msgid "Shift entry removed."
 msgstr "Schichteintrag gelöscht."
 
@@ -284,13 +284,13 @@ msgstr "Ende:"
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:193
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:304
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:414
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:150
 msgid "Needed angels"
 msgstr "Benötigte Engel"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:195
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:100
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:40
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:49
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:56
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:177
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:306
@@ -311,7 +311,7 @@ msgstr "Benötigte Engel"
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:86
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:91
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:182
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:651
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:660
 msgid "Save"
 msgstr "Speichern"
 
@@ -425,7 +425,7 @@ msgstr "Du darfst diesen Benutzer nicht für diesen Engeltyp freischalten."
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:146
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:201
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:268
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:407
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:408
 msgid "User doesn't exist."
 msgstr "Benutzer existiert nicht."
 
@@ -577,55 +577,55 @@ msgstr "Voucher von %s"
 msgid "User not found."
 msgstr "Benutzer nicht gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:267
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:268
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:232
 msgid "All users"
 msgstr "Alle Benutzer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:291
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:292
 msgid "Token is not correct."
 msgstr "Der Token ist nicht in Ordnung."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:304
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:305
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:142
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:116
 msgid "Your passwords don't match."
 msgstr "Deine Passwörter stimmen nicht überein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:308
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:309
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:114
 msgid "Your password is to short (please use at least 6 characters)."
 msgstr "Dein Passwort ist zu kurz (Bitte mindestens 6 Zeichen nutzen)."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:313
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:314
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:119
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:338
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:342
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:339
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:343
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:107
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:31
 msgid "E-mail address is not correct."
 msgstr "Die E-Mail Adresse ist nicht in Ordnung."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:346
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:347
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:111
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:35
 msgid "Please enter your e-mail."
 msgstr "Bitte gib Deine E-Mail-Adresse ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:353
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:389
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:354
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:390
 msgid "Password recovery"
 msgstr "Passwort wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:355
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:356
 #, php-format
 msgid "Please visit %s to recover your password."
 msgstr "Bitte besuche %s, um Dein Passwort zurückzusetzen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:359
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:360
 msgid "We sent an email containing your password recovery link."
 msgstr ""
 "Wir haben eine eMail mit einem Link zum Passwort-zurücksetzen geschickt."
@@ -849,7 +849,7 @@ msgstr "Größe"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:11
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:355
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Rooms_view.php:39
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:503
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:511
 msgid "Shifts"
 msgstr "Schichten"
 
@@ -912,7 +912,7 @@ msgstr "zurücksetzen"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:186
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:201
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:216
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:467
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:475
 msgid "arrived"
 msgstr "angekommen"
 
@@ -945,7 +945,7 @@ msgstr "Summe angekommen"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:193
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:208
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:223
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:35
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:44
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:116
 msgid "Date"
 msgstr "Datum"
@@ -1012,7 +1012,7 @@ msgstr "Jabber"
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:118
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:480
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:52
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:632
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:641
 msgid "E-Mail"
 msgstr "E-Mail"
 
@@ -1150,7 +1150,7 @@ msgstr "Anzulegende Schichten"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:192
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:201
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:210
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:505
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:513
 msgid "Day"
 msgstr "Tag"
 
@@ -1204,41 +1204,45 @@ msgid "Edit news entry"
 msgstr "News-Eintrag bearbeiten"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:37
-msgid "This message contains HTML. After saving the post some formatting will be lost!"
-msgstr "Diese Nachricht beinhaltet HTML. Wenn du sie speicherst gehen diese Formatierungen verloren!"
+msgid ""
+"This message contains HTML. After saving the post some formatting will be "
+"lost!"
+msgstr ""
+"Diese Nachricht beinhaltet HTML. Wenn du sie speicherst gehen diese "
+"Formatierungen verloren!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:36
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:45
 msgid "Author"
 msgstr "Autor"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:37
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:46
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:275
 msgid "Subject"
 msgstr "Betreff"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:47
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:119
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:188
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:276
 msgid "Message"
 msgstr "Nachricht"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:48
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:277
 msgid "Meeting"
 msgstr "Treffen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:57
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:197
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:157
 msgid "Delete"
 msgstr "löschen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:87
 msgid "News entry updated."
 msgstr "News-Eintrag gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:94
 msgid "News entry deleted."
 msgstr "News-Eintrag gelöscht."
 
@@ -1316,7 +1320,7 @@ msgstr ""
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Rooms_view.php:24
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:63
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:101
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:148
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:154
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -1577,12 +1581,12 @@ msgstr "T-Shirt Größe"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:342
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:478
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:119
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:649
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:658
 msgid "Password"
 msgstr "Passwort"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:345
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:650
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:659
 msgid "Confirm password"
 msgstr "Passwort wiederholen"
 
@@ -1730,6 +1734,7 @@ msgid "Wrong action."
 msgstr "Falsche Aktion."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:144
 msgid "My shifts"
 msgstr "Meine Schichten"
 
@@ -1738,7 +1743,7 @@ msgid "Key changed."
 msgstr "Key geändert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:42
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:490
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:498
 msgid "Reset API key"
 msgstr "API-Key zurücksetzen"
 
@@ -1818,7 +1823,7 @@ msgid "No question found."
 msgstr "Keine Frage gefunden."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:10
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:478
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:486
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -1877,59 +1882,59 @@ msgstr ""
 msgid "Description of the jobs."
 msgstr "Beschreibung der Aufgaben."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:251
-msgid "iCal export"
-msgstr "iCal Export"
-
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:252
-#, php-format
-msgid ""
-"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>)."
-msgstr ""
-"Exportiere Deine Schichten. <a href=\"%s\">iCal Format</a> oder <a href=\"%s"
-"\">JSON Format</a> verfügbar (Link bitte geheimhalten, sonst <a href=\"%s"
-"\">API-Key zurücksetzen</a>)."
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:257
 msgid "Filter"
 msgstr "Filter"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:258
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:253
 msgid "Yesterday"
 msgstr "Gestern"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:259
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:254
 msgid "Today"
 msgstr "Heute"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:260
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:255
 msgid "Tomorrow"
 msgstr "Morgen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:261
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:256
 msgid "last 8h"
 msgstr "letzte 8h"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:262
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:257
 msgid "last 4h"
 msgstr "letzte 4h"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:263
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:258
 msgid "next 4h"
 msgstr "nächste 4h"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:264
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:259
 msgid "next 8h"
 msgstr "nächste 8h"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:301
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:276
+msgid "iCal export"
+msgstr "iCal Export"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:278
+#, php-format
+msgid ""
+"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>)."
+msgstr ""
+"Exportiere Deine Schichten. <a href=\"%s\">iCal Format</a> oder <a href=\"%s"
+"\">JSON Format</a> verfügbar (Link bitte geheimhalten, sonst <a href=\"%s"
+"\">API-Key zurücksetzen</a>)."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:312
 #: /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:302
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:313
 msgid "None"
 msgstr "Keine"
 
@@ -2222,23 +2227,23 @@ msgstr "Abbau Ende Datum"
 msgid "Event end date"
 msgstr "Event Ende Datum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:35
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:37
 msgid "Angels needed in the next 3 hrs"
 msgstr "Benötigte Engel in den nächsten 3 Stunden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:36
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:38
 msgid "Angels needed for nightshifts"
 msgstr "Benötigte Engel für Nachtschichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:37
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:39
 msgid "Angels currently working"
 msgstr "Aktuell arbeitende Engel"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:40
 msgid "Hours to be worked"
 msgstr "Noch zu schaffende Stunden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:56
 msgid "Fullscreen"
 msgstr "Vollbild"
 
@@ -2255,7 +2260,7 @@ msgid "No shifts found."
 msgstr "Keine Schichten gefunden."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:248
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:506
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:514
 msgid "Time"
 msgstr "Zeit"
 
@@ -2409,7 +2414,7 @@ msgid "New shifttype"
 msgstr "Neuer Schichttyp"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:40
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:507
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:515
 msgid "Location"
 msgstr "Ort"
 
@@ -2585,7 +2590,7 @@ msgid "Prename"
 msgstr "Vorname"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:242
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:561
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:570
 msgid "Arrived"
 msgstr "Angekommen"
 
@@ -2598,12 +2603,12 @@ msgid "Freeloads"
 msgstr "Schwänzereien"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:245
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:595
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:604
 msgid "Active"
 msgstr "Aktiv"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:247
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:598
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:607
 msgid "T-Shirt"
 msgstr "T-Shirt"
 
@@ -2639,39 +2644,43 @@ msgstr "abmelden"
 msgid "Sum:"
 msgstr "Summe:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:463
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:428
+msgid "Your t-shirt score"
+msgstr "Dein T-Shirt Score"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:471
 msgid "driving license"
 msgstr "Führerschein"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:474
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:482
 msgid "Edit vouchers"
 msgstr "Voucher bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:482
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:490
 msgid "iCal Export"
 msgstr "iCal Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:486
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:494
 msgid "JSON Export"
 msgstr "JSON Export"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:508
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:516
 msgid "Name &amp; workmates"
 msgstr "Name &amp; Kollegen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:509
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:517
 msgid "Comment"
 msgstr "Kommentar"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:510
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:518
 msgid "Action"
 msgstr "Aktion"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:513
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:521
 msgid "Your night shifts between 2 and 8 am count twice."
 msgstr "Deine Nachtschichten zwischen 2 und 8 Uhr zählen doppelt."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:518
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:526
 #, php-format
 msgid ""
 "Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some "
@@ -2680,44 +2689,44 @@ msgstr ""
 "Gehe zur <a href=\"%s\">Schicht-Tabelle</a>, um Dich für Schichten "
 "einzutragen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:543
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:552
 msgid "User state"
 msgstr "Engelzustand"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:563
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:572
 msgid "Not arrived"
 msgstr "Nicht angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:582
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:591
 msgid "Freeloader"
 msgstr "Schwänzer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:589
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:598
 #, php-format
 msgid "Arrived at %s"
 msgstr "Angekommen am %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:593
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:602
 msgid "Active (forced)"
 msgstr "Aktiv (gezwungen)"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:602
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:611
 #, php-format
 msgid "Not arrived (Planned: %s)"
 msgstr "Nicht angekommen (Geplant: %s)"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:610
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:619
 #, php-format
 msgid "Got %s voucher"
 msgid_plural "Got %s vouchers"
 msgstr[0] "Einen Voucher bekommen"
 msgstr[1] "%s Voucher bekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:615
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:624
 msgid "Got no vouchers"
 msgstr "Voucher nicht bekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:630
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:639
 msgid ""
 "We will send you an e-mail with a password recovery link. Please use the "
 "email address you used for registration."
@@ -2726,19 +2735,19 @@ msgstr ""
 "zurücksetzen kannst. Bitte benutze die Mailadresse, die du bei der Anmeldung "
 "verwendet hast."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:633
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:642
 msgid "Recover"
 msgstr "Wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:647
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:656
 msgid "Please enter a new password."
 msgstr "Gib bitte ein neues Passwort ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:690
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:699
 msgid "Rights"
 msgstr "Rechte"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:739
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:748
 msgid ""
 "Please enter your planned date of departure on your settings page to give us "
 "a feeling for teardown capacities."
@@ -2746,7 +2755,7 @@ msgstr ""
 "Bitte gib Dein geplantes Abreisedatum an, damit wir ein Gefühl für die Abbau-"
 "Planung bekommen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:755
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:764
 #, php-format
 msgid ""
 "You freeloaded at least %s shifts. Shift signup is locked. Please go to "
@@ -2755,7 +2764,7 @@ msgstr ""
 "Du hast mindestens %s Schichten geschwänzt. Schicht-Registrierung ist "
 "gesperrt. Bitte gehe zum Himmelsschreibtisch um wieder entsperrt zu werden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:777
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:786
 msgid ""
 "You are not marked as arrived. Please go to heaven's desk, get your angel "
 "badge and/or tell them that you arrived already."
@@ -2763,11 +2772,11 @@ msgstr ""
 "Du bist nicht als angekommen markiert. Bitte gehe zur Himmelsverwaltung, "
 "hole Dein Badge ab und/oder erkläre ihnen, dass Du bereits angekommen bist."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:792
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:801
 msgid "You need to specify a tshirt size in your settings!"
 msgstr "Bitte eine T-Shirt-Größe auswählen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:807
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:816
 msgid ""
 "You need to specify a DECT phone number in your settings! If you don't have "
 "a DECT phone, just enter '-'."