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

3 files changed, 50 insertions, 4 deletions

diff --git a/app/assets/javascripts/public/jquery.ui.datepicker-i18n.js b/app/assets/javascripts/public/jquery.ui.datepicker-i18n.js
index 3d0d55b46..b7748a77a 100644
--- a/app/assets/javascripts/public/jquery.ui.datepicker-i18n.js
+++ b/app/assets/javascripts/public/jquery.ui.datepicker-i18n.js
@@ -53,7 +53,14 @@ jQuery(function($){
                                                   monthNamesShort: $.datepicker.regional[ $('html').attr('lang') ].monthNamesShort, 
                                                   monthNames: $.datepicker.regional[ $('html').attr('lang') ].monthNames
                                               } );
-                                          $(element).datepicker("setDate", $.datepicker.parseDate('yy-mm-dd', $(element).val() ) );
+                                          if ($(element).val().indexOf('/') >= 0) 
+                                          {
+                                          	$(element).datepicker("setDate", $.datepicker.parseDate('dd/mm/y', $(element).val() ) );
+                                          }
+                                          else 
+                                          {
+                                            $(element).datepicker("setDate", $.datepicker.parseDate('yy-mm-dd', $(element).val() ) );
+                                          }   
                                       });
 
         $("form").submit(function(event) {
diff --git a/app/assets/javascripts/time_tables.js.coffee b/app/assets/javascripts/time_tables.js.coffee
new file mode 100644
index 000000000..b85376edb
--- /dev/null
+++ b/app/assets/javascripts/time_tables.js.coffee
@@ -0,0 +1,39 @@
+jQuery ->
+# add trigger to hide/show application dates and periods
+  switch_dates = (event) -> 
+    event.preventDefault()
+    $('.time_tables .dates.content').toggle('slow')
+    $('a.dates .switcher').toggle()
+
+  $('.time_tables a.dates').click(switch_dates)
+
+  switch_periods = (event) -> 
+    event.preventDefault()
+    $('.time_tables .periods.content').toggle('slow')
+    $('a.periods .switcher').toggle()
+
+  $('.time_tables a.periods').click(switch_periods)
+
+# add trigger when creating new date or period entries to activate datepicker
+  tt_datepickerI18n = (index, element) ->
+    # do nothig if a datepicker is already attached
+    return if ($(element).hasClass('hasDatepicker') )
+    $(element).datepicker({ 
+                              dateFormat: "dd/mm/y",
+                              dayNamesShort: $.datepicker.regional[ $('html').attr('lang') ].dayNamesShort, 
+                              dayNames: $.datepicker.regional[ $('html').attr('lang') ].dayNames, 
+                              monthNamesShort: $.datepicker.regional[ $('html').attr('lang') ].monthNamesShort, 
+                              monthNames: $.datepicker.regional[ $('html').attr('lang') ].monthNames
+                          })
+    $(element).datepicker("setDate", $.datepicker.parseDate('dd/mm/y', $(element).val() ) ) if ($(element).val().indexOf('/') >= 0) 
+    $(element).datepicker("setDate", $.datepicker.parseDate('yy-mm-dd', $(element).val() ) ) if ($(element).val().indexOf('/') < 0) 
+
+  after_inserts = ->
+    $('input[type="date"]').each(tt_datepickerI18n)
+    
+  bind_after_inserts = ->
+    $('#periods_content').bind('insertion-callback',after_inserts)
+    $('#dates_content').bind('insertion-callback',after_inserts)
+    #after_inserts()
+    
+  $(document).ready(bind_after_inserts) if $('.time_tables').length > 0
diff --git a/app/assets/javascripts/vehicle_journey.js.coffee b/app/assets/javascripts/vehicle_journey.js.coffee
index 513d177c8..89bc8825f 100644
--- a/app/assets/javascripts/vehicle_journey.js.coffee
+++ b/app/assets/javascripts/vehicle_journey.js.coffee
@@ -1,6 +1,6 @@
 jQuery ->
   swap_hour_minute = ( from, to) -> 
-    rows =  $('.vehicle_journeys.edit tbody.journey_pattern_dependent_list tr')
+    rows =  $('.vehicle_journeys tbody.journey_pattern_dependent_list tr')
     for row in rows 
       do (row) ->
         $(row).find( to).find('.hour')[0].value = $(row).find( from).find('.hour')[0].value
@@ -10,13 +10,13 @@ jQuery ->
     event.preventDefault()
     swap_hour_minute( '.departure_time', '.arrival_time')
 
-  $('.vehicle_journeys.edit a.to_arrivals').live("click", copy_departures_to_arrivals)
+  $('.vehicle_journeys a.to_arrivals').live("click", copy_departures_to_arrivals)
 
   copy_arrivals_to_departures = (event) -> 
     event.preventDefault()
     swap_hour_minute( '.arrival_time', '.departure_time')
 
-  $('.vehicle_journeys.edit a.to_departures').live("click", copy_arrivals_to_departures)
+  $('.vehicle_journeys a.to_departures').live("click", copy_arrivals_to_departures)
 
   switch_vehicle_journey_at_stops = (event) -> 
     event.preventDefault()