diff --git a/assets/js/apiData.js b/assets/js/apiData.js index 3737164..c06d587 100644 --- 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 index 065fc91..e06841a 100644 --- 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 index c704ca9..9abde7a 100644 --- 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 index d10f063..90fea94 100644 --- a/index.html +++ b/index.html @@ -179,7 +179,7 @@