Updated code

DFID · Apr 21, 2016 · bf1dc5b · bf1dc5b
1 parent 82d2282
commit bf1dc5b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/helpers/country_helpers.rb b/helpers/country_helpers.rb
@@ -299,9 +299,9 @@ def get_country_all_projects_data(countryCode)
     allProjectsData['project_budget_higher_bound'] = 0
     allProjectsData['actualStartDate'] = '1990-01-01T00:00:00' 
     allProjectsData['plannedEndDate'] = '2000-01-01T00:00:00'
-     unless allProjectsData['projects']['results'][0].nil?
-       allProjectsData['project_budget_higher_bound'] = allProjectsData['projects']['results'][0]['aggregations']['activity_children']['budget_value']
-     end
+    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'] = JSON.parse(allProjectsData['actualStartDate'])
     # tempStartDate = allProjectsData['actualStartDate']['results'][0]['activity_dates'].select{|activityDate| activityDate['type']['code'] == '2'}.first

diff --git a/helpers/region_helpers.rb b/helpers/region_helpers.rb
@@ -114,9 +114,9 @@ def get_region_projects(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
+      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'] = JSON.parse(results['actualStartDate'])
       # tempStartDate = results['actualStartDate']['results'][0]['activity_dates'].select{|activityDate| activityDate['type']['code'] == '2'}.first

diff --git a/helpers/sector_helpers.rb b/helpers/sector_helpers.rb
@@ -161,9 +161,9 @@ def get_sector_projects(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
+		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_sector=#{n}&ordering=actual_start_date&start_date_gte=1900-01-02"
 		# results['actualStartDate'] = JSON.parse(results['actualStartDate'])
 		# tempStartDate = results['actualStartDate']['results'][0]['activity_dates'].select{|activityDate| activityDate['type']['code'] == '2'}.first