diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/vehicle_journey_frequencies_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 1 | ||||
| -rw-r--r-- | app/models/chouette/journey_pattern.rb | 1 | ||||
| -rw-r--r-- | app/models/chouette/vehicle_journey.rb | 2 | ||||
| -rw-r--r-- | app/models/concerns/iev_interfaces/task.rb | 10 | ||||
| -rw-r--r-- | app/models/import/base.rb | 2 | ||||
| -rw-r--r-- | app/views/compliance_check_sets/_filters.html.slim | 2 | ||||
| -rw-r--r-- | app/views/compliance_check_sets/show.html.slim | 2 | ||||
| -rw-r--r-- | app/views/vehicle_journeys/_form.html.slim | 1 | ||||
| -rw-r--r-- | app/views/vehicle_journeys/_show_details.html.slim | 4 |
10 files changed, 12 insertions, 15 deletions
diff --git a/app/controllers/vehicle_journey_frequencies_controller.rb b/app/controllers/vehicle_journey_frequencies_controller.rb index 9626bd36d..6e12c0247 100644 --- a/app/controllers/vehicle_journey_frequencies_controller.rb +++ b/app/controllers/vehicle_journey_frequencies_controller.rb @@ -13,7 +13,7 @@ class VehicleJourneyFrequenciesController < VehicleJourneysController def vehicle_journey_frequency_params params.require(:vehicle_journey_frequency).permit( { footnote_ids: [] } , :journey_pattern_id, :number, :published_journey_name, :published_journey_identifier, :comment, :transport_mode, - :mobility_restricted_suitability, :flexible_service, :status_value, + :mobility_restricted_suitability, :flexible_service, :facility, :vehicle_type_identifier, :objectid, :time_table_tokens, { date: [ :hour, :minute ] }, :button, :referential_id, :line_id, :route_id, :id, { vehicle_journey_at_stops_attributes: [ :arrival_time, diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb index e532712d2..821ea83ff 100644 --- a/app/controllers/vehicle_journeys_controller.rb +++ b/app/controllers/vehicle_journeys_controller.rb @@ -233,7 +233,6 @@ class VehicleJourneysController < ChouetteController :transport_mode, :mobility_restricted_suitability, :flexible_service, - :status_value, :facility, :vehicle_type_identifier, :objectid, diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb index ff85f376a..3a3d5d56a 100644 --- a/app/models/chouette/journey_pattern.rb +++ b/app/models/chouette/journey_pattern.rb @@ -15,7 +15,6 @@ module Chouette validates_presence_of :name #validates :stop_points, length: { minimum: 2, too_short: :minimum }, on: :update - enum section_status: { todo: 0, completed: 1, control: 2 } attr_accessor :control_checked diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb index b3987060a..525036077 100644 --- a/app/models/chouette/vehicle_journey.rb +++ b/app/models/chouette/vehicle_journey.rb @@ -15,7 +15,7 @@ module Chouette attr_reader :time_table_tokens def self.nullable_attributes - [:transport_mode, :published_journey_name, :vehicle_type_identifier, :published_journey_identifier, :comment, :status_value] + [:transport_mode, :published_journey_name, :vehicle_type_identifier, :published_journey_identifier, :comment] end belongs_to :company diff --git a/app/models/concerns/iev_interfaces/task.rb b/app/models/concerns/iev_interfaces/task.rb index fdd976f39..bc78ff28c 100644 --- a/app/models/concerns/iev_interfaces/task.rb +++ b/app/models/concerns/iev_interfaces/task.rb @@ -52,12 +52,13 @@ module IevInterfaces::Task end def notify_parent + return unless self.class.finished_statuses.include?(status) + return unless parent.present? - return unless status_changed? + return if notified_parent_at parent.child_change - t = Time.now - self.notified_parent_at = t - self.class.where(id: self.id).update_all notified_parent_at: t + + update_column :notified_parent_at, Time.now end def children_succeedeed @@ -65,6 +66,7 @@ module IevInterfaces::Task end def update_status + Rails.logger.info "update_status for #{inspect}" status = if children.where(status: self.class.failed_statuses).count > 0 'failed' diff --git a/app/models/import/base.rb b/app/models/import/base.rb index 1dd9c4195..62494c92e 100644 --- a/app/models/import/base.rb +++ b/app/models/import/base.rb @@ -21,6 +21,7 @@ class Import::Base < ActiveRecord::Base end def child_change + Rails.logger.info "child_change for #{inspect}" return if self.class.finished_statuses.include?(status) super @@ -28,6 +29,7 @@ class Import::Base < ActiveRecord::Base end def update_referentials + Rails.logger.info "update_referentials for #{inspect}" return unless self.class.finished_statuses.include?(status) children.each do |import| diff --git a/app/views/compliance_check_sets/_filters.html.slim b/app/views/compliance_check_sets/_filters.html.slim index e413a6cdd..c8ef14ecd 100644 --- a/app/views/compliance_check_sets/_filters.html.slim +++ b/app/views/compliance_check_sets/_filters.html.slim @@ -11,7 +11,7 @@ = f.label t('activerecord.attributes.compliance_check_set.assigned_to'), required: false, class: 'control-label' = f.input :parent_type_eq_any, collection: ComplianceCheckSet.order('parent_type'), as: :check_boxes, label: false, label_method: lambda {|w| ("<span>#{w}</span>").html_safe}, required: false, wrapper_html: {class: 'checkbox_list'} .form-group.togglable class=filter_item_class(params[:q], :created_at) - = f.label Import.human_attribute_name(:created_at), required: false, class: 'control-label' + = f.label ComplianceCheckSet.human_attribute_name(:created_at), required: false, class: 'control-label' .filter_menu = f.simple_fields_for :created_at do |p| = p.input :start_date, as: :date, label: false, wrapper_html: {class: 'date smart_date filter_menu-item'}, default: @begin_range, include_blank: @begin_range ? false : true diff --git a/app/views/compliance_check_sets/show.html.slim b/app/views/compliance_check_sets/show.html.slim index 4df14ab06..b54bf6c5c 100644 --- a/app/views/compliance_check_sets/show.html.slim +++ b/app/views/compliance_check_sets/show.html.slim @@ -1,4 +1,4 @@ -- breadcrumb :compliance_check_sets, @workbench, @compliance_check_set +- breadcrumb :compliance_check_set, @workbench, @compliance_check_set - page_header_content_for @compliance_check_set / PageContent diff --git a/app/views/vehicle_journeys/_form.html.slim b/app/views/vehicle_journeys/_form.html.slim index ca200a5f7..a412743aa 100644 --- a/app/views/vehicle_journeys/_form.html.slim +++ b/app/views/vehicle_journeys/_form.html.slim @@ -10,7 +10,6 @@ = form.input :transport_mode, include_blank: false = form.input :mobility_restricted_suitability, as: :select, :collection => [[vehicle_journey.human_attribute_name("accessible"), true], [vehicle_journey.human_attribute_name("not_accessible"), false]], :include_blank => true = form.input :flexible_service, as: :select, :collection => [[vehicle_journey.human_attribute_name("on_demand_fs"), true], [vehicle_journey.human_attribute_name("regular_fs"), false]], :include_blank => true - = form.input :status_value = form.input :facility = form.input :vehicle_type_identifier = form.input :objectid, :required => !vehicle_journey.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.vehicle_journey.objectid")} diff --git a/app/views/vehicle_journeys/_show_details.html.slim b/app/views/vehicle_journeys/_show_details.html.slim index d9e4110c9..e46775975 100644 --- a/app/views/vehicle_journeys/_show_details.html.slim +++ b/app/views/vehicle_journeys/_show_details.html.slim @@ -54,10 +54,6 @@ = vehicle_journey.comment p - label = "#{vehicle_journey.human_attribute_name('status_value')} : " - = vehicle_journey.status_value - - p label = "#{vehicle_journey.human_attribute_name('facility')} : " = vehicle_journey.facility |