fix and generalize first departure time shift. Mantis 26840

1 files changed, 31 insertions, 21 deletions

diff --git a/app/assets/javascripts/vehicle_journey.js.coffee b/app/assets/javascripts/vehicle_journey.js.coffee
index df15d79ba..145e86f0f 100644
--- a/app/assets/javascripts/vehicle_journey.js.coffee
+++ b/app/assets/javascripts/vehicle_journey.js.coffee
@@ -1,37 +1,37 @@
 jQuery ->
-  swap_hour_minute = ( from, to) -> 
-    rows =  $('.vehicle_journeys tbody.journey_pattern_dependent_list tr')
-    for row in rows 
+  swap_hour_minute = ( from, to) ->
+    rows =  $('.vehicle_journeys tbody.journey_pattern_dependent_list tr.time')
+    for row in rows
       do (row) ->
         $(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) -> 
+  copy_departures_to_arrivals = (event) ->
     event.preventDefault()
     swap_hour_minute( '.departure_time', '.arrival_time')
 
   $(document).on("click", '.vehicle_journeys a.to_arrivals', copy_departures_to_arrivals)
 
-  copy_arrivals_to_departures = (event) -> 
+  copy_arrivals_to_departures = (event) ->
     event.preventDefault()
     swap_hour_minute( '.arrival_time', '.departure_time')
 
   $(document).on("click", '.vehicle_journeys a.to_departures', copy_arrivals_to_departures)
 
-  switch_vehicle_journey_at_stops = (event) -> 
+  switch_vehicle_journey_at_stops = (event) ->
     event.preventDefault()
     $('.vehicle_journeys.show .vehicle_journey_at_stops.content').toggle('slow')
     $('a.vehicle_journey_at_stops .switcher').toggle()
 
   $('.vehicle_journeys.show a.vehicle_journey_at_stops').click(switch_vehicle_journey_at_stops)
 
-  switch_time_tables = (event) -> 
+  switch_time_tables = (event) ->
     event.preventDefault()
     $('.vehicle_journeys.show .vehicle_journey_time_tables.content').toggle('slow')
     $('a.vehicle_journey_time_tables .switcher').toggle()
 
   $('.vehicle_journeys.show a.vehicle_journey_time_tables').click(switch_time_tables)
-  
+
   convert = (val) ->
     if (val < 10)
       return "0" + val.toString()
@@ -40,24 +40,34 @@ jQuery ->
 
   slide_to = ( col, duration) ->
     rows =  $('.vehicle_journeys tbody.journey_pattern_dependent_list .time')
-    for row in rows 
+    for row in rows
       do (row) ->
-        oldHour = parseInt($(row).find( col).find('.hour')[0].value, 10)
-        oldMinute = parseInt($(row).find( col).find('.minute')[0].value, 10)
+
+        oldHour = parseInt( $( $(row).find( col).find('.hour')).val())
+        oldMinute = parseInt( $( $(row).find( col).find('.minute')).val())
         aTime = (((oldHour - 1) * 60) + oldMinute + duration) * 60000
         newValue = new Date(aTime)
-        $(row).find( col).find('.hour')[0].value = convert(newValue.getHours())
-        $(row).find( col).find('.minute')[0].value = convert(newValue.getMinutes())
+        $( $(row).find( col).find('select.hour')).prop( "selectedIndex", convert(newValue.getHours()))
+        $( $(row).find( col).find('select.minute')).prop( "selectedIndex", convert(newValue.getMinutes()))
 
-  slide = (event) -> 
+  slide = (event) ->
     event.preventDefault()
-    # hour = $(".vehicle_journeys .date option[selected='selected']")[0].value
-    hour = $(".vehicle_journeys .date select#date_hour")[0].value
-    # minute = $(".vehicle_journeys .date option[selected='selected']")[1].value
-    minute = $(".vehicle_journeys .date select#date_minute")[0].value
-    departure_hour = $(".stop_times .journey_pattern_dependent_list .hour option[selected='selected']")[1].value
-    departure_minute = $(".stop_times .journey_pattern_dependent_list .minute option[selected='selected']")[1].value
-    duration = (hour - departure_hour) * 60 + (minute - departure_minute)
+    hour = parseInt( $(".vehicle_journeys .date select#date_hour").val())
+    minute = parseInt( $(".vehicle_journeys .date select#date_minute").val())
+
+    selector_prefix = ".stop_times .journey_pattern_dependent_list"
+    if $(this).hasClass("departure")
+      vjas_hour_selector = selector_prefix + " .departure_time select.hour"
+      vjas_minute_selector = selector_prefix + " .departure_time select.minute"
+    else
+      vjas_hour_selector = selector_prefix + " .arrival_time select.hour"
+      vjas_minute_selector = selector_prefix + " .arrival_time select.minute"
+
+    vjas_hour = $( vjas_hour_selector).prop( "selectedIndex" )
+    vjas_minute = $( vjas_minute_selector).prop( "selectedIndex" )
+
+    duration = (hour - vjas_hour) * 60 + (minute - vjas_minute)
+
     slide_to( '.departure_time', duration)
     slide_to( '.arrival_time', duration)