From c3b8fa892d4d95e9c1b47e89e600dc96d1c279d2 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Wed, 27 Dec 2017 20:30:05 +0100
Subject: [PATCH] tshirt-score for forced active

---
 includes/controller/users_controller.php  |   8 ++++-
 includes/view/User_view.php               |   4 +--
 locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 43788 -> 43833 bytes
 locale/de_DE.UTF-8/LC_MESSAGES/default.po |  34 ++++++++++++----------
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php
index ae297851..aca20a2c 100644
--- a/includes/controller/users_controller.php
+++ b/includes/controller/users_controller.php
@@ -224,6 +224,12 @@ function user_controller()
     if ($user_source['api_key'] == '') {
         User_reset_api_key($user_source, false);
     }
+    
+    if($user_source['force_active']) {
+        $tshirt_score = _('Enough');
+    } else {
+        $tshirt_score = round(User_tshirt_score($user_source), 2) . 'h';
+    }
 
     return [
         $user_source['Nick'],
@@ -235,7 +241,7 @@ function user_controller()
             User_groups($user_source),
             $shifts,
             $user['UID'] == $user_source['UID'],
-            User_tshirt_score($user_source),
+            $tshirt_score,
             in_array('admin_active', $privileges)
         )
     ];
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index 16267635..8d47dc47 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -429,10 +429,10 @@ function User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshi
             'comment'    => '',
             'actions'    => ''
         ];
-        if ($its_me || $tshirt_admin) {
+        if (config('enable_tshirt_size', false) && ($its_me || $tshirt_admin)) {
             $myshifts_table[] = [
                 'date'       => '<b>' . _('Your t-shirt score') . '&trade;:</b>',
-                'duration'   => '<b>' . round($tshirt_score, 2) . ' h</b>',
+                'duration'   => '<b>' . $tshirt_score . '</b>',
                 'room'       => '',
                 'shift_info' => '',
                 'comment'    => '',
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index abf9e5826df17e422848445cbc11a44582f0cb00..c4624b53bb8411153512499f37595b50d1c7dff3 100644
GIT binary patch
delta 12010
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

delta 11982
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
JsUxpf`ah0<vJU_N

diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
index db900d5c..eb73f2b7 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-27 15:02+0100\n"
-"PO-Revision-Date: 2017-12-27 15:02+0100\n"
+"POT-Creation-Date: 2017-12-27 20:29+0100\n"
+"PO-Revision-Date: 2017-12-27 20:29+0100\n"
 "Last-Translator: msquare <msquare@notrademark.de>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -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:409
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:415
 msgid "User doesn't exist."
 msgstr "Benutzer existiert nicht."
 
@@ -577,55 +577,59 @@ msgstr "Voucher von %s"
 msgid "User not found."
 msgstr "Benutzer nicht gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:269
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:229
+msgid "Enough"
+msgstr "Genug"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:275
 #: /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:293
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:299
 msgid "Token is not correct."
 msgstr "Der Token ist nicht in Ordnung."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:306
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:312
 #: /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:310
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:316
 #: /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:315
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:321
 #: /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:340
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:344
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:346
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:350
 #: /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:348
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:354
 #: /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:355
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:391
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:361
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:397
 msgid "Password recovery"
 msgstr "Passwort wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:357
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:363
 #, 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:361
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:367
 msgid "We sent an email containing your password recovery link."
 msgstr ""
 "Wir haben eine eMail mit einem Link zum Passwort-zurücksetzen geschickt."