Merge pull request #43 from it-at-m/mix-1498-1629

Mix 1498 1629
it-at-m · Dec 4, 2023 · 3cb62b0 · 3cb62b0
2 parents 0410aa4 + d50c3aa
commit 3cb62b0
Show file tree

Hide file tree

Showing 4 changed files with 371 additions and 32 deletions.
diff --git a/zmsadmin/public/_js/reactcomponents.js b/zmsadmin/public/_js/reactcomponents.js
diff --git a/zmsadmin/src/Zmsadmin/WorkstationProcessPreCall.php b/zmsadmin/src/Zmsadmin/WorkstationProcessPreCall.php
@@ -23,8 +23,7 @@ public function readResponse(
         $workstation = \App::$http->readGetResult('/workstation/', ['resolveReferences' => 2])->getEntity();
         $processId = Validator::value($args['id'])->isNumber()->getValue();
         $process = \App::$http->readGetResult('/process/'. $processId .'/')->getEntity();
-
-        $excludedIds = $validator->getParameter('exclude')->isString()->setDefault('')->getValue();       
+        $excludedIds = $validator->getParameter('exclude')->isString()->setDefault('')->getValue();
         if ($excludedIds) {
             $exclude = explode(',', $excludedIds);
         }

diff --git a/zmsapi/src/Zmsapi/WorkstationProcessDelete.php b/zmsapi/src/Zmsapi/WorkstationProcessDelete.php
@@ -26,6 +26,8 @@ public function readResponse(
         if (! $workstation->process['id']) {
             throw new Exception\Process\ProcessNotFound();
         }
+        $process = (new Query())->readEntity($workstation->process['id'], $workstation->process['authKey'], 1);
+        $process = (new Query())->updateEntity($process, \App::$now, 0, $process->status);
         $workstation->process->setStatusBySettings();
         (new Workstation)->writeRemovedProcess($workstation);
         unset($workstation->process);

diff --git a/zmsdb/src/Zmsdb/Query/Process.php b/zmsdb/src/Zmsdb/Query/Process.php
@@ -794,12 +794,14 @@ protected function addProcessingTimeData($process, \DateTimeInterface $dateTime)
     {
         $data = array();
 
-        if ($process->status == 'processing') { 
-            $data['showUpTime'] = $dateTime->format('Y-m-d H:i:s'); 
-        } 
-
-        if ($process->status == 'finished') { 
-            $data['finishTime'] = $dateTime->format('Y-m-d H:i:s'); 
+        if (isset($previousStatus) && ($process->status == 'called' && $previousStatus == 'called')) {
+            $data['timeoutTime'] = $dateTime->format('Y-m-d H:i:s');
+        } else if (isset($previousStatus) && ($process->status == 'processing' && $previousStatus == 'processing')) {
+            $data['timeoutTime'] = $dateTime->format('Y-m-d H:i:s');
+        } else if ($process->status == 'processing') {
+            $data['showUpTime'] = $dateTime->format('Y-m-d H:i:s');
+        } else if ($process->status == 'finished') {
+            $data['finishTime'] = $dateTime->format('Y-m-d H:i:s');
         }
 
         $this->addValues($data);