From bdff2081ca15c3a341c0f774eed40f7d99134cd7 Mon Sep 17 00:00:00 2001 From: Bruno Perles Date: Wed, 21 Oct 2015 17:32:59 +0200 Subject: Add vehicle journey frequency --- app/assets/javascripts/vehicle_journeys_frequencies.js.coffee | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 app/assets/javascripts/vehicle_journeys_frequencies.js.coffee (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/vehicle_journeys_frequencies.js.coffee b/app/assets/javascripts/vehicle_journeys_frequencies.js.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/vehicle_journeys_frequencies.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ -- cgit v1.2.3 From 843bec92850de6f4b46498611842f894a78e7d3d Mon Sep 17 00:00:00 2001 From: Bruno Perles Date: Wed, 28 Oct 2015 10:11:50 +0100 Subject: Add journey_frequencies fields, locales and some other little update --- app/assets/javascripts/application.js | 1 + app/assets/javascripts/tools.js.coffee | 6 ++++++ app/assets/javascripts/vehicle_journey.js.coffee | 12 ++++++------ app/assets/javascripts/vehicle_journey_frequencies.js.coffee | 3 +++ .../javascripts/vehicle_journeys_frequencies.js.coffee | 3 --- 5 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 app/assets/javascripts/tools.js.coffee create mode 100644 app/assets/javascripts/vehicle_journey_frequencies.js.coffee delete mode 100644 app/assets/javascripts/vehicle_journeys_frequencies.js.coffee (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 212ccdff8..0862295a4 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -22,6 +22,7 @@ //= require footable/footable.filter //= require footable/footable.paginate //= require footable/footable.sort +//= require tools //= require_directory ./plugins //= require_directory . //= require_directory ./stop_areas diff --git a/app/assets/javascripts/tools.js.coffee b/app/assets/javascripts/tools.js.coffee new file mode 100644 index 000000000..b30eb6f15 --- /dev/null +++ b/app/assets/javascripts/tools.js.coffee @@ -0,0 +1,6 @@ +(($) -> + $ -> + $('.ce-hide').removeClass 'ce-hide' + return + return +) jQuery diff --git a/app/assets/javascripts/vehicle_journey.js.coffee b/app/assets/javascripts/vehicle_journey.js.coffee index 54b359b7a..caf505960 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 tbody.journey_pattern_dependent_list tr.time') + rows = $('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 @@ -8,15 +8,15 @@ jQuery -> copy_departures_to_arrivals = (event) -> event.preventDefault() - swap_hour_minute( '.departure_time', '.arrival_time') + swap_hour_minute('.departure_time', '.arrival_time') - $(document).on("click", '.vehicle_journeys a.to_arrivals', copy_departures_to_arrivals) + $(document).on('click', '[data-ce-action="to_arrivals"]', copy_departures_to_arrivals) copy_arrivals_to_departures = (event) -> event.preventDefault() - swap_hour_minute( '.arrival_time', '.departure_time') + swap_hour_minute('.arrival_time', '.departure_time') - $(document).on("click", '.vehicle_journeys a.to_departures', copy_arrivals_to_departures) + $(document).on('click', '[data-ce-action="to_departures"]', copy_arrivals_to_departures) switch_vehicle_journey_at_stops = (event) -> event.preventDefault() @@ -72,4 +72,4 @@ jQuery -> slide_to( '.departure_time', duration) slide_to( '.arrival_time', duration) - $(document).on("click", '.vehicle_journeys a.slide', slide) \ No newline at end of file + $(document).on("click", '.vehicle_journeys a.slide', slide) diff --git a/app/assets/javascripts/vehicle_journey_frequencies.js.coffee b/app/assets/javascripts/vehicle_journey_frequencies.js.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/vehicle_journey_frequencies.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/vehicle_journeys_frequencies.js.coffee b/app/assets/javascripts/vehicle_journeys_frequencies.js.coffee deleted file mode 100644 index 24f83d18b..000000000 --- a/app/assets/javascripts/vehicle_journeys_frequencies.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ -- cgit v1.2.3 From 5b4136b2907ffc918210495d8f9a29c1e7d681fb Mon Sep 17 00:00:00 2001 From: Bruno Perles Date: Wed, 28 Oct 2015 11:35:08 +0100 Subject: Merge Timeband feature and revert Gemfile --- app/assets/javascripts/timebands.js.coffee | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 app/assets/javascripts/timebands.js.coffee (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/timebands.js.coffee b/app/assets/javascripts/timebands.js.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/timebands.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ -- cgit v1.2.3 From 915612ee90b2f454486fa821fdd75b800c326c99 Mon Sep 17 00:00:00 2001 From: Bruno Perles Date: Mon, 2 Nov 2015 17:05:43 +0100 Subject: Display a list of vehicle journey frequencies --- app/assets/javascripts/application.js | 2 ++ .../javascripts/vehicle_journey_frequencies.js.coffee | 16 +++++++++++++--- app/assets/javascripts/vehicle_journeys/index.js.coffee | 3 +-- 3 files changed, 16 insertions(+), 5 deletions(-) (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 0862295a4..74e680a68 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -23,6 +23,8 @@ //= require footable/footable.paginate //= require footable/footable.sort //= require tools +//= require datatables +//= require datatables-fixedcolumns //= require_directory ./plugins //= require_directory . //= require_directory ./stop_areas diff --git a/app/assets/javascripts/vehicle_journey_frequencies.js.coffee b/app/assets/javascripts/vehicle_journey_frequencies.js.coffee index 24f83d18b..020283116 100644 --- a/app/assets/javascripts/vehicle_journey_frequencies.js.coffee +++ b/app/assets/javascripts/vehicle_journey_frequencies.js.coffee @@ -1,3 +1,13 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ +(($) -> + $ -> + $('.ce-VehicleJourneyFrequencyTableBlock').dataTable + searching: false, + ordering: false, + paging: false, + scrollX: true, + fixedColumns: true, + bInfo: false + window.setTimeout('$( ".dataTables_scrollBody" ).animate({scrollLeft: 100}, 500).animate({scrollLeft: 0}, 500)', 1000) + return + return +) jQuery diff --git a/app/assets/javascripts/vehicle_journeys/index.js.coffee b/app/assets/javascripts/vehicle_journeys/index.js.coffee index e89c3f519..e21580f4e 100644 --- a/app/assets/javascripts/vehicle_journeys/index.js.coffee +++ b/app/assets/javascripts/vehicle_journeys/index.js.coffee @@ -1,7 +1,6 @@ -$(".vehicle_journeys.index").ready -> +$(".vehicle_journeys.index, .vehicle_journey_frequencies.index").ready -> $( 'body' ).popover({html: true, trigger: "focus", selector: 'thead th button'}) .on("show.bs.popover", (event)-> $(event.target).data("bs.popover").tip().css("maxWidth", "350px")) - \ No newline at end of file -- cgit v1.2.3 From fbafa0e7efc71aa392d0d400e1777203cc95c841 Mon Sep 17 00:00:00 2001 From: Bruno Perles Date: Tue, 3 Nov 2015 17:30:33 +0100 Subject: Update IHM for vehicle journey frequency --- app/assets/javascripts/application.js | 3 +-- .../javascripts/vehicle_journey_frequencies.js.coffee | 13 ------------- .../javascripts/vehicle_journey_frequencies/index.js.coffee | 4 ++++ app/assets/javascripts/vehicle_journeys/index.js.coffee | 2 +- 4 files changed, 6 insertions(+), 16 deletions(-) create mode 100644 app/assets/javascripts/vehicle_journey_frequencies/index.js.coffee (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 74e680a68..1ae76cd05 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -23,12 +23,11 @@ //= require footable/footable.paginate //= require footable/footable.sort //= require tools -//= require datatables -//= require datatables-fixedcolumns //= require_directory ./plugins //= require_directory . //= require_directory ./stop_areas //= require_directory ./vehicle_journeys +//= require_directory ./vehicle_journey_frequencies //= require_directory ./import_tasks //= require_directory ./compliance_check_tasks //= require_directory ./compliance_checks diff --git a/app/assets/javascripts/vehicle_journey_frequencies.js.coffee b/app/assets/javascripts/vehicle_journey_frequencies.js.coffee index 020283116..e69de29bb 100644 --- a/app/assets/javascripts/vehicle_journey_frequencies.js.coffee +++ b/app/assets/javascripts/vehicle_journey_frequencies.js.coffee @@ -1,13 +0,0 @@ -(($) -> - $ -> - $('.ce-VehicleJourneyFrequencyTableBlock').dataTable - searching: false, - ordering: false, - paging: false, - scrollX: true, - fixedColumns: true, - bInfo: false - window.setTimeout('$( ".dataTables_scrollBody" ).animate({scrollLeft: 100}, 500).animate({scrollLeft: 0}, 500)', 1000) - return - return -) jQuery diff --git a/app/assets/javascripts/vehicle_journey_frequencies/index.js.coffee b/app/assets/javascripts/vehicle_journey_frequencies/index.js.coffee new file mode 100644 index 000000000..4f4fccc18 --- /dev/null +++ b/app/assets/javascripts/vehicle_journey_frequencies/index.js.coffee @@ -0,0 +1,4 @@ +$(".vehicle_journey_frequencies.index").ready -> + $( 'body' ).popover({html: true, trigger: "click", selector: '[rel="popover"]'}).on("show.bs.popover", (event)-> + $('[aria-describedby]').click() + $(event.target).data("bs.popover").tip().css("maxWidth", "350px")) diff --git a/app/assets/javascripts/vehicle_journeys/index.js.coffee b/app/assets/javascripts/vehicle_journeys/index.js.coffee index e21580f4e..02de558d4 100644 --- a/app/assets/javascripts/vehicle_journeys/index.js.coffee +++ b/app/assets/javascripts/vehicle_journeys/index.js.coffee @@ -1,4 +1,4 @@ -$(".vehicle_journeys.index, .vehicle_journey_frequencies.index").ready -> +$(".vehicle_journeys.index").ready -> $( 'body' ).popover({html: true, trigger: "focus", selector: 'thead th button'}) .on("show.bs.popover", (event)-> -- cgit v1.2.3