From 5299ca210319b324564a889dcb2d7b651117f7eb Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Tue, 15 Nov 2016 17:54:59 +0100
Subject: [PATCH] reduce complexity of shift view

---
 includes/view/EventConfig_view.php        |   4 +-
 includes/view/Shifts_view.php             |  83 ++++++++++++----------
 locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 41201 -> 41205 bytes
 locale/de_DE.UTF-8/LC_MESSAGES/default.po |   8 +--
 4 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/includes/view/EventConfig_view.php b/includes/view/EventConfig_view.php
index 7c369bb0..d184166f 100644
--- a/includes/view/EventConfig_view.php
+++ b/includes/view/EventConfig_view.php
@@ -48,7 +48,7 @@ function EventConfig_info($event_config) {
   
   // Event name, start+end date are set
   if ($event_config['event_name'] != null && $event_config['event_start_date'] != null && $event_config['event_end_date'] != null) {
-    return sprintf(_("%s, from %s to %s"), $event_config['event_name'], date("Y-m-d", $event_config['event_start_date']), date(_("Y-m-d"), $event_config['event_end_date']));
+    return sprintf(_("%s, from %s to %s"), $event_config['event_name'], date(_("Y-m-d"), $event_config['event_start_date']), date(_("Y-m-d"), $event_config['event_end_date']));
   }
   
   // Event name, start date are set
@@ -58,7 +58,7 @@ function EventConfig_info($event_config) {
   
   // Event start+end date are set
   if ($event_config['event_start_date'] != null && $event_config['event_end_date'] != null) {
-    return sprintf(_("Event from %s to %s"), date("Y-m-d", $event_config['event_start_date']), date(_("Y-m-d"), $event_config['event_end_date']));
+    return sprintf(_("Event from %s to %s"), date(_("Y-m-d"), $event_config['event_start_date']), date(_("Y-m-d"), $event_config['event_end_date']));
   }
   
   // Only event name is set
diff --git a/includes/view/Shifts_view.php b/includes/view/Shifts_view.php
index c53bf972..7ad580f4 100644
--- a/includes/view/Shifts_view.php
+++ b/includes/view/Shifts_view.php
@@ -45,40 +45,7 @@ function Shift_view($shift, $shifttype, $room, $angeltypes_source, $user_shifts,
   
   $needed_angels = '';
   foreach ($shift['NeedAngels'] as $needed_angeltype) {
-    $class = 'progress-bar-warning';
-    if ($needed_angeltype['taken'] == 0) {
-      $class = 'progress-bar-danger';
-    }
-    if ($needed_angeltype['taken'] >= $needed_angeltype['count']) {
-      $class = 'progress-bar-success';
-    }
-    $needed_angels .= '<div class="list-group-item">';
-    
-    $needed_angels .= '<div class="pull-right">' . Shift_signup_button_render($shift, $angeltypes[$needed_angeltype['TID']]) . '</div>';
-    
-    $needed_angels .= '<h3>' . AngelType_name_render($angeltypes[$needed_angeltype['TID']]) . '</h3>';
-    $needed_angels .= progress_bar(0, $needed_angeltype['count'], min($needed_angeltype['taken'], $needed_angeltype['count']), $class, $needed_angeltype['taken'] . ' / ' . $needed_angeltype['count']);
-    
-    $angels = [];
-    foreach ($shift['ShiftEntry'] as $shift_entry) {
-      if ($shift_entry['TID'] == $needed_angeltype['TID']) {
-        $entry = User_Nick_render(User($shift_entry['UID']));
-        if ($shift_entry['freeloaded']) {
-          $entry = '<strike>' . $entry . '</strike>';
-        }
-        if ($user_shift_admin) {
-          $entry .= ' <div class="btn-group">';
-          $entry .= button_glyph(page_link_to('user_myshifts') . '&edit=' . $shift_entry['id'] . '&id=' . $shift_entry['UID'], 'pencil', 'btn-xs');
-          $entry .= button_glyph(page_link_to('user_shifts') . '&entry_id=' . $shift_entry['id'], 'trash', 'btn-xs');
-          $entry .= '</div>';
-        }
-        $angels[] = $entry;
-      }
-    }
-    
-    $needed_angels .= join(', ', $angels);
-    
-    $needed_angels .= '</div>';
+    $needed_angels .= Shift_view_render_needed_angeltype($needed_angeltype, $angeltypes, $shift, $user_shift_admin);
   }
   
   return page_with_title($shift['name'] . ' <small class="moment-countdown" data-timestamp="' . $shift['start'] . '">%c</small>', [
@@ -99,7 +66,7 @@ function Shift_view($shift, $shifttype, $room, $angeltypes_source, $user_shifts,
           div('col-sm-3 col-xs-6', [
               '<h4>' . _('Start') . '</h4>',
               '<p class="lead' . (time() >= $shift['start'] ? ' text-success' : '') . '">',
-              glyph('calendar') . date('Y-m-d', $shift['start']),
+              glyph('calendar') . date(_('Y-m-d'), $shift['start']),
               '<br />',
               glyph('time') . date('H:i', $shift['start']),
               '</p>' 
@@ -107,7 +74,7 @@ function Shift_view($shift, $shifttype, $room, $angeltypes_source, $user_shifts,
           div('col-sm-3 col-xs-6', [
               '<h4>' . _('End') . '</h4>',
               '<p class="lead' . (time() >= $shift['end'] ? ' text-success' : '') . '">',
-              glyph('calendar') . date('Y-m-d', $shift['end']),
+              glyph('calendar') . date(_('Y-m-d'), $shift['end']),
               '<br />',
               glyph('time') . date('H:i', $shift['end']),
               '</p>' 
@@ -131,6 +98,50 @@ function Shift_view($shift, $shifttype, $room, $angeltypes_source, $user_shifts,
   ]);
 }
 
+function Shift_view_render_needed_angeltype($needed_angeltype, $angeltypes, $shift, $user_shift_admin) {
+  $needed_angels = '';
+  
+  $class = 'progress-bar-warning';
+  if ($needed_angeltype['taken'] == 0) {
+    $class = 'progress-bar-danger';
+  }
+  if ($needed_angeltype['taken'] >= $needed_angeltype['count']) {
+    $class = 'progress-bar-success';
+  }
+  $needed_angels .= '<div class="list-group-item">';
+  
+  $needed_angels .= '<div class="pull-right">' . Shift_signup_button_render($shift, $angeltypes[$needed_angeltype['TID']]) . '</div>';
+  
+  $needed_angels .= '<h3>' . AngelType_name_render($angeltypes[$needed_angeltype['TID']]) . '</h3>';
+  $needed_angels .= progress_bar(0, $needed_angeltype['count'], min($needed_angeltype['taken'], $needed_angeltype['count']), $class, $needed_angeltype['taken'] . ' / ' . $needed_angeltype['count']);
+  
+  $angels = [];
+  foreach ($shift['ShiftEntry'] as $shift_entry) {
+    if ($shift_entry['TID'] == $needed_angeltype['TID']) {
+      $angels[] = Shift_view_render_shift_entry($shift_entry, $user_shift_admin);
+    }
+  }
+  
+  $needed_angels .= join(', ', $angels);
+  $needed_angels .= '</div>';
+  
+  return $needed_angels;
+}
+
+function Shift_view_render_shift_entry($shift_entry, $user_shift_admin) {
+  $entry = User_Nick_render(User($shift_entry['UID']));
+  if ($shift_entry['freeloaded']) {
+    $entry = '<strike>' . $entry . '</strike>';
+  }
+  if ($user_shift_admin) {
+    $entry .= ' <div class="btn-group">';
+    $entry .= button_glyph(page_link_to('user_myshifts') . '&edit=' . $shift_entry['id'] . '&id=' . $shift_entry['UID'], 'pencil', 'btn-xs');
+    $entry .= button_glyph(page_link_to('user_shifts') . '&entry_id=' . $shift_entry['id'], 'trash', 'btn-xs');
+    $entry .= '</div>';
+  }
+  return $entry;
+}
+
 /**
  * Calc shift length in format 12:23h.
  *
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index 5b99222242d71a147d4a15b79b2049bbbad996e9..7e98477ddc7420ba2a6c24b45e681296d650cfcd 100644
GIT binary patch
delta 4190
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
WcY1cd|IcZM`!~t=f4Fm4lm7vP`e`x%

delta 4188
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
TPHt^;-rhm23Ti*A9M$T7g12Zl

diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
index 0c810ee1..0dbdafec 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Engelsystem 2.0\n"
 "POT-Creation-Date: 2016-11-15 17:40+0100\n"
-"PO-Revision-Date: 2016-11-15 17:40+0100\n"
+"PO-Revision-Date: 2016-11-15 17:49+0100\n"
 "Last-Translator: msquare <msquare@notrademark.de>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -2027,7 +2027,7 @@ msgstr "Wir haben aktuell keine Informationen über das Event."
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:19
 #, php-format
 msgid "from %s to %s"
-msgstr "von %s bis %s"
+msgstr "vom %s bis %s"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:23
 #, php-format
@@ -2052,7 +2052,7 @@ msgstr "Abbau endet in %c"
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:51
 #, php-format
 msgid "%s, from %s to %s"
-msgstr "%s, von %s bis %s"
+msgstr "%s, vom %s bis %s"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:51
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:56
@@ -2063,7 +2063,7 @@ msgstr "d.m.Y"
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:56
 #, php-format
 msgid "%s, starting %s"
-msgstr "%s, ab %s"
+msgstr "%s, ab dem %s"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:61
 #, php-format