Merge pull request #394 from af83/6210-remove-attributes-from-models

Refs #6210 Remove status value attribue from Chouette::VehicleJourney…

13 files changed, 10 insertions, 18 deletions

diff --git a/app/controllers/vehicle_journey_frequencies_controller.rb b/app/controllers/vehicle_journey_frequencies_controller.rb
index 9626bd36d..6e12c0247 100644
--- a/app/controllers/vehicle_journey_frequencies_controller.rb
+++ b/app/controllers/vehicle_journey_frequencies_controller.rb
@@ -13,7 +13,7 @@ class VehicleJourneyFrequenciesController < VehicleJourneysController
   def vehicle_journey_frequency_params
     params.require(:vehicle_journey_frequency).permit( { footnote_ids: [] } , :journey_pattern_id, :number, :published_journey_name,
                                              :published_journey_identifier, :comment, :transport_mode,
-                                             :mobility_restricted_suitability, :flexible_service, :status_value,
+                                             :mobility_restricted_suitability, :flexible_service,
                                              :facility, :vehicle_type_identifier, :objectid, :time_table_tokens,
                                              { date: [ :hour, :minute ] }, :button, :referential_id, :line_id,
                                              :route_id, :id, { vehicle_journey_at_stops_attributes: [ :arrival_time,
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index e532712d2..821ea83ff 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -233,7 +233,6 @@ class VehicleJourneysController < ChouetteController
       :transport_mode,
       :mobility_restricted_suitability,
       :flexible_service,
-      :status_value,
       :facility,
       :vehicle_type_identifier,
       :objectid,
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb
index ff85f376a..3a3d5d56a 100644
--- a/app/models/chouette/journey_pattern.rb
+++ b/app/models/chouette/journey_pattern.rb
@@ -15,7 +15,6 @@ module Chouette
     validates_presence_of :name
 
     #validates :stop_points, length: { minimum: 2, too_short: :minimum }, on: :update
-    enum section_status: { todo: 0, completed: 1, control: 2 }
 
     attr_accessor  :control_checked
 
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index b3987060a..525036077 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -15,7 +15,7 @@ module Chouette
     attr_reader :time_table_tokens
 
     def self.nullable_attributes
-      [:transport_mode, :published_journey_name, :vehicle_type_identifier, :published_journey_identifier, :comment, :status_value]
+      [:transport_mode, :published_journey_name, :vehicle_type_identifier, :published_journey_identifier, :comment]
     end
 
     belongs_to :company
diff --git a/app/views/vehicle_journeys/_form.html.slim b/app/views/vehicle_journeys/_form.html.slim
index ca200a5f7..a412743aa 100644
--- a/app/views/vehicle_journeys/_form.html.slim
+++ b/app/views/vehicle_journeys/_form.html.slim
@@ -10,7 +10,6 @@
     = form.input :transport_mode, include_blank: false
     = form.input :mobility_restricted_suitability, as: :select, :collection => [[vehicle_journey.human_attribute_name("accessible"), true], [vehicle_journey.human_attribute_name("not_accessible"), false]], :include_blank => true
     = form.input :flexible_service, as: :select, :collection => [[vehicle_journey.human_attribute_name("on_demand_fs"), true], [vehicle_journey.human_attribute_name("regular_fs"), false]], :include_blank => true
-    = form.input :status_value
     = form.input :facility
     = form.input :vehicle_type_identifier
     = form.input :objectid, :required => !vehicle_journey.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.vehicle_journey.objectid")}
diff --git a/app/views/vehicle_journeys/_show_details.html.slim b/app/views/vehicle_journeys/_show_details.html.slim
index d9e4110c9..e46775975 100644
--- a/app/views/vehicle_journeys/_show_details.html.slim
+++ b/app/views/vehicle_journeys/_show_details.html.slim
@@ -54,10 +54,6 @@
       = vehicle_journey.comment
 
     p
-      label = "#{vehicle_journey.human_attribute_name('status_value')} : "
-      = vehicle_journey.status_value
-
-    p
       label = "#{vehicle_journey.human_attribute_name('facility')} : "
       = vehicle_journey.facility
 
diff --git a/config/locales/journey_patterns.en.yml b/config/locales/journey_patterns.en.yml
index 5f3de0b05..d480e144d 100644
--- a/config/locales/journey_patterns.en.yml
+++ b/config/locales/journey_patterns.en.yml
@@ -41,7 +41,6 @@ en:
         name: "Name"
         published_name: "Published name"
         comment: "Comments"
-        section_status: "Section status"
         registration_number: "Registration number"
         stop_point_ids: "Route's stop selection"
         objectid: "Neptune identifier"
diff --git a/config/locales/journey_patterns.fr.yml b/config/locales/journey_patterns.fr.yml
index 2aa95248f..32c1f3f97 100644
--- a/config/locales/journey_patterns.fr.yml
+++ b/config/locales/journey_patterns.fr.yml
@@ -40,7 +40,6 @@ fr:
         route: "Séquence d'arrêts"
         name: "Nom"
         published_name: "Nom public"
-        section_status: "Status section"
         comment: "Commentaire"
         registration_number: "Code mission"
         stop_point_ids: "Sélection des arrêts desservis"
diff --git a/config/locales/vehicle_journeys.en.yml b/config/locales/vehicle_journeys.en.yml
index 1fa2618dd..f1ba96dc5 100644
--- a/config/locales/vehicle_journeys.en.yml
+++ b/config/locales/vehicle_journeys.en.yml
@@ -126,7 +126,6 @@ en:
         purchase_window: "Purchase availability"
         regular_fs: "Regular service"
         route: "Route"
-        status_value: "Status Value"
         time_slot: "Time Slot"
         time_table_ids: "Calendar list"
         time_tables: "Calendars"
diff --git a/config/locales/vehicle_journeys.fr.yml b/config/locales/vehicle_journeys.fr.yml
index a1eb5b3f7..d144e580f 100644
--- a/config/locales/vehicle_journeys.fr.yml
+++ b/config/locales/vehicle_journeys.fr.yml
@@ -127,7 +127,6 @@ fr:
         purchase_window: "Disponibilité commerciale"
         regular_fs: "Service régulier"
         route: "Itinéraire"
-        status_value: "Etat de trafic"
         time_slot: "Fréquence"
         time_table_ids: "Liste des calendriers"
         time_tables: "Calendriers"
diff --git a/db/migrate/20180319043333_remove_attributes_from_models.rb b/db/migrate/20180319043333_remove_attributes_from_models.rb
new file mode 100644
index 000000000..e6de2987e
--- /dev/null
+++ b/db/migrate/20180319043333_remove_attributes_from_models.rb
@@ -0,0 +1,6 @@
+class RemoveAttributesFromModels < ActiveRecord::Migration
+  def change
+    remove_column "vehicle_journeys", "status_value"
+    remove_column "journey_patterns", "section_status"
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d7f9a9b25..58c8b0779 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180313110900) do
+ActiveRecord::Schema.define(version: 20180319043333) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -446,7 +446,7 @@ ActiveRecord::Schema.define(version: 20180313110900) do
 
   create_table "journey_patterns", id: :bigserial, force: :cascade do |t|
     t.integer  "route_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"
@@ -454,7 +454,6 @@ ActiveRecord::Schema.define(version: 20180313110900) do
     t.string   "published_name"
     t.integer  "departure_stop_point_id", limit: 8
     t.integer  "arrival_stop_point_id",   limit: 8
-    t.integer  "section_status",                    default: 0, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "checksum"
@@ -976,7 +975,6 @@ ActiveRecord::Schema.define(version: 20180313110900) do
     t.string   "objectid",                                               null: false
     t.integer  "object_version",                  limit: 8
     t.string   "comment"
-    t.string   "status_value"
     t.string   "transport_mode"
     t.string   "published_journey_name"
     t.string   "published_journey_identifier"
diff --git a/spec/lib/model_attribute_spec.rb b/spec/lib/model_attribute_spec.rb
index 6da740dcb..b35a71155 100644
--- a/spec/lib/model_attribute_spec.rb
+++ b/spec/lib/model_attribute_spec.rb
@@ -82,7 +82,6 @@ RSpec.describe ModelAttribute do
       ModelAttribute.define(:route, :name, :string)
       ModelAttribute.define(:route, :checked_at, :date)
       ModelAttribute.define(:journey_pattern, :name, :string)
-      ModelAttribute.define(:journey_pattern, :section_status, :integer)
 
       expect(ModelAttribute.methods_by_class_and_type(:route, :string)).to match_array([
         ModelAttribute.new(:route, :name, :string)