Skip to content
Snippets Groups Projects
Commit 34eee8b1 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch...

Merge branch '136-full-register-printout-show-only-weekday-in-first-column-of-lessons-table' into 'master'

Resolve "[Full register printout] Show only weekday in first column of lessons table"

Closes #136

See merge request !155
parents 944b3661 fa432228
No related branches found
No related tags found
1 merge request!155Resolve "[Full register printout] Show only weekday in first column of lessons table"
Pipeline #6202 passed
...@@ -25,7 +25,7 @@ tr.lessons-day-first { ...@@ -25,7 +25,7 @@ tr.lessons-day-first {
border-top: 3px solid rgba(0, 0, 0, 0.3); border-top: 3px solid rgba(0, 0, 0, 0.3);
} }
th.lessons-day-head, td.rotate, th.rotate { td.rotate, th.rotate {
text-align: center; text-align: center;
transform: rotate(-90deg); transform: rotate(-90deg);
} }
......
...@@ -370,7 +370,7 @@ ...@@ -370,7 +370,7 @@
{% endfor %} {% endfor %}
{% for week in weeks %} {% for week in weeks %}
<h4>{% trans 'Lesson documentation for week' %} {{ week.week }}</h4> <h4>{% trans 'Week' %} {{ week.week }}: {{ week.0 }}–{{ week.6 }}</h4>
<table class="small-print"> <table class="small-print">
<thead> <thead>
...@@ -401,7 +401,7 @@ ...@@ -401,7 +401,7 @@
{% endif %} {% endif %}
"> ">
{% if forloop.first %} {% if forloop.first %}
<th rowspan="{{ register_objects|length }}" class="lessons-day-head">{{ day }}</th> <th rowspan="{{ register_objects|length }}" class="lessons-day-head">{{ day|date:"D" }}</th>
{% endif %} {% endif %}
<td class="lesson-pe"> <td class="lesson-pe">
{% if register_object.label_ != "event" %} {% if register_object.label_ != "event" %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment