.

Author: aunindadf

devtracker.rb

@@ -364,7 +364,7 @@ def getCacheData(fileName)
 		:locals => {
 			oipa_api_url: settings.oipa_api_url,
  			region: region,
-			regionYearWiseBudgets: get_country_region_yearwise_budget_graph_datav2(RestClient.get api_simple_log(settings.oipa_api_url + 'activity/?q=recipient_region_code:'+n+' AND reporting_org_ref:('+settings.goverment_department_ids.gsub(","," OR ")+') &fl=budget_value_gbp,budget_value,default-currency,budget_period_start_iso_date,budget_period_end_iso_date,budget.period-start.quarter,budget.period-end.quarter&rows=10000')),
+			regionYearWiseBudgets: get_country_region_yearwise_budget_graph_datav2(RestClient.get api_simple_log(settings.oipa_api_url + 'activity/?q=iati_identifier:GB-GOV-10-DHSC_WHO_core AND recipient_region_code:'+n+' AND reporting_org_ref:('+settings.goverment_department_ids.gsub(","," OR ")+') &fl=iati_identifier,budget_value_gbp,budget_value,default-currency,budget_period_start_iso_date,budget_period_end_iso_date,budget.period-start.quarter,budget.period-end.quarter&rows=10000')),
  			mapMarkers: getRegionMapMarkersv2(region[:code]),
  		}
 end
@@ -1002,7 +1002,7 @@ def getCacheData(fileName)
 end
 
 get '/regions/?' do
-	query = '(298 OR 798 OR 89 OR 589 OR 389 OR 189 OR 679 OR 289 OR 380)'
+	query = '(298 OR 798 OR 89 OR 589 OR 389 OR 189 OR 679 OR 289 OR 380 OR 1031 OR 619 OR 1027 OR 789 OR 889 OR 689 OR 489 OR 1029 OR 1030)'
 	filters = prepareFilters(query.to_s, 'R')
 	response = solrResponse(query, 'AND activity_status_code:(2)', 'R', 0, '', '')
 	if(response['numFound'].to_i > 0)

helpers/common_helpers.rb

@@ -136,16 +136,19 @@ def financial_year_wise_budgetsv2(yearWiseBudgets,type)
 def get_actual_budget_per_fyv2(yearWiseBudgets)
   hash = {}
   yearWiseBudgets.each do |project|
-    if project.has_key?('budget_period_start_iso_date')
-      project['budget_period_start_iso_date'].each_with_index do |data, index|
-        t = Time.parse(data)
-        fy = if project['budget.period-start.quarter'][index].to_i == 1 then t.year - 1 else t.year end
-        if hash.has_key?(fy)
-          hash[fy] = hash[fy] + project['budget_value_gbp'][index]
-        else
-          hash[fy] = project['budget_value_gbp'][index]
+    begin
+      if project.has_key?('budget_period_start_iso_date')
+        project['budget_period_start_iso_date'].each_with_index do |data, index|
+          t = Time.parse(data)
+          fy = if project['budget.period-start.quarter'][index].to_i == 1 then t.year - 1 else t.year end
+          if hash.has_key?(fy)
+            hash[fy] = hash[fy] + project['budget_value_gbp'][index]
+          else
+            hash[fy] = project['budget_value_gbp'][index]
+          end
         end
       end
+    rescue
     end
   end
   finalData = []

helpers/country_helpers.rb

@@ -496,8 +496,7 @@ def budgetBarGraphDataDv3(countryCode)
   def get_country_region_yearwise_budget_graph_datav2(apiLink)
     yearWiseBudgets = Oj.load(apiLink)['response']['docs']
     budgetYearData = financial_year_wise_budgetsv2(yearWiseBudgets,"C")
-
-end
+  end
 
   def get_reporting_orgWise_yearly_country_budgets(apiLink)
     allBudgets = Oj.load(apiLink)