From 223260c45680eb44c6baa4b38c39b982101ff2b7 Mon Sep 17 00:00:00 2001
From: phillybroadbent <phillybroadbent@gmail.com>
Date: Fri, 25 Aug 2023 10:20:43 +0100
Subject: [PATCH] Moved ID number to first column of all tables

---
 lowfat/templates/lowfat/blogs.html    | 16 ++++++++--------
 lowfat/templates/lowfat/expenses.html | 16 ++++++++--------
 lowfat/templates/lowfat/funds.html    | 16 ++++++++--------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lowfat/templates/lowfat/blogs.html b/lowfat/templates/lowfat/blogs.html
index 61018142..736d047a 100644
--- a/lowfat/templates/lowfat/blogs.html
+++ b/lowfat/templates/lowfat/blogs.html
@@ -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>
@@ -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
@@ -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 }}
@@ -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 }}
diff --git a/lowfat/templates/lowfat/expenses.html b/lowfat/templates/lowfat/expenses.html
index 5a21977c..66ef1bb6 100644
--- a/lowfat/templates/lowfat/expenses.html
+++ b/lowfat/templates/lowfat/expenses.html
@@ -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
@@ -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>
@@ -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>
@@ -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' %}
diff --git a/lowfat/templates/lowfat/funds.html b/lowfat/templates/lowfat/funds.html
index ebf9e890..7f7947b6 100644
--- a/lowfat/templates/lowfat/funds.html
+++ b/lowfat/templates/lowfat/funds.html
@@ -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
@@ -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>
@@ -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>