2024 as the default year

UN-OCHA · Mar 1, 2024 · ceb44ce · ceb44ce
1 parent 3e40bf2
commit ceb44ce
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/assets/js/apiData.js b/assets/js/apiData.js
@@ -7,10 +7,11 @@ function LoadData() {
     LoadCBPFSummary(year);
     LoadAmount();
     LoadDate();
-    const event = new CustomEvent("d3ChartsYear", {
-        detail: +year
-    });
-    document.body.dispatchEvent(event);
+	//temporarily removing until fixing 2024 summary data
+    // const event = new CustomEvent("d3ChartsYear", {
+    //     detail: +year
+    // });
+    // document.body.dispatchEvent(event);
 }
 
 

diff --git a/assets/js/theme.js b/assets/js/theme.js
@@ -3,7 +3,7 @@ var currentyear = d.getFullYear();
 var changedYear = 0;
 
 var minYear = 2014;
-var yearToShowDataOnLoad = 2022;
+var yearToShowDataOnLoad = 2024;
 
 $(function() {
     $('.annualHeading__2uJLv').text(yearToShowDataOnLoad);
@@ -232,7 +232,7 @@ let $underApproval_ = document.querySelector('#underApprovalFig');
 let $updatedOn_ = document.querySelector('#updatedOn');
 let $allocationYear = document.querySelector('.annualHeading__2uJLv');
 
-var yearToShowDataOnLoad = 2022;
+var yearToShowDataOnLoad = 2024;
 
 fetch('https://cbpfapi.unocha.org/vo2/odata/LastModified')
     .then(function(response) {

diff --git a/charts/sankeydiagram.js b/charts/sankeydiagram.js
@@ -2333,7 +2333,7 @@
 		};
 
 		rawDataContributions.forEach(row => {
-			if (chartState.selectedYear.includes(row.contributionYear) && chartState.selectedFund.includes(row.fundId) && (row.paidAmount + row.pledgedAmount)) {
+			if (chartState.selectedYear.includes(row.contributionYear) && chartState.selectedFund.includes(row.fundId) && (row.paidAmount + row.pledgedAmount) && +row.donorId === +row.donorId) {
 
 				const foundSource = data.nodes.find(d => d.level === 1 && d.codeId === row.donorId);
 

diff --git a/index.html b/index.html
@@ -179,7 +179,7 @@ <h1 class="font-weight-bold mb-2 mt-5 font-3rem"><span style="color: #ffc417;">C
 			</div>
             <div class="row">  	
 				<div class="border-top pt-3">	
-                	<div id="d3chartcontainercesank" data-title=" " data-year="2022" data-responsive="false" data-lazyload="true"></div><script type="text/javascript" src="charts/sankeydiagram.js"></script>	
+                	<div id="d3chartcontainercesank" data-title=" " data-year="2024" data-responsive="false" data-lazyload="true"></div><script type="text/javascript" src="charts/sankeydiagram.js"></script>	
 				</div>	
             </div>
 		</div>
@@ -201,7 +201,7 @@ <h1 class="font-weight-bold mb-2 mt-5 font-3rem"><span style="color: #ffc417;">C
 					</ul>
 					<div class="tab-content border-top pt-3" id="myTabContent">
 						<div class="tab-pane active show" id="allocation-overview" role="tabpanel" aria-labelledby="allocation-overview-tab">
-                            <div><div id="d3chartcontainerallocover" data-title=" " data-year="2022" data-cerfallocation="total" data-shownames="false" data-showhelp="false" data-showlink="false" data-responsive="true" data-lazyload="true"></div><script type="text/javascript" src="charts/allocationsoverview.js"></script></div>
+                            <div><div id="d3chartcontainerallocover" data-title=" " data-year="2024" data-cerfallocation="total" data-shownames="false" data-showhelp="false" data-showlink="false" data-responsive="true" data-lazyload="true"></div><script type="text/javascript" src="charts/allocationsoverview.js"></script></div>
                         </div>
 					</div>
 				</div>