Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2

9 files changed, 26 insertions, 2 deletions

diff --git a/app/assets/stylesheets/journey_patterns.css.scss b/app/assets/stylesheets/journey_patterns.css.scss
index 7e9a747a5..5981c76b0 100644
--- a/app/assets/stylesheets/journey_patterns.css.scss
+++ b/app/assets/stylesheets/journey_patterns.css.scss
@@ -23,6 +23,7 @@
         /* to create multi-column index */
         width: 350px;
         padding-right: 10px;
+        height: 60px;
         float: left;
 
         .name {
@@ -38,6 +39,9 @@
     #route_color{ width: 100px;
                  color: white;
                  font-weight: bold;}
+    #journey_pattern_stop_point_ids_input fieldset .choices-group {
+        margin-top: 25px;
+    }
 }
 
 #workspace.journey_patterns.show
diff --git a/app/helpers/journey_patterns_helper.rb b/app/helpers/journey_patterns_helper.rb
index d7b66db06..bcfb71cd1 100644
--- a/app/helpers/journey_patterns_helper.rb
+++ b/app/helpers/journey_patterns_helper.rb
@@ -8,5 +8,10 @@ module JourneyPatternsHelper
       truncate(journey_pattern.name, :length => 30)
     end
   end
+  def stop_point_ids_label(journey_pattern)
+    return journey_pattern.human_attribute_name(:stop_point_ids) if journey_pattern.vehicle_journeys.empty?
+
+    "#{journey_pattern.human_attribute_name(:stop_point_ids)}. #{t('journey_patterns.form.warning', :count => journey_pattern.vehicle_journeys.count)}"
+  end
 end
 
diff --git a/app/views/journey_patterns/_form.html.erb b/app/views/journey_patterns/_form.html.erb
index ed68bb4c8..9d7454b72 100644
--- a/app/views/journey_patterns/_form.html.erb
+++ b/app/views/journey_patterns/_form.html.erb
@@ -4,7 +4,7 @@
     <%= form.input :published_name %>
     <%= form.input :registration_number %>              
     <%= form.input :comment %>              
-    <%= form.input :stop_point_ids, :as => :check_boxes, :collection => @route.stop_points.map { |s| [s.stop_area.name, s.id.to_s]}, :input_html => (@journey_pattern.new_record? ? { :checked => 'checked' }:{}) %>              
+    <%= form.input :stop_point_ids, :label => stop_point_ids_label(@journey_pattern), :as => :check_boxes, :collection => @route.stop_points.map { |s| [s.stop_area.name, s.id.to_s]}, :input_html => (@journey_pattern.new_record? ? { :checked => 'checked' }:{}) %>              
     <%= form.input :objectid, :input_html => { :disabled => !@journey_pattern.new_record? } %>  
   <% end %>
 
diff --git a/app/views/journey_patterns/_journey_pattern.html.erb b/app/views/journey_patterns/_journey_pattern.html.erb
index 41a898888..bf0f84fb1 100644
--- a/app/views/journey_patterns/_journey_pattern.html.erb
+++ b/app/views/journey_patterns/_journey_pattern.html.erb
@@ -8,6 +8,9 @@
     <%= t('.vehicle_journeys_count', :count => journey_pattern.vehicle_journeys.count) %>
     <div class="actions">  
       <%= link_to t("actions.destroy"), referential_line_route_journey_pattern_path(@referential, @line, @route, journey_pattern), :method => :delete, :confirm =>  t('journey_patterns.actions.destroy_confirm'), :class => "remove" %>
+      <% if journey_pattern.vehicle_journeys.count > 0 %>
+        | <%= link_to t('journey_patterns.journey_pattern.vehicle_journey_at_stops'), referential_line_route_vehicle_journeys_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => journey_pattern.id}), :class => "link" %>
+      <% end %>
     </div>
   </div>
 <% end %>
diff --git a/app/views/journey_patterns/show.html.erb b/app/views/journey_patterns/show.html.erb
index 0b9676350..9962e4d8b 100644
--- a/app/views/journey_patterns/show.html.erb
+++ b/app/views/journey_patterns/show.html.erb
@@ -57,6 +57,7 @@
 <ul class="actions">
   <li><%= link_to t('journey_patterns.actions.edit'), edit_referential_line_route_journey_pattern_path(@referential, @line, @route, @journey_pattern), :class => "edit" %></li>
   <li><%= link_to  t('journey_patterns.actions.destroy'), referential_line_route_journey_pattern_path(@referential, @line, @route, @journey_pattern), :method => :delete, :confirm =>  t('journey_patterns.actions.destroy_confirm'), :class => "remove" %></li>
+  <li><%= link_to t('journey_patterns.journey_pattern.vehicle_journey_at_stops'), referential_line_route_vehicle_journeys_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => @journey_pattern.id}), :class => "link" %></li>
 </ul>
 <% end %>
 
diff --git a/app/views/vehicle_journeys/show.html.erb b/app/views/vehicle_journeys/show.html.erb
index 26c5b4070..83993e4d7 100644
--- a/app/views/vehicle_journeys/show.html.erb
+++ b/app/views/vehicle_journeys/show.html.erb
@@ -83,7 +83,7 @@
     <li><%= link_to t('vehicle_journeys.actions.edit'), edit_referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey), :class => "edit" %></li>
     <li><%= link_to  t('vehicle_journeys.actions.destroy'), referential_line_route_vehicle_journey_path(@referential, @line, @route, @vehicle_journey), :method => :delete, :confirm =>  t('vehicle_journeys.actions.destroy_confirm'), :class => "remove" %></li>
   </ul>
-  <h3>Cloner la course</h3>
+  <h3><%= t('.translation_form') %></h3>
   <div id="compact_form" >
   <%= semantic_form_for [@referential, @line, @route, @vehicle_journey, VehicleTranslation.new] do |form| %>
   <%= form.inputs do %> 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 179c14ca5..55696eef5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,3 +3,6 @@
 
 en:
   hello: "Hello world"
+  time:
+    formats:
+      hour: "%H:%M"
diff --git a/config/locales/journey_patterns.yml b/config/locales/journey_patterns.yml
index 86257f784..301c4b7e7 100644
--- a/config/locales/journey_patterns.yml
+++ b/config/locales/journey_patterns.yml
@@ -4,6 +4,7 @@ en:
       from_to: "From '%{departure}' to '%{arrival}'"
       stop_count: "%{count}/%{route_count} stops"
       vehicle_journeys_count: "Vehicle journeys: %{count}"
+      vehicle_journey_at_stops: "Vehicle journey at stops"
     actions:
       new: Add a new journey_pattern
       edit: Edit this journey pattern
@@ -18,6 +19,8 @@ en:
       stop_points: "Stop point on journey pattern list" 
     index:
       title: Journey Patterns
+    form:
+      warning: "Be careful, selection is also applied to the %{count} vehicle journeys associated to this journey pattern"
   activerecord:        
     models:        
       journey_pattern: 
@@ -43,6 +46,7 @@ fr:
       from_to: "De '%{departure}' à '%{arrival}'"
       stop_count: "%{count}/%{route_count} arrêts"
       vehicle_journeys_count: "Courses: %{count}"
+      vehicle_journey_at_stops: "Horaires des courses"
     actions:
       new: Ajouter une mission
       edit: Modifier cette mission
@@ -57,6 +61,8 @@ fr:
       stop_points: "Liste des arrêts de la mission" 
     index:
       title: Missions
+    form:
+      warning: "Attention, la sélection s'applique aussi aux %{count} courses de la mission"
   activerecord:        
     models:        
       journey_pattern: 
diff --git a/config/locales/vehicle_journeys.yml b/config/locales/vehicle_journeys.yml
index bc6a05427..c52dbb62a 100644
--- a/config/locales/vehicle_journeys.yml
+++ b/config/locales/vehicle_journeys.yml
@@ -31,6 +31,7 @@ en:
       time_tables: Calendars list
       bounding: From %{start} to %{end}
       validation: Clone
+      translation_form: Vehicle journey translations
     index:
       title: Vehicle journeys on route %{route}
       vehicle_journeys: "Departure's times"
@@ -104,6 +105,7 @@ fr:
       time_tables: Liste des calendriers
       bounding: De %{start} à %{end}
       validation: Cloner
+      translation_form: Cloner la course
     index:
       title: "Courses de la séquence d'arrêts %{route}"
       timeless: Courses sans horaire