From cac86ef509de8543d473db421898b80ca3b8f8e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20H=C3=A4usler?= <msquare@notrademark.de>
Date: Sat, 15 Aug 2015 14:54:25 +0200
Subject: [PATCH] add planned date of departure

---
 db/update.sql                             |   3 +
 includes/pages/admin_arrive.php           |  51 +++++--
 includes/pages/user_settings.php          |  17 ++-
 includes/sys_menu.php                     |   3 +
 locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 33601 -> 34023 bytes
 locale/de_DE.UTF-8/LC_MESSAGES/default.po | 158 +++++++++++++---------
 6 files changed, 151 insertions(+), 81 deletions(-)

diff --git a/db/update.sql b/db/update.sql
index 4ae7d295..594969f9 100644
--- a/db/update.sql
+++ b/db/update.sql
@@ -1,3 +1,6 @@
+/* Introduce planned departure date */
+ALTER TABLE `User` ADD `planned_departure_date` INT NULL, ADD INDEX ( `planned_departure_date` );
+
 /* Allow longer angeltype names */
 ALTER TABLE `AngelTypes` CHANGE `name` `name` VARCHAR( 50 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
 
diff --git a/includes/pages/admin_arrive.php b/includes/pages/admin_arrive.php
index 8fdcf12b..64cf785d 100644
--- a/includes/pages/admin_arrive.php
+++ b/includes/pages/admin_arrive.php
@@ -31,11 +31,12 @@ function admin_arrive() {
   }
   
   $users = sql_select("SELECT * FROM `User` ORDER BY `Nick`");
-  $arrival_count_at_day = array();
+  $arrival_count_at_day = [];
+  $departure_count_at_day = [];
   $table = "";
-  $users_matched = array();
+  $users_matched = [];
   if ($search == "")
-    $tokens = array();
+    $tokens = [];
   else
     $tokens = explode(" ", $search);
   foreach ($users as $usr) {
@@ -52,6 +53,10 @@ function admin_arrive() {
     }
     
     $usr['nick'] = User_Nick_render($usr);
+    if ($usr['planned_departure_date'] != null)
+      $usr['rendered_planned_departure_date'] = date('Y-m-d', $usr['planned_departure_date']);
+    else
+      $usr['rendered_planned_departure_date'] = '-';
     $usr['rendered_planned_arrival_date'] = date('Y-m-d', $usr['planned_arrival_date']);
     $usr['rendered_arrival_date'] = $usr['arrival_date'] > 0 ? date('Y-m-d', $usr['arrival_date']) : "-";
     $usr['arrived'] = $usr['Gekommen'] == 1 ? _("yes") : "";
@@ -60,24 +65,37 @@ function admin_arrive() {
     $day = $usr['arrival_date'] > 0 ? date('Y-m-d', $usr['arrival_date']) : date('Y-m-d', $usr['planned_arrival_date']);
     if (! isset($arrival_count_at_day[$day]))
       $arrival_count_at_day[$day] = 0;
+    if (! isset($departure_count_at_day[$day]))
+      $departure_count_at_day[$day] = 0;
     $arrival_count_at_day[$day] ++;
     
+    if ($usr['planned_departure_date'] != null) {
+      $day = date('Y-m-d', $usr['planned_departure_date']);
+      if (! isset($arrival_count_at_day[$day]))
+        $arrival_count_at_day[$day] = 0;
+      if (! isset($departure_count_at_day[$day]))
+        $departure_count_at_day[$day] = 0;
+      $departure_count_at_day[$day] ++;
+    }
+    
     $users_matched[] = $usr;
   }
-  
+
   ksort($arrival_count_at_day);
+  ksort($departure_count_at_day);
   
-  $arrival_count = array();
-  $arrival_sums = array();
+  $arrival_count = [];
+  $arrival_sums = [];
   $arrival_sum = 0;
   foreach ($arrival_count_at_day as $day => $count) {
-    $arrival_sum += $count;
+    $arrival_sum += $count - $departure_count_at_day[$day];
     $arrival_sums[$day] = $arrival_sum;
-    $arrival_count[] = array(
+    $arrival_count[] = [
         'day' => $day,
         'count' => $count,
-        'sum' => $arrival_sum 
-    );
+        'sum' => $arrival_sum,
+        'departure' => isset($departure_count_at_day[$day]) ? $departure_count_at_day[$day] : 0 
+    ];
   }
   
   return page_with_title(admin_arrive_title(), array(
@@ -88,9 +106,10 @@ function admin_arrive() {
       )),
       table(array(
           'nick' => _("Nickname"),
-          'rendered_planned_arrival_date' => _("Planned date"),
+          'rendered_planned_arrival_date' => _("Planned arrival"),
           'arrived' => _("Arrived?"),
           'rendered_arrival_date' => _("Arrival date"),
+          'rendered_planned_departure_date' => _("Planned departure"),
           'actions' => "" 
       ), $users_matched),
       heading(_("Arrival statistics"), 2),
@@ -103,13 +122,18 @@ function admin_arrive() {
           'datasets' => array(
               array(
                   'label' => _("arrived"),
-                  'fillColor' => "#444",
+                  'fillColor' => "#090",
                   'data' => array_values($arrival_count_at_day) 
               ),
               array(
                   'label' => _("arrived sum"),
                   'fillColor' => "#888",
                   'data' => array_values($arrival_sums) 
+              ),
+              array(
+                  'label' => _("planned departure"),
+                  'fillColor' => "#900",
+                  'data' => array_values($departure_count_at_day) 
               ) 
           ) 
       )) . ');
@@ -118,7 +142,8 @@ function admin_arrive() {
       table(array(
           'day' => _("Date"),
           'count' => _("arrived"),
-          'sum' => _("arrived sum") 
+          'sum' => _("arrived sum"),
+          'departure' => _("planned departure") 
       ), $arrival_count) 
   ));
 }
diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php
index d210ed56..466d3c3e 100644
--- a/includes/pages/user_settings.php
+++ b/includes/pages/user_settings.php
@@ -25,6 +25,7 @@ function user_settings() {
   $selected_theme = $user['color'];
   $selected_language = $user['Sprache'];
   $planned_arrival_date = $user['planned_arrival_date'];
+  $planned_departure_date = $user['planned_departure_date'];
   
   if (isset($_REQUEST['submit'])) {
     $ok = true;
@@ -63,7 +64,17 @@ function user_settings() {
       $msg .= error(_("Please enter your planned date of arrival."), true);
     }
     
-    // Trivia
+    if (isset($_REQUEST['planned_departure_date']) && $_REQUEST['planned_departure_date'] != '') {
+      if (DateTime::createFromFormat("Y-m-d", trim($_REQUEST['planned_departure_date']))) {
+        $planned_departure_date = DateTime::createFromFormat("Y-m-d", trim($_REQUEST['planned_departure_date']))->getTimestamp();
+      } else {
+        $ok = false;
+        $msg .= error(_("Please enter your planned date of departure."), true);
+      }
+    } else
+      $planned_departure_date = null;
+      
+      // Trivia
     if (isset($_REQUEST['lastname']))
       $lastname = strip_request_item('lastname');
     if (isset($_REQUEST['prename']))
@@ -94,7 +105,8 @@ function user_settings() {
           `jabber`='" . sql_escape($jabber) . "',
           `Size`='" . sql_escape($tshirt_size) . "',
           `Hometown`='" . sql_escape($hometown) . "',
-          `planned_arrival_date`='" . sql_escape($planned_arrival_date) . "'
+          `planned_arrival_date`='" . sql_escape($planned_arrival_date) . "',
+          `planned_departure_date`=" . sql_null($planned_departure_date) . "
           WHERE `UID`='" . sql_escape($user['UID']) . "'");
       
       success(_("Settings saved."));
@@ -157,6 +169,7 @@ function user_settings() {
                   form_text('lastname', _("Last name"), $lastname),
                   form_text('prename', _("First name"), $prename),
                   form_date('planned_arrival_date', _("Planned date of arrival") . ' ' . entry_required(), $planned_arrival_date, time()),
+                  form_date('planned_departure_date', _("Planned date of departure"), $planned_departure_date, time()),
                   form_text('age', _("Age"), $age),
                   form_text('tel', _("Phone"), $tel),
                   form_text('dect', _("DECT"), $dect),
diff --git a/includes/sys_menu.php b/includes/sys_menu.php
index 16577cbc..c7ecfb88 100644
--- a/includes/sys_menu.php
+++ b/includes/sys_menu.php
@@ -45,6 +45,9 @@ function header_toolbar() {
     if ($unconfirmed_hint != '')
       $hints[] = $unconfirmed_hint;
     
+    if (! isset($user['planned_departure_date']) || $user['planned_departure_date'] == null)
+      $hints[] = info(_("Please enter your planned date of departure on your settings page to give us a feeling for teardown capacities."), true);
+    
     if (User_is_freeloader($user)) {
       $hints[] = error(sprintf(_("You freeloaded at least %s shifts. Shift signup is locked. Please go to heavens desk to be unlocked again."), $max_freeloadable_shifts), true);
       $hint_class = 'danger';
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index 9f2d0d0621835f4764c0a1925f9194049bfd2dec..a1f9cab619204f461b4ab0dc18c466ebdb4dee9c 100644
GIT binary patch
delta 9420
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

delta 9088
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
NoIF0%H);Nq{{z{jB76V<

diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
index 313109c7..8f724435 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: 2015-08-14 14:16+0100\n"
-"PO-Revision-Date: 2015-08-14 14:16+0100\n"
+"POT-Creation-Date: 2015-08-15 14:53+0100\n"
+"PO-Revision-Date: 2015-08-15 14:54+0100\n"
 "Last-Translator: msquare <msquare@notrademark.de>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -18,6 +18,14 @@ msgstr ""
 "X-Poedit-SearchPath-1: .\n"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:49
+msgid ""
+"Please enter your planned date of departure on your settings page to give us "
+"a feeling for teardown capacities."
+msgstr ""
+"Bitte gib Dein geplantes Abreisedatum an, damit wir ein Gefühl für die Abbau-"
+"Planung bekommen."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:52
 #, php-format
 msgid ""
 "You freeloaded at least %s shifts. Shift signup is locked. Please go to "
@@ -26,7 +34,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/sys_menu.php:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:59
 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."
@@ -34,11 +42,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/sys_menu.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:65
 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/sys_menu.php:68
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:71
 msgid ""
 "You need to specify a DECT phone number in your settings! If you don't have "
 "a DECT phone, just enter \"-\"."
@@ -46,7 +54,7 @@ msgstr ""
 "Bitte eine DECT-Telefonnummer in den Einstellungen eingeben. Wenn du noch "
 "keine Nummer hast, bitte einfach \"-\" angeben."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:129
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:132
 msgid "Admin"
 msgstr "Admin"
 
@@ -55,6 +63,7 @@ msgid "No data found."
 msgstr "Nichts gefunden."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:7
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:821
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:56
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:72
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:196
@@ -357,12 +366,12 @@ msgstr "Der Token ist nicht in Ordnung."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:156
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:93
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:111
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:123
 msgid "Your passwords don't match."
 msgstr "Deine Passwörter stimmen nicht überein."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:160
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:109
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:121
 msgid "Your password is to short (please use at least 6 characters)."
 msgstr "Dein Passwort ist zu kurz (Bitte mindestens 6 Zeichen nutzen)."
 
@@ -371,20 +380,20 @@ msgid "Password could not be updated."
 msgstr "Passwort kann nicht neu gesetzt werden."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:168
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:125
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:186
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:190
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:63
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:36
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:37
 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:194
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:67
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:40
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:41
 msgid "Please enter your e-mail."
 msgstr "Bitte gib Deine E-Mail-Adresse ein."
 
@@ -572,8 +581,8 @@ msgid "Show all shifts"
 msgstr "Alle Schichten anzeigen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:169
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:86
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:87
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:105
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:71
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:80
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:25
@@ -592,7 +601,7 @@ msgid "Preview"
 msgstr "Vorschau"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:177
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:108
 msgid "Nickname"
 msgstr "Nick"
 
@@ -650,7 +659,7 @@ msgstr "Zurückgesetzt. Engel ist nicht angekommen."
 msgid "Angel has been marked as arrived."
 msgstr "Engel wurde als angekommen markiert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:57
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:62
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:8
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:19
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:30
@@ -659,39 +668,49 @@ msgstr "Engel wurde als angekommen markiert."
 msgid "yes"
 msgstr "Ja"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:58
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:63
 msgid "reset"
 msgstr "zurücksetzen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:58
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:105
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:120
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:63
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:124
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:144
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:208
 msgid "arrived"
 msgstr "angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:91
-msgid "Planned date"
-msgstr "Geplant am"
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:109
+#, fuzzy
+msgid "Planned arrival"
+msgstr "Geplanter Ankunftstag"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:92
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:110
 msgid "Arrived?"
 msgstr "Angekommen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:111
 msgid "Arrival date"
 msgstr "Ankunftsdatum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:112
+msgid "Planned departure"
+msgstr "Geplante Abreise"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:115
 msgid "Arrival statistics"
 msgstr "Ankunfts-Statistik"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:110
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:121
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:129
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:145
 msgid "arrived sum"
 msgstr "Summe angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:119
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:134
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:146
+msgid "planned departure"
+msgstr "Geplante Abreise"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:143
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:27
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:71
 msgid "Date"
@@ -714,7 +733,7 @@ msgstr "Nur bestätigte"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:85
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:180
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:311
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:168
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:131
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:157
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:169
@@ -724,7 +743,7 @@ msgstr "Nick"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:87
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:209
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:162
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:175
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:132
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:158
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:170
@@ -734,13 +753,13 @@ msgstr "DECT"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:88
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:218
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:179
 msgid "Jabber"
 msgstr "Jabber"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:89
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:183
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:164
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:177
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:239
 msgid "E-Mail"
 msgstr "E-Mail"
@@ -774,10 +793,10 @@ msgstr "Privilegien"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:62
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:106
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:160
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:170
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:179
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:184
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:189
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:197
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:202
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:191
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:65
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:32
@@ -1160,7 +1179,7 @@ msgstr "Benutzer existiert nicht."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:45
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:184
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:165
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:178
 msgid "Please send me an email if my shifts change"
 msgstr "Informiere mich per E-Mail über Änderungen an meinen Schichten"
 
@@ -1208,7 +1227,7 @@ msgid "Your nick &quot;%s&quot; is too short (min. 2 characters)."
 msgstr "Der Nick &quot;%s&quot; ist zu kurz (Mindestens 2 Zeichen)."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:77
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:49
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:50
 msgid "Please check your jabber account information."
 msgstr "Bitte überprüfe deine Jabber Account Eingabe."
 
@@ -1222,7 +1241,7 @@ msgid "Your password is too short (please use at least %s characters)."
 msgstr "Dein Passwort ist zu kurz (Bitte mindestens %s Zeichen nutzen)."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:104
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:63
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:64
 msgid "Please enter your planned date of arrival."
 msgstr "Bitte gib Dein geplantes Ankunftsdatum an."
 
@@ -1239,12 +1258,12 @@ msgstr ""
 "der Engel-Aufgabenverwaltung."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:189
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:159
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:171
 msgid "Planned date of arrival"
 msgstr "Geplanter Ankunftstag"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:192
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:181
 msgid "Shirt size"
 msgstr "T-Shirt Größe"
 
@@ -1276,37 +1295,37 @@ msgstr ""
 "werden. Du kannst Deine Auswahl später in den Einstellungen ändern."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:212
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:163
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:176
 msgid "Mobile"
 msgstr "Handy"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:215
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:161
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:174
 msgid "Phone"
 msgstr "Telefon"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:221
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:158
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:170
 msgid "First name"
 msgstr "Vorname"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:224
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:157
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:169
 msgid "Last name"
 msgstr "Nachname"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:229
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:160
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:173
 msgid "Age"
 msgstr "Alter"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:232
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:167
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:180
 msgid "Hometown"
 msgstr "Wohnort"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:235
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:155
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:167
 msgid "Entry required!"
 msgstr "Pflichtfeld!"
 
@@ -1520,59 +1539,67 @@ msgstr "Keine Frage gefunden."
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:100
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:72
+msgid "Please enter your planned date of departure."
+msgstr "Bitte gib Dein geplantes Abreisedatum an."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:112
 msgid "Settings saved."
 msgstr "Einstellungen gespeichert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:119
 msgid "-> not OK. Please try again."
 msgstr "-> Nicht OK. Bitte erneut versuchen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:115
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:127
 msgid "Failed setting password."
 msgstr "Konnte Passwort nicht speichern."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:128
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:140
 msgid "Theme changed."
 msgstr "Aussehen geändert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:154
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:166
 msgid "Here you can change your user details."
 msgstr "Hier kannst Du Deine Details ändern."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:169
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:172
+msgid "Planned date of departure"
+msgstr "Geplanter Abreisetag"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:182
 msgid "Please visit the angeltypes page to manage your angeltypes."
 msgstr "Bitte benutze die Engeltypen-Seite um deine Engeltypen zu verwalten."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:188
 msgid "Here you can change your password."
 msgstr "Hier kannst Du Dein Passwort ändern."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:176
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:189
 msgid "Old password:"
 msgstr "Altes Passwort:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:190
 msgid "New password:"
 msgstr "Neues Passwort:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:191
 msgid "Password confirmation:"
 msgstr "Passwort wiederholen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:182
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:195
 msgid "Here you can choose your color settings:"
 msgstr "Hier kannst Du das Aussehen auswählen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:196
 msgid "Color settings:"
 msgstr "Aussehen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:187
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:200
 msgid "Here you can choose your language:"
 msgstr "Hier kannst Du Deine Sprache auswählen:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:188
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:201
 msgid "Language:"
 msgstr "Sprache:"
 
@@ -1717,10 +1744,6 @@ msgstr "Zeit"
 msgid "Entries"
 msgstr "Einträge"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:821
-msgid "Tasks"
-msgstr "Aufgaben"
-
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:822
 msgid "Occupancy"
 msgstr "Belegung"
@@ -2201,6 +2224,9 @@ msgstr ""
 "Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich "
 "bitte ein, um Zugriff zu erhalten!"
 
+#~ msgid "Tasks"
+#~ msgstr "Aufgaben"
+
 #~ msgid "Count"
 #~ msgstr "Anzahl"