Merge remote-tracking branch 'origin/next' into feat-zms-2936-initial-setup-webcomponent

Author: tobiasholler

zmsadmin/custom_templates/block/navigation/navigation.twig

@@ -24,17 +24,21 @@
                         <li class="nav__link{{ menuActive == 'workstation'? ' active' }}">
                             <a title="{% trans %}Die Oberfläche für den Sachberarbeiter mit der Möglichkeit, Kunden aufzurufen{% endtrans %}" href="{{ urlGet('workstation', {}, {}) }}" {{ menuActive == 'workstation'? ' aria-current="page"' }}>Sach&shy;bearbeiter&shy;platz</a>
                         </li>
-                        <li class="nav__link{{ menuActive == 'pickup'? ' active' }}">
-                            <a title="{% trans %}Hier verwalten Sie die Abholer{% endtrans %}" href="{{ urlGet('pickup', {'id':1}, {}) }}" {{ menuActive == 'pickup'? ' aria-current="page"' }}>Abholer verwalten</a>
-                        </li>
+                        {% if workstation.useraccount.rights.superuser %}
+                            <li class="nav__link{{ menuActive == 'pickup'? ' active' }}">
+                                <a title="{% trans %}Hier verwalten Sie die Abholer{% endtrans %}" href="{{ urlGet('pickup', {'id':1}, {}) }}" {{ menuActive == 'pickup'? ' aria-current="page"' }}>Abholer verwalten</a>
+                            </li>
+                        {% endif %}
                     {% endif %}
                     {% if rights.ticketprinter and workstation.scope.id %}
-                        <li class="nav__link{{ menuActive == 'calldisplay'? ' active' }}">
-                            <a title="{% trans %}Standortauswahlseite der Aufrufanlage{% endtrans %}" href="{{ urlGet('calldisplay', {}, {}) }}" {{ menuActive == 'calldisplay'? ' aria-current="page"' }}>Anzeige Aufrufsystem</a>
-                        </li>
-                        <li class="nav__link{{ menuActive == 'ticketprinter'? ' active' }}">
-                            <a title="{% trans %}Standortauswahlseite der Wartenummernausgabe{% endtrans %}" href="{{ urlGet('ticketprinter', {}, {}) }}" {{ menuActive == 'ticketprinter'? ' aria-current="page"' }}>Wartenummern</a>
-                        </li>
+                        {% if workstation.useraccount.rights.superuser %}
+                            <li class="nav__link{{ menuActive == 'calldisplay'? ' active' }}">
+                                <a title="{% trans %}Standortauswahlseite der Aufrufanlage{% endtrans %}" href="{{ urlGet('calldisplay', {}, {}) }}" {{ menuActive == 'calldisplay'? ' aria-current="page"' }}>Anzeige Aufrufsystem</a>
+                            </li>
+                            <li class="nav__link{{ menuActive == 'ticketprinter'? ' active' }}">
+                                <a title="{% trans %}Standortauswahlseite der Wartenummernausgabe{% endtrans %}" href="{{ urlGet('ticketprinter', {}, {}) }}" {{ menuActive == 'ticketprinter'? ' aria-current="page"' }}>Wartenummern</a>
+                            </li>
+                        {% endif %}
                     {% endif %}
                 </ul>
             </nav>
@@ -97,11 +101,14 @@
             <nav role="navigation" aria-labelledby="admin-title">
                 <ul class="nav__list">
                 {% if workstation.id > 0 %}
-                    <li class="nav__link{{ menuActive == 'profile'? ' active' }}">
-                        <a title="{% trans %}Hier können Sie Ihre eigenen Anmeldedaten einsehen und sich ein neues Passwort geben{% endtrans %}" {{ menuActive == 'profile'? ' aria-current="page"' }} href="{{ urlGet('profile', {}, {}) }}">Mein Profil</a>
-                    </li>
+                    {% if workstation.useraccount.rights.superuser %}
+                        <li class="nav__link{{ menuActive == 'profile'? ' active' }}">
+                            <a title="{% trans %}Hier können Sie Ihre eigenen Anmeldedaten einsehen und sich ein neues Passwort geben{% endtrans %}" {{ menuActive == 'profile'? ' aria-current="page"' }} href="{{ urlGet('profile', {}, {}) }}">Mein Profil</a>
+                        </li>
+                    {% endif %}
                 {% endif %}
                 {% if workstation.scope.id and rights.ticketprinter %}
+                    {% if workstation.useraccount.rights.superuser %}
                     <li class="nav__link{{ menuActive == 'ticketprinterStatus'? ' active' }}">
                         <a {{ menuActive == 'ticketprinterStatus'? ' aria-current="page"' }} href="{{ urlGet('ticketprinterStatusByScope', {'id': workstation.scope.id}, {}) }}">
                             Wartenummern&shy;ausgabe am Kiosk ({% if workstation.scope.status.ticketprinter.deactivated %}
@@ -111,6 +118,7 @@
                         {% endif %})
                         </a>
                     </li>
+                    {% endif %}
                 {% endif %}
                 {% if rights.scope or rights.department or rights.organisation or rights.availability %}
                     <li class="nav__link{{ menuActive == 'owner'? ' active' }}">

zmsadmin/custom_templates/block/queue/table.twig

@@ -307,7 +307,7 @@
 										{% endif %}
 									</td>
 									<td>
-										{% if item.queue.status != "reserved" and item.queue.status != "deleted" and source != 'counter' and (workstation.scope.id == item.scope.id or allowClusterWideCall) and isToday %}
+										{% if item.queue.status != "reserved" and item.queue.status != "preconfirmed" and item.queue.status != "deleted" and source != 'counter' and (workstation.scope.id == item.scope.id or allowClusterWideCall) and isToday %}
 											<a title="{% trans %}Diesen Bürger aufrufen{% endtrans %}" href="{{ urlGet('workstation', {}, {'calledprocess': item.id}) }}" data-process="{{ item.id }}">
 												{{ item.queue.number }}
 											</a>
@@ -318,6 +318,8 @@
 									<td class="callnextclient">
 										{% if item.queue.status == "reserved" %}
 											Reservierung
+										{% elseif item.queue.status == "preconfirmed" %}
+                                                {{ item.clients|first.familyName|decodeEntities|raw }}
 										{% elseif item.queue.status == "deleted" %}
                                                 {{ item.clients|first.familyName|decodeEntities|raw }}
 										{% else %}