Skip to content

Commit

Permalink
1. Resolve API for 2.01 data with GB-GOV-1
Browse files Browse the repository at this point in the history 
2. Resolve Region Data for 2.01 data
  • Loading branch information
@g-shafiullah
g-shafiullah committed Feb 29, 2016
1 parent 6712eb3 commit c1fae1c
Show file tree
Hide file tree
Showing 9 changed files with 61 additions and 152 deletions.
109 changes: 9 additions & 100 deletions data/dfidRegions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,48 +13,6 @@
"type":"Regional",
"url":"http://iati.dfid.gov.uk/iati_files/Region/DFID-Asia-regional-798.xml"
},
{
"code":"AB",
"name":"Asia Regional Poverty Fund",
"description":"",
"type":"Regional",
"url":"http://iati.dfid.gov.uk/iati_files/Non_Iati_Region/DFID-Asia-regional-Poverty-Fund-AB.xml"
},
{
"code":"BL",
"name":"Balkan Regional",
"description":"",
"type":"Regional",
"url":"http://iati.dfid.gov.uk/iati_files/Non_Iati_Region/DFID-Balkan-Regional-BL.xml"
},
{
"code":"CP",
"name":"Central Africa Regional",
"description":"",
"type":"Regional",
"url":"http://iati.dfid.gov.uk/iati_files/Non_Iati_Region/DFID-Central-Africa-Regional-CP.xml"
},
{
"code":"EA",
"name":"East Africa",
"description":"",
"type":"Regional",
"url":"http://iati.dfid.gov.uk/iati_files/Non_Iati_Region/DFID-East-Africa-EA.xml"
},
{
"code":"ED",
"name":"East Europe Regional",
"description":"",
"type":"Regional",
"url":"http://iati.dfid.gov.uk/iati_files/Non_Iati_Region/DFID-East-Europe-Regional-ED.xml"
},
{
"code":"EF",
"name":"EECAD Regional",
"description":"",
"type":"Regional",
"url":"http://iati.dfid.gov.uk/iati_files/Non_Iati_Region/DFID-EECAD-Regional-EF.xml"
},
{
"code":"89",
"name":"Europe",
Expand All @@ -63,32 +21,11 @@
"url":"http://iati.dfid.gov.uk/iati_files/Region/DFID-Europe-regional-89.xml"
},
{
"code":"FA",
"name":"Francophone Africa",
"description":"",
"type":"Regional",
"url":"http://iati.dfid.gov.uk/iati_files/Non_Iati_Region/DFID-Francophone-Africa-FA.xml"
},
{
"code":"IB",
"name":"Indian Ocean Asia Regional",
"code":"389",
"name":"North & Central America",
"description":"",
"type":"Regional",
"url":"http://iati.dfid.gov.uk/iati_files/Non_Iati_Region/DFID-Indian-Ocean-Asia-Regional-IB.xml"
},
{
"code":"LE",
"name":"Latin America Regional",
"description":"",
"type":"Regional",
"url":"http://iati.dfid.gov.uk/iati_files/Non_Iati_Region/DFID-Latin-America-Regional-LE.xml"
},
{
"code":"589",
"name":"Middle East",
"description":"",
"type":"Regional",
"url":"http://iati.dfid.gov.uk/iati_files/Region/DFID-Middle-East-regional-589.xml"
"url":"http://iati.dfid.gov.uk/iati_files/Region/DFID-North-&-Central-America-regional-389.xml"
},
{
"code":"189",
Expand All @@ -98,18 +35,11 @@
"url":"http://iati.dfid.gov.uk/iati_files/Region/DFID-North-of-Sahara-regional-189.xml"
},
{
"code":"OT",
"name":"Overseas Territories",
"description":"",
"type":"Regional",
"url":"http://iati.dfid.gov.uk/iati_files/Non_Iati_Region/DFID-Overseas-Territories-OT.xml"
},
{
"code":"SQ",
"name":"South East Asia",
"code":"679",
"name":"South Asia",
"description":"",
"type":"Regional",
"url":"http://iati.dfid.gov.uk/iati_files/Non_Iati_Region/DFID-South-East-Asia-SQ.xml"
"url":"http://iati.dfid.gov.uk/iati_files/Region/DFID-South-Asia-regional-679.xml"
},
{
"code":"289",
Expand All @@ -126,31 +56,10 @@
"url":"http://iati.dfid.gov.uk/iati_files/Region/DFID-West-Indies-regional-380.xml"
},
{
"code":"ZZ",
"name":"Multilateral Organisation",
"code":"998",
"name":"Developing Countries Unspecified",
"description":"",
"type":"Global",
"url":"http://iati.dfid.gov.uk/iati_files/Non_Iati_Region/DFID-Multilateral-Organisation-ZZ.xml"
},
{
"code":"NS",
"name":"Non Specific Country",
"description":"",
"type":"Global",
"url":"http://iati.dfid.gov.uk/iati_files/Non_Iati_Region/DFID-Non-Specific-Country-NS-1.xml"
},
{
"code":"SF",
"name":"Sahel",
"description":"",
"type":"Regional",
"url":"http://iati.dfid.gov.uk/iati_files/Non_Iati_Region/DFID-Sahel-SF.xml"
},
{
"code":"XA",
"name":"Southern Africa Development Cooperation Committee",
"description":"",
"type":"Regional",
"url":"http://iati.dfid.gov.uk/iati_files/Non_Iati_Region/DFID-Sthrn-Af-Dev-Coord-Ctte-XA.xml"
"url":"http://iati.dfid.gov.uk/iati_files/Region/DFID-Developing-countries-unspecified-998-1.xml"
}
]
10 changes: 5 additions & 5 deletions devtracker.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@
x.report("Loading Time: ") {
country = get_country_details(n)
results = get_country_results(n)
countryYearWiseBudgets= get_country_region_yearwise_budget_graph_data(RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-1&group_by=budget_per_quarter&aggregations=budget&recipient_country=#{n}&order_by=year,quarter")
countrySectorGraphData = get_country_sector_graph_data(RestClient.get settings.oipa_api_url + "activities/aggregations/?reporting_organisation=GB-1&order_by=-budget&group_by=sector&aggregations=budget&format=json&related_activity_recipient_country=#{n}")
countryYearWiseBudgets= get_country_region_yearwise_budget_graph_data(RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-GOV-1&group_by=budget_per_quarter&aggregations=budget&recipient_country=#{n}&order_by=year,quarter")
countrySectorGraphData = get_country_sector_graph_data(RestClient.get settings.oipa_api_url + "activities/aggregations/?reporting_organisation=GB-GOV-1&order_by=-budget&group_by=sector&aggregations=budget&format=json&related_activity_recipient_country=#{n}")
}
end
settings.devtracker_page_title = 'Country ' + country[:name] + ' Summary Page'
Expand Down Expand Up @@ -156,7 +156,7 @@
country = get_country_code_name(n)
results = get_country_results(n)
resultsPillar = results_pillar_wise_indicators(n,results)
totalProjects = get_total_project(RestClient.get settings.oipa_api_url + "activities/?reporting_organisation=GB-1&hierarchy=1&related_activity_recipient_country=#{n}&format=json&fields=activity_status&page_size=250")
totalProjects = get_total_project(RestClient.get settings.oipa_api_url + "activities/?reporting_organisation=GB-GOV-1&hierarchy=1&related_activity_recipient_country=#{n}&format=json&fields=activity_status&page_size=250")
settings.devtracker_page_title = 'Country '+country[:name]+' Results Page'
erb :'countries/results',
:layout => :'layouts/layout',
Expand Down Expand Up @@ -259,8 +259,8 @@
get '/regions/:region_code/?' do |n|
n = sanitize_input(n,"p")
region = get_region_details(n)
regionYearWiseBudgets= get_country_region_yearwise_budget_graph_data(RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-1&group_by=budget_per_quarter&aggregations=budget&recipient_region=#{n}&order_by=year,quarter")
regionSectorGraphData = get_country_sector_graph_data(RestClient.get settings.oipa_api_url + "activities/aggregations/?reporting_organisation=GB-1&order_by=-budget&group_by=sector&aggregations=budget&format=json&recipient_region=#{n}")
regionYearWiseBudgets= get_country_region_yearwise_budget_graph_data(RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-GOV-1&group_by=budget_per_quarter&aggregations=budget&recipient_region=#{n}&order_by=year,quarter")
regionSectorGraphData = get_country_sector_graph_data(RestClient.get settings.oipa_api_url + "activities/aggregations/?reporting_organisation=GB-GOV-1&order_by=-budget&group_by=sector&aggregations=budget&format=json&recipient_region=#{n}")
settings.devtracker_page_title = 'Region '+region[:name]+' Summary Page'
erb :'regions/region',
:layout => :'layouts/layout',
Expand Down
20 changes: 10 additions & 10 deletions helpers/country_helpers.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def get_top_5_countries()

countriesInfo = JSON.parse(File.read('data/countries.json'))

top5countriesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?reporting_organisation=GB-1&group_by=recipient_country&aggregations=budget&budget_period_start=#{firstDayOfFinYear}&budget_period_end=#{lastDayOfFinYear}&order_by=-budget&page_size=5&format=json"
top5countriesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?reporting_organisation=GB-GOV-1&group_by=recipient_country&aggregations=budget&budget_period_start=#{firstDayOfFinYear}&budget_period_end=#{lastDayOfFinYear}&order_by=-budget&page_size=5&format=json"
top5countries = JSON.parse(top5countriesJSON)

top5countriesBudget = top5countries["results"].map do |elem|
Expand Down Expand Up @@ -102,10 +102,10 @@ def get_country_details(countryCode)
countryOperationalBudgetInfo = Oj.load(File.read('data/countries_operational_budgets.json'))
countryOperationalBudget = countryOperationalBudgetInfo.select {|result| result['code'] == countryCode}

currentTotalCountryBudget= get_current_total_budget(RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-1&budget_period_start=#{firstDayOfFinYear}&budget_period_end=#{lastDayOfFinYear}&group_by=recipient_country&aggregations=budget&recipient_country=#{countryCode}")
currentTotalDFIDBudget = get_current_dfid_total_budget(RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-1&budget_period_start=#{firstDayOfFinYear}&budget_period_end=#{lastDayOfFinYear}&group_by=reporting_organisation&aggregations=budget")
currentTotalCountryBudget= get_current_total_budget(RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-GOV-1&budget_period_start=#{firstDayOfFinYear}&budget_period_end=#{lastDayOfFinYear}&group_by=recipient_country&aggregations=budget&recipient_country=#{countryCode}")
currentTotalDFIDBudget = get_current_dfid_total_budget(RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-GOV-1&budget_period_start=#{firstDayOfFinYear}&budget_period_end=#{lastDayOfFinYear}&group_by=reporting_organisation&aggregations=budget")

totalProjectsDetails = get_total_project(RestClient.get settings.oipa_api_url + "activities/?reporting_organisation=GB-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&format=json&fields=activity_status&page_size=250")
totalProjectsDetails = get_total_project(RestClient.get settings.oipa_api_url + "activities/?reporting_organisation=GB-GOV-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&format=json&fields=activity_status&page_size=250")
totalActiveProjects = totalProjectsDetails['results'].select {|status| status['activity_status']['code'] =="2" }.length

if countryOperationalBudget.length > 0 then
Expand Down Expand Up @@ -291,9 +291,9 @@ def get_country_all_projects_data(countryCode)
allProjectsData['countryAllProjectFilters'] = get_static_filter_list()
allProjectsData['country'] = get_country_code_name(countryCode)
allProjectsData['results'] = get_country_results(countryCode)
oipa_project_list = RestClient.get settings.oipa_api_url + "activities/?hierarchy=1&format=json&reporting_organisation=GB-1&page_size=10&fields=descriptions,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,aggregations&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_recipient_country=#{countryCode}"
oipa_project_list = RestClient.get settings.oipa_api_url + "activities/?hierarchy=1&format=json&reporting_organisation=GB-GOV-1&page_size=10&fields=descriptions,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,aggregations&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_recipient_country=#{countryCode}"
allProjectsData['projects']= JSON.parse(oipa_project_list)
sectorValuesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=sector&aggregations=count&reporting_organisation=GB-1&related_activity_recipient_country=#{countryCode}"
sectorValuesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=sector&aggregations=count&reporting_organisation=GB-GOV-1&related_activity_recipient_country=#{countryCode}"
allProjectsData['highLevelSectorList'] = high_level_sector_list_filter(sectorValuesJSON)
#projects = projects_list['results']
allProjectsData['project_budget_higher_bound'] = 0
Expand All @@ -302,12 +302,12 @@ def get_country_all_projects_data(countryCode)
unless allProjectsData['projects']['results'][0].nil?
allProjectsData['project_budget_higher_bound'] = allProjectsData['projects']['results'][0]['aggregations']['activity_children']['budget_value']
end
###allProjectsData['actualStartDate'] = RestClient.get settings.oipa_api_url + "activities?format=json&page_size=1&fields=activity_dates&reporting_organisation=GB-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=actual_start_date"
###allProjectsData['actualStartDate'] = RestClient.get settings.oipa_api_url + "activities?format=json&page_size=1&fields=activity_dates&reporting_organisation=GB-GOV-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=actual_start_date"
###allProjectsData['actualStartDate'] = JSON.parse(allProjectsData['actualStartDate'])
###unless allProjectsData['actualStartDate']['results'][0].nil?
###allProjectsData['actualStartDate'] = allProjectsData['actualStartDate']['results'][0]['activity_dates'][1]['iso_date']
###end
###allProjectsData['plannedEndDate'] = RestClient.get settings.oipa_api_url + "activities?format=json&page_size=1&fields=activity_dates&reporting_organisation=GB-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=-planned_end_date"
###allProjectsData['plannedEndDate'] = RestClient.get settings.oipa_api_url + "activities?format=json&page_size=1&fields=activity_dates&reporting_organisation=GB-GOV-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=-planned_end_date"
###allProjectsData['plannedEndDate'] = JSON.parse(allProjectsData['plannedEndDate'])
###unless allProjectsData['plannedEndDate']['results'][0].nil?
###allProjectsData['plannedEndDate'] = allProjectsData['plannedEndDate']['results'][0]['activity_dates'][2]['iso_date']
Expand All @@ -317,7 +317,7 @@ def get_country_all_projects_data(countryCode)

def get_country_all_projects_data_para(countryCode)
allProjectsData = {}
apiLinks = [{"title"=>"oipa_project_list", "link"=>"activities/?hierarchy=1&format=json&reporting_organisation=GB-1&page_size=10&fields=descriptions,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,aggregations&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_recipient_country=#{countryCode}"},{"title"=>"sectorValuesJSON", "link"=>"activities/aggregations/?format=json&group_by=sector&aggregations=count&reporting_organisation=GB-1&related_activity_recipient_country=#{countryCode}"},{"title"=>"actualStartDate", "link"=>"activities/?format=json&page_size=1&fields=activity_dates&reporting_organisation=GB-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=actual_start_date"},{"title"=>"plannedEndDate", "link"=>"activities/?format=json&page_size=1&fields=activity_dates&reporting_organisation=GB-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=-planned_end_date"}]
apiLinks = [{"title"=>"oipa_project_list", "link"=>"activities/?hierarchy=1&format=json&reporting_organisation=GB-GOV-1&page_size=10&fields=descriptions,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,aggregations&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_recipient_country=#{countryCode}"},{"title"=>"sectorValuesJSON", "link"=>"activities/aggregations/?format=json&group_by=sector&aggregations=count&reporting_organisation=GB-GOV-1&related_activity_recipient_country=#{countryCode}"},{"title"=>"actualStartDate", "link"=>"activities/?format=json&page_size=1&fields=activity_dates&reporting_organisation=GB-GOV-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=actual_start_date"},{"title"=>"plannedEndDate", "link"=>"activities/?format=json&page_size=1&fields=activity_dates&reporting_organisation=GB-GOV-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=-planned_end_date"}]
returnedAPIData = ""
EM.synchrony do
concurrency = 4
Expand Down Expand Up @@ -354,7 +354,7 @@ def get_country_all_projects_data_para(countryCode)
end

def get_country_all_projects_rss(countryCode)
rssJSON = RestClient.get settings.oipa_api_url + "activities/?format=json&reporting_organisation=GB-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=-last_updated_datetime&fields=last_updated_datetime,title,descriptions,iati_identifier&page_size=500"
rssJSON = RestClient.get settings.oipa_api_url + "activities/?format=json&reporting_organisation=GB-GOV-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=-last_updated_datetime&fields=last_updated_datetime,title,descriptions,iati_identifier&page_size=500"
rssData = JSON.parse(rssJSON)
rssResults = rssData['results']
end
Expand Down
Loading

0 comments on commit c1fae1c

Please sign in to comment.