add union, intersection and disjunction operation on time tables, Mantis 26838

3 files changed, 36 insertions, 4 deletions

diff --git a/config/locales/time_table_combinations.yml b/config/locales/time_table_combinations.yml
new file mode 100644
index 000000000..14d0cbe8c
--- /dev/null
+++ b/config/locales/time_table_combinations.yml
@@ -0,0 +1,27 @@
+en:
+  time_table_combinations:
+    success: "operation applied on timetable"
+    failure: "operation failed on timetable"
+    operations:
+      union: "merge"
+      intersection: "intersect"
+      disjunction: "disjoin"
+  activemodel:
+    attributes:
+      time_table_combination:
+        combined_id: "Time table to combine with"
+        operation: "operation"
+fr:
+  time_table_combinations:
+    success: "opération appliquée sur le calendrier"
+    failure: "opération échouée"
+    operations:
+      union: "fusion"
+      intersection: "intersection"
+      disjunction: "exclusion"
+  activemodel:
+    attributes:
+      time_table_combination:
+        combined_id: "Calendrier à combiner"
+        operation: "opération"
+
diff --git a/config/locales/time_tables.yml b/config/locales/time_tables.yml
index ede789bc9..3f7baa6ae 100644
--- a/config/locales/time_tables.yml
+++ b/config/locales/time_tables.yml
@@ -21,7 +21,7 @@ en:
     edit:
       title: "Update timetable %{time_table}"
     show:
-      resume: "From %{start_date} to %{end_date} (independently of any period day types)"
+      resume: "From %{start_date} to %{end_date}"
       resume_empty: "Empty timetable"
       title: "Timetable %{time_table}"
       dates: "Application dates"
@@ -30,6 +30,8 @@ en:
       to: "to"
       add_period: "Add a period"
       add_date: "Add a date"
+      combine_form: "Combinations"
+      combine: "Apply"
     index:
       title: "Timetables"
       comment: "Name"
@@ -48,7 +50,7 @@ en:
         peculiarities: "Peculiarities"
         school_holliday: "School hollidays"
         public_holliday: "Public hollidays"
-        day_types: "Day types"
+        day_types: "Period day types"
         none: "none"
         monday: "Monday"
         tuesday: "Tuesday"
@@ -97,7 +99,7 @@ fr:
     edit:
       title: "Modifier le calendrier %{time_table}"
     show:
-      resume: "Validité comprise du %{start_date} au %{end_date} (sans tenir compte des jours d'application)"
+      resume: "Validité comprise du %{start_date} au %{end_date}"
       resume_empty: "Calendrier vide"
       title: Calendrier %{time_table}
       dates: "Dates d'application"
@@ -106,6 +108,8 @@ fr:
       to: "au"
       add_period: "Ajouter une période"
       add_date: "Ajouter une date"
+      combine_form: "Combinatoire"
+      combine: "Appliquer"
     index:
       comment: "Nom"
       title: "calendriers"
@@ -124,7 +128,7 @@ fr:
         peculiarities: "Particularités"
         school_holliday: "Vacances scolaires"
         public_holliday: "Jours fériés"
-        day_types: "Jours d'application"
+        day_types: "Jours d'application des périodes"
         none: "aucun"
         monday: "Lundi"
         tuesday: "Mardi"
diff --git a/config/routes.rb b/config/routes.rb
index a167ef09c..7f4a6193a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -129,6 +129,7 @@ ChouetteIhm::Application.routes.draw do
       end
       resources :time_table_dates
       resources :time_table_periods
+      resources :time_table_combinations
     end
 
     resources :access_points do