feat(ZMS-1498): merge into main

it-at-m · Dec 18, 2023 · 0b2889c · 0b2889c
2 parents 3e69d31 + affa54f
commit 0b2889c
Showing 1 changed file with 31 additions and 0 deletions.
diff --git a/zmsadmin/src/Zmsadmin/WorkstationProcessNext.php b/zmsadmin/src/Zmsadmin/WorkstationProcessNext.php
@@ -24,6 +24,37 @@ public function readResponse(
         $validator = $request->getAttribute('validator');
         $excludedIds = $validator->getParameter('exclude')->isString()->getValue();
         $excludedIds = ($excludedIds) ? $excludedIds : '';
+
+        $selectedDateTime = \App::$now;
+        $selectedDateTime = ($selectedDateTime < \App::$now) ? \App::$now : $selectedDateTime;
+
+        $workstationRequest = new \BO\Zmsclient\WorkstationRequests(\App::$http, $workstation);
+
+        $processList = $workstationRequest->readProcessListByDate(
+            $selectedDateTime,
+            Helper\GraphDefaults::getProcess()
+        );
+
+        $filteredProcessList = new ProcessList;
+
+        foreach ($processList as $process) {
+            if ($process->status === "queued" || $process->status === "confirmed") {
+                $timeoutTimeUnix = isset($process->timeoutTime) ? $this->timeToUnix($process->timeoutTime) : null;
+                $currentTimeUnix = time();
+
+                if(!isset($process->timeoutTime)){
+                    $filteredProcessList->addEntity(clone $process);
+                } else if (isset($timeoutTimeUnix) && !($process->queue->callCount > 0 && ($currentTimeUnix - $timeoutTimeUnix) < 300)) {
+                    $filteredProcessList->addEntity(clone $process);
+                } else {                    
+                    if (!empty($excludedIds)) {
+                        $excludedIds .= ",";
+                    }                
+                    $excludedIds .= $process->queue->number;
+                }
+            }
+        }
+
         $process = (new Helper\ClusterHelper($workstation))->getNextProcess($excludedIds);
 
         if (! $process->hasId() || $process->getFirstAppointment()->date > \App::$now->getTimestamp()) {