drop received status from workflow, fixes #14

controllers/timesheet.php

@@ -355,7 +355,6 @@ class TimesheetController extends PluginController {
         if($timesheet){
             $timesheet->finished = false;
             $timesheet->approved = false;
-            $timesheet->received = false;
             $timesheet->complete = false;
             $timesheet->store();
             PageLayout::postMessage(MessageBox::error($this->_("Sie können diesen Stundenzettel erst wieder einsehen, wenn dieser erneut digital eingereicht wird.")));
@@ -385,29 +384,6 @@ class TimesheetController extends PluginController {
         }
     }
 
-    public function received_action($timesheet_id)
-    {
-        if ( !$this->adminrole ) {
-            throw new AccessDeniedException($this->_("Sie haben keine Zugriffsberechtigung"));
-        }
-
-        $timesheet = StundenzettelTimesheet::find($timesheet_id);
-        if($timesheet && $this->adminrole){
-            //toggle status
-            $timesheet->received = (($timesheet->getCurrentState('received', 'admin') == 'true') ? false : true);
-            $timesheet->store();
-             if ($timesheet->getCurrentState('received', 'admin') == 'true') {
-                PageLayout::postMessage(MessageBox::success($this->_("Vorliegen in Papierform bestätigt: ") . htmlready($timesheet->contract->stumi->nachname) . '/' . strftime('%B', strtotime("2020-" . $timesheet->month . "-01") )) );
-            } else {
-                PageLayout::postMessage(MessageBox::success($this->_("Bestätigung für Vorliegen in Papierform zurückgezogen.")));
-            }
-            $this->redirect('timesheet/admin_index/'. $timesheet->contract->id);
-        } else {
-            PageLayout::postMessage(MessageBox::error($this->_("Fehler: Sie sind zu dieser aktion nicht berechtigt.")));
-            $this->redirect('timesheet/index');
-        }
-    }
-
     public function complete_action($timesheet_id)
     {
         if ( !$this->adminrole ) {
@@ -431,5 +407,4 @@ class TimesheetController extends PluginController {
             $this->redirect('timesheet/index');
         }
     }
-
 }

models/StundenzettelContract.class.php

@@ -219,13 +219,6 @@ class StundenzettelContract extends \SimpleORMap
                 'waiting_tooltip' => dgettext('stundenzettel', 'Warten auf Freigabe durch verantwortliche/n Mitarbeiter/in'),
                 'overdue_tooltip' => dgettext('stundenzettel', 'Prüfung und Freigabe durch verantwortliche/n Mitarbeiter/in überfällig')
                 ),
-            'received' => array(
-                'icon' => 'inbox',
-                'true_tooltip' => dgettext('stundenzettel', 'Papierausdruck liegt unterschrieben im Sekretariat vor'),
-                'false_tooltip' => dgettext('stundenzettel', 'Papierausdruck liegt noch nicht im Sekretariat vor'),
-                'waiting_tooltip' => dgettext('stundenzettel', 'Warten auf Eintreffen das ausgedruckten Stundenzettels im Sekretariat'),
-                'overdue_tooltip' => dgettext('stundenzettel', 'Eintreffen des Papierausdrucks im Sekretariat überfällig')
-                ),
             'complete' => array(
                 'icon' => 'lock-locked',
                 'true_tooltip' => dgettext('stundenzettel', 'Vorgang abgeschlossen'),

models/StundenzettelTimesheet.class.php

@@ -53,7 +53,7 @@ class StundenzettelTimesheet extends \SimpleORMap
         };
 
         $config['additional_fields']['int_status']['get'] = function ($item) {
-            return $item->finished + $item->approved + $item->received + $item->complete ;
+            return $item->finished + $item->approved + $item->complete;
         };
 
         $config['additional_fields']['overdue']['get'] = function ($item) {
@@ -81,12 +81,8 @@ class StundenzettelTimesheet extends \SimpleORMap
                     if ($this->approved) return 'true';
                     if (!$this->approved && $this->finished) return 'waiting';
                     else return 'false';
-                case 'received':
-                    if ($this->received) return 'true';
-                    if (!$this->received && $this->overdue) return 'overdue';
-                    else return 'false';
                 case 'complete':
-                    if ($this->received) return 'true';
+                    if ($this->approved) return 'true';
                     else return 'false';
             }
         }
@@ -102,12 +98,8 @@ class StundenzettelTimesheet extends \SimpleORMap
                     if (!$this->approved && $this->finished && !$this->overdue) return 'waiting';
                     if (!$this->approved && $this->finished && $this->overdue) return 'overdue';
                     else return 'false';
-                case 'received':
-                    if ($this->received) return 'true';
-                    if (!$this->received && $this->overdue) return 'overdue';
-                    else return 'false';
                 case 'complete':
-                    if ($this->received) return 'true';
+                    if ($this->approved) return 'true';
                     else return 'false';
             }
         }
@@ -120,18 +112,13 @@ class StundenzettelTimesheet extends \SimpleORMap
                     else return 'false';
                 case 'approved':
                     if ($this->approved) return 'true';
-                    if (!$this->approved && $this->finished) return 'waiting';
+                    if (!$this->approved && $this->finished && !$this->overdue) return 'waiting';
                     if (!$this->approved && $this->finished && $this->overdue) return 'overdue';
                     else return 'false';
-                case 'received':
-                    if ($this->received) return 'true';
-                    if (!$this->received && $this->approved) return 'waiting';
-                    if (!$this->received && $this->approved && $this->overdue) return 'overdue';
-                    else return 'false';
                 case 'complete':
                     if ($this->complete) return 'true';
-                    if (!$this->complete && $this->received) return 'waiting';
-                    if (!$this->complete && $this->received && $this->overdue) return 'overdue';
+                    if (!$this->complete && $this->approved && !$this->overdue) return 'waiting';
+                    if (!$this->complete && $this->approved && $this->overdue) return 'overdue';
                     else return 'false';
             }
         }

views/timesheet/admin_index.php

@@ -39,12 +39,10 @@
                         <? if ($timesheet) : ?>
                             <?= Icon::create($status_infos['finished']['icon'], $status_infos[$timesheet->getCurrentState('finished', 'admin') . '_icon_role'], ['title' =>  $status_infos['finished'][$timesheet->getCurrentState('finished', 'admin') . '_tooltip']] )?>
                             <?= Icon::create($status_infos['approved']['icon'], $status_infos[$timesheet->getCurrentState('approved', 'admin') . '_icon_role'], ['title' =>  $status_infos['approved'][$timesheet->getCurrentState('approved', 'admin') . '_tooltip']] )?>
-                            <?= Icon::create($status_infos['received']['icon'], $status_infos[$timesheet->getCurrentState('received', 'admin') . '_icon_role'], ['title' =>  $status_infos['received'][$timesheet->getCurrentState('received', 'admin') . '_tooltip']] )?>
                             <?= Icon::create($status_infos['complete']['icon'], $status_infos[$timesheet->getCurrentState('complete', 'admin') . '_icon_role'], ['title' =>  $status_infos['complete'][$timesheet->getCurrentState('complete', 'admin') . '_tooltip']] )?>
                         <? else : ?>
                             <?= Icon::create($status_infos['finished']['icon'], Icon::ROLE_INACTIVE, ['title' => $controller->_('Stundenzettel noch nicht angelegt')])?>
                             <?= Icon::create($status_infos['approved']['icon'], Icon::ROLE_INACTIVE, ['title' =>  $controller->_('Stundenzettel noch nicht angelegt')] )?>
-                                <?= Icon::create($status_infos['received']['icon'], Icon::ROLE_INACTIVE, ['title' =>  $controller->_('Stundenzettel noch nicht angelegt')] )?>
                             <?= Icon::create($status_infos['complete']['icon'], Icon::ROLE_INACTIVE, ['title' =>  $controller->_('Stundenzettel noch nicht angelegt')] )?>
                         <? endif ?>
                     </td>
@@ -60,10 +58,6 @@
                                     <?= Icon::create('rotate-left', ['title' =>  $controller->_('Einreichen rückgängig machen')] )?>
                                 </a>
                             <? endif ?>
-                            <a href='<?=$this->controller->link_for('timesheet/received/' . $timesheet->id) ?>'
-                                title='<?= ($timesheet->received) ? $controller->_("Bestätigen für Vorliegen zurückziehen") : $controller->_("Vorliegen bestätigen") ?>' >
-                                <?= Icon::create($status_infos['received']['icon']) ?>
-                            </a>
                             <a href='<?=$this->controller->link_for('timesheet/complete/' . $timesheet->id) ?>'
                                 title='<?= ($timesheet->complete) ? $controller->_('Vorgang wieder öffnen') : $controller->_('Vorgang abschließen') ?>' >
                                 <?= Icon::create($status_infos['complete']['icon']) ?>

views/timesheet/index.php

@@ -39,7 +39,6 @@
                     <td>
                         <?= Icon::create($status_infos['finished']['icon'], $status_infos[$timesheet->getCurrentState('finished', $role) . '_icon_role'], ['title' =>  $status_infos['finished'][$timesheet->getCurrentState('finished', $role) . '_tooltip']] )?>
                         <?= Icon::create($status_infos['approved']['icon'], $status_infos[$timesheet->getCurrentState('approved', $role) . '_icon_role'], ['title' =>  $status_infos['approved'][$timesheet->getCurrentState('approved', $role) . '_tooltip']] )?>
-                        <?= Icon::create($status_infos['received']['icon'], $status_infos[$timesheet->getCurrentState('received', $role) . '_icon_role'], ['title' =>  $status_infos['received'][$timesheet->getCurrentState('received', $role) . '_tooltip']] )?>
                         <?= Icon::create($status_infos['complete']['icon'], $status_infos[$timesheet->getCurrentState('complete', $role) . '_icon_role'], ['title' =>  $status_infos['complete'][$timesheet->getCurrentState('complete', $role) . '_tooltip']] )?>
                     </td>
                     <td>
@@ -49,10 +48,6 @@
                                     <?= Icon::create('rotate-left', ['title' =>  $controller->_('Einreichen rückgängig machen')] )?>
                                 </a>
                             <? endif ?>
-                            <a href='<?=$this->controller->link_for('timesheet/received/' . $timesheet->id) ?>'
-                                title='<?= ($timesheet->received) ? $controller->_("Bestätigen für Vorliegen zurückziehen") : $controller->_("Vorliegen bestätigen") ?>' >
-                                <?= Icon::create($status_infos['received']['icon']) ?>
-                            </a>
                             <a href='<?=$this->controller->link_for('timesheet/complete/' . $timesheet->id) ?>'
                                 title='<?= ($timesheet->complete) ? $controller->_('Vorgang wieder öffnen') : $controller->_('Vorgang abschließen') ?>' >
                                 <?= Icon::create($status_infos['complete']['icon']) ?>
@@ -116,7 +111,6 @@
                         <!--
                         <?= Icon::create($status_infos['approved']['icon'], $status_infos[$timesheet->getCurrentState('approved', 'stumi') . '_icon_role'], ['title' =>  $status_infos['approved'][$timesheet->getCurrentState('approved', 'stumi') . '_tooltip']] )?>
                         -->
-                        <?= Icon::create($status_infos['received']['icon'], $status_infos[$timesheet->getCurrentState('received', 'stumi') . '_icon_role'], ['title' =>  $status_infos['received'][$timesheet->getCurrentState('received', 'stumi') . '_tooltip']] )?>
                         <?= Icon::create($status_infos['complete']['icon'], $status_infos[$timesheet->getCurrentState('complete', 'stumi') . '_icon_role'], ['title' =>  $status_infos['complete'][$timesheet->getCurrentState('complete', 'stumi') . '_tooltip']] )?>
                     </td>
                     <td>

views/timesheet/timesheet.php

@@ -235,8 +235,6 @@ use Studip\Button, Studip\LinkButton;
 
 <? if ($timesheet->is_supervisor(User::findCurrent()) && $timesheet->finished) : ?>
     <?= LinkButton::create($controller->_('Korrektheit bestätigen'), $controller->link_for('timesheet/approve/' . $timesheet->id) ) ?>
-<? elseif ($adminrole && $timesheet->finished) : ?>
-    <?= LinkButton::create($controller->_('Eingang bestätigen'), $controller->link_for('timesheet/received/' . $timesheet->id) ) ?>
 <? endif ?>
 
 <? endif ?>