Adding PRM and ODT capabilities

13 files changed, 137 insertions, 13 deletions

diff --git a/Gemfile b/Gemfile
index 207672326..9681e229a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -60,8 +60,8 @@ gem 'google-analytics-rails'
 gem 'will_paginate', '~> 3.0'
 gem 'ransack'
 gem 'squeel'
-gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git'
-#gem 'ninoxe',:path => '~/projects/ninoxe'
+gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git', :branch => 'tad_pmr'
+#gem 'ninoxe',:path => '~/Projects/dryade/ninoxe'
 #gem 'ninoxe', '~> 1.0.1'
 
 gem 'acts_as_list', '0.1.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index 21da94f80..cab03b81b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,10 @@
 GIT
   remote: https://github.com/afimb/ninoxe.git
-  revision: 81104810ace190584d6b445de0d0948bc204b7b5
+  revision: 74ebce7462c541521b554a7af2818d1055c404b8
+  branch: tad_pmr
   specs:
-    ninoxe (1.0.1)
-      activerecord (>= 3.1.3)
+    ninoxe (1.1.0)
+      activerecord (>= 3.1.3, < 4.0)
       acts_as_list (~> 0.1.6)
       foreigner (= 1.6.0)
       georuby-ext (= 0.0.5)
diff --git a/app/controllers/lines_controller.rb b/app/controllers/lines_controller.rb
index effb0deba..6f717549a 100644
--- a/app/controllers/lines_controller.rb
+++ b/app/controllers/lines_controller.rb
@@ -17,7 +17,6 @@ class LinesController < ChouetteController
     end       
   end
 
-  
   def show
     @map = LineMap.new(resource).with_helpers(self)
     @routes = @line.routes
diff --git a/app/views/lines/_form.erb b/app/views/lines/_form.erb
index 5705d7b1e..ccf0a2f65 100644
--- a/app/views/lines/_form.erb
+++ b/app/views/lines/_form.erb
@@ -8,6 +8,8 @@
     <%= form.input :registration_number %>  
     <%= form.input :number %>
     <%= form.input :transport_mode, :as => :select, :collection => Chouette::Line.transport_modes, :include_blank => false, :member_label => Proc.new { |mode| t("transport_modes.label.#{mode}") }  %>
+    <%= form.input :mobility_restricted_suitability, :as => :select, :collection => [[@line.human_attribute_name("accessible"), true], [@line.human_attribute_name("not_accessible"), false]], :include_blank => true %>
+    <%= form.input :flexible_service, :as => :select, :collection => [[@line.human_attribute_name("on_demaond_fs"), true], [@line.human_attribute_name("regular_fs"), false]], :include_blank => true %>
     <%= form.input :comment %>              
     <%= form.input :objectid, :required => !@line.new_record?, :input_html => { :disabled => !@line.new_record? } %>  
   <% end %>
diff --git a/app/views/lines/show.html.erb b/app/views/lines/show.html.erb
index d62be2066..d66c42d91 100644
--- a/app/views/lines/show.html.erb
+++ b/app/views/lines/show.html.erb
@@ -40,6 +40,34 @@
       <label><%= @line.human_attribute_name("transport_mode") %>: </label>
       <%= t("transport_modes.label.#{@line.transport_mode}") %>
     </p>
+
+    <p>
+      <label><%= @line.human_attribute_name("mobility_restricted_suitability") %> : </label>
+      <% if @line.mobility_restricted_suitability.nil? %>
+      <%= @line.human_attribute_name("unspecified_mrs") %>
+      <% elsif @line.mobility_restricted_suitability? %>
+      <%= @line.human_attribute_name("accessible") %>
+      <% else %>
+      <%= @line.human_attribute_name("not_accessible") %>
+      <% end %>
+      <br>&nbsp;&nbsp;<%= @line.human_attribute_name("number_of_mrs_vj") %> : <%= @line.vehicle_journeys.where("mobility_restricted_suitability = ?", true).count %>
+      <br>&nbsp;&nbsp;<%= @line.human_attribute_name("number_of_non_mrs_vj") %> : <%= @line.vehicle_journeys.where("mobility_restricted_suitability = ?", false).count %>
+      <br>&nbsp;&nbsp;<%= @line.human_attribute_name("number_of_vj") %> : <%= @line.vehicle_journeys.count %>
+    </p>
+    <p>
+      <label><%= @line.human_attribute_name("flexible_service") %> : </label>
+      <% if @line.flexible_service.nil? %>
+      <%= @line.human_attribute_name("unspecified_fs") %>
+      <% elsif @line.flexible_service? %>
+      <%= @line.human_attribute_name("on_demaond_fs") %>
+      <% else %>
+      <%= @line.human_attribute_name("regular_fs") %>
+      <% end %>
+      <br>&nbsp;&nbsp;<%= @line.human_attribute_name("number_of_fs_vj") %> : <%= @line.vehicle_journeys.where("flexible_service = ?", true).count %>
+      <br>&nbsp;&nbsp;<%= @line.human_attribute_name("number_of_non_fs_vj") %> : <%= @line.vehicle_journeys.where("flexible_service = ?", false).count %>
+      <br>&nbsp;&nbsp;<%= @line.human_attribute_name("number_of_vj") %> : <%= @line.vehicle_journeys.count %>
+    </p>
+    
     <p>
       <label><%= @line.human_attribute_name("comment") %>: </label>
       <%= @line.comment %>
diff --git a/app/views/vehicle_journeys/_form.html.erb b/app/views/vehicle_journeys/_form.html.erb
index 8f15b6336..ef92ef114 100644
--- a/app/views/vehicle_journeys/_form.html.erb
+++ b/app/views/vehicle_journeys/_form.html.erb
@@ -5,6 +5,8 @@
     <%= form.input :published_journey_identifier %>
     <%= form.input :comment %>
     <%= form.input :transport_mode_name, :as => :select, :collection => Chouette::Line.transport_modes, :include_blank => true, :member_label => Proc.new { |mode| t("transport_modes.label.#{mode}") }  %>
+    <%= 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_demaond_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%>
diff --git a/app/views/vehicle_journeys/show.html.erb b/app/views/vehicle_journeys/show.html.erb
index e083e81e6..235268575 100644
--- a/app/views/vehicle_journeys/show.html.erb
+++ b/app/views/vehicle_journeys/show.html.erb
@@ -22,6 +22,28 @@
       <label><%= @vehicle_journey.human_attribute_name("published_journey_identifier") %>: </label>
       <%= @vehicle_journey.published_journey_identifier %>
     </p>
+
+    <p>
+      <label><%= @vehicle_journey.human_attribute_name("mobility_restricted_suitability") %>: </label>
+      <% if @vehicle_journey.mobility_restricted_suitability.nil? %>
+      <%= @vehicle_journey.human_attribute_name("unspecified_mrs") %>
+      <% elsif @vehicle_journey.mobility_restricted_suitability? %>
+      <%= @vehicle_journey.human_attribute_name("accessible") %>
+      <% else %>
+      <%= @vehicle_journey.human_attribute_name("not_accessible") %>
+      <% end %>
+    </p>
+    <p>
+      <label><%= @vehicle_journey.human_attribute_name("flexible_service") %>: </label>
+      <% if @vehicle_journey.flexible_service.nil? %>
+      <%= @vehicle_journey.human_attribute_name("unspecified_fs") %>
+      <% elsif @vehicle_journey.flexible_service? %>
+      <%= @vehicle_journey.human_attribute_name("on_demaond_fs") %>
+      <% else %>
+      <%= @vehicle_journey.human_attribute_name("regular_fs") %>
+      <% end %>
+    </p>
+
     <p>
       <label><%= @vehicle_journey.human_attribute_name("comment") %>: </label>
       <%= @vehicle_journey.comment %>
diff --git a/config/locales/lines.yml b/config/locales/lines.yml
index 2fd55d4bc..f9d4321ef 100644
--- a/config/locales/lines.yml
+++ b/config/locales/lines.yml
@@ -48,6 +48,19 @@ en:
         published_name: "Published name"
         number: "Number"
         transport_mode: "Transport mode"
+        mobility_restricted_suitability: "PRM accessibility"
+        flexible_service: "On demond transportation"
+        unspecified_mrs: "Not specified"
+        accessible: "Accessible"
+        not_accessible: "Not accessible"
+        unspecified_fs: "Not specified"
+        on_demaond_fs: "On demond service"
+        regular_fs: "Regular service"
+        number_of_vj: "Total number of vehicle journeys"
+        number_of_fs_vj: "Number of on demond vehicle journeys"
+        number_of_mrs_vj: "Number of accessible vehicle journeys"
+        number_of_non_fs_vj: "Number of non on demond vehicle journeys"
+        number_of_non_mrs_vj: "Number of non accessible vehicle journeys"
         group_of_line: "Group of lines"
         comment: "Comments"
         objectid: "Neptune identifier"
@@ -110,6 +123,19 @@ fr:
         published_name: "Nom public"
         number: "Indice"
         transport_mode: "Mode de transport"
+        mobility_restricted_suitability: "Accessibilité PMR"
+        flexible_service: "Transport à la demande"
+        unspecified_mrs: "Non spécifié"
+        accessible: "Accessible"
+        not_accessible: "Non accessible"
+        unspecified_fs: "Non spécifié"
+        on_demaond_fs: "Service à la demande"
+        regular_fs: "Service régulier"
+        number_of_vj: "Nombre total de courses"
+        number_of_fs_vj: "Nombre de courses à la demande"
+        number_of_mrs_vj: "Nombre de courses accessibles"
+        number_of_non_fs_vj: "Nombre de courses régulières"
+        number_of_non_mrs_vj: "Nombre de courses non accessibles"
         group_of_line: "Groupe de lignes"
         comment: "Commentaire"
         objectid: "Identifiant Neptune"
diff --git a/config/locales/vehicle_journeys.yml b/config/locales/vehicle_journeys.yml
index fb13c8399..9e8ee4e0f 100644
--- a/config/locales/vehicle_journeys.yml
+++ b/config/locales/vehicle_journeys.yml
@@ -60,6 +60,14 @@ en:
         comment: "Comments"
         status_value: "Status Value"
         transport_mode_name: "Transport Mode"
+        mobility_restricted_suitability: "PRM accessibility"
+        flexible_service: "On demond transportation"
+        unspecified_mrs: "Not specified"
+        accessible: "Accessible"
+        not_accessible: "Not accessible"
+        unspecified_fs: "Not specified"
+        on_demaond_fs: "On demond service"
+        regular_fs: "Regular service"
         published_journey_name: "Published Name"
         published_journey_identifier: "Published Identifier"
         facility: "Facility"
@@ -141,6 +149,14 @@ fr:
         comment: "Commentaires"
         status_value: "Etat de trafic"
         transport_mode_name: "Mode de transport"
+        mobility_restricted_suitability: "Accessibilité PMR"
+        flexible_service: "Transport à la demande"
+        unspecified_mrs: "Non spécifié"
+        accessible: "Accessible"
+        not_accessible: "Non accessible"
+        unspecified_fs: "Non spécifié"
+        on_demaond_fs: "Service à la demande"
+        regular_fs: "Service régulier"
         published_journey_name: "Nom public"
         published_journey_identifier: "Identifiant public"
         facility: "Equipement"
diff --git a/db/migrate/20140617141550_add_on_demand_transportation_to_line.ninoxe_engine.rb b/db/migrate/20140617141550_add_on_demand_transportation_to_line.ninoxe_engine.rb
new file mode 100644
index 000000000..358312ec4
--- /dev/null
+++ b/db/migrate/20140617141550_add_on_demand_transportation_to_line.ninoxe_engine.rb
@@ -0,0 +1,6 @@
+# This migration comes from ninoxe_engine (originally 20140617131630)
+class AddOnDemandTransportationToLine < ActiveRecord::Migration
+  def change
+    add_column :lines, :on_demand_transportation, :boolean
+  end
+end
diff --git a/db/migrate/20140617141551_add_details_to_vehicle_journey.ninoxe_engine.rb b/db/migrate/20140617141551_add_details_to_vehicle_journey.ninoxe_engine.rb
new file mode 100644
index 000000000..ec0c5af40
--- /dev/null
+++ b/db/migrate/20140617141551_add_details_to_vehicle_journey.ninoxe_engine.rb
@@ -0,0 +1,7 @@
+# This migration comes from ninoxe_engine (originally 20140617132236)
+class AddDetailsToVehicleJourney < ActiveRecord::Migration
+  def change
+    add_column :vehicle_journeys, :mobility_restricted_suitability, :boolean
+    add_column :vehicle_journeys, :on_demand_transportation, :boolean
+  end
+end
diff --git a/db/migrate/20140618072859_fix_column_name.ninoxe_engine.rb b/db/migrate/20140618072859_fix_column_name.ninoxe_engine.rb
new file mode 100644
index 000000000..9802528d3
--- /dev/null
+++ b/db/migrate/20140618072859_fix_column_name.ninoxe_engine.rb
@@ -0,0 +1,12 @@
+# This migration comes from ninoxe_engine (originally 20140618071147)
+class FixColumnName < ActiveRecord::Migration
+  def up
+    rename_column :lines, :on_demand_transportation, :flexible_service
+    rename_column :vehicle_journeys, :on_demand_transportation, :flexible_service
+  end
+
+  def down
+    rename_column :lines, :flexible_service, :on_demand_transportation
+    rename_column :vehicle_journeys, :flexible_service, :on_demand_transportation
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0978a437a..f18047652 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140207162334) do
+ActiveRecord::Schema.define(:version => 20140618072859) do
 
   create_table "access_links", :force => true do |t|
     t.integer  "access_point_id",                        :limit => 8
@@ -279,6 +279,7 @@ ActiveRecord::Schema.define(:version => 20140207162334) do
     t.string   "comment"
     t.boolean  "mobility_restricted_suitability"
     t.integer  "int_user_needs"
+    t.boolean  "flexible_service"
   end
 
   add_index "lines", ["objectid"], :name => "lines_objectid_key", :unique => true
@@ -514,11 +515,11 @@ ActiveRecord::Schema.define(:version => 20140207162334) do
   add_index "vehicle_journey_at_stops", ["vehicle_journey_id"], :name => "index_vehicle_journey_at_stops_on_vehicle_journey_id"
 
   create_table "vehicle_journeys", :force => true do |t|
-    t.integer  "route_id",                     :limit => 8
-    t.integer  "journey_pattern_id",           :limit => 8
-    t.integer  "time_slot_id",                 :limit => 8
-    t.integer  "company_id",                   :limit => 8
-    t.string   "objectid",                                  :null => false
+    t.integer  "route_id",                        :limit => 8
+    t.integer  "journey_pattern_id",              :limit => 8
+    t.integer  "time_slot_id",                    :limit => 8
+    t.integer  "company_id",                      :limit => 8
+    t.string   "objectid",                                     :null => false
     t.integer  "object_version"
     t.datetime "creation_time"
     t.string   "creator_id"
@@ -529,7 +530,9 @@ ActiveRecord::Schema.define(:version => 20140207162334) do
     t.string   "published_journey_identifier"
     t.string   "facility"
     t.string   "vehicle_type_identifier"
-    t.integer  "number",                       :limit => 8
+    t.integer  "number",                          :limit => 8
+    t.boolean  "mobility_restricted_suitability"
+    t.boolean  "flexible_service"
   end
 
   add_index "vehicle_journeys", ["objectid"], :name => "vehicle_journeys_objectid_key", :unique => true