diff options
| author | cedricnjanga | 2017-08-02 17:43:23 +0200 |
|---|---|---|
| committer | cedricnjanga | 2017-08-02 17:44:16 +0200 |
| commit | 2c6524f88815eee7715e9b0d4ee3082e2d326b05 (patch) | |
| tree | 8b76a7fc3f77c39803cb191ed4e196ee4e0fefe0 | |
| parent | 420068615d1633a1a9fac48db82d3df04913af9a (diff) | |
| download | chouette-core-2c6524f88815eee7715e9b0d4ee3082e2d326b05.tar.bz2 | |
Fix date filters for Timetable and workbenches
| -rw-r--r-- | app/assets/javascripts/workbench.coffee | 6 | ||||
| -rw-r--r-- | app/controllers/time_tables_controller.rb | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/workbench.coffee b/app/assets/javascripts/workbench.coffee index 971462e98..0e9fe62a3 100644 --- a/app/assets/javascripts/workbench.coffee +++ b/app/assets/javascripts/workbench.coffee @@ -1,6 +1,6 @@ $(document).on("click", "#referential_filter_btn", (e) -> dates = [1, 2, 3].reduce (arr, key) -> - arr.push $("#q_validity_period_begin_gteq_#{key}i").val(), $("#q_validity_period_end_gteq__#{key}i").val() + arr.push $("#q_validity_period_begin_gteq_#{key}i").val(), $("#q_validity_period_end_lteq_#{key}i").val() arr , [] @@ -8,6 +8,10 @@ noDate = dates.every (date) -> !date + console.log("valid dates :", validDate) + console.log("no dates :", noDate) + console.log(dates) + unless (validDate || noDate) e.preventDefault() alert(window.I18n.fr.referentials.error_period_filter) diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb index 2ff7a2c3a..0054963c9 100644 --- a/app/controllers/time_tables_controller.rb +++ b/app/controllers/time_tables_controller.rb @@ -161,6 +161,7 @@ class TimeTablesController < ChouetteController private def ransack_periode scope return scope unless params[:q] + return scope unless params[:q]['end_date_lteq(1i)'].present? begin_range = flatten_date('start_date_gteq') end_range = flatten_date('end_date_lteq') |