diff options
35 files changed, 6 insertions, 641 deletions
diff --git a/app/assets/images/import_task-completed.png b/app/assets/images/import_task-completed.png Binary files differdeleted file mode 100644 index cd047c5fc..000000000 --- a/app/assets/images/import_task-completed.png +++ /dev/null diff --git a/app/assets/images/import_task-failed.png b/app/assets/images/import_task-failed.png Binary files differdeleted file mode 100644 index 5d7b51646..000000000 --- a/app/assets/images/import_task-failed.png +++ /dev/null diff --git a/app/assets/images/import_task-pending.png b/app/assets/images/import_task-pending.png Binary files differdeleted file mode 100644 index d5af6a807..000000000 --- a/app/assets/images/import_task-pending.png +++ /dev/null diff --git a/app/assets/images/import_task-processing.png b/app/assets/images/import_task-processing.png Binary files differdeleted file mode 100644 index 88990027b..000000000 --- a/app/assets/images/import_task-processing.png +++ /dev/null diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 97caed7fb..7be2b9041 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -117,8 +117,6 @@ module ApplicationHelper "stop_areas" when path.include?("/time_tables") "time_tables" - when path.include?("/import_tasks") - "imports" when path.include?("/exports") "exports" when path.include?("/compliance_check_tasks") diff --git a/app/helpers/exports_helper.rb b/app/helpers/exports_helper.rb index f30a80ed9..4de539b73 100644 --- a/app/helpers/exports_helper.rb +++ b/app/helpers/exports_helper.rb @@ -20,39 +20,6 @@ module ExportsHelper end.html_safe end - def fields_for_export_task_format(form) - begin - render :partial => export_partial_name(form), :locals => { :form => form } - rescue ActionView::MissingTemplate - "" - end - end - - def export_partial_name(form) - "fields_#{form.object.format.underscore}_export" - end - - def export_attributes_tag(export) - content_tag :div, class: "export-attributes" do - [].tap do |parts| - if export.format.present? - parts << bh_label(t("enumerize.data_format.#{export.format}")) - end - end.join.html_safe - end - end - - def compliance_icon( export_task) - return nil unless export_task.compliance_check_task - export_task.compliance_check_task.tap do |cct| - if cct.failed? || cct.any_error_severity_failure? - return 'icons/link_page_alert.png' - else - return 'icons/link_page.png' - end - end - end - def workgroup_exports workgroup Export::Base.user_visible_descendants.select{|e| workgroup.has_export? e.name} end diff --git a/app/helpers/imports_helper.rb b/app/helpers/imports_helper.rb index f06d77eca..62a09b216 100644 --- a/app/helpers/imports_helper.rb +++ b/app/helpers/imports_helper.rb @@ -44,51 +44,4 @@ module ImportsHelper def import_message_content message export_message_content message end - - ############################## - # TO CLEAN!!! - ############################## - - def fields_for_import_task_format(form) - begin - render :partial => import_partial_name(form), :locals => { :form => form } - rescue ActionView::MissingTemplate - "" - end - end - - def import_partial_name(form) - "fields_#{form.object.format.underscore}_import" - end - - def compliance_icon( import_task) - return nil unless import_task.compliance_check_task - import_task.compliance_check_task.tap do |cct| - if cct.failed? || cct.any_error_severity_failure? - return 'icons/link_page_alert.png' - else - return 'icons/link_page.png' - end - end - end - - def import_attributes_tag(import) - content_tag :div, class: "import-attributes" do - [].tap do |parts| - if import.format.present? - parts << bh_label(t("enumerize.data_format.#{import.format}")) - end - parts << content_tag(:div, import_save_mode_icon_tag(import), class: "save-mode") - end.join.html_safe - end - end - - def import_save_mode_icon_tag(import) - if import.no_save? - fa_stacked_icon "database", base: "ban" - else - fa_icon "database" - end - end - end diff --git a/app/helpers/stop_area_copies_helper.rb b/app/helpers/stop_area_copies_helper.rb deleted file mode 100644 index 023a9d750..000000000 --- a/app/helpers/stop_area_copies_helper.rb +++ /dev/null @@ -1,8 +0,0 @@ -module StopAreaCopiesHelper - - def label_stop_area_types(*stop_area_types) - stop_area_types - .flatten - .zip_map { |stop_area_type| t("area_types.label.#{stop_area_type}") } - end -end diff --git a/app/models/stop_area_copy.rb b/app/models/stop_area_copy.rb deleted file mode 100644 index d3eb78557..000000000 --- a/app/models/stop_area_copy.rb +++ /dev/null @@ -1,95 +0,0 @@ -class StopAreaCopy - include ActiveModel::Validations - include ActiveModel::Conversion - extend ActiveModel::Naming - - attr_accessor :source_id, :hierarchy, :area_type, :source, :copy - - validates_presence_of :source_id, :hierarchy, :area_type - - validates :hierarchy, inclusion: { in: %w(child parent) } - - - def initialize(attributes = {}) - attributes.each { |name, value| send("#{name}=", value) } if attributes - if self.area_type.blank? && self.source != nil - self.source_id = self.source.id - if self.hierarchy == "child" - if self.source.area_type.underscore == "stop_place" - self.area_type="commercial_stop_point" - else - self.area_type="boarding_position" - end - else - if self.source.area_type.underscore == "stop_place" || self.source.area_type.underscore == "commercial_stop_point" - self.area_type="stop_place" - else - self.area_type="commercial_stop_point" - end - end - end - end - - def persisted? - false - end - - def source - @source ||= Chouette::StopArea.find self.source_id - end - - def copy - @copy ||= self.source.duplicate - end - - def copy_is_source_parent? - self.hierarchy == "parent" - end - - def copy_is_source_child? - self.hierarchy == "child" - end - - def copy_modfied_attributes - { :name => self.source.name, # TODO: change ninoxe to avoid that !!! - :area_type => self.area_type.camelcase, - :registration_number => nil, - :parent_id => copy_is_source_child? ? self.source_id : nil - } - end - - def source_modified_attributes - return {} unless copy_is_source_parent? - { :parent_id => self.copy.id - } - end - - def save - begin - if self.valid? - Chouette::StopArea.transaction do - copy.update_attributes copy_modfied_attributes - if copy.valid? - unless source_modified_attributes.empty? - source.update_attributes source_modified_attributes - end - true - else - copy.errors.full_messages.each do |m| - errors.add :base, m - end - false - end - end - else - false - end - rescue Exception => exception - Rails.logger.error(exception.message) - Rails.logger.error(exception.backtrace.join("\n")) - errors.add :base, I18n.t("stop_area_copies.errors.exception") - false - end - end - -end diff --git a/app/views/export_tasks/_fields_gtfs_export.html.slim b/app/views/export_tasks/_fields_gtfs_export.html.slim deleted file mode 100644 index e95e86230..000000000 --- a/app/views/export_tasks/_fields_gtfs_export.html.slim +++ /dev/null @@ -1,3 +0,0 @@ -= form.input :time_zone, as: :time_zone, :input_html => { :value => @referential.time_zone ,:title => t("formtastic.titles.export_task.time_zone")} - -= form.input :object_id_prefix, :input_html => { :value => @referential.prefix ,:title => t("formtastic.titles.export_task.object_id_prefix")}
\ No newline at end of file diff --git a/app/views/export_tasks/_fields_hub_export.html.slim b/app/views/export_tasks/_fields_hub_export.html.slim deleted file mode 100644 index e69de29bb..000000000 --- a/app/views/export_tasks/_fields_hub_export.html.slim +++ /dev/null diff --git a/app/views/export_tasks/_fields_kml_export.html.slim b/app/views/export_tasks/_fields_kml_export.html.slim deleted file mode 100644 index e69de29bb..000000000 --- a/app/views/export_tasks/_fields_kml_export.html.slim +++ /dev/null diff --git a/app/views/export_tasks/_fields_neptune_export.html.slim b/app/views/export_tasks/_fields_neptune_export.html.slim deleted file mode 100644 index 43749c87e..000000000 --- a/app/views/export_tasks/_fields_neptune_export.html.slim +++ /dev/null @@ -1,2 +0,0 @@ -= form.input :projection_type, as: :hidden, :input_html => { :value => @referential.projection_type || "" } -= form.input :extensions , as: :boolean
\ No newline at end of file diff --git a/app/views/export_tasks/_fields_netex_export.html.slim b/app/views/export_tasks/_fields_netex_export.html.slim deleted file mode 100644 index e69de29bb..000000000 --- a/app/views/export_tasks/_fields_netex_export.html.slim +++ /dev/null diff --git a/app/views/export_tasks/new.html.slim b/app/views/export_tasks/new.html.slim deleted file mode 100644 index 5f89f5865..000000000 --- a/app/views/export_tasks/new.html.slim +++ /dev/null @@ -1,32 +0,0 @@ -= title_tag t(".title") - -ul.nav.nav-pills - - ExportTask.data_formats.each do |format| - li role="presentation" - a href="##{format}" class=("#{@export_task.data_format == format ? "#{format} active" : "#{format}"}") title="#{t(:"enumerize.data_format_detail.#{format}")}" data-toggle="tab" - = t(:"enumerize.data_format.#{format}") - -.tab-content - - @available_exports.each do |export_task| - = semantic_form_for [@referential, export_task], :as => :export_task, :url => referential_export_tasks_path(@referential), :namespace => export_task.data_format ,:html => { :id => "#{export_task.data_format}", :class => "tab-pane highlight"} do |form| - = form.inputs do - = form.input :user_name, as: :hidden, :input_html => { :value => current_user.name } - = form.input :user_id, as: :hidden, :input_html => { :value => current_user.id } - = form.input :data_format, as: :hidden - = form.input :referential_id, as: :hidden, :input_html => { :value => @referential.id } - = form.input :name - = form.input :references_type, as: :select, include_blank: t(".all"), collection: export_task.class.references_type.options.map { |o| o << {data:{"hidden-attributes" => export_task.class.optional_attributes(o.second).join(',') }} } - - - export_task.class.references_types.each do |type| - = form.input :reference_ids, as: :reference_ids, :json => references_referential_export_tasks_path(@referential, :format => :json) + "?filter=#{type}", :hint_text => t('search_hint'), :no_result_text => t('no_result_text'),:searching_text => t('searching_term'), :id => "#{export_task.data_format}_#{type}_reference_ids", :input_html => { :id => "#{export_task.data_format}_#{type}_reference_ids" }, :wrapper_html => { style: "display:none;", "data-type" => type.to_s } - - = form.input :start_date, as: :date_picker, :input_html => { :title => t("formtastic.titles.export_task.start_date")} - = form.input :end_date, as: :date_picker, :input_html => { :title => t("formtastic.titles.export_task.end_date")} - - = render partial: "fields_#{export_task.data_format}_export", :locals => { :form => form } - - = form.actions do - = form.action :submit, as: :button , :label => t('formtastic.export') - = form.action :cancel, as: :link - -= javascript_include_tag new_referential_export_task_path(@referential, :format => :js) diff --git a/app/views/export_tasks/new.js.coffee b/app/views/export_tasks/new.js.coffee deleted file mode 100644 index dd0e284a5..000000000 --- a/app/views/export_tasks/new.js.coffee +++ /dev/null @@ -1,2 +0,0 @@ -jQuery -> - $('#workspace.export_tasks .nav a.active').tab('show') diff --git a/app/views/import_tasks/_fields_gtfs_import.html.slim b/app/views/import_tasks/_fields_gtfs_import.html.slim deleted file mode 100644 index a560b6878..000000000 --- a/app/views/import_tasks/_fields_gtfs_import.html.slim +++ /dev/null @@ -1,5 +0,0 @@ -= form.input :references_type, as: :select, :include_blank => t("import_tasks.new.all"), :input_html => { :title => t("formtastic.titles.import_task.references_type") } -= form.input :object_id_prefix, :input_html => { :value => @referential.prefix } -= 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 } diff --git a/app/views/import_tasks/_fields_neptune_import.html.slim b/app/views/import_tasks/_fields_neptune_import.html.slim deleted file mode 100644 index e69de29bb..000000000 --- a/app/views/import_tasks/_fields_neptune_import.html.slim +++ /dev/null diff --git a/app/views/import_tasks/_fields_netex_import.slim b/app/views/import_tasks/_fields_netex_import.slim deleted file mode 100644 index e69de29bb..000000000 --- a/app/views/import_tasks/_fields_netex_import.slim +++ /dev/null diff --git a/app/views/import_tasks/new.html.slim b/app/views/import_tasks/new.html.slim deleted file mode 100644 index dad004759..000000000 --- a/app/views/import_tasks/new.html.slim +++ /dev/null @@ -1,27 +0,0 @@ -= title_tag t(".title") - -ul.nav.nav-pills - - ImportTask.data_formats.each do |format| - li role="presentation" - a href="##{format}" class="#{@import_task.data_format == format ? "#{format} active" : "#{format}" }" title="#{t(:"enumerize.data_format_detail.#{format}")}" data-toggle="tab" - = t(:"enumerize.data_format.#{format}") - -.tab-content - - @available_imports.each do |import_task| - = semantic_form_for [@referential, import_task], as: :import_task, :url => referential_import_tasks_path(@referential), :namespace => import_task.data_format, :html => { :id => "#{import_task.data_format}", class: 'tab-pane highlight' } do |form| - = form.inputs do - = form.input :user_name, as: :hidden, :input_html => { :value => current_user.name } - = form.input :user_id, as: :hidden, :input_html => { :value => current_user.id } - = form.input :data_format, as: :hidden - = form.input :referential_id, as: :hidden, :input_html => { :value => @referential.id } - = form.input :name - = form.input :no_save, as: :boolean - = form.input :resources, as: :file - - = render partial: "fields_#{import_task.data_format}_import", :locals => { :form => form } - - = form.actions do - = form.action :submit, as: :button , :label => t( 'formtastic.import' ) - = form.action :cancel, as: :link - -= javascript_include_tag new_referential_import_task_path(@referential, :format => :js) diff --git a/app/views/import_tasks/new.js.coffee b/app/views/import_tasks/new.js.coffee deleted file mode 100644 index 57dbe9e72..000000000 --- a/app/views/import_tasks/new.js.coffee +++ /dev/null @@ -1,2 +0,0 @@ -jQuery -> - $('#workspace.import_tasks .nav a.active').tab('show') diff --git a/app/views/stop_area_copies/new.html.slim b/app/views/stop_area_copies/new.html.slim deleted file mode 100644 index b506d35f4..000000000 --- a/app/views/stop_area_copies/new.html.slim +++ /dev/null @@ -1,28 +0,0 @@ -= title_tag t("stop_area_copies.new.title.#{@stop_area_copy.hierarchy}") - -= semantic_form_for [@referential, @stop_area, @stop_area_copy] do |form| - br - = form.inputs do - = form.input :source_id, as: :hidden - = form.input :hierarchy, as: :hidden - - - if @stop_area_copy.hierarchy == "child" - - if @stop_area.area_type.underscore == "stop_place" - = form.input :area_type, - as: :select, - collection: label_stop_area_types( "stop_place","commercial_stop_point" ), - include_blank: false - - else - = form.input :area_type, - as: :select, - collection: label_stop_area_types( "boarding_position","quay" ), - include_blank: false - - else - = form.input :area_type, - as: :select, - collection: label_stop_area_types(@stop_area_copy.area_type), - include_blank: false - - = form.actions do - = form.action :submit, as: :button , label: t('formtastic.duplicate') - = form.action :cancel, as: :link diff --git a/config/locales/export_tasks.en.yml b/config/locales/export_tasks.en.yml deleted file mode 100644 index 505cf688e..000000000 --- a/config/locales/export_tasks.en.yml +++ /dev/null @@ -1,57 +0,0 @@ -en: - export_tasks: - actions: - new: "New export" - new: - title: "New export" - all: "All" - flash: "Export task on queue, refresh page to see progression" - fields_gtfs_export: - warning: "Filter on stop areas export only GTFS stops and transfers files, these may contain extra attributes" - activemodel: - models: - export_task: - zero: "export" - one: "export" - other: "exports" - neptune_export: - zero: "export" - one: "Neptune export" - other: "exports" - gtfs_export: - zero: "export" - one: "GTFS export" - other: "exports" - netex_export: - zero: "export" - one: "NeTEx export" - other: "exports" - attributes: - export_task: - name: "Export name" - start_date: "Start date" - end_date: "End date" - start_date_greater_than: "Start date must be greater than or equal to %{tt_st_date}." - end_date_less_than: "End date must be less than or equal to %{tt_ed_date}." - end_date_greater_than_start_date: "End date must be greater than start date" - extensions: "Extensions" - created_at: "Created on" - status: "Status" - references_type: "Associated Data Type" - reference_ids: "Associated Data" - object_id_prefix: "Neptune Id prefix" - max_distance_for_commercial: "Max distance for commercial stop" - ignore_last_word: "ignore last word" - ignore_end_chars: "ignore last chars" - formtastic: - titles: - export_task: - time_zone: "according to TZ encoding (see http://en.wikipedia.org/wiki/Tz_database)" - object_id_prefix: "when prefix has this value, it will be removed to build GTFS id" - start_date: "reduce import to vehicle journeys running from this date" - end_date: "reduce import to vehicle journeys running until this date" - 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" - 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 deleted file mode 100644 index 268f9b2ce..000000000 --- a/config/locales/export_tasks.fr.yml +++ /dev/null @@ -1,57 +0,0 @@ -fr: - export_tasks: - actions: - new: "Nouvel export" - new: - title: "Nouvel export" - all: "Tous" - flash: "La demande d'export est mise en file d'attente, veuillez rafraichir régulièrement la page pour en suivre la progression" - fields_gtfs_export: - warning: "Le filtre sur arrêts exporte uniquement les fichiers GTFS stops et transfers gtfs, ceux-ci pouvant contenir des attributs supplémentaires" - activemodel: - models: - export_task: - zero: "export" - one: "export" - other: "exports" - neptune_export: - zero: "export" - one: "export Neptune" - other: "exports" - gtfs_export: - zero: "export" - one: "export GTFS" - other: "exports" - netex_export: - zero: "export" - one: "export NeTEx" - other: "exports" - attributes: - export_task: - name: "Nom de l'export" - start_date: "Date de début" - end_date: "Date de fin" - start_date_greater_than: "La date de début doit être postérieure ou égale à %{tt_st_date}." - end_date_less_than: "La date de fin doit être antérieure ou égale à %{tt_ed_date}." - end_date_greater_than_start_date: "La date de fin doit être postérieure à la date de début." - extensions: "Extensions" - created_at: "Créé le" - status: "Status" - references_type: "Type de données incluses" - reference_ids: "Données incluses" - object_id_prefix: "Préfixe d'identifiants" - max_distance_for_commercial: "Distance max pour créer les zones" - ignore_last_word: "ignorer le dernier mot" - ignore_end_chars: "ignorer les n derniers caractères" - formtastic: - titles: - export_task: - time_zone: "selon le codage TZ (http://fr.wikipedia.org/wiki/Tz_database)" - object_id_prefix: "lorsque le préfixe d'identifiant Netpune prend cette valeur, il n'est pas utilisé pour composer l'identifiant GTFS" - start_date: "limite l'export aux courses circulant à partir de cette date" - end_date: "limite l'export aux courses circulant jusqu'à cette date" - 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)" - 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/stop_area_copies.en.yml b/config/locales/stop_area_copies.en.yml deleted file mode 100644 index 0e9053bae..000000000 --- a/config/locales/stop_area_copies.en.yml +++ /dev/null @@ -1,14 +0,0 @@ -en: - stop_area_copies: - new: - success: "Clone succedeed" - title: - child: "Clone as child" - parent: "Clone as parent" - errors: - copy_aborted: "Errors prohibited this copy from completing: " - exception: "internal error" - activemodel: - attributes: - stop_area_copy: - area_type: "Area type" diff --git a/config/locales/stop_area_copies.fr.yml b/config/locales/stop_area_copies.fr.yml deleted file mode 100644 index 55543cfb3..000000000 --- a/config/locales/stop_area_copies.fr.yml +++ /dev/null @@ -1,14 +0,0 @@ -fr: - stop_area_copies: - new: - success: "Clonage réussi" - title: - child: "Cloner pour créer un fils" - parent: "Cloner pour créer un père" - errors: - copy_aborted: "Des erreurs ont empéchées le bon déroulement de la copie: " - exception: "erreur interne" - activemodel: - attributes: - stop_area_copy: - area_type: "Type d'arrêt" diff --git a/config/routes.rb b/config/routes.rb index 5693b86f9..dc9a17482 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -94,13 +94,6 @@ ChouetteIhm::Application.routes.draw do resources :vehicle_journeys, controller: 'referential_vehicle_journeys', only: [:index] - resources :import_tasks, :only => [:new, :create] - resources :export_tasks, :only => [:new, :create] do - collection do - get 'references' - end - end - resources :exports, :only => [:index, :show, :destroy] do member do get "exported_file" @@ -130,8 +123,6 @@ ChouetteIhm::Application.routes.draw do end resources :stop_areas, controller: "referential_stop_areas" do - resources :access_points - resources :stop_area_copies resources :stop_area_routing_lines member do get 'add_children' diff --git a/db/migrate/20180528125333_spring_cleanup.rb b/db/migrate/20180528125333_spring_cleanup.rb index c2759dc32..75f4c0c0b 100644 --- a/db/migrate/20180528125333_spring_cleanup.rb +++ b/db/migrate/20180528125333_spring_cleanup.rb @@ -1,5 +1,7 @@ class SpringCleanup < ActiveRecord::Migration def change - drop_table :timebands, :journey_frequencies, :vehicle_journey_frequencies, :access_points, :access_links + [:journey_frequencies, :timebands].each do |t| + drop_table t + end end end diff --git a/db/schema.rb b/db/schema.rb index c5fe6e0d1..27bb19579 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180517190722) do +ActiveRecord::Schema.define(version: 20180528125333) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -92,9 +92,9 @@ ActiveRecord::Schema.define(version: 20180517190722) do t.integer "organisation_id", limit: 8 t.datetime "created_at" t.datetime "updated_at" + t.integer "workgroup_id", limit: 8 t.integer "int_day_types" t.date "excluded_dates", array: true - t.integer "workgroup_id", limit: 8 t.jsonb "metadata", default: {} end @@ -472,29 +472,15 @@ ActiveRecord::Schema.define(version: 20180517190722) do t.string "type" t.integer "parent_id", limit: 8 t.string "parent_type" + t.datetime "notified_parent_at" t.integer "current_step", default: 0 t.integer "total_steps", default: 0 - t.datetime "notified_parent_at" t.string "creator" end add_index "imports", ["referential_id"], name: "index_imports_on_referential_id", using: :btree add_index "imports", ["workbench_id"], name: "index_imports_on_workbench_id", using: :btree - create_table "journey_frequencies", id: :bigserial, force: :cascade do |t| - t.integer "vehicle_journey_id", limit: 8 - t.time "scheduled_headway_interval", null: false - t.time "first_departure_time", null: false - t.time "last_departure_time" - t.boolean "exact_time", default: false - t.datetime "created_at" - t.datetime "updated_at" - t.integer "timeband_id", limit: 8 - end - - add_index "journey_frequencies", ["timeband_id"], name: "index_journey_frequencies_on_timeband_id", using: :btree - add_index "journey_frequencies", ["vehicle_journey_id"], name: "index_journey_frequencies_on_vehicle_journey_id", using: :btree - create_table "journey_patterns", id: :bigserial, force: :cascade do |t| t.integer "route_id", limit: 8 t.string "objectid", null: false @@ -967,17 +953,6 @@ ActiveRecord::Schema.define(version: 20180517190722) do add_index "time_tables_vehicle_journeys", ["time_table_id"], name: "index_time_tables_vehicle_journeys_on_time_table_id", using: :btree add_index "time_tables_vehicle_journeys", ["vehicle_journey_id"], name: "index_time_tables_vehicle_journeys_on_vehicle_journey_id", using: :btree - create_table "timebands", id: :bigserial, force: :cascade do |t| - t.string "objectid", null: false - t.integer "object_version", limit: 8 - t.string "name" - t.time "start_time", null: false - t.time "end_time", null: false - t.datetime "created_at" - t.datetime "updated_at" - t.jsonb "metadata", default: {} - end - create_table "users", id: :bigserial, force: :cascade do |t| t.string "email", default: "", null: false t.string "encrypted_password", default: "" @@ -1110,8 +1085,6 @@ ActiveRecord::Schema.define(version: 20180517190722) do add_foreign_key "compliance_controls", "compliance_control_sets" add_foreign_key "group_of_lines_lines", "group_of_lines", name: "groupofline_group_fkey", on_delete: :cascade add_foreign_key "import_resources", "referentials" - add_foreign_key "journey_frequencies", "timebands", on_delete: :nullify - add_foreign_key "journey_frequencies", "vehicle_journeys", on_delete: :nullify add_foreign_key "journey_patterns", "routes", name: "jp_route_fkey", on_delete: :cascade add_foreign_key "journey_patterns", "stop_points", column: "arrival_stop_point_id", name: "arrival_point_fkey", on_delete: :nullify add_foreign_key "journey_patterns", "stop_points", column: "departure_stop_point_id", name: "departure_point_fkey", on_delete: :nullify diff --git a/spec/controllers/vehicle_journey_frequencies_controller_spec.rb b/spec/controllers/vehicle_journey_frequencies_controller_spec.rb deleted file mode 100644 index 61636e334..000000000 --- a/spec/controllers/vehicle_journey_frequencies_controller_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'spec_helper' - -RSpec.describe VehicleJourneyFrequenciesController, :type => :controller do - -end diff --git a/spec/features/access_points_spec.rb b/spec/features/access_points_spec.rb deleted file mode 100644 index 890906de7..000000000 --- a/spec/features/access_points_spec.rb +++ /dev/null @@ -1,64 +0,0 @@ -# -*- coding: utf-8 -*- -require 'spec_helper' - -describe "Access points", :type => :feature do - login_user - - let!(:stop_area) { create(:stop_area, stop_area_referential: referential.stop_area_referential) } - let!(:access_points) { Array.new(2) { create(:access_point, :stop_area => stop_area) } } - subject { access_points.first } - - describe "list" do - - it "displays a list of access points" do - visit referential_stop_area_access_points_path(referential, stop_area) - #save_and_open_page - access_points.each do |ap| - expect(page).to have_content(ap.name) - end - end - - end - - describe "show" do - - # it "displays an access point" do - # access_points.each do |ap| - # visit referential_stop_area_path(referential, stop_area) - # click_link ap.name - # expect(page).to have_content(ap.name) - # end - # end - - # it "displays a map" do - # access_points.each do |ap| - # visit referential_stop_area_path(referential, stop_area) - # click_link ap.name - # expect(page).to have_selector("#map.access_point") - # end - # end - - end - - # Fixme #1780 - # describe "new" do - # it "creates an access point" do - # visit referential_stop_area_path(referential, stop_area) - # click_link I18n.t("access_points.actions.new") - # fill_in "access_point[name]", :with => "My Access Point Name" - # click_button(I18n.t('formtastic.create',model: I18n.t('activerecord.models.access_point.one'))) - # expect(page).to have_content("My Access Point Name") - # end - # end - - # describe "edit" do - # it "edits an acess point" do - # visit referential_stop_area_access_point_path(referential, stop_area, subject) - # click_link I18n.t("access_points.actions.edit") - # fill_in "access_point[name]", :with => "My New Access Point Name" - # click_button(I18n.t('formtastic.update',model: I18n.t('activerecord.models.access_point.one'))) - # expect(page).to have_content("My New Access Point Name") - # end - # end - -end diff --git a/spec/features/connection_links_spec.rb b/spec/features/connection_links_spec.rb deleted file mode 100644 index 7e95aeb13..000000000 --- a/spec/features/connection_links_spec.rb +++ /dev/null @@ -1,46 +0,0 @@ -# coding: utf-8 -RSpec.describe "ConnectionLinks", type: :feature do - login_user - - let!(:connection_links) { Array.new(2) { create(:connection_link) } } - subject { connection_links.first } - - describe "list" do - it "display connection_links" do - visit referential_connection_links_path(referential) - expect(page).to have_content(connection_links.first.name) - expect(page).to have_content(connection_links.last.name) - end - - end - - describe "show" do - it "display connection_link" do - visit referential_connection_links_path(referential) - click_link "#{connection_links.first.name}" - expect(page).to have_content(connection_links.first.name) - end - end - - describe "new" do - it "creates connection_link and return to show" do - visit referential_connection_links_path(referential) - click_link "Ajouter une correspondance" - fill_in "Nom", :with => "ConnectionLink 1" - fill_in "Identifiant Neptune", :with => "test:ConnectionLink:1:LOC" - click_button("Créer correspondance") - expect(page).to have_content("ConnectionLink 1") - end - end - - describe "edit and return to show" do - it "edit connection_link" do - visit referential_connection_link_path(referential, subject) - click_link "Editer cette correspondance" - fill_in "Nom", :with => "ConnectionLink Modified" - click_button("Editer correspondance") - expect(page).to have_content("ConnectionLink Modified") - end - end - -end diff --git a/spec/models/stop_area_copy_spec.rb b/spec/models/stop_area_copy_spec.rb deleted file mode 100644 index a00271077..000000000 --- a/spec/models/stop_area_copy_spec.rb +++ /dev/null @@ -1,38 +0,0 @@ -# -*- coding: utf-8 -*- -require 'spec_helper' - -describe StopAreaCopy, :type => :model do - - subject { StopAreaCopy.new(:source_id => 1, :hierarchy => "child", :area_type => "Quay") } - - describe ".save" do - # Fixme #1627 - # it "should create a child for source" do - # source = create(:stop_area, :area_type => "CommercialStopPoint", :name => "test1", - # :registration_number => "123456", :city_name => "dummy", :zip_code => "12345") - # source.save - # subject.source_id = source.id - # subject.hierarchy = "child" - # subject.area_type = "Quay" - # subject.save - - # source.reload - # expect(source.children.length).to eq(1) - # expect(source.children[0].name).to eq("test1") - # end - - # it "should create a parent for source" do - # source = create(:stop_area, :area_type => "CommercialStopPoint", :name => "test2", - # :registration_number => "123456", :city_name => "dummy", :zip_code => "12345") - # source.save - # subject.source_id = source.id - # subject.hierarchy = "parent" - # subject.area_type = "StopPlace" - # subject.save - # source.reload - # expect(source.parent).not_to be_nil - # expect(source.parent.name).to eq('test2') - # end - end - -end diff --git a/spec/views/import_tasks/index.html.erb_spec.rb b/spec/views/import_tasks/index.html.erb_spec.rb deleted file mode 100644 index db70e046c..000000000 --- a/spec/views/import_tasks/index.html.erb_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'spec_helper' - -describe "imports/index.html.erb", :type => :view do - pending "add some examples to (or delete) #{__FILE__}" -end diff --git a/spec/views/import_tasks/new.html.erb_spec.rb b/spec/views/import_tasks/new.html.erb_spec.rb deleted file mode 100644 index 7726bddbc..000000000 --- a/spec/views/import_tasks/new.html.erb_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -# require 'spec_helper' - -# describe "import_tasks/new.html.erb", :type => :view do - -# assign_referential -# let!(:import_task) { assign(:import_task, ImportTask.new) } - -# let!(:available_imports) { assign(:available_imports, []) } - -# it "should display a radio button to choose import type" do -# render -# expect(rendered).to have_selector("input", :type => "select", :name => "import_task[format]") -# end - -# end |
