fix simplification

2 files changed, 14 insertions, 19 deletions

diff --git a/app/assets/javascripts/vehicle_journey.js.coffee b/app/assets/javascripts/vehicle_journey.js.coffee
index e3e66811f..b266cfa30 100644
--- a/app/assets/javascripts/vehicle_journey.js.coffee
+++ b/app/assets/javascripts/vehicle_journey.js.coffee
@@ -1,25 +1,20 @@
 jQuery ->
-  copy_departures_to_arrivals = (event) -> 
-    event.preventDefault()
+  swap_hour_minute = ( from, to) -> 
     rows =  $('.vehicle_journeys.edit tbody.journey_pattern_dependent_list tr')
     for row in rows 
       do (row) ->
-        arrival = row.children[0]
-        departure = row.children[2]
-        arrival.children[0].value = departure.children[0].value
-        arrival.children[1].value = departure.children[1].value
+        $(row).find( to).find('.hour')[0].value = $(row).find( from).find('.hour')[0].value
+        $(row).find( to).find('.minute')[0].value = $(row).find( from).find('.minute')[0].value
+
+  copy_departures_to_arrivals = (event) -> 
+    event.preventDefault()
+    swap_hour_minute( '.departure_time', '.arrival_time')
 
-  $('.vehicle_journeys.edit a.to_arrivals').click(copy_departures_to_arrivals)
+  $('.vehicle_journeys.edit a.to_arrivals').live("click", copy_departures_to_arrivals)
 
   copy_arrivals_to_departures = (event) -> 
     event.preventDefault()
-    rows =  $('.vehicle_journeys.edit tbody.journey_pattern_dependent_list tr')
-    for row in rows 
-      do (row) ->
-        arrival = row.children[0]
-        departure = row.children[2]
-        departure.children[0].value = arrival.children[0].value
-        departure.children[1].value = arrival.children[1].value
+    swap_hour_minute( '.arrival_time', '.departure_time')
 
-  $('.vehicle_journeys.edit a.to_departures').click(copy_arrivals_to_departures)
+  $('.vehicle_journeys.edit a.to_departures').live("click", copy_arrivals_to_departures)
 
diff --git a/app/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb b/app/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb
index 2edc8f9a8..65a017f24 100644
--- a/app/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb
+++ b/app/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb
@@ -1,8 +1,8 @@
 <% vjas = vehicle_journey_at_stop %>
 <tr class="time input optional <%= vjas._destroy ? "no_stop" : "" %> <%= (vehicle_journey_at_stop_counter%2==0) ? "odd" : "even" %>" >
   <td class="arrival_time <%= vjas.arrival_time.nil? ? "missing" : "" %> <%= vjas.errors[:arrival_time].blank? ? "" : "invalid_position" %>">
-   <%= select_hour(vjas.arrival_time ? vjas.arrival_time.hour : 0, :prefix => "vehicle_journey", :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][arrival_time(4i)]") %>
-   <%= select_minute(vjas.arrival_time ? vjas.arrival_time.min : 0, :prefix => "vehicle_journey", :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][arrival_time(5i)]") %>
+    <%= select_hour(vjas.arrival_time ? vjas.arrival_time.hour : 0, { :prefix => "vehicle_journey", :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][arrival_time(4i)]"}, :class => "hour") %>
+    <%= select_minute(vjas.arrival_time ? vjas.arrival_time.min : 0, { :prefix => "vehicle_journey", :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][arrival_time(5i)]"}, :class => "minute") %>
   </td>
  <td>
   <input name=<%= "vehicle_journey[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][id]" %> type="hidden" value="<%= vjas.id %>">
@@ -17,8 +17,8 @@
    <label for=<%= "vehicle_journey_vehicle_journey_at_stops_attributes_#{vehicle_journey_at_stop_counter}_departure_time_5i" %>><%= vjas.stop_point.stop_area.name %></label>
   </td>
   <td class="departure_time <%= vjas.departure_time.nil? ? "missing" : "" %> <%= vjas.errors[:departure_time].blank? ? "" : "invalid_position" %>">
-   <%= select_hour(vjas.departure_time ? vjas.departure_time.hour : 0, :prefix => "vehicle_journey", :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][departure_time(4i)]") %>
-   <%= select_minute(vjas.departure_time ? vjas.departure_time.min : 0, :prefix => "vehicle_journey", :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][departure_time(5i)]") %>
+    <%= select_hour(vjas.departure_time ? vjas.departure_time.hour : 0, { :prefix => "vehicle_journey", :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][departure_time(4i)]"}, :class => "hour") %>
+    <%= select_minute(vjas.departure_time ? vjas.departure_time.min : 0, { :prefix => "vehicle_journey", :field_name => "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][departure_time(5i)]"}, :class => "minute") %>
  </td>
 </tr>