Refs #6210 Remove status value attribue from Chouette::VehicleJourney and section status fron Chouette::JourneyPattern

6 files changed, 2 insertions, 9 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 9c3ef78fa..5a5132200 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