merge into dev

it-at-m · Nov 27, 2023 · 7391608 · 7391608
2 parents b70d6ae + bd12c85
commit 7391608
Show file tree

Hide file tree

Showing 31 changed files with 1,483 additions and 378 deletions.
diff --git a/zmsadmin/js/block/calldisplay/config/index.js b/zmsadmin/js/block/calldisplay/config/index.js
@@ -321,7 +321,10 @@ class CallDisplayConfigView extends Component {
                                 { name: 'Uhrzeit, Anzahl Wartende, Wartezeit, 6-12 Aufrufe | Raum', value: 'clocknrwaitraum' },
                                 { name: '4-8 Aufrufe, nur Zahlen | Tür', value: 'rawdoor4-8' },
                                 { name: '6-18 Aufrufe | Tür', value: 'raw18door' },
-                                { name: '6-18 Aufrufe | Platz', value: 'raw18platz' }
+                                { name: '6-18 Aufrufe | Platz', value: 'raw18platz' },
+                                { name: '10 Aufrufe | Platz', value: 'default_platz' },
+                                { name: '10 Aufrufe | Tür', value: 'default_tuer' },
+                                { name: '10 Aufrufe | Raum', value: 'default_raum' }
                             ]}
                             value={this.state.template}
                             onChange={onTemplateStatusChange} />

diff --git a/zmsadmin/public/_js/index.js b/zmsadmin/public/_js/index.js
diff --git a/zmsadmin/public/_js/reactcomponents.js b/zmsadmin/public/_js/reactcomponents.js
diff --git a/zmscalldisplay/js/block/analogClock.js b/zmscalldisplay/js/block/analogClock.js
@@ -7,6 +7,22 @@ class View {
     }
 
     setClock() {
+        if (document.querySelector('.second-hand')) {
+            this.setAnalogClock();
+        }
+
+        if (document.querySelector('.digital-clock')) {
+            const now = new Date();
+
+            document.querySelector('.digital-clock').innerHTML =
+                new Intl.DateTimeFormat('de-DE', {hour: '2-digit', minute: '2-digit'}).format(now)
+
+            document.querySelector('.digital-datum').innerHTML =
+                new Intl.DateTimeFormat('de-DE', { weekday: 'long', year: 'numeric', month: '2-digit', day: '2-digit' }).format(now)
+        }
+    }
+
+    setAnalogClock() {
         const now = new Date();
 
         const secondHand = document.querySelector('.second-hand');
@@ -16,22 +32,25 @@ class View {
         const seconds = now.getSeconds();
         const secondsDegrees = ((seconds / 60) * 360) + 90;
         secondHand.style.transform = `rotate(${secondsDegrees}deg)`;
-      
+
         const mins = now.getMinutes();
         const minsDegrees = ((mins / 60) * 360) + ((seconds/60)*6) + 90;
         minsHand.style.transform = `rotate(${minsDegrees}deg)`;
-      
+
         const hour = now.getHours();
         const hourDegrees = ((hour / 12) * 360) + ((mins/60)*30) + 90;
-        hourHand.style.transform = `rotate(${hourDegrees}deg)`; 
+        hourHand.style.transform = `rotate(${hourDegrees}deg)`;
     }
 
     setDate() {
         const dateString = document.querySelector('#aufrufanzeige_Datum');
         const now = new Date();
         let options = { weekday: 'long', year: 'numeric', month: '2-digit', day: '2-digit' }
-        dateString.innerHTML = new Intl.DateTimeFormat('de-DE', options).format(now)
-    }    
+
+        if (dateString) {
+            dateString.innerHTML = new Intl.DateTimeFormat('de-DE', options).format(now)
+        }
+    }
 }
 
 export default View;
diff --git a/zmscalldisplay/public/_css/background_anzeige1.44c0eb4d.png b/zmscalldisplay/public/_css/background_anzeige1.44c0eb4d.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1.8e638d08.png b/zmscalldisplay/public/_css/background_anzeige1.8e638d08.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1.f1ed1461.png b/zmscalldisplay/public/_css/background_anzeige1.f1ed1461.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_1920.461afab7.png b/zmscalldisplay/public/_css/background_anzeige1_1920.461afab7.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_1920.af25e8eb.png b/zmscalldisplay/public/_css/background_anzeige1_1920.af25e8eb.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_1920.bc9eff88.png b/zmscalldisplay/public/_css/background_anzeige1_1920.bc9eff88.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_1920_behoerde_80.6bd6e6e7.png b/zmscalldisplay/public/_css/background_anzeige1_1920_behoerde_80.6bd6e6e7.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_1920_behoerde_80.aef875ec.png b/zmscalldisplay/public/_css/background_anzeige1_1920_behoerde_80.aef875ec.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_1920_behoerde_80.ea86ad30.png b/zmscalldisplay/public/_css/background_anzeige1_1920_behoerde_80.ea86ad30.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_behoerde_80.92ef8db0.png b/zmscalldisplay/public/_css/background_anzeige1_behoerde_80.92ef8db0.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_behoerde_80.b753a749.png b/zmscalldisplay/public/_css/background_anzeige1_behoerde_80.b753a749.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_behoerde_80.efe68ab8.png b/zmscalldisplay/public/_css/background_anzeige1_behoerde_80.efe68ab8.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_hoch.049e589c.png b/zmscalldisplay/public/_css/background_anzeige1_hoch.049e589c.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_hoch.07a7476e.png b/zmscalldisplay/public/_css/background_anzeige1_hoch.07a7476e.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_hoch.a73ccd93.png b/zmscalldisplay/public/_css/background_anzeige1_hoch.a73ccd93.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_hoch_1920.6f51f255.png b/zmscalldisplay/public/_css/background_anzeige1_hoch_1920.6f51f255.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_hoch_1920.7be93f97.png b/zmscalldisplay/public/_css/background_anzeige1_hoch_1920.7be93f97.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_hoch_1920.86f30aa9.png b/zmscalldisplay/public/_css/background_anzeige1_hoch_1920.86f30aa9.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_hoch_1920_behoerde_80.32f3f136.png b/zmscalldisplay/public/_css/background_anzeige1_hoch_1920_behoerde_80.32f3f136.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_hoch_1920_behoerde_80.50058120.png b/zmscalldisplay/public/_css/background_anzeige1_hoch_1920_behoerde_80.50058120.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_hoch_1920_behoerde_80.6d94fc72.png b/zmscalldisplay/public/_css/background_anzeige1_hoch_1920_behoerde_80.6d94fc72.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_hoch_behoerde_80.34071b8c.png b/zmscalldisplay/public/_css/background_anzeige1_hoch_behoerde_80.34071b8c.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_hoch_behoerde_80.b8f91f5d.png b/zmscalldisplay/public/_css/background_anzeige1_hoch_behoerde_80.b8f91f5d.png
diff --git a/zmscalldisplay/public/_css/background_anzeige1_hoch_behoerde_80.d15fb8a9.png b/zmscalldisplay/public/_css/background_anzeige1_hoch_behoerde_80.d15fb8a9.png
diff --git a/zmscalldisplay/public/_css/calldisplay.css b/zmscalldisplay/public/_css/calldisplay.css
diff --git a/zmscalldisplay/public/_js/index.js b/zmscalldisplay/public/_js/index.js
diff --git a/zmsslim/src/Slim/TwigExceptionHandler.php b/zmsslim/src/Slim/TwigExceptionHandler.php
@@ -58,6 +58,7 @@ public static function withHtml(
                 $logInfo = $extendedInfo;
                 unset($logInfo['responsedata']);
                 unset($logInfo['exception']);
+                unset($logInfo['workstation']);
                 //ksort($logInfo);
                 // Some error-reporting is limited to a defined amount of chars
                 // Remove unnecessary chars, for ordering see self::getExtendedExceptionInfo()