diff --git a/data/dfidRegions.json b/data/dfidRegions.json index 066d72b5..24d47547 100644 --- a/data/dfidRegions.json +++ b/data/dfidRegions.json @@ -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", @@ -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", @@ -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", @@ -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" } ] diff --git a/devtracker.rb b/devtracker.rb index d07db527..b81b7e1a 100644 --- a/devtracker.rb +++ b/devtracker.rb @@ -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' @@ -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', @@ -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', diff --git a/helpers/country_helpers.rb b/helpers/country_helpers.rb index db4cb15c..427b57f7 100755 --- a/helpers/country_helpers.rb +++ b/helpers/country_helpers.rb @@ -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| @@ -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 @@ -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 @@ -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'] @@ -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 @@ -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 diff --git a/helpers/project_helpers.rb b/helpers/project_helpers.rb index 7ab55b52..03548b53 100644 --- a/helpers/project_helpers.rb +++ b/helpers/project_helpers.rb @@ -55,7 +55,7 @@ def get_transaction_details(projectId) def get_project_yearwise_budget(projectId) if is_dfid_project(projectId) then - oipaYearWiseBudgets=RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-1&group_by=budget_per_quarter&aggregations=budget&related_activity_id=#{projectId}&order_by=year,quarter" + oipaYearWiseBudgets=RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-GOV-1&group_by=budget_per_quarter&aggregations=budget&related_activity_id=#{projectId}&order_by=year,quarter" else oipaYearWiseBudgets=RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=budget_per_quarter&aggregations=budget&id=#{projectId}&order_by=year,quarter" end @@ -72,10 +72,10 @@ def dfid_country_map_data current_first_day_of_financial_year = first_day_of_financial_year(DateTime.now) current_last_day_of_financial_year = last_day_of_financial_year(DateTime.now) - oipaCountryProjectBudgetValuesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-1&budget_period_start=#{current_first_day_of_financial_year}&budget_period_end=#{current_last_day_of_financial_year}&group_by=recipient_country&aggregations=count,budget&order_by=recipient_country" + oipaCountryProjectBudgetValuesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-GOV-1&budget_period_start=#{current_first_day_of_financial_year}&budget_period_end=#{current_last_day_of_financial_year}&group_by=recipient_country&aggregations=count,budget&order_by=recipient_country" projectBudgetValues = JSON.parse(oipaCountryProjectBudgetValuesJSON) projectBudgetValues = projectBudgetValues['results'] - oipaCountryProjectCountJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&hierarchy=1&reporting_organisation=GB-1&group_by=recipient_country&aggregations=count&reporting_organisation=GB-1" + oipaCountryProjectCountJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&hierarchy=1&reporting_organisation=GB-GOV-1&group_by=recipient_country&aggregations=count&reporting_organisation=GB-GOV-1" projectValues = JSON.parse(oipaCountryProjectCountJSON) projectCountValues = projectValues['results'] countriesList = JSON.parse(File.read('data/countries.json')) @@ -126,7 +126,7 @@ def reporting_organisation(project) def get_implementing_orgs(projectId) if is_dfid_project(projectId) then - implementingOrgsDetailsJSON = RestClient.get settings.oipa_api_url + "activities/?format=json&reporting_organisation=GB-1&hierarchy=2&related_activity_id=#{projectId}&fields=participating_organisations" + implementingOrgsDetailsJSON = RestClient.get settings.oipa_api_url + "activities/?format=json&reporting_organisation=GB-GOV-1&hierarchy=2&related_activity_id=#{projectId}&fields=participating_organisations" else implementingOrgsDetailsJSON = RestClient.get settings.oipa_api_url + "activities/?format=json&hierarchy=1&id=#{projectId}&fields=participating_organisations" end @@ -149,7 +149,7 @@ def get_implementing_orgs(projectId) def get_project_sector_graph_data(projectId) if is_dfid_project(projectId) then - projectSectorGraphJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-1&hierarchy=2&related_activity_id=#{projectId}&group_by=sector&aggregations=sector_percentage_weighted_budget&order_by=-budget&page_count=1000" + projectSectorGraphJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-GOV-1&hierarchy=2&related_activity_id=#{projectId}&group_by=sector&aggregations=sector_percentage_weighted_budget&order_by=-budget&page_count=1000" else projectSectorGraphJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&id=#{projectId}&group_by=sector&aggregations=sector_percentage_weighted_budget&order_by=-budget&page_count=1000" end @@ -178,7 +178,7 @@ def get_project_sector_graph_data(projectId) def get_project_budget(projectId) if is_dfid_project(projectId) then - projectBudgetJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-1&related_activity_id=#{projectId}&group_by=related_activity&aggregations=expenditure,disbursement,budget" + projectBudgetJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-GOV-1&related_activity_id=#{projectId}&group_by=related_activity&aggregations=expenditure,disbursement,budget" else projectBudgetJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&id=#{projectId}&group_by=related_activity&aggregations=expenditure,disbursement,budget" end @@ -218,9 +218,9 @@ def project_budget_per_fy(projectId) begin #to mask errors in the return of the aggregation for some partner projects. if is_dfid_project(projectId) then - actualBudgetJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-1&related_activity_id=#{projectId}&group_by=budget_per_quarter&aggregations=budget" - disbursementJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-1&related_activity_id=#{projectId}&group_by=transactions_per_quarter&aggregations=disbursement" - expenditureJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-1&related_activity_id=#{projectId}&group_by=transactions_per_quarter&aggregations=expenditure" + actualBudgetJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-GOV-1&related_activity_id=#{projectId}&group_by=budget_per_quarter&aggregations=budget" + disbursementJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-GOV-1&related_activity_id=#{projectId}&group_by=transactions_per_quarter&aggregations=disbursement" + expenditureJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-GOV-1&related_activity_id=#{projectId}&group_by=transactions_per_quarter&aggregations=expenditure" else actualBudgetJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&id=#{projectId}&group_by=budget_per_quarter&aggregations=budget" disbursementJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&id=#{projectId}&group_by=transactions_per_quarter&aggregations=disbursement" diff --git a/helpers/region_helpers.rb b/helpers/region_helpers.rb index 363582ff..90b3dcc7 100644 --- a/helpers/region_helpers.rb +++ b/helpers/region_helpers.rb @@ -22,10 +22,10 @@ def get_region_details(regionCode) regionInfo = JSON.parse(File.read('data/dfidRegions.json')) region = regionInfo.select {|region| region['code'] == regionCode}.first - currentTotalRegionBudget= 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_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-1&budget_period_start=#{firstDayOfFinYear}&budget_period_end=#{lastDayOfFinYear}&group_by=reporting_organisation&aggregations=budget") + 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-1&hierarchy=1&related_activity_recipient_region=#{regionCode}&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_region=#{regionCode}&format=json&fields=activity_status&page_size=250") totalActiveProjects = totalProjectsDetails['results'].select {|status| status['activity_status']['code'] =="2" }.length @@ -68,13 +68,13 @@ def dfid_regional_projects_data(regionType) lastDayOfFinYear = last_day_of_financial_year(DateTime.now) if (regionType=="region") - regionsDataJSON = 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_region&aggregations=count,budget&recipient_region_not_in=NS,ZZ" + regionsDataJSON = 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=count,budget"#&recipient_region_not_in=998 else - regionsDataJSON = 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_region&aggregations=count,budget&recipient_region=NS,ZZ" + regionsDataJSON = 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=count,budget&recipient_region=998" end # aggregates budgets of the dfid regional projects that are active in the current FY - #oipaAllRegionsJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-1&budget_period_start=#{settings.current_first_day_of_financial_year}&budget_period_end=#{settings.current_last_day_of_financial_year}&group_by=recipient_region&aggregations=count,budget"; + #oipaAllRegionsJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-GOV-1&budget_period_start=#{settings.current_first_day_of_financial_year}&budget_period_end=#{settings.current_last_day_of_financial_year}&group_by=recipient_region&aggregations=count,budget"; allCurrentRegions = JSON.parse(regionsDataJSON) allCurrentRegions = allCurrentRegions['results'] @@ -106,10 +106,10 @@ 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-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=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_recipient_region=#{n}" projects= JSON.parse(oipa_project_list) results = {} - sectorValuesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=sector&aggregations=count&reporting_organisation=GB-1&related_activity_recipient_region=#{n}" + 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['highLevelSectorList'] = high_level_sector_list_filter(sectorValuesJSON) results['project_budget_higher_bound'] = 0 results['actualStartDate'] = '1990-01-01T00:00:00' @@ -117,12 +117,12 @@ def get_region_projects(n) 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-1&hierarchy=1&related_activity_recipient_region=#{n}&ordering=actual_start_date" + ###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" ###results['actualStartDate'] = JSON.parse(results['actualStartDate']) ###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-1&hierarchy=1&related_activity_recipient_region=#{n}&ordering=-planned_end_date" + ###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" ###results['plannedEndDate'] = JSON.parse(results['plannedEndDate']) ###unless results['plannedEndDate']['results'][0].nil? ###if !results['plannedEndDate']['results'][0]['activity_dates'][2].nil? diff --git a/helpers/search_helper.rb b/helpers/search_helper.rb index 6a9f63ad..0a6b47c2 100644 --- a/helpers/search_helper.rb +++ b/helpers/search_helper.rb @@ -74,7 +74,7 @@ def generate_searched_data(query) searchedData['dfidRegionBudgets'][results["code"]][1] = results["name"] # Storing the region name end # This json call is pulling the total budget list based on the 'recipient_countries' string previously created - oipa_total_project_budget = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-1&budget_period_start=#{settings.current_first_day_of_financial_year}&budget_period_end=#{settings.current_last_day_of_financial_year}&group_by=recipient_country&aggregations=budget&recipient_country="+recipient_countries + oipa_total_project_budget = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-GOV-1&budget_period_start=#{settings.current_first_day_of_financial_year}&budget_period_end=#{settings.current_last_day_of_financial_year}&group_by=recipient_country&aggregations=budget&recipient_country="+recipient_countries countries_project_budget = JSON.parse_nil(oipa_total_project_budget) # Parsed the returned json data and storing it as a hash # This check is necessary to make sure if there really exists a DFID country list matching with the search query else won't try to # parse and store budget data for the 'Did you mean' country data. @@ -88,7 +88,7 @@ def generate_searched_data(query) end end # This json call is pulling the total budget list based on the 'recipient_regions' string previously created - oipa_selected_regions_budget = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-1&budget_period_start=#{settings.current_first_day_of_financial_year}&budget_period_end=#{settings.current_last_day_of_financial_year}&group_by=recipient_region&aggregations=budget&recipient_region="+recipient_regions + oipa_selected_regions_budget = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&reporting_organisation=GB-GOV-1&budget_period_start=#{settings.current_first_day_of_financial_year}&budget_period_end=#{settings.current_last_day_of_financial_year}&group_by=recipient_region&aggregations=budget&recipient_region="+recipient_regions regions_project_budget = JSON.parse_nil(oipa_selected_regions_budget) # Parsed the returned json data and storing it as a hash # This check is necessary to make sure if there really exists a DFID region list matching with the search query else won't try to # parse and store budget data for the 'Did you mean' region data. diff --git a/helpers/sector_helpers.rb b/helpers/sector_helpers.rb index 5d6df14a..f3662471 100644 --- a/helpers/sector_helpers.rb +++ b/helpers/sector_helpers.rb @@ -26,7 +26,7 @@ module SectorHelpers def get_5_dac_sector_data() firstDayOfFinYear = first_day_of_financial_year(DateTime.now) lastDayOfFinYear = last_day_of_financial_year(DateTime.now) - sectorValuesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?reporting_organisation=GB-1&group_by=sector&aggregations=sector_percentage_weighted_budget&budget_period_start=#{firstDayOfFinYear}&budget_period_end=#{lastDayOfFinYear}&format=json" + sectorValuesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?reporting_organisation=GB-GOV-1&group_by=sector&aggregations=sector_percentage_weighted_budget&budget_period_start=#{firstDayOfFinYear}&budget_period_end=#{lastDayOfFinYear}&format=json" end def group_hashes arr, group_fields @@ -86,7 +86,7 @@ def high_level_sector_list(apiUrl, listType, codeType, sectorDescription ) def sector_parent_data_list(apiUrl, pageType, code, description, parentCodeType, parentDescriptionType, urlHighLevelSectorCode, urlCategoryCode) - sectorValuesJSON = RestClient.get apiUrl + "activities/aggregations/?reporting_organisation=GB-1&group_by=sector&aggregations=sector_percentage_weighted_budget&budget_period_start=#{settings.current_first_day_of_financial_year}&budget_period_end=#{settings.current_last_day_of_financial_year}&format=json" + sectorValuesJSON = RestClient.get apiUrl + "activities/aggregations/?reporting_organisation=GB-GOV-1&group_by=sector&aggregations=sector_percentage_weighted_budget&budget_period_start=#{settings.current_first_day_of_financial_year}&budget_period_end=#{settings.current_last_day_of_financial_year}&format=json" sectorValues = JSON.parse(sectorValuesJSON) sectorValues = sectorValues['results'] sectorHierarchy = JSON.parse(File.read('data/sectorHierarchies.json')) @@ -150,26 +150,26 @@ def sector_parent_data_list(apiUrl, pageType, code, description, parentCodeType, end def get_sector_projects(n) - 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_sector=#{n}" + 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_sector=#{n}" projects= JSON.parse(oipa_project_list) results = {} - sectorValuesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=sector&aggregations=count&reporting_organisation=GB-1&related_activity_sector=#{n}" + sectorValuesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=sector&aggregations=count&reporting_organisation=GB-GOV-1&related_activity_sector=#{n}" results['highLevelSectorList'] = high_level_sector_list_filter(sectorValuesJSON) - #results['LocationCountries'] = JSON.parse(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&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_sector=#{n}") - results['LocationCountries'] = JSON.parse(RestClient.get settings.oipa_api_url + "activities/aggregations/?hierarchy=1&format=json&reporting_organisation=GB-1&group_by=recipient_country&aggregations=count&related_activity_sector=#{n}") - results['LocationRegions'] = JSON.parse(RestClient.get settings.oipa_api_url + "activities/aggregations/?hierarchy=1&format=json&reporting_organisation=GB-1&group_by=recipient_region&aggregations=count&related_activity_sector=#{n}") + #results['LocationCountries'] = JSON.parse(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&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_sector=#{n}") + results['LocationCountries'] = JSON.parse(RestClient.get settings.oipa_api_url + "activities/aggregations/?hierarchy=1&format=json&reporting_organisation=GB-GOV-1&group_by=recipient_country&aggregations=count&related_activity_sector=#{n}") + results['LocationRegions'] = JSON.parse(RestClient.get settings.oipa_api_url + "activities/aggregations/?hierarchy=1&format=json&reporting_organisation=GB-GOV-1&group_by=recipient_region&aggregations=count&related_activity_sector=#{n}") 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-1&hierarchy=1&related_activity_sector=#{n}&ordering=actual_start_date" + ###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_sector=#{n}&ordering=actual_start_date" ###results['actualStartDate'] = JSON.parse(results['actualStartDate']) ###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-1&hierarchy=1&related_activity_sector=#{n}&ordering=-planned_end_date" + ###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_sector=#{n}&ordering=-planned_end_date" ###results['plannedEndDate'] = JSON.parse(results['plannedEndDate']) ###unless results['plannedEndDate']['results'][0].nil? ###if !results['plannedEndDate']['results'][0]['activity_dates'][2].nil? diff --git a/public/javascripts/countrypagemap.js b/public/javascripts/countrypagemap.js index 360755bb..401b7dbf 100644 --- a/public/javascripts/countrypagemap.js +++ b/public/javascripts/countrypagemap.js @@ -122,7 +122,7 @@ $(document).ready(function() { // create the geopoints if any are defined if(map) { //alert("start processing datapoints"); - var url = window.baseUrl + "activities/?format=json&reporting_organisation=GB-1&hierarchy=1&related_activity_recipient_country=" + countryCode + "&fields=title,iati_identifier,locations&page_size=500"; + var url = window.baseUrl + "activities/?format=json&reporting_organisation=GB-GOV-1&hierarchy=1&related_activity_recipient_country=" + countryCode + "&fields=title,iati_identifier,locations&page_size=500"; $.getJSON(url, function (iati) { $('.modal_map_markers').show(); diff --git a/public/javascripts/searchPageFilters.js b/public/javascripts/searchPageFilters.js index 54879393..11767c3f 100644 --- a/public/javascripts/searchPageFilters.js +++ b/public/javascripts/searchPageFilters.js @@ -15,31 +15,31 @@ $(document).ready(function() { // $('.search-result h3 a small').hasClass('GB-*').show(); switch (window.searchType){ case 'C': - oipaLink = window.oipaApiUrl + 'activities/?hierarchy=1&page_size=10&format=json&reporting_organisation=GB-1&fields=aggregations,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,descriptions&activity_status='+$('#activity_status_states').val()+'&ordering='+$('#sort_results_type').val()+'&activity_plus_child_aggregation_budget_value_gte='+$('#budget_lower_bound').val()+'&activity_plus_child_aggregation_budget_value_lte='+$('#budget_higher_bound').val()+'&actual_start_date_gte='+$('#date_lower_bound').val()+'&planned_end_date_lte='+$('#date_higher_bound').val()+'§or='+$('#selected_sectors').val()+'&related_activity_recipient_country='+window.CountryCode; + oipaLink = window.oipaApiUrl + 'activities/?hierarchy=1&page_size=10&format=json&reporting_organisation=GB-GOV-1&fields=aggregations,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,descriptions&activity_status='+$('#activity_status_states').val()+'&ordering='+$('#sort_results_type').val()+'&activity_plus_child_aggregation_budget_value_gte='+$('#budget_lower_bound').val()+'&activity_plus_child_aggregation_budget_value_lte='+$('#budget_higher_bound').val()+'&actual_start_date_gte='+$('#date_lower_bound').val()+'&planned_end_date_lte='+$('#date_higher_bound').val()+'§or='+$('#selected_sectors').val()+'&related_activity_recipient_country='+window.CountryCode; break; case 'F': oipaLink = window.oipaApiUrl + 'activities/?hierarchy=1&page_size=10&format=json&fields=aggregations,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,descriptions&q='+window.searchQuery+'&activity_status='+$('#activity_status_states').val()+'&ordering='+$('#sort_results_type').val()+'&activity_plus_child_aggregation_budget_value_gte='+$('#budget_lower_bound').val()+'&activity_plus_child_aggregation_budget_value_lte='+$('#budget_higher_bound').val()+'&actual_start_date_gte='+$('#date_lower_bound').val()+'&planned_end_date_lte='+$('#date_higher_bound').val()+'§or='+$('#selected_sectors').val()+'&reporting_organisation_startswith=GB'; break; case 'S': - oipaLink = window.oipaApiUrl + 'activities/?hierarchy=1&page_size=10&format=json&reporting_organisation=GB-1&fields=aggregations,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,descriptions&activity_status='+$('#activity_status_states').val()+'&ordering='+$('#sort_results_type').val()+'&activity_plus_child_aggregation_budget_value_gte='+$('#budget_lower_bound').val()+'&activity_plus_child_aggregation_budget_value_lte='+$('#budget_higher_bound').val()+'&actual_start_date_gte='+$('#date_lower_bound').val()+'&planned_end_date_lte='+$('#date_higher_bound').val()+'§or='+$('#selected_sectors').val()+'&related_activity_sector='+window.SectorCode + '&recipient_country=' + $('#locationCountryFilterStates').val() + '&recipient_region=' + $('#locationRegionFilterStates').val(); + oipaLink = window.oipaApiUrl + 'activities/?hierarchy=1&page_size=10&format=json&reporting_organisation=GB-GOV-1&fields=aggregations,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,descriptions&activity_status='+$('#activity_status_states').val()+'&ordering='+$('#sort_results_type').val()+'&activity_plus_child_aggregation_budget_value_gte='+$('#budget_lower_bound').val()+'&activity_plus_child_aggregation_budget_value_lte='+$('#budget_higher_bound').val()+'&actual_start_date_gte='+$('#date_lower_bound').val()+'&planned_end_date_lte='+$('#date_higher_bound').val()+'§or='+$('#selected_sectors').val()+'&related_activity_sector='+window.SectorCode + '&recipient_country=' + $('#locationCountryFilterStates').val() + '&recipient_region=' + $('#locationRegionFilterStates').val(); break; case 'R': - oipaLink = window.oipaApiUrl + 'activities/?hierarchy=1&page_size=10&format=json&reporting_organisation=GB-1&fields=aggregations,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,descriptions&activity_status='+$('#activity_status_states').val()+'&ordering='+$('#sort_results_type').val()+'&activity_plus_child_aggregation_budget_value_gte='+$('#budget_lower_bound').val()+'&activity_plus_child_aggregation_budget_value_lte='+$('#budget_higher_bound').val()+'&actual_start_date_gte='+$('#date_lower_bound').val()+'&planned_end_date_lte='+$('#date_higher_bound').val()+'§or='+$('#selected_sectors').val()+'&related_activity_recipient_region='+window.RegionCode; + oipaLink = window.oipaApiUrl + 'activities/?hierarchy=1&page_size=10&format=json&reporting_organisation=GB-GOV-1&fields=aggregations,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,descriptions&activity_status='+$('#activity_status_states').val()+'&ordering='+$('#sort_results_type').val()+'&activity_plus_child_aggregation_budget_value_gte='+$('#budget_lower_bound').val()+'&activity_plus_child_aggregation_budget_value_lte='+$('#budget_higher_bound').val()+'&actual_start_date_gte='+$('#date_lower_bound').val()+'&planned_end_date_lte='+$('#date_higher_bound').val()+'§or='+$('#selected_sectors').val()+'&related_activity_recipient_region='+window.RegionCode; break; } function refreshOipaLink(searchType){ switch (window.searchType){ case 'C': - oipaLink = window.oipaApiUrl + 'activities/?hierarchy=1&page_size=10&format=json&reporting_organisation=GB-1&fields=aggregations,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,descriptions&activity_status='+$('#activity_status_states').val()+'&ordering='+$('#sort_results_type').val()+'&activity_plus_child_aggregation_budget_value_gte='+$('#budget_lower_bound').val()+'&activity_plus_child_aggregation_budget_value_lte='+$('#budget_higher_bound').val()+'&actual_start_date_gte='+$('#date_lower_bound').val()+'&planned_end_date_lte='+$('#date_higher_bound').val()+'§or='+$('#selected_sectors').val()+'&related_activity_recipient_country='+window.CountryCode; + oipaLink = window.oipaApiUrl + 'activities/?hierarchy=1&page_size=10&format=json&reporting_organisation=GB-GOV-1&fields=aggregations,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,descriptions&activity_status='+$('#activity_status_states').val()+'&ordering='+$('#sort_results_type').val()+'&activity_plus_child_aggregation_budget_value_gte='+$('#budget_lower_bound').val()+'&activity_plus_child_aggregation_budget_value_lte='+$('#budget_higher_bound').val()+'&actual_start_date_gte='+$('#date_lower_bound').val()+'&planned_end_date_lte='+$('#date_higher_bound').val()+'§or='+$('#selected_sectors').val()+'&related_activity_recipient_country='+window.CountryCode; break; case 'F': oipaLink = window.oipaApiUrl + 'activities/?hierarchy=1&page_size=10&format=json&fields=aggregations,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,descriptions&q='+window.searchQuery+'&activity_status='+$('#activity_status_states').val()+'&ordering='+$('#sort_results_type').val()+'&activity_plus_child_aggregation_budget_value_gte='+$('#budget_lower_bound').val()+'&activity_plus_child_aggregation_budget_value_lte='+$('#budget_higher_bound').val()+'&actual_start_date_gte='+$('#date_lower_bound').val()+'&planned_end_date_lte='+$('#date_higher_bound').val()+'§or='+$('#selected_sectors').val()+'&reporting_organisation_startswith=GB'; break; case 'S': - oipaLink = window.oipaApiUrl + 'activities/?hierarchy=1&page_size=10&format=json&reporting_organisation=GB-1&fields=aggregations,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,descriptions&activity_status='+$('#activity_status_states').val()+'&ordering='+$('#sort_results_type').val()+'&activity_plus_child_aggregation_budget_value_gte='+$('#budget_lower_bound').val()+'&activity_plus_child_aggregation_budget_value_lte='+$('#budget_higher_bound').val()+'&actual_start_date_gte='+$('#date_lower_bound').val()+'&planned_end_date_lte='+$('#date_higher_bound').val()+'§or='+$('#selected_sectors').val()+'&related_activity_sector='+window.SectorCode + '&recipient_country=' + $('#locationCountryFilterStates').val() + '&recipient_region=' + $('#locationRegionFilterStates').val(); + oipaLink = window.oipaApiUrl + 'activities/?hierarchy=1&page_size=10&format=json&reporting_organisation=GB-GOV-1&fields=aggregations,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,descriptions&activity_status='+$('#activity_status_states').val()+'&ordering='+$('#sort_results_type').val()+'&activity_plus_child_aggregation_budget_value_gte='+$('#budget_lower_bound').val()+'&activity_plus_child_aggregation_budget_value_lte='+$('#budget_higher_bound').val()+'&actual_start_date_gte='+$('#date_lower_bound').val()+'&planned_end_date_lte='+$('#date_higher_bound').val()+'§or='+$('#selected_sectors').val()+'&related_activity_sector='+window.SectorCode + '&recipient_country=' + $('#locationCountryFilterStates').val() + '&recipient_region=' + $('#locationRegionFilterStates').val(); break; case 'R': - oipaLink = window.oipaApiUrl + 'activities/?hierarchy=1&page_size=10&format=json&reporting_organisation=GB-1&fields=aggregations,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,descriptions&activity_status='+$('#activity_status_states').val()+'&ordering='+$('#sort_results_type').val()+'&activity_plus_child_aggregation_budget_value_gte='+$('#budget_lower_bound').val()+'&activity_plus_child_aggregation_budget_value_lte='+$('#budget_higher_bound').val()+'&actual_start_date_gte='+$('#date_lower_bound').val()+'&planned_end_date_lte='+$('#date_higher_bound').val()+'§or='+$('#selected_sectors').val()+'&related_activity_recipient_region='+window.RegionCode; + oipaLink = window.oipaApiUrl + 'activities/?hierarchy=1&page_size=10&format=json&reporting_organisation=GB-GOV-1&fields=aggregations,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,descriptions&activity_status='+$('#activity_status_states').val()+'&ordering='+$('#sort_results_type').val()+'&activity_plus_child_aggregation_budget_value_gte='+$('#budget_lower_bound').val()+'&activity_plus_child_aggregation_budget_value_lte='+$('#budget_higher_bound').val()+'&actual_start_date_gte='+$('#date_lower_bound').val()+'&planned_end_date_lte='+$('#date_higher_bound').val()+'§or='+$('#selected_sectors').val()+'&related_activity_recipient_region='+window.RegionCode; break; } };