Updated the organisation filter to remove duplicates.

DFID · May 4, 2016 · deb4c7e · deb4c7e
1 parent ea4876e
commit deb4c7e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/helpers/country_helpers.rb b/helpers/country_helpers.rb
@@ -343,7 +343,7 @@ def get_country_all_projects_data(countryCode)
     end
     allProjectsData['highLevelSectorList'] = allProjectsData['highLevelSectorList'].sort_by {|key| key}
     allProjectsData['document_types'] = allProjectsData['document_types'].sort_by {|key| key["document_link_category"]["name"]}
-    allProjectsData['implementingOrg_types'] = allProjectsData['implementingOrg_types'].sort_by {|key| key["name"]}
+    allProjectsData['implementingOrg_types'] = allProjectsData['implementingOrg_types'].sort_by {|key| key["name"]}.uniq {|key| key["ref"]}
     return allProjectsData
   end
 

diff --git a/helpers/region_helpers.rb b/helpers/region_helpers.rb
@@ -164,7 +164,7 @@ def get_region_projects(n)
       end
       results['highLevelSectorList'] = results['highLevelSectorList'].sort_by {|key| key}
       results['document_types'] = results['document_types'].sort_by {|key| key["document_link_category"]["name"]}
-      results['implementingOrg_types'] = results['implementingOrg_types'].sort_by {|key| key["name"]}
+      results['implementingOrg_types'] = results['implementingOrg_types'].sort_by {|key| key["name"]}.uniq{|key| key["ref"]}
       return results
   end
 

diff --git a/helpers/search_helper.rb b/helpers/search_helper.rb
@@ -117,7 +117,7 @@ def generate_searched_data(query)
 		# This returns the relevant sector list to populate the left hand side sectors filter.
 		sectorValuesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=sector&aggregations=count&q=#{query}&reporting_organisation_startswith=GB"
 		searchedData['highLevelSectorList'] = high_level_sector_list_filter( sectorValuesJSON) # Returns the high level sector data with name and codes
-		puts searchedData['highLevelSectorList']
+		#puts searchedData['highLevelSectorList']
 		searchedData['highLevelSectorList'] = searchedData['highLevelSectorList'].sort_by {|key| key}
 
 		# Initiating the actual start date and the planned end date.
@@ -142,7 +142,7 @@ def generate_searched_data(query)
 		# Pulling json data with an order by on planned end date (DSC) to get the ending bound for the LHS date range slider. 
 		searchedData['plannedEndDate'] = RestClient.get settings.oipa_api_url + "activities/?format=json&page_size=1&fields=activity_dates&hierarchy=1&q=#{query}&ordering=-planned_end_date&end_date_isnull=False"
 		searchedData['plannedEndDate'] = JSON.parse(searchedData['plannedEndDate'])
-		puts "activities/?format=json&page_size=1&fields=activity_dates&hierarchy=1&q=#{query}&ordering=-planned_end_date&end_date_isnull=False"
+		#puts "activities/?format=json&page_size=1&fields=activity_dates&hierarchy=1&q=#{query}&ordering=-planned_end_date&end_date_isnull=False"
 		if(searchedData['plannedEndDate']['count'] > 0)
 			tempEndDate = searchedData['plannedEndDate']['results'][0]['activity_dates'].select{|activityDate| activityDate['type']['code'] == '3'}.first
 			if (tempEndDate.nil?)
@@ -183,7 +183,7 @@ def generate_searched_data(query)
 		   		end
 			end
 		end
-		searchedData['implementingOrg_types'] = searchedData['implementingOrg_types'].sort_by {|key| key["name"]}
+		searchedData['implementingOrg_types'] = searchedData['implementingOrg_types'].sort_by {|key| key["name"]}.uniq{|key| key["ref"]}
 		return searchedData
 	end
 

diff --git a/helpers/sector_helpers.rb b/helpers/sector_helpers.rb
@@ -216,7 +216,7 @@ def get_sector_projects(n)
 		results['LocationRegions'] = results['LocationRegions'].sort_by {|key| key["recipient_region"]["name"]}
 		results['highLevelSectorList'] = results['highLevelSectorList'].sort_by {|key| key}
     	results['document_types'] = results['document_types'].sort_by {|key| key["document_link_category"]["name"]}
-    	results['implementingOrg_types'] = results['implementingOrg_types'].sort_by {|key| key["name"]}
+    	results['implementingOrg_types'] = results['implementingOrg_types'].sort_by {|key| key["name"]}.uniq{|key| key["ref"]}
 		return results
 	end
 end