Skip to content

Commit

Permalink
feat: data implementation for access to funding
Browse files Browse the repository at this point in the history
  • Loading branch information
stephanoshadjipetrou committed Mar 31, 2023
1 parent eada4c8 commit 1a44aac
Show file tree
Hide file tree
Showing 13 changed files with 577 additions and 58 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"axios": "^0.24.0",
"lodash": "^4.17.21",
"map-transform": "^0.3.12",
"moment": "^2.29.1",
"moment": "^2.29.4",
"nodemon": "^2.0.7",
"querystring": "^0.2.1",
"tslib": "^2.3.1"
Expand Down
5 changes: 4 additions & 1 deletion src/config/filtering/eligibility.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@
"country": "geographicAreaCode_ISO3",
"component": "componentName",
"period": "eligibilityYear",
"search": "(contains(geographicAreaName,<value>) OR contains(componentName,<value>) OR contains(isEligible,<value>) OR contains(diseaseBurdenName,<value>))"
"cycle": "allocationCycleName",
"disease": "diseaseBurdenName",
"status": "isEligible",
"search": "(contains(geographicAreaName,<value>) OR contains(componentName,<value>) OR contains(isEligible,<value>) OR contains(diseaseBurdenName,<value>) OR contains(incomeLevelClassificationName,<value>))"
}
9 changes: 9 additions & 0 deletions src/config/filtering/fundingrequests.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"country": "geographicArea/geographicAreaCode_ISO3",
"component": "fundingRequestComponents/any(c: c/component/componentName in (<value>))",
"cycle": "grantCycle/grantCycleCoveragePeriod",
"trpwindow": "trP_Window",
"portfolioCategory": "portfolioCategory",
"multicountry": "multicountry/multiCountryName",
"search": "(contains(geographicArea/geographicAreaName,<value>) OR contains(multiCountry/multiCountryName,<value>) OR contains(fundingRequestComponents/component/componentName,<value>) OR contains(grantCycle/grantCycleCoveragePeriod,<value>) OR contains(trP_Window,<value>))"
}
6 changes: 6 additions & 0 deletions src/config/mapping/eligibility/scatterplot.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,14 @@
"no": "Not Eligible",
"year": "eligibilityYear",
"transition funding": "Transition Funding",
"statusValues": {
"Yes": "Eligible",
"No": "Not Eligible",
"Transition Funding": "Transition Funding"
},
"incomeLevel": "incomeLevelClassificationName",
"diseaseBurden": "diseaseBurdenName",
"component": "componentName",
"aggregateByField": "componentName",
"defaultFilter": "$filter=geographicAreaCode_ISO3 eq 'AFG'&",
"defaultSelect": "$select=componentName,geographicAreaName,isEligible,incomeLevelClassificationName,diseaseBurdenName,eligibilityYear",
Expand Down
37 changes: 37 additions & 0 deletions src/config/mapping/fundingrequests/table.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"dataPath": "value",
"tableMap": [
"value[]",
{
"country": "geographicArea.geographicAreaName",
"countryCode": "geographicArea.geographicAreaCode_ISO3",
"multicountry": "multiCountry.multiCountryName",
"name": "fundingRequestName",
"submissionDate": "fundingRequestSubmissionDate",
"components": [
"fundingRequestComponents",
{
"component": "component.componentName"
}
],
"approach": "fundingRequestReviewApproach",
"trpwindow": "trP_Window",
"trpoutcome": "trP_Outcome",
"gacmeeting": "fundingRequestGrantAgreementImplementationPeriods[0].meetingStartDate",
"boardApproval": "fundingRequestGrantAgreementImplementationPeriods[0].grantAgreementImplementationPeriod.boardApprovalDate",
"items": [
"fundingRequestGrantAgreementImplementationPeriods[]",
{
"IPGrantNumber": "grantAgreementImplementationPeriod.grantAgreement.grantAgreementNumber",
"IPStartDate": "grantAgreementImplementationPeriod.implementationPeriodStartDate",
"IPEndDate": "grantAgreementImplementationPeriod.implementationPeriodEndDate"
}
]
}
],
"defaultExpand": "$expand=multiCountry,geographicArea,fundingRequestComponents($expand=component),fundingRequestGrantAgreementImplementationPeriods($expand=grantAgreementImplementationPeriod($expand=grantAgreement))",
"portfolioCategoryAggregationField": "portfolioCategory",
"portfolioCategoriesCodelistAggregation": "$apply=groupby((portfolioCategory))",
"trpWindowAggregationField": "trP_Window",
"trpWindowCodelistAggregation": "$apply=groupby((trP_Window))"
}
2 changes: 2 additions & 0 deletions src/config/urls/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"grantDetailGrants": "https://fetch.theglobalfund.org/v3.4/odata/GrantAgreementImplementationPeriods",
"grantPeriods": "https://fetch.theglobalfund.org/v3.4/odata/GrantAgreementImplementationPeriods",
"vgrantPeriods": "https://fetch.theglobalfund.org/v3.4/odata/VGrantAgreementImplementationPeriods",
"grantCycles": "https://fetch.theglobalfund.org/v3.4/odata/grantCycles",
"grantDetailDisbursements": "https://fetch.theglobalfund.org/v3.4/odata/GrantAgreementDisbursements",
"budgets": "https://fetch.theglobalfund.org/v3.4/odata/GrantAgreementImplementationPeriodDetailedBudgets",
"allocations": "https://fetch.theglobalfund.org/v3.4/odata/Allocations",
Expand All @@ -18,6 +19,7 @@
"pledgescontributions": "https://fetch.theglobalfund.org/v3.4/odata/PledgesAndContributions",
"performancerating": "https://fetch.theglobalfund.org/v3.4/odata/GrantAgreementProgressUpdates",
"performanceframework": "https://fetch.theglobalfund.org/v3.4/odata/GrantAgreementImplementationPeriodPerformanceFrameworks",
"fundingrequests": "https://fetch.theglobalfund.org/v3.4/odata/FundingRequests",
"multicountries": "https://fetch.theglobalfund.org/v3.4/odata/MultiCountries",
"indicators": "https://fetch.theglobalfund.org/v3.4/odata/VNationalHealthAndDevelopmentIndicators",
"filteroptionslocations": "https://fetch.theglobalfund.org/v3.4/odata/GeographicAreas?$select=geographicAreaCode_ISO3,geographicAreaCode_ISO2,geographicAreaId,geographicAreaName,geographicAreaParentId&$expand=members($select=geographicAreaCode_ISO3,geographicAreaCode_ISO2,geographicAreaId,geographicAreaName,geographicAreaParentId;$expand=members($select=geographicAreaCode_ISO3,geographicAreaCode_ISO2,geographicAreaId,geographicAreaName,geographicAreaParentId;$expand=members($select=geographicAreaCode_ISO3,geographicAreaCode_ISO2,geographicAreaId,geographicAreaName,geographicAreaParentId;$expand=members)))&$filter=geographicAreaName eq 'World'",
Expand Down
Loading

0 comments on commit 1a44aac

Please sign in to comment.