Add option to show completed tasks

Author: Bernhard Schmitt

Classes/Application/Controller/BitzerController.php

@@ -57,20 +57,24 @@ final class BitzerController extends ModuleController
 
     private \DateInterval $upcomingInterval;
 
+    private bool $showCompletedTasks;
+
     public function __construct(
         Bitzer $bitzer,
         Schedule $schedule,
         AgentRepository $agentRepository,
         Translator $translator,
         TaskClassNameRepository $taskClassNameRepository,
-        string $upcomingInterval
+        string $upcomingInterval,
+        bool $showCompletedTasks
     ) {
         $this->bitzer = $bitzer;
         $this->schedule = $schedule;
         $this->agentRepository = $agentRepository;
         $this->translator = $translator;
         $this->taskClassNameRepository = $taskClassNameRepository;
         $this->upcomingInterval = new \DateInterval($upcomingInterval);
+        $this->showCompletedTasks = $showCompletedTasks;
     }
 
     public function indexAction(array $module = []): void
@@ -164,6 +168,7 @@ public function myScheduleAction(): void
         $this->view->setFusionPath('mySchedule');
         $this->view->assignMultiple([
             'groupedTasks' => $groupedTasks,
+            'completedTasks' => $this->showCompletedTasks ? $this->schedule->findCompleted(null, $agents) : null,
             'labels' => [
                 'task.scheduledTime.label' => $this->getLabel('task.scheduledTime.label'),
                 'task.actionStatus.label' => $this->getLabel('task.actionStatus.label'),

Classes/Domain/Task/Schedule.php

@@ -144,6 +144,38 @@ final public function findPastDueDueAndUpcoming(\DateInterval $upcomingInterval,
         return $groupedTasks;
     }
 
+    /**
+     * @throws DbalException
+     * @throws DriverException
+     */
+    final public function findCompleted(?TaskClassName $taskClassName = null, ?Agents $agents = null): Tasks
+    {
+        $query = 'SELECT * FROM ' . self::TABLE_NAME . '
+                    WHERE actionstatus = :actionStatusType';
+        $parameters = [
+            'actionStatusType' => ActionStatusType::TYPE_COMPLETED
+        ];
+        if ($taskClassName) {
+            $query .= ' AND classname = :taskClassName';
+            $params['taskClassName'] = $taskClassName->getValue();
+        }
+
+        if ($agents) {
+            $parameters['agentIdentifiers'] = $agents->getIdentifiers();
+            $types['agentIdentifiers'] = Connection::PARAM_STR_ARRAY;
+            $query .= ' AND agent IN (:agentIdentifiers)';
+        }
+        $query .= ' ORDER BY scheduledtime ASC';
+
+        $rawDataSet = $this->databaseConnection->executeQuery(
+            $query,
+            $parameters,
+            $types
+        )->fetchAllAssociative();
+
+        return $this->createTasksFromTableRows($rawDataSet);
+    }
+
     /**
      * @throws DriverException
      * @throws DbalException

Configuration/Objects.yaml

@@ -17,3 +17,5 @@
   arguments:
     6:
       setting: 'Sitegeist.Bitzer.upcomingInterval'
+    7:
+      setting: 'Sitegeist.Bitzer.mySchedule.showCompletedTasks'

Configuration/Settings.yaml

@@ -4,5 +4,7 @@ Sitegeist:
     factories: [] # Here task factories can be registered as $taskClassName: $taskFactoryClassName
     constraintCheckPlugins: [] # Here constraint check plugins registered as $taskClassName: {$taskFactoryClassName: $active}
     taskAutoGenerationEnabled: true # Plugins may auto generate tasks on node events if this is enabled
+    mySchedule:
+      showCompletedTasks: false
     fusion:
-      autoInclude: [] # Here auto included fusion roots can be configured as $packageKey: $active
+      autoInclude: [] # Here auto included fusion roots can be configured as $packageKey: $active

Resources/Private/Fusion/Application/MySchedule.fusion

@@ -20,6 +20,7 @@ prototype(Sitegeist.Bitzer:Application.MySchedule) < prototype(Neos.Fusion:Compo
                 <Sitegeist.Bitzer:MyScheduleTable @if.hasPastDueTasks={props.groupedTasks.pastDue} tasks={props.groupedTasks.pastDue} groupIdentifier="pastDue" />
                 <Sitegeist.Bitzer:MyScheduleTable @if.hasDueTasks={props.groupedTasks.due} tasks={props.groupedTasks.due} groupIdentifier="due" />
                 <Sitegeist.Bitzer:MyScheduleTable @if.hasUpcomingTasks={props.groupedTasks.upcoming} tasks={props.groupedTasks.upcoming} groupIdentifier="upcoming" />
+                <Sitegeist.Bitzer:CompletedTable @if.hasCompletedTasks={props.completedTasks} tasks={props.completedTasks} />
             </tbody>
         </table>
         <Sitegeist.Bitzer:ToggleScript />`
@@ -57,3 +58,27 @@ prototype(Sitegeist.Bitzer:MyScheduleTable) < prototype(Neos.Fusion:Component) {
             </tr>
         </Neos.Fusion:Collection>`
 }
+
+prototype(Sitegeist.Bitzer:CompletedTable) < prototype(Neos.Fusion:Component) {
+    tasks = ${[]}
+
+    renderer = afx`
+        <tr class="neos-folder">
+            <td class="neos-priority1" colspan="7">{q(labels).get('actionStatusType.https://schema.org/CompletedActionStatus.label')}</td>
+            <td class="neos-priority1 neos-aRight">
+                <i class="fold-toggle icon-white fas fa-chevron-up" data-toggle={'fold-tasks_completed'}></i>
+            </td>
+        </tr>
+        <Neos.Fusion:Collection collection={props.tasks} itemName="task">
+            <tr class={'fold-tasks_completed'} style="display: table-row">
+                <td><i class={'fas fa-' + task.image + ' icon-white'}></i></td>
+                <td>{Date.format(task.scheduledTime, 'Y-m-d H:i')}</td>
+                <td></td>
+                <td>{task.shortType}</td>
+                <td>{task.description}</td>
+                <td>{task.agent.label}</td>
+                <td>{task.object.label}</td>
+                <td></td>
+            </tr>
+        </Neos.Fusion:Collection>`
+}

Resources/Private/Fusion/Root.fusion

@@ -7,6 +7,7 @@ index = Sitegeist.Bitzer:Application.Index {
 
 mySchedule = Sitegeist.Bitzer:Application.MySchedule {
     groupedTasks = ${groupedTasks}
+    completedTasks = ${completedTasks}
 }
 
 schedule = Sitegeist.Bitzer:Application.Schedule {