diff options
Diffstat (limited to 'app')
80 files changed, 43 insertions, 1113 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/assets/javascripts/modal_confirmation.coffee b/app/assets/javascripts/modal_confirmation.coffee new file mode 100644 index 000000000..0c80148e3 --- /dev/null +++ b/app/assets/javascripts/modal_confirmation.coffee @@ -0,0 +1,29 @@ +$(document).ready () => + $.rails.allowAction = (link) => + message = link.data('confirm') + if !message + return true + showConfirmModal link + false + + showConfirmModal = (link) => + message = link.data('confirm') + html = """<div class="modal fade" id="confirmationDialog" tabindex="1" role="dialog"> + <div class="modal-container"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <h4 class="modal-title"> #{I18n.t('warning')} </h4> + </div> + <div class="modal-body"> + <p>#{message}</p> + </div> + <div class="modal-footer"> + <a data-dismiss="modal" class="btn">#{I18n.t('cancel')}</a> + <a data-dismiss="modal" class="btn btn-primary" data-method=#{link.data('method')} href=#{link.attr('href')}>#{I18n.t('ok')}</a> + </div> + </div> + </div> + </div> + </div>""" + $(html).modal() diff --git a/app/assets/javascripts/modal_confirmation.js b/app/assets/javascripts/modal_confirmation.js deleted file mode 100644 index e82a8a81b..000000000 --- a/app/assets/javascripts/modal_confirmation.js +++ /dev/null @@ -1,31 +0,0 @@ -$(document).ready(() => { - $.rails.allowAction = (link) => { - let message = link.data('confirm') - if (!message) return true - showConfirmModal(link) - return false - } - - let showConfirmModal = (link) => { - let message = link.data('confirm') - let html = `<div class="modal fade" id="confirmationDialog" tabindex="1" role="dialog"> - <div class="modal-container"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <h4 class="modal-title"> ${I18n.t('warning')} </h4> - </div> - <div class="modal-body"> - <p>${message}</p> - </div> - <div class="modal-footer"> - <a data-dismiss="modal" class="btn">${I18n.t('cancel')}</a> - <a data-dismiss="modal" class="btn btn-primary" data-method=${link.data('method')} href=${link.attr('href')}>${I18n.t('ok')}</a> - </div> - </div> - </div> - </div> - </div> ` - $(html).modal() - } -})
\ No newline at end of file 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/stop_area_copies_controller.rb b/app/controllers/stop_area_copies_controller.rb deleted file mode 100644 index 992a2bb08..000000000 --- a/app/controllers/stop_area_copies_controller.rb +++ /dev/null @@ -1,31 +0,0 @@ -class StopAreaCopiesController < ChouetteController - include ReferentialSupport - defaults :resource_class => StopAreaCopy - belongs_to :referential do - belongs_to :stop_area, :parent_class => Chouette::StopArea - end - - actions :new, :create - respond_to :html, :only => :new - - def new - @stop_area_copy = StopAreaCopy.new(:hierarchy => params[:hierarchy], :source => parent) - new! do - build_breadcrumb :new - end - end - - def create - @stop_area_copy = StopAreaCopy.new(params[:stop_area_copy]) - @stop_area = parent - if @stop_area_copy.save - redirect_to referential_stop_area_path( @referential,@stop_area_copy.copy ), notice: I18n.t("stop_area_copies.new.success") - else - flash[:error] = I18n.t("stop_area_copies.errors.copy_aborted") + "<br>" + @stop_area_copy.errors.full_messages.join("<br>") - render :action => :new - end - end - - protected - -end 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..7be2b9041 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -115,14 +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") "exports" when path.include?("/compliance_check_tasks") 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/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/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 '<li>' + item.name + '</li>'; - }; - $('##{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/concerns/custom_fields_support.rb b/app/models/concerns/custom_fields_support.rb index f5a76f324..f55ff923b 100644 --- a/app/models/concerns/custom_fields_support.rb +++ b/app/models/concerns/custom_fields_support.rb @@ -31,7 +31,7 @@ module CustomFieldsSupport end def custom_fields_checksum - custom_fields.values.map(&:checksum) + custom_fields.values.sort_by(&:code).map(&:checksum) end def custom_field_values= vals 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/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/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_link.slim b/app/views/connection_links/_connection_link.slim index 44ed5093f..9de04ba12 100644 --- a/app/views/connection_links/_connection_link.slim +++ b/app/views/connection_links/_connection_link.slim @@ -20,14 +20,14 @@ = t('.from') - if connection_link.departure.present? - = link_to_if connection_link.departure, truncate(connection_link.departure.name, :length => 15) , referential_stop_area_path(@referential, connection_link.departure), :title => "#{connection_link.human_attribute_name('departure')} #{connection_link.departure.name}" + = link_to_if connection_link.departure, truncate(connection_link.departure.name, :length => 15) , stop_area_referential_stop_area_path(connection_link.departure.stop_area_referential, connection_link.departure), :title => "#{connection_link.human_attribute_name('departure')} #{connection_link.departure.name}" - else = connection_link.human_attribute_name('undefined') = t('.to') - if connection_link.arrival.present? - = link_to_if( connection_link.arrival, truncate(connection_link.arrival.name, :length => 15), referential_stop_area_path(@referential, connection_link.arrival), :title => "#{connection_link.human_attribute_name('arrival')} #{connection_link.arrival.name}" ) + = link_to_if( connection_link.arrival, truncate(connection_link.arrival.name, :length => 15), stop_area_referential_stop_area_path(connection_link.arrival.stop_area_referential, connection_link.arrival), :title => "#{connection_link.human_attribute_name('arrival')} #{connection_link.arrival.name}" ) - else = connection_link.human_attribute_name("undefined") p 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 - - / <!-- /input-group --> - / <!-- <a data-toggle="collapse" data-parent="#search" href="#advanced_search"> --> - / <!-- <i class="fa fa-plus"></i> <%= "#{t('.advanced_search')}" %> --> - / <!-- </a> --> - -#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/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/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 deleted file mode 100644 index 8c2ef8ed8..000000000 --- a/app/views/import_tasks/_fields_gtfs_import.html.slim +++ /dev/null @@ -1,6 +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 } -= 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/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/referential_stop_areas/_stop_area.html.slim b/app/views/referential_stop_areas/_stop_area.html.slim index bb9ed7ce3..e4dfe63fa 100644 --- a/app/views/referential_stop_areas/_stop_area.html.slim +++ b/app/views/referential_stop_areas/_stop_area.html.slim @@ -3,11 +3,11 @@ .panel-title.clearfix span.pull-right - if policy(stop_area).update? - = link_to edit_referential_stop_area_path(@referential, stop_area), class: 'btn btn-default btn-sm' do + = link_to edit_stop_area_referential_stop_area_path(stop_area.stop_area_referential, stop_area), class: 'btn btn-default btn-sm' do span.fa.fa-pencil - if policy(stop_area).destroy? - = link_to referential_stop_area_path(@referential, stop_area), method: :delete, :data => {:confirm => t('stop_areas.actions.destroy_confirm')}, class: 'btn btn-danger btn-sm' do + = link_to stop_area_referential_stop_area_path(stop_area.stop_area_referential, stop_area), method: :delete, :data => {:confirm => t('stop_areas.actions.destroy_confirm')}, class: 'btn btn-danger btn-sm' do span.fa.fa-trash-o h5 diff --git a/app/views/referential_stop_areas/edit.html.slim b/app/views/referential_stop_areas/edit.html.slim index d88230b58..4641cf0be 100644 --- a/app/views/referential_stop_areas/edit.html.slim +++ b/app/views/referential_stop_areas/edit.html.slim @@ -1,3 +1,3 @@ -- breadcrumb :referential_stop_area, @referential, @stop_area +- breadcrumb :stop_area, @stop_area.stop_area_referential, @stop_area - page_header_content_for @stop_area = render 'form' diff --git a/app/views/referential_stop_areas/index.html.slim b/app/views/referential_stop_areas/index.html.slim index ad04fb02e..39073540d 100644 --- a/app/views/referential_stop_areas/index.html.slim +++ b/app/views/referential_stop_areas/index.html.slim @@ -1,6 +1,6 @@ -- breadcrumb :referential_stop_areas, @referential +- breadcrumb :stop_areas, @referential.workbench.stop_area_referential -= search_form_for @q, :url => referential_stop_areas_path(@referential), remote: true, :html => {:method => :get, class: "form-inline", :id => "search", role: "form"} do |f| += search_form_for @q, :url => stop_area_referential_stop_areas_path(@referential.workbench.stop_area_referential), remote: true, :html => {:method => :get, class: "form-inline", :id => "search", role: "form"} do |f| .panel.panel-default .panel-heading .input-group.col-md-9.col-sm-9 @@ -29,6 +29,6 @@ ul.actions - if policy(Chouette::StopArea).create? li - = link_to t('stop_areas.actions.new'), new_referential_stop_area_path(@referential), class: 'add' + = link_to t('stop_areas.actions.new'), new_stop_area_referential_stop_area_path(@referential.workbench.stop_area_referential), class: 'add' li / = link_to t('stop_areas.actions.default_geometry'), default_geometry_referential_stop_areas_path(@referential), :method => :put, :class => "calculator" diff --git a/app/views/referential_stop_areas/new.html.slim b/app/views/referential_stop_areas/new.html.slim index 9342b673b..8fbef33de 100644 --- a/app/views/referential_stop_areas/new.html.slim +++ b/app/views/referential_stop_areas/new.html.slim @@ -1,2 +1,2 @@ -- breadcrumb :referential_stop_areas, @referential +- breadcrumb :stop_areas, @referential.workbench.stop_area_referential = render 'form' diff --git a/app/views/referential_stop_areas/show.html.slim b/app/views/referential_stop_areas/show.html.slim index 06096bbaa..d464eb438 100644 --- a/app/views/referential_stop_areas/show.html.slim +++ b/app/views/referential_stop_areas/show.html.slim @@ -1,4 +1,4 @@ -- breadcrumb :referential_stop_area, @referential, @stop_area +- breadcrumb :stop_area, @stop_area.stop_area_referential, @stop_area - page_header_content_for @stop_area .page_content diff --git a/app/views/routing_constraint_zones/_stop_points.html.slim b/app/views/routing_constraint_zones/_stop_points.html.slim index 4e85ba8b2..c2da4bb2d 100644 --- a/app/views/routing_constraint_zones/_stop_points.html.slim +++ b/app/views/routing_constraint_zones/_stop_points.html.slim @@ -1,7 +1,7 @@ - stop_points.each do |stop_point| .wrapper div - = link_to referential_stop_area_path(@referential, stop_point.stop_area.id), class: 'navlink', title: "Voir l'arrêt" do + = link_to stop_area_referential_stop_area_path(stop_point.stop_area.stop_are_referential, stop_point.stop_area.id), class: 'navlink', title: "Voir l'arrêt" do span = stop_point.stop_area.name div diff --git a/app/views/routing_constraint_zones/show.html.slim b/app/views/routing_constraint_zones/show.html.slim index 55c952ae6..2d444fe90 100644 --- a/app/views/routing_constraint_zones/show.html.slim +++ b/app/views/routing_constraint_zones/show.html.slim @@ -19,7 +19,7 @@ name: t('.route_stop_points'), \ attribute: 'name', \ link_to: lambda do |stop_point| \ - referential_stop_area_path(@referential, stop_point.stop_area) \ + stop_area_referential_stop_area_path(stop_point.stop_area.stop_area_referential, stop_point.stop_area) \ end \ ), TableBuilderHelper::Column.new( \ diff --git a/app/views/shared/_header.html.slim b/app/views/shared/_header.html.slim index afe802b49..a653e5cdf 100644 --- a/app/views/shared/_header.html.slim +++ b/app/views/shared/_header.html.slim @@ -67,7 +67,7 @@ nav.navbar.navbar-default.navbar-fixed-top role="navigation" = Referential.human_attribute_name("lines") li - = link_to referential_stop_areas_path(@referential) do + = link_to stop_area_referential_stop_areas_path(@referential.workbench.stop_area_referential) do span.badge.pull-right = @referential.stop_areas.size = Referential.human_attribute_name("stop_areas") @@ -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/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/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 = '<i class="fa fa-check"></i>'.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| "<input name=\"vehicle_journey_frequency[vehicle_journey_at_stops_attributes][#{vehicle_journey_at_stop_counter}][#{k}]\" type=\"hidden\" value=\"#{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('<span class="fa fa-pencil"></span>'.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' |
