Merge pull request #39 from it-at-m/feature-1498-wiederaufruf-erst-na…

…ch-5-minuten-patch Feature 1498 wiederaufruf erst nach 5 minuten patch
it-at-m · Dec 4, 2023 · b4319a7 · b4319a7
2 parents 8f619b9 + affa54f
commit b4319a7
Show file tree

Hide file tree

Showing 23 changed files with 221 additions and 397 deletions.
diff --git a/zmsadmin/js/block/calldisplay/config/index.js b/zmsadmin/js/block/calldisplay/config/index.js
@@ -48,6 +48,7 @@ class CallDisplayConfigView extends Component {
             webtemplate: 'defaultplatz',
             hmac: '',
             enableQrCode: false,
+            twoDisplays: false,
             showQrCode: false
         }
 
@@ -73,9 +74,9 @@ class CallDisplayConfigView extends Component {
         return document.location.origin;
     }
 
-    buildCalldisplayUrl() {
+    buildCalldisplayUrl(displayNumber = 1) {
         const baseUrl  = this.props.config.calldisplay.baseUrl
-        let parameters = this.buildParameters(false);
+        let parameters = this.buildParameters(false, 'calldisplay', displayNumber);
 
         return `${this.buildHost()}${baseUrl}?${parameters.join('&')}`
     }
@@ -87,7 +88,7 @@ class CallDisplayConfigView extends Component {
         return `${this.buildHost()}${baseUrl}?${parameters.join('&')}`
     }
 
-    buildParameters(hashParameters, target = 'calldisplay') {
+    buildParameters(hashParameters, target = 'calldisplay', displayNumber = 1) {
         const collections = this.getSelectedItemsCollection(this.state)
         let queryParts = []
 
@@ -115,6 +116,10 @@ class CallDisplayConfigView extends Component {
             queryParts.push(`qrcode=1`)
         }
 
+        if (! hashParameters && this.state.twoDisplays) {
+            queryParts.push(`display=` + displayNumber)
+        }
+
         if (hashParameters) {
             queryParts.push(`hmac=${this.state.hmac}`)
         }
@@ -229,6 +234,22 @@ class CallDisplayConfigView extends Component {
         )
     }
 
+    renderTwoDisplays() {
+        const onChange = () => {
+            this.setState({
+                twoDisplays: !this.state.twoDisplays
+            });
+        }
+        return (
+            <fieldset>
+                <legend className="label">2 Aufrufanzeige</legend>
+                <div key="twoDisplays" className="form-check ticketprinter-config__item">
+                    {this.renderCheckbox(this.state.twoDisplays, onChange, "2 Aufrufanzeige erstellen")}
+                </div>
+            </fieldset>
+        )
+    }
+
     renderScopes(scopes) {
         if (scopes.length > 0) {
             return (
@@ -267,6 +288,7 @@ class CallDisplayConfigView extends Component {
 
     render() {
         const calldisplayUrl = this.buildCalldisplayUrl()
+        const calldisplayUrl2 = this.buildCalldisplayUrl(2)
         const webcalldisplayUrl = this.buildWebcalldisplayUrl()
 
         const onQueueStatusChange = (_, value) => {
@@ -291,6 +313,7 @@ class CallDisplayConfigView extends Component {
             <form className="form--base form-group calldisplay-config">
                 {this.state.departments.map(this.renderDepartment.bind(this))}
                 {this.renderQrCodeEnabled()}
+                {this.renderTwoDisplays()}
                 <FormGroup>
                     <Label 
                         attributes={{ "htmlFor": "visibleCalls" }} 
@@ -331,7 +354,10 @@ class CallDisplayConfigView extends Component {
                     </Controls>
                 </FormGroup>
                 <FormGroup>
-                    <Label attributes={{ "htmlFor": "calldisplayUrl" }} value="URL"></Label>
+                    { this.state.twoDisplays ?
+                    <Label attributes={{ "htmlFor": "calldisplayUrl" }} value="URL Anzeige 1"></Label>
+                        :
+                    <Label attributes={{ "htmlFor": "calldisplayUrl" }} value="URL"></Label> }
                     <Controls>
                         <Inputs.Text
                             value={calldisplayUrl}
@@ -342,6 +368,23 @@ class CallDisplayConfigView extends Component {
                     <a href={calldisplayUrl} target="_blank" rel="noopener noreferrer" className="button button-submit"><i className="fas fa-external-link-alt"></i> Aktuelle Konfiguration in einem neuen Fenster öffnen</a>
                 </div>
 
+
+                { this.state.twoDisplays ?
+                <div className="firstDisplay">
+                    <FormGroup>
+                        <Label attributes={{ "htmlFor": "calldisplayUrl2" }} value="URL Anzeige 2"></Label>
+                        <Controls>
+                            <Inputs.Text
+                                value={calldisplayUrl2}
+                                attributes={{ readOnly: true, id: "calldisplayUrl2" }} />
+                        </Controls>
+                    </FormGroup>
+                    <div className="form-actions">
+                        <a href={calldisplayUrl2} target="_blank" rel="noopener noreferrer" className="button button-submit"><i className="fas fa-external-link-alt"></i> Aktuelle Konfiguration in einem neuen Fenster öffnen</a>
+                    </div>
+                </div>
+                    : null }
+
                 <FormGroup>
                     <Label attributes={{ "htmlFor": "webcalldisplayLayout" }} value="Layout mobile Aufrufanzeige"></Label>
                     <Controls>

diff --git a/zmsadmin/public/_css/admin.css b/zmsadmin/public/_css/admin.css
diff --git a/zmsadmin/public/_css/admin.css.map b/zmsadmin/public/_css/admin.css.map
diff --git a/zmsadmin/public/_js/reactcomponents.js b/zmsadmin/public/_js/reactcomponents.js
diff --git a/zmsadmin/public/_js/reactcomponents.js.map b/zmsadmin/public/_js/reactcomponents.js.map
diff --git a/zmsadmin/src/Zmsadmin/WorkstationProcessNext.php b/zmsadmin/src/Zmsadmin/WorkstationProcessNext.php
@@ -47,7 +47,7 @@ public function readResponse(
         $filteredProcessList = new ProcessList;
 
         foreach ($processList as $process) {
-            if ($process->status === "queued") {
+            if ($process->status === "queued" || $process->status === "confirmed") {
                 $timeoutTimeUnix = isset($process->timeoutTime) ? $this->timeToUnix($process->timeoutTime) : null;
                 $currentTimeUnix = time();
 

diff --git a/zmscalldisplay/public/_css/calldisplay.css b/zmscalldisplay/public/_css/calldisplay.css
diff --git a/zmscalldisplay/public/_css/calldisplay.css.map b/zmscalldisplay/public/_css/calldisplay.css.map
diff --git a/zmscalldisplay/scss/block/aufrufanzeige.scss b/zmscalldisplay/scss/block/aufrufanzeige.scss
@@ -144,6 +144,14 @@
     background: #F2F6FA;
 }
 
+#display_number {
+    position: fixed;
+    bottom: 20px;
+    right: 54px;
+    font-size: 28px;
+    font-weight: bold;
+}
+
 #infoicon {
     background: url(img/info-icon.svg) top left no-repeat;
     width: 21px;

diff --git a/zmscalldisplay/src/Zmscalldisplay/Index.php b/zmscalldisplay/src/Zmscalldisplay/Index.php
@@ -30,7 +30,7 @@ public function readResponse(
         $validator = $request->getAttribute('validator');
         $defaultTemplate = $validator->getParameter("template")
             ->isPath()
-            ->setDefault('defaultplatz')
+            ->setDefault('default_platz')
             ->getValue();
 
         $calldisplayHelper = (new Helper\Calldisplay($request));
@@ -42,6 +42,7 @@ public function readResponse(
         $calldisplay = $calldisplayHelper->getEntity();
 
         $template = (new Helper\TemplateFinder($defaultTemplate))->setCustomizedTemplate($calldisplay);
+        $parameters['displayNumber'] = $request->getParam('display') ?? null;
 
         return \BO\Slim\Render::withHtml(
             $response,

diff --git a/zmscalldisplay/src/Zmscalldisplay/Queue.php b/zmscalldisplay/src/Zmscalldisplay/Queue.php
@@ -23,6 +23,7 @@ public function readResponse(
         array $args
     ) {
         $validator = $request->getAttribute('validator');
+        $displayNumber = $validator->getParameter('display')->isNumber()->getValue();
 
         $calldisplay = new Helper\Calldisplay($request);
 
@@ -32,16 +33,24 @@ public function readResponse(
             ])
             ->getCollection();
 
+        $queueList = ($queueList) ?
+            $queueList->withStatus($calldisplay::getRequestedQueueStatus($request)) :
+            new \BO\Zmsentities\Collection\QueueList();
+
+        if ($displayNumber === 1) {
+            $queueList = $queueList->chunk(10)[0];
+        } else if ($displayNumber === 2) {
+            $queueList = $queueList->chunk(10)[1] ?? new \BO\Zmsentities\Collection\QueueList();
+        }
+
         return Render::withHtml(
             $response,
             'block/queue/queueTable.twig',
             array(
                 'tableSettings' => $validator->getParameter('tableLayout')->isArray()->getValue(),
                 'calldisplay' => $calldisplay->getEntity(false),
                 'scope' => $calldisplay->getSingleScope(),
-                'queueList' => ($queueList) ?
-                    $queueList->withStatus($calldisplay::getRequestedQueueStatus($request)) :
-                    new \BO\Zmsentities\Collection\QueueList()
+                'queueList' => $queueList
             )
         );
     }

diff --git a/zmscalldisplay/templates/page/customized/base.twig b/zmscalldisplay/templates/page/customized/base.twig
@@ -46,6 +46,12 @@
 <div class="aufrufanzeige_text">
 	{% include "block/marginal/infoColumn.twig" %}
 </div>
+
+    {% if displayNumber %}
+        <div id="display_number">
+            {{ displayNumber }}/2
+        </div>
+    {% endif %}
 {% endblock %}
 
 {% block tableLayoutSettings %}

diff --git a/zmscalldisplay/templates/page/customized/default_platz.twig b/zmscalldisplay/templates/page/customized/default_platz.twig
@@ -30,6 +30,9 @@ window.bo.zmscalldisplay.queue.timeWaitingInfo = 20;
 window.bo.zmscalldisplay.queue.showOnlyNumeric = false;
 // Seconds to reload table
 window.bo.zmscalldisplay.reloadInterval = 5;
+{% if displayNumber %}
+window.bo.zmscalldisplay.display = {{ displayNumber }};
+{% endif %}
 </script>
 {% endblock %}
 
diff --git a/zmscalldisplay/templates/page/customized/default_raum.twig b/zmscalldisplay/templates/page/customized/default_raum.twig
@@ -30,6 +30,9 @@ window.bo.zmscalldisplay.queue.timeWaitingInfo = 20;
 window.bo.zmscalldisplay.queue.showOnlyNumeric = false;
 // Seconds to reload table
 window.bo.zmscalldisplay.reloadInterval = 5;
+{% if displayNumber %}
+window.bo.zmscalldisplay.display = {{ displayNumber }};
+{% endif %}
 </script>
 {% endblock %}
 
diff --git a/zmscalldisplay/templates/page/customized/default_tuer.twig b/zmscalldisplay/templates/page/customized/default_tuer.twig
@@ -30,6 +30,9 @@ window.bo.zmscalldisplay.queue.timeWaitingInfo = 20;
 window.bo.zmscalldisplay.queue.showOnlyNumeric = false;
 // Seconds to reload table
 window.bo.zmscalldisplay.reloadInterval = 5;
+{% if displayNumber %}
+window.bo.zmscalldisplay.display = {{ displayNumber }};
+{% endif %}
 </script>
 {% endblock %}
 
diff --git a/zmsentities/src/Zmsentities/Collection/Base.php b/zmsentities/src/Zmsentities/Collection/Base.php
@@ -273,4 +273,21 @@ public function withResolveLevel($resolveLevel)
         }
         return $collection;
     }
+
+    public function chunk($length)
+    {
+        $chunks = [new static()];
+        $id = 0;
+        foreach ($this as $entry) {
+            if (! isset($chunks[floor($id / $length)])) {
+                $chunks[floor($id / $length)] = new static();
+            }
+
+            $chunks[floor($id / $length)][] = $entry;
+
+            $id++;
+        }
+
+        return $chunks;
+    }
 }
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/Download/WaitingReport.php b/zmsstatistic/src/Zmsstatistic/Download/WaitingReport.php
@@ -15,11 +15,11 @@
 class WaitingReport extends Base
 {
     protected $reportParts = [
-        'waitingcalculated' => 'maximal berechnetet Wartezeit Spontankunde',
-        'waitingcount' => 'maximal Wartende Spontankunde',
-        'waitingtime' => 'maximal gemessene Wartezeit Spontankunde',
-        'waitingcount_termin' => 'maximal Wartende Terminkunde',
-        'waitingtime_termin' => 'maximal gemessene Wartezeit Terminkunde'
+        'waitingcalculated' => 'maximal berechnete Wartezeit Spontankunden',
+        'waitingcount' => 'maximal Wartende Spontankunden',
+        'waitingtime' => 'maximal gemessene Wartezeit Spontankunden',
+        'waitingcount_termin' => 'maximal Wartende Terminkunden',
+        'waitingtime_termin' => 'maximal gemessene Wartezeit Terminkunden'
     ];
 
     /**
@@ -81,8 +81,8 @@ public function writeTotals(ReportEntity $report, $sheet)
     {
         $entity = clone $report;
         $totals = array_pop($entity->data);
-        $reportTotal['max'][] = 'Tagesmaximum Spontantkunde';
-        $reportTotal['average'][] = 'Tagesdurchschnitt Spontantkunde';
+        $reportTotal['max'][] = 'Tagesmaximum Spontankunden';
+        $reportTotal['average'][] = 'Tagesdurchschnitt Spontankunden';
         $reportTotal['max'][] = $totals['max_waitingtime'];
         $reportTotal['average'][] = $totals['average_waitingtime'];
         foreach ($entity->data as $entry) {
@@ -91,8 +91,8 @@ public function writeTotals(ReportEntity $report, $sheet)
         }
         $sheet->fromArray($reportTotal, null, 'A'. ($sheet->getHighestRow() + 1));
 
-        $reportTotal2['max'][] = 'Tagesmaximum Terminkunde';
-        $reportTotal2['average'][] = 'Tagesdurchschnitt Terminkunde';
+        $reportTotal2['max'][] = 'Tagesmaximum Terminkunden';
+        $reportTotal2['average'][] = 'Tagesdurchschnitt Terminkunden';
         $reportTotal2['max'][] = $totals['max_waitingtime_termin'];
         $reportTotal2['average'][] = $totals['average_waitingtime_termin'];
         foreach ($entity->data as $entry) {

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();

diff --git a/zmsstatistic/src/Zmsstatistic/ReportWaitingDepartment.php b/zmsstatistic/src/Zmsstatistic/ReportWaitingDepartment.php
@@ -15,7 +15,9 @@ class ReportWaitingDepartment extends BaseController
     protected $hashset = [
         'waitingcount',
         'waitingtime',
-        'waitingcalculated'
+        'waitingcalculated',
+        'waitingcount_termin',
+        'waitingtime_termin'
     ];
 
     protected $groupfields = [
@@ -44,6 +46,9 @@ public function readResponse(
             ->toGrouped($this->groupfields, $this->hashset)
             ->withMaxByHour($this->hashset)
             ->withMaxAndAverageFromWaitingTime();
+
+            $exchangeWaiting = $this->withMaxAndAverageFromWaitingTime($exchangeWaiting, 'waitingtime');
+            $exchangeWaiting = $this->withMaxAndAverageFromWaitingTime($exchangeWaiting, 'waitingtime_termin');
         }
 
         $type = $validator->getParameter('type')->isString()->getValue();
@@ -73,4 +78,28 @@ public function readResponse(
             )
         );
     }
+
+
+    public function withMaxAndAverageFromWaitingTime($entity, $targetKey)
+    {
+        foreach ($entity->data as $date => $dateItems) {
+            $maxima = 0;
+            $total = 0;
+            $count = 0;
+            foreach ($dateItems as $hourItems) {
+                if (is_array($hourItems)) { // Check if $hourItems is an array
+                    foreach ($hourItems as $key => $value) {
+                        if (is_numeric($value) && $targetKey == $key && 0 < $value) {
+                            $total += $value;
+                            $count += 1;
+                            $maxima = ($maxima > $value) ? $maxima : $value;
+                        }
+                    }
+                }
+            }
+            $entity->data[$date]['max_' . $targetKey] = $maxima;
+            $entity->data[$date]['average_' . $targetKey] = (! $total || ! $count) ? 0 : floor($total / $count);
+        }
+        return $entity;
+    }
 }