From 809a2ccd44973a5aedc1ed38df4c10dca23c70d5 Mon Sep 17 00:00:00 2001 From: "mohamad.daaeboul" Date: Tue, 22 Oct 2024 14:26:32 +0200 Subject: [PATCH] =?UTF-8?q?ZMS-1802=20Template-anpassungen,=20F=C3=BCr=20d?= =?UTF-8?q?en=20status=20'deleted'=20werden=20die=20Links=20in=20der=20War?= =?UTF-8?q?teschlange=20entfernt=20und=20die=20Buttons=20f=C3=BCrs=20Bearb?= =?UTF-8?q?eiten=20und=20L=C3=B6schen=20werden=20auch=20entfernt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom_templates/block/queue/table.twig | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/zmsadmin/custom_templates/block/queue/table.twig b/zmsadmin/custom_templates/block/queue/table.twig index 3da860679..3581cdb0f 100644 --- a/zmsadmin/custom_templates/block/queue/table.twig +++ b/zmsadmin/custom_templates/block/queue/table.twig @@ -247,7 +247,7 @@ {% endif %} - {% if item.queue.status != "reserved" and source != 'counter' and (workstation.scope.id == item.scope.id or allowClusterWideCall) and isToday %} + {% if item.queue.status != "reserved" and item.queue.status != "deleted" and source != 'counter' and (workstation.scope.id == item.scope.id or allowClusterWideCall) and isToday %} {{ item.queue.number }} @@ -258,6 +258,8 @@ {% if item.queue.status == "reserved" %} Reservierung + {% elseif item.queue.status == "deleted" %} + {{ item.clients|first.familyName|decodeEntities|raw }} {% else %} {% set familyName = item.clients|first.familyName|decodeEntities|raw %} {% set currentTime = "now"|date('U') %} @@ -350,7 +352,7 @@

+{{ item.queue.waitingTimeOptimistic }}‑{{ item.queue.waitingTimeEstimate }} Min.

{% endif %} - {% if item.queue.status != "reserved" and item.queue.status != "preconfirmed" %} + {% if item.queue.status != "reserved" and item.queue.status != "preconfirmed" and item.queue.status != "deleted" %} @@ -599,3 +601,15 @@ content.addClass('hidden') {% endblock %} {% block board_footer %}{% endblock %} {% endembed %} + + +