Refs #1977: Add transport_submode enum. on lines#show

6 files changed, 212 insertions, 2 deletions

diff --git a/app/controllers/referential_lines_controller.rb b/app/controllers/referential_lines_controller.rb
index 05f80f718..c53819dd2 100644
--- a/app/controllers/referential_lines_controller.rb
+++ b/app/controllers/referential_lines_controller.rb
@@ -83,6 +83,7 @@ class ReferentialLinesController < ChouetteController
   def line_params
     params.require(:line).permit(
       :transport_mode,
+      :transport_submode,
       :network_id,
       :company_id,
       :objectid,
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index 76a421b4c..b47f7d6f9 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -1,9 +1,13 @@
 class Chouette::Line < Chouette::ActiveRecord
   include DefaultNetexAttributesSupport
   include LineRestrictions
-
   include LineReferentialSupport
 
+  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/line_referential.rb b/app/models/line_referential.rb
index 47bd67a06..8bbc32993 100644
--- a/app/models/line_referential.rb
+++ b/app/models/line_referential.rb
@@ -1,7 +1,6 @@
 class LineReferential < ActiveRecord::Base
   has_many :line_referential_memberships
   has_many :organisations, through: :line_referential_memberships
-
   has_many :lines, class_name: 'Chouette::Line'
   has_many :group_of_lines, class_name: 'Chouette::GroupOfLine'
   has_many :companies, class_name: 'Chouette::Company'
diff --git a/app/views/referential_lines/show.html.slim b/app/views/referential_lines/show.html.slim
index 801aebb28..a479cd580 100644
--- a/app/views/referential_lines/show.html.slim
+++ b/app/views/referential_lines/show.html.slim
@@ -48,6 +48,10 @@ h2
     p
       label = "#{@line.human_attribute_name('transport_mode')} : "
       = t("transport_modes.label.#{@line.transport_mode}")
+    
+    p
+      label = "#{@line.human_attribute_name('transport_submode')} : "
+      = t("enumerize.linereferential.transport_submode.#{@line.transport_submode}")
 
     p
       label = "#{@line.human_attribute_name('stable_id')} : "
diff --git a/config/locales/enumerize.en.yml b/config/locales/enumerize.en.yml
index aab0bcf32..ed6c84efa 100644
--- a/config/locales/enumerize.en.yml
+++ b/config/locales/enumerize.en.yml
@@ -50,3 +50,104 @@ en:
       wayback:
         straight_forward: 'Straight Forward'
         backward: 'Backward'
+
+    linereferential:
+      transport_submode:
+        unknown: 'Unknown'
+        undefined: 'Undefined'
+        internationalFlight: 'International flight'
+        domesticFlight: 'Domestic flight'
+        intercontinentalFlight: 'Intercontinental flight'
+        domesticScheduledFlight: 'Domestic scheduled flight'
+        shuttleFlight: 'Shuttle flight'
+        intercontinentalCharterFlight: "Intercontinental charter flight"
+        internationalCharterFlight: "International charter flight"
+        roundTripCharterFlight: "Roundtrip charter flight"
+        sightseeingFlight: 'Sightseeing flight'
+        helicopterService: "Helicopter service"
+        domesticCharterFlight: "Domestic charter flight"
+        SchengenAreaFlight: 'Schengen area flight'
+        airshipService: 'Airship service'
+        shortHaulInternationalFlight: 'Short haul international flight'
+        canalBarge: 'Canal barge'
+        localBus: 'Local bus'
+        regionalBus: 'Regional bus'
+        expressBus: 'Express bus'
+        nightBus: 'Night bus'
+        postBus: 'Post but'
+        specialNeedsBus: 'Special needs bus'
+        mobilityBus: 'Mobility bus'
+        mobilityBusForRegisteredDisabled: 'Mobility bus for registered disabled'
+        sightseeingBus: 'sightseeingBus'
+        shuttleBus: 'Shuttle bus'
+        highFrequencyBus: 'High frequency bus'
+        dedicatedLaneBus: 'Dedicated lane bus'
+        schoolBus: 'School bus'
+        schoolAndPublicServiceBus: 'School and public service bus'
+        railReplacementBus: 'Rail replacement bus'
+        demandAndResponseBus: 'Demand and response bus'
+        airportLinkBus: 'Airport link bus'
+        internationalCoach: 'International coach'
+        nationalCoach: 'National coach'
+        shuttleCoach: 'Shuttle coach'
+        regionalCoach: 'Regional coach'
+        specialCoach: 'Special coach'
+        schoolCoach: 'School coach'
+        sightseeingCoach: 'Sightseeing coach'
+        touristCoach: 'Tourist coach'
+        commuterCoach: 'Commuter coach'
+        metro: 'Metro'
+        tube: 'Tube'
+        urbanRailway: 'Urban railway'
+        local: 'Local'
+        highSpeedRail: 'High speed rail'
+        suburbanRailway: 'Suburban railway'
+        regionalRail: 'Regional rail'
+        interregionalRail: 'Interregional rail'
+        longDistance: 'Long distance'
+        international: 'International'
+        sleeperRailService: 'Sleeper rail service'
+        nightRail: 'Night rail'
+        carTransportRailService: 'Car transport rail service'
+        touristRailway: 'Tourist railway'
+        railShuttle: 'Rail shuttle'
+        replacementRailService: 'Replacement rail service'
+        specialTrain: 'Special train'
+        crossCountryRail: 'Cross country rail'
+        rackAndPinionRailway: 'Rack and pinion railway'
+        cityTram: 'City tram'
+        localTram: 'Local tram'
+        regionalTram: 'Regional tram'
+        sightseeingTram: 'Sightseeing tram'
+        shuttleTram: 'Shuttle tram'
+        trainTram: 'Train tram'
+        internationalCarFerry: 'International car ferry'
+        nationalCarFerry: 'National car ferry'
+        regionalCarFerry: 'Regional car ferry'
+        localCarFerry: 'Local car ferry'
+        internationalPassengerFerry: 'International passenger ferry'
+        nationalPassengerFerry: 'National passenger ferry'
+        regionalPassengerFerry: 'Regional passenger ferry'
+        localPassengerFerry: 'Local passenger ferry'
+        postBoat: 'Post boat'
+        trainFerry: 'Train ferry'
+        roadFerryLink: 'Road ferry link'
+        airportBoatLink: "Airport boat link"
+        highSpeedVehicleService: 'High speed vehicle service'
+        highSpeedPassengerService: 'High speed passenger service'
+        sightseeingService: 'Sightseeing service'
+        schoolBoat: 'School boat'
+        cableFerry: 'Cable ferry'
+        riverBus: 'River bus'
+        scheduledFerry: 'Scheduled ferry'
+        shuttleFerryService: 'Shuttle ferry service'
+        telecabin: 'Telecabin'
+        cableCar: 'Cable car'
+        lift: 'Lift'
+        chairLift: 'Chair lift'
+        dragLift: 'Drag lift'
+        telecabinLink: 'Telecabin link'
+        funicular: 'Funicular'
+        streetCableCar: 'Street cable car'
+        allFunicularServices: 'All funicular services'
+        undefinedFunicular: 'Undefined funicular'
diff --git a/config/locales/enumerize.fr.yml b/config/locales/enumerize.fr.yml
index b800521e3..e6eb1f13b 100644
--- a/config/locales/enumerize.fr.yml
+++ b/config/locales/enumerize.fr.yml
@@ -50,3 +50,104 @@ fr:
       wayback:
         straight_forward: 'Aller'
         backward: 'Retour'
+
+    linereferential:
+      transport_submode:
+        unknown: 'Inconnu'
+        undefined: 'Non défini'
+        internationalFlight: 'Vol international'
+        domesticFlight: 'Vol intérieur'
+        intercontinentalFlight: 'Vol intercontinental'
+        domesticScheduledFlight: 'Vol intérieur régulier'
+        shuttleFlight: 'Vol de navette'
+        intercontinentalCharterFlight: "Vol 'charter' intercontinental"
+        internationalCharterFlight: "Vol 'charter' international"
+        roundTripCharterFlight: "Vol 'charter' aller/retour"
+        sightseeingFlight: 'Vol tourisme'
+        helicopterService: "Service d'hélicoptère"
+        domesticCharterFlight: "Vol 'charter' intérieur"
+        SchengenAreaFlight: 'Vol de zone Shengen'
+        airshipService: 'Service de dirigeable'
+        shortHaulInternationalFlight: 'Vol international à courte distance'
+        canalBarge: 'Péniche'
+        localBus: 'Bus local'
+        regionalBus: 'Bus régional'
+        expressBus: 'Bus express'
+        nightBus: 'Bus de nuit'
+        postBus: 'Bus postal'
+        specialNeedsBus: 'Bus de besoins spécial'
+        mobilityBus: 'Bus de mobilité'
+        mobilityBusForRegisteredDisabled: 'Bus de mobilité pour personnes handicapées'
+        sightseeingBus: 'Bus touristique'
+        shuttleBus: 'Bus navette'
+        highFrequencyBus: 'Bus à haute fréquence'
+        dedicatedLaneBus: 'Bus à voie réservée'
+        schoolBus: 'Bus scolaire'
+        schoolAndPublicServiceBus: 'Bus scolaire/service public'
+        railReplacementBus: 'Bus de remplacement de train'
+        demandAndResponseBus: 'Bus demande/réponse'
+        airportLinkBus: 'Bus de liaison aéroport'
+        internationalCoach: 'Autocar international'
+        nationalCoach: 'Autocar national'
+        shuttleCoach: 'Autocar navette'
+        regionalCoach: 'Autocar régional'
+        specialCoach: 'Autocar spécial'
+        schoolCoach: 'Autocar scolaire'
+        sightseeingCoach: 'Autocar touristique'
+        touristCoach: 'Autocar touristique (2)'
+        commuterCoach: 'Autocar de banlieue'
+        metro: 'Métro'
+        tube: 'Métro (2)'
+        urbanRailway: 'Train urbain'
+        local: 'Local'
+        highSpeedRail: 'Train à grande vitesse'
+        suburbanRailway: 'Train de banlieue'
+        regionalRail: 'Train régional'
+        interregionalRail: 'Train interrégional'
+        longDistance: 'Longue distance'
+        international: 'International'
+        sleeperRailService: 'Train à couchettes'
+        nightRail: 'Train de nuit'
+        carTransportRailService: 'Service ferroviaire de transport de voitures'
+        touristRailway: 'Train touristique'
+        railShuttle: 'Navette ferroviaire'
+        replacementRailService: 'Service de train de remplacement'
+        specialTrain: 'Train spécial'
+        crossCountryRail: 'Train de campagne'
+        rackAndPinionRailway: 'Train à crémaillère'
+        cityTram: 'Tramway de ville'
+        localTram: 'Tramway local'
+        regionalTram: 'Tramway régional'
+        sightseeingTram: 'Tramway touristique'
+        shuttleTram: 'Tramway navette'
+        trainTram: 'Train/tramway'
+        internationalCarFerry: 'Ferry international'
+        nationalCarFerry: 'Ferry national'
+        regionalCarFerry: 'Ferry régional'
+        localCarFerry: 'Ferry local'
+        internationalPassengerFerry: 'Traversier international à passagers'
+        nationalPassengerFerry: 'Traversier national à passagers'
+        regionalPassengerFerry: 'Traversier régional à passagers'
+        localPassengerFerry: 'Traversier local à passagers'
+        postBoat: 'Bateau de poste'
+        trainFerry: 'Navire transbordeur'
+        roadFerryLink: 'Liaison par navire transbordeur'
+        airportBoatLink: "Liaison maritime d'aéroport"
+        highSpeedVehicleService: 'Service de véhicule à grande vitesse'
+        highSpeedPassengerService: 'Service passager à grande vitesse'
+        sightseeingService: 'Service touristique'
+        schoolBoat: 'Bateau scolaire'
+        cableFerry: 'Traversier à câble'
+        riverBus: 'Bateau-bus'
+        scheduledFerry: 'Traversier régulier'
+        shuttleFerryService: 'Service de traversier-navette'
+        telecabin: 'Télécabine'
+        cableCar: 'Téléphérique'
+        lift: 'Ascenseur'
+        chairLift: 'Télésiège'
+        dragLift: 'Téléski'
+        telecabinLink: 'Liaison télécabine'
+        funicular: 'Funiculaire'
+        streetCableCar: 'Tramway (2)'
+        allFunicularServices: 'Tous services de funiculaire'
+        undefinedFunicular: 'Funiculaire non défini'