working on change requests

vulekamali · Aug 18, 2023 · f6a295c · f6a295c
1 parent f00d1d1
commit f6a295c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/assets/js/scenes/department/ExpenditurePhaseSection/index.html b/assets/js/scenes/department/ExpenditurePhaseSection/index.html
@@ -72,9 +72,11 @@ <h3 class="Title Title--section">Budgeted and actual expenditure comparison</h3>
                     {% include 'components/ChartLabel/index.html' with index="3" label="Audited outcome" %}
                 </div>
 
-                <div class="ExpenditurePhaseSection-labelItem">
-                    {% include 'components/ChartLabel/index.html' with index="4" label="Actual expenditure" %}
-                </div>
+                {% if sphere.slug == "national" %}
+                    <div class="ExpenditurePhaseSection-labelItem">
+                        {% include 'components/ChartLabel/index.html' with index="4" label="Actual expenditure" %}
+                    </div>
+                {% endif %}
             </div>
 
             <div class="Card">

diff --git a/budgetportal/datasets.py b/budgetportal/datasets.py
@@ -10,7 +10,7 @@
     AdjustedEstimatesOfExpenditure,
     EstimatesOfExpenditure,
     ExpenditureTimeSeries,
-    BudgetedAndActualExpenditure,
+    BudgetedAndActualExpenditureComparison,
 )
 from ckanapi import NotFound
 from django.conf import settings
@@ -200,7 +200,7 @@ def get_openspending_api(self):
             "budgeted-and-actual-national-expenditure": ExpenditureTimeSeries,
             "budgeted-and-actual-provincial-expenditure": ExpenditureTimeSeries,
             "consolidated-expenditure-budget": ExpenditureTimeSeries,
-            "in-year-spending": BudgetedAndActualExpenditure,
+            "in-year-spending": BudgetedAndActualExpenditureComparison,
         }
         api_class = api_class_mapping[self.category.slug]
         self._openspending_api = api_class(api_resource["url"])

diff --git a/budgetportal/openspending.py b/budgetportal/openspending.py
@@ -230,7 +230,7 @@ def get_adjustment_kind_ref(self):
         return self.get_ref(self.get_adjustment_kind_dimension(), "label")
 
 
-class BudgetedAndActualExpenditure(BabbageFiscalDataset):
+class BudgetedAndActualExpenditureComparison(BabbageFiscalDataset):
     def get_financial_year_ref(self):
         return self.get_ref(self.get_financial_year_dimension(), "label")
 

diff --git a/budgetportal/urls.py b/budgetportal/urls.py
@@ -261,7 +261,7 @@ def trigger_error(request):
     # Budget comparison
     url(
         r"actual-expenditure/",
-        views.actual_expenditure_json,
+        views.iym_datasets_json,
         name="actual-expenditure",
     ),
     # Sitemap

diff --git a/budgetportal/views.py b/budgetportal/views.py
@@ -1110,7 +1110,7 @@ def department_preview(
     return render(request, "department_preview.html", context)
 
 
-def actual_expenditure_json(request):
+def iym_datasets_json(request):
     query = {"fq": ('+groups: "in-year-spending"' '+vocab_spheres: "national"')}
     search_response = ckan.action.package_search(**query)
     department_name = request.GET.get("department_name", "")