awesomefoundation#269 defaulting chapter date range to project review…

… date range (if defined)
divideby0 · Jul 7, 2017 · 9bff41e · 9bff41e
1 parent e0eaeef
commit 9bff41e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/app/controllers/finalists_controller.rb b/app/controllers/finalists_controller.rb
@@ -6,7 +6,7 @@ class FinalistsController < ApplicationController
   include ApplicationHelper
 
   def index
-    @start_date, @end_date = extract_timeframe
+    @start_date, @end_date = extract_timeframe_for_chapter(@chapter)
     @projects = Project.
                   voted_for_by_members_of(current_chapter).
                   during_timeframe(@start_date, @end_date).

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
@@ -10,7 +10,7 @@ class ProjectsController < ApplicationController
   include ApplicationHelper
 
   def index
-    @start_date, @end_date = extract_timeframe
+    @start_date, @end_date = extract_timeframe_for_chapter(@chapter)
     @short_listed = params[:short_list]
 
     project_filter = ProjectFilter.new(@chapter.projects).during(@start_date, @end_date)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -1,7 +1,12 @@
 module ApplicationHelper
   def extract_timeframe
     start_date = params[:start]
-    end_date =   params[:end]
+    end_date = params[:end]
+  end
+
+  def extract_timeframe_for_chapter(chapter)
+    start_date = params[:start] || chapter.project_review_start.to_s
+    end_date   =   params[:start] || chapter.project_review_end.to_s
     [start_date, end_date]
   end