From 3e8d95ac8168205ac9526fb8663459d691d09c30 Mon Sep 17 00:00:00 2001 From: Zog Date: Tue, 29 May 2018 10:18:16 +0200 Subject: Refs #6433; Fix specs --- app/assets/stylesheets/partials/base.sass | 19 ----- .../api/v1/connection_links_controller.rb | 12 --- .../autocomplete_timebands_controller.rb | 23 ------ .../connection_link_areas_controller.rb | 28 ------- app/controllers/connection_links_controller.rb | 59 -------------- .../referential_stop_areas_controller.rb | 1 - app/controllers/timebands_controller.rb | 14 ---- .../vehicle_journey_frequencies_controller.rb | 26 ------ app/helpers/application_helper.rb | 4 - app/helpers/connection_links_helper.rb | 8 -- app/helpers/timebands_helper.rb | 2 - app/inputs/search_timeband_input.rb | 44 ---------- app/models/chouette/journey_frequency.rb | 35 -------- app/models/chouette/timeband.rb | 28 ------- app/models/referential.rb | 3 - app/views/autocomplete_timebands/index.rabl | 8 -- .../connection_links/_connection_links.html.slim | 10 --- app/views/connection_links/_form.html.slim | 21 ----- app/views/connection_links/edit.html.slim | 3 - app/views/connection_links/index.html.slim | 24 ------ app/views/connection_links/index.js.slim | 1 - app/views/connection_links/new.html.slim | 3 - app/views/connection_links/select_areas.html.slim | 11 --- app/views/connection_links/show.html.slim | 94 ---------------------- app/views/connection_links/show.kml.slim | 16 ---- app/views/help/toc.textile | 2 - .../import_tasks/_fields_gtfs_import.html.slim | 1 - app/views/shared/_header.html.slim | 4 - app/views/timebands/_form.html.slim | 9 --- app/views/timebands/_sidebar.html.slim | 9 --- app/views/timebands/edit.html.slim | 4 - app/views/timebands/index.html.slim | 23 ------ app/views/timebands/new.html.slim | 4 - app/views/timebands/show.html.slim | 9 --- .../_form_footer.html.slim | 4 - .../_form_vehicle_journey_at_stops.html.slim | 44 ---------- .../_journey_frequency_fields.html.slim | 16 ---- .../_show_journey_frequencies.html.slim | 21 ----- .../_show_sidebar.html.slim | 15 ---- .../_show_vehicle_journey_at_stops.html.slim | 22 ----- .../_vehicle_journey_at_stop_fields.html.slim | 23 ------ .../_vehicle_journeys_matrix.html.slim | 11 --- .../vehicle_journey_frequencies/edit.html.slim | 3 - app/views/vehicle_journey_frequencies/edit.js.slim | 10 --- .../vehicle_journey_frequencies/new.html.slim | 3 - app/views/vehicle_journey_frequencies/new.js.slim | 13 --- .../select_journey_pattern.js.slim | 1 - .../vehicle_journey_frequencies/show.html.slim | 3 - config/breadcrumbs.rb | 10 --- config/locales/export_tasks.en.yml | 2 - config/locales/export_tasks.fr.yml | 2 - config/locales/exports.en.yml | 1 - config/locales/exports.fr.yml | 1 - config/locales/imports.en.yml | 1 - config/locales/imports.fr.yml | 1 - config/locales/journey_frequencies.en.yml | 13 --- config/locales/journey_frequencies.fr.yml | 13 --- config/locales/ninoxe.en.yml | 9 +-- config/locales/ninoxe.fr.yml | 10 +-- config/locales/referentials.en.yml | 1 - config/locales/referentials.fr.yml | 1 - config/locales/timebands.en.yml | 28 ------- config/locales/timebands.fr.yml | 28 ------- config/locales/validation_tasks.en.yml | 2 - config/locales/validation_tasks.fr.yml | 2 - config/locales/vehicle_journeys.en.yml | 2 - config/routes.rb | 3 - db/migrate/20170307155042_set_updated_at.rb | 2 +- .../20180330124436_add_metadata_to_other_models.rb | 1 - db/migrate/20180528125333_spring_cleanup.rb | 5 ++ spec/factories/chouette_journey_frequency.rb | 38 --------- spec/factories/chouette_timeband.rb | 17 ---- spec/features/timebands_spec.rb | 62 -------------- spec/models/chouette/journey_frequency_spec.rb | 47 ----------- spec/models/chouette/timeband_spec.rb | 19 ----- spec/models/gtfs_import_spec.rb | 9 --- spec/views/connection_links/edit.html.erb_spec.rb | 24 ------ spec/views/connection_links/index.html.erb_spec.rb | 27 ------- spec/views/connection_links/new.html.erb_spec.rb | 17 ---- spec/views/connection_links/show.html.slim_spec.rb | 32 -------- spec/views/timebands/edit.html.erb_spec.rb | 24 ------ spec/views/timebands/index.html.erb_spec.rb | 20 ----- spec/views/timebands/new.html.erb_spec.rb | 18 ----- spec/views/timebands/show.html.erb_spec.rb | 24 ------ 84 files changed, 9 insertions(+), 1258 deletions(-) delete mode 100644 app/assets/stylesheets/partials/base.sass delete mode 100644 app/controllers/api/v1/connection_links_controller.rb delete mode 100644 app/controllers/autocomplete_timebands_controller.rb delete mode 100644 app/controllers/connection_link_areas_controller.rb delete mode 100644 app/controllers/connection_links_controller.rb delete mode 100644 app/controllers/timebands_controller.rb delete mode 100644 app/controllers/vehicle_journey_frequencies_controller.rb delete mode 100644 app/helpers/connection_links_helper.rb delete mode 100644 app/helpers/timebands_helper.rb delete mode 100644 app/inputs/search_timeband_input.rb delete mode 100644 app/models/chouette/journey_frequency.rb delete mode 100644 app/models/chouette/timeband.rb delete mode 100644 app/views/autocomplete_timebands/index.rabl delete mode 100644 app/views/connection_links/_connection_links.html.slim delete mode 100644 app/views/connection_links/_form.html.slim delete mode 100644 app/views/connection_links/edit.html.slim delete mode 100644 app/views/connection_links/index.html.slim delete mode 100644 app/views/connection_links/index.js.slim delete mode 100644 app/views/connection_links/new.html.slim delete mode 100644 app/views/connection_links/select_areas.html.slim delete mode 100644 app/views/connection_links/show.html.slim delete mode 100644 app/views/connection_links/show.kml.slim delete mode 100644 app/views/timebands/_form.html.slim delete mode 100644 app/views/timebands/_sidebar.html.slim delete mode 100644 app/views/timebands/edit.html.slim delete mode 100644 app/views/timebands/index.html.slim delete mode 100644 app/views/timebands/new.html.slim delete mode 100644 app/views/timebands/show.html.slim delete mode 100644 app/views/vehicle_journey_frequencies/_form_footer.html.slim delete mode 100644 app/views/vehicle_journey_frequencies/_form_vehicle_journey_at_stops.html.slim delete mode 100644 app/views/vehicle_journey_frequencies/_journey_frequency_fields.html.slim delete mode 100644 app/views/vehicle_journey_frequencies/_show_journey_frequencies.html.slim delete mode 100644 app/views/vehicle_journey_frequencies/_show_sidebar.html.slim delete mode 100644 app/views/vehicle_journey_frequencies/_show_vehicle_journey_at_stops.html.slim delete mode 100644 app/views/vehicle_journey_frequencies/_vehicle_journey_at_stop_fields.html.slim delete mode 100644 app/views/vehicle_journey_frequencies/_vehicle_journeys_matrix.html.slim delete mode 100644 app/views/vehicle_journey_frequencies/edit.html.slim delete mode 100644 app/views/vehicle_journey_frequencies/edit.js.slim delete mode 100644 app/views/vehicle_journey_frequencies/new.html.slim delete mode 100644 app/views/vehicle_journey_frequencies/new.js.slim delete mode 100644 app/views/vehicle_journey_frequencies/select_journey_pattern.js.slim delete mode 100644 app/views/vehicle_journey_frequencies/show.html.slim delete mode 100644 config/locales/journey_frequencies.en.yml delete mode 100644 config/locales/journey_frequencies.fr.yml delete mode 100644 config/locales/timebands.en.yml delete mode 100644 config/locales/timebands.fr.yml create mode 100644 db/migrate/20180528125333_spring_cleanup.rb delete mode 100644 spec/factories/chouette_journey_frequency.rb delete mode 100644 spec/factories/chouette_timeband.rb delete mode 100644 spec/features/timebands_spec.rb delete mode 100644 spec/models/chouette/journey_frequency_spec.rb delete mode 100644 spec/models/chouette/timeband_spec.rb delete mode 100644 spec/views/connection_links/edit.html.erb_spec.rb delete mode 100644 spec/views/connection_links/index.html.erb_spec.rb delete mode 100644 spec/views/connection_links/new.html.erb_spec.rb delete mode 100644 spec/views/connection_links/show.html.slim_spec.rb delete mode 100644 spec/views/timebands/edit.html.erb_spec.rb delete mode 100644 spec/views/timebands/index.html.erb_spec.rb delete mode 100644 spec/views/timebands/new.html.erb_spec.rb delete mode 100644 spec/views/timebands/show.html.erb_spec.rb diff --git a/app/assets/stylesheets/partials/base.sass b/app/assets/stylesheets/partials/base.sass deleted file mode 100644 index 50a50457b..000000000 --- a/app/assets/stylesheets/partials/base.sass +++ /dev/null @@ -1,19 +0,0 @@ -.formtastic.timeband - .time_select - .fragments - .fragments-group - padding-left: 0 - - legend.label - position: relative - width: auto - display: block - width: 25% - float: left - border: none - - label - position: relative - width: auto - font-size: 125% - padding: .2em .6em .3em \ No newline at end of file diff --git a/app/controllers/api/v1/connection_links_controller.rb b/app/controllers/api/v1/connection_links_controller.rb deleted file mode 100644 index c5cf39812..000000000 --- a/app/controllers/api/v1/connection_links_controller.rb +++ /dev/null @@ -1,12 +0,0 @@ -class Api::V1::ConnectionLinksController < Api::V1::ChouetteController - - defaults :resource_class => Chouette::ConnectionLink, :finder => :find_by_objectid! - -protected - - def collection - @connection_links ||= ( @referential ? @referential.connection_links.search(params[:q]).result(:distinct => true) : []) - end - -end - diff --git a/app/controllers/autocomplete_timebands_controller.rb b/app/controllers/autocomplete_timebands_controller.rb deleted file mode 100644 index af041c33e..000000000 --- a/app/controllers/autocomplete_timebands_controller.rb +++ /dev/null @@ -1,23 +0,0 @@ -class AutocompleteTimebandsController < ChouetteController - respond_to :json, :only => [:index] - - include ReferentialSupport - - protected - - def select_timebands - if params[:route_id] - referential.timebands.joins( vehicle_journeys: :route).where( "routes.id IN (#{params[:route_id]})") - else - referential.timebands - end - end - - def referential_timebands - @referential_timebands ||= select_timebands - end - - def collection - @timebands = referential_timebands.select{ |p| p.fullname =~ /#{params[:q]}/i } - end -end diff --git a/app/controllers/connection_link_areas_controller.rb b/app/controllers/connection_link_areas_controller.rb deleted file mode 100644 index 981a7639e..000000000 --- a/app/controllers/connection_link_areas_controller.rb +++ /dev/null @@ -1,28 +0,0 @@ -class ConnectionLinkAreasController < ChouetteController - include ReferentialSupport - - respond_to :json, :only => :index - - def index - respond_to do |format| - format.json { render :json => areas_maps } - end - end - - def areas_maps - areas.collect do |area| - { :id => area.id.to_s, - :name => area.name, - :country_code => area.country_code, - :zip_code => area.zip_code || "", - :city_name => area.city_name || "", - :area_type => t("area_types.label.#{area.area_type.underscore}") - } - end - end - - def areas - referential.connection_links.find(params[:connection_link_id]).possible_areas.select{ |p| p.name =~ /#{params[:q]}/i } - end - -end diff --git a/app/controllers/connection_links_controller.rb b/app/controllers/connection_links_controller.rb deleted file mode 100644 index a7f9758e8..000000000 --- a/app/controllers/connection_links_controller.rb +++ /dev/null @@ -1,59 +0,0 @@ -class ConnectionLinksController < ChouetteController - include ReferentialSupport - defaults :resource_class => Chouette::ConnectionLink - - belongs_to :referential do - belongs_to :departure, :parent_class => Chouette::StopArea, :optional => true - belongs_to :arrival, :parent_class => Chouette::StopArea, :optional => true - end - - respond_to :html, :xml, :json - respond_to :kml, :only => :show - respond_to :js, :only => :index - - include PolicyChecker - - def index - index! do |format| - format.html { - if collection.out_of_bounds? - redirect_to params.merge(:page => 1) - end - } - end - end - - def show - show! - end - - def select_areas - @connection_link = connection_link - @departure = connection_link.departure - @arrival = connection_link.arrival - end - - protected - - alias_method :connection_link, :resource - - def collection - @q = referential.connection_links.search(params[:q]) - @connection_links ||= @q.result(:distinct => true).order(:name).paginate(:page => params[:page]) - end - - def resource_url(connection_link = nil) - referential_connection_link_path(referential, connection_link || resource) - end - - def collection_url - referential_connection_links_path(referential) - end - - private - - def connection_link_params - params.require(:connection_link).permit( :connection_link_type,:departure_id, :arrival_id, :objectid, :object_version, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs ) - end - -end diff --git a/app/controllers/referential_stop_areas_controller.rb b/app/controllers/referential_stop_areas_controller.rb index fa09bb773..a5fd15fcb 100644 --- a/app/controllers/referential_stop_areas_controller.rb +++ b/app/controllers/referential_stop_areas_controller.rb @@ -6,7 +6,6 @@ class ReferentialStopAreasController < ChouetteController belongs_to :referential do belongs_to :line, :parent_class => Chouette::Line, :optional => true, :polymorphic => true belongs_to :network, :parent_class => Chouette::Network, :optional => true, :polymorphic => true - belongs_to :connection_link, :parent_class => Chouette::ConnectionLink, :optional => true, :polymorphic => true end respond_to :html, :kml, :xml, :json diff --git a/app/controllers/timebands_controller.rb b/app/controllers/timebands_controller.rb deleted file mode 100644 index 937283b0e..000000000 --- a/app/controllers/timebands_controller.rb +++ /dev/null @@ -1,14 +0,0 @@ -class TimebandsController < ChouetteController - include ReferentialSupport - - defaults :resource_class => Chouette::Timeband - - respond_to :html - - belongs_to :referential - - private - def timeband_params - params.require(:timeband).permit( :name, :start_time, :end_time ) - end -end diff --git a/app/controllers/vehicle_journey_frequencies_controller.rb b/app/controllers/vehicle_journey_frequencies_controller.rb deleted file mode 100644 index 6e12c0247..000000000 --- a/app/controllers/vehicle_journey_frequencies_controller.rb +++ /dev/null @@ -1,26 +0,0 @@ -class VehicleJourneyFrequenciesController < VehicleJourneysController - - defaults resource_class: Chouette::VehicleJourneyFrequency - - def new - new! do - vehicle_journey.journey_frequencies.build - end - end - - private - - def vehicle_journey_frequency_params - params.require(:vehicle_journey_frequency).permit( { footnote_ids: [] } , :journey_pattern_id, :number, :published_journey_name, - :published_journey_identifier, :comment, :transport_mode, - :mobility_restricted_suitability, :flexible_service, - :facility, :vehicle_type_identifier, :objectid, :time_table_tokens, - { date: [ :hour, :minute ] }, :button, :referential_id, :line_id, - :route_id, :id, { vehicle_journey_at_stops_attributes: [ :arrival_time, - :id, :_destroy, - :stop_point_id, - :departure_time] }, - { journey_frequencies_attributes: [ :id, :_destroy, :scheduled_headway_interval, :first_departure_time, - :last_departure_time, :exact_time, :timeband_id ] } ) - end -end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7a3f7e719..97caed7fb 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -115,12 +115,8 @@ module ApplicationHelper "access_points_links" when path.include?("/stop_areas") "stop_areas" - when path.include?("/connection_links") - "connection_links" when path.include?("/time_tables") "time_tables" - when path.include?("/timebands") - "timebands" when path.include?("/import_tasks") "imports" when path.include?("/exports") diff --git a/app/helpers/connection_links_helper.rb b/app/helpers/connection_links_helper.rb deleted file mode 100644 index d9c201028..000000000 --- a/app/helpers/connection_links_helper.rb +++ /dev/null @@ -1,8 +0,0 @@ -module ConnectionLinksHelper - - def connection_link_type_label_pairs - Chouette::ConnectionLink - .connection_link_types - .zip_map { |type| t("connection_link_types.label.#{type}") } - end -end diff --git a/app/helpers/timebands_helper.rb b/app/helpers/timebands_helper.rb deleted file mode 100644 index 51251e46f..000000000 --- a/app/helpers/timebands_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module TimebandsHelper -end diff --git a/app/inputs/search_timeband_input.rb b/app/inputs/search_timeband_input.rb deleted file mode 100644 index bad262ef2..000000000 --- a/app/inputs/search_timeband_input.rb +++ /dev/null @@ -1,44 +0,0 @@ -class SearchTimebandInput < Formtastic::Inputs::SearchInput - - def search - if options[:json] - template.content_tag( :script, - ("$(document).ready(function() { - var timeband_formatter = function(item){ - return '
  • ' + item.name + '
    • '; - }; - $('##{dom_id}').tokenInput('#{options[:json]}', { - zindex: 1061, - crossDomain: false, - tokenLimit: 1, - minChars: 2, - propertyToSearch: 'name', - preventDuplicates: true, - hintText: '#{options[:hint_text]}', - noResultsText: '#{options[:no_result_text]}', - searchingText: '#{options[:searching_text]}', - resultsFormatter: timeband_formatter, - tokenFormatter: timeband_formatter, - }); - });").html_safe) - end - end - - def to_html - input_wrapping do - label_html << - builder.search_field(method, input_html_options) << - search - end - end - - def input_html_options - super.merge({ - required: nil, - autofocus: nil, - class: 'token-input', - :'data-model-name' => object.class.model_name.human - }) - end - -end diff --git a/app/models/chouette/journey_frequency.rb b/app/models/chouette/journey_frequency.rb deleted file mode 100644 index 1b4efe96e..000000000 --- a/app/models/chouette/journey_frequency.rb +++ /dev/null @@ -1,35 +0,0 @@ -module Chouette - class JourneyFrequencyValidator < ActiveModel::Validator - def validate(record) - timeband = record.timeband - if timeband - first_departure_time = record.first_departure_time.utc.strftime( "%H%M%S%N" ) - last_departure_time = record.last_departure_time.utc.strftime( "%H%M%S%N" ) - timeband_start_time = timeband.start_time.utc.strftime( "%H%M%S%N" ) - timeband_end_time = timeband.end_time.utc.strftime( "%H%M%S%N" ) - - unless first_departure_time.between? timeband_start_time, timeband_end_time - record.errors[:first_departure_time] << I18n.t('activerecord.errors.models.journey_frequency.start_must_be_after_timeband') - end - unless last_departure_time.between? timeband_start_time, timeband_end_time - record.errors[:last_departure_time] << I18n.t('activerecord.errors.models.journey_frequency.end_must_be_before_timeband') - end - end - if record.first_departure_time == record.last_departure_time - record.errors[:last_departure_time] << I18n.t('activerecord.errors.models.journey_frequency.end_must_be_different_from_first') - end - if record.scheduled_headway_interval.blank? || (record.scheduled_headway_interval.strftime( "%H%M%S%N" ) == Time.current.midnight.strftime( "%H%M%S%N" )) - record.errors[:scheduled_headway_interval] << I18n.t('activerecord.errors.models.journey_frequency.scheduled_headway_interval_greater_than_zero') - end - end - end - - class JourneyFrequency < ActiveRecord - belongs_to :vehicle_journey_frequency, foreign_key: 'vehicle_journey_id' - belongs_to :timeband - validates :first_departure_time, presence: true - validates :last_departure_time, presence: true - validates :scheduled_headway_interval, presence: true - validates_with Chouette::JourneyFrequencyValidator - end -end \ No newline at end of file diff --git a/app/models/chouette/timeband.rb b/app/models/chouette/timeband.rb deleted file mode 100644 index 38260b755..000000000 --- a/app/models/chouette/timeband.rb +++ /dev/null @@ -1,28 +0,0 @@ -module Chouette - class TimebandValidator < ActiveModel::Validator - def validate(record) - if record.end_time <= record.start_time - record.errors[:end_time] << I18n.t('activerecord.errors.models.timeband.start_must_be_before_end') - end - end - end - - class Timeband < Chouette::TridentActiveRecord - include ObjectidSupport - has_metadata - - validates :start_time, :end_time, presence: true - validates_with Chouette::TimebandValidator - - default_scope { order(:start_time) } - - def self.object_id_key - "Timeband" - end - - def fullname - fullname = "#{I18n.l(self.start_time, format: :hour)}-#{I18n.l(self.end_time, format: :hour)}" - "#{self.name} (#{fullname})" if self.name - end - end -end diff --git a/app/models/referential.rb b/app/models/referential.rb index 0c6e71d47..ea75274d0 100644 --- a/app/models/referential.rb +++ b/app/models/referential.rb @@ -192,9 +192,6 @@ class Referential < ApplicationModel Chouette::TimeTableDate.all end - def timebands - Chouette::Timeband.all - end def connection_links Chouette::ConnectionLink.all diff --git a/app/views/autocomplete_timebands/index.rabl b/app/views/autocomplete_timebands/index.rabl deleted file mode 100644 index 663b09285..000000000 --- a/app/views/autocomplete_timebands/index.rabl +++ /dev/null @@ -1,8 +0,0 @@ -collection @timebands - -node do |timeband| - { - id: timeband.id, - name: timeband.fullname - } -end diff --git a/app/views/connection_links/_connection_links.html.slim b/app/views/connection_links/_connection_links.html.slim deleted file mode 100644 index 8cf41a6c1..000000000 --- a/app/views/connection_links/_connection_links.html.slim +++ /dev/null @@ -1,10 +0,0 @@ -.page_info - span.search - = t("will_paginate.page_entries_info.search") - = page_entries_info @connection_links - -.connection_links.paginated_content - = paginated_content(@connection_links) - -.pagination - = will_paginate @connection_links, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer diff --git a/app/views/connection_links/_form.html.slim b/app/views/connection_links/_form.html.slim deleted file mode 100644 index a3774ec88..000000000 --- a/app/views/connection_links/_form.html.slim +++ /dev/null @@ -1,21 +0,0 @@ -= semantic_form_for [@referential, @connection_link] do |form| - = form.inputs do - = form.input :name - = form.input :connection_link_type, as: :select, collection: connection_link_type_label_pairs, include_blank: true - = form.input :comment - = form.input :link_distance, input_html: { title: t("formtastic.titles#{format_restriction_for_locales(@referential)}.connection_link.link_distance") } - = form.input :mobility_restricted_suitability, as: :select, :collection => [[t("true"), true], [t("false"), false]], include_blank: true - = form.input :stairs_availability, as: :select, :collection => [[t("true"), true], [t("false"), false]], include_blank: true - = form.input :lift_availability, as: :select, :collection => [[t("true"), true], [t("false"), false]], include_blank: true - - = form.input :objectid, :required => !@connection_link.new_record?, :input_html => { :title => t("formtastic.titles.connection_link.objectid")} - - = form.inputs :name => t('connection_links.show.durations') do - = form.input :default_duration, :as => :extended_time_picker, :size => 8, :step => :seconds, :label => @connection_link.human_attribute_name("default_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } - = form.input :frequent_traveller_duration, :as => :extended_time_picker, :size => 8, :step => :seconds, :include_seconds => true, :label => @connection_link.human_attribute_name("frequent_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } - = form.input :occasional_traveller_duration, :as => :extended_time_picker, :size => 8, :include_seconds => true, :label => @connection_link.human_attribute_name("occasional_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } - = form.input :mobility_restricted_traveller_duration, :as => :extended_time_picker,:size => 8, :include_seconds => true, :label => @connection_link.human_attribute_name("mobility_restricted_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } - - = form.actions do - = form.action :submit, as: :button - = form.action :cancel, as: :link diff --git a/app/views/connection_links/edit.html.slim b/app/views/connection_links/edit.html.slim deleted file mode 100644 index 08a6ddd36..000000000 --- a/app/views/connection_links/edit.html.slim +++ /dev/null @@ -1,3 +0,0 @@ -= title_tag t('connection_links.edit.title', :connection_link => @connection_link.name ) - -= render 'form' \ No newline at end of file diff --git a/app/views/connection_links/index.html.slim b/app/views/connection_links/index.html.slim deleted file mode 100644 index 7651ae340..000000000 --- a/app/views/connection_links/index.html.slim +++ /dev/null @@ -1,24 +0,0 @@ -= title_tag t('connection_links.index.title') - -= search_form_for @q, :url => referential_connection_links_path(@referential), remote: true, :html => {:method => :get, class: "form-inline", :id => "search", role: "form"} do |f| - .panel.panel-default - .panel-heading - .input-group.col-md-12 - = f.text_field :name_cont, :placeholder => "#{t('.name')}", class: 'form-control' - .input-group-btn - button.btn.btn-default type="submit" - i.fa.fa-search - - / - / - / - / - -#connection_links - = render 'connection_links' - -- content_for :sidebar do - ul.actions - li - - if policy(Chouette::ConnectionLink).create? && @referential.organisation == current_organisation - = link_to t('connection_links.actions.new'), new_referential_connection_link_path(@referential), class: 'add' diff --git a/app/views/connection_links/index.js.slim b/app/views/connection_links/index.js.slim deleted file mode 100644 index 2be61610e..000000000 --- a/app/views/connection_links/index.js.slim +++ /dev/null @@ -1 +0,0 @@ -| $('#connection_links').html("#{escape_javascript(render('connection_links'))}"); \ No newline at end of file diff --git a/app/views/connection_links/new.html.slim b/app/views/connection_links/new.html.slim deleted file mode 100644 index c4acdf622..000000000 --- a/app/views/connection_links/new.html.slim +++ /dev/null @@ -1,3 +0,0 @@ -= title_tag t('connection_links.new.title') - -= render 'form' \ No newline at end of file diff --git a/app/views/connection_links/select_areas.html.slim b/app/views/connection_links/select_areas.html.slim deleted file mode 100644 index 85da40eb7..000000000 --- a/app/views/connection_links/select_areas.html.slim +++ /dev/null @@ -1,11 +0,0 @@ -= title_tag t('connection_links.select_areas.title', connection_link: @connection_link.name) - -= semantic_form_for [@referential, @connection_link] do |form| - div - = form.inputs do - = form.input :departure_id, :as => :search_stop_area, :json => referential_autocomplete_stop_areas_path(@referential, :format => :json)+"?filter=itl_excluded", :tokenLimit => 1, :hint_text => t('search_hint'), :no_result_text => t('no_result_text'),:searching_text => t('searching_term'), :input_html => { :"data-pre" => Rabl::Renderer.new('autocomplete_stop_areas/show', [@departure].compact, :view_path => 'app/views', :format => :json, :scope => self).render } - = form.input :arrival_id, :as => :search_stop_area, :json => referential_autocomplete_stop_areas_path(@referential, :format => :json)+"?filter=itl_excluded", :tokenLimit => 1, :hint_text => t('search_hint'), :no_result_text => t('no_result_text'),:searching_text => t('searching_term'), :input_html => { :"data-pre" => Rabl::Renderer.new('autocomplete_stop_areas/show', [@arrival].compact, :view_path => 'app/views', :format => :json, :scope => self).render } - - = form.actions do - = form.action :submit, as: :button - = form.action :cancel, as: :link \ No newline at end of file diff --git a/app/views/connection_links/show.html.slim b/app/views/connection_links/show.html.slim deleted file mode 100644 index ca6593131..000000000 --- a/app/views/connection_links/show.html.slim +++ /dev/null @@ -1,94 +0,0 @@ -= title_tag t('connection_links.show.title', :connection_link => @connection_link.name) - -.connection_link_show - .summary - p - label = "#{@connection_link.human_attribute_name(:departure)} : " - - if @connection_link.departure.present? - = link_to @connection_link.departure.name, [@referential, @connection_link.departure] - - else - = @connection_link.human_attribute_name("undefined") - - p - label = "#{@connection_link.human_attribute_name(:arrival)} : " - - if @connection_link.arrival.present? - = link_to @connection_link.arrival.name, [@referential, @connection_link.arrival] - - else - = @connection_link.human_attribute_name("undefined") - - p - label = "#{@connection_link.human_attribute_name('connection_link_type')} : " - - if @connection_link.connection_link_type.blank? - = t("unknown") - - else - = t("connection_link_types.label.#{@connection_link.connection_link_type}") - - p - label = "#{@connection_link.human_attribute_name('comment')} : " - = @connection_link.comment - - p - label = "#{@connection_link.human_attribute_name('link_distance')} : " - = @connection_link.link_distance - - p - label = t('connection_links.show.durations') - - p - label.duration = "#{@connection_link.human_attribute_name('default_duration')} : " - - if @connection_link.default_duration.present? - = @connection_link.default_duration.strftime('%Hh %Mm %Ss') - - p - label.duration = "#{@connection_link.human_attribute_name('frequent_traveller_duration')} : " - - if @connection_link.frequent_traveller_duration.present? - = @connection_link.frequent_traveller_duration.strftime('%Hh %Mm %Ss') - - p - label.duration = "#{@connection_link.human_attribute_name('occasional_traveller_duration')} : " - - if @connection_link.occasional_traveller_duration.present? - = @connection_link.occasional_traveller_duration.strftime('%Hh %Mm %Ss') - - p - label.duration = "#{@connection_link.human_attribute_name('mobility_restricted_traveller_duration')} : " - -if @connection_link.mobility_restricted_traveller_duration.present? - = @connection_link.mobility_restricted_traveller_duration.strftime('%Hh %Mm %Ss') - - p - label = "#{@connection_link.human_attribute_name('mobility_restricted_suitability')} : " - - if !@connection_link.mobility_restricted_suitability.nil? - = t((@connection_link.mobility_restricted_suitability == true).to_s) - - else - = t("unknown") - - p - label = "#{@connection_link.human_attribute_name('stairs_availability')} : " - - if !@connection_link.stairs_availability.nil? - = t((@connection_link.stairs_availability == true).to_s) - - else - = t("unknown") - - p - label = "#{@connection_link.human_attribute_name('lift_availability')} : " - - if !@connection_link.lift_availability.nil? - = t((@connection_link.lift_availability == true).to_s) - - else - = t("unknown") - -- content_for :sidebar do - ul.actions - - if policy(Chouette::ConnectionLink).create? && @referential.organisation == current_organisation - li - = link_to t('connection_links.actions.new'), new_referential_connection_link_path(@referential), class: 'add' - - if policy(@connection_link).edit? - li - = link_to t('connection_links.actions.edit'), edit_referential_connection_link_path(@referential, @connection_link), class: 'edit' - - if policy(@connection_link).destroy? - li - = link_to t('connection_links.actions.destroy'), referential_connection_link_path(@referential, @connection_link), :method => :delete, :data => {:confirm => t('connection_links.actions.destroy_confirm')}, class: 'remove' - - if policy(@connection_link).edit? - li - = link_to t('connection_links.actions.select_areas'), select_areas_referential_connection_link_path(@referential, @connection_link), class: 'select' - br - - = creation_tag(@connection_link) diff --git a/app/views/connection_links/show.kml.slim b/app/views/connection_links/show.kml.slim deleted file mode 100644 index 59169dba3..000000000 --- a/app/views/connection_links/show.kml.slim +++ /dev/null @@ -1,16 +0,0 @@ -doctype XML - -kml xmlns="http://www.opengis.net/kml/2.2" - document - - if @connection_link.geometry - placemark id="route_#{@connection_link.id}" - name = @connection_link.name - = @connection_link.geometry.kml_representation.html_safe - - placemark id="#{@connection_link.departure.id}" - departure true - = @connection_link.departure.geometry.kml_representation.html_safe - - placemark id="#{@connection_link.arrival.id}" - arrival true - = @connection_link.arrival.geometry.kml_representation.html_safe diff --git a/app/views/help/toc.textile b/app/views/help/toc.textile index 9772ca1b6..754a6ebb5 100644 --- a/app/views/help/toc.textile +++ b/app/views/help/toc.textile @@ -27,8 +27,6 @@ h3. Sommaire ## "Séquences d'arrêts":routes ## "Missions":journey_patterns ## "Courses et horaires":vehicle_journeys -## "Courses en fréquence":timebands.textile -## "Correspondances":connection_links ## "Calendrier":time_tables # Imports ## "Imports":imports diff --git a/app/views/import_tasks/_fields_gtfs_import.html.slim b/app/views/import_tasks/_fields_gtfs_import.html.slim index 8c2ef8ed8..a560b6878 100644 --- a/app/views/import_tasks/_fields_gtfs_import.html.slim +++ b/app/views/import_tasks/_fields_gtfs_import.html.slim @@ -3,4 +3,3 @@ = form.input :max_distance_for_commercial , as: :number , :input_html => { :title => t("formtastic.titles.import_task.max_distance_for_commercial"), :value => 0 } = form.input :ignore_last_word , as: :boolean , :input_html => { :title => t("formtastic.titles.import_task.ignore_last_word"), :value => false } = form.input :ignore_end_chars , as: :number , :input_html => { :title => t("formtastic.titles.import_task.ignore_end_chars"), :value => 0 } -= form.input :max_distance_for_connection_link , as: :number , :input_html => { :title => t("formtastic.titles.import_task.max_distance_for_connection_link"), :value => 0 } \ No newline at end of file diff --git a/app/views/shared/_header.html.slim b/app/views/shared/_header.html.slim index b59be2b08..a653e5cdf 100644 --- a/app/views/shared/_header.html.slim +++ b/app/views/shared/_header.html.slim @@ -81,10 +81,6 @@ nav.navbar.navbar-default.navbar-fixed-top role="navigation" span.badge.pull-right = @referential.time_tables.size = Referential.human_attribute_name("time_tables") - li - = link_to referential_timebands_path(@referential) do - span.badge.pull-right = @referential.timebands.size - = Referential.human_attribute_name("timebands") li = link_to Referential.human_attribute_name("exports"), referential_exports_path(@referential) li diff --git a/app/views/timebands/_form.html.slim b/app/views/timebands/_form.html.slim deleted file mode 100644 index 433d777dc..000000000 --- a/app/views/timebands/_form.html.slim +++ /dev/null @@ -1,9 +0,0 @@ -= semantic_form_for [@referential, @timeband] do |form| - = form.inputs do - = form.input :name - = form.input :start_time - = form.input :end_time - - = form.actions do - = form.action :submit, as: :button - = form.action :cancel, as: :link \ No newline at end of file diff --git a/app/views/timebands/_sidebar.html.slim b/app/views/timebands/_sidebar.html.slim deleted file mode 100644 index 07dcebdad..000000000 --- a/app/views/timebands/_sidebar.html.slim +++ /dev/null @@ -1,9 +0,0 @@ -- content_for :sidebar do - ul.actions - li = link_to t('timebands.actions.new'), new_referential_timeband_path(@referential), class: "add" - - - if @timeband - li - = link_to t('timebands.actions.edit'), edit_referential_timeband_path(@referential, @timeband), class: "edit" - li - = link_to t('timebands.actions.destroy'), referential_timeband_path(@referential, @timeband), :method => :delete, :data => {:confirm => t('timebands.actions.destroy_confirm')}, class: "remove" \ No newline at end of file diff --git a/app/views/timebands/edit.html.slim b/app/views/timebands/edit.html.slim deleted file mode 100644 index c70de82ef..000000000 --- a/app/views/timebands/edit.html.slim +++ /dev/null @@ -1,4 +0,0 @@ -- breadcrumb :timeband, @referential, @timeband -= title_tag t('timebands.edit.title', timeband: @timeband.name) - -= render 'form' diff --git a/app/views/timebands/index.html.slim b/app/views/timebands/index.html.slim deleted file mode 100644 index 6dcf348f9..000000000 --- a/app/views/timebands/index.html.slim +++ /dev/null @@ -1,23 +0,0 @@ -- breadcrumb :timebands, @referential -= title_tag t('timebands.index.title') - -- if @timebands.any? - table.table.table-striped.table-condensed - thead - tr - th = t('activerecord.attributes.timeband.name') - th = t('activerecord.attributes.timeband.start_time') - th = t('activerecord.attributes.timeband.end_time') - th - - tbody - - @timebands.each do |timeband| - tr - td = link_to timeband.name, referential_timeband_path(@referential, timeband) - td = l(timeband.start_time, format: :hour) - td = l(timeband.end_time, format: :hour) - td - = link_to '', edit_referential_timeband_path(@referential, timeband), class: "edit" - = link_to '', referential_timeband_path(@referential, timeband), :method => :delete, :data => {:confirm => t('timebands.actions.destroy_confirm')}, class: "remove" - -== render 'sidebar' diff --git a/app/views/timebands/new.html.slim b/app/views/timebands/new.html.slim deleted file mode 100644 index d9fc27823..000000000 --- a/app/views/timebands/new.html.slim +++ /dev/null @@ -1,4 +0,0 @@ -- breadcrumb :timebands, @referential -= title_tag t('timebands.new.title') - -== render 'form' diff --git a/app/views/timebands/show.html.slim b/app/views/timebands/show.html.slim deleted file mode 100644 index d45611c56..000000000 --- a/app/views/timebands/show.html.slim +++ /dev/null @@ -1,9 +0,0 @@ -- breadcrumb :timeband, @referential, @timeband -= title_tag t( 'timebands.show.title', timeband: @timeband.name ) - -.summary - p - label = "#{@timeband.name} : " - = "#{l(@timeband.start_time, format: :hour)} - #{l(@timeband.end_time, format: :hour)}" - -== render 'sidebar' diff --git a/app/views/vehicle_journey_frequencies/_form_footer.html.slim b/app/views/vehicle_journey_frequencies/_form_footer.html.slim deleted file mode 100644 index 922e867a8..000000000 --- a/app/views/vehicle_journey_frequencies/_form_footer.html.slim +++ /dev/null @@ -1,4 +0,0 @@ -- if vehicle_journey.new_record? - = javascript_include_tag new_referential_line_route_vehicle_journey_frequency_path(@referential, @line, @route, format: :js) -- else - = javascript_include_tag edit_referential_line_route_vehicle_journey_frequency_path(@referential, @line, @route, vehicle_journey, format: :js) \ No newline at end of file diff --git a/app/views/vehicle_journey_frequencies/_form_vehicle_journey_at_stops.html.slim b/app/views/vehicle_journey_frequencies/_form_vehicle_journey_at_stops.html.slim deleted file mode 100644 index 45b37dee9..000000000 --- a/app/views/vehicle_journey_frequencies/_form_vehicle_journey_at_stops.html.slim +++ /dev/null @@ -1,44 +0,0 @@ -li.input - = form.label vehicle_journey.human_attribute_name(:vehicle_journey_at_stop_ids), class: 'label' - - table.table-striped.ce-TimeBandFormTable - thead - tr - th = t('vehicle_journeys.form.stop_title') - th - th = t('vehicle_journeys.form.arrival') - th = t('vehicle_journeys.form.departure') - - tbody.journey_pattern_dependent_list - == render partial: 'vehicle_journey_at_stop_fields', collection: vehicle_journey.vehicle_journey_at_stops, as: :vehicle_journey_at_stop, locals: { vehicle_journey_at_stops_size: vehicle_journey.vehicle_journey_at_stops.size } - - tfoot - tr - td - td - td - = button_tag 'data-ce-action' => 'to_departures', class: 'ce-hide btn btn-primary' do - = t('vehicle_journeys.form.to_departures').html_safe - i.fa.fa-angle-double-right - td - = button_tag 'data-ce-action' => 'to_arrivals', class: 'ce-hide btn btn-primary' do - i.fa.fa-angle-double-left - = t('vehicle_journeys.form.to_arrivals').html_safe - -li.input - = form.label vehicle_journey.human_attribute_name(:journey_frequency_ids), class: 'label' - - ul.ce-FrequencyFormFields - li = t('activerecord.attributes.journey_frequency.timeband') - li = t('activerecord.attributes.journey_frequency.first_departure_time') - li = t('activerecord.attributes.journey_frequency.last_departure_time') - li = t('activerecord.attributes.journey_frequency.scheduled_headway_interval') - li - li - - - i = 0 - = form.semantic_fields_for :journey_frequencies do |journey_frequency| - == render 'journey_frequency_fields', f: journey_frequency, no_destroy: ((i += 1) == 1 ? true : false) - - .actions-add-fields - = link_to_add_association t('journey_frequencies.form.add_line'), form, :journey_frequencies, class: 'btn btn-primary' \ No newline at end of file diff --git a/app/views/vehicle_journey_frequencies/_journey_frequency_fields.html.slim b/app/views/vehicle_journey_frequencies/_journey_frequency_fields.html.slim deleted file mode 100644 index c649abd9b..000000000 --- a/app/views/vehicle_journey_frequencies/_journey_frequency_fields.html.slim +++ /dev/null @@ -1,16 +0,0 @@ -- no_destroy = false unless local_assigns[:no_destroy] - -.nested-fields - ul.ce-FrequencyFormFields - = f.input :timeband_id, as: :search_timeband, json: referential_autocomplete_timebands_path(@referential, format: :json), hint_text: t('search_hint'), no_result_text: t('no_result_text'), searching_text: t('searching_term'), label: false, input_html: { :"data-pre" => Rabl::Renderer.new( 'autocomplete_timebands/index', Chouette::Timeband.where(id: f.object.timeband_id), view_path: 'app/views', format: :json, scope: :self ).render } - = f.input :first_departure_time, label: false - = f.input :last_departure_time, label: false - = f.input :scheduled_headway_interval, label: false - = f.input :exact_time, label: t('activerecord.attributes.journey_frequency.exact_time') - - li - label.label - - - unless no_destroy - = link_to_remove_association f do - i.fa.fa-trash \ No newline at end of file diff --git a/app/views/vehicle_journey_frequencies/_show_journey_frequencies.html.slim b/app/views/vehicle_journey_frequencies/_show_journey_frequencies.html.slim deleted file mode 100644 index 4510f26f0..000000000 --- a/app/views/vehicle_journey_frequencies/_show_journey_frequencies.html.slim +++ /dev/null @@ -1,21 +0,0 @@ -h3 = t('vehicle_journeys.show.journey_frequencies') - -.journey_frequencies.content - table.table.table-hover.table-striped - thead - tr - th = t('activerecord.attributes.journey_frequency.timeband') - th = t('activerecord.attributes.journey_frequency.first_departure_time') - th = t('activerecord.attributes.journey_frequency.last_departure_time') - th = t('activerecord.attributes.journey_frequency.scheduled_headway_interval') - th = t('activerecord.attributes.journey_frequency.exact_time') - - tbody - - @vehicle_journey_frequency.journey_frequencies.each do |journey_frequency| - tr class="#{cycle :odd, :even}"" - td - = link_to journey_frequency.timeband.fullname, referential_timeband_path(@referential, journey_frequency.timeband) if journey_frequency.timeband - td = l(journey_frequency.first_departure_time, format: :hour) - td = l(journey_frequency.last_departure_time, format: :hour) - td = l(journey_frequency.scheduled_headway_interval, format: :hour) - td = ''.html_safe if journey_frequency.exact_time \ No newline at end of file diff --git a/app/views/vehicle_journey_frequencies/_show_sidebar.html.slim b/app/views/vehicle_journey_frequencies/_show_sidebar.html.slim deleted file mode 100644 index 61695ef86..000000000 --- a/app/views/vehicle_journey_frequencies/_show_sidebar.html.slim +++ /dev/null @@ -1,15 +0,0 @@ -- content_for :sidebar do - ul.actions - li - = link_to t('vehicle_journeys.actions.new'), new_referential_line_route_vehicle_journey_path(@referential, @line, @route), class: "add" - - li - = link_to t('vehicle_journeys.actions.new_frequency'), new_referential_line_route_vehicle_journey_frequency_path(@referential, @line, @route), class: "add" - - li - = link_to t('vehicle_journeys.actions.edit_frequency'), edit_referential_line_route_vehicle_journey_frequency_path(@referential, @line, @route, @vehicle_journey_frequency), class: "edit" - - li - = link_to t('vehicle_journeys.actions.destroy'), referential_line_route_vehicle_journey_frequency_path(@referential, @line, @route, @vehicle_journey_frequency), method: :delete, data: { confirm: t('vehicle_journeys.actions.destroy_confirm') }, class: "remove" - - = creation_tag(@vehicle_journey_frequency) \ No newline at end of file diff --git a/app/views/vehicle_journey_frequencies/_show_vehicle_journey_at_stops.html.slim b/app/views/vehicle_journey_frequencies/_show_vehicle_journey_at_stops.html.slim deleted file mode 100644 index 24517309c..000000000 --- a/app/views/vehicle_journey_frequencies/_show_vehicle_journey_at_stops.html.slim +++ /dev/null @@ -1,22 +0,0 @@ -.vehicle_journey_at_stops.content - table.table-striped.ce-TimeBandFormTable - thead - tr - th.stop.title = t('vehicle_journeys.show.stop_title') - th - th.hour.title = t('vehicle_journeys.show.arrival') - th.hour.title = t('vehicle_journeys.show.departure') - - tbody - - @vehicle_journey_frequency.vehicle_journey_at_stops.each do |vjas| - tr class="#{cycle :odd, :even}" - td = link_to vjas.stop_point.stop_area.name, [@referential, vjas.stop_point.stop_area] - td.ce-TimeBandFormTable-circleLine - span.ce-TimeBandFormTable-circle - span.ce-TimeBandFormTable-line - - td class="hour #{'missing' if vjas.arrival_time.nil?}" - = l(vjas.arrival_time, format: :hour) if vjas.arrival_time - - td class="hour #{'missing' if vjas.departure_time.nil?}" - = l(vjas.departure_time, format: :hour) if vjas.departure_time \ No newline at end of file diff --git a/app/views/vehicle_journey_frequencies/_vehicle_journey_at_stop_fields.html.slim b/app/views/vehicle_journey_frequencies/_vehicle_journey_at_stop_fields.html.slim deleted file mode 100644 index 6352cebdf..000000000 --- a/app/views/vehicle_journey_frequencies/_vehicle_journey_at_stop_fields.html.slim +++ /dev/null @@ -1,23 +0,0 @@ -- vjas = vehicle_journey_at_stop -- tab_counter_arrival = 2 * vehicle_journey_at_stop_counter + 100 -- tab_counter_departure = (vehicle_journey_at_stops_size * 2) + 2 * vehicle_journey_at_stop_counter + 100 - -tr class="time input optional #{'no_stop' if vjas._destroy} #{cycle :odd, :even}" - td - = {id: vjas.id, _destroy: (vjas._destroy ? 1 : 0), stop_point_id: vjas.stop_point_id, :'departure_time(3i)' => 1, :'departure_time(2i)' => 1, :'departure_time(1i)' => 1, :'arrival_time(3i)' => 1, :'arrival_time(2i)' => 1, :'arrival_time(1i)' => 2000}.map{ |k, v| "" }.join("\n").html_safe - - = vjas.stop_point.stop_area.name - - td.ce-TimeBandFormTable-circleLine - span.ce-TimeBandFormTable-circle - span.ce-TimeBandFormTable-line - - td class="arrival_time #{'missing' unless vjas.arrival_time} #{'invalid_position' if vjas.errors[:arrival_time].present?}" - = select_hour(vjas.arrival_time ? vjas.arrival_time.hour : 0, { prefix: 'vehicle_journey_frequency', field_name: "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][arrival_time(4i)]" }, class: 'hour', tabindex: tab_counter_arrival + 1) - - = select_minute(vjas.arrival_time ? vjas.arrival_time.min : 0, { prefix: 'vehicle_journey_frequency', field_name: "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][arrival_time(5i)]" }, class: 'minute', tabindex: tab_counter_arrival + 2) - - td class="departure_time #{'missing' unless vjas.departure_time} #{'invalid_position' if vjas.errors[:departure_time].present?}" - = select_hour(vjas.departure_time ? vjas.departure_time.hour : 0, { prefix: 'vehicle_journey_frequency', field_name: "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][departure_time(4i)]" }, class: 'hour', tabindex: tab_counter_departure + 1) - - = select_minute(vjas.departure_time ? vjas.departure_time.min : 0, { prefix: 'vehicle_journey_frequency', field_name: "vehicle_journey_at_stops_attributes[#{vehicle_journey_at_stop_counter}][departure_time(5i)]" }, class: 'minute', tabindex: tab_counter_departure + 2) \ No newline at end of file diff --git a/app/views/vehicle_journey_frequencies/_vehicle_journeys_matrix.html.slim b/app/views/vehicle_journey_frequencies/_vehicle_journeys_matrix.html.slim deleted file mode 100644 index be6e76e08..000000000 --- a/app/views/vehicle_journey_frequencies/_vehicle_journeys_matrix.html.slim +++ /dev/null @@ -1,11 +0,0 @@ -ul.ce-VehicleJourneyFrequenciesMatrix - - @vehicle_journeys.each do |vj| - li - ul - - vj.journey_frequencies.each do |jf| - - left, width = journey_frequency_percent(jf) - - li style="left:#{left};width:#{width};" data-style="primary" data-container="body" rel="popover" data-toggle="popover" data-title="#{link_to(vehicle_title(vj, jf), [@referential, @line, @route, vj] )} #{link_to(''.html_safe, send("edit_referential_line_route_vehicle_journey#{'_frequency' if vj.frequency?}_path", @referential, @line, @route, vj), class: "btn btn-default btn-sm" )}" data-placement= "top" data-content="#{render 'vehicle_journeys/show_popover', { vehicle_journey: vj }}" - - span.ce-VehicleJourneyFrequenciesMatrix-firstDepartureTime = l(jf.first_departure_time, format: :hour) - span.ce-VehicleJourneyFrequenciesMatrix-lastDepartureTime = l(jf.last_departure_time, format: :hour) \ No newline at end of file diff --git a/app/views/vehicle_journey_frequencies/edit.html.slim b/app/views/vehicle_journey_frequencies/edit.html.slim deleted file mode 100644 index af5f1d88e..000000000 --- a/app/views/vehicle_journey_frequencies/edit.html.slim +++ /dev/null @@ -1,3 +0,0 @@ -= title_tag edit_vehicle_title(@vehicle_journey_frequency) - -== render 'vehicle_journeys/form', vehicle_journey: @vehicle_journey_frequency, form_url: referential_line_route_vehicle_journey_frequency_path(@referential, @line, @route, id: @vehicle_journey_frequency) \ No newline at end of file diff --git a/app/views/vehicle_journey_frequencies/edit.js.slim b/app/views/vehicle_journey_frequencies/edit.js.slim deleted file mode 100644 index de74b80c7..000000000 --- a/app/views/vehicle_journey_frequencies/edit.js.slim +++ /dev/null @@ -1,10 +0,0 @@ -| $(document).ready(function() { -| $("#vehicle_journey_frequency_journey_pattern_id").change( -| function(){ -| var url = "#{select_journey_pattern_referential_line_route_vehicle_journey_path( @referential, @line, @route, @vehicle_journey_frequency)}?journey_pattern_id="+ -| $("#vehicle_journey_frequency_journey_pattern_input select option:selected").attr("value"); -| url += "&journey_category=frequency"; -| $.get(url); -| } -| ); -| }); \ No newline at end of file diff --git a/app/views/vehicle_journey_frequencies/new.html.slim b/app/views/vehicle_journey_frequencies/new.html.slim deleted file mode 100644 index 86a9d144c..000000000 --- a/app/views/vehicle_journey_frequencies/new.html.slim +++ /dev/null @@ -1,3 +0,0 @@ -= title_tag t('vehicle_journeys.new.title_frequency') - -== render 'vehicle_journeys/form', vehicle_journey: @vehicle_journey_frequency, form_url: referential_line_route_vehicle_journey_frequencies_path(@referential, @line, @route) \ No newline at end of file diff --git a/app/views/vehicle_journey_frequencies/new.js.slim b/app/views/vehicle_journey_frequencies/new.js.slim deleted file mode 100644 index f4d742f72..000000000 --- a/app/views/vehicle_journey_frequencies/new.js.slim +++ /dev/null @@ -1,13 +0,0 @@ -| $(document).ready(function() { -| $("#vehicle_journey_frequency_journey_pattern_id").change( -| function(){ -| var vehicle_journey_journey_pattern_id = $("#vehicle_journey_frequency_journey_pattern_input select option:selected").attr("value"); -| if (vehicle_journey_journey_pattern_id > 0) { -| var url = "#{referential_line_route_journey_patterns_path(@referential.id,@line.id,@route.id)}"; -| url = url + "/" + vehicle_journey_journey_pattern_id + -| "/new_vehicle_journey?journey_category=frequency"; -| $.get(url); -| } -| } -| ); -| }); \ No newline at end of file diff --git a/app/views/vehicle_journey_frequencies/select_journey_pattern.js.slim b/app/views/vehicle_journey_frequencies/select_journey_pattern.js.slim deleted file mode 100644 index 205fee59e..000000000 --- a/app/views/vehicle_journey_frequencies/select_journey_pattern.js.slim +++ /dev/null @@ -1 +0,0 @@ -| $('.journey_pattern_dependent_list').html("#{escape_javascript(render(partial: 'vehicle_journey_frequencies/vehicle_journey_at_stop_fields', collection: @vehicle_journey.vehicle_journey_at_stops, as: :vehicle_journey_at_stop, locals: { vehicle_journey_at_stops_size: @vehicle_journey.vehicle_journey_at_stops.size })).html_safe}"); \ No newline at end of file diff --git a/app/views/vehicle_journey_frequencies/show.html.slim b/app/views/vehicle_journey_frequencies/show.html.slim deleted file mode 100644 index 9701dbba9..000000000 --- a/app/views/vehicle_journey_frequencies/show.html.slim +++ /dev/null @@ -1,3 +0,0 @@ -== render 'vehicle_journeys/show_details', vehicle_journey: @vehicle_journey_frequency -== render 'show_journey_frequencies' -== render 'show_sidebar' diff --git a/config/breadcrumbs.rb b/config/breadcrumbs.rb index d2edb7d5e..76942d476 100644 --- a/config/breadcrumbs.rb +++ b/config/breadcrumbs.rb @@ -81,16 +81,6 @@ crumb :time_table do |referential, time_table| parent :time_tables, referential end -crumb :timebands do |referential| - link I18n.t('timebands.index.title'), referential_timebands_path(referential) - parent :referential, referential -end - -crumb :timeband do |referential, timeband| - link breadcrumb_name(timeband), referential_timeband_path(referential, timeband) - parent :timebands, referential -end - crumb :compliance_check_sets do |workbench| link I18n.t('compliance_check_sets.index.title'), workbench_compliance_check_sets_path(workbench) parent :workbench, workbench diff --git a/config/locales/export_tasks.en.yml b/config/locales/export_tasks.en.yml index fe0e32828..505cf688e 100644 --- a/config/locales/export_tasks.en.yml +++ b/config/locales/export_tasks.en.yml @@ -41,7 +41,6 @@ en: reference_ids: "Associated Data" 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" ignore_last_word: "ignore last word" ignore_end_chars: "ignore last chars" formtastic: @@ -54,6 +53,5 @@ en: dates: not_nul: "HUB Export interrupted. Start date and end date must be provided." max_distance_for_commercial: "Maximal distance to merge homonymous stops in commercial stop in meter" - max_distance_for_connection_link: "Maximal distance to link stops by connection link stop in meter" ignore_last_word: "ignore last word on stop name in homonymous detection (inappliable when just one word occurs)" ignore_end_chars: "ignore some chars at the end of stop names in homonymous detection" diff --git a/config/locales/export_tasks.fr.yml b/config/locales/export_tasks.fr.yml index 770384a21..268f9b2ce 100644 --- a/config/locales/export_tasks.fr.yml +++ b/config/locales/export_tasks.fr.yml @@ -41,7 +41,6 @@ fr: reference_ids: "Données incluses" 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" ignore_last_word: "ignorer le dernier mot" ignore_end_chars: "ignorer les n derniers caractères" formtastic: @@ -54,6 +53,5 @@ fr: dates: not_nul: "Export HUB interrompu. Les dates de début et de fin doivent êtres renseignées." max_distance_for_commercial: "Distance maximale entre deux arrêts homonymes pour créer les zones d'arrêt (en mètre)" - max_distance_for_connection_link: "Distance maximale entre deux arrêts pour créer les correspondances (en mètre)" ignore_last_word: "Ignorer le dernier mot pour détecter l'homonymie des noms d'arrêt (inapplicable quand le nom ne comporte qu'un mot)" ignore_end_chars: "Ignorer les n derniers caractères du nom de l'arrêt pour détecter l'homonymie" diff --git a/config/locales/exports.en.yml b/config/locales/exports.en.yml index de34e797c..9a4c65d41 100644 --- a/config/locales/exports.en.yml +++ b/config/locales/exports.en.yml @@ -81,7 +81,6 @@ en: no_save: "No save" 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" ignore_last_word: "ignore last word" ignore_end_chars: "ignore last chars" type: "Export type" diff --git a/config/locales/exports.fr.yml b/config/locales/exports.fr.yml index 62aae70cd..e3479b052 100644 --- a/config/locales/exports.fr.yml +++ b/config/locales/exports.fr.yml @@ -81,7 +81,6 @@ fr: references_type: "Données à exporter" 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" ignore_last_word: "ignorer le dernier mot" ignore_end_chars: "ignorer les n derniers caractères" type: "Type d'export" diff --git a/config/locales/imports.en.yml b/config/locales/imports.en.yml index 51939c1fb..32c93d19a 100644 --- a/config/locales/imports.en.yml +++ b/config/locales/imports.en.yml @@ -92,7 +92,6 @@ en: no_save: "No save" 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" ignore_last_word: "ignore last word" ignore_end_chars: "ignore last chars" referential: Referential diff --git a/config/locales/imports.fr.yml b/config/locales/imports.fr.yml index 219414e57..110155865 100644 --- a/config/locales/imports.fr.yml +++ b/config/locales/imports.fr.yml @@ -96,7 +96,6 @@ fr: references_type: "Données à importer" 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" ignore_last_word: "ignorer le dernier mot" ignore_end_chars: "ignorer les n derniers caractères" referential: Jeu de données diff --git a/config/locales/journey_frequencies.en.yml b/config/locales/journey_frequencies.en.yml deleted file mode 100644 index b6303c248..000000000 --- a/config/locales/journey_frequencies.en.yml +++ /dev/null @@ -1,13 +0,0 @@ -en: - journey_frequencies: - time_band: Time band - form: - add_line: Add a timeband - activerecord: - attributes: - journey_frequency: - first_departure_time: First departure - last_departure_time: Last departure - scheduled_headway_interval: Interval - exact_time: Exact? - timeband: Time bands diff --git a/config/locales/journey_frequencies.fr.yml b/config/locales/journey_frequencies.fr.yml deleted file mode 100644 index 7c5a25c73..000000000 --- a/config/locales/journey_frequencies.fr.yml +++ /dev/null @@ -1,13 +0,0 @@ -fr: - journey_frequencies: - time_band: Créneaux horaires - form: - add_line: Ajouter un créneau - activerecord: - attributes: - journey_frequency: - first_departure_time: Premier départ - last_departure_time: Dernier départ - scheduled_headway_interval: Intervalle - exact_time: Exact ? - timeband: Créneau horaire diff --git a/config/locales/ninoxe.en.yml b/config/locales/ninoxe.en.yml index 134ef4f66..c380c2fb6 100644 --- a/config/locales/ninoxe.en.yml +++ b/config/locales/ninoxe.en.yml @@ -8,16 +8,9 @@ en: invalid_object_id_type: invalid type, must be %{type} time_table_period: start_must_be_before_end: end date must be after start date - time_table_date: + time_table_date: attributes: date: taken: dupplicate date for this timetable vehicle_journey_at_stop: arrival_must_be_before_departure: arrival time must be before departure time - timeband: - start_must_be_before_end: end date must be after start date - journey_frequency: - start_must_be_after_timeband: the date of departure must be greater or equal to the time bands - end_must_be_before_timeband: the end date must be less than or equal to the time bands - end_must_be_different_from_first: the end date must be different from first date - scheduled_headway_interval_greater_than_zero: interval must be greater than 0 diff --git a/config/locales/ninoxe.fr.yml b/config/locales/ninoxe.fr.yml index 3a823465d..6e3e2c35e 100644 --- a/config/locales/ninoxe.fr.yml +++ b/config/locales/ninoxe.fr.yml @@ -8,16 +8,10 @@ fr: invalid_object_id_type: type invalide, %{type} attendu time_table_period: start_must_be_before_end: la date de fin doit être postérieure à la date de début - time_table_date: + time_table_date: attributes: date: taken: date déjà saisie pour ce calendrier vehicle_journey_at_stop: arrival_must_be_before_departure: "l'heure d'arrivée doit être antérieure à l'heure de départ" - timeband: - start_must_be_before_end: la date de fin doit être postérieure à la date de début - journey_frequency: - start_must_be_after_timeband: la date de départ doit être supérieure ou égal à la plage horaire - end_must_be_before_timeband: la date de fin doit être inférieur ou égal à la plage horaire - end_must_be_different_from_first: la date de fin doit être différent de la date de départ - scheduled_headway_interval_greater_than_zero: l'intervalle doit être supérieur à 0 + diff --git a/config/locales/referentials.en.yml b/config/locales/referentials.en.yml index 3caec8933..c37362cc7 100644 --- a/config/locales/referentials.en.yml +++ b/config/locales/referentials.en.yml @@ -101,7 +101,6 @@ en: compliance_checks: "Validations" data_format_restrictions: "Data format constraint" data_format: "Favorite format for export" - timebands: "Time bands" routing_constraint_zone: Routing constraint zone validity_period: "Inclusive validity period" updated_at: "Updated" diff --git a/config/locales/referentials.fr.yml b/config/locales/referentials.fr.yml index e932494ce..77fc3ba9d 100644 --- a/config/locales/referentials.fr.yml +++ b/config/locales/referentials.fr.yml @@ -101,7 +101,6 @@ fr: compliance_checks: "Validations" data_format_restrictions: "Format d'export privilégié" data_format: "Format d'export privilégié" - timebands: "Créneaux horaires" routing_constraint_zone: Zone de contrainte validity_period: "Période de validité englobante" updated_at: "Edité le" diff --git a/config/locales/timebands.en.yml b/config/locales/timebands.en.yml deleted file mode 100644 index 1ac68644d..000000000 --- a/config/locales/timebands.en.yml +++ /dev/null @@ -1,28 +0,0 @@ -en: - timebands: - actions: - new: "Add a time band" - edit: "Edit a time band" - destroy: "Delete a time band" - destroy_confirm: "Thank you to confirm the deletion of these time band." - new: - title: "Add a time band" - edit: - title: "Edit this time band %{timeband}" - show: - title: "Time band %{timeband}" - index: - title: "Time bands" - activerecord: - models: - timeband: - zero: "Time band" - one: "Time band" - other: "Time bands" - attributes: - timeband: - name: "Title" - start_time: "Start time" - end_time: "End time" - created_at: Created at - updated_at: Updated at diff --git a/config/locales/timebands.fr.yml b/config/locales/timebands.fr.yml deleted file mode 100644 index 9d401ef8a..000000000 --- a/config/locales/timebands.fr.yml +++ /dev/null @@ -1,28 +0,0 @@ -fr: - timebands: - actions: - new: "Ajouter un créneau horaire" - edit: "Editer ce créneau horaire" - destroy: "Supprimer ce créneau horaire" - destroy_confirm: "Merci de confirmer la suppression de ce créneau horaire." - new: - title: "Ajouter un créneau horaire" - edit: - title: "Editer le créneau horaire %{timeband}" - show: - title: "Créneau horaire %{timeband}" - index: - title: "Créneaux horaires" - activerecord: - models: - timeband: - zero: "créneau horaire" - one: "créneau horaire" - other: "créneaux horaires" - attributes: - timeband: - name: "Titre" - start_time: "Heure de début" - end_time: "Heure de fin" - created_at: "Créé le" - updated_at: "Edité le" diff --git a/config/locales/validation_tasks.en.yml b/config/locales/validation_tasks.en.yml index ebccae383..da9add988 100644 --- a/config/locales/validation_tasks.en.yml +++ b/config/locales/validation_tasks.en.yml @@ -98,13 +98,11 @@ en: no_save: "No save" 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" ignore_last_word: "ignore last word" ignore_end_chars: "ignore last chars" formtastic: titles: validation_task: max_distance_for_commercial: "Maximal distance to merge homonymous stops in commercial stop in meter" - max_distance_for_connection_link: "Maximal distance to link stops by connection link stop in meter" ignore_last_word: "ignore last word on stop name in homonymous detection (inappliable when just one word occurs)" ignore_end_chars: "ignore some chars at the end of stop names in homonymous detection" diff --git a/config/locales/validation_tasks.fr.yml b/config/locales/validation_tasks.fr.yml index 286807edd..7ae414400 100644 --- a/config/locales/validation_tasks.fr.yml +++ b/config/locales/validation_tasks.fr.yml @@ -98,13 +98,11 @@ fr: references_type: "Sous ensemble" 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" ignore_last_word: "ignorer le dernier mot" ignore_end_chars: "ignorer les n derniers caractères" formtastic: titles: validation_task: max_distance_for_commercial: "Distance maximale entre deux arrêts homonymes pour créer les zones d'arrêt (en mètre)" - max_distance_for_connection_link: "Distance maximale entre deux arrêts pour créer les correspondances (en mètre)" ignore_last_word: "Ignorer le dernier mot pour détecter l'homonymie des noms d'arrêt (inapplicable quand le nom ne comporte qu'un mot)" ignore_end_chars: "Ignorer les n derniers caractères du nom de l'arrêt pour détecter l'homonymie" diff --git a/config/locales/vehicle_journeys.en.yml b/config/locales/vehicle_journeys.en.yml index c073fd1e7..f9019411e 100644 --- a/config/locales/vehicle_journeys.en.yml +++ b/config/locales/vehicle_journeys.en.yml @@ -90,7 +90,6 @@ en: arrival: "Arrival" bounding: "From %{start} to %{end}" departure: "Departure" - journey_frequencies: "Timeband" stop_title: "Stop" time_tables: "Calendars list" title: "Vehicle Journey %{vehicle journey}" @@ -132,7 +131,6 @@ en: flexible_service: "On demond transportation" footnote_ids: "Footnotes" id: "Journey ID" - journey_frequency_ids: "Timeband" journey_name: "Name of the vehicle journey" journey_pattern_id: "Pattern ID" journey_pattern: "Journey Pattern" diff --git a/config/routes.rb b/config/routes.rb index cde1701f8..5693b86f9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -50,7 +50,6 @@ ChouetteIhm::Application.routes.draw do end resources :autocomplete_purchase_windows, only: [:index] resources :autocomplete_time_tables, only: [:index] - resources :autocomplete_timebands resources :group_of_lines, controller: "referential_group_of_lines" do collection do get 'name_filter' @@ -126,8 +125,6 @@ ChouetteIhm::Application.routes.draw do resources :time_table_combinations end - resources :timebands - resources :access_points do resources :access_links end diff --git a/db/migrate/20170307155042_set_updated_at.rb b/db/migrate/20170307155042_set_updated_at.rb index 16bfda3d9..6280ba9a8 100644 --- a/db/migrate/20170307155042_set_updated_at.rb +++ b/db/migrate/20170307155042_set_updated_at.rb @@ -1,6 +1,6 @@ class SetUpdatedAt < ActiveRecord::Migration def up - models = %w(VehicleJourney Timeband TimeTable StopPoint StopArea RoutingConstraintZone Route PtLink Network Line + models = %w(VehicleJourney TimeTable StopPoint StopArea RoutingConstraintZone Route PtLink Network Line JourneyPattern GroupOfLine ConnectionLink Company AccessPoint AccessLink) models.each do |table| diff --git a/db/migrate/20180330124436_add_metadata_to_other_models.rb b/db/migrate/20180330124436_add_metadata_to_other_models.rb index db01c77df..be031de0c 100644 --- a/db/migrate/20180330124436_add_metadata_to_other_models.rb +++ b/db/migrate/20180330124436_add_metadata_to_other_models.rb @@ -17,7 +17,6 @@ class AddMetadataToOtherModels < ActiveRecord::Migration Chouette::StopArea, Chouette::StopPoint, Chouette::TimeTable, - Chouette::Timeband, Chouette::VehicleJourney, ComplianceCheckSet, ComplianceControlSet, diff --git a/db/migrate/20180528125333_spring_cleanup.rb b/db/migrate/20180528125333_spring_cleanup.rb new file mode 100644 index 000000000..c2759dc32 --- /dev/null +++ b/db/migrate/20180528125333_spring_cleanup.rb @@ -0,0 +1,5 @@ +class SpringCleanup < ActiveRecord::Migration + def change + drop_table :timebands, :journey_frequencies, :vehicle_journey_frequencies, :access_points, :access_links + end +end diff --git a/spec/factories/chouette_journey_frequency.rb b/spec/factories/chouette_journey_frequency.rb deleted file mode 100644 index aa28bdefe..000000000 --- a/spec/factories/chouette_journey_frequency.rb +++ /dev/null @@ -1,38 +0,0 @@ -FactoryGirl.define do - - factory :journey_frequency, class: Chouette::JourneyFrequency do - timeband - scheduled_headway_interval { Time.current } - first_departure_time { timeband.start_time } - last_departure_time { timeband.end_time } - end - - factory :journey_frequency_first_departure_time_invalid, class: Chouette::JourneyFrequency do - timeband - scheduled_headway_interval { Time.current } - first_departure_time { timeband.start_time - 1.minute } - last_departure_time { timeband.end_time } - end - - factory :journey_frequency_last_departure_time_invalid, class: Chouette::JourneyFrequency do - timeband - scheduled_headway_interval { Time.current } - first_departure_time { timeband.start_time } - last_departure_time { timeband.end_time + 1.minute } - end - - factory :journey_frequency_departure_time_invalid, class: Chouette::JourneyFrequency do - timeband - scheduled_headway_interval { Time.current } - first_departure_time { '00:00' } - last_departure_time { '00:00' } - end - - factory :journey_frequency_scheduled_headway_interval_invalid, class: Chouette::JourneyFrequency do - timeband - scheduled_headway_interval { '00:00' } - first_departure_time { timeband.start_time } - last_departure_time { timeband.end_time } - end - -end diff --git a/spec/factories/chouette_timeband.rb b/spec/factories/chouette_timeband.rb deleted file mode 100644 index 010461479..000000000 --- a/spec/factories/chouette_timeband.rb +++ /dev/null @@ -1,17 +0,0 @@ -FactoryGirl.define do - - factory :timeband, class: Chouette::Timeband do - sequence(:name) { |n| "Name: #{n}" } - start_time { Time.now } - end_time { Time.now + 1.hour } - sequence(:objectid) { |n| "test:Timeband:#{n}:loc" } - end - - factory :timeband_invalid, class: Chouette::Timeband do - sequence(:name) { |n| "Name: #{n}" } - start_time { Time.now + 1.hour } - end_time { Time.now } - sequence(:objectid) { |n| "test:Timeband:#{n}:loc" } - end - -end diff --git a/spec/features/timebands_spec.rb b/spec/features/timebands_spec.rb deleted file mode 100644 index fcd14641a..000000000 --- a/spec/features/timebands_spec.rb +++ /dev/null @@ -1,62 +0,0 @@ -# -*- coding: utf-8 -*- -require 'spec_helper' - -describe "Timebands", :type => :feature do - login_user - - let!(:timebands) { Array.new(2) { create(:timeband) } } - subject { timebands.first } - - describe "list" do - it "display timebands" do - visit referential_timebands_path(referential) - expect(page).to have_content(timebands.first.name) - expect(page).to have_content(timebands.last.name) - end - - end - - describe "show" do - it "display timeband" do - visit referential_timebands_path(referential) - click_link "#{timebands.first.name}" - expect(page).to have_content(timebands.first.name) - end - - end - - describe "new" do - it "creates timeband and return to show" do - visit referential_timebands_path(referential) - click_link "Ajouter un créneau horaire" - fill_in "Titre", :with => "Timeband 1" - - select '10', from: 'timeband_start_time_4i' - select '00', from: 'timeband_start_time_5i' - select '11', from: 'timeband_end_time_4i' - select '00', from: 'timeband_end_time_5i' - - click_button("Créer créneau horaire") - expect(page).to have_content("Timeband 1") - end - end - - describe "edit and return to show" do - it "edit timeband" do - visit referential_timeband_path(referential, subject) - click_link "Editer ce créneau horaire" - fill_in "Titre", :with => "Timeband Modified" - click_button("Editer créneau horaire") - expect(page).to have_content("Timeband Modified") - end - end - - describe "delete and return to list" do - it "delete timeband" do - visit referential_timebands_path(referential) - page.all('.remove')[0].click - expect(page).to_not have_content("Timeband Modified") - end - end - -end diff --git a/spec/models/chouette/journey_frequency_spec.rb b/spec/models/chouette/journey_frequency_spec.rb deleted file mode 100644 index 549439d90..000000000 --- a/spec/models/chouette/journey_frequency_spec.rb +++ /dev/null @@ -1,47 +0,0 @@ -require 'spec_helper' - -describe Chouette::JourneyFrequency, type: :model do - let!(:vehicle_journey) { create(:vehicle_journey_even)} - - describe '#create' do - context 'when valid' do - xit 'should be created', '#5209 probably to be removed with Dead Code Elimination' do - journey_frequency = build(:journey_frequency) - journey_frequency.vehicle_journey_id = vehicle_journey.id - expect(journey_frequency.save!).to be - end - end - - context 'when first_departure_time not valid' do - it 'fails validation with first_departure_time before timeband start_time' do - journey_frequency = build(:journey_frequency_first_departure_time_invalid) - journey_frequency.vehicle_journey_id = vehicle_journey.id - expect(journey_frequency).to be_invalid - end - end - - context 'when last_departure_time not valid' do - it 'fails validation with last_departure_time after timeband end_time' do - journey_frequency = build(:journey_frequency_last_departure_time_invalid) - journey_frequency.vehicle_journey_id = vehicle_journey.id - expect(journey_frequency).to be_invalid - end - end - - context 'when first and last departure_time not valid' do - it 'fails validation with first_departure_time equal last_departure_time' do - journey_frequency = build(:journey_frequency_departure_time_invalid) - journey_frequency.vehicle_journey_id = vehicle_journey.id - expect(journey_frequency).to be_invalid - end - end - - context 'when scheduled_headway_interval not valid' do - it 'fails validation with scheduled_headway_interval is not set' do - journey_frequency = build(:journey_frequency_scheduled_headway_interval_invalid) - journey_frequency.vehicle_journey_id = vehicle_journey.id - expect(journey_frequency).to be_invalid - end - end - end -end diff --git a/spec/models/chouette/timeband_spec.rb b/spec/models/chouette/timeband_spec.rb deleted file mode 100644 index fa7c8f06e..000000000 --- a/spec/models/chouette/timeband_spec.rb +++ /dev/null @@ -1,19 +0,0 @@ -require 'spec_helper' - -describe Chouette::Timeband, :type => :model do - - - describe '#create' do - context 'when valid' do - it { create(:timeband) } - end - - context 'when not valid' do - it 'fails validation with end_time before start_time' do - timeband = build(:timeband_invalid) - expect(timeband).to be_invalid - end - end - end - -end diff --git a/spec/models/gtfs_import_spec.rb b/spec/models/gtfs_import_spec.rb index 5cb69332c..bf9a353eb 100644 --- a/spec/models/gtfs_import_spec.rb +++ b/spec/models/gtfs_import_spec.rb @@ -20,15 +20,6 @@ describe Import::Gtfs, :type => :model do # end - # describe "#max_distance_for_connection_link" do - - # it "should be included in import_options" do - # subject.max_distance_for_connection_link = 300 - # expect(subject.parameter_set["max_distance_for_connection_link"]).to eq(300) - # end - - # end - # describe "#ignore_last_word" do # it "should be included in import_options" do diff --git a/spec/views/connection_links/edit.html.erb_spec.rb b/spec/views/connection_links/edit.html.erb_spec.rb deleted file mode 100644 index 963375454..000000000 --- a/spec/views/connection_links/edit.html.erb_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -require 'spec_helper' - -describe "/connection_links/edit", :type => :view do - assign_referential - let!(:connection_link) { assign(:connection_link, create(:connection_link)) } - let!(:connection_links) { Array.new(2) { create(:connection_link) } } - - describe "test" do - it "should render h2 with the connection_link name" do - render - expect(rendered).to have_selector("h2", :text => Regexp.new(connection_link.name)) - end - end - - describe "form" do - it "should render input for name" do - render - expect(rendered).to have_selector("form") do - with_tag "input[type=text][name='connection_link[name]'][value=?]", connection_link.name - end - end - end - -end diff --git a/spec/views/connection_links/index.html.erb_spec.rb b/spec/views/connection_links/index.html.erb_spec.rb deleted file mode 100644 index 1f133e31e..000000000 --- a/spec/views/connection_links/index.html.erb_spec.rb +++ /dev/null @@ -1,27 +0,0 @@ -require 'spec_helper' - -describe "/connection_links/index", :type => :view do - - assign_referential - let!(:connection_links) { assign :connection_links, Array.new(2) { create(:connection_link) }.paginate } - let!(:search) { assign :q, Ransack::Search.new(Chouette::ConnectionLink) } - - before do - allow(view).to receive_messages(current_organisation: referential.organisation) - end - - it "should render a show link for each group" do - render - connection_links.each do |connection_link| - expect(rendered).to have_selector(".connection_link a[href='#{view.referential_connection_link_path(referential, connection_link)}']", :text => connection_link.name) - end - end - - with_permission "connection_links.create" do - it "should render a link to create a new group" do - render - expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{new_referential_connection_link_path(referential)}']") - end - end - -end diff --git a/spec/views/connection_links/new.html.erb_spec.rb b/spec/views/connection_links/new.html.erb_spec.rb deleted file mode 100644 index 8d17bbe8b..000000000 --- a/spec/views/connection_links/new.html.erb_spec.rb +++ /dev/null @@ -1,17 +0,0 @@ -require 'spec_helper' - -describe "/connection_links/new", :type => :view do - assign_referential - let!(:connection_link) { assign(:connection_link, build(:connection_link)) } - - describe "form" do - - it "should render input for name" do - render - expect(rendered).to have_selector("form") do - with_selector "input[type=text][name=?]", connection_link.name - end - end - - end -end diff --git a/spec/views/connection_links/show.html.slim_spec.rb b/spec/views/connection_links/show.html.slim_spec.rb deleted file mode 100644 index afe94fc6c..000000000 --- a/spec/views/connection_links/show.html.slim_spec.rb +++ /dev/null @@ -1,32 +0,0 @@ -require 'spec_helper' - -describe "/connection_links/show", :type => :view do - - assign_referential - let!(:connection_link) { assign(:connection_link, create(:connection_link)) } - let!(:map) { assign(:map, double(:to_html => '
    '.html_safe)) } - - before do - allow(view).to receive_messages(current_organisation: referential.organisation) - end - - it "should render h2 with the connection_link name" do - render - expect(rendered).to have_selector("h2", :text => Regexp.new(connection_link.name)) - end - - with_permission "connection_links.update" do - it "should render a link to edit the connection_link" do - render - expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.edit_referential_connection_link_path(referential, connection_link)}']") - end - end - - with_permission "connection_links.destroy" do - it "should render a link to remove the connection_link" do - render - expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.referential_connection_link_path(referential, connection_link)}'][class='remove']") - end - end - -end diff --git a/spec/views/timebands/edit.html.erb_spec.rb b/spec/views/timebands/edit.html.erb_spec.rb deleted file mode 100644 index 5f6051884..000000000 --- a/spec/views/timebands/edit.html.erb_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -require 'spec_helper' - -describe "/timebands/edit", :type => :view do - assign_referential - let!(:timeband) { assign(:timeband, create(:timeband) ) } - - describe "test" do - it "should render h2 with the group name" do - render - expect(rendered).to have_selector("h2", text: Regexp.new(timeband.name)) - end - end - - describe "form" do - it "should render input for timeband" do - render - expect(rendered).to have_field('timeband[name]') - expect(rendered).to have_field('timeband[start_time(4i)]') - expect(rendered).to have_field('timeband[start_time(5i)]') - expect(rendered).to have_selector('button[type=submit]') - end - - end -end diff --git a/spec/views/timebands/index.html.erb_spec.rb b/spec/views/timebands/index.html.erb_spec.rb deleted file mode 100644 index 0ce0c419c..000000000 --- a/spec/views/timebands/index.html.erb_spec.rb +++ /dev/null @@ -1,20 +0,0 @@ -require 'spec_helper' - -describe "/timebands/index", :type => :view do - - assign_referential - let!(:timebands) { assign :timebands, Array.new(2){ create(:timeband) }.paginate } - - it "should render a show link for each timeband" do - render - timebands.each do |timeband| - expect(rendered).to have_selector("a[href='#{view.referential_timeband_path(referential, timeband)}']", :text => timeband.name) - end - end - - it "should render a link to create a new timeband" do - render - expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{new_referential_timeband_path(referential)}']") - end - -end diff --git a/spec/views/timebands/new.html.erb_spec.rb b/spec/views/timebands/new.html.erb_spec.rb deleted file mode 100644 index f5e85f20c..000000000 --- a/spec/views/timebands/new.html.erb_spec.rb +++ /dev/null @@ -1,18 +0,0 @@ -require 'spec_helper' - -describe "/timebands/new", :type => :view do - assign_referential - let!(:timeband) { assign(:timeband, build(:timeband)) } - - describe "form" do - - it "should render inputs" do - render - expect(rendered).to have_field('timeband[name]') - expect(rendered).to have_field('timeband[start_time(4i)]') - expect(rendered).to have_field('timeband[start_time(5i)]') - expect(rendered).to have_selector('button[type=submit]') - end - - end -end diff --git a/spec/views/timebands/show.html.erb_spec.rb b/spec/views/timebands/show.html.erb_spec.rb deleted file mode 100644 index d43ba588c..000000000 --- a/spec/views/timebands/show.html.erb_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -require 'spec_helper' - -describe "/timebands/show", :type => :view do - - assign_referential - let!(:timeband) { assign(:timeband, create(:timeband)) } - - it "should render h2 with the timeband name" do - render - expect(rendered).to have_selector("h2", text: Regexp.new(timeband.name)) - end - - it "should render a link to edit the timeband" do - render - expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.edit_referential_timeband_path(referential, timeband)}']") - end - - it "should render a link to remove the timeband" do - render - expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.referential_timeband_path(referential, timeband)}'][class='remove']") - end - -end - -- cgit v1.2.3