Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ZMS-1802): umgebuchter Termin kann aufgerufen werden #652

Merged
merged 1 commit into from
Oct 24, 2024
Merged

fix(ZMS-1802): umgebuchter Termin kann aufgerufen werden #652

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions zmsadmin/custom_templates/block/queue/table.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
{% endif %}
</td>
<td>
{% 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 %}
<a title="{% trans %}Diesen Bürger aufrufen{% endtrans %}" href="{{ urlGet('workstation', {}, {'calledprocess': item.id}) }}" data-process="{{ item.id }}">
{{ item.queue.number }}
</a>
Expand All @@ -258,6 +258,8 @@
<td class="callnextclient">
{% 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') %}
Expand Down Expand Up @@ -350,7 +352,7 @@
<p class="queue-table-amendment-time">+{{ item.queue.waitingTimeOptimistic }}&#8209;{{ item.queue.waitingTimeEstimate }}&nbsp;Min.</p>
{% endif %}
</td>
{% 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" %}
<td class="center">
<a data-id="{{ item.id }}" data-name="{{ item.queue.withAppointment ? item.clients|first.familyName|raw : ('Wartenummer ' ~ item.queue.number) }}" href="#" class="icon process-delete" title="Löschen">
<i class="far fa-trash-alt" aria-hidden="true"></i>
Expand Down Expand Up @@ -599,3 +601,15 @@ content.addClass('hidden')
{% endblock %}
{% block board_footer %}{% endblock %}
{% endembed %}

<style>
.queue-table tr.deleted {
background-color: #ddd !important;
opacity: 0.45;
}
.queue-table tr.deleted a {
cursor: not-allowed;
pointer-events: none;
}
</style>

Loading