Merge pull request #88 from it-at-m/feature-1629-adjust-calldisplay

feat(ZMS-1629-1804): adjust call display
it-at-m · Dec 21, 2023 · b393418 · b393418
2 parents 22bc286 + 0f0a469
commit b393418
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 50 deletions.
diff --git a/zmsadmin/templates/block/scope/form.twig b/zmsadmin/templates/block/scope/form.twig
@@ -808,6 +808,7 @@
                             "parameter": {
                                 "name": "preferences[queue][callDisplayText]",
                                 "id": "aufrufanzeigetext",
+                                "maxlength": 120,
                                 "value": scope.preferences.queue.callDisplayText|default('Herzlich Willkommen'),
                             }
                         }]

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/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/public/_js/index.js b/zmscalldisplay/public/_js/index.js
diff --git a/zmscalldisplay/public/_js/index.js.map b/zmscalldisplay/public/_js/index.js.map
diff --git a/zmscalldisplay/scss/block/aufrufanzeige.scss b/zmscalldisplay/scss/block/aufrufanzeige.scss
@@ -135,7 +135,8 @@
 .aufrufanzeige .infotext
 {
     top: 77px;
-    position: absolute;
+    left: 0;
+    position: fixed;
     padding: 10px 40px;
     font-size:2em;
     font-weight:normal;

diff --git a/zmscalldisplay/scss/block/tabellen.scss b/zmscalldisplay/scss/block/tabellen.scss
@@ -38,7 +38,7 @@ div.aufrufanzeige_anzeigebereich_zweizeilig
     border-top: 3px solid $borderLight;
     color: $white;
     font-size: 36px;
-    font-family: Arial, sans-serif;
+    font-family: Roboto Condensed, Arial, sans-serif;
     font-weight: bold;
     line-height: 45px;
     text-align:center;
@@ -55,7 +55,7 @@ div.aufrufanzeige_anzeigebereich_zweizeilig
     border-top: 3px solid $borderLight;
     /*font-size: 70px;
     line-height: 108px;*/
-    font-family: Arial, sans-serif;
+    font-family: Roboto Condensed, Arial, sans-serif;
     font-weight: bold;
     text-align: left;
     padding:8px 0px;

diff --git a/zmscalldisplay/src/Zmscalldisplay/Queue.php b/zmscalldisplay/src/Zmscalldisplay/Queue.php
@@ -47,8 +47,9 @@ public function readResponse(
             $response,
             'block/queue/queueTable.twig',
             array(
+                'text' => 'asdsadsa',
                 'tableSettings' => $validator->getParameter('tableLayout')->isArray()->getValue(),
-                'calldisplay' => $calldisplay->getEntity(false),
+                'calldisplay' => $calldisplay->getEntity(true),
                 'scope' => $calldisplay->getSingleScope(),
                 'queueList' => $queueList
             )

diff --git a/zmscalldisplay/templates/block/queue/queueTable.twig b/zmscalldisplay/templates/block/queue/queueTable.twig
@@ -1,3 +1,17 @@
+{% set text = '' %}
+{% if calldisplay.clusters|length == 1 and calldisplay.clusters|first.callDisplayText %}
+    {% set text = calldisplay.clusters|first.callDisplayText|raw|nl2br %}
+{% elseif calldisplay.scopes|length == 1 and calldisplay.scopes|first.preferences.queue.callDisplayText%}
+    {% set text = calldisplay.scopes|first.preferences.queue.callDisplayText|raw|nl2br %}
+{% endif %}
+
+{% if text %}
+    <div class="infotext">
+        <span id="infoicon"></span>
+        <div class="infotext-content">{{ text }}</div>
+    </div>
+{% endif %}
+
 {% block queueTable %}
     {% if tableSettings.multiColumns == 1 %}
         {% include "block/queue/table/oneColumn.twig" with {"settings": tableSettings} %}

diff --git a/zmscalldisplay/templates/element/queueTable/leftCol.twig b/zmscalldisplay/templates/element/queueTable/leftCol.twig
@@ -1,14 +1,5 @@
 <td class="rechterRand wartenummer" data-callTime="{{ queue.callTime }}">
 	<div class="highlight {{ queue.status }}">
-        {% if queue.withAppointment %}
-			{% if queue.number|length == 7 %}
-				{% set addClass = " smallerFont7Chars" %}
-			{% elseif queue.number|length == 8 %}
-				{% set addClass = " smallerFont8Chars" %}
-			{% endif %}
-			<span class="terminkundennummer{{ addClass }}" data-appointment="{{ queue.number }}" data-status="{{ queue.status }}">{{ queue.number }}</span>
-		{% else %}
-		    <span class="wartenummer" data-appointment="{{ queue.number }}" data-status="{{ queue.status }}">{{ queue.number }}</span>
-		{% endif %}
+		<span class="terminkundennummer" data-appointment="{{ queue.number }}" data-status="{{ queue.status }}">{{ queue.number }}</span>
 	</div>
 </td>
diff --git a/zmscalldisplay/templates/page/customized/base.twig b/zmscalldisplay/templates/page/customized/base.twig
@@ -23,19 +23,6 @@
             </div>
         </div>
     {% endif %}
-    {% set text = '' %}
-    {% if calldisplay.clusters|length == 1 and calldisplay.clusters|first.callDisplayText %}
-        {% set text = calldisplay.clusters|first.callDisplayText|raw|nl2br %}
-    {% elseif calldisplay.scopes|length == 1 and calldisplay.scopes|first.preferences.queue.callDisplayText%}
-        {% set text = calldisplay.scopes|first.preferences.queue.callDisplayText|raw|nl2br %}
-    {% endif %}
-
-    {% if text %}
-        <div class="infotext">
-            <span id="infoicon"></span>
-            <div class="infotext-content">{{ text }}</div>
-        </div>
-    {% endif %}
 <div class="aufrufanzeige_main{% if skipAll %} aufrufanzeige_full{% endif %}">
     {% block messages %}
         {% include "block/messages/messages.twig" %}