Skip to content

Commit

Permalink
Moved ID number to first column of all tables
Browse files Browse the repository at this point in the history
  • Loading branch information
phillybroadbent committed Aug 25, 2023
1 parent b86547d commit 223260c
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
16 changes: 8 additions & 8 deletions lowfat/templates/lowfat/blogs.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ <h2>
<tbody>
<tr>
{% if user.is_staff or claimant and user == claimant.user or fund.claimant and user == fund.claimant.user %}
{% if user.is_staff or claimant and user == claimant.user %}
<th>
ID
</th>
{% endif %}
<th>
Submitted date
</th>
Expand All @@ -52,11 +57,6 @@ <h2>
Funding Request
</th>
{% endif %}
{% if user.is_staff or claimant and user == claimant.user %}
<th>
ID
</th>
{% endif %}
{% if user.is_staff or claimant and user == claimant.user or fund.claimant and user == fund.claimant.user %}
<th>
Status
Expand Down Expand Up @@ -84,6 +84,9 @@ <h2>
{% endif %}
{% endif %}
>
{% if user.is_staff or claimant and user == claimant.user %}
<td>{{blog.fund.id}}</td>
{% endif %}
{% if user.is_staff or claimant and user == claimant.user or fund.claimant and user == fund.claimant.user %}
<td sorttable_customkey="{{ blog.added | date:'Ymd' }}">
{{ blog.added }}
Expand Down Expand Up @@ -115,9 +118,6 @@ <h2>
{% endif %}
</td>
{% endif %}
{% if user.is_staff or claimant and user == claimant.user %}
<td>{{blog.fund.id}}</td>
{% endif %}
{% if user.is_staff or claimant and user == claimant.user or fund.claimant and user == fund.claimant.user %}
<td>
{{ blog.get_status_display }}
Expand Down
16 changes: 8 additions & 8 deletions lowfat/templates/lowfat/expenses.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ <h2>
<table class="table table-bordered sortable">
<tbody>
<tr>
{% if user.is_staff or claimant and user == claimant.user %}
<th>
ID
</th>
{% endif %}
{% if user.is_staff or claimant and user == claimant.user %}
<th>
Submitted date
Expand All @@ -52,11 +57,6 @@ <h2>
Funding Request
</th>
{% endif %}
{% if user.is_staff or claimant and user == claimant.user %}
<th>
ID
</th>
{% endif %}
<th>
Status
</th>
Expand Down Expand Up @@ -84,6 +84,9 @@ <h2>
{% endif %}
>
{% if user.is_staff or claimant and user == claimant.user %}
<td>{{expense.fund.id}}</td>
{% endif %}
{% if user.is_staff or claimant and user == claimant.user %}
<td sorttable_customkey="{{ expense.added | date:'Ymd' }}">
{{ expense.added }}
</td>
Expand Down Expand Up @@ -111,9 +114,6 @@ <h2>
<a title='View' href="{% url 'fund_detail' expense.fund.id %}">{{ expense.fund.title }}</a>
</td>
{% endif %}
{% if user.is_staff or claimant and user == claimant.user %}
<td>{{expense.fund.id}}</td>
{% endif %}
<td>
{{ expense.get_status_display }}
{% if fund.status == 'F' %}
Expand Down
16 changes: 8 additions & 8 deletions lowfat/templates/lowfat/funds.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@
<tr>
{% if user.is_staff or claimant and user == claimant.user %}
<th>
Submitted date
ID
</th>
{% endif %}
<th>
Title
</th>
{% if user.is_staff or claimant and user == claimant.user %}
<th>
ID
Submitted date
</th>
{% endif %}
<th>
Title
</th>
{% if user.is_staff %}
<th>
Fellow
Expand Down Expand Up @@ -75,6 +75,9 @@
{% endif %}
>
{% if user.is_staff or claimant and user == claimant.user %}
<td>{{fund.id}}</td>
{% endif %}
{% if user.is_staff or claimant and user == claimant.user %}
<td sorttable_customkey="{{ fund.added | date:'Ymd' }}">
{{ fund.added }}
</td>
Expand Down Expand Up @@ -113,9 +116,6 @@
)
{% endif %}
</td>
{% if user.is_staff or claimant and user == claimant.user %}
<td>{{fund.id}}</td>
{% endif %}
{% if user.is_staff %}
<td>
<a href="{% url 'fellow_slug' fund.claimant.slug %}">{{ fund.claimant.fullname }}</a>
Expand Down

0 comments on commit 223260c

Please sign in to comment.