aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorZog2018-05-29 15:51:52 +0200
committerJohan Van Ryseghem2018-05-30 16:29:33 +0200
commit63a277b88de6703dcf4f32508099def1e9cbca19 (patch)
tree367488bc99b17d479a77a6b2773046470bf213ad /app
parent3e8d95ac8168205ac9526fb8663459d691d09c30 (diff)
downloadchouette-core-63a277b88de6703dcf4f32508099def1e9cbca19.tar.bz2
Refs #7161; Clean views and routes
Diffstat (limited to 'app')
-rw-r--r--app/assets/images/import_task-completed.pngbin1473 -> 0 bytes
-rw-r--r--app/assets/images/import_task-failed.pngbin1460 -> 0 bytes
-rw-r--r--app/assets/images/import_task-pending.pngbin1311 -> 0 bytes
-rw-r--r--app/assets/images/import_task-processing.pngbin1373 -> 0 bytes
-rw-r--r--app/helpers/application_helper.rb2
-rw-r--r--app/helpers/exports_helper.rb33
-rw-r--r--app/helpers/imports_helper.rb47
-rw-r--r--app/helpers/stop_area_copies_helper.rb8
-rw-r--r--app/models/stop_area_copy.rb95
-rw-r--r--app/views/export_tasks/_fields_gtfs_export.html.slim3
-rw-r--r--app/views/export_tasks/_fields_hub_export.html.slim0
-rw-r--r--app/views/export_tasks/_fields_kml_export.html.slim0
-rw-r--r--app/views/export_tasks/_fields_neptune_export.html.slim2
-rw-r--r--app/views/export_tasks/_fields_netex_export.html.slim0
-rw-r--r--app/views/export_tasks/new.html.slim32
-rw-r--r--app/views/export_tasks/new.js.coffee2
-rw-r--r--app/views/import_tasks/_fields_gtfs_import.html.slim5
-rw-r--r--app/views/import_tasks/_fields_neptune_import.html.slim0
-rw-r--r--app/views/import_tasks/_fields_netex_import.slim0
-rw-r--r--app/views/import_tasks/new.html.slim27
-rw-r--r--app/views/import_tasks/new.js.coffee2
-rw-r--r--app/views/stop_area_copies/new.html.slim28
22 files changed, 0 insertions, 286 deletions
diff --git a/app/assets/images/import_task-completed.png b/app/assets/images/import_task-completed.png
deleted file mode 100644
index cd047c5fc..000000000
--- a/app/assets/images/import_task-completed.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/import_task-failed.png b/app/assets/images/import_task-failed.png
deleted file mode 100644
index 5d7b51646..000000000
--- a/app/assets/images/import_task-failed.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/import_task-pending.png b/app/assets/images/import_task-pending.png
deleted file mode 100644
index d5af6a807..000000000
--- a/app/assets/images/import_task-pending.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/import_task-processing.png b/app/assets/images/import_task-processing.png
deleted file mode 100644
index 88990027b..000000000
--- a/app/assets/images/import_task-processing.png
+++ /dev/null
Binary files differ
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