diff options
| author | Xinhui | 2017-11-17 12:07:58 +0100 | 
|---|---|---|
| committer | Xinhui | 2017-11-17 12:09:42 +0100 | 
| commit | 1261698d213964a3391fe1880198da00e7ac9831 (patch) | |
| tree | bae0b1a874a47fc36106dc5c33e66e9af182b503 | |
| parent | f677c08029ccb3b910ab6a2401fa56ccacb2b4d9 (diff) | |
| parent | 219af774c2d589446133bda55aa0f001d6526181 (diff) | |
| download | chouette-core-1261698d213964a3391fe1880198da00e7ac9831.tar.bz2 | |
Merge branch '4516_cleanup_rule_parameter_set'
43 files changed, 13 insertions, 1121 deletions
| diff --git a/app/controllers/rule_parameter_sets_controller.rb b/app/controllers/rule_parameter_sets_controller.rb deleted file mode 100644 index de4863a08..000000000 --- a/app/controllers/rule_parameter_sets_controller.rb +++ /dev/null @@ -1,53 +0,0 @@ -class RuleParameterSetsController < InheritedResources::Base -  defaults :resource_class => RuleParameterSet -  respond_to :html -  respond_to :js, :only => [ :mode ] - -  def new -    @rule_parameter_set = RuleParameterSet.default( current_organisation) -    new! -  end - -  def destroy -    if current_organisation.rule_parameter_sets.count == 1 -      flash[:alert] = t('rule_parameter_sets.destroy.last_rps_protected') -      redirect_to organisation_rule_parameter_sets_path -    else -      destroy! do |success, failure| -        success.html { redirect_to organisation_rule_parameter_sets_path } -      end -    end -  end - -  def update -    update!(rule_parameter_set_params) do |success, failure| -      success.html { redirect_to organisation_rule_parameter_sets_path } -    end -  end - -  def create -    create!(rule_parameter_set_params) do |success, failure| -      success.html { redirect_to organisation_rule_parameter_sets_path } -    end -  end - -  protected - -  alias_method :rule_parameter_set, :resource - -  def collection -    @rule_parameter_sets = current_organisation.rule_parameter_sets -  end - -  def create_resource(rule_parameter_sets) -    rule_parameter_sets.organisation = current_organisation -    super -  end - -  private - -  def rule_parameter_set_params -    params.require(:rule_parameter_set).permit(:organisation, :name, :inter_stop_area_distance_min, :parent_stop_area_distance_max, :stop_areas_area, :inter_access_point_distance_min, :inter_connection_link_distance_max, :walk_default_speed_max, :walk_occasional_traveller_speed_max, :walk_frequent_traveller_speed_max, :walk_mobility_restricted_traveller_speed_max, :inter_access_link_distance_max, :inter_stop_duration_max, :facility_stop_area_distance_max, :check_lines_in_groups, :check_line_routes, :check_stop_parent, :check_connection_link_on_physical, :check_allowed_transport_modes, :allowed_transport_mode_coach, :inter_stop_area_distance_min_mode_coach, :inter_stop_area_distance_max_mode_coach, :speed_max_mode_coach, :speed_min_mode_coach, :inter_stop_duration_variation_max_mode_coach, :allowed_transport_mode_air, :inter_stop_area_distance_min_mode_air, :inter_stop_area_distance_max_mode_air, :speed_max_mode_air, :speed_min_mode_air, :inter_stop_duration_variation_max_mode_air, :allowed_transport_mode_waterborne, :inter_stop_area_distance_min_mode_waterborne, :inter_stop_area_distance_max_mode_waterborne, :speed_max_mode_waterborne, :speed_min_mode_waterborne, :inter_stop_duration_variation_max_mode_waterborne, :allowed_transport_mode_bus, :inter_stop_area_distance_min_mode_bus, :inter_stop_area_distance_max_mode_bus, :speed_max_mode_bus, :speed_min_mode_bus, :inter_stop_duration_variation_max_mode_bus, :allowed_transport_mode_ferry, :inter_stop_area_distance_min_mode_ferry, :inter_stop_area_distance_max_mode_ferry, :speed_max_mode_ferry, :speed_min_mode_ferry, :inter_stop_duration_variation_max_mode_ferry, :allowed_transport_mode_walk, :inter_stop_area_distance_min_mode_walk, :inter_stop_area_distance_max_mode_walk, :speed_max_mode_walk, :speed_min_mode_walk, :inter_stop_duration_variation_max_mode_walk, :allowed_transport_mode_metro, :inter_stop_area_distance_min_mode_metro, :inter_stop_area_distance_max_mode_metro, :speed_max_mode_metro, :speed_min_mode_metro, :inter_stop_duration_variation_max_mode_metro, :allowed_transport_mode_shuttle, :inter_stop_area_distance_min_mode_shuttle, :inter_stop_area_distance_max_mode_shuttle, :speed_max_mode_shuttle, :speed_min_mode_shuttle, :inter_stop_duration_variation_max_mode_shuttle, :allowed_transport_mode_rapid_transit, :inter_stop_area_distance_min_mode_rapid_transit, :inter_stop_area_distance_max_mode_rapid_transit, :speed_max_mode_rapid_transit, :speed_min_mode_rapid_transit, :inter_stop_duration_variation_max_mode_rapid_transit, :allowed_transport_mode_taxi, :inter_stop_area_distance_min_mode_taxi, :inter_stop_area_distance_max_mode_taxi, :speed_max_mode_taxi, :speed_min_mode_taxi, :inter_stop_duration_variation_max_mode_taxi, :allowed_transport_mode_local_train, :inter_stop_area_distance_min_mode_local_train, :inter_stop_area_distance_max_mode_local_train, :speed_max_mode_local_train, :speed_min_mode_local_train, :inter_stop_duration_variation_max_mode_local_train, :allowed_transport_mode_train, :inter_stop_area_distance_min_mode_train, :inter_stop_area_distance_max_mode_train, :speed_max_mode_train, :speed_min_mode_train, :inter_stop_duration_variation_max_mode_train, :allowed_transport_mode_long_distance_train, :inter_stop_area_distance_min_mode_long_distance_train, :inter_stop_area_distance_max_mode_long_distance_train, :speed_max_mode_long_distance_train, :speed_min_mode_long_distance_train, :inter_stop_duration_variation_max_mode_long_distance_train, :allowed_transport_mode_tramway, :inter_stop_area_distance_min_mode_tramway, :inter_stop_area_distance_max_mode_tramway, :speed_max_mode_tramway, :speed_min_mode_tramway, :inter_stop_duration_variation_max_mode_tramway, :allowed_transport_mode_trolleybus, :inter_stop_area_distance_min_mode_trolleybus, :inter_stop_area_distance_max_mode_trolleybus, :speed_max_mode_trolleybus, :speed_min_mode_trolleybus, :inter_stop_duration_variation_max_mode_trolleybus, :allowed_transport_mode_private_vehicle, :inter_stop_area_distance_min_mode_private_vehicle, :inter_stop_area_distance_max_mode_private_vehicle, :speed_max_mode_private_vehicle, :speed_min_mode_private_vehicle, :inter_stop_duration_variation_max_mode_private_vehicle, :allowed_transport_mode_bicycle, :inter_stop_area_distance_min_mode_bicycle, :inter_stop_area_distance_max_mode_bicycle, :speed_max_mode_bicycle, :speed_min_mode_bicycle, :inter_stop_duration_variation_max_mode_bicycle, :allowed_transport_mode_other, :inter_stop_area_distance_min_mode_other, :inter_stop_area_distance_max_mode_other, :speed_max_mode_other, :speed_min_mode_other, :inter_stop_duration_variation_max_mode_other, :check_network, :unique_column_objectid_object_network, :pattern_column_objectid_object_network, :min_size_column_objectid_object_network, :max_size_column_objectid_object_network, :unique_column_name_object_network, :pattern_column_name_object_network, :min_size_column_name_object_network, :max_size_column_name_object_network, :unique_column_registration_number_object_network, :pattern_column_registration_number_object_network, :min_size_column_registration_number_object_network, :max_size_column_registration_number_object_network, :check_company, :unique_column_objectid_object_company, :pattern_column_objectid_object_company, :min_size_column_objectid_object_company, :max_size_column_objectid_object_company, :unique_column_name_object_company, :pattern_column_name_object_company, :min_size_column_name_object_company, :max_size_column_name_object_company, :unique_column_registration_number_object_company, :pattern_column_registration_number_object_company, :min_size_column_registration_number_object_company, :max_size_column_registration_number_object_company, :check_group_of_line, :unique_column_objectid_object_group_of_line, :pattern_column_objectid_object_group_of_line, :min_size_column_objectid_object_group_of_line, :max_size_column_objectid_object_group_of_line, :unique_column_name_object_group_of_line, :pattern_column_name_object_group_of_line, :min_size_column_name_object_group_of_line, :max_size_column_name_object_group_of_line, :unique_column_registration_number_object_group_of_line, :pattern_column_registration_number_object_group_of_line, :min_size_column_registration_number_object_group_of_line, :max_size_column_registration_number_object_group_of_line, :check_stop_area, :unique_column_objectid_object_stop_area, :pattern_column_objectid_object_stop_area, :min_size_column_objectid_object_stop_area, :max_size_column_objectid_object_stop_area, :unique_column_name_object_stop_area, :pattern_column_name_object_stop_area, :min_size_column_name_object_stop_area, :max_size_column_name_object_stop_area, :unique_column_registration_number_object_stop_area, :pattern_column_registration_number_object_stop_area, :min_size_column_registration_number_object_stop_area, :max_size_column_registration_number_object_stop_area, :unique_column_city_name_object_stop_area, :pattern_column_city_name_object_stop_area, :min_size_column_city_name_object_stop_area, :max_size_column_city_name_object_stop_area, :unique_column_country_code_object_stop_area, :pattern_column_country_code_object_stop_area, :min_size_column_country_code_object_stop_area, :max_size_column_country_code_object_stop_area, :unique_column_zip_code_object_stop_area, :pattern_column_zip_code_object_stop_area, :min_size_column_zip_code_object_stop_area, :max_size_column_zip_code_object_stop_area, :check_access_point, :unique_column_objectid_object_access_point, :pattern_column_objectid_object_access_point, :min_size_column_objectid_object_access_point, :max_size_column_objectid_object_access_point, :unique_column_name_object_access_point, :pattern_column_name_object_access_point, :min_size_column_name_object_access_point, :max_size_column_name_object_access_point, :unique_column_city_name_object_access_point, :pattern_column_city_name_object_access_point, :min_size_column_city_name_object_access_point, :max_size_column_city_name_object_access_point, :unique_column_country_code_object_access_point, :pattern_column_country_code_object_access_point, :min_size_column_country_code_object_access_point, :max_size_column_country_code_object_access_point, :unique_column_zip_code_object_access_point, :pattern_column_zip_code_object_access_point, :min_size_column_zip_code_object_access_point, :max_size_column_zip_code_object_access_point, :check_access_link, :unique_column_objectid_object_access_link, :pattern_column_objectid_object_access_link, :min_size_column_objectid_object_access_link, :max_size_column_objectid_object_access_link, :unique_column_name_object_access_link, :pattern_column_name_object_access_link, :min_size_column_name_object_access_link, :max_size_column_name_object_access_link, :unique_column_link_distance_object_access_link, :min_size_column_link_distance_object_access_link, :max_size_column_link_distance_object_access_link, :unique_column_default_duration_object_access_link, :min_size_column_default_duration_object_access_link, :max_size_column_default_duration_object_access_link, :check_connection_link, :unique_column_objectid_object_connection_link, :pattern_column_objectid_object_connection_link, :min_size_column_objectid_object_connection_link, :max_size_column_objectid_object_connection_link, :unique_column_name_object_connection_link, :pattern_column_name_object_connection_link, :min_size_column_name_object_connection_link, :max_size_column_name_object_connection_link, :unique_column_link_distance_object_connection_link, :min_size_column_link_distance_object_connection_link, :max_size_column_link_distance_object_connection_link, :unique_column_default_duration_object_connection_link, :min_size_column_default_duration_object_connection_link, :max_size_column_default_duration_object_connection_link, :check_time_table, :unique_column_objectid_object_time_table, :pattern_column_objectid_object_time_table, :min_size_column_objectid_object_time_table, :max_size_column_objectid_object_time_table, :unique_column_comment_object_time_table, :pattern_column_comment_object_time_table, :min_size_column_comment_object_time_table, :max_size_column_comment_object_time_table, :unique_column_version_object_time_table, :pattern_column_version_object_time_table, :min_size_column_version_object_time_table, :max_size_column_version_object_time_table, :check_line, :unique_column_objectid_object_line, :pattern_column_objectid_object_line, :min_size_column_objectid_object_line, :max_size_column_objectid_object_line, :unique_column_name_object_line, :pattern_column_name_object_line, :min_size_column_name_object_line, :max_size_column_name_object_line, :unique_column_registration_number_object_line, :pattern_column_registration_number_object_line, :min_size_column_registration_number_object_line, :max_size_column_registration_number_object_line, :unique_column_number_object_line, :pattern_column_number_object_line, :min_size_column_number_object_line, :max_size_column_number_object_line, :unique_column_published_name_object_line, :pattern_column_published_name_object_line, :min_size_column_published_name_object_line, :max_size_column_published_name_object_line, :check_route, :unique_column_objectid_object_route, :pattern_column_objectid_object_route, :min_size_column_objectid_object_route, :max_size_column_objectid_object_route, :unique_column_name_object_route, :pattern_column_name_object_route, :min_size_column_name_object_route, :max_size_column_name_object_route, :unique_column_number_object_route, :pattern_column_number_object_route, :min_size_column_number_object_route, :max_size_column_number_object_route, :unique_column_published_name_object_route, :pattern_column_published_name_object_route, :min_size_column_published_name_object_route, :max_size_column_published_name_object_route, :check_journey_pattern, :unique_column_objectid_object_journey_pattern, :pattern_column_objectid_object_journey_pattern, :min_size_column_objectid_object_journey_pattern, :max_size_column_objectid_object_journey_pattern, :unique_column_name_object_journey_pattern, :pattern_column_name_object_journey_pattern, :min_size_column_name_object_journey_pattern, :max_size_column_name_object_journey_pattern, :unique_column_registration_number_object_journey_pattern, :pattern_column_registration_number_object_journey_pattern, :min_size_column_registration_number_object_journey_pattern, :max_size_column_registration_number_object_journey_pattern, :unique_column_published_name_object_journey_pattern, :pattern_column_published_name_object_journey_pattern, :min_size_column_published_name_object_journey_pattern, :max_size_column_published_name_object_journey_pattern, :check_vehicle_journey, :unique_column_objectid_object_vehicle_journey, :pattern_column_objectid_object_vehicle_journey, :min_size_column_objectid_object_vehicle_journey, :max_size_column_objectid_object_vehicle_journey, :unique_column_published_journey_name_object_vehicle_journey, :pattern_column_published_journey_name_object_vehicle_journey, :min_size_column_published_journey_name_object_vehicle_journey, :max_size_column_published_journey_name_object_vehicle_journey, :unique_column_published_journey_identifier_object_vehicle_journey, :pattern_column_published_journey_identifier_object_vehicle_journey, :min_size_column_published_journey_identifier_object_vehicle_journey, :max_size_column_published_journey_identifier_object_vehicle_journey, :unique_column_number_object_vehicle_journey, :min_size_column_number_object_vehicle_journey, :max_size_column_number_object_vehicle_journey) -  end -end - diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9f2e2765f..0a7b0fb75 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -73,8 +73,6 @@ module ApplicationHelper        "time_tables"      when path.include?("/timebands")        "timebands" -     when path.include?("/rule_parameter_set") -      "parametersets"      when path.include?("/import_tasks")        "imports"      when path.include?("/exports") diff --git a/app/helpers/rule_parameter_sets_helper.rb b/app/helpers/rule_parameter_sets_helper.rb deleted file mode 100644 index bb210d9cd..000000000 --- a/app/helpers/rule_parameter_sets_helper.rb +++ /dev/null @@ -1,28 +0,0 @@ -module RuleParameterSetsHelper - -  def unique( value) -    return t("true") if value == "1" -    t "false" -  end - -  def pattern(value) -    return t("rule_parameter_sets.labels.free_char") if value == "0" -    return t("rule_parameter_sets.labels.num_char") if value == "1" -    return t("rule_parameter_sets.labels.alpha_char") if value == "2" -    return t("rule_parameter_sets.labels.upper_char") if value == "3" -    return t("rule_parameter_sets.labels.lower_char") if value == "4" -  end -   -  def boolean_value(value) -    return t("true") if value == "1" -    t "false" -  end -   -  def transport_mode_label_pairs -    Chouette::TransportMode -      .all -      .zip_map { |mode| t("transport_modes.label.#{mode}") } -  end -end - - diff --git a/app/models/import_task.rb b/app/models/import_task.rb index 0e1ab65be..7dfa2c644 100644 --- a/app/models/import_task.rb +++ b/app/models/import_task.rb @@ -12,7 +12,7 @@ class ImportTask    cattr_accessor :root    enumerize :data_format, in: %w( neptune netex gtfs ) -  attr_accessor :rule_parameter_set_id, :referential_id, :user_id, :user_name, :data_format, :resources, :name, :no_save +  attr_accessor :referential_id, :user_id, :user_name, :data_format, :resources, :name, :no_save    validates_presence_of :referential_id    validates_presence_of :resources @@ -34,10 +34,6 @@ class ImportTask      referential.organisation    end -  def rule_parameter_set -    organisation.rule_parameter_sets.find(rule_parameter_set_id) if rule_parameter_set_id.present? -  end -    def save      if valid?        # Save resources @@ -68,20 +64,10 @@ class ImportTask    def params      {}.tap do |h| -      h["parameters"] = validation_params ? action_params.merge(validation_params) : action_params +      h["parameters"] = {}      end    end -  def action_params -    {} -  end - -  def validation_params -    { -      "validation" => rule_parameter_set.parameters -    } if rule_parameter_set.present? -  end -    def self.data_formats      self.data_format.values    end diff --git a/app/models/organisation.rb b/app/models/organisation.rb index 6104b4431..b0c0692da 100644 --- a/app/models/organisation.rb +++ b/app/models/organisation.rb @@ -3,7 +3,6 @@ class Organisation < ActiveRecord::Base    has_many :users, :dependent => :destroy    has_many :referentials, :dependent => :destroy -  # has_many :rule_parameter_sets, :dependent => :destroy    has_many :compliance_control_sets, :dependent => :destroy    has_many :stop_area_referential_memberships @@ -19,12 +18,6 @@ class Organisation < ActiveRecord::Base    validates_presence_of :name    validates_uniqueness_of :code -  # after_create :add_rule_parameter_set - -  # def add_rule_parameter_set -  #   RuleParameterSet.default_for_all_modes( self).save -  # end -    def self.portail_api_request      conf = Rails.application.config.try(:stif_portail_api)      raise 'Rails.application.config.stif_portail_api configuration is not defined' unless conf diff --git a/app/models/rule_parameter_set.rb b/app/models/rule_parameter_set.rb deleted file mode 100644 index 91e575822..000000000 --- a/app/models/rule_parameter_set.rb +++ /dev/null @@ -1,392 +0,0 @@ -class RuleParameterSet < ActiveRecord::Base -  belongs_to :organisation - -  #validates_presence_of :referential -  validates_presence_of :name - -  # Access to parent object -  attr_accessor :import, :compliance_check - -  serialize :parameters, JSON - -  def self.mode_attribute_prefixes -    %w( allowed_transport inter_stop_area_distance_min inter_stop_area_distance_max speed_max speed_min inter_stop_duration_variation_max) -  end -  def self.general_attributes -    %w( inter_stop_area_distance_min parent_stop_area_distance_max stop_areas_area inter_access_point_distance_min -      inter_connection_link_distance_max walk_default_speed_max -      walk_occasional_traveller_speed_max walk_frequent_traveller_speed_max walk_mobility_restricted_traveller_speed_max -      inter_access_link_distance_max inter_stop_duration_max facility_stop_area_distance_max -      check_allowed_transport_modes check_lines_in_groups check_line_routes -      check_stop_parent check_connection_link_on_physical) -  end - -  def self.validable_objects -      [Chouette::Network,Chouette::Company,Chouette::GroupOfLine, -        Chouette::StopArea,Chouette::AccessPoint,Chouette::AccessLink,Chouette::ConnectionLink, -        Chouette::TimeTable,Chouette::Line,Chouette::Route, -        Chouette::JourneyPattern,Chouette::VehicleJourney] -  end - -  def self.validable_object_names -    %w( network company group_of_line stop_area access_point access_link connection_link time_table line route -        journey_pattern vehicle_journey ) -  end - -  def self.validable_columns -      { 'network' => ['objectid','name','registration_number'], -        'company' => ['objectid','name','registration_number'], -        'group_of_line' => ['objectid','name','registration_number'], -        'stop_area' => ['objectid','name','registration_number','city_name','country_code','zip_code'], -        'access_point' => ['objectid','name','city_name','country_code','zip_code'], -        'access_link' => ['objectid','name','link_distance','default_duration'], -        'connection_link' => ['objectid','name','link_distance','default_duration'], -        'time_table' => ['objectid','comment','version'], -        'line' => ['objectid','name','registration_number','number','published_name'], -        'route' => ['objectid','name','number','published_name'], -        'journey_pattern' => ['objectid','name','registration_number','published_name'], -        'vehicle_journey' => ['objectid','published_journey_name','published_journey_identifier','number'] } -  end - -  @@objects_by_name = Hash[[validable_object_names, validable_objects].transpose].freeze - -  def self.validable_object_class(object_name) -    @@objects_by_name[object_name] -  end - -  def self.validable_column_type(object_name, column) -    if object_class = validable_object_class(object_name) -      object_class.columns_hash[column].try(:type) -    end -  end - -  def self.column_attribute_prefixes -    %w( unique pattern min_size max_size ) -  end - -  def self.all_modes -    ["interchange", - "unknown", - "coach", - "air", - "waterborne", - "bus", - "ferry", - "walk", - "metro", - "shuttle", - "rapid_transit", - "taxi", - "local_train", - "train", - "long_distance_train", - "tramway", - "trolleybus", - "private_vehicle", - "bicycle", - "other"] -  end - -  def self.mode_attribute?( method_name ) -    pattern = /(\w+)_mode_(\w+)/ -    return false unless method_name.match( pattern) - -    mode_attribute_prefixes.include?( $1) && self.class.all_modes.include?( $2) -  end - -  def self.column_attribute?( method_name ) -    pattern = /(\w+)_column_(\w+)_object_(\w+)/ -    return false unless method_name.match( pattern) -    return false unless validable_object_names.include?($3) -    column_attribute_prefixes.include?( $1) && validable_columns[$3].include?( $2) -  end - -  def self.mode_of_mode_attribute( method_name ) -    method_name.match( /(\w+)_mode_(\w+)/) -    $2 -  end -  def self.attribute_of_mode_attribute( method_name ) -    method_name.match( /(\w+)_mode_(\w+)/) -    $1 -  end - -  def self.object_of_column_attribute( method_name ) -    method_name.match(  /(\w+)_column_(\w+)_object_(\w+)/) -    $3 -  end -  def self.column_of_column_attribute( method_name ) -    method_name.match(  /(\w+)_column_(\w+)_object_(\w+)/) -    $2 -  end -  def self.attribute_of_column_attribute( method_name ) -    method_name.match(  /(\w+)_column_(\w+)_object_(\w+)/) -    $1 -  end - - -  def self.mode_parameter(name) -    name = name.to_s -    #attr_accessible name - -    define_method(name) do -      attribute_name, mode = RuleParameterSet.attribute_of_mode_attribute( name), RuleParameterSet.mode_of_mode_attribute( name) -      self.parameters and self.parameters["mode_#{mode}"] and -        self.parameters["mode_#{mode}"][attribute_name] -    end - -    define_method("#{name}=") do |prefix| -      attribute_name, mode = RuleParameterSet.attribute_of_mode_attribute( name), RuleParameterSet.mode_of_mode_attribute( name) -      ((self.parameters ||= {})["mode_#{mode}"] ||= {})[attribute_name] = prefix -    end -  end - -  def self.column_parameter(obj,column,prefix) -    name = "#{prefix}_column_#{column}_object_#{obj}" -    #attr_accessible name -    define_method(name) do -      attribute_name, column, obj = prefix, column, obj -      self.parameters and self.parameters[obj] and -        self.parameters[obj][column] and self.parameters[obj][column][attribute_name] -    end - -    define_method("#{name}=") do |key| -      attribute_name, column, obj = prefix, column, obj -      (((self.parameters ||= {})[obj] ||= {})[column]||= {})[attribute_name] = key -    end - -   end - -  def self.object_parameter(clazz) -    name = clazz.table_name.singularize -    #attr_accessible name - -    parameter "check_#{clazz.table_name.singularize}" -    validable_columns[name].each do |column| -      column_attribute_prefixes.each do |prefix| -         column_parameter name,column,prefix -      end - -    end - -  end - -  def self.parameter(name) -    name = name.to_s -    #attr_accessible name - -    define_method(name) do -        self.parameters and self.parameters[name] -    end - -    define_method("#{name}=") do |prefix| -        (self.parameters ||= {})[name] = prefix -    end -  end - -  def self.default_params(mode=nil) -    base = { :inter_stop_area_distance_min          => 20, -      :parent_stop_area_distance_max                => 300, -      :inter_access_point_distance_min              => 20, -      :inter_connection_link_distance_max           => 400, -      :walk_default_speed_max                       => 4, -      :walk_occasional_traveller_speed_max          => 2, -      :walk_frequent_traveller_speed_max            => 5, -      :walk_mobility_restricted_traveller_speed_max => 1, -      :inter_access_link_distance_max               => 300, -      :inter_stop_duration_max                      => 40, -      :facility_stop_area_distance_max              => 300, -      :check_allowed_transport_modes                => false, -      :check_lines_in_groups                        => false, -      :check_line_routes                            => false, -      :check_stop_parent                            => false, -      :check_connection_link_on_physical            => false -    } -    if mode && self.mode_default_params[ mode.to_sym] -      base.merge!( self.mode_default_params[ mode.to_sym]) -    end -    base -  end -  def self.mode_default_params -    { -    :coach => { -      :allowed_transport_mode_coach                 => false, -      :inter_stop_area_distance_min_mode_coach      => 500, -      :inter_stop_area_distance_max_mode_coach      => 10000, -      :speed_max_mode_coach                         => 90, -      :speed_min_mode_coach                         => 40, -      :inter_stop_duration_variation_max_mode_coach => 20}, -    :air => { -      :allowed_transport_mode_air                 => false, -      :inter_stop_area_distance_min_mode_air      => 200, -      :inter_stop_area_distance_max_mode_air      => 10000, -      :speed_max_mode_air                         => 800, -      :speed_min_mode_air                         => 700, -      :inter_stop_duration_variation_max_mode_air => 60}, -    :waterborne => { -      :allowed_transport_mode_waterborne                 => false, -      :inter_stop_area_distance_min_mode_waterborne      => 200, -      :inter_stop_area_distance_max_mode_waterborne      => 10000, -      :speed_max_mode_waterborne                         => 40, -      :speed_min_mode_waterborne                         => 5, -      :inter_stop_duration_variation_max_mode_waterborne => 60}, -    :bus => { -      :allowed_transport_mode_bus                 => false, -      :inter_stop_area_distance_min_mode_bus      => 100, -      :inter_stop_area_distance_max_mode_bus      => 10000, -      :speed_max_mode_bus                         => 60, -      :speed_min_mode_bus                         => 10, -      :inter_stop_duration_variation_max_mode_bus => 15}, -    :ferry => { -      :allowed_transport_mode_ferry                 => false, -      :inter_stop_area_distance_min_mode_ferry      => 200, -      :inter_stop_area_distance_max_mode_ferry      => 10000, -      :speed_max_mode_ferry                         => 40, -      :speed_min_mode_ferry                         => 5, -      :inter_stop_duration_variation_max_mode_ferry => 60}, -    :walk => { -      :allowed_transport_mode_walk                 => false, -      :inter_stop_area_distance_min_mode_walk      => 1, -      :inter_stop_area_distance_max_mode_walk      => 10000, -      :speed_max_mode_walk                         => 6, -      :speed_min_mode_walk                         => 1, -      :inter_stop_duration_variation_max_mode_walk => 10}, -    :metro => { -      :allowed_transport_mode_metro                 => false, -      :inter_stop_area_distance_min_mode_metro      => 300, -      :inter_stop_area_distance_max_mode_metro      => 2000, -      :speed_max_mode_metro                         => 60, -      :speed_min_mode_metro                         => 30, -      :inter_stop_duration_variation_max_mode_metro => 30}, -    :shuttle => { -      :allowed_transport_mode_shuttle                 => false, -      :inter_stop_area_distance_min_mode_shuttle      => 500, -      :inter_stop_area_distance_max_mode_shuttle      => 10000, -      :speed_max_mode_shuttle                         => 80, -      :speed_min_mode_shuttle                         => 20, -      :inter_stop_duration_variation_max_mode_shuttle => 10}, -    :rapid_transit => { -      :allowed_transport_mode_rapid_transit                 => false, -      :inter_stop_area_distance_min_mode_rapid_transit      => 2000, -      :inter_stop_area_distance_max_mode_rapid_transit      => 500000, -      :speed_max_mode_rapid_transit                         => 300, -      :speed_min_mode_rapid_transit                         => 20, -      :inter_stop_duration_variation_max_mode_rapid_transit => 60}, -    :taxi => { -      :allowed_transport_mode_taxi                 => false, -      :inter_stop_area_distance_min_mode_taxi      => 500, -      :inter_stop_area_distance_max_mode_taxi      => 300000, -      :speed_max_mode_taxi                         => 130, -      :speed_min_mode_taxi                         => 20, -      :inter_stop_duration_variation_max_mode_taxi => 60}, -    :local_train => { -      :allowed_transport_mode_local_train                 => false, -      :inter_stop_area_distance_min_mode_local_train      => 2000, -      :inter_stop_area_distance_max_mode_local_train      => 500000, -      :speed_max_mode_local_train                         => 300, -      :speed_min_mode_local_train                         => 20, -      :inter_stop_duration_variation_max_mode_local_train => 60}, -    :train => { -      :allowed_transport_mode_train                 => false, -      :inter_stop_area_distance_min_mode_train      => 2000, -      :inter_stop_area_distance_max_mode_train      => 500000, -      :speed_max_mode_train                         => 300, -      :speed_min_mode_train                         => 20, -      :inter_stop_duration_variation_max_mode_train => 60}, -    :long_distance_train => { -      :allowed_transport_mode_long_distance_train                 => false, -      :inter_stop_area_distance_min_mode_long_distance_train      => 2000, -      :inter_stop_area_distance_max_mode_long_distance_train      => 500000, -      :speed_max_mode_long_distance_train                         => 300, -      :speed_min_mode_long_distance_train                         => 20, -      :inter_stop_duration_variation_max_mode_long_distance_train => 60}, -    :tramway => { -      :allowed_transport_mode_tramway                 => false, -      :inter_stop_area_distance_min_mode_tramway      => 300, -      :inter_stop_area_distance_max_mode_tramway      => 2000, -      :speed_max_mode_tramway                         => 50, -      :speed_min_mode_tramway                         => 20, -      :inter_stop_duration_variation_max_mode_tramway => 30}, -    :trolleybus => { -      :allowed_transport_mode_trolleybus                 => false, -      :inter_stop_area_distance_min_mode_trolleybus      => 300, -      :inter_stop_area_distance_max_mode_trolleybus      => 2000, -      :speed_max_mode_trolleybus                         => 50, -      :speed_min_mode_trolleybus                         => 20, -      :inter_stop_duration_variation_max_mode_trolleybus => 30}, -    :private_vehicle => { -      :allowed_transport_mode_private_vehicle                 => false, -      :inter_stop_area_distance_min_mode_private_vehicle      => 500, -      :inter_stop_area_distance_max_mode_private_vehicle      => 300000, -      :speed_max_mode_private_vehicle                         => 130, -      :speed_min_mode_private_vehicle                         => 20, -      :inter_stop_duration_variation_max_mode_private_vehicle => 60}, -    :bicycle => { -      :allowed_transport_mode_bicycle                 => false, -      :inter_stop_area_distance_min_mode_bicycle      => 300, -      :inter_stop_area_distance_max_mode_bicycle      => 30000, -      :speed_max_mode_bicycle                         => 40, -      :speed_min_mode_bicycle                         => 10, -      :inter_stop_duration_variation_max_mode_bicycle => 10}, -    :other => { -      :allowed_transport_mode_other                 => false, -      :inter_stop_area_distance_min_mode_other      => 300, -      :inter_stop_area_distance_max_mode_other      => 30000, -      :speed_max_mode_other                         => 40, -      :speed_min_mode_other                         => 10, -      :inter_stop_duration_variation_max_mode_other => 10}, -    } -    # :waterborne, :bus, :ferry, :walk, :metro, :shuttle, :rapidtransit, :taxi, :localtrain, :train, :longdistancetrain, :tramway, :trolleybus, :privatevehicle, :bicycle, :other -  end -  def self.default(organisation) -    self.default_for_all_modes(organisation).tap do |rps| -      rps.name = "" -    end -  end -  def self.default_for_all_modes(organisation) -    mode_attributes = mode_default_params.values.inject(self.default_params){|memo, obj| memo.merge! obj} -    self.new( -      { :organisation_id => organisation.id, -        :name => "valeurs par defaut" -      }.merge(mode_attributes)) -  end - -  def allowed(mode) -    return true unless self.check_allowed_transport_modes == "1" -    # puts "#{mode} = "+self.send("allowed_transport_mode_#{mode}").to_s -    return self.send("allowed_transport_mode_#{mode}") == "1" -  end - -  def selected(object) -    # puts "#{mode} = "+self.send("allowed_transport_mode_#{mode}").to_s -    return self.send("check_#{object}") == "1" -  end - -  def selected_column(object,column) -    # puts "#{mode} = "+self.send("allowed_transport_mode_#{mode}").to_s -    return self.send("unique_column_#{column}_object_#{object}") == "1" || -           self.send("pattern_column_#{column}_object_#{object}") != "0" || -           !self.send("min_size_column_#{column}_object_#{object}").empty? || -           !self.send("max_size_column_#{column}_object_#{object}").empty? -  end - - -  all_modes.each do |mode| -    mode_attribute_prefixes.each do |prefix| -      mode_parameter "#{prefix}_mode_#{mode}".to_sym -    end -  end - -  general_attributes.each do |attribute| -    parameter attribute.to_sym -    unless attribute == "stop_areas_area" || attribute == "check_allowed_transport_modes" -      validates attribute.to_sym, :numericality => true, :allow_nil => true, :allow_blank => true -    end -  end - - -  validable_objects.each do |obj| -     object_parameter obj -  end - - -end diff --git a/app/views/import_tasks/new.html.slim b/app/views/import_tasks/new.html.slim index b4b77d344..dad004759 100644 --- a/app/views/import_tasks/new.html.slim +++ b/app/views/import_tasks/new.html.slim @@ -16,13 +16,12 @@ ul.nav.nav-pills          = form.input :referential_id, as: :hidden, :input_html => { :value => @referential.id }          = form.input :name          = form.input :no_save, as: :boolean -        = form.input :rule_parameter_set_id, as: :select, :collection =>  @referential.organisation.rule_parameter_sets.map { |rps| [ rps.name, rps.id ] }, :include_blank => true          = form.input :resources, as: :file        = render partial: "fields_#{import_task.data_format}_import", :locals => { :form => form } -       +        = form.actions do          = form.action :submit, as: :button , :label => t( 'formtastic.import' )          = form.action :cancel, as: :link -= javascript_include_tag new_referential_import_task_path(@referential, :format => :js)
\ No newline at end of file += javascript_include_tag new_referential_import_task_path(@referential, :format => :js) diff --git a/app/views/organisations/show.html.slim b/app/views/organisations/show.html.slim index 89e3b2870..e7ab18dd3 100644 --- a/app/views/organisations/show.html.slim +++ b/app/views/organisations/show.html.slim @@ -27,8 +27,3 @@          = link_to t('organisations.actions.edit'), edit_organisation_path, class: 'edit'        li          = link_to t('users.actions.new'), new_organisation_user_path, class: 'add' - -    / FIXME ref #2007 -    - if false -      li -        = link_to t('rule_parameter_sets.actions.new'), new_organisation_rule_parameter_set_path, class: 'add' diff --git a/app/views/rule_parameter_sets/_column_fields.html.slim b/app/views/rule_parameter_sets/_column_fields.html.slim deleted file mode 100644 index 176318765..000000000 --- a/app/views/rule_parameter_sets/_column_fields.html.slim +++ /dev/null @@ -1,13 +0,0 @@ -td -td = t("activerecord.attributes.#{object_name}.#{column}") -- suffix = "column_#{column}_object_#{object_name}" -td = f.check_box "unique_#{suffix}".to_sym, class: 'special' - -- if RuleParameterSet.validable_column_type(object_name, column) == :string -  td -    = f.select "pattern_#{suffix}".to_sym, options_for_select([[t("rule_parameter_sets.labels.free_char"), "0"], [t("rule_parameter_sets.labels.num_char"), "1"], [t("rule_parameter_sets.labels.alpha_char"), "2"], [t("rule_parameter_sets.labels.upper_char"), "3"], [t("rule_parameter_sets.labels.lower_char"), "4"]]) -- else -  td = t('rule_parameter_sets.labels.num_char') - -td = f.number_field "min_size_#{suffix}".to_sym, class: 'special' -td = f.number_field "max_size_#{suffix}".to_sym, class: 'special' diff --git a/app/views/rule_parameter_sets/_form.html.slim b/app/views/rule_parameter_sets/_form.html.slim deleted file mode 100644 index b93caae58..000000000 --- a/app/views/rule_parameter_sets/_form.html.slim +++ /dev/null @@ -1,73 +0,0 @@ -= semantic_form_for [ :organisation, @rule_parameter_set] do |form| -  = form.inputs do -    = form.input :name -    = form.input :inter_stop_area_distance_min, as: :number -    = form.input :parent_stop_area_distance_max, as: :number -    = form.input :stop_areas_area -    = form.input :inter_access_point_distance_min, as: :number -    = form.input :inter_connection_link_distance_max, as: :number -    = form.input :walk_default_speed_max, as: :number -    = form.input :walk_occasional_traveller_speed_max, as: :number -    = form.input :walk_frequent_traveller_speed_max, as: :number -    = form.input :walk_mobility_restricted_traveller_speed_max, as: :number - -    = form.input :inter_access_link_distance_max, as: :number -    = form.input :inter_stop_duration_max, as: :number -    = form.input :facility_stop_area_distance_max, as: :number - -    = form.input :check_lines_in_groups, as: :boolean -    = form.input :check_line_routes, as: :boolean -    = form.input :check_stop_parent, as: :boolean -    = form.input :check_connection_link_on_physical, as: :boolean -    = form.input :check_allowed_transport_modes, as: :boolean - -    table.table.table-striped.table-condensed -      thead -      	tr -          th = t("transport_modes.name") - -          - RuleParameterSet.mode_attribute_prefixes.each do |prefix| -            - if prefix == "allowed_transport" -              - hidden = (@rule_parameter_set.check_allowed_transport_modes == "1") ? "" : 'display:none;' -              th.allowed style="#{hidden}" -                = RuleParameterSet.human_attribute_name(prefix) -            - else -              th = RuleParameterSet.human_attribute_name(prefix) - -      tbody -        / To be removed, see #1936 -        - Chouette::Line.transport_mode.values.each do |mode| -          tr -            == render partial: "mode_fields", :locals => { f: form, mode: mode } - -    = t("rule_parameter_sets.labels.columns_restrictions") - -    table.table.table-bordered.table-condensed -      - RuleParameterSet.validable_object_names.each do |object_name| -        thead -          tr -            th -              = form.check_box "check_#{object_name}".to_sym, class: 'special' -              = t("activerecord.models.#{object_name}.one") - -        		th = RuleParameterSet.human_attribute_name("attribute") -        		th = RuleParameterSet.human_attribute_name("unique") -        		th = RuleParameterSet.human_attribute_name("string_type") -        		th = RuleParameterSet.human_attribute_name("min_size") -        		th = RuleParameterSet.human_attribute_name("max_size") - -        tbody -          - RuleParameterSet.validable_columns[object_name].each do |col| -            tr class="columns_for_#{object_name.pluralize}" -              == render partial: "column_fields", :locals => { f: form, object_name: object_name, column: col } - -  = form.actions do -    = form.action :submit, as: :button -    = form.action :cancel, as: :link - -javascript: -	$(function() { -    $( "#rule_parameter_set_check_allowed_transport_modes").change( function() { -      $(".allowed").toggle(); -    }); -  }); diff --git a/app/views/rule_parameter_sets/_mode_fields.html.slim b/app/views/rule_parameter_sets/_mode_fields.html.slim deleted file mode 100644 index 848e065f3..000000000 --- a/app/views/rule_parameter_sets/_mode_fields.html.slim +++ /dev/null @@ -1,9 +0,0 @@ -td = t("transport_modes.label.#{mode}") - -- RuleParameterSet.mode_attribute_prefixes.each do |prefix| -  - if prefix == "allowed_transport" -    - hidden = (@rule_parameter_set.check_allowed_transport_modes == "1") ? "" : 'display: none;' -    td.allowed style="#{hidden}" -      = f.check_box "#{prefix}_mode_#{mode}".to_sym, class: 'special' -  - else -    td = f.number_field "#{prefix}_mode_#{mode}".to_sym, class: 'special'
\ No newline at end of file diff --git a/app/views/rule_parameter_sets/_mode_selection.html.slim b/app/views/rule_parameter_sets/_mode_selection.html.slim deleted file mode 100644 index b9afd10b6..000000000 --- a/app/views/rule_parameter_sets/_mode_selection.html.slim +++ /dev/null @@ -1,4 +0,0 @@ -/ select.undescribed_modes -/   - Chouette::TransportMode.all.map { |m| m.name.downcase}.each do |mode| -/     option value="#{mode}" -/       = t("transport_modes.label.#{mode}")
\ No newline at end of file diff --git a/app/views/rule_parameter_sets/_rule_parameter_set.html.slim b/app/views/rule_parameter_sets/_rule_parameter_set.html.slim deleted file mode 100644 index 5603d2b80..000000000 --- a/app/views/rule_parameter_sets/_rule_parameter_set.html.slim +++ /dev/null @@ -1,14 +0,0 @@ -#index_item.panel.panel-default.rule_parameter_set -  .panel-heading -    .panel-title.clearfix -      span.pull-right -        = link_to edit_organisation_rule_parameter_set_path( rule_parameter_set), class: 'btn btn-default btn-sm' do -          span.fa.fa-pencil -         -        - if rule_parameter_set.organisation.rule_parameter_sets.size > 1 -          = link_to organisation_rule_parameter_set_path( rule_parameter_set), method: :delete, data: { confirm: t('rule_parameter_sets.actions.destroy_confirm') }, class: 'btn btn-danger btn-sm' do -            span.fa.fa-trash-o - -      h5 -        = link_to( organisation_rule_parameter_set_path( rule_parameter_set), class: 'preview', title: "#{RuleParameterSet.model_name.human.capitalize} #{rule_parameter_set.name}") do -          span.name = truncate(rule_parameter_set.name, length: 20)
\ No newline at end of file diff --git a/app/views/rule_parameter_sets/_transport_mode_parameter_set_fields.html.slim b/app/views/rule_parameter_sets/_transport_mode_parameter_set_fields.html.slim deleted file mode 100644 index ede7e2b75..000000000 --- a/app/views/rule_parameter_sets/_transport_mode_parameter_set_fields.html.slim +++ /dev/null @@ -1,9 +0,0 @@ -= f.inputs class: 'transport_mode_parameter_sets nested-fields' do -  = f.input :transport_mode, as: :select, collection: transport_mode_label_pairs, include_blank: false, label: "transport_mode", wrapper_html: { class: 'fl1' } -  = f.input :inter_stop_area_distance_min, as: :number, label: "inter_stop_area_distance_min", wrapper_html: { class: 'fl1' } -  = f.input :inter_stop_area_distance_max, as: :number, label: "inter_stop_area_distance_max", wrapper_html: { class: 'fl2' } -  = f.input :speed_min, as: :number, label: "speed_min", wrapper_html: { class: 'fl2' } -  = f.input :speed_max, as: :number, label: "speed_max", wrapper_html: { class: 'fl2' } -  = f.input :inter_stop_duration_variation_max, as: :number, label: "inter_stop_duration_variation_max", wrapper_html: { class: 'fl2' } -   -  = link_to_remove_association t('actions.destroy'), f diff --git a/app/views/rule_parameter_sets/edit.html.slim b/app/views/rule_parameter_sets/edit.html.slim deleted file mode 100644 index b49b02cf6..000000000 --- a/app/views/rule_parameter_sets/edit.html.slim +++ /dev/null @@ -1,3 +0,0 @@ -= title_tag t('rule_parameter_sets.edit.title', rule_parameter_set: @rule_parameter_set.name ) - -== render 'form'
\ No newline at end of file diff --git a/app/views/rule_parameter_sets/index.html.slim b/app/views/rule_parameter_sets/index.html.slim deleted file mode 100644 index 6be57d68e..000000000 --- a/app/views/rule_parameter_sets/index.html.slim +++ /dev/null @@ -1,7 +0,0 @@ -= title_tag t('rule_parameter_sets.index.title') - -= paginated_content(@rule_parameter_sets) - -- content_for :sidebar do -  ul.actions -    li = link_to t('rule_parameter_sets.actions.new'), new_organisation_rule_parameter_set_path, class: 'add'
\ No newline at end of file diff --git a/app/views/rule_parameter_sets/mode.js.slim b/app/views/rule_parameter_sets/mode.js.slim deleted file mode 100644 index 392446a7c..000000000 --- a/app/views/rule_parameter_sets/mode.js.slim +++ /dev/null @@ -1,9 +0,0 @@ -| if ( $("#specific_parameters_#{@mode}").length == 0 ) { -|   - form_content = "" -|   - semantic_form_for [@referential, @rule_parameter_set] do |form| -|     - form_content += render(partial: 'mode_fields', locals: { mode: @mode, f: form }) -|   $('#added_mode_parameter_set').before("#{escape_javascript(form_content).html_safe}"); -| } else { -|   $("#_destroy_mode_#{@mode}").attr( "value", false); -|   $("#specific_parameters_#{@mode}").toggle(); -| }
\ No newline at end of file diff --git a/app/views/rule_parameter_sets/new.html.slim b/app/views/rule_parameter_sets/new.html.slim deleted file mode 100644 index c4e4c5b4d..000000000 --- a/app/views/rule_parameter_sets/new.html.slim +++ /dev/null @@ -1,3 +0,0 @@ -= title_tag t('rule_parameter_sets.new.title') - -== render 'form'
\ No newline at end of file diff --git a/app/views/rule_parameter_sets/show.html.slim b/app/views/rule_parameter_sets/show.html.slim deleted file mode 100644 index 6adfeab89..000000000 --- a/app/views/rule_parameter_sets/show.html.slim +++ /dev/null @@ -1,143 +0,0 @@ -= title_tag t('rule_parameter_sets.show.title', :rule_parameter_set => @rule_parameter_set.name ) - -.rule_parameter_set_show -  .summary -    p -      label = "#{RuleParameterSet.human_attribute_name('stop_areas_area')} : " -      = @rule_parameter_set.stop_areas_area - -    .attributes_group -      span.title = t(".min_distance") - -      .columns -        .two_columns -          label = "#{t('.inter_stop_area_distance_min')} : " -          span.value = @rule_parameter_set.inter_stop_area_distance_min - -        .two_columns -          label = "#{t('.inter_access_point_distance_min')} : " -          span.value = @rule_parameter_set.inter_access_point_distance_min - -    .attributes_group -      span.title = t(".max_distance") - -      .columns -        .two_columns -          label = "#{t('.parent_stop_area_distance_max')} : " -          span.value = @rule_parameter_set.parent_stop_area_distance_max - -        .two_columns -          label = "#{t('.inter_connection_link_distance_max')} : " -          span.value = @rule_parameter_set.inter_connection_link_distance_max - -      .columns -        .two_columns -          label = "#{t('.inter_access_link_distance_max')} : " -          span.value = @rule_parameter_set.inter_access_link_distance_max - -        .two_columns -          label = "#{t('.facility_stop_area_distance_max')} : " -          span.value = @rule_parameter_set.facility_stop_area_distance_max - -    .attributes_group -      span.title = t(".walk_speed") - -      .columns -        .four_columns -          label = "#{t('.walk_default_speed_max')} : " -          span.value = @rule_parameter_set.walk_default_speed_max - -        .four_columns -          label = "#{t('.walk_occasional_traveller_speed_max')} : " -          span.value = @rule_parameter_set.walk_occasional_traveller_speed_max - -        .four_columns -          label = "#{t('.walk_frequent_traveller_speed_max')} : " -          span.value = @rule_parameter_set.walk_frequent_traveller_speed_max - -        .four_columns -          label = "#{t('.walk_mobility_restricted_traveller_speed_max')} : " -          span.value = @rule_parameter_set.walk_mobility_restricted_traveller_speed_max - -    p -      label = "#{t('.inter_stop_duration_max')} :" -      = @rule_parameter_set.inter_stop_duration_max - -    p -      label = "#{RuleParameterSet.human_attribute_name('check_lines_in_groups')} : " -      = boolean_value(@rule_parameter_set.check_lines_in_groups) - -    p -      label = "#{RuleParameterSet.human_attribute_name('check_line_routes')} : " -      = boolean_value(@rule_parameter_set.check_line_routes) - -    p -      label = "#{RuleParameterSet.human_attribute_name('check_stop_parent')} : " -      = boolean_value(@rule_parameter_set.check_stop_parent) - -    p -      label = "#{RuleParameterSet.human_attribute_name('check_connection_link_on_physical')} : " -      = boolean_value(@rule_parameter_set.check_connection_link_on_physical) - -    p -      label = "#{RuleParameterSet.human_attribute_name('check_allowed_transport_modes')} : " -      = boolean_value(@rule_parameter_set.check_allowed_transport_modes) - -    .rule_parameter_by_mode -      label -        = t(".rule_parameter_by_mode") -        = t(".modes_allowed") if @rule_parameter_set.check_allowed_transport_modes == "1" - -      table.table.table-striped.table-condensed -        tr -          th = t("transport_modes.name") - -          - RuleParameterSet.mode_attribute_prefixes.each do |prefix| -            - unless prefix == "allowed_transport" -              th = RuleParameterSet.human_attribute_name(prefix) -        / To be removed, see #1936 -        - Chouette::Line.transport_mode.values.each do |mode| -          - if @rule_parameter_set.allowed(mode) -            tr -              td = t("transport_modes.label.#{mode}") - -              - RuleParameterSet.mode_attribute_prefixes.each do |prefix| -                - unless prefix == "allowed_transport" -                  td = @rule_parameter_set.send  "#{prefix}_mode_#{mode}" - -    .rule_parameter_by_object -      label = t("rule_parameter_sets.labels.columns_restrictions") - -      table.table.table-bordered.table-condensed -        - RuleParameterSet.validable_object_names.each do |object_name| -          - if @rule_parameter_set.selected(object_name) -            thead -              tr -                th = t("activerecord.models.#{object_name}.one") -                th = RuleParameterSet.human_attribute_name("attribute") -                th = RuleParameterSet.human_attribute_name("unique") -                th = RuleParameterSet.human_attribute_name("string_type") -                th = RuleParameterSet.human_attribute_name("min_size") -                th = RuleParameterSet.human_attribute_name("max_size") - -            tbody -              - RuleParameterSet.validable_columns[object_name].each do |col| -                - if @rule_parameter_set.selected_column(object_name,col) -                  tr -                    td -                    td = t("activerecord.attributes.#{object_name}.#{col}") -                    - suffix = "column_#{col}_object_#{object_name}" -                    td = unique(@rule_parameter_set.send  "unique_#{suffix}".to_sym) -                    td = pattern(@rule_parameter_set.send  "pattern_#{suffix}".to_sym) -                    td = @rule_parameter_set.send  "min_size_#{suffix}".to_sym -                    td = @rule_parameter_set.send  "max_size_#{suffix}".to_sym - -- content_for :sidebar do -  ul.actions -    li = link_to t('rule_parameter_sets.actions.new'), new_organisation_rule_parameter_set_path, class: 'add' - -    - if @rule_parameter_set.persisted? -      li = link_to t('rule_parameter_sets.actions.edit'), edit_organisation_rule_parameter_set_path( @rule_parameter_set), class: 'edit' - -      - if current_organisation.rule_parameter_sets.size > 1 -        li = link_to  t('rule_parameter_sets.actions.destroy'), organisation_rule_parameter_set_path( @rule_parameter_set), method: :delete, data: { confirm: t('rule_parameter_sets.actions.destroy_confirm') }, class: 'remove' diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb index 1c951317a..87bca0b45 100644 --- a/config/initializers/apartment.rb +++ b/config/initializers/apartment.rb @@ -24,7 +24,6 @@ Apartment.configure do |config|      'Organisation',      'User',      'Api::V1::ApiKey', -    'RuleParameterSet',      'StopAreaReferential',      'StopAreaReferentialMembership',      'StopAreaReferentialSync', diff --git a/config/locales/import_tasks.en.yml b/config/locales/import_tasks.en.yml index ad633e872..34f7e6998 100644 --- a/config/locales/import_tasks.en.yml +++ b/config/locales/import_tasks.en.yml @@ -30,7 +30,6 @@ en:          no_save: "No save"          resources: "File to import"          references_type: "Data to be imported" -        rule_parameter_set_id: "Rule parameter set for compliance check"          object_id_prefix: "Neptune Id prefix"          max_distance_for_commercial: "Max distance for commercial stop"          max_distance_for_connection_link: "Max distance for connection link" diff --git a/config/locales/import_tasks.fr.yml b/config/locales/import_tasks.fr.yml index 13e796520..002ca03cb 100644 --- a/config/locales/import_tasks.fr.yml +++ b/config/locales/import_tasks.fr.yml @@ -30,7 +30,6 @@ fr:          no_save: "Pas de sauvegarde"          resources: "Fichier à importer"          references_type: "Données à importer" -        rule_parameter_set_id: "Jeu de paramètres pour validation"          object_id_prefix: "Préfixe d'identifiants"          max_distance_for_commercial: "Distance max pour créer les zones"          max_distance_for_connection_link: "Distance max pour créer les correspondances" diff --git a/config/locales/imports.en.yml b/config/locales/imports.en.yml index 10434dd19..97574007c 100644 --- a/config/locales/imports.en.yml +++ b/config/locales/imports.en.yml @@ -19,7 +19,6 @@ en:      show:        report: "Report"        imported_file: "Original file" -      rule_parameter_set: "Rule parameter set"        compliance_check: "Validation report"        compliance_check_of: "Validation of import: "        import_of_validation: "Import of the validation" @@ -69,7 +68,6 @@ en:          creator: "Creator"          references_type: "Data to be imported"          no_save: "No save" -        rule_parameter_set_id: "Rule parameter set for compliance check"          object_id_prefix: "Neptune Id prefix"          max_distance_for_commercial: "Max distance for commercial stop"          max_distance_for_connection_link: "Max distance for connection link" diff --git a/config/locales/imports.fr.yml b/config/locales/imports.fr.yml index 099488a6b..59107cccb 100644 --- a/config/locales/imports.fr.yml +++ b/config/locales/imports.fr.yml @@ -19,7 +19,6 @@ fr:      show:        report: "Rapport"        imported_file: "Fichier source" -      rule_parameter_set: "Jeu de paramètres"        compliance_check: "Test de conformité"        compliance_check_of: "Validation de l'import : "        import_of_validation: "L'import de la validation" @@ -69,7 +68,6 @@ fr:          creator: "Opérateur"          no_save: "Pas de sauvegarde"          references_type: "Données à importer" -        rule_parameter_set_id: "Jeu de paramètres pour validation"          object_id_prefix: "Préfixe d'identifiants"          max_distance_for_commercial: "Distance max pour créer les zones"          max_distance_for_connection_link: "Distance max pour créer les correspondances" diff --git a/config/locales/organisations.en.yml b/config/locales/organisations.en.yml index a64920daf..cade312e1 100644 --- a/config/locales/organisations.en.yml +++ b/config/locales/organisations.en.yml @@ -8,7 +8,6 @@ en:        key_not_registered: "No key registered"      show:        users: "Users" -      rule_parameter_sets: "Rule parameter sets"    activerecord:      models:        organisation: diff --git a/config/locales/organisations.fr.yml b/config/locales/organisations.fr.yml index 50cb9f3be..756615285 100644 --- a/config/locales/organisations.fr.yml +++ b/config/locales/organisations.fr.yml @@ -8,7 +8,6 @@ fr:        key_not_registered: "Pas de clé"      show:        users: "Utilisateurs" -      rule_parameter_sets: "Jeux de paramètres"    activerecord:      models:        organisation: diff --git a/config/locales/referentials.en.yml b/config/locales/referentials.en.yml index a2c6fcf59..8420e9539 100644 --- a/config/locales/referentials.en.yml +++ b/config/locales/referentials.en.yml @@ -86,7 +86,6 @@ en:          imports: "Imports"          exports: "Exports"          compliance_checks: "Validations" -        rule_parameter_sets: "Rule parameters sets"          data_format_restrictions: "Data format constraint"          data_format: "Favorite format for export"          timebands: "Time bands" diff --git a/config/locales/referentials.fr.yml b/config/locales/referentials.fr.yml index e132c959d..ec7ed776d 100644 --- a/config/locales/referentials.fr.yml +++ b/config/locales/referentials.fr.yml @@ -86,7 +86,6 @@ fr:          imports: "Imports"          exports: "Exports"          compliance_checks: "Validations" -        rule_parameter_sets: "Jeux de paramètres"          data_format_restrictions: "Format d'export privilégié"          data_format: "Format d'export privilégié"          timebands: "Créneaux horaires" diff --git a/config/locales/rule_parameter_sets.en.yml b/config/locales/rule_parameter_sets.en.yml deleted file mode 100644 index 814e97f1d..000000000 --- a/config/locales/rule_parameter_sets.en.yml +++ /dev/null @@ -1,78 +0,0 @@ -en: -  rule_parameter_sets: -    actions: -      new: "Add a new parameter set" -      edit: "Edit this parameter set" -      index: "Rule parameter sets" -      destroy: "Remove this rule parameter set" -      destroy_confirm: "Are you sure you want destroy this rule parameter set ?" -    new: -      title: "Add a new parameter set" -    destroy: -      last_rps_protected: "Delete refused. Last rule parameter set in current referential can't be destroyed." -    edit: -      title: "Update parameter set %{rule_parameter_set}" -    form: -      add_mode_parameter_set: "Add mode specific parameter set" -    show: -      title: "Parameter Set %{rule_parameter_set}" -      max_distance: "Maximum distance between " -      min_distance: "Minimum distance between " -      walk_speed: "Maximum walk speed for travellers" -      inter_stop_area_distance_min: "2 stop areas having different parent" -      parent_stop_area_distance_max: "a stop area and its own parent" -      inter_access_point_distance_min: "2 access with different names on a same stop area" -      inter_connection_link_distance_max: "stop areas in a connection link" -      walk_default_speed_max: "a regular one" -      walk_occasional_traveller_speed_max: "an occasional one" -      walk_frequent_traveller_speed_max: "a frequent one" -      walk_mobility_restricted_traveller_speed_max: "a mobility restricted one" -      inter_access_link_distance_max: "an access point and a linked stop area" -      inter_stop_duration_max: "Maximum duration between the moment when a vehicle is arriving at a stop and the moment when the vehicle is leaving" -      facility_stop_area_distance_max: "a stop area and a facility" -      rule_parameter_by_mode: "Parameters by mode" -      modes_allowed: " (only for allowed ones)" -    index: -      title: "Parameter sets" -    labels: -      columns_restrictions: "Check model objects atributes" -      attribute: "attribute" -      free_char: "free" -      num_char: "number only" -      alpha_char: "character only" -      lower_char: "lowercase only" -      upper_char: "uppercase only" -  activerecord: -    models: -      rule_parameter_set:  "Parameter Set for Conformity Rules" -    attributes: -      rule_parameter_set: -        name: "Name" -        inter_stop_area_distance_min: "Minimum distance between 2 stop areas having different parent" -        parent_stop_area_distance_max: "Maximum distance between a stop area and its own parent" -        stop_areas_area: "Geographic stop area envelop" -        inter_access_point_distance_min: "Minimum distance between 2 access having different name for a commun stop area" -        inter_connection_link_distance_max: "Maximum distance between stop area departure and stop area arrival in a connection link" -        walk_default_speed_max: "Maximum walk speed for a regular traveller" -        walk_occasional_traveller_speed_max: "Maximum walk speed for an occasional traveller" -        walk_frequent_traveller_speed_max: "Maximum walk speed for a frequent traveller" -        walk_mobility_restricted_traveller_speed_max: "Maximum walk speed for a mobility restricted traveller" -        inter_access_link_distance_max: "Access link maximum distance" -        inter_stop_duration_max: "Maximum duration for a stopping time" -        facility_stop_area_distance_max: "Maximum distance between a stop area and a facility" -        inter_stop_area_distance_min: "Maximum distance between 2 stop areas" -        inter_stop_area_distance_max: "Maximum distance between 2 stop areas" -        speed_min: "Minimum speed" -        speed_max: "Maximum speed" -        inter_stop_duration_variation_max: "Maximum duration gap between 2 vehicle journeys and between 2 following stops" -        check_lines_in_groups: "check if each line belongs scrictly to one group of line" -        check_line_routes:  "check if each line have 1 route or 2 routes coupled" -        check_stop_parent:  "check if all physical stop areas are owned by a commercial stop point" -        check_connection_link_on_physical: "check if connection links connect only physical stops" -        check_allowed_transport_modes: "Check transport modes" -        allowed_transport: "Allowed" -        attribute: "attribute" -        unique: "uniqness" -        string_type: "allowed characters" -        min_size: "minimal size or value" -        max_size: "maximal  size or value" diff --git a/config/locales/rule_parameter_sets.fr.yml b/config/locales/rule_parameter_sets.fr.yml deleted file mode 100644 index fd5d75938..000000000 --- a/config/locales/rule_parameter_sets.fr.yml +++ /dev/null @@ -1,78 +0,0 @@ -fr: -  rule_parameter_sets: -    actions: -      new: "Ajouter un jeu de paramètres" -      edit: "Editer ce jeu de paramètres" -      index: "Jeux de paramètres" -      destroy: "Supprimer ce jeu de paramètres" -      destroy_confirm: "Etes vous sûr de supprimer ce jeu de paramètres ?" -    new: -      title: "Ajouter un jeu de paramètres" -    form: -      add_mode_parameter_set: "Ajouter les paramètres spécifiques à un mode" -    edit: -      title: "Editer le jeu de paramètres %{rule_parameter_set}" -    destroy: -      last_rps_protected: "Suppresion impossible. L'espace de données doit compter au minimum un jeu de paramètres." -    show: -      title: "Jeu de paramètres %{rule_parameter_set}" -      max_distance: "Distance maximum entre : " -      min_distance: "Distance minimum entre : " -      walk_speed: "Vitesse de marche maximum d'un voyageur : " -      inter_stop_area_distance_min: "2 arrêts n'ayant pas le même parent" -      parent_stop_area_distance_max: "un arrêt et son parent" -      inter_access_point_distance_min: "2 accès de noms différents pour un même arrêt" -      inter_connection_link_distance_max: "les arrêts en correspondance" -      walk_default_speed_max: "ordinaire" -      walk_occasional_traveller_speed_max: "occasionnel" -      walk_frequent_traveller_speed_max: "habituel" -      walk_mobility_restricted_traveller_speed_max: "à mobilité réduite" -      inter_access_link_distance_max: "liaison accès - arrêt" -      facility_stop_area_distance_max: "un arrêt et un équipement" -      inter_stop_duration_max: "Durée maximum de stationnement à un arrêt" -      rule_parameter_by_mode: "Jeu de paramètres pour un mode de transport" -      modes_allowed: " (uniquement pour les modes autorisés)" -    index: -      title: "Jeux de paramètres" -    labels: -      columns_restrictions: "Contôles sur les attributs des objets du modèle" -      attribute: "attribut" -      free_char: "libre" -      num_char: "numérique" -      alpha_char: "alphabétique" -      lower_char: "minuscule" -      upper_char: "majuscule" -  activerecord: -    models: -      rule_parameter_set: "Jeu de paramètres pour le contrôle de qualité des données" -    attributes: -      rule_parameter_set: -        name: "Nom" -        inter_stop_area_distance_min: "Distance minimum entre 2 arrêts n'ayant pas le même parent" -        parent_stop_area_distance_max: "Distance maximum entre un arrêt et son parent" -        stop_areas_area: "Délimitation géographique des arrêts" -        inter_access_point_distance_min: "Distance minimum entre 2 accès de noms différents pour un même arrêt" -        inter_connection_link_distance_max: "Distance maximum entre les arrêts en correspondance" -        walk_default_speed_max: "Vitesse de marche maximum pour un voyageur ordinaire" -        walk_occasional_traveller_speed_max: "Vitesse de marche maximum pour un voyageur occasionnel" -        walk_frequent_traveller_speed_max: "Vitesse de marche maximum pour un voyageur habituel" -        walk_mobility_restricted_traveller_speed_max: "Vitesse de marche maximum pour un voyageur à mobilité réduite" -        inter_access_link_distance_max: "Distance maximum d'un liaison accès - arrêt" -        inter_stop_duration_max: "Durée maximum entre les horaires d'arrivée et de départ à un arrêt" -        facility_stop_area_distance_max: "Distance maximum entre un arrêt et un équipement" -        inter_stop_area_distance_min: "Distance minimum entre 2 arrêts" -        inter_stop_area_distance_max: "Distance maximum entre 2 arrêts" -        speed_min: "Vitesse minimum" -        speed_max: "Vitesse maximum" -        inter_stop_duration_variation_max: "Ecart maximum de durée entre 2 arrêts successifs pour les différentes courses" -        check_lines_in_groups: "Contrôler que chaque ligne appartient à un et un seul groupe de lignes" -        check_line_routes:  "Contrôler que chaque ligne a une séquence d'arrêt ou un couple A/R de séquences d'arrêts" -        check_stop_parent:  "Contrôler que chaque arrêt physique est rattaché à un arrêt commercial" -        check_connection_link_on_physical: "Contrôler que les correspondances ne relient que des arrêts physiques" -        check_allowed_transport_modes: "Contrôler les modes de transport des lignes et des courses" -        allowed_transport: "Autorisé" -        attribute: "attribut" -        unique: "unicité" -        string_type: "caractères autorisés" -        min_size: "taille ou valeur minimale" -        max_size: "taille ou valeur maximale" diff --git a/config/locales/validation_tasks.en.yml b/config/locales/validation_tasks.en.yml index 1b142e992..ebccae383 100644 --- a/config/locales/validation_tasks.en.yml +++ b/config/locales/validation_tasks.en.yml @@ -96,7 +96,6 @@ en:          status: "Status"          references_type: "subset"          no_save: "No save" -        rule_parameter_set_id: "Rule parameter set for compliance check"          object_id_prefix: "Neptune Id prefix"          max_distance_for_commercial: "Max distance for commercial stop"          max_distance_for_connection_link: "Max distance for connection link" diff --git a/config/locales/validation_tasks.fr.yml b/config/locales/validation_tasks.fr.yml index adbd9c99f..286807edd 100644 --- a/config/locales/validation_tasks.fr.yml +++ b/config/locales/validation_tasks.fr.yml @@ -96,7 +96,6 @@ fr:          status: "Status"          no_save: "Pas de sauvegarde"          references_type: "Sous ensemble" -        rule_parameter_set_id: "Jeu de paramètres pour validation"          object_id_prefix: "Préfixe d'identifiants"          max_distance_for_commercial: "Distance max pour créer les zones"          max_distance_for_connection_link: "Distance max pour créer les correspondances" diff --git a/config/locales/validations.en.yml b/config/locales/validations.en.yml index 5bac62ff3..aa63c2551 100644 --- a/config/locales/validations.en.yml +++ b/config/locales/validations.en.yml @@ -101,7 +101,6 @@ en:          status: "Status"          references_type: "subset"          no_save: "No save" -        rule_parameter_set_id: "Rule parameter set for compliance check"          object_id_prefix: "Neptune Id prefix"          max_distance_for_commercial: "Max distance for commercial stop"          max_distance_for_connection_link: "Max distance for connection link" diff --git a/config/locales/validations.fr.yml b/config/locales/validations.fr.yml index dc459bee0..d1c1355db 100644 --- a/config/locales/validations.fr.yml +++ b/config/locales/validations.fr.yml @@ -101,7 +101,6 @@ fr:          status: "Status"          no_save: "Pas de sauvegarde"          references_type: "Sous ensemble" -        rule_parameter_set_id: "Jeu de paramètres pour validation"          object_id_prefix: "Préfixe d'identifiants"          max_distance_for_commercial: "Distance max pour créer les zones"          max_distance_for_connection_link: "Distance max pour créer les correspondances" diff --git a/config/routes.rb b/config/routes.rb index 27db66c2c..8221dfe1a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -71,7 +71,6 @@ ChouetteIhm::Application.routes.draw do    resource :organisation, :only => [:show, :edit, :update] do      resources :users -    resources :rule_parameter_sets    end    resources :api_keys, :only => [:edit, :update, :new, :create, :destroy] diff --git a/db/migrate/20150218175300_set_organisation_id_to_rps.rb b/db/migrate/20150218175300_set_organisation_id_to_rps.rb deleted file mode 100644 index 024f5938e..000000000 --- a/db/migrate/20150218175300_set_organisation_id_to_rps.rb +++ /dev/null @@ -1,13 +0,0 @@ -class SetOrganisationIdToRps < ActiveRecord::Migration -  def up -    RuleParameterSet.where(organisation_id: nil).update_all "name = concat(name, ' ', id)" - -    # RuleParameterSet.joins(...).update_all("organisation_id = referentials.organisation_id") -    # fails (see https://github.com/rails/arel/pull/294) -    execute "UPDATE rule_parameter_sets SET organisation_id = referentials.organisation_id FROM referentials WHERE referentials.id = rule_parameter_sets.referential_id;" -  end - -  def down -    RuleParameterSet.update_all organisation_id: nil -  end -end diff --git a/db/migrate/20150219175300_insert_default_organisation.rb b/db/migrate/20150219175300_insert_default_organisation.rb index c8e97b562..2734893f5 100644 --- a/db/migrate/20150219175300_insert_default_organisation.rb +++ b/db/migrate/20150219175300_insert_default_organisation.rb @@ -1,10 +1,8 @@  class InsertDefaultOrganisation < ActiveRecord::Migration    class Organisation  < ActiveRecord::Base      attr_accessor :name - -    has_many :rule_parameter_sets, :dependent => :destroy    end -   +    def up      organisation = Organisation.find_or_create_by!(:name => "Chouette")      Referential.where(  :organisation_id => nil).each do |r| @@ -13,10 +11,6 @@ class InsertDefaultOrganisation < ActiveRecord::Migration      User.where(  :organisation_id => nil).each do |r|        r.update_attributes :organisation_id => organisation.id      end -    Organisation.all.each do |organisation| -      RuleParameterSet.default_for_all_modes( organisation).save if organisation.rule_parameter_sets.empty? -    end -    end    def down diff --git a/db/migrate/20171114102438_drop_table_rule_parameter_sets.rb b/db/migrate/20171114102438_drop_table_rule_parameter_sets.rb new file mode 100644 index 000000000..55dfd32df --- /dev/null +++ b/db/migrate/20171114102438_drop_table_rule_parameter_sets.rb @@ -0,0 +1,5 @@ +class DropTableRuleParameterSets < ActiveRecord::Migration +  def change +    drop_table :rule_parameter_sets +  end +end diff --git a/db/schema.rb b/db/schema.rb index a992eb32b..af6a51f7a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@  #  # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171113101005) do +ActiveRecord::Schema.define(version: 20171114102438) do    # These are extensions that must be enabled in order to support this database    enable_extension "plpgsql" @@ -408,9 +408,9 @@ ActiveRecord::Schema.define(version: 20171113101005) do      t.string   "type"      t.integer  "parent_id",             limit: 8      t.string   "parent_type" +    t.datetime "notified_parent_at"      t.integer  "current_step",                    default: 0      t.integer  "total_steps",                     default: 0 -    t.datetime "notified_parent_at"      t.string   "creator"    end @@ -491,8 +491,7 @@ ActiveRecord::Schema.define(version: 20171113101005) do      t.string   "name"      t.datetime "created_at"      t.datetime "updated_at" -    t.integer  "sync_interval",   default: 1 -    t.string   "objectid_format" +    t.integer  "sync_interval", default: 1    end    create_table "lines", id: :bigserial, force: :cascade do |t| @@ -636,7 +635,6 @@ ActiveRecord::Schema.define(version: 20171113101005) do      t.integer  "created_from_id",          limit: 8      t.boolean  "ready",                              default: false      t.integer  "referential_suite_id",     limit: 8 -    t.string   "objectid_format"    end    add_index "referentials", ["created_from_id"], name: "index_referentials_on_created_from_id", using: :btree @@ -682,14 +680,6 @@ ActiveRecord::Schema.define(version: 20171113101005) do      t.integer "line_id",      limit: 8    end -  create_table "rule_parameter_sets", id: :bigserial, force: :cascade do |t| -    t.text     "parameters" -    t.string   "name" -    t.datetime "created_at" -    t.datetime "updated_at" -    t.integer  "organisation_id", limit: 8 -  end -    create_table "stop_area_referential_memberships", id: :bigserial, force: :cascade do |t|      t.integer "organisation_id",          limit: 8      t.integer "stop_area_referential_id", limit: 8 @@ -722,7 +712,6 @@ ActiveRecord::Schema.define(version: 20171113101005) do      t.string   "name"      t.datetime "created_at"      t.datetime "updated_at" -    t.string   "objectid_format"    end    create_table "stop_areas", id: :bigserial, force: :cascade do |t| @@ -961,7 +950,6 @@ ActiveRecord::Schema.define(version: 20171113101005) do      t.integer  "line_referential_id",      limit: 8      t.integer  "stop_area_referential_id", limit: 8      t.integer  "output_id",                limit: 8 -    t.string   "objectid_format"    end    add_index "workbenches", ["line_referential_id"], name: "index_workbenches_on_line_referential_id", using: :btree diff --git a/spec/controllers/rule_parameter_sets_controller_spec.rb b/spec/controllers/rule_parameter_sets_controller_spec.rb deleted file mode 100644 index 0f57855b7..000000000 --- a/spec/controllers/rule_parameter_sets_controller_spec.rb +++ /dev/null @@ -1,36 +0,0 @@ -# require 'spec_helper' - -# describe RuleParameterSetsController, :type => :controller do -#   login_user -#   let(:mode){"air"} - -  # shared_examples_for "organisation dependant" do -  #   it "assigns rule_parameter_set.organisation as current organisation" do -  #     expect(assigns[:organisation]).to eq(assigns[:organisation].rule_parameter_sets[0].organisation) -  #   end -  # end - -  # describe "GET /index" do -  #   before(:each) do -  #     get :index -  #   end -  #   it "should assign rule_parameter_sets to organisation rule_parameter_sets" do -  #     expect(assigns[:rule_parameter_sets].size).to eq(assigns[:rule_parameter_sets][0].organisation.rule_parameter_sets.size) -  #     assigns[:rule_parameter_sets].each do |rps| -  #       expect(rps.organisation.id).to eq(assigns[:rule_parameter_sets][0].organisation.id) -  #     end -  #   end -  # end - -  # describe "GET /new" do -  #   before(:each) do -  #     get :new -  #   end -  #   it_behaves_like "organisation dependant" -  #   it "should assign rule_parameter_set with default params" do -  #     RuleParameterSet.default_params.each do |k,v| -  #       expect(assigns[:rule_parameter_set].send( k )).to eq(v) -  #     end -  #   end -  # end -# end diff --git a/spec/factories/rule_parameter_sets.rb b/spec/factories/rule_parameter_sets.rb deleted file mode 100644 index e20fff8ce..000000000 --- a/spec/factories/rule_parameter_sets.rb +++ /dev/null @@ -1,9 +0,0 @@ -FactoryGirl.define do -  factory :rule_parameter_set do -    sequence(:name) { |n| "Test #{n}" } -    association :organisation -    after(:create) do |rsp| -      rsp.parameters = RuleParameterSet.default_for_all_modes( rsp.organisation).parameters -    end -  end -end diff --git a/spec/models/rule_parameter_set_spec.rb b/spec/models/rule_parameter_set_spec.rb deleted file mode 100644 index 71ab0cddd..000000000 --- a/spec/models/rule_parameter_set_spec.rb +++ /dev/null @@ -1,49 +0,0 @@ -# require 'spec_helper' - -# describe RuleParameterSet, :type => :model do - -#   describe ".mode_of_mode_attribute" do -#     it "should retreive attribute name" do -#       expect(subject.class.attribute_of_mode_attribute("dummy1_mode_dummy2")).to eq("dummy1") -#     end -#     it "should retreive mode" do -#       expect(subject.class.mode_of_mode_attribute("dummy1_mode_dummy2")).to eq("dummy2") -#     end -#   end - -#   RuleParameterSet.mode_attribute_prefixes.each do |prefix| -#     RuleParameterSet.all_modes.map do |mode| -#       "#{prefix}_mode_#{mode}".tap do |attribute| -#         describe "##{attribute}=" do -#           it "should store value on parameters hash" do -#             subject.send( "#{attribute}=".to_sym, 1234) -#             expect(subject.send( attribute.to_sym)).to eq(1234) -#             expect(subject.parameters["mode_#{mode}"][ prefix]).to eq(1234) -#           end -#         end -#         it { is_expected.to allow_mass_assignment_of attribute.to_sym} -#       end -#     end -#   end - -#   RuleParameterSet.general_attributes.each do |attribute| -#     describe "##{attribute}=" do -#       it "should store value on parameters hash" do -#         subject.send( "#{attribute}=".to_sym, 1234) -#         expect(subject.send( attribute.to_sym)).to eq(1234) -#         expect(subject.parameters[ attribute]).to eq(1234) -#       end -#     end -#     it { is_expected.to allow_mass_assignment_of attribute.to_sym} -#   end - -#   describe "#referential" do -#     it { is_expected.to validate_presence_of(:referential) } -#     it { is_expected.to allow_mass_assignment_of :referential_id } -#   end - -#   describe "#name" do -#     it { is_expected.to validate_presence_of(:name) } -#     it { is_expected.to allow_mass_assignment_of :name } -#   end -# end diff --git a/spec/views/rule_parameter_sets/new.html.erb_spec.rb b/spec/views/rule_parameter_sets/new.html.erb_spec.rb deleted file mode 100644 index 6f44311d5..000000000 --- a/spec/views/rule_parameter_sets/new.html.erb_spec.rb +++ /dev/null @@ -1,27 +0,0 @@ -require 'spec_helper' - -describe "/rule_parameter_sets/new", :type => :view do - -  assign_organisation -  let!(:organisation) { create(:organisation) } -  let!(:rule_parameter_set) { assign :rule_parameter_set, build( :rule_parameter_set, :organisation => organisation) } - -  describe "form" do - -    xit "should render input for name" do -      render -      expect(rendered).to have_selector("form") do -        with_selector "input[type=text][name=?]", rule_parameter_set.name -      end -    end -    xit "should render input div for added_mode_parameter_set" do -      render -      expect(rendered).to have_selector("form") do -        with_selector "#added_mode_parameter_set" -      end -    end - -  end - -end - | 
