From e7b0e9934d2df55a7971eaac42cc6b27a9733a32 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Fri, 29 Dec 2017 16:20:30 +0100
Subject: [PATCH 01/12] add shift filter buttons at the top

---
 includes/pages/user_shifts.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index 0be4aa67..81b405b1 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -313,11 +313,19 @@ function get_ids_from_array($array)
  */
 function make_select($items, $selected, $name, $title = null, $additionalButtons = [])
 {
+    $html = '';
     $htmlItems = [];
     if (isset($title)) {
-        $htmlItems[] = '<h4>' . $title . '</h4>' . "\n";
+        $html .= '<h4>' . $title . '</h4>' . "\n";
     }
 
+    $buttons = [];
+    $buttons[] = button('javascript: checkAll(\'selection_' . $name . '\', true)', _('All'));
+    $buttons[] = button('javascript: checkAll(\'selection_' . $name . '\', false)', _('None'));
+    $buttons = array_merge($buttons, $additionalButtons);
+
+    $html .= buttons($buttons);
+
     foreach ($items as $i) {
         $htmlItems[] = '<div class="checkbox">'
             . '<label><input type="checkbox" name="' . $name . '[]" value="' . $i['id'] . '" '
@@ -326,13 +334,9 @@ function make_select($items, $selected, $name, $title = null, $additionalButtons
             . (!isset($i['enabled']) || $i['enabled'] ? '' : glyph('lock'))
             . '</div><br />';
     }
-    $html = '<div id="selection_' . $name . '" class="selection ' . $name . '">' . "\n";
+    $html .= '<div id="selection_' . $name . '" class="selection ' . $name . '">' . "\n";
     $html .= implode("\n", $htmlItems);
 
-    $buttons = [];
-    $buttons[] = button('javascript: checkAll(\'selection_' . $name . '\', true)', _('All'));
-    $buttons[] = button('javascript: checkAll(\'selection_' . $name . '\', false)', _('None'));
-    $buttons = array_merge($buttons, $additionalButtons);
     $html .= buttons($buttons);
 
     $html .= '</div>' . "\n";

From 86a38a3372557bd72db309e7b24b4a4a95544397 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Fri, 29 Dec 2017 17:19:27 +0100
Subject: [PATCH 02/12] add user work log entries feature

---
 db/update.sql                                 |   7 +
 .../controller/user_worklog_controller.php    | 189 ++++++++++++++++++
 includes/controller/users_controller.php      |   4 +-
 includes/includes.php                         |   3 +
 includes/model/UserWorkLog_model.php          | 111 ++++++++++
 includes/model/User_model.php                 |  12 +-
 includes/pages/admin_active.php               |   8 +-
 includes/view/UserWorkLog_view.php            |  95 +++++++++
 includes/view/User_view.php                   |  51 ++++-
 public/index.php                              |   4 +
 10 files changed, 476 insertions(+), 8 deletions(-)
 create mode 100644 includes/controller/user_worklog_controller.php
 create mode 100644 includes/model/UserWorkLog_model.php
 create mode 100644 includes/view/UserWorkLog_view.php

diff --git a/db/update.sql b/db/update.sql
index 212cd97e..351cf8b4 100644
--- a/db/update.sql
+++ b/db/update.sql
@@ -49,3 +49,10 @@ ALTER TABLE `Room` ADD `description` TEXT NULL AFTER `map_url`;
 -- Dashboard
 ALTER TABLE `AngelTypes` ADD `show_on_dashboard` BOOLEAN NOT NULL AFTER `contact_email`;
 UPDATE `AngelTypes` SET `show_on_dashboard` = TRUE;
+
+-- Work Log
+CREATE TABLE `engelsystem`.`UserWorkLog` ( `id` INT NOT NULL AUTO_INCREMENT , `user_id` INT NOT NULL , `work_hours` DECIMAL NOT NULL , `comment` VARCHAR(200) NOT NULL , `created_user_id` INT NOT NULL , `created_timestamp` INT NOT NULL , PRIMARY KEY (`id`), INDEX (`user_id`), INDEX (`created_user_id`)) ENGINE = InnoDB;
+ALTER TABLE `UserWorkLog` ADD FOREIGN KEY (`created_user_id`) REFERENCES `User`(`UID`) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE `UserWorkLog` ADD FOREIGN KEY (`user_id`) REFERENCES `User`(`UID`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `UserWorkLog` ADD INDEX(`created_timestamp`);
+INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (NULL, 'admin_user_worklog', 'Manage user work log entries.');
+ALTER TABLE `UserWorkLog` CHANGE `work_hours` `work_hours` DECIMAL(10,2) NOT NULL;
diff --git a/includes/controller/user_worklog_controller.php b/includes/controller/user_worklog_controller.php
new file mode 100644
index 00000000..ba91534b
--- /dev/null
+++ b/includes/controller/user_worklog_controller.php
@@ -0,0 +1,189 @@
+<?php
+
+/**
+ * Delete a work log entry.
+ */
+function user_worklog_delete_controller()
+{
+    global $user;
+    
+    $request = request();
+    $userWorkLog = UserWorkLog($request->input('user_worklog_id'));
+    if (empty($userWorkLog)) {
+        redirect(user_link($user));
+    }
+    $user_source = User($userWorkLog['user_id']);
+    
+    if ($request->has('confirmed')) {
+        UserWorkLog_delete($userWorkLog);
+        
+        success(_('Work log entry deleted.'));
+        redirect(user_link($user_source));
+    }
+    
+    return [
+        UserWorkLog_delete_title(),
+        UserWorkLog_delete_view($user_source, $userWorkLog)
+    ];
+}
+
+/**
+ * Edit work log for user.
+ */
+function user_worklog_edit_controller()
+{
+    global $user;
+    
+    $request = request();
+    $userWorkLog = UserWorkLog($request->input('user_worklog_id'));
+    if (empty($userWorkLog)) {
+        redirect(user_link($user));
+    }
+    $user_source = User($userWorkLog['user_id']);
+    
+    if ($request->has('submit')) {
+        list ($valid, $userWorkLog) = user_worklog_from_request($userWorkLog);
+        
+        if ($valid) {
+            UserWorkLog_update($userWorkLog);
+            
+            success(_('Work log entry updated.'));
+            redirect(user_link($user_source));
+        }
+    }
+    
+    return [
+        UserWorkLog_edit_title(),
+        UserWorkLog_edit_view($user_source, $userWorkLog)
+    ];
+}
+
+/**
+ *
+ * @param UserWorkLog $userWorkLog            
+ * @return [bool $valid, UserWorkLog $userWorkLog]
+ */
+function user_worklog_from_request($userWorkLog)
+{
+    $request = request();
+    
+    $valid = true;
+    
+    $userWorkLog['work_hours'] = $request->input('work_hours');
+    if (! preg_match("/[0-9]+(\.[0-9]+)?/", $userWorkLog['work_hours'])) {
+        $valid = false;
+        error(_('Please enter work hours in format ##[.##].'));
+    }
+    
+    $userWorkLog['comment'] = $request->input('comment');
+    if (empty($userWorkLog['comment'])) {
+        $valid = false;
+        error(_('Please enter a comment.'));
+    }
+    
+    return [
+        $valid,
+        $userWorkLog
+    ];
+}
+
+/**
+ * Add work log entry to user.
+ */
+function user_worklog_add_controller()
+{
+    global $user;
+    
+    $request = request();
+    $user_source = User($request->input('user_id'));
+    if (empty($user_source)) {
+        redirect(user_link($user));
+    }
+    
+    $userWorkLog = UserWorkLog_new($user_source);
+    
+    if ($request->has('submit')) {
+        list ($valid, $userWorkLog) = user_worklog_from_request($userWorkLog);
+        
+        if ($valid) {
+            UserWorkLog_create($userWorkLog);
+            
+            success(_('Work log entry created.'));
+            redirect(user_link($user_source));
+        }
+    }
+    
+    return [
+        UserWorkLog_add_title(),
+        UserWorkLog_add_view($user_source, $userWorkLog)
+    ];
+}
+
+/**
+ * Link to work log entry add for given user.
+ *
+ * @param User $user            
+ */
+function user_worklog_add_link($user)
+{
+    return page_link_to('user_worklog', [
+        'action' => 'add',
+        'user_id' => $user['UID']
+    ]);
+}
+
+/**
+ * Link to work log entry edit.
+ *
+ * @param UserWorkLog $userWorkLog            
+ */
+function user_worklog_edit_link($userWorkLog)
+{
+    return page_link_to('user_worklog', [
+        'action' => 'edit',
+        'user_worklog_id' => $userWorkLog['id']
+    ]);
+}
+
+/**
+ * Link to work log entry delete.
+ *
+ * @param UserWorkLog $userWorkLog        
+ * @param array[] $parameters    
+ */
+function user_worklog_delete_link($userWorkLog, $parameters = [])
+{
+    return page_link_to('user_worklog', array_merge([
+        'action' => 'delete',
+        'user_worklog_id' => $userWorkLog['id']
+    ], $parameters));
+}
+
+/**
+ * Work log entry actions
+ */
+function user_worklogs_controller()
+{
+    global $user, $privileges;
+    
+    if (! in_array('admin_user_worklog', $privileges)) {
+        redirect(user_link($user));
+    }
+    
+    $request = request();
+    $action = $request->input('action');
+    if (! $request->has('action')) {
+        redirect(user_link($user));
+    }
+    
+    switch ($action) {
+        case 'add':
+            return user_worklog_add_controller();
+        case 'edit':
+            return user_worklog_edit_controller();
+        case 'delete':
+            return user_worklog_delete_controller();
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php
index a2a28410..c763cd48 100644
--- a/includes/controller/users_controller.php
+++ b/includes/controller/users_controller.php
@@ -242,7 +242,9 @@ function user_controller()
             $shifts,
             $user['UID'] == $user_source['UID'],
             $tshirt_score,
-            in_array('admin_active', $privileges)
+            in_array('admin_active', $privileges),
+            in_array('admin_user_worklog', $privileges),
+            UserWorkLogsForUser($user_source)
         )
     ];
 }
diff --git a/includes/includes.php b/includes/includes.php
index e8e5ce29..e316e550 100644
--- a/includes/includes.php
+++ b/includes/includes.php
@@ -27,6 +27,7 @@ $includeFiles = [
     __DIR__ . '/../includes/model/UserDriverLicenses_model.php',
     __DIR__ . '/../includes/model/UserGroups_model.php',
     __DIR__ . '/../includes/model/User_model.php',
+    __DIR__ . '/../includes/model/UserWorkLog_model.php',
     __DIR__ . '/../includes/model/ValidationResult.php',
 
     __DIR__ . '/../includes/view/AngelTypes_view.php',
@@ -45,6 +46,7 @@ $includeFiles = [
     __DIR__ . '/../includes/view/UserDriverLicenses_view.php',
     __DIR__ . '/../includes/view/UserHintsRenderer.php',
     __DIR__ . '/../includes/view/User_view.php',
+    __DIR__ . '/../includes/view/UserWorkLog_view.php',
 
     __DIR__ . '/../includes/controller/angeltypes_controller.php',
     __DIR__ . '/../includes/controller/event_config_controller.php',
@@ -56,6 +58,7 @@ $includeFiles = [
     __DIR__ . '/../includes/controller/users_controller.php',
     __DIR__ . '/../includes/controller/user_angeltypes_controller.php',
     __DIR__ . '/../includes/controller/user_driver_licenses_controller.php',
+    __DIR__ . '/../includes/controller/user_worklog_controller.php',
 
     __DIR__ . '/../includes/helper/graph_helper.php',
     __DIR__ . '/../includes/helper/internationalization_helper.php',
diff --git a/includes/model/UserWorkLog_model.php b/includes/model/UserWorkLog_model.php
new file mode 100644
index 00000000..d9628e1d
--- /dev/null
+++ b/includes/model/UserWorkLog_model.php
@@ -0,0 +1,111 @@
+<?php
+use Engelsystem\Database\Db;
+
+/**
+ * Load a single work log entry.
+ * @param int $user_worklog_id
+ */
+function UserWorkLog($user_worklog_id) {
+    return Db::selectOne("SELECT * FROM `UserWorkLog` WHERE `id`=?", [$user_worklog_id]);
+}
+
+/**
+ * Returns all work log entries for a user.
+ * @param User $user
+ */
+function UserWorkLogsForUser($user) {
+    return Db::select("SELECT * FROM `UserWorkLog` WHERE `user_id`=? ORDER BY `created_timestamp`", [$user['UID']]);
+}
+
+/**
+ * Delete a work log entry.
+ * @param UserWorkLog $userWorkLog
+ */
+function UserWorkLog_delete($userWorkLog)
+{
+    $user_source = $userWorkLog['user_id'];
+    $result = Db::delete("DELETE FROM `UserWorkLog` WHERE `id`=?", [
+        $userWorkLog['id']
+    ]);
+    
+    engelsystem_log(sprintf('Delete work log for %s, %s hours, %s',
+        User_Nick_render($user_source),
+        $userWorkLog['work_hours'],
+        $userWorkLog['comment']));
+    
+    return $result;
+}
+
+/**
+ * Update work log entry (only work hours and comment)
+ * @param UserWorkLog $userWorkLog
+ */
+function UserWorkLog_update($userWorkLog)
+{
+    $user_source = $userWorkLog['user_id'];
+
+    $result = Db::update("UPDATE `UserWorkLog` SET
+        `work_hours`=?,
+        `comment`=?
+        WHERE `id`=?", [
+            $userWorkLog['work_hours'],
+            $userWorkLog['comment'],
+            $userWorkLog['id']
+        ]);
+    
+    engelsystem_log(sprintf('Updated work log for %s, %s hours, %s',
+        User_Nick_render($user_source),
+        $userWorkLog['work_hours'],
+        $userWorkLog['comment']));
+    
+    return $result;
+}
+
+/**
+ * Create a new work log entry
+ * @param UserWorkLog $userWorkLog
+ */
+function UserWorkLog_create($userWorkLog)
+{
+    global $user;
+    
+    $user_source = $userWorkLog['user_id'];
+    
+    $result = Db::insert("INSERT INTO `UserWorkLog` (
+            `user_id`,
+            `work_hours`,
+            `comment`,
+            `created_user_id`,
+            `created_timestamp`
+        )
+        VALUES (?, ?, ?, ?, ?)", [
+            $userWorkLog['user_id'],
+            $userWorkLog['work_hours'],
+            $userWorkLog['comment'],
+            $user['UID'],
+            time()
+        ]);
+    
+    engelsystem_log(sprintf('Added work log entry for %s, %s hours, %s',
+        User_Nick_render($user_source),
+        $userWorkLog['work_hours'],
+        $userWorkLog['comment']));
+    
+    return $result;
+}
+
+/**
+ * New user work log entry
+ *
+ * @param array[] $user            
+ */
+function UserWorkLog_new($user)
+{
+    return [
+        'user_id' => $user['UID'],
+        'work_hours' => 0,
+        'comment' => ''
+    ];
+}
+
+?>
\ No newline at end of file
diff --git a/includes/model/User_model.php b/includes/model/User_model.php
index fa24aac1..b398cefe 100644
--- a/includes/model/User_model.php
+++ b/includes/model/User_model.php
@@ -26,7 +26,7 @@ function User_delete($user_id)
 function User_tshirt_score($user) {
     $shift_sum_formula = config('shift_sum_formula');
     
-    $result = DB::selectOne('
+    $result_shifts = 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` 
@@ -37,8 +37,16 @@ function User_tshirt_score($user) {
         $user['UID'],
         time()
     ]);
+    $result_worklog = DB::selectOne('
+        SELECT SUM(`work_hours`) AS `tshirt_score`
+        FROM `User` 
+        LEFT JOIN `UserWorkLog` ON `User`.`UID` = `UserWorkLog`.`user_id`
+        WHERE `User`.`UID` = ?
+    ',[
+        $user['UID']
+    ]);
     
-    return $result['tshirt_score'];
+    return $result_shifts['tshirt_score'] + $result_worklog['tshirt_score'];
 }
 
 /**
diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php
index 576cdc49..18553159 100644
--- a/includes/pages/admin_active.php
+++ b/includes/pages/admin_active.php
@@ -58,7 +58,9 @@ function admin_active()
                   SELECT
                       `User`.*,
                       COUNT(`ShiftEntry`.`id`) AS `shift_count`,
-                      %s AS `shift_length`
+                      (%s + (
+                          SELECT SUM(`work_hours`) * 3600 FROM `UserWorkLog` WHERE `user_id`=`User`.`UID`
+                      )) AS `shift_length`
                   FROM `User`
                   LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID`
                   LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID`
@@ -140,7 +142,9 @@ function admin_active()
             SELECT
                 `User`.*,
                 COUNT(`ShiftEntry`.`id`) AS `shift_count`,
-                %s AS `shift_length`
+                (%s + (
+                    SELECT SUM(`work_hours`) * 3600 FROM `UserWorkLog` WHERE `user_id`=`User`.`UID`
+                )) AS `shift_length`
             FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID`
             LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` '
         . ($show_all_shifts ? '' : 'AND (`Shifts`.`end` < ' . time() . " OR `Shifts`.`end` IS NULL)") . '
diff --git a/includes/view/UserWorkLog_view.php b/includes/view/UserWorkLog_view.php
new file mode 100644
index 00000000..86a367ae
--- /dev/null
+++ b/includes/view/UserWorkLog_view.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * Delete work log entry.
+ * @param User $user_source
+ * @param UserWorkLog $userWorkLog
+ */
+function UserWorkLog_delete_view($user_source, $userWorkLog)
+{
+    return page_with_title(UserWorkLog_delete_title(), [
+        info(sprintf(_('Do you want to delete the worklog entry for %s?'), User_Nick_render($user_source)), true),
+        buttons([
+            button(user_link($user_source), glyph('remove') . _('cancel')),
+            button(user_worklog_delete_link($userWorkLog, [
+                'confirmed' => 1
+            ]), glyph('ok') . _('delete'), 'btn-danger')
+        ])
+    ]);
+}
+
+/**
+ * Title for work log delete.
+ */
+function UserWorkLog_delete_title()
+{
+    return _('Delete work log entry');
+}
+
+/**
+ * Render edit table.
+ * 
+ * @param User $user_source            
+ * @param UserWorkLog $userWorkLog            
+ */
+function UserWorkLog_edit_form($user_source, $userWorkLog)
+{
+    return form([
+        form_info(_('User'), User_Nick_render($user_source)),
+        form_text('work_hours', _('Work hours'), $userWorkLog['work_hours']),
+        form_text('comment', _('Comment'), $userWorkLog['comment']),
+        form_submit('submit', _('Add'))
+    ]);
+}
+
+/**
+ * Form for edit a user work log entry.
+ *
+ * @param User $user_source            
+ * @param UserWorkLog $userWorkLog            
+ */
+function UserWorkLog_edit_view($user_source, $userWorkLog)
+{
+    return page_with_title(UserWorkLog_edit_title(), [
+        buttons([
+            button(user_link($user_source), _('back'))
+        ]),
+        msg(),
+        UserWorkLog_edit_form($user_source, $userWorkLog)
+    ]);
+}
+
+/**
+ * Form for adding a user work log entry.
+ *
+ * @param User $user_source            
+ * @param UserWorkLog $userWorkLog            
+ */
+function UserWorkLog_add_view($user_source, $userWorkLog)
+{
+    return page_with_title(UserWorkLog_add_title(), [
+        buttons([
+            button(user_link($user_source), _('back'))
+        ]),
+        msg(),
+        UserWorkLog_edit_form($user_source, $userWorkLog)
+    ]);
+}
+
+/**
+ * Title text for editing work log entry.
+ */
+function UserWorkLog_edit_title()
+{
+    return _('Edit work log entry');
+}
+
+/**
+ * Title text for adding work log entry.
+ */
+function UserWorkLog_add_title()
+{
+    return _('Add work log entry');
+}
+
+?>
\ No newline at end of file
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index fff2952e..b1521ff8 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -408,7 +408,7 @@ function User_view_myshift($shift, $user_source, $its_me)
  * @param bool    $its_me
  * @return array
  */
-function User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshirt_admin)
+function User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshirt_admin, $user_worklogs, $admin_user_worklog_privilege)
 {
     $myshifts_table = [];
     $timesum = 0;
@@ -420,6 +420,13 @@ function User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshi
         }
     }
 
+    if($its_me || $admin_user_worklog_privilege) {
+        foreach($user_worklogs as $worklog) {
+            $myshifts_table[] = User_view_worklog($worklog, $admin_user_worklog_privilege);
+            $timesum += $worklog['work_hours'] * 3600;
+        }
+    }
+
     if (count($myshifts_table) > 0) {
         $myshifts_table[] = [
             'date'       => '<b>' . _('Sum:') . '</b>',
@@ -443,6 +450,38 @@ function User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshi
     return $myshifts_table;
 }
 
+/**
+ * Renders table entry for user work log
+ * @param UserWorkLog $worklog
+ * @param bool $admin_user_worklog_privilege
+ */
+function User_view_worklog($worklog, $admin_user_worklog_privilege) {
+    $actions = '';
+    if($admin_user_worklog_privilege) {
+        $actions = table_buttons([
+            button(
+                user_worklog_edit_link($worklog),
+                glyph('edit') . _('edit'),
+                'btn-xs'
+            ),
+            button(
+                user_worklog_delete_link($worklog),
+                glyph('trash') . _('delete'),
+                'btn-xs'
+            )
+        ]);
+    }
+    
+    return [
+        'date'       => '',
+        'duration'   => '<b>' . $worklog['work_hours'] . ' h</b>',
+        'room'       => '',
+        'shift_info' => _('Work log entry'),
+        'comment'    => $worklog['comment'],
+        'actions'    => $actions
+    ];
+}
+
 /**
  * Renders view for a single user
  *
@@ -466,12 +505,14 @@ function User_view(
     $shifts,
     $its_me,
     $tshirt_score,
-    $tshirt_admin
+    $tshirt_admin,
+    $admin_user_worklog_privilege,
+    $user_worklogs
 ) {
     $user_name = htmlspecialchars($user_source['Vorname']) . ' ' . htmlspecialchars($user_source['Name']);
     $myshifts_table = '';
     if($its_me || $admin_user_privilege) {
-        $my_shifts = User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshirt_admin);
+        $my_shifts = User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshirt_admin, $user_worklogs, $admin_user_worklog_privilege);
         if(count($my_shifts) > 0) {
             $myshifts_table = table([
                 'date'       => _('Day &amp; time'),
@@ -514,6 +555,10 @@ function User_view(
                             ),
                             glyph('cutlery') . _('Edit vouchers')
                         ) : '',
+                        $admin_user_worklog_privilege ? button(
+                            user_worklog_add_link($user_source),
+                            glyph('list') . _('Add work log')
+                        ) : '',
                         $its_me ? button(
                             page_link_to('user_settings'),
                             glyph('list-alt') . _('Settings')
diff --git a/public/index.php b/public/index.php
index af7318b1..adf22e71 100644
--- a/public/index.php
+++ b/public/index.php
@@ -22,6 +22,7 @@ $free_pages = [
     'users',
     'user_driver_licenses',
     'user_password_recovery',
+    'user_worklog'
 ];
 
 // Gewünschte Seite/Funktion
@@ -130,6 +131,9 @@ if (
             $title = shifts_title();
             $content = user_shifts();
             break;
+        case 'user_worklog':
+            list($title, $content) = user_worklogs_controller();
+            break;
         case 'user_messages':
             $title = messages_title();
             $content = user_messages();

From be3652b44aa279d7a8ae153d8038959e71eb7ecc Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Fri, 29 Dec 2017 17:30:54 +0100
Subject: [PATCH 03/12] fix work log logs

---
 db/update.sql                        | 2 +-
 includes/model/UserWorkLog_model.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/db/update.sql b/db/update.sql
index 351cf8b4..f012e319 100644
--- a/db/update.sql
+++ b/db/update.sql
@@ -51,7 +51,7 @@ ALTER TABLE `AngelTypes` ADD `show_on_dashboard` BOOLEAN NOT NULL AFTER `contact
 UPDATE `AngelTypes` SET `show_on_dashboard` = TRUE;
 
 -- Work Log
-CREATE TABLE `engelsystem`.`UserWorkLog` ( `id` INT NOT NULL AUTO_INCREMENT , `user_id` INT NOT NULL , `work_hours` DECIMAL NOT NULL , `comment` VARCHAR(200) NOT NULL , `created_user_id` INT NOT NULL , `created_timestamp` INT NOT NULL , PRIMARY KEY (`id`), INDEX (`user_id`), INDEX (`created_user_id`)) ENGINE = InnoDB;
+CREATE TABLE `UserWorkLog` ( `id` INT NOT NULL AUTO_INCREMENT , `user_id` INT NOT NULL , `work_hours` DECIMAL NOT NULL , `comment` VARCHAR(200) NOT NULL , `created_user_id` INT NOT NULL , `created_timestamp` INT NOT NULL , PRIMARY KEY (`id`), INDEX (`user_id`), INDEX (`created_user_id`)) ENGINE = InnoDB;
 ALTER TABLE `UserWorkLog` ADD FOREIGN KEY (`created_user_id`) REFERENCES `User`(`UID`) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE `UserWorkLog` ADD FOREIGN KEY (`user_id`) REFERENCES `User`(`UID`) ON DELETE CASCADE ON UPDATE CASCADE;
 ALTER TABLE `UserWorkLog` ADD INDEX(`created_timestamp`);
 INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (NULL, 'admin_user_worklog', 'Manage user work log entries.');
diff --git a/includes/model/UserWorkLog_model.php b/includes/model/UserWorkLog_model.php
index d9628e1d..55e135ca 100644
--- a/includes/model/UserWorkLog_model.php
+++ b/includes/model/UserWorkLog_model.php
@@ -23,7 +23,7 @@ function UserWorkLogsForUser($user) {
  */
 function UserWorkLog_delete($userWorkLog)
 {
-    $user_source = $userWorkLog['user_id'];
+    $user_source = User($userWorkLog['user_id']);
     $result = Db::delete("DELETE FROM `UserWorkLog` WHERE `id`=?", [
         $userWorkLog['id']
     ]);
@@ -42,7 +42,7 @@ function UserWorkLog_delete($userWorkLog)
  */
 function UserWorkLog_update($userWorkLog)
 {
-    $user_source = $userWorkLog['user_id'];
+    $user_source = User($userWorkLog['user_id']);
 
     $result = Db::update("UPDATE `UserWorkLog` SET
         `work_hours`=?,
@@ -69,7 +69,7 @@ function UserWorkLog_create($userWorkLog)
 {
     global $user;
     
-    $user_source = $userWorkLog['user_id'];
+    $user_source = User($userWorkLog['user_id']);
     
     $result = Db::insert("INSERT INTO `UserWorkLog` (
             `user_id`,

From d95e48889356eab85aff5ae7121aeb18115aef95 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Fri, 29 Dec 2017 17:37:08 +0100
Subject: [PATCH 04/12] add work log creator infor

---
 includes/view/User_view.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index b1521ff8..82df1851 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -477,7 +477,12 @@ function User_view_worklog($worklog, $admin_user_worklog_privilege) {
         'duration'   => '<b>' . $worklog['work_hours'] . ' h</b>',
         'room'       => '',
         'shift_info' => _('Work log entry'),
-        'comment'    => $worklog['comment'],
+        'comment'    => $worklog['comment'] . '<br>'
+                        . sprintf(
+                            _('Added by %s at %s'), 
+                            User_Nick_render(User($worklog['user_id'])), 
+                            date('Y-m-d H:i', $worklog['created_timestamp'])
+                        ),
         'actions'    => $actions
     ];
 }

From ee9fbda098b3c608176ced4425765e3029ca8f93 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Fri, 29 Dec 2017 18:57:11 +0100
Subject: [PATCH 05/12] add work date to work log

---
 db/update.sql                                 |  1 +
 .../controller/user_worklog_controller.php    |  6 ++
 includes/model/UserWorkLog_model.php          | 78 +++++++++++--------
 includes/model/User_model.php                 |  4 +-
 includes/pages/admin_active.php               |  8 +-
 includes/view/UserWorkLog_view.php            |  3 +-
 includes/view/User_view.php                   | 15 ++--
 7 files changed, 71 insertions(+), 44 deletions(-)

diff --git a/db/update.sql b/db/update.sql
index f012e319..56663071 100644
--- a/db/update.sql
+++ b/db/update.sql
@@ -56,3 +56,4 @@ ALTER TABLE `UserWorkLog` ADD FOREIGN KEY (`created_user_id`) REFERENCES `User`(
 ALTER TABLE `UserWorkLog` ADD INDEX(`created_timestamp`);
 INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (NULL, 'admin_user_worklog', 'Manage user work log entries.');
 ALTER TABLE `UserWorkLog` CHANGE `work_hours` `work_hours` DECIMAL(10,2) NOT NULL;
+ALTER TABLE `UserWorkLog` ADD `work_timestamp` INT NOT NULL AFTER `user_id`;
diff --git a/includes/controller/user_worklog_controller.php b/includes/controller/user_worklog_controller.php
index ba91534b..bd62c83c 100644
--- a/includes/controller/user_worklog_controller.php
+++ b/includes/controller/user_worklog_controller.php
@@ -69,6 +69,12 @@ function user_worklog_from_request($userWorkLog)
     
     $valid = true;
     
+    $userWorkLog['work_timestamp'] = parse_date('Y-m-d H:i', $request->input('work_timestamp') . ' 00:00');
+    if ($userWorkLog['work_timestamp'] == null) {
+        $valid = false;
+        error(_('Please enter work date.'));
+    }
+    
     $userWorkLog['work_hours'] = $request->input('work_hours');
     if (! preg_match("/[0-9]+(\.[0-9]+)?/", $userWorkLog['work_hours'])) {
         $valid = false;
diff --git a/includes/model/UserWorkLog_model.php b/includes/model/UserWorkLog_model.php
index 55e135ca..36442943 100644
--- a/includes/model/UserWorkLog_model.php
+++ b/includes/model/UserWorkLog_model.php
@@ -3,23 +3,32 @@ use Engelsystem\Database\Db;
 
 /**
  * Load a single work log entry.
- * @param int $user_worklog_id
+ * 
+ * @param int $user_worklog_id            
  */
-function UserWorkLog($user_worklog_id) {
-    return Db::selectOne("SELECT * FROM `UserWorkLog` WHERE `id`=?", [$user_worklog_id]);
+function UserWorkLog($user_worklog_id)
+{
+    return Db::selectOne("SELECT * FROM `UserWorkLog` WHERE `id`=?", [
+        $user_worklog_id
+    ]);
 }
 
 /**
  * Returns all work log entries for a user.
- * @param User $user
+ * 
+ * @param User $user            
  */
-function UserWorkLogsForUser($user) {
-    return Db::select("SELECT * FROM `UserWorkLog` WHERE `user_id`=? ORDER BY `created_timestamp`", [$user['UID']]);
+function UserWorkLogsForUser($user)
+{
+    return Db::select("SELECT * FROM `UserWorkLog` WHERE `user_id`=? ORDER BY `created_timestamp`", [
+        $user['UID']
+    ]);
 }
 
 /**
  * Delete a work log entry.
- * @param UserWorkLog $userWorkLog
+ * 
+ * @param UserWorkLog $userWorkLog            
  */
 function UserWorkLog_delete($userWorkLog)
 {
@@ -28,42 +37,40 @@ function UserWorkLog_delete($userWorkLog)
         $userWorkLog['id']
     ]);
     
-    engelsystem_log(sprintf('Delete work log for %s, %s hours, %s',
-        User_Nick_render($user_source),
-        $userWorkLog['work_hours'],
-        $userWorkLog['comment']));
+    engelsystem_log(sprintf('Delete work log for %s, %s hours, %s', User_Nick_render($user_source), $userWorkLog['work_hours'], $userWorkLog['comment']));
     
     return $result;
 }
 
 /**
  * Update work log entry (only work hours and comment)
- * @param UserWorkLog $userWorkLog
+ * 
+ * @param UserWorkLog $userWorkLog            
  */
 function UserWorkLog_update($userWorkLog)
 {
     $user_source = User($userWorkLog['user_id']);
-
+    
     $result = Db::update("UPDATE `UserWorkLog` SET
+        `work_timestamp`=?,
         `work_hours`=?,
         `comment`=?
         WHERE `id`=?", [
-            $userWorkLog['work_hours'],
-            $userWorkLog['comment'],
-            $userWorkLog['id']
-        ]);
-    
-    engelsystem_log(sprintf('Updated work log for %s, %s hours, %s',
-        User_Nick_render($user_source),
+        $userWorkLog['work_timestamp'],
         $userWorkLog['work_hours'],
-        $userWorkLog['comment']));
+        $userWorkLog['comment'],
+        $userWorkLog['id']
+    ]);
+    
+    engelsystem_log(sprintf('Updated work log for %s, %s hours, %s', User_Nick_render($user_source), $userWorkLog['work_hours'], $userWorkLog['comment']));
     
     return $result;
 }
 
 /**
  * Create a new work log entry
- * @param UserWorkLog $userWorkLog
+ * 
+ * @param UserWorkLog $userWorkLog            
  */
 function UserWorkLog_create($userWorkLog)
 {
@@ -73,23 +80,22 @@ function UserWorkLog_create($userWorkLog)
     
     $result = Db::insert("INSERT INTO `UserWorkLog` (
             `user_id`,
+            `work_timestamp`,
             `work_hours`,
             `comment`,
             `created_user_id`,
             `created_timestamp`
         )
-        VALUES (?, ?, ?, ?, ?)", [
-            $userWorkLog['user_id'],
-            $userWorkLog['work_hours'],
-            $userWorkLog['comment'],
-            $user['UID'],
-            time()
-        ]);
-    
-    engelsystem_log(sprintf('Added work log entry for %s, %s hours, %s',
-        User_Nick_render($user_source),
+        VALUES (?, ?, ?, ?, ?, ?)", [
+        $userWorkLog['user_id'],
+        $userWorkLog['work_timestamp'],
         $userWorkLog['work_hours'],
-        $userWorkLog['comment']));
+        $userWorkLog['comment'],
+        $user['UID'],
+        time()
+    ]);
+    
+    engelsystem_log(sprintf('Added work log entry for %s, %s hours, %s', User_Nick_render($user_source), $userWorkLog['work_hours'], $userWorkLog['comment']));
     
     return $result;
 }
@@ -101,8 +107,14 @@ function UserWorkLog_create($userWorkLog)
  */
 function UserWorkLog_new($user)
 {
+    $work_date = parse_date('Y-m-d H:i', date('Y-m-d 00:00', time()));
+    $event_config = EventConfig();
+    if (! empty($event_config['buildup_start_date'])) {
+        $work_date = parse_date('Y-m-d H:i', date('Y-m-d 00:00', $event_config['buildup_start_date']));
+    }
     return [
         'user_id' => $user['UID'],
+        'work_timestamp' => $work_date,
         'work_hours' => 0,
         'comment' => ''
     ];
diff --git a/includes/model/User_model.php b/includes/model/User_model.php
index b398cefe..5a31e7b8 100644
--- a/includes/model/User_model.php
+++ b/includes/model/User_model.php
@@ -42,8 +42,10 @@ function User_tshirt_score($user) {
         FROM `User` 
         LEFT JOIN `UserWorkLog` ON `User`.`UID` = `UserWorkLog`.`user_id`
         WHERE `User`.`UID` = ?
+        AND `UserWorkLog`.`work_timestamp` < ?
     ',[
-        $user['UID']
+        $user['UID'],
+        time()
     ]);
     
     return $result_shifts['tshirt_score'] + $result_worklog['tshirt_score'];
diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php
index 18553159..f3a28061 100644
--- a/includes/pages/admin_active.php
+++ b/includes/pages/admin_active.php
@@ -59,7 +59,8 @@ function admin_active()
                       `User`.*,
                       COUNT(`ShiftEntry`.`id`) AS `shift_count`,
                       (%s + (
-                          SELECT SUM(`work_hours`) * 3600 FROM `UserWorkLog` WHERE `user_id`=`User`.`UID`
+                          SELECT COALESCE(SUM(`work_hours`) * 3600, 0) FROM `UserWorkLog` WHERE `user_id`=`User`.`UID`
+                          AND `work_timestamp` < %s
                       )) AS `shift_length`
                   FROM `User`
                   LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID`
@@ -71,6 +72,7 @@ function admin_active()
                   %s
                 ',
                 $shift_sum_formula,
+                time(),
                 $limit
             ));
             $user_nicks = [];
@@ -143,7 +145,8 @@ function admin_active()
                 `User`.*,
                 COUNT(`ShiftEntry`.`id`) AS `shift_count`,
                 (%s + (
-                    SELECT SUM(`work_hours`) * 3600 FROM `UserWorkLog` WHERE `user_id`=`User`.`UID`
+                    SELECT COALESCE(SUM(`work_hours`) * 3600, 0) FROM `UserWorkLog` WHERE `user_id`=`User`.`UID`
+                    AND `work_timestamp` < %s
                 )) AS `shift_length`
             FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID`
             LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` '
@@ -154,6 +157,7 @@ function admin_active()
             %s
         ',
         $shift_sum_formula,
+        time(),
         $limit
     ));
     $matched_users = [];
diff --git a/includes/view/UserWorkLog_view.php b/includes/view/UserWorkLog_view.php
index 86a367ae..79c049b3 100644
--- a/includes/view/UserWorkLog_view.php
+++ b/includes/view/UserWorkLog_view.php
@@ -36,9 +36,10 @@ function UserWorkLog_edit_form($user_source, $userWorkLog)
 {
     return form([
         form_info(_('User'), User_Nick_render($user_source)),
+        form_date('work_timestamp', _('Work date'), $userWorkLog['work_timestamp'], null, time()),
         form_text('work_hours', _('Work hours'), $userWorkLog['work_hours']),
         form_text('comment', _('Comment'), $userWorkLog['comment']),
-        form_submit('submit', _('Add'))
+        form_submit('submit', _('Save'))
     ]);
 }
 
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index 82df1851..36ac36c3 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -356,7 +356,7 @@ function User_view_myshift($shift, $user_source, $its_me)
             . glyph('time') . date('H:i', $shift['start'])
             . ' - '
             . date('H:i', $shift['end']),
-        'duration'   => round(($shift['end'] - $shift['start']) / 3600, 2) . ' h',
+        'duration'   => sprintf('%.2f', round(($shift['end'] - $shift['start']) / 3600, 2)) . ' h',
         'room'       => Room_name_render($shift),
         'shift_info' => $shift_info,
         'comment'    => ''
@@ -413,7 +413,7 @@ function User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshi
     $myshifts_table = [];
     $timesum = 0;
     foreach ($shifts as $shift) {
-        $myshifts_table[] = User_view_myshift($shift, $user_source, $its_me);
+        $myshifts_table[$shift['start']] = User_view_myshift($shift, $user_source, $its_me);
 
         if (!$shift['freeloaded']) {
             $timesum += ($shift['end'] - $shift['start']);
@@ -422,15 +422,16 @@ function User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshi
 
     if($its_me || $admin_user_worklog_privilege) {
         foreach($user_worklogs as $worklog) {
-            $myshifts_table[] = User_view_worklog($worklog, $admin_user_worklog_privilege);
+            $myshifts_table[$worklog['work_timestamp']] = User_view_worklog($worklog, $admin_user_worklog_privilege);
             $timesum += $worklog['work_hours'] * 3600;
         }
     }
 
     if (count($myshifts_table) > 0) {
+        ksort($myshifts_table);
         $myshifts_table[] = [
             'date'       => '<b>' . _('Sum:') . '</b>',
-            'duration'   => '<b>' . round($timesum / 3600, 2) . ' h</b>',
+            'duration'   => '<b>' . sprintf('%.2f', round($timesum / 3600, 2)) . ' h</b>',
             'room'       => '',
             'shift_info' => '',
             'comment'    => '',
@@ -439,7 +440,7 @@ function User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshi
         if (config('enable_tshirt_size', false) && ($its_me || $tshirt_admin)) {
             $myshifts_table[] = [
                 'date'       => '<b>' . _('Your t-shirt score') . '&trade;:</b>',
-                'duration'   => '<b>' . $tshirt_score . '</b>',
+                'duration'   => '<b>' . sprintf('%.2f', $tshirt_score) . ' h</b>',
                 'room'       => '',
                 'shift_info' => '',
                 'comment'    => '',
@@ -473,8 +474,8 @@ function User_view_worklog($worklog, $admin_user_worklog_privilege) {
     }
     
     return [
-        'date'       => '',
-        'duration'   => '<b>' . $worklog['work_hours'] . ' h</b>',
+        'date'       => glyph('calendar') . date('Y-m-d', $worklog['work_timestamp']),
+        'duration'   => '<b>' . sprintf('%.2f', $worklog['work_hours']) . ' h</b>',
         'room'       => '',
         'shift_info' => _('Work log entry'),
         'comment'    => $worklog['comment'] . '<br>'

From 4579509b0e21d33ae27ecb5910fdc1d31b1e027a Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Fri, 29 Dec 2017 19:03:58 +0100
Subject: [PATCH 06/12] update german translation

---
 locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 43833 -> 44974 bytes
 locale/de_DE.UTF-8/LC_MESSAGES/default.po | 289 ++++++++++++++--------
 2 files changed, 182 insertions(+), 107 deletions(-)

diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index c4624b53bb8411153512499f37595b50d1c7dff3..3939e87019df710e0047e1cd4bfdc3c7146383f3 100644
GIT binary patch
delta 13142
zcmZ|V34Bgh{>SkviG)}qi7m)O>?9F_*lMfTms+Z+T0$a8Wzpn`CDfy>y=n`!v=vK>
z+BK-6Rckj@M%5@~v}zeuEiF~W|MSf`rpCPf_tl^G`JH?2J<C1!KFn)A_{MAFIWN!I
zGCm6&juu{yQwe_yaGX1o4~MDNaW+RfPBq+uRq$)9jyJIcmT%xVT;kNkQW%3(u@lzB
z=TWzsYu$#r-zlU&kMkFWVpLR!a-7mw1O2fH*2T8gRP-fZXkCix@Ez1ZwxJ*HM{oQB
z%ivcSgx{mu-?q75L&piGf2R_K;+$xRx}Y@%U~kk+6R<E&N8Na~H5WC|g;*3<pbOWd
zR^Ut2_1CdH1~p=m7>=4~N325s&NCG1;b_!_D^W8&h`R7FR>mJO6uqNOhhZ2@9*z~U
zJ*xd6)WAlg?(;IL!|AA%UV>$C6?!!D4{XID)DoV;l6W4qw7*~xyl?CM8k-d=i=C;j
zjp`^9wZvmlD>5C`VJ@nlJk)*H<3!xmnDy6^wrpZ9Y=as=FVu{mL3KO|^+-IZna)Mc
zXg$`z4^h|sfNFmg^~iq1viK)zg#((JfwV$h-=!(*uNe-o6)C8t$wA%lHT1y+)+MMJ
z=Aj0@2{og9)C%lF&HOVA#N*aW7)*W_wfh5N%yrQo3R<G}sAt#Hnv7xOFCqUq@9;-$
zJd2U&*UaQiF`j$~*2jI=3a_KC4{vT>+ow?ZNaO`@=A-W8IYdDh+``rv-NM|+jmnoJ
z_j1moW*E}ajJz6ZsiRQ!%~9Wnwy2dGg6c3CwHarkR&F6`=~p8w=W%vW(2{+EdKAY{
zOLq>v@h0jK+(vcu7wSgdj9Qy25Y>STYhpdrQuns!lTnW-8`W+S>i)B_wBG-f6m+Al
zxB~a0I!<`PJep)INA5-qU?%EDxu{LG6m|XQ_WViI%A7?#+DoVj+_d>0sHOK|dHw0%
ziB<tyqgJ8|>Vm$uJ`UAE0(Qd}unK;JT8Zya9bH2${T*b(JB8Yq`WWm<{v>Mi%}1@&
z`{*gyR1|c=udSJ3T`YLEsJEdxR>khfe@+H})WIzngr_kcf5D~LyPdhuuUMV@57cW~
zxxJZKd(<B2)SmU%%;Tug3=&XFJQ6kI(Wn)fglad-=8IA7R-y*F*4F2vH~ELC_kS;{
z-6yE~9YJqAjasR5?LB65T(T9nP&d4fy3p@Q)379J0A+1n71gc|Y6Tji+IK`B?1371
zADa(EwHu1s<fBoWa<a!(%tvo3R-i_@%GT#w_gcR~b^IOr;6+=16}7AHSW9#;9aTlO
zi$q-)jb7LaH9$`r3i`BmL2ahzP$Nr4J^OK}XEh5eVjhmbo#?`vv8IELs7KfhE8sI&
z2{Tb0%|^|9G3x%SjUHz^g$7g{M6JLr)JXqCeY?FongLcs4X{2I#+Ej3hZ<OK)N7iC
z8o*@K#PU!B*@BUH1nc2_)bEc|w-cX9Du$qLFbiF{3iZrBLEYdCmd88DXWS{%+2mcU
z!>|tZ<53e@g|+b{Hbkcjf6IbKs4r>;y6E3|mx4O@9Q9sb!dmFt)%@N^pa#|h>*8?K
z4Ci7duEPwh!pC7g&O)^d>u%chKz;L*ZN3C`|E=iJr}7L1c>_bRNDs55)lqqCn-9Qx
z<fBjnUV$3$9@HK=i@Nc3jKFd|%?iY#Rwe_V!o{eSxZ0ET_oGm&mwC-1F_OHg&6Cid
zJOfK(4i>>zu_(?*UBA@UuR^WNCe(_3hNbbm&2OMKwLhcKqpAE9>#v5fRFuF$SPfHA
z9nZ!=xCF=I9rVSl-e%Y5pgQniF`R?ioNroJU@7u7)*YzV@l&jfU+O~L@G5EmH&E}f
z)5mPSAk>WOpl;L<%V0ayO#5L;%s^c~0rl3*L~Y)cwtffd(Hug3Uw%ei=ecVu{QH^?
z%Asan3)P?@YJhD~Gwo!Jvp$b{6ys2PXfg)j8>stiw(de*e+V^^lNdn%&Ls+ZhIdd)
zQ>dR=LSIzJ#Zl)2QQwCURJ%}A$JJ3CMWEU>L#<d_tbtu@{YVTZAA@x4%)%0S|Cdo1
zPQ^xy#^9&*Vc<gKuL90Qd;&khhIkKo<D3Tl`DMiM*bLvtQ2f=_2RvhTeK+h({V3F<
z`xv#d$FYOn|L-a2!rF2CfM6#ai*t~BIsVUbF%HES@D%pMt^>?#_y#s2-+}e<C#--K
zo-_Atgv$G%RxS;-0-5O1Zk<FyOFaXX&&6O|h+4`GsNKCC>*7Atv%F^O@1q`p|3EXd
zVAOr8V-VIwUEdnD0$ou988ndfSA$_xl*chx8Rw#Q^Ck?$4^cBXhT1$=Q61j3`tpwI
z*#}?@RzR&(Z)}1GushyG4WRR2GtlP-v;O6%7(s<L(<`VOzh)aOLY-f2-D5q88sK%*
zOz)vKr}q$ZA3xLz24G99h1y#Q*a8=$9@z;Gg#-#k`TLWeT{>35H!ufxVpVKB)YSJ!
zCgF_25Ilhy_$xk-@x#mq>@bFrU&oplNGIBK&2c1l#&GoPq>w`4GHOJ<6U~gLpe|U7
zWpRV`09GbHjpOkSM&T%4p-5bVdOQA!`ovaGGH*$DRJ&=YmD_1@kMk*oR#g0ntuZFq
z%xnzmQOrj@vpn?1_pmT-M?c(++FS?F2alpJp0MZ7*z*@qd+8T@-iKM2)caqIf-bCx
zMKBb#$!epPIL4muiyBBAY5=LIjx+7~2{wNPwGy*!zQ_6ns-KgnfuE7|?_8ju8~%j4
z;SJO``aY_|Vmw$~P{mpkHP8suThkOZ<6fwx?T>nNiKzR!Q61-?KYCEt&p?k(<WkTF
zVG(MH*J4dCzKB?h{6wnRO!u%ldDS%2K`iRJeyEO<Q0=o(?cTyVxDRXNPpC~9oNmrH
zOK1IyQZa}MeNd87BO8ml@MWxt>rpd2j+)W8sE+@ITB#fM`~%bq`tnLt!!oE28>2RH
z9O|_ki7uRy!TRe1w3>>FxZ5^3iF)m>p*k$ZJ0pWpD;9$O=)w|M4@0pTYUXiR11H$}
zx6ws@05yOgZGP87p*|IrUNAH6jGAc{>e=R?ZkUVpa0hCIE}&*~4fSR8$uw3$4J-z=
zXWC;K?21~ML8!OjdDOr?6DX9SFcWoQ9tPlAERDNS7k-JQ@D!@!E7%8}EVD9wu?*?6
zs7I1!&9P3!lGM*fww1FISxJvm(rrGOf!4~XM^OtkpmwMkc1JzaBn-kC7=d}HnI1v4
z{|2>!=TWckWo(K**=EKqQ4{EbfqMVrDFjiGZJmL-VIJyPuSPxl^{5%Vhk8r)+Wa8u
zk$jC>sqZiluV66VLroxXlz9unQ3H4yi|hSQqo4*ksF}}4J?l+a7f)k2`i?d;iAL3@
zBA*CnAx2}NG3I;|)a#axYPZn34;ztR!)91@EbHHn!T<^#aVa*zi`WJ$^9!V3t3jwG
zU4q&)%TX(`$<}W}b-3G}|Iy|*QG2P<IP;qlffdMOQ7bcK9P6)5HHr#to+-A$V${;-
zqdMAQ{Rp+W4xk>{G1N1^h+3gvF$6>TWzr*Pf!f49QIBSbtxrV_Y~py<Uo)CV#YS9)
zdbT}ZG`qbI>QM|st-x&5-gq6=;ZoED4x>I~XHWyYi0berY9bG8?lZwGeQDJBE*=V+
z!PBVC6^|OgNYtisqh|Ud_P}|lXL=sXqBf8w5Qb_Wg->8})WF7K98O1lkbbZhooGJQ
zo=6IMcKuN^n24I;46KOrP@m8ZsJ(IwYhut#=8?6)SIB$doA?jZ%rag!zxU%%AGi&u
zmG~C*XwD)1d7PURbiqB;5*OueT8YxA8HJ)|Sli}JQ0-cyH^!oF+{NZSQG2Ejs$Cpv
zC5G7gk*F0Pg=O{rzeGVZUSwT{>Ua&R;TF_@cB5A43)Fy5U}Zdy>hOWJ@Fde=G1S09
zP&0O+He)nu^L0=?{X6|Bc;g7$AOqFmMAXP<+xk4zfHtEK?n0ga7|Y>N)a!K_)uGp9
z)2^&F#OgwA(i-T|1q~_aee8xB;ZU1rq0UdoI=B+2<Cj>lXQr5$Peffe1*_mf)PT05
zR`LjHpeL=DP>=NX6xP2Lg~C(KvucmJpbKh1eNY2PvH2_LN50tR%Te$9`!+w0dRwlb
z26P{_iAzm0AGEsIoO}eT-&NCC|40fKs3?y?Os^J(qdM+~RWSo~elB*wwWyANM=f>0
z471B?U{mtm*Z^l>Gu(ww<L}rHyS-|D)>n8aRHNb(48wn;E+{$E)OSL4Gy?13R8+ey
zn2aZI2tM%|e_O&ltc}%Xnd`b@H}WK#Z$(Y`C~EV1oZ03dkyS91iWb%Z=prA7dZurp
zej9e#{03?u0dvd>G{z|M&em}lPQC#f;%U@CO3vkfh{gfvr~a2wC_=>=tb|)oo8t%;
z!!uYKFJoc6gZ}uy*89&hyEz0kf!e4?*9ik~sLkD|O*sp-lB)`Gp8rt_+H9Ax9^OZF
zTsN1$&0rH`@XlQH#cK1-YgGr!kVl|8YKt0RA5^<IdwvK8k!N91oQ4|cJS<HA&U+M!
z;||m&J7_(NT8Z1JU0is9`R2Q@26<D|00yE~Xe8=Uy@XnUWww4N#*lx3LFn_knQ#U4
zXylO;bfdPYrR{4Q3`UJO+vXnB5-vbJstu_2pQ8qT0yWT|Q4=b<(7g9$QT^0JT_1yL
z*J~lqUmc8~g3aJ$qn7SP>m*zMDr#wSZT(`@b<3=4QP*!p?WNt=1P|K!zfc|eEHWz<
zih9Hi7P0>66k1XdgX^ppP#=iOi_O2^2cY)GBJ70+usH@VG4{gh<ga2U+>B~}2a~bJ
z8)g8rP~VGpF%m!YP|!2GhR<SgenY2X62{?m<UgnLTY6Xciv>Q1!<U*5(|(L1{}Cgw
zT%LKaV=;t00W07{^uZ;lN0WzIQO|k`TJra7#RnKlzQ@*|LoMk=Y=GBMo6WV%Jc20H
z`4*_n`Xs8O-WZJiQ5~k)JO|Z&4u)z@iz!s1;sewN<r`E7f1*ZSY`K|94J=RI7InjC
ztx2e7@5atJ9^b}8*bYampmW@aTKY;W&0Ej_%WF+LP|ytrVM$$J%_(TWFCJ<jE3CV*
z6!|x(CA^4U_!DX%*HIna#x_`t(X_*E*b-;s6L=W)?@y=LJ7%+t!<yu)kyq6@g0(PV
zm05wAm_fb<Yhd}+=ATke;5_noQSDo<F<-a@R6YyK;dUI4N3bDweV6qgO<@8B-S8Ib
zJ5Xt@S&>L|k+($sSPVpMs&P0N7ov9gZ4Ae-b^LV<pTgR>2wUJ@Y>xL(dn9JPc|Bv-
zv;JC&7pZ8CyRi=bg=$!HgBegXdXsm=BG?uEu`g<`3`Rd3iA8Y?7Q>hA`B|vVn1{N4
z8)~8-ZD9RXag2%*_^tIa>KWcbb>zR%EMYMEl80k)j7A@9i|Q~I_2KDl^Xb+FsDUlF
zuCs3Q*uoy`XQ+`LM{T+*s2h84GL}LOAOy=|HPnrpVM%O{T9MwU2@SL7UqIbw9BRT-
zQ7h(|LqSWi2(^pXVIi!`AJ?%X(VNgKsz;@xE)65mn>L$>GDKtQ8sSCi^VEo=FY$Fj
z>F+;&w8a|gOz;0Uw!+QDI)>pv;<!l*{_I5lfYNMY59R8_a>{vFoXDbFgd1)}9j_7Z
zQ(pyNMK9ti5lR%MU4j~Me4zJV#{o{%#9MfiSW0;}5k=!jLT|@v>MK%?AzYNN6FU6J
z^<mQEYGdol;vd9*>V790(54?=Bf=;b#(G%Le>y%%==g=`OmyVp2%LkRa1q`oo+I8R
z{zct+)NjUc+((om3USja`0(&0f04v(D>ASm=Y4IPg84VmNI1fXeBvZ0vvE7|CgthG
zP<ufjZ3Aq3PCG}5QiOhlbbLlMEhw2kUgo-IC~C90>~(kS`KE>J`oE?Qs2oISSAR}4
zrY?>+LU}OpJmtB#8@1E_jU@<gZn_ya5IVjh&J#tczlYnYAB)LYk2pd3H-fLP^JF3W
z{3$!#IQb(nk$8A~OJUk0`8LX<ZQdNCh`YA&BwRo|a!Y3*c^L-sPpnRSO#7nt`XusZ
zYMf5RCY)?fP%L;AOLC$9XV?kUf2Ybvj_+;Tcc}Z+*6R~H*_LBCpGo{hY$QG*x)ZlJ
zzXr<@`W|?O@kcJnID6qioI+H#c^j-n)L|fxAJbL;SmhR*7o+_M%9SyQ`;Q`YJWYII
z%O4eDj}NEf51rvyMC1~+Y48N`fapV<qRvH>$lV(j=;=VIE3uj=&siOBSXFLIxgAl7
z(8oK=o=ZfJEk`h{`<$Ca{L|LWr`&~TL_9o}aBdpOTeb~Fk8_d4m(oe1Em4n{Lfvv=
z8|7b#WyDzWLc}WKGNI!+gY!1|P0EKcme@%-gh4e%{a7axI(&!~L=mDY?JjA5=|}qm
z5*_obDxV?R5v8eHj5+pP3V!=YJ5D)W$rFeRlqcbv_%qRmxJ^V8y{IpWJ29X5f!L=l
z>%&N&CDAX(qemEZe-d>F{R}-tl%VZAJWPB@=qN{BbK(T;7Lr$`e5K&b-+v6`+^@uU
z#Ie7t9nWc!LsW+17)&F&5IVw%7l`)6&$cd&a=}3-4s`*<KPZNie`?zt$Li#lY<__A
ziE2a6Uq+mMINzM}I1{KSO!5=af~Z0CBt9fUI9H7u{X*G?s7*PRx>TYSxj(Um2qvF_
zEpaWO<9nhZ?cc{YRKf8t+UzA_C|AH*4?kIvBs!wGpouN_ATL6BDba%ROkxgkmUxM1
zO^o2&OT@$D9ED~!Z-}RCxjwEZ0(71}7E*p*7wP#oBzh^~Sj&mprs(X!t>iBfFAzFL
zT201Bp8W13b)6~SA#OiX*T6RZ7{^in1vX_6<IyvOKWdTa=x%UIk<X%GJo#J1Dq;sQ
zfVykMQ^Y6aI!fDXb0}A${148JCpHwE<)18+XHcGrWjP;8yiWcVdBnq?EZf#uOl1{&
z!<v+LaiRgP!S`@5(O+eI!Jn8!-Dku);s`O7&{3S|N!+mcI#t?Z6rQGjfY$$W3Ki(I
znr)~yjqD&+QvQe-NzAtA?^(U6(-BC1)fAnUkKALTtrJ72uW$1&@m(TXZT0*wP^e6_
zCw?bhC%z`)iHAp^Eri&*9oT^=&On#gbN-Z5Y<VT;%99_%%MWj2-9=p{<^AaCMqv!`
zG)b_X^)r+o9<3>-+WZwN>)SRuztJ{&88c{e$mZhQBlkE;xgvF~9y$LFb?-cU{$AX4
z85PBd-b65=<KM*If)bAhs}g>kyJFAVQw4lU-K(~uF8*c93#h+Ac{4GWa*s!@JzI$B
zm!zUE@d}~;<Ng_3K{T;9_`w>)xv7+Yvbp$;cG*M_<v1sQc*In%2-oP0%n`2Cj3lRR
zLc)I%S7N$5bF8Wo6I?^bx@u&(;@$k2f2F~a!hxxY?!?EM=1**L&@1<7j9;)j*_`8+
z<}R+`8JYP}&8`<JlaS(m{IV)7))n&`mXVf5hxt2V-}j0x7*9gHJ2ArPm6{lzm8iQU
zW||9=GqN+YTq)_gXBs043mXs-7B(<{Nax=JJ(`Fvbo#4Q(9{(FGnB_t*Rae)+9yOj
zUZ0StDgJML_DJ1d^_dyzNv`-|?v#x52q!K)Ej+==PaYWLQ!P1uRH7>(BVEJJ$WBUj
zxiefziEdZC%N?GToRaB|$R8cQ&DXD)E2>%Z22r_<lB?Qsqx=EMGkm)BNX%xoZ8L`^
zrns{bQ_{2I-8s&Gr>^9b^qlPB`*$ZLraK)nv)qZPsczS(jP!!%l*XS94=g#}o!cNg
zDE~of3E%Snbvp)>x_^7tuw(|~pY_12LPEAHAu;{2PIbfF>Dkrui;s%(D*4|d$d4M6
zR-#<H6gL~8t9g3ynXdTsq{N|#>G^L?j`eQU!3>=R%T9ZECc-h7^l@jWtHYEuSL~w?
za=eQP>mK>1rfn|kdGr<!mmter`Y`=}7DyvWO-yn}Jl5`!ng8#Z{ckfU9*`3opUUDS
q=FiF7>Qg;AKFiHz>DfsxRy<Q9boCAIqen?~T71DOwt4%G@Babn=?-xK

delta 12102
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
S-B7}ryJ4S)bI+DXp8o?6P0tws

diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
index eb73f2b7..7187b32c 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 20:29+0100\n"
-"PO-Revision-Date: 2017-12-27 20:29+0100\n"
+"POT-Creation-Date: 2017-12-29 19:01+0100\n"
+"PO-Revision-Date: 2017-12-29 19:03+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:247
 #: /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:700
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:759
 msgid "Angeltypes"
 msgstr "Engeltypen"
 
@@ -78,7 +78,8 @@ msgstr "ansehen"
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:124
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:138
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:387
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:485
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:465
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:547
 msgid "edit"
 msgstr "bearbeiten"
 
@@ -98,6 +99,8 @@ msgstr "bearbeiten"
 #: /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:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:16
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:470
 msgid "delete"
 msgstr "löschen"
 
@@ -306,12 +309,13 @@ msgstr "Benötigte Engel"
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:199
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:65
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:42
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:72
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:81
 #: /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:678
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:737
 msgid "Save"
 msgstr "Speichern"
 
@@ -425,7 +429,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:415
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:417
 msgid "User doesn't exist."
 msgstr "Benutzer existiert nicht."
 
@@ -540,6 +544,30 @@ msgstr "Deine Führerschein-Infos wurden gelöscht."
 msgid "Edit %s driving license information"
 msgstr "Bearbeite die Führerschein-Infos von %s"
 
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:20
+msgid "Work log entry deleted."
+msgstr "Arbeitseinsatz gelöscht."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:50
+msgid "Work log entry updated."
+msgstr "Arbeitseinsatz geändert."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:75
+msgid "Please enter work date."
+msgstr "Bitte Einsatzdatum angeben."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:81
+msgid "Please enter work hours in format ##[.##]."
+msgstr "Bitte Stunden im Format ##[.##| eingeben."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:87
+msgid "Please enter a comment."
+msgstr "Bitte Kommentar angeben."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:117
+msgid "Work log entry created."
+msgstr "Arbeitseinsatz angelegt."
+
 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:61
 msgid "You cannot delete yourself."
 msgstr "Du kannst Dich nicht selber löschen."
@@ -581,55 +609,55 @@ msgstr "Benutzer nicht gefunden."
 msgid "Enough"
 msgstr "Genug"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:275
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:277
 #: /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:299
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:301
 msgid "Token is not correct."
 msgstr "Der Token ist nicht in Ordnung."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:312
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:314
 #: /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:316
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:318
 #: /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:321
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:323
 #: /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:346
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:350
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:348
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:352
 #: /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:354
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:356
 #: /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:361
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:397
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:363
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:399
 msgid "Password recovery"
 msgstr "Passwort wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:363
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:365
 #, 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:367
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:369
 msgid "We sent an email containing your password recovery link."
 msgstr ""
 "Wir haben eine eMail mit einem Link zum Passwort-zurücksetzen geschickt."
@@ -742,65 +770,67 @@ msgid "Please enter a number of angels to be marked as active."
 msgstr ""
 "Bitte gib eine Anzahl an Engeln ein, die als Aktiv markiert werden sollen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:83
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:87
 msgid "Marked angels."
 msgstr "Engel wurden markiert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:90
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:155
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:191
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:300
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:164
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:73
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:149
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:173
 msgid "back"
 msgstr "zurück"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:92
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:96
 msgid "apply"
 msgstr "anwenden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:103
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:107
 msgid "Angel has been marked as active."
 msgstr "Engel wurde als aktiv markiert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:105
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:115
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:135
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:109
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:119
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:139
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:40
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:56
 msgid "Angel not found."
 msgstr "Engel nicht gefunden."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:117
 msgid "Angel has been marked as not active."
 msgstr "Engel wurde als nicht aktiv markiert."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:127
 msgid "Angel has got a t-shirt."
 msgstr "Engel hat ein T-Shirt bekommen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:133
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:137
 msgid "Angel has got no t-shirt."
 msgstr "Engel hat kein T-Shirt bekommen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:200
 msgid "set active"
 msgstr "setze aktiv"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:209
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:217
 msgid "remove active"
 msgstr "entferne aktiv"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:212
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:220
 msgid "got t-shirt"
 msgstr "hat t-shirt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:224
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:232
 msgid "remove t-shirt"
 msgstr "entferne t-shirt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:260
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:268
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:195
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:210
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:225
@@ -810,15 +840,15 @@ msgstr "entferne t-shirt"
 msgid "Sum"
 msgstr "Summe"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:267
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:275
 msgid "Search angel:"
 msgstr "Suche Engel:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:268
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:276
 msgid "Show all shifts"
 msgstr "Alle Schichten anzeigen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:269
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:277
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:171
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:172
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:105
@@ -828,62 +858,62 @@ msgstr "Alle Schichten anzeigen"
 msgid "Search"
 msgstr "Suche"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:272
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:280
 msgid "How much angels should be active?"
 msgstr "Wie viele Engel sollten aktiv sein?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:273
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:281
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:288
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:432
 msgid "Preview"
 msgstr "Vorschau"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:277
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:285
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:175
 msgid "Nickname"
 msgstr "Nick"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:278
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:288
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:286
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:296
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:248
 msgid "Size"
 msgstr "Größe"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:279
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:287
 #: /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:529
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:595
 msgid "Shifts"
 msgstr "Schichten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:280
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:288
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:394
 msgid "Length"
 msgstr "Länge"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:281
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:289
 msgid "Active?"
 msgstr "Aktiv?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:282
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:290
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:246
 msgid "Forced"
 msgstr "Gezwungen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:283
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:291
 msgid "T-shirt?"
 msgstr "T-Shirt?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:286
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:294
 msgid "Shirt statistics"
 msgstr "T-Shirt Statistik"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:289
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:297
 msgid "Needed shirts"
 msgstr "Benötigte T-Shirts"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:290
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:298
 msgid "Given shirts"
 msgstr "Ausgegebene T-Shirts"
 
@@ -916,7 +946,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:493
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:555
 msgid "arrived"
 msgstr "angekommen"
 
@@ -1016,7 +1046,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:659
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:718
 msgid "E-Mail"
 msgstr "E-Mail"
 
@@ -1584,12 +1614,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:676
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:735
 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:677
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:736
 msgid "Confirm password"
 msgstr "Passwort wiederholen"
 
@@ -1746,7 +1776,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:516
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:582
 msgid "Reset API key"
 msgstr "API-Key zurücksetzen"
 
@@ -1826,7 +1856,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:504
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:570
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -1936,12 +1966,12 @@ msgstr ""
 "\">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:333
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:323
 #: /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:334
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:324
 msgid "None"
 msgstr "Keine"
 
@@ -1987,6 +2017,7 @@ msgstr "Möchtest Du den Engeltypen %s löschen?"
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:106
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:135
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:191
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:13
 msgid "cancel"
 msgstr "abbrechen"
 
@@ -2341,6 +2372,7 @@ msgstr "Möchtest du den folgenden User für die Schicht eintragen?"
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:91
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:116
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:170
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:38
 msgid "User"
 msgstr "Benutzer"
 
@@ -2420,7 +2452,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:533
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:526
 msgid "Location"
 msgstr "Ort"
 
@@ -2514,6 +2546,36 @@ msgstr "7,5t LKW"
 msgid "Truck 12,5t"
 msgstr "12,5t LKW"
 
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:11
+#, php-format
+msgid "Do you want to delete the worklog entry for %s?"
+msgstr "Möchtest du den Arbeitseinsatz von %s wirklich löschen?"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:26
+msgid "Delete work log entry"
+msgstr "Arbeitseinsatz gelöscht."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:39
+msgid "Work date"
+msgstr "Einsatzdatum"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:40
+msgid "Work hours"
+msgstr "Arbeitsstunden"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:41
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:528
+msgid "Comment"
+msgstr "Kommentar"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:85
+msgid "Edit work log entry"
+msgstr "Arbeitseinsatz bearbeiten"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:93
+msgid "Add work log entry"
+msgstr "Arbeitseinsatz hinzufügen"
+
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:29
 msgid "Here you can change your user details."
 msgstr "Hier kannst Du Deine Details ändern."
@@ -2596,7 +2658,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:588
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:647
 msgid "Arrived"
 msgstr "Angekommen"
 
@@ -2609,12 +2671,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:622
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:681
 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:625
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:684
 msgid "T-Shirt"
 msgstr "T-Shirt"
 
@@ -2646,55 +2708,68 @@ msgstr "Schicht endet %c"
 msgid "sign off"
 msgstr "abmelden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:425
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:433
 msgid "Sum:"
 msgstr "Summe:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:434
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:442
 msgid "Your t-shirt score"
 msgstr "Dein T-Shirt Score"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:489
-msgid "driving license"
-msgstr "Führerschein"
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:480
+msgid "Work log entry"
+msgstr "Arbeitseinsatz"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:500
-msgid "Edit vouchers"
-msgstr "Voucher bearbeiten"
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:483
+#, php-format
+msgid "Added by %s at %s"
+msgstr "Erstellt von %s am %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:508
-msgid "iCal Export"
-msgstr "iCal Export"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:512
-msgid "JSON Export"
-msgstr "JSON Export"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:531
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:524
 msgid "Day &amp; time"
 msgstr "Day &amp; time"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:532
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:525
 msgid "Duration"
 msgstr "Dauer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:534
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:527
 msgid "Name &amp; workmates"
 msgstr "Name &amp; Kollegen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:535
-msgid "Comment"
-msgstr "Kommentar"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:536
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:529
 msgid "Action"
 msgstr "Aktion"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:539
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:532
+msgid "You have done enough to get a t-shirt."
+msgstr "Du hast genug für ein T-Shirt gemacht."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:551
+msgid "driving license"
+msgstr "Führerschein"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:562
+msgid "Edit vouchers"
+msgstr "Voucher bearbeiten"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:566
+msgid "Add work log"
+msgstr "Neuer Arbeitseinsatz"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:574
+msgid "iCal Export"
+msgstr "iCal Export"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:578
+msgid "JSON Export"
+msgstr "JSON Export"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:598
 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:544
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:603
 #, php-format
 msgid ""
 "Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some "
@@ -2703,44 +2778,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:570
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:629
 msgid "User state"
 msgstr "Engelzustand"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:590
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:649
 msgid "Not arrived"
 msgstr "Nicht angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:609
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:668
 msgid "Freeloader"
 msgstr "Schwänzer"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:616
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:675
 #, php-format
 msgid "Arrived at %s"
 msgstr "Angekommen am %s"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:620
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:679
 msgid "Active (forced)"
 msgstr "Aktiv (gezwungen)"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:629
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:688
 #, php-format
 msgid "Not arrived (Planned: %s)"
 msgstr "Nicht angekommen (Geplant: %s)"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:637
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:696
 #, 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:642
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:701
 msgid "Got no vouchers"
 msgstr "Voucher nicht bekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:657
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:716
 msgid ""
 "We will send you an e-mail with a password recovery link. Please use the "
 "email address you used for registration."
@@ -2749,19 +2824,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:660
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:719
 msgid "Recover"
 msgstr "Wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:674
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:733
 msgid "Please enter a new password."
 msgstr "Gib bitte ein neues Passwort ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:717
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:776
 msgid "Rights"
 msgstr "Rechte"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:766
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:825
 msgid ""
 "Please enter your planned date of departure on your settings page to give us "
 "a feeling for teardown capacities."
@@ -2769,7 +2844,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:782
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:841
 #, php-format
 msgid ""
 "You freeloaded at least %s shifts. Shift signup is locked. Please go to "
@@ -2778,7 +2853,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:804
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:863
 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."
@@ -2786,11 +2861,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:819
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:878
 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:834
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:893
 msgid ""
 "You need to specify a DECT phone number in your settings! If you don't have "
 "a DECT phone, just enter '-'."
@@ -2798,11 +2873,11 @@ msgstr ""
 "Bitte eine DECT-Telefonnummer in den Einstellungen eingeben. Wenn du noch "
 "keine Nummer hast, bitte einfach \"-\" angeben."
 
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:214
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:218
 msgid "No Access"
 msgstr "Kein Zugriff"
 
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:215
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:219
 msgid ""
 "You don't have permission to view this page . You probably have to sign in "
 "or register in order to gain access!"

From d66dc43aecf10e53acded391c196752444f9d70e Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Fri, 29 Dec 2017 19:08:57 +0100
Subject: [PATCH 07/12] fix worklog entry view

---
 includes/view/User_view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index 36ac36c3..4dc78f05 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -481,7 +481,7 @@ function User_view_worklog($worklog, $admin_user_worklog_privilege) {
         'comment'    => $worklog['comment'] . '<br>'
                         . sprintf(
                             _('Added by %s at %s'), 
-                            User_Nick_render(User($worklog['user_id'])), 
+                            User_Nick_render(User($worklog['created_user_id'])), 
                             date('Y-m-d H:i', $worklog['created_timestamp'])
                         ),
         'actions'    => $actions

From c961269bb718cfc5b5889af88fd12bfc86563d09 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Sat, 30 Dec 2017 12:07:10 +0100
Subject: [PATCH 08/12] better hour formatting

---
 includes/controller/users_controller.php |  2 +-
 includes/pages/admin_active.php          |  2 +-
 includes/view/PublicDashboard_view.php   |  2 +-
 includes/view/User_view.php              | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php
index c763cd48..8a325621 100644
--- a/includes/controller/users_controller.php
+++ b/includes/controller/users_controller.php
@@ -228,7 +228,7 @@ function user_controller()
     if($user_source['force_active']) {
         $tshirt_score = _('Enough');
     } else {
-        $tshirt_score = round(User_tshirt_score($user_source), 2) . ' h';
+        $tshirt_score = sprintf('%.2f', User_tshirt_score($user_source)) . '&nbsp;h';
     }
 
     return [
diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php
index f3a28061..6a9e96ce 100644
--- a/includes/pages/admin_active.php
+++ b/includes/pages/admin_active.php
@@ -182,7 +182,7 @@ function admin_active()
         $usr['nick'] = User_Nick_render($usr);
         $usr['shirt_size'] = $tshirt_sizes[$usr['Size']];
         $usr['work_time'] = round($usr['shift_length'] / 60)
-            . ' min (' . round($usr['shift_length'] / 3600) . ' h)';
+            . ' min (' . sprintf('%.2f', $usr['shift_length'] / 3600) . '&nbsp;h)';
         $usr['active'] = glyph_bool($usr['Aktiv'] == 1);
         $usr['force_active'] = glyph_bool($usr['force_active'] == 1);
         $usr['tshirt'] = glyph_bool($usr['Tshirt'] == 1);
diff --git a/includes/view/PublicDashboard_view.php b/includes/view/PublicDashboard_view.php
index 83cf0e5f..6fef8f54 100644
--- a/includes/view/PublicDashboard_view.php
+++ b/includes/view/PublicDashboard_view.php
@@ -68,7 +68,7 @@ function public_dashboard_view($stats, $free_shifts)
 function public_dashboard_shift_render($shift)
 {
     $panel_body = glyph('time') . $shift['start'] . ' - ' . $shift['end'];
-    $panel_body .= ' (' . $shift['duration'] . ' h)';
+    $panel_body .= ' (' . $shift['duration'] . '&nbsp;h)';
 
     $panel_body .= '<br>' . glyph('tasks') . $shift['shifttype_name'];
     if (!empty($shift['title'])) {
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index 4dc78f05..745bc6d5 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -356,7 +356,7 @@ function User_view_myshift($shift, $user_source, $its_me)
             . glyph('time') . date('H:i', $shift['start'])
             . ' - '
             . date('H:i', $shift['end']),
-        'duration'   => sprintf('%.2f', round(($shift['end'] - $shift['start']) / 3600, 2)) . ' h',
+        'duration'   => sprintf('%.2f', ($shift['end'] - $shift['start']) / 3600) . '&nbsp;h',
         'room'       => Room_name_render($shift),
         'shift_info' => $shift_info,
         'comment'    => ''
@@ -368,7 +368,7 @@ function User_view_myshift($shift, $user_source, $its_me)
 
     if ($shift['freeloaded']) {
         $myshift['duration'] = '<p class="text-danger">'
-            . round(-($shift['end'] - $shift['start']) / 3600 * 2, 2) . ' h'
+            . round(-($shift['end'] - $shift['start']) / 3600 * 2, 2) . '&nbsp;h'
             . '</p>';
         if (in_array('user_shifts_admin', $privileges)) {
             $myshift['comment'] .= '<br />'
@@ -431,7 +431,7 @@ function User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshi
         ksort($myshifts_table);
         $myshifts_table[] = [
             'date'       => '<b>' . _('Sum:') . '</b>',
-            'duration'   => '<b>' . sprintf('%.2f', round($timesum / 3600, 2)) . ' h</b>',
+            'duration'   => '<b>' . sprintf('%.2f', round($timesum / 3600, 2)) . '&nbsp;h</b>',
             'room'       => '',
             'shift_info' => '',
             'comment'    => '',
@@ -440,7 +440,7 @@ function User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshi
         if (config('enable_tshirt_size', false) && ($its_me || $tshirt_admin)) {
             $myshifts_table[] = [
                 'date'       => '<b>' . _('Your t-shirt score') . '&trade;:</b>',
-                'duration'   => '<b>' . sprintf('%.2f', $tshirt_score) . ' h</b>',
+                'duration'   => '<b>' . $tshirt_score . '</b>',
                 'room'       => '',
                 'shift_info' => '',
                 'comment'    => '',
@@ -475,7 +475,7 @@ function User_view_worklog($worklog, $admin_user_worklog_privilege) {
     
     return [
         'date'       => glyph('calendar') . date('Y-m-d', $worklog['work_timestamp']),
-        'duration'   => '<b>' . sprintf('%.2f', $worklog['work_hours']) . ' h</b>',
+        'duration'   => '<b>' . sprintf('%.2f', $worklog['work_hours']) . '</b>',
         'room'       => '',
         'shift_info' => _('Work log entry'),
         'comment'    => $worklog['comment'] . '<br>'

From 0314ba19e38077b62a2884985b5dd4d50e8af0b0 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Sat, 30 Dec 2017 13:37:26 +0100
Subject: [PATCH 09/12] make got t-shirt always available

---
 includes/pages/admin_active.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php
index 6a9e96ce..c9f8679d 100644
--- a/includes/pages/admin_active.php
+++ b/includes/pages/admin_active.php
@@ -200,22 +200,26 @@ function admin_active()
                 . _('set active')
                 . '</a>';
         }
-        if ($usr['Aktiv'] == 1 && $usr['Tshirt'] == 0) {
+        if ($usr['Aktiv'] == 1) {
             $parametersRemove = [
                 'not_active' => $usr['UID'],
                 'search'     => $search,
             ];
+            if ($show_all_shifts) {
+                $parametersRemove['show_all_shifts'] = 1;
+            }
+            $actions[] = '<a href="' . page_link_to('admin_active', $parametersRemove) . '">'
+                . _('remove active')
+                . '</a>';
+        }
+        if ($usr['Tshirt'] == 0) {
             $parametersShirt = [
                 'tshirt' => $usr['UID'],
                 'search' => $search,
             ];
             if ($show_all_shifts) {
-                $parametersRemove['show_all_shifts'] = 1;
                 $parametersShirt['show_all_shifts'] = 1;
             }
-            $actions[] = '<a href="' . page_link_to('admin_active', $parametersRemove) . '">'
-                . _('remove active')
-                . '</a>';
             $actions[] = '<a href="' . page_link_to('admin_active', $parametersShirt) . '">'
                 . _('got t-shirt')
                 . '</a>';

From b3ca550ed0667bf730ac44fad82f170f1ef937d2 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Sat, 30 Dec 2017 13:40:24 +0100
Subject: [PATCH 10/12] simplify t-shirt statistics

---
 includes/pages/admin_active.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php
index c9f8679d..fd657c11 100644
--- a/includes/pages/admin_active.php
+++ b/includes/pages/admin_active.php
@@ -245,12 +245,6 @@ function admin_active()
     $shirt_statistics = [];
     foreach (array_keys($tshirt_sizes) as $size) {
         if (!empty($size)) {
-            $sc = DB::selectOne(
-                'SELECT count(*) FROM `User` WHERE `Size`=? AND `Gekommen`=1',
-                [$size]
-            );
-            $sc = array_shift($sc);
-
             $gc = DB::selectOne(
                 'SELECT count(*) FROM `User` WHERE `Size`=? AND `Tshirt`=1',
                 [$size]
@@ -259,7 +253,6 @@ function admin_active()
 
             $shirt_statistics[] = [
                 'size'   => $size,
-                'needed' => (int)$sc,
                 'given'  => (int)$gc
             ];
         }
@@ -270,7 +263,6 @@ function admin_active()
 
     $shirt_statistics[] = [
         'size'   => '<b>' . _('Sum') . '</b>',
-        'needed' => '<b>' . User_arrived_count() . '</b>',
         'given'  => '<b>' . (int)$shirtCount . '</b>'
     ];
 
@@ -298,7 +290,6 @@ function admin_active()
         '<h2>' . _('Shirt statistics') . '</h2>',
         table([
             'size'   => _('Size'),
-            'needed' => _('Needed shirts'),
             'given'  => _('Given shirts')
         ], $shirt_statistics)
     ]);

From 73ed2308c1f68ec080ff06afb4312a001e4f39e2 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Sat, 30 Dec 2017 13:59:41 +0100
Subject: [PATCH 11/12] use user tshirt count

---
 includes/pages/admin_active.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php
index fd657c11..2616de6c 100644
--- a/includes/pages/admin_active.php
+++ b/includes/pages/admin_active.php
@@ -258,12 +258,11 @@ function admin_active()
         }
     }
 
-    $shirtCount = DB::selectOne('SELECT count(*) FROM `User` WHERE `Tshirt`=1');
-    $shirtCount = array_shift($shirtCount);
+    $shirtCount = User_tshirts_count();
 
     $shirt_statistics[] = [
         'size'   => '<b>' . _('Sum') . '</b>',
-        'given'  => '<b>' . (int)$shirtCount . '</b>'
+        'given'  => '<b>' . $shirtCount . '</b>'
     ];
 
     return page_with_title(admin_active_title(), [

From c83771ed6234285d05f776218ad53a47df09510c Mon Sep 17 00:00:00 2001
From: mia <miadia@users.noreply.github.com>
Date: Mon, 1 Jan 2018 16:55:59 +0000
Subject: [PATCH 12/12] Fixes #401

Display "shift started" instead of "shift starts" when shift has already started.
---
 includes/view/User_view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index 745bc6d5..2f53e641 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -299,7 +299,7 @@ function User_shift_state_render($user)
 
     if (time() < $halfway) {
         return '<span class="text-danger moment-countdown" data-timestamp="' . $nextShift['start'] . '">'
-            . _('Shift starts %c')
+            . _('Shift started %c')
             . '</span>';
     }