kontakt
/
shiftregister
2
0
Fork 0
Code

Improve layout

This commit is contained in:
Luca 2022-06-03 13:45:00 +02:00
parent 974a7e5a60
commit 5c9c29c0c1
4 changed files with 65 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
shiftregister/app/templates/shift.html
View File

@ -20,14 +20,14 @@
<strong>Dauer:</strong> {{ shift.duration }}<br> <strong>Dauer:</strong> {{ shift.duration }}<br>
<strong>Treffpunkt:</strong> {{ shift.room.meeting_location|linebreaksbr }} <strong>Treffpunkt:</strong> {{ shift.room.meeting_location|linebreaksbr }}
</p> </p>
{% if shift.room.description %} {% if shift.room.description %}
<strong>Beschreibung:</strong> <strong>Beschreibung:</strong>
<p>{{ shift.room.description|linebreaksbr }}</p> <p>{{ shift.room.description|linebreaksbr }}</p>
{% endif %} {% endif %}
{% if shift.description %} {% if shift.description %}
<strong>Zusatzinfo:</strong><br> <strong>Zusatzinfo:</strong>
<p>{{ shift.description|linebreaksbr }}</p> <p>{{ shift.description|linebreaksbr }}</p>
{% endif %} {% endif %}
</div> </div>
{% if can_register and not shift.deleted %} {% if can_register and not shift.deleted %}
<form action="" method="post"> <form action="" method="post">

2
shiftregister/signage/forms.py
View File

@ -2,4 +2,4 @@ from django import forms
class TeamBackupForm(forms.Form): class TeamBackupForm(forms.Form):
name = forms.CharField(max_length=100) name = forms.CharField(max_length=100, widget=forms.TextInput(attrs={"class": "input"}))

7
shiftregister/team/templates/partials/shift_box.html
View File

@ -7,9 +7,10 @@
<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.shiftregistration_set.count }}/{{ shift.required_helpers|default:shift.room.required_helpers }} <strong>Belegung:</strong> {{ shift.shiftregistration_set.count }}/{{ shift.required_helpers|default:shift.room.required_helpers }}
{% if shift.teambackup_set.all.count %}<br> {% if shift.teambackup_set.all.count %}
<strong>Backup Teammitglied(er): {%for member in shift.teambackup_set.all%}{{member.name}}, {%endfor%}</strong> <br>
{% endif %} <strong>Backup-Teammitglied(er):</strong> {% for member in shift.teambackup_set.all %}{{ member.name }}{% if not forloop.last %}, {% endif %}{% endfor %}
{% endif %}
</div> </div>
<div class="is-flex is-justify-content-end"> <div class="is-flex is-justify-content-end">
<a class="button is-info is-small" href="{% url 'team:shift' shift.id %}">Details</a> <a class="button is-info is-small" href="{% url 'team:shift' shift.id %}">Details</a>

96
shiftregister/team/templates/shift_detail.html
View File

@ -1,8 +1,9 @@
{% extends "team_base.html" %} {% extends "team_base.html" %}
{% block title %}Schichtdetails{% endblock %} {% block title %}Schichtdetails{% endblock %}
{% block content %} {% block content %}
<h3 class="title">{% if shift.deleted %}(gelöscht) {% endif %}{{ shift.room.name }} {{ shift.start_at }} ({{ shift.registration_count }}/{{ shift.required_helpers|default:shift.room.required_helpers }})</h3> <h3 class="title is-spaced">{% if shift.deleted %}(gelöscht) {% endif %}{{ shift.room.name }} {{ shift.start_at }} ({{ shift.registration_count }}/{{ shift.required_helpers|default:shift.room.required_helpers }})</h3>
{% if shift.description %} {% if shift.description %}
<div class="content"> <div class="content">
<em>{{ shift.description|linebreaksbr }}</em> <em>{{ shift.description|linebreaksbr }}</em>
@ -13,17 +14,19 @@
<div class="columns is-multiline"> <div class="columns is-multiline">
{% for reg in shift.shiftregistration_set.all %} {% for reg in shift.shiftregistration_set.all %}
<div class="column is-one-quarter"> <div class="column is-one-quarter">
<div class="box is-flex is-align-items-center is-justify-content-space-between"> <div class="box">
<div class="content"> <div class="is-flex is-align-items-center is-justify-content-space-between mb-2">
<a class="is-size-4" href="{% url 'team:helper' reg.helper.pk %}">{{ reg.helper.name }}</a> <a class="is-size-4" href="{% url 'team:helper' reg.helper.pk %}">{{ reg.helper.name }}</a>
<a class="button is-link is-small" href="tel:{{ reg.helper.phone }}">📞</a> <a class="button is-link is-small" href="tel:{{ reg.helper.phone }}">📞</a>
{% if not reg.is_checked_in %} </div>
<a class="button is-warning is-small" href="{%url 'team:checkin' reg.pk%}">als angekommen markieren</a><br> <div class="buttons">
{% else %} {% if not reg.is_checked_in %}
<div class="button is-success"> ✓</div> <a class="button is-warning is-small" href="{% url 'team:checkin' reg.pk %}">Als angekommen markieren</a><br>
{% endif %} {% else %}
<a class="button is-danger is-small" href="{%url 'team:unregister' reg.pk%}">helfer abmelden</a> <button class="button is-success is-small" style="pointer-events:none;">✓</button>
</div> {% endif %}
<a class="button is-danger is-small" href="{% url 'team:unregister' reg.pk %}">Helfer*in abmelden</a>
</div>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
@ -58,37 +61,42 @@
<button class="button is-link" type="submit">Hinzufügen</button> <button class="button is-link" type="submit">Hinzufügen</button>
</form> </form>
<hr> <hr>
{% if shift.teambackup_set.all.count %}<br> {% if shift.teambackup_set.all.count %}
<strong>Backup Teammitglied(er):</strong> <h5 class="subtitle">Backup-Teammitglied(er)</h5>
<ul> <div class="columns">
{%for member in shift.teambackup_set.all%} {% for member in shift.teambackup_set.all %}
<li>{{member.name}} <a class="button is-danger is-small" href="{%url 'signage:work_remove' member.pk%}">entfernen</a></li> <div class="column is-one-quarter">
{%endfor%} <div class="box is-flex is-align-items-center is-justify-content-space-between">
</ul> <span class="is-size-4">{{ member.name }}</span>
{% endif %} <a class="button is-danger is-small" href="{% url 'signage:work_remove' member.pk %}">entfernen</a>
<form action="{%url 'signage:work_add' shift.pk%}?redir={{request.path}}" method="post"> </div>
{% csrf_token %}
{% for field in backup_form%}
<div class="field">
{% if field.widget_type == 'checkbox' %}
<div class="control">
<label class="checkbox" for="{{ field.id_for_label }}">{{ field }} {{ field.label }}</label>
</div>
{% else %}
<label class="label" for="{{ field.id_for_label }}">{{ field.label }}</label>
<div class="control">
{{ field }}
</div>
{% endif %}
{% for error in field.errors %}
<p class="help is-danger">{{ error }}</p>
{% endfor %}
{% if field.help_text %}
<p class="help">{{ field.help_text }}</p>
{% endif %}
</div>
{% endfor %}
<button class="button is-link" type="submit">Team hinzufuegen</button>
</form>
</div> </div>
{% endfor %}
</div>
{% endif %}
<h5 class="subtitle">Backup-Teammitglied eintragen</h5>
<form action="{% url 'signage:work_add' shift.pk %}?redir={{ request.path }}" method="post">
{% csrf_token %}
{% for field in backup_form %}
<div class="field">
{% if field.widget_type == 'checkbox' %}
<div class="control">
<label class="checkbox" for="{{ field.id_for_label }}">{{ field }} {{ field.label }}</label>
</div>
{% else %}
<label class="label" for="{{ field.id_for_label }}">{{ field.label }}</label>
<div class="control">
{{ field }}
</div>
{% endif %}
{% for error in field.errors %}
<p class="help is-danger">{{ error }}</p>
{% endfor %}
{% if field.help_text %}
<p class="help">{{ field.help_text }}</p>
{% endif %}
</div>
{% endfor %}
<button class="button is-link" type="submit">Team hinzufügen</button>
</form>
{% endblock %} {% endblock %}