Refs #4787 Add waiting time unity

3 files changed, 11 insertions, 52 deletions

diff --git a/config/locales/compliance_controls.en.yml b/config/locales/compliance_controls.en.yml
index f9d7d23d2..3392afab5 100644
--- a/config/locales/compliance_controls.en.yml
+++ b/config/locales/compliance_controls.en.yml
@@ -89,7 +89,7 @@ en:
     vehicle_journey_control/waiting_time:
       messages:
         3_vehiclejourney_1: "On the following vehicle journey %{source_objectid}, the waiting time %{error_value} a this stop point %{target_0_label} (%{target_0_objectid}) is greater than the threshold (%{reference_value})"
-      description: "The waiting time at a specific stop point cannot be too big"
+      description: "The waiting time, in minutes, at a specific stop point cannot be too big"
     vehicle_journey_control/speed:
       messages:
         3_vehiclejourney_2_1: "On the following vehicle journey %{source_objectid}, the computed speed %{error_value} between the stop points %{target_0_label} (%{target_0_objectid}) and %{target_1_label} (%{target_1_objectid}) is greater than the threshold (%{reference_value})"
diff --git a/config/locales/compliance_controls.fr.yml b/config/locales/compliance_controls.fr.yml
index b77b4e6d4..cde75aaf5 100644
--- a/config/locales/compliance_controls.fr.yml
+++ b/config/locales/compliance_controls.fr.yml
@@ -88,7 +88,7 @@ fr:
     vehicle_journey_control/waiting_time:
       messages:
         3_vehiclejourney_1: "Sur la course %{source_objectid}, le temps d'attente %{error_value} à l'arrêt %{target_0_label} (%{target_0_objectid}) est supérieur au seuil toléré (%{reference_value})"
-      description: "La durée d’attente à un arrêt ne doit pas être trop grande"
+      description: "La durée d’attente, en minutes, à un arrêt ne doit pas être trop grande"
     vehicle_journey_control/speed:
       messages:
         3_vehiclejourney_2_1: "Sur la course %{source_objectid}, la vitesse calculée %{error_value} entre les arrêts %{target_0_label} (%{target_0_objectid}) et %{target_1_label} (%{target_1_objectid}) est supérieur au seuil toléré (%{reference_value})"
diff --git a/db/schema.rb b/db/schema.rb
index 9469a36d4..81966575b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -281,22 +281,6 @@ ActiveRecord::Schema.define(version: 20171220164059) do
 
   add_index "connection_links", ["objectid"], name: "connection_links_objectid_key", unique: true, using: :btree
 
-  create_table "delayed_jobs", id: :bigserial, force: :cascade do |t|
-    t.integer  "priority",               default: 0
-    t.integer  "attempts",               default: 0
-    t.text     "handler"
-    t.text     "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by",  limit: 255
-    t.string   "queue",      limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree
-
   create_table "exports", id: :bigserial, force: :cascade do |t|
     t.integer  "referential_id",  limit: 8
     t.string   "status"
@@ -416,16 +400,11 @@ ActiveRecord::Schema.define(version: 20171220164059) do
     t.datetime "started_at"
     t.datetime "ended_at"
     t.string   "token_download"
-    t.string   "type",                  limit: 255
+    t.string   "type"
     t.integer  "parent_id",             limit: 8
     t.string   "parent_type"
-<<<<<<< HEAD
-    t.integer  "current_step",                      default: 0
-    t.integer  "total_steps",                       default: 0
-=======
     t.integer  "current_step",                    default: 0
     t.integer  "total_steps",                     default: 0
->>>>>>> Commit schema
     t.datetime "notified_parent_at"
     t.string   "creator"
   end
@@ -543,19 +522,6 @@ ActiveRecord::Schema.define(version: 20171220164059) do
   add_index "lines", ["registration_number"], name: "lines_registration_number_key", using: :btree
   add_index "lines", ["secondary_company_ids"], name: "index_lines_on_secondary_company_ids", using: :gin
 
-  create_table "merges", id: :bigserial, force: :cascade do |t|
-    t.integer  "workbench_id",    limit: 8
-    t.integer  "referential_ids", limit: 8,              array: true
-    t.string   "creator"
-    t.string   "status"
-    t.datetime "started_at"
-    t.datetime "ended_at"
-    t.datetime "created_at",                null: false
-    t.datetime "updated_at",                null: false
-  end
-
-  add_index "merges", ["workbench_id"], name: "index_merges_on_workbench_id", using: :btree
-
   create_table "networks", id: :bigserial, force: :cascade do |t|
     t.string   "objectid",                      null: false
     t.integer  "object_version",      limit: 8
@@ -577,11 +543,6 @@ ActiveRecord::Schema.define(version: 20171220164059) do
   add_index "networks", ["objectid"], name: "networks_objectid_key", unique: true, using: :btree
   add_index "networks", ["registration_number"], name: "networks_registration_number_key", using: :btree
 
-  create_table "object_id_factories", id: :bigserial, force: :cascade do |t|
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
   create_table "organisations", id: :bigserial, force: :cascade do |t|
     t.string   "name"
     t.datetime "created_at"
@@ -763,7 +724,7 @@ ActiveRecord::Schema.define(version: 20171220164059) do
 
   create_table "stop_areas", id: :bigserial, force: :cascade do |t|
     t.integer  "parent_id",                       limit: 8
-    t.string   "objectid",                                                              null: false
+    t.string   "objectid",                                                            null: false
     t.integer  "object_version",                  limit: 8
     t.string   "name"
     t.string   "comment"
@@ -771,8 +732,8 @@ ActiveRecord::Schema.define(version: 20171220164059) do
     t.string   "registration_number"
     t.string   "nearest_topic_name"
     t.integer  "fare_code"
-    t.decimal  "longitude",                                   precision: 19, scale: 16
-    t.decimal  "latitude",                                    precision: 19, scale: 16
+    t.decimal  "longitude",                                 precision: 19, scale: 16
+    t.decimal  "latitude",                                  precision: 19, scale: 16
     t.string   "long_lat_type"
     t.string   "country_code"
     t.string   "street_name"
@@ -790,7 +751,7 @@ ActiveRecord::Schema.define(version: 20171220164059) do
     t.datetime "deleted_at"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "stif_type",                       limit: 255
+    t.string   "stif_type"
     t.integer  "waiting_time"
   end
 
@@ -861,17 +822,17 @@ ActiveRecord::Schema.define(version: 20171220164059) do
   add_index "time_table_periods", ["time_table_id"], name: "index_time_table_periods_on_time_table_id", using: :btree
 
   create_table "time_tables", id: :bigserial, force: :cascade do |t|
-    t.string   "objectid",                                null: false
-    t.integer  "object_version",  limit: 8,   default: 1
+    t.string   "objectid",                              null: false
+    t.integer  "object_version",  limit: 8, default: 1
     t.string   "version"
     t.string   "comment"
-    t.integer  "int_day_types",               default: 0
+    t.integer  "int_day_types",             default: 0
     t.date     "start_date"
     t.date     "end_date"
     t.integer  "calendar_id",     limit: 8
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "color",           limit: 255
+    t.string   "color"
     t.integer  "created_from_id", limit: 8
     t.string   "checksum"
     t.text     "checksum_source"
@@ -1026,9 +987,7 @@ ActiveRecord::Schema.define(version: 20171220164059) do
   add_foreign_key "compliance_controls", "compliance_control_blocks"
   add_foreign_key "compliance_controls", "compliance_control_sets"
   add_foreign_key "group_of_lines_lines", "group_of_lines", name: "groupofline_group_fkey", on_delete: :cascade
-  add_foreign_key "journey_frequencies", "timebands", name: "journey_frequencies_timeband_id_fk", on_delete: :nullify
   add_foreign_key "journey_frequencies", "timebands", on_delete: :nullify
-  add_foreign_key "journey_frequencies", "vehicle_journeys", name: "journey_frequencies_vehicle_journey_id_fk", on_delete: :nullify
   add_foreign_key "journey_frequencies", "vehicle_journeys", on_delete: :nullify
   add_foreign_key "journey_patterns", "routes", name: "jp_route_fkey", on_delete: :cascade
   add_foreign_key "journey_patterns", "stop_points", column: "arrival_stop_point_id", name: "arrival_point_fkey", on_delete: :nullify