From 597dfcc987aa6ad8bee61fac11986ab57c68d355 Mon Sep 17 00:00:00 2001
From: Mathias Magnusson <mathias@magnusson.space>
Date: Mon, 8 Jul 2024 17:39:18 +0200
Subject: [PATCH] Show primary and secondary cost centre, not secondary twice

---
 templates/expenses/show.html | 40 ++++++++++--------------------------
 templates/invoices/show.html | 40 ++++++++++--------------------------
 2 files changed, 22 insertions(+), 58 deletions(-)

diff --git a/templates/expenses/show.html b/templates/expenses/show.html
index 21b9ccd..e9e40a9 100644
--- a/templates/expenses/show.html
+++ b/templates/expenses/show.html
@@ -26,41 +26,23 @@ <h2>Kvittodelar</h2>
     <table>
       <thead>
         <tr>
-          <th>
-            Belopp
-          </th>
-          <th>
-            Resultatställe
-          </th>
-          <th>
-            Sekundärt resultatställe
-          </th>
-          <th>
-            Budgetpost
-          </th>
-          <th>
-            Attesterad av
-          </th>
+            <th>Belopp</th>
+            <th>Resultatställe</th>
+            <th>Sekundärt resultatställe</th>
+            <th>Budgetpost</th>
+            <th>Attesterad av</th>
         </tr>
       </thead>
       <tbody>
         {% for expense_part in expense.expensepart_set.all %}
             <tr>
-                <td>
-                    <span class="value">{{ expense_part.amount|intcomma }} kr</span>
-                </td>
-                <td>
-                    {{ expense_part.secondary_cost_centre }}
-                </td>
-                <td>
-                    <span class="value">{{ expense_part.secondary_cost_centre }}</span>
-                </td>
-                <td>
-                    <span class="value">{{ expense_part.budget_line }}</span>
-                </td>
+                <td>{{ expense_part.amount|intcomma }} kr</td>
+                <td>{{ expense_part.cost_centre }}</td>
+                <td>{{ expense_part.secondary_cost_centre }}</td>
+                <td>{{ expense_part.budget_line }}</td>
                 <td>
                     {% if expense_part.attested_by %}
-                    <a class="value" href="{% url 'user-show' expense_part.attested_by.user.username %}">
+                    <a href="{% url 'user-show' expense_part.attested_by.user.username %}">
                         {{ expense_part.attested_by.user.get_full_name }} ({{ expense_part.attest_date }})
                     </a>
                     {% else %}
@@ -73,7 +55,7 @@ <h2>Kvittodelar</h2>
                                 </form>
                             </span>
                         {% else %}
-                            <span class="value">Ej attesterad</span>
+                            Ej attesterad
                         {% endif %}
                     {% endif %}
                 </td>
diff --git a/templates/invoices/show.html b/templates/invoices/show.html
index d1a9874..a9f743f 100644
--- a/templates/invoices/show.html
+++ b/templates/invoices/show.html
@@ -35,41 +35,23 @@ <h2>Fakturadelar</h2>
     <table>
         <thead>
             <tr>
-                <th>
-                    Belopp
-                </th>
-                <th>
-                    Resultatställe
-                </th>
-                <th>
-                    Sekundärt resultatställe
-                </th>
-                <th>
-                    Budgetpost
-                </th>
-                <th>
-                    Attesterad av
-                </th>
+                <th>Belopp</th>
+                <th>Resultatställe</th>
+                <th>Sekundärt resultatställe</th>
+                <th>Budgetpost</th>
+                <th>Attesterad av</th>
             </tr>
         </thead>
         <tbody>
         {% for invoice_part in invoice.invoicepart_set.all %}
             <tr>
-                <td>
-                    <span class="value">{{ invoice_part.amount|intcomma }} kr</span>
-                </td>
-                <td>
-                    {{ invoice_part.secondary_cost_centre }}
-                </td>
-                <td>
-                    <span class="value">{{ invoice_part.secondary_cost_centre }}</span>
-                </td>
-                <td>
-                    <span class="value">{{ invoice_part.budget_line }}</span>
-                </td>
+                <td>{{ invoice_part.amount|intcomma }} kr</td>
+                <td>{{ invoice_part.cost_centre }}</td>
+                <td>{{ invoice_part.secondary_cost_centre }}</td>
+                <td>{{ invoice_part.budget_line }}</td>
                 <td>
                     {% if invoice_part.attested_by %}
-                    <a class="value" href="{% url 'user-show' invoice_part.attested_by.user.username %}">
+                    <a href="{% url 'user-show' invoice_part.attested_by.user.username %}">
                         {{ invoice_part.attested_by.user.get_full_name }} ({{ invoice_part.attest_date }})
                     </a>
                     {% else %}
@@ -82,7 +64,7 @@ <h2>Fakturadelar</h2>
                                 </form>
                             </span>
                         {% else %}
-                            <span class="value">Ej attesterad</span>
+                            Ej attesterad
                         {% endif %}
                     {% endif %}
                 </td>