Merge pull request #28 from globalfund/feat/DE-1428

DE-1428 | Change component names

src/config/mapping/budgets/treemap.json

@@ -6,7 +6,7 @@
   "urlParams1": "?$apply=filter(contains(indicatorName, 'reference') AND financialDataSet eq 'GrantBudget_ReferenceRate'<filterString>)/groupby((implementationPeriod/grant/<componentField>/name),aggregate(plannedAmount with sum as value))",
   "urlParams2": "?$apply=filter(contains(indicatorName, 'reference') AND financialDataSet eq 'GrantBudget_ReferenceRate'<filterString>)/groupby((implementationPeriod/grant/<componentField>/parent/name),aggregate(plannedAmount with sum as value))",
   "url1Items": ["Malaria", "Tuberculosis"],
-  "url2Items": ["HIV/AIDS", "Other"],
+  "url2Items": ["HIV", "Other"],
   "textbgcolors": [
     {
       "color": "#0A2840",

src/config/mapping/disbursements/barChart.json

@@ -5,6 +5,6 @@
   "urlParams1": "?$apply=filter(contains(indicatorName, 'reference') AND financialDataSet eq 'Disbursement_ReferenceRate'<filterString>)/groupby((implementationPeriod/grant/<componentField>/name),aggregate(actualAmount with sum as value))&$orderby=value desc",
   "urlParams2": "?$apply=filter(contains(indicatorName, 'reference') AND financialDataSet eq 'Disbursement_ReferenceRate'<filterString>)/groupby((implementationPeriod/grant/<componentField>/parent/name),aggregate(actualAmount with sum as value))&$orderby=value desc",
   "url1Items": ["Malaria", "Tuberculosis"],
-  "url2Items": ["HIV/AIDS", "Other"],
+  "url2Items": ["HIV", "Other"],
   "barColor": "#013E77"
 }

src/config/mapping/disbursements/lineChart.json

@@ -7,6 +7,6 @@
   "urlParams1": "?$apply=filter(contains(indicatorName, 'reference') AND financialDataSet eq 'Disbursement_ReferenceRate'<filterString>)/groupby((periodFrom,implementationPeriod/grant/<componentField>/name),aggregate(actualAmount with sum as value))",
   "urlParams2": "?$apply=filter(contains(indicatorName, 'reference') AND financialDataSet eq 'Disbursement_ReferenceRate'<filterString>)/groupby((periodFrom,implementationPeriod/grant/<componentField>/parent/name),aggregate(actualAmount with sum as value))",
   "url1Items": ["Malaria", "Tuberculosis"],
-  "url2Items": ["HIV/AIDS", "Other"],
+  "url2Items": ["HIV", "Other"],
   "colors": ["#0A2840", "#DEE1E7", "#013E77", "#00B5AE", "#C3EDFD", "#D9D9D9"]
 }

src/config/mapping/disbursements/table.json

@@ -10,5 +10,5 @@
   "urlParams1": "?$apply=filter(indicatorName in ('Total Signed Amount - Reference Rate','Total Commitment Amount - Reference Rate','Total Disbursed Amount - Reference Rate')<filterString>)/groupby((implementationPeriod/grant/<componentField>/name,indicatorName),aggregate(actualAmount with sum as value,implementationPeriod/grantId with countdistinct as count))&$orderby=value desc",
   "urlParams2": "?$apply=filter(indicatorName in ('Total Signed Amount - Reference Rate','Total Commitment Amount - Reference Rate','Total Disbursed Amount - Reference Rate')<filterString>)/groupby((implementationPeriod/grant/<componentField>/parent/name,indicatorName),aggregate(actualAmount with sum as value,implementationPeriod/grantId with countdistinct as count))&$orderby=value desc",
   "url1Items": ["Malaria", "Tuberculosis"],
-  "url2Items": ["HIV/AIDS", "Other"]
+  "url2Items": ["HIV", "Other"]
 }

src/config/mapping/expenditures/heatmap.json

@@ -5,7 +5,7 @@
   "cycle": "periodCovered",
   "urlParams": "?$apply=filter(financialDataSet eq 'Expenditure_Intervention_ReferenceRate' AND isLatestReported eq true<filterString>)/groupby((<rowField>,<columnField>),aggregate(actualAmountCumulative with sum as value1,plannedAmountCumulative with sum as value2))",
   "url1Items": ["Malaria", "Tuberculosis"],
-  "url2Items": ["HIV/AIDS", "Other"],
+  "url2Items": ["HIV", "Other"],
   "fields": {
     "principalRecipient": "implementationPeriod/grant/principalRecipient/name",
     "principalRecipientSubType": "implementationPeriod/grant/principalRecipient/type/name",

src/config/mapping/results/polyline.json

@@ -5,10 +5,10 @@
   "component": "activityArea.name",
   "value": "value",
   "componentColors": {
-    "HIV/AIDS": "#0A2840",
+    "HIV": "#0A2840",
     "Malaria": "#013E77",
     "Tuberculosis": "#00B5AE",
-    "HIV/TB": "#C3EDFD",
+    "TB/HIV": "#C3EDFD",
     "RSSH": "#D9D9D9"
   },
   "urlParams": "?$apply=filter(programmaticDataset eq 'Annual_Results'<filterString>)/groupby((indicatorName,activityArea/name,resultValueYear),aggregate(resultValueNumerator with sum as value))&$orderby=value desc"