Only pass the partnerProjectCount parameter into the summary, transac…

…tions & documents project pages. DevTracker.rb - update this file to reduce the number of parameters being passed to the project pages.
DFID · Sep 9, 2015 · aa5ebd6 · aa5ebd6
1 parent 98a913b
commit aa5ebd6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 18 deletions.
diff --git a/devtracker.rb b/devtracker.rb
@@ -17,6 +17,7 @@
 
 #helpers modules
 include SectorHelpers
+include ProjectHelpers
 
 # set global settings
 set :oipa_api_url, 'http://dfid-oipa.zz-clients.net/api/'
@@ -64,13 +65,11 @@
 	# get the funded projects from the API
     fundedProjectsAPI = RestClient.get settings.oipa_api_url + "activities?format=json&transaction_provider_activity=#{n}&page_size=1000"	
 	fundedProjectsData = JSON.parse(fundedProjectsAPI)
-	fundedProjects = fundedProjectsData['results']     
-
+
 	erb :'projects/summary', 
 		:layout => :'layouts/layout',
 		 :locals => {
- 			project: project, 	 					
- 			fundedProjects: fundedProjects,
+ 			project: project, 	 					 			
  			fundedProjectsCount: fundedProjectsData['count']
  		}
 end
@@ -83,14 +82,12 @@
 
     # get the funded projects from the API
     fundedProjectsAPI = RestClient.get settings.oipa_api_url + "activities?format=json&transaction_provider_activity=#{n}&page_size=1000"	
-	fundedProjectsData = JSON.parse(fundedProjectsAPI)
-	fundedProjects = fundedProjectsData['results']	
+	fundedProjectsData = JSON.parse(fundedProjectsAPI)	
 
 	erb :'projects/documents', 
 		:layout => :'layouts/layout',
 		:locals => {
  			project: project,
- 			fundedProjects: fundedProjects,
  			fundedProjectsCount: fundedProjectsData['count']   
  		}
 end
@@ -109,14 +106,12 @@
     # get the funded projects from the API
     fundedProjectsAPI = RestClient.get settings.oipa_api_url + "activities?format=json&transaction_provider_activity=#{n}&page_size=1000"	
 	fundedProjectsData = JSON.parse(fundedProjectsAPI)
-	fundedProjects = fundedProjectsData['results']		
-
+
 	erb :'projects/transactions', 
 		:layout => :'layouts/layout',
 		:locals => {
 			project: project,
- 			transactions: transactions,
- 			fundedProjects: fundedProjects, 
+ 			transactions: transactions, 			
  			fundedProjectsCount: fundedProjectsData['count']  
  		}
 end
@@ -129,14 +124,13 @@
 
 	# get the funded projects from the API
     fundedProjectsAPI = RestClient.get settings.oipa_api_url + "activities?format=json&transaction_provider_activity=#{n}&page_size=1000"	
-	fundedProjectsData = JSON.parse(fundedProjectsAPI)
-	fundedProjects = fundedProjectsData['results']
+	fundedProjectsData = JSON.parse(fundedProjectsAPI)	
 
 	erb :'projects/partners', 
 		:layout => :'layouts/layout',
 		:locals => {
 			project: project, 			
- 			fundedProjects: fundedProjects,
+ 			fundedProjects: fundedProjectsData['results'],
  			fundedProjectsCount: fundedProjectsData['count']  
  		}
 end

diff --git a/views/projects/documents.html.erb b/views/projects/documents.html.erb
@@ -4,7 +4,7 @@ title: Development Tracker
 
 ---
 
-<%= erb :'partials/_projects-header', :locals => { :project => project, :active => "documents"} %>
+<%= erb :'partials/_projects-header', :locals => { :project => project, :fundedProjectsCount => fundedProjectsCount, :active => "documents"} %>
 
 <div class="row">
     <div class="twelve columns summary">

diff --git a/views/projects/partners.html.erb b/views/projects/partners.html.erb
@@ -1,6 +1,6 @@
 <!-- title: Development Tracker -->
 
-<%= erb :'partials/_projects-header', :locals => { :project => project, :fundedProjects => fundedProjects, :fundedProjectsCount => fundedProjectsCount, :active => "partners"} %>
+<%= erb :'partials/_projects-header', :locals => { :project => project, :fundedProjectsCount => fundedProjectsCount, :active => "partners"} %>
 
 <% if fundedProjectsCount > 0 then %> 
   <div class="row">

diff --git a/views/projects/summary.html.erb b/views/projects/summary.html.erb
@@ -2,7 +2,7 @@
 title: Development Tracker
 --- -->
 
-<%= erb :'partials/_projects-header', :locals => { :project => project, :fundedProjects => fundedProjects, :fundedProjectsCount => fundedProjectsCount, :active => "summary"} %>
+<%= erb :'partials/_projects-header', :locals => { :project => project, :fundedProjectsCount => fundedProjectsCount, :active => "summary"} %>
 
 
 <div class="row">

diff --git a/views/projects/transactions.html.erb b/views/projects/transactions.html.erb
@@ -2,7 +2,7 @@
 title: Development Tracker
 --- -->
 
-<%= erb :'partials/_projects-header', :locals => { :project => project, :active => "transactions"} %>
+<%= erb :'partials/_projects-header', :locals => { :project => project, :fundedProjectsCount => fundedProjectsCount, :active => "transactions"} %>
 
 <%# ------------------------------------------------------------------------ %>
 <%#                   I N C O M I N G   F U N D S   T A B L E                %>