From 3ed5640f1de6e0f376338dddcc3527a2744ad10a Mon Sep 17 00:00:00 2001 From: Thomas Haddad Date: Wed, 30 Nov 2016 16:46:42 +0100 Subject: Add journey_patterns route and rabl files Signed-off-by: Thomas Shawarma Haddad --- app/controllers/journey_patterns_controller.rb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb index b7cdccc72..326c5397a 100644 --- a/app/controllers/journey_patterns_controller.rb +++ b/app/controllers/journey_patterns_controller.rb @@ -15,12 +15,6 @@ class JourneyPatternsController < ChouetteController alias_method :route, :parent alias_method :journey_pattern, :resource - def index - index! do |format| - format.html { redirect_to referential_line_route_path(@referential,@line,@route) } - end - end - def create_resource(object) object.special_update end -- cgit v1.2.3 From c18839ee89fdc4e82be9bc25b148117a96ecc3c7 Mon Sep 17 00:00:00 2001 From: Xinhui Date: Mon, 5 Dec 2016 11:38:11 +0100 Subject: Wip bulk_update action JourneyPatternsController --- app/controllers/journey_patterns_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app/controllers') diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb index 326c5397a..1e2d2f191 100644 --- a/app/controllers/journey_patterns_controller.rb +++ b/app/controllers/journey_patterns_controller.rb @@ -19,6 +19,11 @@ class JourneyPatternsController < ChouetteController object.special_update end + def bulk_update + ap "--------call to bulk_update action ------------" + ap params + end + def show @map = JourneyPatternMap.new(journey_pattern).with_helpers(self) @stop_points = journey_pattern.stop_points.paginate(:page => params[:page]) -- cgit v1.2.3 From 9b37986ef2f7c10e26fec5c7ce1297e071f53aa4 Mon Sep 17 00:00:00 2001 From: Xinhui Date: Thu, 8 Dec 2016 12:28:35 +0100 Subject: Journey patterns collection controller --- .../journey_patterns_collections_controller.rb | 25 ++++++++++++++++++++++ app/controllers/journey_patterns_controller.rb | 5 ----- 2 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 app/controllers/journey_patterns_collections_controller.rb (limited to 'app/controllers') diff --git a/app/controllers/journey_patterns_collections_controller.rb b/app/controllers/journey_patterns_collections_controller.rb new file mode 100644 index 000000000..c4dc92584 --- /dev/null +++ b/app/controllers/journey_patterns_collections_controller.rb @@ -0,0 +1,25 @@ +class JourneyPatternsCollectionsController < ChouetteController + defaults :resource_class => Chouette::JourneyPattern + + respond_to :html + respond_to :json + + belongs_to :referential do + belongs_to :line, :parent_class => Chouette::Line do + belongs_to :route, :parent_class => Chouette::Route + end + end + alias_method :route, :parent + + def show + @q = route.journey_patterns.search(params[:q]) + @journey_patterns ||= @q.result(:distinct => true).order(:name) + end + + def update + ap "-----Call to #{params[:action]} from #{params[:controller]}" + ap '------------------------------------------------------------' + ap params + ap '------------------------------------------------------------' + end +end diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb index 1e2d2f191..326c5397a 100644 --- a/app/controllers/journey_patterns_controller.rb +++ b/app/controllers/journey_patterns_controller.rb @@ -19,11 +19,6 @@ class JourneyPatternsController < ChouetteController object.special_update end - def bulk_update - ap "--------call to bulk_update action ------------" - ap params - end - def show @map = JourneyPatternMap.new(journey_pattern).with_helpers(self) @stop_points = journey_pattern.stop_points.paginate(:page => params[:page]) -- cgit v1.2.3 From 0595ee02e0b0f7d0a29db99ae997e127835734c5 Mon Sep 17 00:00:00 2001 From: Xinhui Date: Thu, 8 Dec 2016 12:32:33 +0100 Subject: Restore journey_pattern controller to original state --- app/controllers/journey_patterns_controller.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'app/controllers') diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb index 326c5397a..b7cdccc72 100644 --- a/app/controllers/journey_patterns_controller.rb +++ b/app/controllers/journey_patterns_controller.rb @@ -15,6 +15,12 @@ class JourneyPatternsController < ChouetteController alias_method :route, :parent alias_method :journey_pattern, :resource + def index + index! do |format| + format.html { redirect_to referential_line_route_path(@referential,@line,@route) } + end + end + def create_resource(object) object.special_update end -- cgit v1.2.3 From f3b915d7c19f9457fb4bda6559efaebd6f75ca86 Mon Sep 17 00:00:00 2001 From: Xinhui Date: Mon, 12 Dec 2016 17:17:47 +0100 Subject: Paginate journey_patterns_collection#show --- app/controllers/journey_patterns_collections_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers') diff --git a/app/controllers/journey_patterns_collections_controller.rb b/app/controllers/journey_patterns_collections_controller.rb index c4dc92584..6f8bc17ea 100644 --- a/app/controllers/journey_patterns_collections_controller.rb +++ b/app/controllers/journey_patterns_collections_controller.rb @@ -13,7 +13,7 @@ class JourneyPatternsCollectionsController < ChouetteController def show @q = route.journey_patterns.search(params[:q]) - @journey_patterns ||= @q.result(:distinct => true).order(:name) + @journey_patterns ||= @q.result(:distinct => true).paginate(:page => params[:page]).order(:name) end def update -- cgit v1.2.3 From f0c7858c2576921dc870189dbdf6acebea313648 Mon Sep 17 00:00:00 2001 From: Thomas Haddad Date: Wed, 14 Dec 2016 14:30:13 +0100 Subject: Journey_pattern_controller gardening Signed-off-by: Thomas Shawarma Haddad --- app/controllers/journey_patterns_collections_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/journey_patterns_collections_controller.rb b/app/controllers/journey_patterns_collections_controller.rb index 6f8bc17ea..0974ec3dd 100644 --- a/app/controllers/journey_patterns_collections_controller.rb +++ b/app/controllers/journey_patterns_collections_controller.rb @@ -12,8 +12,8 @@ class JourneyPatternsCollectionsController < ChouetteController alias_method :route, :parent def show - @q = route.journey_patterns.search(params[:q]) - @journey_patterns ||= @q.result(:distinct => true).paginate(:page => params[:page]).order(:name) + @q = route.journey_patterns.includes(:stop_points) + @journey_patterns ||= @q.paginate(:page => params[:page]).order(:name) end def update -- cgit v1.2.3 From 0c83b3223e458e1af0a469ba5c11bc308f9fe057 Mon Sep 17 00:00:00 2001 From: Xinhui Date: Thu, 22 Dec 2016 12:17:56 +0100 Subject: Wip update journey_patterns collections Refs #2213 --- .../journey_patterns_collections_controller.rb | 40 ++++++++++++++++++---- 1 file changed, 33 insertions(+), 7 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/journey_patterns_collections_controller.rb b/app/controllers/journey_patterns_collections_controller.rb index 0974ec3dd..39355932e 100644 --- a/app/controllers/journey_patterns_collections_controller.rb +++ b/app/controllers/journey_patterns_collections_controller.rb @@ -1,6 +1,4 @@ class JourneyPatternsCollectionsController < ChouetteController - defaults :resource_class => Chouette::JourneyPattern - respond_to :html respond_to :json @@ -12,14 +10,42 @@ class JourneyPatternsCollectionsController < ChouetteController alias_method :route, :parent def show + journey_patterns_state + end + + def update + state = JSON.parse request.raw_post + state.each do |item| + journey_pattern = journey_pattern_by_objectid(item['object_id']) + journey_pattern_update_stop_points(journey_pattern, item['stop_points']) if journey_pattern + end + + journey_patterns_state + end + + protected + + def journey_pattern_update_stop_points journey_pattern, stop_points + stop_points.each do |sp| + stop_id = sp['id'] + exist = journey_pattern.stop_area_ids.include?(stop_id) + next if exist && sp['checked'] + + stop_point = route.stop_points.find_by(stop_area_id: stop_id) + if sp['checked'] && !exist + journey_pattern.stop_points << stop_point + else + journey_pattern.stop_points.delete(stop_point) + end + end + end + + def journey_patterns_state @q = route.journey_patterns.includes(:stop_points) @journey_patterns ||= @q.paginate(:page => params[:page]).order(:name) end - def update - ap "-----Call to #{params[:action]} from #{params[:controller]}" - ap '------------------------------------------------------------' - ap params - ap '------------------------------------------------------------' + def journey_pattern_by_objectid objectid + Chouette::JourneyPattern.find_by(objectid: objectid) end end -- cgit v1.2.3