Refs Adapt transport mode & submode translations

18 files changed, 28 insertions, 112 deletions

diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js
index 2ff4999c6..d9f81d399 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js
@@ -111,7 +111,7 @@ class EditVehicleJourney extends Component {
                               <input
                                 type='text'
                                 className='form-control'
-                                value={window.I18n.fr.enumerize.line.transport_mode[this.props.modal.modalProps.vehicleJourney.transport_mode]}
+                                value={window.I18n.fr.enumerize.transport_mode[this.props.modal.modalProps.vehicleJourney.transport_mode]}
                                 disabled={true}
                               />
                             </div>
@@ -122,7 +122,7 @@ class EditVehicleJourney extends Component {
                               <input
                                 type='text'
                                 className='form-control'
-                                value={window.I18n.fr.enumerize.line.transport_submode[this.props.modal.modalProps.vehicleJourney.transport_submode]}
+                                value={window.I18n.fr.enumerize.transport_submode[this.props.modal.modalProps.vehicleJourney.transport_submode]}
                                 disabled={true}
                               />
                             </div>
diff --git a/app/controllers/compliance_control_blocks_controller.rb b/app/controllers/compliance_control_blocks_controller.rb
index 6896b0d4b..9d231e25e 100644
--- a/app/controllers/compliance_control_blocks_controller.rb
+++ b/app/controllers/compliance_control_blocks_controller.rb
@@ -3,11 +3,6 @@ class ComplianceControlBlocksController < BreadcrumbController
   belongs_to :compliance_control_set
   actions :all, :except => [:show, :index]
 
-  def new
-    @compliance_control_set = parent
-    @compliance_control_block = ComplianceControlBlock.new(compliance_control_set: @compliance_control_set)
-  end
-
   private
 
   def compliance_control_block_params
diff --git a/app/helpers/lines_helper.rb b/app/helpers/lines_helper.rb
index ccf3a12a2..1a7f567c7 100644
--- a/app/helpers/lines_helper.rb
+++ b/app/helpers/lines_helper.rb
@@ -6,11 +6,11 @@ module LinesHelper
   end
 
   def sorted_transport_submode
-    Chouette::Line.transport_submode.values.sort_by{|m| t("enumerize.line.transport_submode.#{m}").parameterize }
+    Chouette::Line.transport_submode.values.sort_by{|m| t("enumerize.transport_submode.#{m}").parameterize }
   end
 
   def sorted_transport_mode
-    Chouette::Line.transport_mode.values.sort_by{|m| t("enumerize.line.transport_mode.#{m}").parameterize }
+    Chouette::Line.transport_mode.values.sort_by{|m| t("enumerize.transport_mode.#{m}").parameterize }
   end
 
   def colors?(line)
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index 63d2d1606..6f87a5d08 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -3,12 +3,10 @@ class Chouette::Line < Chouette::ActiveRecord
   include LineRestrictions
   include LineReferentialSupport
   include StifTransportModeEnumerations
+  include StifTransportSubmodeEnumerations
 
-  extend Enumerize
   extend ActiveModel::Naming
 
-  enumerize :transport_submode, in: %i(unknown undefined internationalFlight domesticFlight intercontinentalFlight domesticScheduledFlight shuttleFlight intercontinentalCharterFlight internationalCharterFlight roundTripCharterFlight sightseeingFlight helicopterService domesticCharterFlight SchengenAreaFlight airshipService shortHaulInternationalFlight canalBarge localBus regionalBus expressBus nightBus postBus specialNeedsBus mobilityBus mobilityBusForRegisteredDisabled sightseeingBus shuttleBus highFrequencyBus dedicatedLaneBus schoolBus schoolAndPublicServiceBus railReplacementBus demandAndResponseBus airportLinkBus internationalCoach nationalCoach shuttleCoach regionalCoach specialCoach schoolCoach sightseeingCoach touristCoach commuterCoach metro tube urbanRailway local highSpeedRail suburbanRailway regionalRail interregionalRail longDistance intermational sleeperRailService nightRail carTransportRailService touristRailway railShuttle replacementRailService specialTrain crossCountryRail rackAndPinionRailway cityTram localTram regionalTram sightseeingTram shuttleTram trainTram internationalCarFerry nationalCarFerry regionalCarFerry localCarFerry internationalPassengerFerry nationalPassengerFerry regionalPassengerFerry localPassengerFerry postBoat trainFerry roadFerryLink airportBoatLink highSpeedVehicleService highSpeedPassengerService sightseeingService schoolBoat cableFerry riverBus scheduledFerry shuttleFerryService telecabin cableCar lift chairLift dragLift telecabinLink funicular streetCableCar allFunicularServices undefinedFunicular)
-
   # FIXME http://jira.codehaus.org/browse/JRUBY-6358
   self.primary_key = "id"
 
diff --git a/app/models/chouette/transport_mode.rb b/app/models/chouette/transport_mode.rb
deleted file mode 100644
index 825ef15b8..000000000
--- a/app/models/chouette/transport_mode.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-class Chouette::TransportMode < ActiveSupport::StringInquirer
-
-  def initialize(text_code, numerical_code)
-    super text_code.to_s
-    @numerical_code = numerical_code
-  end
-
-  def self.new(text_code, numerical_code = nil)
-    if text_code and numerical_code
-      super
-    elsif self === text_code 
-      text_code
-    else
-      if Fixnum === text_code
-        text_code, numerical_code = definitions.rassoc(text_code)
-      else
-        text_code, numerical_code = definitions.assoc(text_code.to_s)
-      end
-
-      super text_code, numerical_code
-    end
-  end
-
-  def to_i
-    @numerical_code
-  end
-
-  def inspect
-    "#{to_s}/#{to_i}"
-  end
-
-  def name
-    camelize
-  end
-
-  @@definitions = [
-    ["interchange", -1],
-    ["unknown", 0],
-    ["coach", 1],
-    ["air", 2],
-    ["waterborne", 3],
-    ["bus", 4],
-    ["ferry", 5],
-    ["walk", 6],
-    ["metro", 7],
-    ["shuttle", 8],
-    ["rapid_transit", 9],
-    ["taxi", 10],
-    ["local_train", 11],
-    ["train", 12],
-    ["long_distance_train", 13],
-    ["tramway", 14],
-    ["trolleybus", 15],
-    ["private_vehicle", 16],
-    ["bicycle", 17],
-    ["other", 18]
-  ]
-  cattr_reader :definitions
-
-  @@all = nil
-  def self.all
-    @@all ||= definitions.collect do |text_code, numerical_code|
-      new(text_code, numerical_code)
-    end
-  end
-
-  def public_transport?
-    not interchange?
-  end
-
-end
diff --git a/app/models/line_referential.rb b/app/models/line_referential.rb
index 8bbc32993..7ab892b53 100644
--- a/app/models/line_referential.rb
+++ b/app/models/line_referential.rb
@@ -1,4 +1,6 @@
 class LineReferential < ActiveRecord::Base
+  include StifTransportModeEnumerations
+  
   has_many :line_referential_memberships
   has_many :organisations, through: :line_referential_memberships
   has_many :lines, class_name: 'Chouette::Line'
@@ -25,8 +27,4 @@ class LineReferential < ActiveRecord::Base
   def last_sync
     line_referential_syncs.last
   end
-
-  def transport_modes
-    Chouette::TransportMode.all.select { |tm| tm.to_i > 0 }
-  end
 end
diff --git a/app/models/organisation.rb b/app/models/organisation.rb
index ba65ad375..ffbbdd542 100644
--- a/app/models/organisation.rb
+++ b/app/models/organisation.rb
@@ -19,7 +19,7 @@ class Organisation < ActiveRecord::Base
   validates_presence_of :name
   validates_uniqueness_of :code
 
-  after_create :add_rule_parameter_set
+  # after_create :add_rule_parameter_set
 
   def add_rule_parameter_set
     RuleParameterSet.default_for_all_modes( self).save
diff --git a/app/models/rule_parameter_set.rb b/app/models/rule_parameter_set.rb
index db78a2f8a..122483711 100644
--- a/app/models/rule_parameter_set.rb
+++ b/app/models/rule_parameter_set.rb
@@ -65,7 +65,8 @@ class RuleParameterSet < ActiveRecord::Base
   end
 
   def self.all_modes
-    Chouette::TransportMode.all.map { |m| m.to_s}
+    # Chouette::TransportMode.all.map { |m| m.to_s}
+    []
   end
 
   def self.mode_attribute?( method_name )
diff --git a/app/models/stif_transport_mode_enumerations.rb b/app/models/stif_transport_mode_enumerations.rb
deleted file mode 100644
index a9a3fc3e0..000000000
--- a/app/models/stif_transport_mode_enumerations.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module StifTransportModeEnumerations
-  extend Enumerize
-
-  enumerize :transport_mode, in: %w(air bus coach ferry metro rail trolleyBus tram water cableway funicular other)
-end
diff --git a/app/views/compliance_control_blocks/_form.html.slim b/app/views/compliance_control_blocks/_form.html.slim
index 877af91cb..23271ea9b 100644
--- a/app/views/compliance_control_blocks/_form.html.slim
+++ b/app/views/compliance_control_blocks/_form.html.slim
@@ -2,8 +2,8 @@
   .row
     .col-lg-12
       .form-group
-        = f.input :transport_mode, as: :select, collection: ComplianceControlBlock.transport_modes, label: t('activerecord.attributes.compliance_control_block.transport_mode') 
-        = f.input :transport_sub_mode, as: :select, collection: ComplianceControlBlock.transport_sub_modes, label: t('activerecord.attributes.compliance_control_block.transport_sub_mode')
+        = f.input :transport_mode, as: :select, collection: ComplianceControlBlock.transport_modes, label: t('activerecord.attributes.compliance_control_blocks.transport_mode') 
+        = f.input :transport_sub_mode, as: :select, collection: ComplianceControlBlock.transport_sub_modes, label: t('activerecord.attributes.compliance_control_blocks.transport_submode')
 
   .separator
 
diff --git a/app/views/lines/_filters.html.slim b/app/views/lines/_filters.html.slim
index 0e34b2e4c..01c2da58f 100644
--- a/app/views/lines/_filters.html.slim
+++ b/app/views/lines/_filters.html.slim
@@ -17,11 +17,11 @@
 
     .form-group.togglable
       = f.label Chouette::Line.human_attribute_name(:transport_mode), required: false, class: 'control-label'
-      = f.input :transport_mode_eq_any, collection: sorted_transport_mode, as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + t("enumerize.line.transport_mode.#{l}") + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list'}
+      = f.input :transport_mode_eq_any, collection: sorted_transport_mode, as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + t("enumerize.transport_mode.#{l}") + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list'}
 
     .form-group.togglable
       = f.label Chouette::Line.human_attribute_name(:transport_submode), required: false, class: 'control-label'
-      = f.input :transport_submode_eq_any, collection: sorted_transport_submode, as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + t("enumerize.line.transport_submode.#{l}") + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list'}
+      = f.input :transport_submode_eq_any, collection: sorted_transport_submode, as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + t("enumerize.transport_submode.#{l}") + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list'}
 
   .actions
     = link_to 'Effacer', @workbench, class: 'btn btn-link'
diff --git a/app/views/lines/index.html.slim b/app/views/lines/index.html.slim
index fb07c45a2..4ee91e8f8 100644
--- a/app/views/lines/index.html.slim
+++ b/app/views/lines/index.html.slim
@@ -48,11 +48,11 @@
               ), \
               TableBuilderHelper::Column.new( \
                 key: :transport_mode, \
-                attribute: Proc.new { |n| n.transport_mode.nil? ? '-' :  t("enumerize.line.transport_mode.#{n.try(:transport_mode)}") } \
+                attribute: Proc.new { |n| n.transport_mode.nil? ? '-' :  t("enumerize.transport_mode.#{n.try(:transport_mode)}") } \
               ), \
               TableBuilderHelper::Column.new( \
                 key: :transport_submode, \
-                attribute: Proc.new { |n| n.transport_submode.nil? ? '-' :  t("enumerize.line.transport_submode.#{n.try(:transport_submode)}") } \
+                attribute: Proc.new { |n| n.transport_submode.nil? ? '-' :  t("enumerize.transport_submode.#{n.try(:transport_submode)}") } \
               ) \
             ],
             links: [:show],
diff --git a/app/views/lines/show.html.slim b/app/views/lines/show.html.slim
index 0779a0f5a..201aa2ae4 100644
--- a/app/views/lines/show.html.slim
+++ b/app/views/lines/show.html.slim
@@ -27,7 +27,7 @@
              'Transporteur(s) secondaire(s)' => (@line.secondary_companies.nil? ? t('lines.index.unset') : @line.secondary_companies.collect(&:name).join(', ')),
              'Nom court' => @line.number,
              'Code public' => (@line.registration_number ? @line.registration_number : '-'),
-             @line.human_attribute_name(:transport_mode) => (@line.transport_mode ? t("enumerize.line.transport_mode.#{@line.transport_mode}") : '-'),
-             @line.human_attribute_name(:transport_submode) => (@line.transport_submode ? t("enumerize.line.transport_submode.#{@line.transport_submode}") : '-'),
+             @line.human_attribute_name(:transport_mode) => (@line.transport_mode ? t("enumerize.transport_mode.#{@line.transport_mode}") : '-'),
+             @line.human_attribute_name(:transport_submode) => (@line.transport_submode ? t("enumerize.transport_submode.#{@line.transport_submode}") : '-'),
              @line.human_attribute_name(:url) => (@line.url ? @line.url : '-'),
              @line.human_attribute_name(:seasonal) => (@line.seasonal? ? t('true') : t('false')),}
diff --git a/app/views/referential_lines/show.html.slim b/app/views/referential_lines/show.html.slim
index 6e59d83b3..06a52a45d 100644
--- a/app/views/referential_lines/show.html.slim
+++ b/app/views/referential_lines/show.html.slim
@@ -27,8 +27,8 @@
              'Transporteur(s) secondaire(s)' => (@line.secondary_companies.nil? ? t('lines.index.unset') : @line.secondary_companies.collect(&:name).join(', ')),
              'Nom court' => @line.number,
              'Code public' => (@line.registration_number ? @line.registration_number : '-'),
-             @line.human_attribute_name(:transport_mode) => (@line.transport_mode ? t("enumerize.line.transport_mode.#{@line.transport_mode}") : '-'),
-             @line.human_attribute_name(:transport_submode) => (@line.transport_submode ? t("enumerize.line.transport_submode.#{@line.transport_submode}") : '-'),
+             @line.human_attribute_name(:transport_mode) => (@line.transport_mode ? t("enumerize.transport_mode.#{@line.transport_mode}") : '-'),
+             @line.human_attribute_name(:transport_submode) => (@line.transport_submode ? t("enumerize.transport_submode.#{@line.transport_submode}") : '-'),
              @line.human_attribute_name(:url) => (@line.url ? @line.url : '-'),
              @line.human_attribute_name(:seasonal) => (@line.seasonal? ? t('true') : t('false')),}
 
diff --git a/app/views/referentials/_filters.html.slim b/app/views/referentials/_filters.html.slim
index 1cc6bb410..c5b6042f0 100644
--- a/app/views/referentials/_filters.html.slim
+++ b/app/views/referentials/_filters.html.slim
@@ -9,7 +9,7 @@
   .ffg-row
     .form-group.togglable
       = f.label Chouette::Line.human_attribute_name(:transport_mode), required: false, class: 'control-label'
-      = f.input :transport_mode_eq_any, collection: @referential.lines.pluck(:transport_mode).uniq.compact, as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + t("enumerize.line.transport_mode.#{l}") + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list' }
+      = f.input :transport_mode_eq_any, collection: @referential.lines.pluck(:transport_mode).uniq.compact, as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + t("enumerize.transport_mode.#{l}") + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list' }
 
     .form-group.togglable
       = f.label Chouette::Line.human_attribute_name(:network), required: false, class: 'control-label'
diff --git a/app/views/referentials/show.html.slim b/app/views/referentials/show.html.slim
index 0fdd79e14..26ce0acbb 100644
--- a/app/views/referentials/show.html.slim
+++ b/app/views/referentials/show.html.slim
@@ -62,7 +62,7 @@
               ), \
               TableBuilderHelper::Column.new( \
                 key: :transport_mode, \
-                attribute: Proc.new { |n| n.transport_mode ? t("enumerize.line.transport_mode.#{n.transport_mode}") : '' }, \
+                attribute: Proc.new { |n| n.transport_mode ? t("enumerize.transport_mode.#{n.transport_mode}") : '' }, \
               ), \
               TableBuilderHelper::Column.new( \
                 key: 'networks.name', \
diff --git a/app/views/rule_parameter_sets/_mode_selection.html.slim b/app/views/rule_parameter_sets/_mode_selection.html.slim
index a2a8a16e5..b9afd10b6 100644
--- a/app/views/rule_parameter_sets/_mode_selection.html.slim
+++ b/app/views/rule_parameter_sets/_mode_selection.html.slim
@@ -1,4 +1,4 @@
-select.undescribed_modes
-  - Chouette::TransportMode.all.map { |m| m.name.downcase}.each do |mode|
-    option value="#{mode}"
-      = t("transport_modes.label.#{mode}")
\ No newline at end of file
+/ select.undescribed_modes
+/   - Chouette::TransportMode.all.map { |m| m.name.downcase}.each do |mode|
+/     option value="#{mode}"
+/       = t("transport_modes.label.#{mode}")
\ No newline at end of file
diff --git a/app/views/shared/_lines_search_form.html.slim b/app/views/shared/_lines_search_form.html.slim
index 3bc84a3ad..8a59412a4 100644
--- a/app/views/shared/_lines_search_form.html.slim
+++ b/app/views/shared/_lines_search_form.html.slim
@@ -19,6 +19,6 @@
           .col-xs-3
             = f.select(:company_id_eq, referential.companies.collect { |c| [c.name, c.id] }.unshift([t("lines.index.no_networks"), -1]), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_companies") })
           .col-xs-3
-            = f.select(:transport_mode_eq, Chouette::Line.transport_mode.values.collect { |v| [ I18n.t("enumerize.line.transport_mode.#{v}"), v] }.sort.unshift([t("lines.index.no_transport_modes"), -1]), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_transport_modes") })
+            = f.select(:transport_mode_eq, Chouette::Line.transport_mode.values.collect { |v| [ I18n.t("enumerize.transport_mode.#{v}"), v] }.sort.unshift([t("lines.index.no_transport_modes"), -1]), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_transport_modes") })
           .col-xs-3
-            = f.select(:transport_submode_eq, Chouette::Line.transport_submode.values.collect { |v| [ I18n.t("enumerize.line.transport_submode.#{v}"), v] }.sort.unshift([t("lines.index.no_transport_submodes"), -1]), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_transport_submodes") })
+            = f.select(:transport_submode_eq, Chouette::Line.transport_submode.values.collect { |v| [ I18n.t("enumerize.transport_submode.#{v}"), v] }.sort.unshift([t("lines.index.no_transport_submodes"), -1]), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_transport_submodes") })