Merge pull request #615 from DFID/fix-countrynaming-budget-aggregation-issues

Fix countrynaming budget aggregation issues

Author: aunindadf

helpers/common_helpers.rb

@@ -1277,7 +1277,6 @@ def generateCountryDatav5()
     pd = RestClient.get newApiCall
     pd  = JSON.parse(pd)
     numOActivities = pd['response']['numFound'].to_i
-    #puts ('Number of activities: ' + numOActivities.to_s)
     pulledData = pd['response']['docs'] 
     if (numOActivities > count)
       pages = (numOActivities.to_f/count).ceil
@@ -1339,7 +1338,7 @@ def generateCountryDatav5()
             elsif c =='PS'
               projectDataHash[c]["country"] = 'Occupied Palestinian Territories (OPT)'
             else
-              projectDataHash[c]["country"] = element.has_key?('recipient_country_name') ? element["recipient_country_name"][i] : 'N/A'
+              projectDataHash[c]["country"] = begin get_country_code_name(c)['name'] rescue 'N/A' end# element.has_key?('recipient_country_name') ? element["recipient_country_name"][i] : 'N/A'
             end
             projectDataHash[c]["id"] = c
             if(element['activity_status_code'].to_i == 2)

helpers/country_helpers.rb

@@ -66,7 +66,7 @@ def get_top_5_countriesv2()
     lastDayOfFinYear = last_day_of_financial_year(DateTime.now)
     countriesInfo = JSON.parse(File.read('data/countries.json'))
     count = 20
-    newApiCall = settings.oipa_api_url + "activity?q=hierarchy:1 AND activity_status_code:2 AND participating_org_ref:GB-GOV-* AND reporting_org_ref:(#{settings.goverment_department_ids.gsub(","," OR ")}) AND recipient_country_code:*&fl=reporting_org_ref,recipient_country_percentage,budget_value,activity_status_code,iati_identifier,budget.period-start.quarter,budget.period-end.quarter,recipient_country_code,budget_period_start_iso_date,budget_period_end_iso_date,budget_value_gbp,recipient_country_name,sector_code,sector_percentage,hierarchy,related_activity_type,related_activity_ref,related_budget_value,related_budget_period_start_quarter,related_budget_period_end_quarter,related_budget_period_start_iso_date,related_budget_period_end_iso_date&start=0&rows=#{count}"
+    newApiCall = settings.oipa_api_url + "activity?q=hierarchy:1 AND participating_org_ref:GB-GOV-* AND reporting_org_ref:(#{settings.goverment_department_ids.gsub(","," OR ")}) AND recipient_country_code:*&fl=reporting_org_ref,recipient_country_percentage,budget_value,activity_status_code,iati_identifier,budget.period-start.quarter,budget.period-end.quarter,recipient_country_code,budget_period_start_iso_date,budget_period_end_iso_date,budget_value_gbp,recipient_country_name,sector_code,sector_percentage,hierarchy,related_activity_type,related_activity_ref,related_budget_value,related_budget_period_start_quarter,related_budget_period_end_quarter,related_budget_period_start_iso_date,related_budget_period_end_iso_date&start=0&rows=#{count}"
     ##pagination stuff
     page = 1
     page = page.to_i - 1
@@ -81,7 +81,7 @@ def get_top_5_countriesv2()
       for p in 2..pages do
           p = p - 1
           finalPage = p * count
-          tempData = JSON.parse(RestClient.get settings.oipa_api_url + "activity?q=hierarchy:1 AND activity_status_code:2 AND participating_org_ref:GB-GOV-* AND reporting_org_ref:(#{settings.goverment_department_ids.gsub(","," OR ")}) AND recipient_country_code:*&fl=reporting_org_ref,recipient_country_percentage,budget_value,activity_status_code,iati_identifier,budget.period-start.quarter,budget.period-end.quarter,recipient_country_code,budget_period_start_iso_date,budget_period_end_iso_date,budget_value_gbp,recipient_country_name,sector_code,sector_percentage,hierarchy,related_activity_type,related_activity_ref,related_budget_value,related_budget_period_start_quarter,related_budget_period_end_quarter,related_budget_period_start_iso_date,related_budget_period_end_iso_date,&start=#{finalPage}&rows=#{count}")
+          tempData = JSON.parse(RestClient.get settings.oipa_api_url + "activity?q=hierarchy:1 AND participating_org_ref:GB-GOV-* AND reporting_org_ref:(#{settings.goverment_department_ids.gsub(","," OR ")}) AND recipient_country_code:*&fl=reporting_org_ref,recipient_country_percentage,budget_value,activity_status_code,iati_identifier,budget.period-start.quarter,budget.period-end.quarter,recipient_country_code,budget_period_start_iso_date,budget_period_end_iso_date,budget_value_gbp,recipient_country_name,sector_code,sector_percentage,hierarchy,related_activity_type,related_activity_ref,related_budget_value,related_budget_period_start_quarter,related_budget_period_end_quarter,related_budget_period_start_iso_date,related_budget_period_end_iso_date,&start=#{finalPage}&rows=#{count}")
           tempData = tempData['response']['docs']
           tempData.each do |item|
             pulledData.push(item)
@@ -117,7 +117,7 @@ def get_top_5_countriesv2()
             newTop5countriesBudget[cd]['budget'] = (newTop5countriesBudget[cd]['budget'] + countryBudget).round(2)
           else
             newTop5countriesBudget[cd] = {}
-            newTop5countriesBudget[cd]['name'] = begin element['recipient_country_name'][i] rescue 'N/A' end
+            newTop5countriesBudget[cd]['name'] = begin get_country_code_name(cd)['name'] rescue 'N/A' end #element['recipient_country_name'][i] rescue 'N/A' end
             newTop5countriesBudget[cd]['code'] = cd
             newTop5countriesBudget[cd]['budget'] = countryBudget.round(2)
           end

views/countries/country.html.erb

@@ -49,12 +49,12 @@
         <%= erb :'partials/_map_disclaimer'%>
 
         <div class="govuk-grid-row govuk-!-margin-bottom-6">
-            <div class="govuk-grid-column-full">
+            <!--<div class="govuk-grid-column-full">
                 <p class="govuk-!-font-size-16 govuk-!-font-weight-bold govuk-!-margin-top-3 govuk-!-margin-bottom-0">Download location data for <%= country['name'] %></p>
                 <div class="app-download-data">
                     <a href="/downloadLocationDataCountriesCSV/<%=country['code']%>" class="govuk-link" target="_blank"><strong class="govuk-tag govuk-tag--blue">CSV</strong></a>
                 </div>
-            </div>
+            </div> -->
         </div>
 
         <hr class="govuk-section-break govuk-section-break--l govuk-section-break--visible">