main into next

CHANGELOG.md

@@ -1,3 +1,39 @@
+## Release Muc-20 (14.02.2025)
+
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://jira.muenchen.de/browse/ZMS-3212'>ZMS-3212</a>] -         Tresen-Notruf lässt sich nicht mehr abschalten
+</li>
+<li>[<a href='https://jira.muenchen.de/browse/ZMS-3272'>ZMS-3272</a>] -         [ZMS-Admin] Ein Slot am aktuellen Tag soll noch 5 Minuten davor buchbar sein
+</li>
+<li>[<a href='https://jira.muenchen.de/browse/ZMS-3513'>ZMS-3513</a>] -         Bürgeransicht Anzeigefehler: erste Dienstleistung wird fälschlicherweise als &#39;0x&#39; angezeigt
+</li>
+<li>[<a href='https://jira.muenchen.de/browse/ZMS-3519'>ZMS-3519</a>] -         Clusteransicht Sortierung nach Uhrzeit 
+</li>
+</ul>
+
+<h2>        Aufgabe
+</h2>
+<ul>
+<li>[<a href='https://jira.muenchen.de/browse/ZMS-3430'>ZMS-3430</a>] -         DB-Indexen erstellen
+</li>
+</ul>
+
+<h2>        Story
+</h2>
+<ul>
+<li>[<a href='https://jira.muenchen.de/browse/ZMS-3499'>ZMS-3499</a>] -         Automatisches Aktualisieren der Warteschlange mit Spontankunden
+</li>
+<li>[<a href='https://jira.muenchen.de/browse/ZMS-3503'>ZMS-3503</a>] -         Notruf über Standorteinstellugen zurücksetzen
+</li>
+<li>[<a href='https://jira.muenchen.de/browse/ZMS-3507'>ZMS-3507</a>] -         Weiterleiten von Spontankunden 
+</li>
+</ul>
+
+
+
+
 ## Release Muc-19 (17.01.2025)
 
 <h2>        Bug

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