Test into main

zmsadmin/js/block/scope/emergencyend.js

@@ -0,0 +1,40 @@
+import $ from 'jquery'
+
+class EndEmergencyView {
+
+    constructor(element, options) {
+        this.includeUrl = options.includeurl
+        this.scope = options.scope
+        this.workstationName = "" + options.workstationname
+        this.data = {}
+        this.$ = $(element)
+
+        this.$.find('.emergency__button-end').on('click', this.endEmergency.bind(this))
+    }
+
+    endEmergency() {
+        this.update({ activated: "0", calledByWorkstation: "-1", acceptedByWorkstation: "-1" })
+        this.sendEmergencyCancel()
+    }
+
+    update(newData) {
+        this.data = Object.assign({}, this.data, newData)
+    }
+
+    sendEmergencyCancel() {
+        const url = `${this.includeUrl}/scope/${this.scope.id}/emergency/`
+
+        return new Promise((resolve, reject) => {
+            $.ajax(url, {
+                method: 'GET'
+            }).done(() => {
+                resolve()
+            }).fail(err => {
+                console.log('XHR error', url, err)
+                reject(err)
+            })
+        })
+    }
+}
+
+export default EndEmergencyView;  

zmsadmin/js/index.js

@@ -26,6 +26,7 @@ import PickupKeyboardHandheldView from "./page/pickup/keyboard-handheld"
 import StatisticView from './page/statistic'
 
 import LoginScopeSelectView from './block/scope/loginselectform'
+import EmergencyEnd from './block/scope/emergencyend'
 //import AvailabilityDayPage from './page/availabilityDay'
 import WeekCalendarPage from './page/weekCalendar'
 import printScopeAppointmentsByDay from './page/scopeAppointmentsByDay/print'
@@ -108,6 +109,10 @@ $('[data-scope-select-form]').each(function () {
     new LoginScopeSelectView(this, getDataAttributes(this));
 })
 
+$('.emergency-end').each(function () {
+    new EmergencyEnd(this, getDataAttributes(this));
+})
+
 $('.pickup-view').each(function () {
     new PickupView(this, getDataAttributes(this));
 })

zmsadmin/js/page/counter/index.js

@@ -19,18 +19,6 @@ class View extends Workstation {
             }
             this.setReloadTimer();
         }
-        window.onblur = () => {
-            //console.log("lost Focus");
-            clearTimeout(this.reloadTimer);
-        }
-        this.$main.find('[data-queue-table], [data-queue-info]').on("mouseenter", () => {
-            //console.log("stop Reload on mouse enter");
-            clearTimeout(this.reloadTimer);
-        });
-        this.$main.find('[data-queue-table], [data-queue-info]').on("mouseleave", () => {
-            //console.log("start reload on mouse leave");
-            this.setReloadTimer();
-        });
     }
 
     loadAllPartials() {

zmsadmin/js/page/workstation/index.js

@@ -83,18 +83,6 @@ class View extends BaseView {
             }
             this.setReloadTimer();
         }
-        window.onblur = () => {
-            //console.log("lost Focus");
-            clearTimeout(this.reloadTimer);
-        }
-        this.$main.find('[data-queue-table]').on("mouseenter", () => {
-            //console.log("stop Reload on mouse enter");
-            clearTimeout(this.reloadTimer);
-        });
-        this.$main.find('[data-queue-table]').on("mouseleave", () => {
-            //console.log("start reload on mouse leave");
-            this.setReloadTimer();
-        });
     }
 
     setReloadTimer() {

zmsadmin/src/Zmsadmin/QueueTable.php

@@ -50,6 +50,9 @@ public function readResponse(
 
         // data refinement
         $queueList = $processList->toQueueList(\App::$now);
+        $queueList->uasort(function ($queueA, $queueB) {
+            return $queueA->arrivalTime - $queueB->arrivalTime;
+        });
         $queueListVisible = $queueList->withStatus(['preconfirmed', 'confirmed', 'queued', 'reserved', 'deleted']);
         $queueListMissed = $queueList->withStatus(['missed']);
         $queueListParked = $queueList->withStatus(['parked']);

zmsadmin/templates/block/emergency/emergency.twig

@@ -7,10 +7,11 @@
         data-state="clear"
         data-source="">
         <h2 class="aural">Notruf</h2>
+        {% if workstation.name %}
         <button class="button button--emergency emergency__button-trigger" >
             <i class="fas fa-bell" aria-hidden="true"></i> NOTRUF
         </button>
-
+        {% endif %}
         <div class="emergency__overlay">
             <div class="block emergency__overlay-layout" role="dialog" aria-labelledby="emergency__overlay_title">
             {% embed "block/scaffholding/board.twig" with {'class': "emergency__display-box"} %} {# do NOT use class exception here! #}

zmsadmin/templates/block/process/info.twig

@@ -60,10 +60,8 @@
             </dl>
             <a class="button button--positive button--fullwidth button-finish right" href="{{ urlGet("workstationProcessFinished", {}, {}) }}" style="margin: 0.5em 0;">Fertig stellen</a>
 
-            {% if workstation.process.withAppointment %}
-                <a class="button button--default button--fullwidth button-finish right" href="{{ urlGet("workstationProcessRedirect", {}, {}) }}" style="margin: 0.5em 0;">Weiterleiten</a>
-            {% endif %}
-            <button 
+            <a class="button button--default button--fullwidth button-finish right" href="{{ urlGet("workstationProcessRedirect", {}, {}) }}" style="margin: 0.5em 0;">Weiterleiten</a>
+            <button
                 type="button" 
                 class="button button--fullwidth client-called_button-parked left" 
                 style="margin: 0.5em 0; background-color: #edc00f; border-color: #edc00f !important;"