Refs #4665

Add a controller concern to deal with date filters

4 files changed, 8 insertions, 8 deletions

diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb
index 8821a5201..72496273e 100644
--- a/app/models/chouette/time_table.rb
+++ b/app/models/chouette/time_table.rb
@@ -21,12 +21,12 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
   belongs_to :calendar
   belongs_to :created_from, class_name: 'Chouette::TimeTable'
 
-  scope :overlapping, -> (date_start, date_end) do
+  scope :overlapping, -> (period_range) do
     joins("
       LEFT JOIN time_table_periods ON time_tables.id = time_table_periods.time_table_id
       LEFT JOIN time_table_dates ON time_tables.id = time_table_dates.time_table_id
     ")
-    .where("(time_table_periods.period_start <= :end AND time_table_periods.period_end >= :start) OR (time_table_dates.date BETWEEN :start AND :end)", {start: date_start, end: date_end})
+    .where("(time_table_periods.period_start <= :end AND time_table_periods.period_end >= :begin) OR (time_table_dates.date BETWEEN :begin AND :end)", {begin: period_range.begin, end: period_range.end})
   end
 
   after_save :save_shortcuts
diff --git a/app/models/compliance_check_set.rb b/app/models/compliance_check_set.rb
index 4c00c3516..e4146e0e2 100644
--- a/app/models/compliance_check_set.rb
+++ b/app/models/compliance_check_set.rb
@@ -11,8 +11,8 @@ class ComplianceCheckSet < ActiveRecord::Base
 
   enumerize :status, in: %w[new pending successful warning failed running aborted canceled]
 
-  scope :where_created_at_between, ->(start_date, end_date) do
-    where('created_at BETWEEN ? AND ?', start_date, end_date)
+  scope :where_created_at_between, ->(period_range) do
+    where('created_at BETWEEN :begin AND :end', begin: period_range.begin, end: period_range.end)
   end
 
 end
diff --git a/app/models/compliance_control_set.rb b/app/models/compliance_control_set.rb
index 40e269146..1ab0fd6d2 100644
--- a/app/models/compliance_control_set.rb
+++ b/app/models/compliance_control_set.rb
@@ -4,7 +4,7 @@ class ComplianceControlSet < ActiveRecord::Base
   has_many :compliance_controls, dependent: :destroy
 
   validates :name, presence: true
-  scope :where_updated_at_between, ->(start_date, end_date) do
-    where('updated_at BETWEEN ? AND ?', start_date, end_date)
+  scope :where_updated_at_between, ->(period_range) do
+    where('updated_at BETWEEN :begin AND :end', begin: period_range.begin, end: period_range.end)
   end
 end
diff --git a/app/models/import.rb b/app/models/import.rb
index 74f7ef10c..64f713914 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -9,8 +9,8 @@ class Import < ActiveRecord::Base
   has_many :resources, class_name: "ImportResource", dependent: :destroy
   has_many :children, foreign_key: :parent_id, class_name: "Import", dependent: :destroy
 
-  scope :where_started_at_between, ->(start_date, end_date) do
-     where('started_at BETWEEN ? AND ?', start_date, end_date)
+  scope :where_started_at_in, ->(period_range) do
+    where('started_at BETWEEN :begin AND :end', begin: period_range.begin, end: period_range.end)
    end
 
   extend Enumerize