aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
AgeCommit message (Collapse)Author
2018-02-07Refs #5815 Add required fields to some compliance controlscedricnjanga
2018-02-07Edit checksum stop_points attributes for routeXinhui
Refs #5416
2018-02-07Edit support of list attributesXinhui
Refs #5416
2018-02-07Merge branch 'master' into 5683-add_workgroup_id_to_calendarscedricnjanga
2018-02-07Update branch according to mastercedricnjanga
2018-02-07Refs #5750 @1h; Add a "kind" attribute to StopAreasZog
This determines if the StopArea is commercial or not The useless fields are hidden in the form for the non-commercials ones
2018-02-07Refs #5682 @3h; Use same UI as for timetablesZog
2018-02-07Refs #5682; Add application_days field to calendarsZog
2018-02-07Refs #5750 @1h; Add a "kind" attribute to StopAreasZog
This determines if the StopArea is commercial or not The useless fields are hidden in the form for the non-commercials ones
2018-02-07StopArea: Don't auto-initialise a value for the `kind` attributeTeddy Wing
We were getting this error on `ReferentialVehicleJourneys#index`: Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Started GET "/referentials/9/vehicle_journeys" for 172.28.10.14 at 2018-02-01 17:48:32 +0100 Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Processing by ReferentialVehicleJourneysController#index as HTML Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Parameters: {"referential_id"=>"9"} Feb 1 17:48:32 chouette-dev rails/chouette[18900]: locale set to :fr Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Rendered referential_vehicle_journeys/_filters.html.slim (37.0ms) Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Rendered referential_vehicle_journeys/index.html.slim within layouts/application (54.3ms) Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Completed 500 Internal Server Error in 73ms (ActiveRecord: 10.4ms) Feb 1 17:48:32 chouette-dev rails/chouette[18900]: ActionView::Template::Error (missing attribute: kind):#012 23: = f.input :published_journey_name_lteq, label: false, wrapper_html: { class: 'w45'}#012 24: .form-group.togglable#012 25: = f.label Chouette::StopArea.model_name.human.pluralize, required: false, class: 'control-label'#012 26: = f.input :stop_area_ids, collection: @all_stop_areas.select(:id, :name).order(name: :asc), checked: params[:q] && params[:q][:stop_area_ids], as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + l.name + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list'}, multiple: true#012 27: .form-group.togglable#012 28: = f.label Chouette::VehicleJourney.human_attribute_name(:purchase_window), class: 'control-label'#012 29: .filter_menu#012 app/models/chouette/stop_area.rb:51:in `block in <class:StopArea>'#012 app/views/referential_vehicle_journeys/_filters.html.slim:26:in `block in _app_views_referential_vehicle_journeys__filters_html_slim__692539656386688985_47285414929500'#012 app/views/referential_vehicle_journeys/_filters.html.slim:1:in `_app_views_referential_vehicle_journeys__filters_html_slim__692539656386688985_47285414929500'#012 app/views/referential_vehicle_journeys/index.html.slim:9:in `_app_views_referential_vehicle_journeys_index_html_slim___336434325333090796_47285419865660' Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Processing by ErrorsController#server_error as HTML Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Parameters: {"referential_id"=>"9"} Feb 1 17:48:32 chouette-dev rails/chouette[18900]: locale set to :fr or, this one locally which is easier to read: ActiveModel::MissingAttributeError in ReferentialVehicleJourneys#index Showing .../stif-boiv/app/views/referential_vehicle_journeys/_filters.html.slim where line #44 raised: missing attribute: kind Extracted source (around line #51): after_initialize do > self.kind ||= :commercial end def self.nullable_attributes Trace of template inclusion: app/views/referential_vehicle_journeys/index.html.slim Rails.root: .../stif-boiv Application Trace | Framework Trace | Full Trace app/models/chouette/stop_area.rb:51:in `block in <class:StopArea>' app/views/referential_vehicle_journeys/_filters.html.slim:44:in `block in _app_views_referential_vehicle_journeys__filters_html_slim___131528464712770693_70134715599760' app/views/referential_vehicle_journeys/_filters.html.slim:1:in `_app_views_referential_vehicle_journeys__filters_html_slim___131528464712770693_70134715599760' app/views/referential_vehicle_journeys/index.html.slim:9:in `_app_views_referential_vehicle_journeys_index_html_slim__3124451149445015007_70134715309040' This is because on `ReferentialVehicleJourneys#index`, the StopArea filter makes this query: @all_stop_areas.select(:id, :name).order(name: :asc) Alban added a temporary fix for the release in c2bc391ee91cac70e726d188be97dd2323df0df2. After a discussion with Luc, he said we only want the initial value on the `#new` form, and we decided to take this out of the model and put it in the form template instead. Here, when a new `StopArea` is created, `:commercial` will be pre-filled in the `kind` field by default. On the `#edit` page, it should show the existing value of `kind` but not permit editing. Refs #5817
2018-02-07Refs #5682 @3h; Use same UI as for timetablesZog
2018-02-06Update calendar form_simple according to workgroupcedricnjanga
2018-02-06Refs #5750 @1h; Add a "kind" attribute to StopAreasZog
This determines if the StopArea is commercial or not The useless fields are hidden in the form for the non-commercials ones
2018-02-06Refs #5417; Fix specsZog
2018-02-06Refs #5417; Update parents checksum when children are created or updatedZog
2018-02-06Refs #5758; Set a default kind for StopAreasZog
2018-02-06VehicleJourney.lines: Change query to only get lines for routeTeddy Wing
Johan recommended using an `IN` query to only get the lines in the current scope. I assumed I'd be covered by the schema and how only the lines for the current referential are in the schema, but this is probably a more reasonable way to get associated lines. Refs #5576
2018-02-06ReferentialVehicleJourneys#index: Use ransack filter for line idTeddy Wing
I went with this custom filter because I couldn't get it to work with a symbol-based filter in the template. But Johan suggested trying it and I guess it works. Not sure what I was doing that didn't work before. Refs #5576
2018-02-06ReferentialVehicleJourneys#index: Add 'line' filterTeddy Wing
Filter vehicle journeys by their associated route's line. The `with_line_id` scope is modeled on `with_stop_area_ids`. The HTML filter is modeled on the line filter from `app/views/workbenches/_filters.html.slim`. Refs #5576
2018-02-06Refs #5758 @1h; Add localized names to StopAreasZog
2018-02-06Refs #5762; Make coordinates optional on stop areasZog
2018-02-06:fire: logZog
2018-02-06Refs #5798 @3h; Show return journeys on the journeys' editor.Zog
2018-02-06Refs #5682; Fix timetables bulk updateZog
2018-02-06Refs #5682 @3h; Use same UI as for timetablesZog
2018-02-06Refs #5682; Set default value for application daysZog
2018-02-06Refs #5682; Fix warningZog
2018-02-06Refs #5682; Add application_days field to calendarsZog
2018-02-06Refs #5754; Add a filter on calendars for ReferentialVJs#indexZog
2018-02-06Refs #5754; Add a filter on purchase_windows on ReferentialVJs#indexZog
2018-02-06Fix StopArea validation breaking the specsZog
2018-02-06Refs #5750; Fix validationZog
2018-02-06VehicleJourney.state_permited_attributes: Fix whitespaceTeddy Wing
Add line breaks to make this method more readable. Refs #5574
2018-02-06VehicleJourney: Allow deletion of associated companyTeddy Wing
If the state doesn't contain a company, that means it was deleted on the frontend. In that case, the backend code should correctly delete the associated company from the vehicle journey. Refs #5574
2018-02-06Refs #5750 @1h; Manage non-commercial StopAreasZog
- Add a `kind` attribute - Hide irrelevant fields in the form
2018-02-06Refs #5750 @1h; Add a "kind" attribute to StopAreasZog
This determines if the StopArea is commercial or not The useless fields are hidden in the form for the non-commercials ones
2018-02-06StopArea: Don't auto-initialise a value for the `kind` attributeTeddy Wing
We were getting this error on `ReferentialVehicleJourneys#index`: Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Started GET "/referentials/9/vehicle_journeys" for 172.28.10.14 at 2018-02-01 17:48:32 +0100 Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Processing by ReferentialVehicleJourneysController#index as HTML Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Parameters: {"referential_id"=>"9"} Feb 1 17:48:32 chouette-dev rails/chouette[18900]: locale set to :fr Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Rendered referential_vehicle_journeys/_filters.html.slim (37.0ms) Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Rendered referential_vehicle_journeys/index.html.slim within layouts/application (54.3ms) Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Completed 500 Internal Server Error in 73ms (ActiveRecord: 10.4ms) Feb 1 17:48:32 chouette-dev rails/chouette[18900]: ActionView::Template::Error (missing attribute: kind):#012 23: = f.input :published_journey_name_lteq, label: false, wrapper_html: { class: 'w45'}#012 24: .form-group.togglable#012 25: = f.label Chouette::StopArea.model_name.human.pluralize, required: false, class: 'control-label'#012 26: = f.input :stop_area_ids, collection: @all_stop_areas.select(:id, :name).order(name: :asc), checked: params[:q] && params[:q][:stop_area_ids], as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + l.name + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list'}, multiple: true#012 27: .form-group.togglable#012 28: = f.label Chouette::VehicleJourney.human_attribute_name(:purchase_window), class: 'control-label'#012 29: .filter_menu#012 app/models/chouette/stop_area.rb:51:in `block in <class:StopArea>'#012 app/views/referential_vehicle_journeys/_filters.html.slim:26:in `block in _app_views_referential_vehicle_journeys__filters_html_slim__692539656386688985_47285414929500'#012 app/views/referential_vehicle_journeys/_filters.html.slim:1:in `_app_views_referential_vehicle_journeys__filters_html_slim__692539656386688985_47285414929500'#012 app/views/referential_vehicle_journeys/index.html.slim:9:in `_app_views_referential_vehicle_journeys_index_html_slim___336434325333090796_47285419865660' Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Processing by ErrorsController#server_error as HTML Feb 1 17:48:32 chouette-dev rails/chouette[18900]: Parameters: {"referential_id"=>"9"} Feb 1 17:48:32 chouette-dev rails/chouette[18900]: locale set to :fr or, this one locally which is easier to read: ActiveModel::MissingAttributeError in ReferentialVehicleJourneys#index Showing .../stif-boiv/app/views/referential_vehicle_journeys/_filters.html.slim where line #44 raised: missing attribute: kind Extracted source (around line #51): after_initialize do > self.kind ||= :commercial end def self.nullable_attributes Trace of template inclusion: app/views/referential_vehicle_journeys/index.html.slim Rails.root: .../stif-boiv Application Trace | Framework Trace | Full Trace app/models/chouette/stop_area.rb:51:in `block in <class:StopArea>' app/views/referential_vehicle_journeys/_filters.html.slim:44:in `block in _app_views_referential_vehicle_journeys__filters_html_slim___131528464712770693_70134715599760' app/views/referential_vehicle_journeys/_filters.html.slim:1:in `_app_views_referential_vehicle_journeys__filters_html_slim___131528464712770693_70134715599760' app/views/referential_vehicle_journeys/index.html.slim:9:in `_app_views_referential_vehicle_journeys_index_html_slim__3124451149445015007_70134715309040' This is because on `ReferentialVehicleJourneys#index`, the StopArea filter makes this query: @all_stop_areas.select(:id, :name).order(name: :asc) Alban added a temporary fix for the release in c2bc391ee91cac70e726d188be97dd2323df0df2. After a discussion with Luc, he said we only want the initial value on the `#new` form, and we decided to take this out of the model and put it in the form template instead. Here, when a new `StopArea` is created, `:commercial` will be pre-filled in the `kind` field by default. On the `#edit` page, it should show the existing value of `kind` but not permit editing. Refs #5817
2018-02-06Import.abort_old: Don't change finished importsTeddy Wing
Imports that have a `finished_status` should not be changed to `aborted`. Refs #4963
2018-02-06Import: Add `.abort_old` methodTeddy Wing
This will abort all imports that don't have a finished status and were created more than four hours ago. We want to add this functionality to the import cron to auto-abort stale imports. Refs #4963
2018-02-02Refs #5417; Fix specs5417-checksum-relationshipsZog
2018-02-02Refs #5417; Update parents checksum when children are created or updatedZog
2018-02-01Merge pull request #273 from af83/5798-show-return-times-on-vjs-editorLuc Donnet
5798 Show return journeys on the journeys' editor.
2018-02-01Merge pull request #274 from af83/5576-vehicle-journeys--filter-by-lineLuc Donnet
5576 vehicle journeys filter by line
2018-02-01Refs #5758; Set a default kind for StopAreasZog
2018-02-01VehicleJourney.lines: Change query to only get lines for route5576-vehicle-journeys--filter-by-lineTeddy Wing
Johan recommended using an `IN` query to only get the lines in the current scope. I assumed I'd be covered by the schema and how only the lines for the current referential are in the schema, but this is probably a more reasonable way to get associated lines. Refs #5576
2018-02-01ReferentialVehicleJourneys#index: Use ransack filter for line idTeddy Wing
I went with this custom filter because I couldn't get it to work with a symbol-based filter in the template. But Johan suggested trying it and I guess it works. Not sure what I was doing that didn't work before. Refs #5576
2018-02-01ReferentialVehicleJourneys#index: Add 'line' filterTeddy Wing
Filter vehicle journeys by their associated route's line. The `with_line_id` scope is modeled on `with_stop_area_ids`. The HTML filter is modeled on the line filter from `app/views/workbenches/_filters.html.slim`. Refs #5576
2018-02-01Refs #5758 @1h; Add localized names to StopAreasZog
2018-02-01Merge pull request #266 from af83/5762-stoparea-coordinates-are-optionalLuc Donnet
5761 Make coordinates optional on stop areas
2018-02-01Refs #5762; Make coordinates optional on stop areasZog
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-13 17:18:39 +0000