Bug 7308: (follow-up) change color style for fund child

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / admin / aqbudgets.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index c33946e..1a88548 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -241,12 +241,13 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
         <tr>
             <th>Fund code</th>
             <th>Fund name</th>
-            <th>Total<br />allocated</th>
-            <th>Base-level<br />allocated</th>
-            <th>Base-level<br />ordered</th>
-            <th>Base-level<br />spent</th>
-            <th>Total sublevels<br />spent</th>
-            <th>Base-level<br />remaining</th>
+            <th>Base-level allocated</th>
+            <th>Base-level ordered</th>
+            <th>Total ordered</th>
+            <th>Base-level spent</th>
+            <th>Total spent</th>
+            <th>Base-level available</th>
+            <th>Total available</th>
             <th class="tooltipcontent">&nbsp;</th>
             <th>Actions</th>
         </tr>
@@ -255,12 +256,13 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
     <tr>
     <th colspan="2" style="text-align: left;" nowrap="nowrap">Period allocated [% IF ( budget_period_total ) %][% budget_period_total %][% END %]  </th>
     <th nowrap="nowrap" class="data"> [% period_alloc_total %]</th>
-    <th nowrap="nowrap"  class="data"> [% base_alloc_total %]</th>
-    <th class="data">[% base_ordered_total %]</th>
-    <th class="data">[% base_spent_total %]</th>
-    <th class="data">[% base_spent_total %]</th>
-    <th class="data">[% base_remaining_total %]</th>
+    <th></th>
+    <th class="data">[% ordered_total %]</th>
+    <th></th>
+    <th class="data">[% spent_total %]</th>
+    <th></th>
     <th class="tooltipcontent"></th>
+    <th class="data">[% available_total %]</th>
     <th></th>
     </tr>
     </tfoot>
@@ -274,19 +276,60 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
 
     <td>[% budge.budget_code_indent %]</td>
     <td>[% budge.budget_name %]</td>
-    <td class="data">[% budge.budget_amount_total %]</td>
-    <td class="data">[% budge.budget_amount %] </td>
-    <td class="data">[% budge.budget_ordered %]</td>
-    <td class="data">[% budge.budget_spent %] </td>
-    <td class="data">[% budge.total_levels_spent %]</td>
-    [% IF ( budge.remaining_pos ) %]
-        <td class="data" style="color: green;">
-    [% ELSIF ( budge.remaining_neg ) %] 
-        <td class="data" style="color: red;">
-    [% ELSE %]
-        <td class="data">
+    <td class="data">
+      [% IF budge.budget_parent_id %]
+        <span style="color:grey">[% budge.budget_amount %]</span>
+      [% ELSE %]
+        [% budge.budget_amount %]
+      [% END %]
+    </td>
+    <td class="data">
+      [% IF budge.budget_parent_id %]
+        <span style="color:grey">[% budge.budget_ordered %]</span>
+      [% ELSE %]
+        [% budge.budget_ordered %]
+      [% END %]
+    </td>
+    <td class="data">
+      [% IF budge.budget_parent_id %]
+        <span style="color:grey">[% budge.total_ordered %]</span>
+      [% ELSE %]
+        [% budge.total_ordered %]
+      [% END %]
+    </td>
+    <td class="data">
+      [% IF budge.budget_parent_id %]
+        <span style="color:grey">[% budge.budget_spent %]</span>
+      [% ELSE %]
+        [% budge.budget_spent %]
+      [% END %]
+    </td>
+    <td class="data">
+      [% IF budge.budget_parent_id %]
+        <span style="color:grey">[% budge.total_spent %]</span>
+      [% ELSE %]
+        [% budge.total_spent %]
+      [% END %]
+    </td>
+
+
+    [% BLOCK colorcellvalue %]
+        [% IF (value > 0) %]
+            <span style="color: green;">
+        [% ELSIF (value < 0) %]
+            <span style="color: red;">
+        [% ELSE %]
+            <span>
+        [% END %]
+            [% text %]
+        </span>
     [% END %]
-            [% budge.budget_remaining %] </td>
+    <td class="data">
+        [% INCLUDE colorcellvalue value=budge.budget_remaining text=budge.budget_remaining_display %]
+    </td>
+    <td class="data">
+        [% INCLUDE colorcellvalue value=budge.total_remaining text=budge.total_remaining_display %]
+    </td>
 
     <td class="tooltipcontent">[% IF ( budge.budget_owner_id ) %]<strong>Owner: </strong><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budge.budget_owner_id %]">[% budge.budget_owner_name %]</a>[% END %]
         [% IF ( budge.budget_branchcode ) %]<br /><strong>Library: </strong>[% budge.budget_branchcode %][% END %]