Skip to content

Commit

Permalink
Update print.html
Browse files Browse the repository at this point in the history 
I removed the table that showed the planning for room duty since it was just taking a lot of space without anyone using it. I have also updated the task list with some extra tasks.
  • Loading branch information
@ThijsK518
ThijsK518 authored Nov 18, 2024
1 parent 8874100 commit cd473e3
Showing 1 changed file with 59 additions and 43 deletions.
102 changes: 59 additions & 43 deletions amelie/room_duty/templates/room_duty/table/print.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,26 +47,6 @@
</script>
</head>
<body>
<table class="kamerdienst-table">
<tr>
<th><!-- Dummy --></th>
{% for person in table.persons %}
<th>{{ person.first_name }}</th>
{% endfor %}
</tr>
<tr>

</tr>
{% for room_duty in table.room_duties.all %}
<tr class="kamerdienst-weekday-{{ room_duty.begin.weekday|divisibleby:"2"|yesno:"even,odd" }}">
<td class="time">{{ room_duty.begin|date:"D j b H:i" }} - {{ room_duty.end|date:"H:i" }}</td>
{% for person in table.persons %}
<td class="cross">{% if person in room_duty.participant_set.all %}X{% endif %}</td>
{% endfor %}
</tr>
{% endfor %}
</table>

<h2>Balcony duty: {{ table.balcony_duty.association|default:"None" }}</h2>

{% if table.balcony_duty %}
Expand All @@ -82,16 +62,25 @@ <h2>Balcony duty: {{ table.balcony_duty.association|default:"None" }}</h2>
</tr>
<tr>
<td>Open room</td>
<td>Morning</td>
<td>At opening</td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
</tr>
<tr>
<td>Clean room</td>
<td>Morning</td>
<td>Clear workspaces</td>
<td>At opening</td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>-
</tr>
<tr>
<td>Vaccuum floor</td>
<td>At opening</td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
Expand All @@ -117,7 +106,7 @@ <h2>Balcony duty: {{ table.balcony_duty.association|default:"None" }}</h2>
<td colspan="2" class="cross {% if not balcony_duty%}disabled{% endif %}"></td>
</tr>
<tr>
<td>Check board food</td>
<td>Check food in fridge for mold</td>
<td>Morning</td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross disabled"></td>
Expand All @@ -134,15 +123,6 @@ <h2>Balcony duty: {{ table.balcony_duty.association|default:"None" }}</h2>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
</tr>
<tr>
<td>Retrieve mail</td>
<td>Morning</td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
</tr>
<tr>
<td>Dishes</td>
<td>Morning</td>
Expand All @@ -152,22 +132,40 @@ <h2>Balcony duty: {{ table.balcony_duty.association|default:"None" }}</h2>
<td colspan="2" class="cross {% if not balcony_duty%}disabled{% endif %}"></td>
<td colspan="2" class="cross {% if not balcony_duty%}disabled{% endif %}"></td>
</tr>
<tr>
<td>Retrieve mail</td>
<td>After 11:00</td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
</tr>
<tr>
<td>Water the plants</td>
<td>Afternoon</td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross disabled"></td>
</tr>
<tr>
<td>Coffee machines</td>
<td>Rinse coffee machines</td>
<td>Afternoon</td>
<td colspan="2" class="cross {% if not balcony_duty%}disabled{% endif %}"></td>
<td colspan="2" class="cross {% if not balcony_duty%}disabled{% endif %}"></td>
<td colspan="2" class="cross {% if not balcony_duty%}disabled{% endif %}"></td>
<td colspan="2" class="cross {% if not balcony_duty%}disabled{% endif %}"></td>
<td colspan="2" class="cross disabled"></td>
</tr>
<tr>
<td>Big clean coffee machines</td>
<td>Afternoon</td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross {% if not balcony_duty%}disabled{% endif %}"></td>
</tr>
<tr>
Expand Down Expand Up @@ -198,32 +196,50 @@ <h2>Balcony duty: {{ table.balcony_duty.association|default:"None" }}</h2>
<td colspan="2" class="cross"></td>
</tr>
<tr>
<td>Close room</td>
<td>Afternoon</td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
<td>Empty trashcans</td>
<td>At closing</td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross"></td>
</tr>
<tr>
<td>Clean workspaces with soap</td>
<td>At closing</td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross disabled"></td>
</tr>
<tr>
<td>Empty trashcans</td>
<td>Afternoon</td>
<td>Mop floor</td>
<td>At closing</td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross"></td>
</tr>
<tr>
<td>ASITO</td>
<td>Afternoon</td>
<td>At closing</td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross disabled"></td>
<td colspan="2" class="cross disabled"></td>
</tr>
<tr>
<td>Close room</td>
<td>At closing</td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
<td colspan="2" class="cross"></td>
</tr>
</table>
{% endwith %}
{% endif %}
Expand Down

0 comments on commit cd473e3

Please sign in to comment.