Feature zmskvr 145 wartezeit statistik

zmsadmin/src/Zmsadmin/ProcessQueueReset.php

@@ -33,6 +33,11 @@ public function readResponse(
         if ($processId) {
             $selectedProcess = \App::$http->readGetResult('/process/' . $processId . '/')->getEntity();
         }
+
+        if (isset($selectedProcess->queue)) {
+            $selectedProcess->queue->arrivalTime = time();
+        }
+
         \App::$http->readPostResult('/process/status/queued/', $selectedProcess);
 
         return \BO\Slim\Render::redirect(

zmsapi/cron/cronjob.daily

@@ -10,6 +10,7 @@ set +a
 if [[ $ZMS_CRONROOT =~ ^1|on|true|yes$ ]]; then
     if [[ $ZMS_ENV =~ ^prod|dev|stage$ ]]; then
         $API config cron migrate|grep -q "$ZMS_ENV" && $BIN/migrate --update
+        $API config cron calculateDailyWaitingStatistic|grep -q "$ZMS_ENV" && $BIN/calculateDailyWaitingStatistic --commit
         $API config cron archiveStatisticData|grep -q "$ZMS_ENV" && $BIN/archiveStatisticData --commit
         $API config cron anonymizeStatisticData|grep -q "$ZMS_ENV" && $BIN/anonymizeStatisticData --commit
         $API config cron resetGhostWorkstationCount|grep -q "$ZMS_ENV" && $BIN/resetGhostWorkstationCount --commit

zmsapi/src/Zmsapi/ProcessFinished.php

@@ -47,7 +47,7 @@ public function readResponse(
             );
             (new Workstation())->writeRemovedProcess($workstation);
         } else {
-            $query->writeEntityFinished($process, \App::$now, true, $workstation->getUseraccount());
+            $query->writeEntityFinished($process, \App::$now, false, $workstation->getUseraccount());
         }
 
         if ($survey) {

zmsapi/src/Zmsapi/ProcessQueued.php

@@ -33,6 +33,12 @@ public function readResponse(
         $this->testProcessData($entity);
         $process = (new Query())->readEntity($entity['id'], $entity['authKey'], 1);
         $previousStatus = $process->status;
+        if (isset($entity->queue['waitingTime'])) {
+            $process->queue['waitingTime'] = $entity->queue['waitingTime'];
+        }
+        if (isset($entity->queue['arrivalTime'])) {
+            $process->queue['arrivalTime'] = $entity->queue['arrivalTime'];
+        }
         $process->status = 'queued';
         $process->queue['callCount'] = 0;
         $process->queue['lastCallTime'] = 0;

zmsapi/src/Zmsapi/ProcessRedirect.php

@@ -24,45 +24,25 @@ class ProcessRedirect extends BaseController
      * @SuppressWarnings(Param)
      * @return String
      */
-    public function readResponse(
-        \Psr\Http\Message\RequestInterface $request,
-        \Psr\Http\Message\ResponseInterface $response,
-        array $args
-    ) {
+    public function readResponse(\Psr\Http\Message\RequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+    {
         $workstation = (new Helper\User($request))->checkRights();
         $input = Validator::input()->isJson()->assertValid()->getValue();
         $entity = new \BO\Zmsentities\Process($input);
         $newProcess = new \BO\Zmsentities\Process($input);
         $process = $this->readValidProcess($workstation, $entity, $input, $workstation);
         $newProcess->requests = new RequestList();
-
         $this->testProcessAccess($workstation, $process);
-
         \BO\Zmsdb\Connection\Select::getWriteConnection();
         $processStatusArchived = new \BO\Zmsdb\ProcessStatusArchived();
-
         $process->status = 'finished';
-        $process = (new Query())->updateEntity(
-            $process,
-            \App::$now,
-            0,
-            'processing',
-            $workstation->getUseraccount()
-        );
+        $process = (new Query())->updateEntity($process, \App::$now, 0, 'processing', $workstation->getUseraccount());
         (new Workstation())->writeRemovedProcess($workstation);
-        $processStatusArchived->writeEntityFinished($process, \App::$now, true);
-
-        $newProcess = (new \BO\Zmsdb\Process())->redirectToScope(
-            $newProcess,
-            $process->scope,
-            $process->queue['number'] ?? $process->id,
-            $workstation->getUseraccount()
-        );
-
+        $processStatusArchived->writeEntityFinished($process, \App::$now, false);
+        $newProcess = (new \BO\Zmsdb\Process())->redirectToScope($newProcess, $process->scope, $process->queue['number'] ?? $process->id, $workstation->getUseraccount());
         $message = Response\Message::create($request);
         $message->data = $newProcess;
         $response = Render::withLastModified($response, time(), '0');
-
         return Render::withJson($response, $message->setUpdatedMetaData(), $message->getStatuscode());
     }
 
@@ -95,25 +75,14 @@ protected function readValidProcess($workstation, $entity, $input)
         if ($entity->hasProcessCredentials()) {
             $this->testProcessData($entity);
             $entity->addData($input);
-            $process = (new Query())->updateEntity(
-                $entity,
-                \App::$now,
-                0,
-                null,
-                $workstation->getUseraccount()
-            );
+            $process = (new Query())->updateEntity($entity, \App::$now, 0, null, $workstation->getUseraccount());
         } elseif ($entity->hasQueueNumber()) {
-            // Allow waitingnumbers over 1000 with the fourth parameter
+        // Allow waitingnumbers over 1000 with the fourth parameter
             $process = ProcessStatusQueued::init()
                 ->readByQueueNumberAndScope($entity['queue']['number'], $workstation->scope['id'], 0, 100000000);
             if (! $process->id) {
                 $workstation = (new \BO\Zmsdb\Workstation())->readResolvedReferences($workstation, 1);
-                $process = (new Query())->writeNewPickup(
-                    $workstation->scope,
-                    \App::$now,
-                    $entity['queue']['number'],
-                    $workstation->getUseraccount()
-                );
+                $process = (new Query())->writeNewPickup($workstation->scope, \App::$now, $entity['queue']['number'], $workstation->getUseraccount());
             }
             $process->testValid();
         } else {

zmsapi/src/Zmsapi/WorkstationProcessDelete.php

@@ -29,6 +29,9 @@ public function readResponse(
             throw new Exception\Process\ProcessNotFound();
         }
         $process = (new Query())->readEntity($workstation->process['id'], $workstation->process['authKey'], 1);
+        if ('called' == $workstation->process->status && $workstation->process->queue['callCount'] > $workstation->scope->getPreference('queue', 'callCountMax')) {
+            $process->setWasMissed(true);
+        }
         $process = (new Query())->updateEntity(
             $process,
             \App::$now,

zmsapi/src/Zmsapi/WorkstationProcessParked.php

@@ -29,9 +29,6 @@ public function readResponse(
             throw new Exception\Process\ProcessNotFound();
         }
         $process = (new Query())->readEntity($workstation->process['id'], $workstation->process['authKey'], 1);
-
-        (new \BO\Zmsdb\ExchangeWaitingscope())->updateWaitingStatistics($process, \App::$now);
-
         $previousStatus = $process->status;
         $workstation->process->setStatus("parked");
         $workstation->process->setStatusBySettings();

zmsdb/bin/calculateDailyWaitingStatistic

@@ -0,0 +1,21 @@
+#!/usr/bin/env php
+<?php
+/**
+ * calculate average waiting times for each scope, date, and hour,
+ * separated by 'spontan' vs. 'termin', and store results into wartenrstatistik.
+ */
+echo "calculateDailyWaitingStatistic: calculate average waiting times\n";
+require_once(__DIR__."/script_bootstrap.php");
+
+$verbose = in_array('--verbose', $argv);
+$commit  = in_array('--commit',  $argv);
+
+$targetDate = (new \DateTimeImmutable())->modify('-1 day');
+
+$job = new BO\Zmsdb\Helper\CalculateDailyWaitingStatisticByCron();
+
+$job->run($targetDate, $commit);
+
+if (!$commit) {
+    echo "\n[DRY RUN] Nothing was written to the database. Use --commit to persist data.\n";
+}

zmsdb/composer.json

@@ -44,6 +44,7 @@
     "bin": [
         "bin/archiveStatisticData",
         "bin/anonymizeStatisticData",
+        "bin/calculateDailyWaitingStatistic",
         "bin/calculateSlots",
         "bin/calculateDayOffList",
         "bin/deallocateAppointmentData",

zmsdb/migrations/91738315597-add-column-wasMissed-buerger.sql

@@ -0,0 +1 @@
+ALTER TABLE `buerger` ADD COLUMN `wasMissed` BOOLEAN DEFAULT FALSE;

zmsdb/migrations/91740644959-calculateDailyWaitingStatistic.sql

@@ -0,0 +1 @@
+INSERT INTO `config` SET `name` = "cron__calculateDailyWaitingStatistic", `value` = "stage,dev,test,load,prod";