diff options
15 files changed, 0 insertions, 431 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/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/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/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/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 - |