Fix Dienstleistungsstatistik

it-at-m · Nov 30, 2023 · e3df73b · e3df73b
1 parent 495b43b
commit e3df73b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/zmsentities/src/Zmsentities/Exchange.php b/zmsentities/src/Zmsentities/Exchange.php
@@ -240,13 +240,18 @@ public function getGroupedHashSet(array $fields, array $hashfields)
         if (count($fields)) {
             $field = array_shift($fields);
             $fieldposition = $this->getPositionByName($field);
+
             foreach ($this->data as $element) {
-                if (! isset($list[$element[$fieldposition]])) {
-                    $list[$element[$fieldposition]] = clone $this;
-                    $list[$element[$fieldposition]]->data = [];
+                // Check if $fieldposition exists in $element
+                if (isset($element[$fieldposition])) {
+                    if (!isset($list[$element[$fieldposition]])) {
+                        $list[$element[$fieldposition]] = clone $this;
+                        $list[$element[$fieldposition]]->data = [];
+                    }
+                    $list[$element[$fieldposition]]->data[] = $element;
                 }
-                $list[$element[$fieldposition]]->data[] = $element;
             }
+
             foreach ($list as $key => $row) {
                 if ($row instanceof Exchange) {
                     $list[$key] = $row->getGroupedHashSet($fields, $hashfields);
@@ -256,5 +261,5 @@ public function getGroupedHashSet(array $fields, array $hashfields)
             return $this->getHashData($hashfields, true);
         }
         return $list;
-    }
+    }    
 }
diff --git a/zmsstatistic/src/Zmsstatistic/ReportRequestDepartment.php b/zmsstatistic/src/Zmsstatistic/ReportRequestDepartment.php
@@ -40,7 +40,8 @@ public function readResponse(
             ->readGetResult('/warehouse/requestdepartment/' . $this->department->id . '/'. $args['period']. '/')
             ->getEntity()
             ->toGrouped($this->groupfields, $this->hashset)
-            ->withRequestsSum();
+            ->withRequestsSum()
+            ->withAverage('processingtime');
         }
 
         $type = $validator->getParameter('type')->isString()->getValue();

diff --git a/zmsstatistic/src/Zmsstatistic/ReportRequestOrganisation.php b/zmsstatistic/src/Zmsstatistic/ReportRequestOrganisation.php
@@ -40,7 +40,8 @@ public function readResponse(
             ->readGetResult('/warehouse/requestorganisation/' . $this->organisation->id . '/'. $args['period']. '/')
             ->getEntity()
             ->toGrouped($this->groupfields, $this->hashset)
-            ->withRequestsSum();
+            ->withRequestsSum()
+            ->withAverage('processingtime');
         }
 
         $type = $validator->getParameter('type')->isString()->getValue();