Show selected year for expenditure column

vulekamali · Mar 18, 2024 · e3aa0ed · e3aa0ed
1 parent a2b2bf1
commit e3aa0ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/assets/js/components/public-entity-budgets/PublicEntityGroup/index.jsx b/assets/js/components/public-entity-budgets/PublicEntityGroup/index.jsx
@@ -27,7 +27,7 @@ function public_entities(linksArray) {
           <th>Entity name</th>
           <th>Relevant department</th>
           <th>PFMA</th>
-          <th>Expenditure {}</th>
+          <th>Expenditure ({linksArray[0].selected_year_slug})</th>
         </tr>
       </thead>
       <tbody>
@@ -36,11 +36,11 @@ function public_entities(linksArray) {
             {
               name,
               url_path: url,
-              functiongroup1,
               department,
               department_slug,
               department_sphere,
               selected_year_slug,
+              pfma
             },
             index
           ) => {
@@ -66,7 +66,7 @@ function public_entities(linksArray) {
                     {department}
                   </a>
                 </td>
-                <td>{functiongroup1}</td>
+                <td>{pfma}</td>
                 <td>
                   <div className="PublicEntityGroup-expenditure-outer">
                     <div

diff --git a/budgetportal/views.py b/budgetportal/views.py
@@ -318,6 +318,7 @@ def public_entity_list_data(financial_year_id):
                     "department_sphere": public_entity.department.government.sphere.slug,
                     "functiongroup1": public_entity.functiongroup1,
                     "selected_year_slug": selected_year.slug,
+                    "pfma": public_entity.pfma,
                 }
             )
         public_entities = sorted(public_entities, key=lambda d: d["name"])