Skip to content

Commit

Permalink
Merge 7d45634 into 806fe5a
Browse files Browse the repository at this point in the history
  • Loading branch information
@aunindadf
aunindadf committed May 25, 2016
2 parents 806fe5a + 7d45634 commit 04957cf
Show file tree
Hide file tree
Showing 14 changed files with 86 additions and 56 deletions.
12 changes: 8 additions & 4 deletions devtracker.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@
actualStartDate: projectData['actualStartDate'],
plannedEndDate: projectData['plannedEndDate'],
documentTypes: projectData['document_types'],
implementingOrgTypes: projectData['implementingOrg_types']
implementingOrgTypes: projectData['implementingOrg_types'],
projectCount: projectData['projects']['count']
}

end
Expand Down Expand Up @@ -197,7 +198,8 @@
actualStartDate: getRegionProjects['actualStartDate'],
plannedEndDate: getRegionProjects['plannedEndDate'],
documentTypes: getRegionProjects['document_types'],
implementingOrgTypes: getRegionProjects['implementingOrg_types']
implementingOrgTypes: getRegionProjects['implementingOrg_types'],
projectCount: getRegionProjects['projects']['count']
}
end

Expand Down Expand Up @@ -231,7 +233,8 @@
actualStartDate: getRegionProjects['actualStartDate'],
plannedEndDate: getRegionProjects['plannedEndDate'],
documentTypes: getRegionProjects['document_types'],
implementingOrgTypes: getRegionProjects['implementingOrg_types']
implementingOrgTypes: getRegionProjects['implementingOrg_types'],
projectCount: getRegionProjects['projects']['count']
}
end

Expand Down Expand Up @@ -301,7 +304,8 @@
actualStartDate: getRegionProjects['actualStartDate'],
plannedEndDate: getRegionProjects['plannedEndDate'],
documentTypes: getRegionProjects['document_types'],
implementingOrgTypes: getRegionProjects['implementingOrg_types']
implementingOrgTypes: getRegionProjects['implementingOrg_types'],
projectCount: getRegionProjects['projects']['count']
}
end

Expand Down
19 changes: 11 additions & 8 deletions helpers/country_helpers.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def get_country_details(countryCode)
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-GOV-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&activity_status=2")
totalActiveProjects = totalProjectsDetails['results'].select {|status| status['activity_status']['code'] =="2" }.length

if countryOperationalBudget.length > 0 then
Expand Down Expand Up @@ -291,9 +291,12 @@ 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-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}"
#oipa_project_list_count = 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['projectsCount']= JSON.parse(oipa_project_list_count)

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=2&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-GOV-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}&activity_status=2"
allProjectsData['highLevelSectorList'] = high_level_sector_list_filter(sectorValuesJSON)
#projects = projects_list['results']
allProjectsData['project_budget_higher_bound'] = 0
Expand All @@ -302,7 +305,7 @@ 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-GOV-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=actual_start_date&start_date_gte=1900-01-02"
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&start_date_gte=1900-01-02&activity_status=2"
allProjectsData['actualStartDate'] = JSON.parse(allProjectsData['actualStartDate'])
tempStartDate = allProjectsData['actualStartDate']['results'][0]['activity_dates'].select{|activityDate| activityDate['type']['code'] == '2'}.first
if (tempStartDate.nil?)
Expand All @@ -314,20 +317,20 @@ def get_country_all_projects_data(countryCode)
#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-GOV-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=-planned_end_date&end_date_isnull=False"
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&end_date_isnull=False&activity_status=2"
allProjectsData['plannedEndDate'] = JSON.parse(allProjectsData['plannedEndDate'])
allProjectsData['plannedEndDate'] = allProjectsData['plannedEndDate']['results'][0]['activity_dates'].select{|activityDate| activityDate['type']['code'] == '3'}.first
allProjectsData['plannedEndDate'] = allProjectsData['plannedEndDate']['iso_date']
#unless allProjectsData['plannedEndDate']['results'][0].nil?
# allProjectsData['plannedEndDate'] = allProjectsData['plannedEndDate']['results'][0]['activity_dates'][2]['iso_date']
#end
oipa_document_type_list = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=document_link_category&aggregations=count&reporting_organisation=GB-GOV-1&related_activity_recipient_country=#{countryCode}"
oipa_document_type_list = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=document_link_category&aggregations=count&reporting_organisation=GB-GOV-1&related_activity_recipient_country=#{countryCode}&activity_status=2"
document_type_list = JSON.parse(oipa_document_type_list)
allProjectsData['document_types'] = document_type_list['results']

#Implementing org type filters
participatingOrgInfo = JSON.parse(File.read('data/participatingOrgList.json'))
oipa_implementingOrg_type_list = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=participating_organisation&aggregations=count&reporting_organisation=GB-GOV-1&related_activity_recipient_country=#{countryCode}&hierarchy=1"
oipa_implementingOrg_type_list = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=participating_organisation&aggregations=count&reporting_organisation=GB-GOV-1&related_activity_recipient_country=#{countryCode}&hierarchy=1&activity_status=2"
implementingOrg_type_list = JSON.parse(oipa_implementingOrg_type_list)
allProjectsData['implementingOrg_types'] = implementingOrg_type_list['results']
allProjectsData['implementingOrg_types'].each do |implementingOrgs|
Expand All @@ -349,7 +352,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-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"}]
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=2&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
21 changes: 13 additions & 8 deletions helpers/region_helpers.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ def get_region_details(regionCode)
currentTotalRegionBudget= 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_region&aggregations=budget&recipient_region=#{regionCode}")
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-GOV-1&hierarchy=1&related_activity_recipient_region=#{regionCode}&format=json&fields=activity_status&page_size=2500")
totalProjectsDetails = get_total_project(RestClient.get settings.oipa_api_url + "activities/?reporting_organisation=GB-GOV-1&hierarchy=1&related_activity_recipient_region=#{regionCode}&format=json&fields=activity_status&page_size=2500&activity_status=2")
totalActiveProjects = totalProjectsDetails['results'].select {|status| status['activity_status']['code'] =="2" }.length

totalActiveProjects = totalProjectsDetails['results'].length

if currentTotalRegionBudget['count'] > 0 then
if currentTotalRegionBudget['results'][0]['budget'].nil? then
Expand Down Expand Up @@ -106,18 +106,23 @@ def dfid_regional_projects_data(regionType)

#Here variable n = related_activity_recipient_region
def get_region_projects(n)
oipa_project_list = RestClient.get settings.oipa_api_url + "activities/?hierarchy=1&format=json&reporting_organisation=GB-GOV-1&page_size=10&fields=aggregations,descriptions,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_recipient_region=#{n}"
oipa_project_list = RestClient.get settings.oipa_api_url + "activities/?hierarchy=1&format=json&reporting_organisation=GB-GOV-1&page_size=10&fields=aggregations,descriptions,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation&activity_status=2&ordering=-activity_plus_child_budget_value&related_activity_recipient_region=#{n}"
projects= JSON.parse(oipa_project_list)

oipa_project_list_count = RestClient.get settings.oipa_api_url + "activities/?hierarchy=1&format=json&reporting_organisation=GB-GOV-1&page_size=10&fields=aggregations,descriptions,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_recipient_region=#{n}"
projects_count= JSON.parse(oipa_project_list_count)

results = {}
sectorValuesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=sector&aggregations=count&reporting_organisation=GB-GOV-1&related_activity_recipient_region=#{n}"
results['projectsCount'] = projects_count
sectorValuesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=sector&aggregations=count&reporting_organisation=GB-GOV-1&related_activity_recipient_region=#{n}&activity_status=2"
results['highLevelSectorList'] = high_level_sector_list_filter(sectorValuesJSON)
results['project_budget_higher_bound'] = 0
results['actualStartDate'] = '1990-01-01T00:00:00'
results['plannedEndDate'] = '2000-01-01T00:00:00'
unless projects['results'][0].nil?
results['project_budget_higher_bound'] = projects['results'][0]['aggregations']['activity_children']['budget_value']
end
results['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_region=#{n}&ordering=actual_start_date&start_date_gte=1900-01-02"
results['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_region=#{n}&ordering=actual_start_date&start_date_gte=1900-01-02&activity_status=2"
results['actualStartDate'] = JSON.parse(results['actualStartDate'])
tempStartDate = results['actualStartDate']['results'][0]['activity_dates'].select{|activityDate| activityDate['type']['code'] == '2'}.first
if (tempStartDate.nil?)
Expand All @@ -128,7 +133,7 @@ def get_region_projects(n)
#unless results['actualStartDate']['results'][0].nil?
# results['actualStartDate'] = results['actualStartDate']['results'][0]['activity_dates'][1]['iso_date']
#end
results['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_region=#{n}&ordering=-planned_end_date&end_date_isnull=False"
results['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_region=#{n}&ordering=-planned_end_date&end_date_isnull=False&activity_status=2"
results['plannedEndDate'] = JSON.parse(results['plannedEndDate'])
results['plannedEndDate'] = results['plannedEndDate']['results'][0]['activity_dates'].select{|activityDate| activityDate['type']['code'] == '3'}.first
results['plannedEndDate'] = results['plannedEndDate']['iso_date']
Expand All @@ -142,13 +147,13 @@ def get_region_projects(n)
#end
results['projects'] = projects
#This code is created for generating the left hand side document type filter list
oipa_document_type_list = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=document_link_category&aggregations=count&reporting_organisation=GB-GOV-1&related_activity_recipient_region=#{n}"
oipa_document_type_list = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=document_link_category&aggregations=count&reporting_organisation=GB-GOV-1&related_activity_recipient_region=#{n}&activity_status=2"
document_type_list = JSON.parse(oipa_document_type_list)
results['document_types'] = document_type_list['results']

#Implementing org type filters
participatingOrgInfo = JSON.parse(File.read('data/participatingOrgList.json'))
oipa_implementingOrg_type_list = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=participating_organisation&aggregations=count&reporting_organisation=GB-GOV-1&related_activity_recipient_region=#{n}&hierarchy=1"
oipa_implementingOrg_type_list = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=participating_organisation&aggregations=count&reporting_organisation=GB-GOV-1&related_activity_recipient_region=#{n}&hierarchy=1&activity_status=2"
implementingOrg_type_list = JSON.parse(oipa_implementingOrg_type_list)
results['implementingOrg_types'] = implementingOrg_type_list['results']
results['implementingOrg_types'].each do |implementingOrgs|
Expand Down

0 comments on commit 04957cf

Please sign in to comment.