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

Jump to bottom

move date first in all related-work tables #1895

Merged
merged 1 commit into from
Nov 30, 2023
Merged

move date first in all related-work tables #1895

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions indigo_app/templates/indigo_api/_work_amendment_tables.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ <h5 class="mt-3">{% trans "Amended by" %}</h5>
<table class="table table-sm">
<thead>
<tr>
<th>{% trans 'Work' %}</th>
<th>{% trans 'Date' %}</th>
<th>{% trans 'Work' %}</th>
</tr>
</thead>
{% for item in amendments %}
<tr>
<td>{{ item.date|date:"Y-m-d" }}</td>
<td>
<a href="{% url 'work' frbr_uri=item.amending_work.frbr_uri %}"
data-popup-url="{% url 'work_popup' frbr_uri=item.amending_work.frbr_uri %}"
>{{ item.amending_work.title }}</a>
<span class="text-muted">· {{ item.amending_work.frbr_uri }}</span>
</td>
<td>{{ item.date|date:"Y-m-d" }}</td>
</tr>
{% endfor %}
</table>
Expand All @@ -35,19 +35,19 @@ <h5>{% trans "Amendments made" %}</h5>
<table class="table table-sm">
<thead>
<tr>
<th>{% trans 'Work' %}</th>
<th>{% trans 'Date' %}</th>
<th>{% trans 'Work' %}</th>
</tr>
</thead>
{% for item in amendments_made %}
<tr>
<td>{{ item.date|date:"Y-m-d" }}</td>
<td>
<a href="{% url 'work' frbr_uri=item.amended_work.frbr_uri %}"
data-popup-url="{% url 'work_popup' frbr_uri=item.amended_work.frbr_uri %}"
>{{ item.amended_work.title }}</a>
<span class="text-muted">· {{ item.amended_work.frbr_uri }}</span>
</td>
<td>{{ item.date|date:"Y-m-d" }}</td>
</tr>
{% endfor %}
</table>
Expand Down
16 changes: 8 additions & 8 deletions indigo_app/templates/indigo_api/_work_commencement_tables.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ <h5 class="mt-3">{% trans "Commencements" %}</h5>
<table class="table table-sm">
<thead>
<tr>
<th>{% trans 'Date' %}</th>
<th>{% trans 'Work' %}</th>
<th>{% trans 'In full' %}</th>
<th>{% trans 'Note' %}</th>
<th>{% trans 'Date' %}</th>
<th>{% trans 'In full' %}</th>
</tr>
</thead>
{% for item in commencements %}
<tr>
<td>{{ item.date|date:"Y-m-d" }}</td>
<td>
{% if item.commencing_work %}
<a href="{% url 'work' frbr_uri=item.commencing_work.frbr_uri %}"
Expand All @@ -25,9 +26,8 @@ <h5 class="mt-3">{% trans "Commencements" %}</h5>
—
{% endif %}
</td>
<td>{% if item.all_provisions %}✔{% else %}✕{% endif %}</td>
<td>{{ item.note|default:"" }}</td>
<td>{{ item.date|date:"Y-m-d" }}</td>
<td>{% if item.all_provisions %}✓{% else %}✕{% endif %}</td>
</tr>
{% endfor %}
</table>
Expand All @@ -43,23 +43,23 @@ <h5>{% trans "Commencements made" %}</h5>
<table class="table table-sm">
<thead>
<tr>
<th>{% trans 'Date' %}</th>
<th>{% trans 'Work' %}</th>
<th>{% trans 'In full' %}</th>
<th>{% trans 'Note' %}</th>
<th>{% trans 'Date' %}</th>
<th>{% trans 'In full' %}</th>
</tr>
</thead>
{% for item in commencements_made %}
<tr>
<td>{{ item.date|date:"Y-m-d" }}</td>
<td>
<a href="{% url 'work' frbr_uri=item.commenced_work.frbr_uri %}"
data-popup-url="{% url 'work_popup' frbr_uri=item.commenced_work.frbr_uri %}"
>{{ item.commenced_work.title }}</a>
<span class="text-muted">· {{ item.commenced_work.frbr_uri }}</span>
</td>
<td>{% if item.all_provisions %}✔{% else %}✕{% endif %}</td>
<td>{{ item.note|default:"" }}</td>
<td>{{ item.date|date:"Y-m-d" }}</td>
<td>{% if item.all_provisions %}✓{% else %}✕{% endif %}</td>
</tr>
{% endfor %}
</table>
Expand Down
8 changes: 4 additions & 4 deletions indigo_app/templates/indigo_api/_work_repeal_tables.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ <h5 class="mt-3">{% trans "Repealed by" %}</h5>
<table class="table table-sm">
<thead>
<tr>
<th>{% trans 'Work' %}</th>
<th>{% trans 'Date' %}</th>
<th>{% trans 'Work' %}</th>
</tr>
</thead>
<tr>
<td>{{ work.repealed_date|date:"Y-m-d" }}</td>
<td>
<a href="{% url 'work' frbr_uri=work.repealed_by.frbr_uri %}"
data-popup-url="{% url 'work_popup' frbr_uri=work.repealed_by.frbr_uri %}"
>{{ work.repealed_by.title }}</a>
<span class="text-muted">· {{ work.repealed_by.frbr_uri }}</span>
</td>
<td>{{ work.repealed_date|date:"Y-m-d" }}</td>
</tr>
</table>
{% else %}
Expand All @@ -31,19 +31,19 @@ <h5>{% trans "Repeals made" %}</h5>
<table class="table table-sm">
<thead>
<tr>
<th>{% trans 'Work' %}</th>
<th>{% trans 'Date' %}</th>
<th>{% trans 'Work' %}</th>
</tr>
</thead>
{% for repealed_work in repeals_made %}
<tr>
<td>{{ repealed_work.repealed_date|date:"Y-m-d" }}</td>
<td>
<a href="{% url 'work' frbr_uri=repealed_work.frbr_uri %}"
data-popup-url="{% url 'work_popup' frbr_uri=repealed_work.frbr_uri %}"
>{{ repealed_work.title }}</a>
<span class="text-muted">· {{ repealed_work.frbr_uri }}</span>
</td>
<td>{{ repealed_work.repealed_date|date:"Y-m-d" }}</td>
</tr>
{% endfor %}
</table>
Expand Down
Loading