Merge pull request #55 from it-at-m/feature-1223-allow-same-seat-numbers

Feature 1223 allow same seat numbers
it-at-m · Dec 6, 2023 · 329f870 · 329f870
2 parents 8c3c146 + d95446f
commit 329f870
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/zmsapi/src/Zmsapi/WorkstationUpdate.php b/zmsapi/src/Zmsapi/WorkstationUpdate.php
@@ -26,7 +26,6 @@ public function readResponse(
         $input = Validator::input()->isJson()->assertValid()->getValue();
         $entity = new \BO\Zmsentities\Workstation($input);
         $entity->testValid();
-        Helper\User::testWorkstationAssigend($entity, $resolveReferences);
         Helper\User::testWorkstationIsOveraged($entity);
         if ($entity->getUseraccount()->id != $currentWorkstation->getUseraccount()->id) {
             throw new Exception\Workstation\WorkstationAccessFailed();

diff --git a/zmsdb/src/Zmsdb/Helper/ArchivedDataIntoStatisticByCron.php b/zmsdb/src/Zmsdb/Helper/ArchivedDataIntoStatisticByCron.php
@@ -88,8 +88,12 @@ protected function writeProcessInStatisticTable(
         $commit = false
     ) {
         $requestList = (new \BO\Zmsdb\Request())->readRequestByArchiveId($process->archiveId);
-        $requestList = ($requestList->count()) ? $requestList : [new \BO\Zmsentities\Request(['id' => '-1'])];
-        $processingTime = $requestList->count() === 1 ? $process->bearbeitungszeit : null;
+        $processingTime = null;
+        if ($requestList->count()) {
+            $processingTime = $requestList->count() === 1 ? $process->bearbeitungszeit : null;
+        } else {
+            $requestList = [new \BO\Zmsentities\Request(['id' => '-1'])];
+        }
 
         foreach ($requestList as $request) {
             $archived = true; // for verbose