Compare commits

...

2 Commits

@ -0,0 +1,18 @@
{% if can_register and not shift.deleted %}
<form action="" method="post">
{% csrf_token %}
{{ shift_form.as_p }}
<input type="submit" class="button is-link" value="Anmelden">
</form>
{% endif %}
{% if is_registered and not shift.deleted %}
{% if can_cancel %}
<form action="{% url 'cancel' shift.pk %}" method="post">
{% csrf_token %}
{{ shift_form.as_p }}
<input type="submit" class="button is-danger is-small" value="Abmelden">
</form>
{% elif not shift.has_ended %}
<div class="content">Bitte wende dich an den Infopoint, falls du es nicht zu deiner Schicht schaffst.</div>
{% endif %}
{% endif %}

@ -23,6 +23,9 @@
<strong>Treffpunkt:</strong> {{ shift.room.meeting_location|linebreaksbr }}<br> <strong>Treffpunkt:</strong> {{ shift.room.meeting_location|linebreaksbr }}<br>
<strong>Belegung:</strong> {{ shift.registration_count }}/{{ shift.required_helpers|default:shift.room.required_helpers }} <strong>Belegung:</strong> {{ shift.registration_count }}/{{ shift.required_helpers|default:shift.room.required_helpers }}
</p> </p>
{% if shift.room.description|length > 100 or shift.description|length > 100 %}
{% include 'partials/shift_detail_buttons.html'%}
{% endif %}
{% if shift.room.description %} {% if shift.room.description %}
<div class="description"> <div class="description">
<strong>Beschreibung:</strong> <strong>Beschreibung:</strong>
@ -36,23 +39,6 @@
</div> </div>
{% endif %} {% endif %}
</div> </div>
{% if can_register and not shift.deleted %} {% include 'partials/shift_detail_buttons.html'%}
<form action="" method="post">
{% csrf_token %}
{{ shift_form.as_p }}
<input type="submit" class="button is-link" value="Anmelden">
</form>
{% endif %}
{% if is_registered and not shift.deleted %}
{% if can_cancel %}
<form action="{% url 'cancel' shift.pk %}" method="post">
{% csrf_token %}
{{ shift_form.as_p }}
<input type="submit" class="button is-danger is-small" value="Abmelden">
</form>
{% elif not shift.has_ended %}
<div class="content">Bitte wende dich an den Infopoint, falls du es nicht zu deiner Schicht schaffst.</div>
{% endif %}
{% endif %}
</div> </div>
{% endblock %} {% endblock %}

@ -1,4 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load shift_extras %}
{% block title %}{{ title }}{% endblock %} {% block title %}{{ title }}{% endblock %}
@ -10,15 +11,28 @@
<th>Name</th> <th>Name</th>
<th>Schicht</th> <th>Schicht</th>
<th>Startzeit</th> <th>Startzeit</th>
<th>Dauer</th>
<th>Aktionen</th> <th>Aktionen</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for reg in object_list %} {% for reg in object_list %}
<tr> <tr>
<td>{{ reg.helper.name }} ({{ reg.helper.phone|stringformat:"s"|slice:"-3:" }})</td> <td>
<td>{{ reg.shift.room }}</td> <a href="{% url 'team:helper' reg.helper.pk %}">
{{ reg.helper.name }} ({{ reg.helper.phone|stringformat:"s"|slice:"-3:" }})
{% if not reg.helper.asta_confirmed %}
<span class="tag is-danger">AStA</span>
{% endif %}
</a>
</td>
<td>
<span class="{{ reg.shift.event.calendar.needs_fallback|yesno:"is-underlined," }}">
<a href="{% url 'team:shift_room' reg.shift.room.pk %}">{{ reg.shift.room }}</a>
</span>
</td>
<td><a href="{% url 'team:shift' reg.shift.pk %}">{{ reg.shift.start_at }}</a></td> <td><a href="{% url 'team:shift' reg.shift.pk %}">{{ reg.shift.start_at }}</a></td>
<td><a href="{% url 'team:shift' reg.shift.pk %}">{{ reg.shift.duration|duration }}</a></td>
<td> <td>
<a class="button is-success is-small" href="{% url 'team:checkin' reg.pk %}">Als angekommen markieren</a> <a class="button is-success is-small" href="{% url 'team:checkin' reg.pk %}">Als angekommen markieren</a>
<a class="button is-danger is-small" href="{% url 'team:mark_as_failed' reg.pk %}">Nicht angetreten</a> <a class="button is-danger is-small" href="{% url 'team:mark_as_failed' reg.pk %}">Nicht angetreten</a>

@ -3,7 +3,7 @@
{% if shift.deleted %} {% if shift.deleted %}
<em>gelöscht</em><br> <em>gelöscht</em><br>
{% endif %} {% endif %}
<strong>Ort:</strong> {{ shift.room.name }}<br> <strong>Ort:</strong> <span class="{{ shift.event.calendar.needs_fallback|yesno:"is-underlined," }}">{{ shift.room.name }}</span><br>
<strong>Beginn:</strong> {{ shift.start_at }}<br> <strong>Beginn:</strong> {{ shift.start_at }}<br>
<strong>Dauer:</strong> {{ shift.duration }}<br> <strong>Dauer:</strong> {{ shift.duration }}<br>
<strong>Belegung:</strong> {{ shift.registration_count }}/{{ shift.required_helpers|default:shift.room.required_helpers }} <strong>Belegung:</strong> {{ shift.registration_count }}/{{ shift.required_helpers|default:shift.room.required_helpers }}

Loading…
Cancel
Save