diff options
| author | Michel Etienne | 2012-07-02 08:11:29 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-07-02 08:11:29 +0200 |
| commit | 0412d82c225ddd47e3c0436ae5d421b1098d2fa0 (patch) | |
| tree | 7ed33590d68d9066fdd416b41f949dd075d209da /app/views | |
| parent | 8ccb51a3fd3907388ccaa02652a50af5e2ac08e0 (diff) | |
| download | chouette-core-0412d82c225ddd47e3c0436ae5d421b1098d2fa0.tar.bz2 | |
add file validation
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/exports/new.html.erb | 9 | ||||
| -rw-r--r-- | app/views/file_validations/_file_validation.erb | 13 | ||||
| -rw-r--r-- | app/views/file_validations/index.html.erb | 20 | ||||
| -rw-r--r-- | app/views/file_validations/new.html.erb | 45 | ||||
| -rw-r--r-- | app/views/file_validations/show.html.erb | 149 | ||||
| -rw-r--r-- | app/views/help/faq.textile | 6 | ||||
| -rw-r--r-- | app/views/help/schema.textile | 6 | ||||
| -rw-r--r-- | app/views/help/toc.textile | 2 | ||||
| -rw-r--r-- | app/views/imports/new.html.erb | 9 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 4 | ||||
| -rw-r--r-- | app/views/routes/_route.html.erb | 1 | ||||
| -rw-r--r-- | app/views/stop_areas/add_routing_lines.html.erb | 9 | ||||
| -rw-r--r-- | app/views/stop_areas/add_routing_stops.html.erb | 9 | ||||
| -rw-r--r-- | app/views/time_table_dates/_form.html.erb | 2 | ||||
| -rw-r--r-- | app/views/time_table_periods/_form.html.erb | 4 | ||||
| -rw-r--r-- | app/views/time_tables/_form.erb | 3 |
16 files changed, 263 insertions, 28 deletions
diff --git a/app/views/exports/new.html.erb b/app/views/exports/new.html.erb index 16c6e9720..82409955b 100644 --- a/app/views/exports/new.html.erb +++ b/app/views/exports/new.html.erb @@ -9,11 +9,10 @@ <% end %> <% end %> - <%= form.buttons do %> - <%= form.commit_button true %> - <li><%= t('or') %></li> - <li><%= link_to t('cancel'), :back %></li> - <% end %> + <%= form.actions do %> + <%= form.action :submit, :as => :button , :label => t( 'formtastic.export' ) %> + <%= form.action :cancel, :as => :link %> + <% end %> <% end %> <%= javascript_include_tag new_referential_export_path(@referential, :format => :js) %> diff --git a/app/views/file_validations/_file_validation.erb b/app/views/file_validations/_file_validation.erb new file mode 100644 index 000000000..3e895f445 --- /dev/null +++ b/app/views/file_validations/_file_validation.erb @@ -0,0 +1,13 @@ +<%= div_for(file_validation, :class => :file_validation) do %> + <%= link_to(file_validation_path(file_validation), :class => "preview") do %> + <%= image_tag "file-validation-#{file_validation.status}.png" %> + <% end %> + <%= link_to(file_validation.name, file_validation_path(file_validation)) %> + <div class="info"> + <%= l file_validation.created_at %><br/> + <%= file_validation.file_name %> + <div class="actions"> + <%= link_to t("actions.destroy"), file_validation_path(file_validation), :method => :delete, :confirm => t('file_validations.actions.destroy_confirm'), :class => "remove" %> + </div> + </div> +<% end %> diff --git a/app/views/file_validations/index.html.erb b/app/views/file_validations/index.html.erb new file mode 100644 index 000000000..e1416fa96 --- /dev/null +++ b/app/views/file_validations/index.html.erb @@ -0,0 +1,20 @@ +<%= title_tag t('.title') %> + +<div class="pagination"> + <div class="page_info"> + <%= page_entries_info @file_validations %> + </div> + <%= will_paginate @file_validations, :container => false %> +</div> +<div class="file_validations paginated_content"> + <%= render :partial => "file_validation", :collection => @file_validations %> +</div> +<div class="pagination"> + <%= will_paginate @file_validations, :container => false %> +</div> + +<% content_for :sidebar do %> +<ul class="actions"> + <li><%= link_to t('file_validations.actions.new'), new_file_validation_path(), :class => "add" %></li> +</ul> +<% end %> diff --git a/app/views/file_validations/new.html.erb b/app/views/file_validations/new.html.erb new file mode 100644 index 000000000..d02584e52 --- /dev/null +++ b/app/views/file_validations/new.html.erb @@ -0,0 +1,45 @@ +<%= title_tag t(".title") %> + +<%= semantic_form_for [@file_validation], :as => :file_validation, :url => file_validations_path() do |form| %> + <%= form.inputs do %> + <%= form.input :resources, :as => :file %> + <%= form.input :test3_1_minimal_distance, :as => :number,:input_html => { :value => '10.0' }, :wrapper_html => { :class => 'fl' } %> + <%= form.input :test3_2_minimal_distance, :as => :number,:input_html => { :value => '10.0' }, :wrapper_html => { :class => 'fl' } %> + <%= form.input :test3_2_polygon_points , :as => :text ,:input_html => { :rows => '4', :value => '2.303466,51.399206 8.411865,49.05227 7.950439,43.34116 3.138427,41.869561 -2.376709,43.2932 -5.848389,48.705463' }%> + <%= form.input :test3_7_minimal_distance, :as => :number ,:input_html => { :value => '50.0' }, :wrapper_html => { :class => 'fl1' } %> + <%= form.input :test3_7_maximal_distance, :as => :number ,:input_html => { :value => '15000.0' },:wrapper_html => { :class => 'fl2' } %> + <%= form.input :test3_8a_minimal_speed, :as => :number ,:input_html => { :value => '3.0' }, :wrapper_html => { :class => 'fl1' } %> + <%= form.input :test3_8a_maximal_speed, :as => :number ,:input_html => { :value => '6.0' }, :wrapper_html => { :class => 'fl2' } %> + <%= form.input :test3_8b_minimal_speed, :as => :number ,:input_html => { :value => '4.0' }, :wrapper_html => { :class => 'fl1' } %> + <%= form.input :test3_8b_maximal_speed, :as => :number ,:input_html => { :value => '7.0' }, :wrapper_html => { :class => 'fl2' } %> + <%= form.input :test3_8c_minimal_speed, :as => :number ,:input_html => { :value => '2.0' }, :wrapper_html => { :class => 'fl1' } %> + <%= form.input :test3_8c_maximal_speed, :as => :number ,:input_html => { :value => '5.0' }, :wrapper_html => { :class => 'fl2' } %> + <%= form.input :test3_8d_minimal_speed, :as => :number ,:input_html => { :value => '1.0' }, :wrapper_html => { :class => 'fl1' } %> + <%= form.input :test3_8d_maximal_speed, :as => :number ,:input_html => { :value => '4.0' }, :wrapper_html => { :class => 'fl2' } %> + <%= form.input :test3_9_minimal_speed, :as => :number ,:input_html => { :value => '5.0' }, :wrapper_html => { :class => 'fl1' } %> + <%= form.input :test3_9_maximal_speed, :as => :number ,:input_html => { :value => '45.0' }, :wrapper_html => { :class => 'fl2' } %> + <% end %> + <%= form.inputs do %> + <%= form.input :test3_10_minimal_distance, :as => :number ,:input_html => { :value => '50.0' }, :wrapper_html => { :class => 'fl' } %> + <%= form.input :test3_15_minimal_time, :as => :number,:input_html => { :value => '1' }, :wrapper_html => { :class => 'fl' } %> + <%= form.input :test3_16_1_maximal_time, :as => :number,:input_html => { :value => '120' }, :wrapper_html => { :class => 'fl' } %> + <%= form.input :test3_16_3a_maximal_time, :as => :number ,:input_html => { :value => '600' }, :wrapper_html => { :class => 'fl' } %> + <%= form.input :test3_16_3b_maximal_time, :as => :number ,:input_html => { :value => '300' }, :wrapper_html => { :class => 'fl' } %> + <%= form.input :test3_21a_minimal_speed, :as => :number ,:input_html => { :value => '3.0' }, :wrapper_html => { :class => 'fl1' } %> + <%= form.input :test3_21a_maximal_speed, :as => :number ,:input_html => { :value => '6.0' }, :wrapper_html => { :class => 'fl2' } %> + <%= form.input :test3_21b_minimal_speed, :as => :number ,:input_html => { :value => '4.0' }, :wrapper_html => { :class => 'fl1' } %> + <%= form.input :test3_21b_maximal_speed, :as => :number ,:input_html => { :value => '7.0' }, :wrapper_html => { :class => 'fl2' } %> + <%= form.input :test3_21c_minimal_speed, :as => :number ,:input_html => { :value => '2.0' }, :wrapper_html => { :class => 'fl1' } %> + <%= form.input :test3_21c_maximal_speed, :as => :number ,:input_html => { :value => '2.0' }, :wrapper_html => { :class => 'fl2' } %> + <%= form.input :test3_21d_minimal_speed, :as => :number ,:input_html => { :value => '1.0' }, :wrapper_html => { :class => 'fl1' } %> + <%= form.input :test3_21d_maximal_speed, :as => :number ,:input_html => { :value => '4.0' }, :wrapper_html => { :class => 'fl2' } %> + <% end %> + <%= form.inputs do %> + <%= form.input :projection_reference ,:input_html => { :value => 'WGS84' }, :wrapper_html => { :class => 'fl' } %> + <% end %> + + <%= form.actions do %> + <%= form.action :submit, :as => :button , :label => t( 'formtastic.validate' ) %> + <%= form.action :cancel, :as => :link %> + <% end %> +<% end %> diff --git a/app/views/file_validations/show.html.erb b/app/views/file_validations/show.html.erb new file mode 100644 index 000000000..5a63c9c81 --- /dev/null +++ b/app/views/file_validations/show.html.erb @@ -0,0 +1,149 @@ +<%= title_tag @file_validation.name %> + +<div class="file_validation_show"> + <div class="panelDataSection"><%= t(".summary") %></div> + + <div class="neptune-panel"> + <label><%= FileValidation.human_attribute_name(:created_at) %>: </label> + <%= l @file_validation.created_at %><br/> + <label><%= FileValidation.human_attribute_name(:status) %>: </label> + <%= t @file_validation.status, :scope => "file_validations.statuses" %><br/> + <label><%= FileValidation.human_attribute_name(:file_name) %>: </label> + <%= @file_validation.file_name %><br/> + <br/> + <br/> + <% if @file_validation.status == 'completed' %> + <table> + <tbody> + <tr> + <td><%= image_tag "severity-uncheck.png" , :alt => t("uncheck", :scope => "file_validation_log_messages.severities") %> + <%= t( "file_validations.uncheck_count" , :count => @file_validation.uncheck_count )%> + </td> + <td><%= image_tag "severity-ok.png" , :alt => t("ok", :scope => "file_validation_log_messages.severities") %> + <%= t( "file_validations.ok_count" , :count => @file_validation.ok_count )%> + </td> + <td><%= image_tag "severity-warning.png" , :alt => t("warning", :scope => "file_validation_log_messages.severities") %> + <%= t( "file_validations.warning_count" , :count => @file_validation.warning_count )%> + </td> + <td><%= image_tag "severity-error.png" , :alt => t("error", :scope => "file_validation_log_messages.severities") %> + <%= t( "file_validations.error_count" , :count => @file_validation.error_count )%> + </td> + <td><%= image_tag "severity-fatal.png" , :alt => t("fatal", :scope => "file_validation_log_messages.severities") %> + <%= t( "file_validations.fatal_count" , :count => @file_validation.fatal_count )%> + </td> + </tr> + </tbody> + </table> + <% end %> + </div> +<% if @file_validation.status == 'completed' %> + <h3><%= t(".details") %></h3> + <% @file_validation.log_message_tree.each do |message1| %> + <label class="category"><%= message1.full_message %></label> + <div id="<%= message1.key %>" style="margin-left: 40px;"> + <% message1.children.each do |message2| %> + <div class="panelDataSection"><%= message2.full_message %></div> + <div id="<%= message2.severity %>" class="neptune-panel"> + <% message2.children.each do |message3| %> + <div class="<%= message3.severity %>"> + <div> + <label id=""><%= message3.label %></label> + </div> + <div id="" class="step"> + <%= message3.full_message %> + </div> + </div> + <% if !message3.children.nil? %> + <div id="" class="detail"> </div> + <div id="detail_0_4_0" class="neptune-panel-inSide"> + <ol> + <% message3.children.each do |message4| %> + <li> <%= message4.full_message %> </li> + <br> + <% end %> + </ol> + </div> + <% end %> + <% end %> + </div> + <% end %> + </div> + <% end %> + <div class="panelDataSection"><%= t(".parameters") %></div> + <div class="neptune-panel"> + <label class="label"><%= t("activerecord.attributes.file_validation.test3_1_minimal_distance") %> :</label> + <label><%= @file_validation.test3_1_minimal_distance %></label> + <br> + <label class="label"><%= t("activerecord.attributes.file_validation.test3_2_minimal_distance") %> :</label> + <label><%= @file_validation.test3_2_minimal_distance %></label> + <br> + <label class="label"><%= t("activerecord.attributes.file_validation.test3_2_polygon_points") %> :</label> + <label><%= @file_validation.test3_2_polygon_points %></label> + <br> + <label class="label"><%= t("activerecord.attributes.file_validation.test3_7_minimal_distance") %> :</label> + <label><%= @file_validation.test3_7_minimal_distance %></label> / + <label><%= @file_validation.test3_7_maximal_distance %></label> + <br> + <label class="label"><%= t("activerecord.attributes.file_validation.test3_8a_minimal_speed") %> :</label> + <label><%= @file_validation.test3_8a_minimal_speed %></label> / + <label><%= @file_validation.test3_8a_maximal_speed %></label> + <br> + <label class="label"><%= t("activerecord.attributes.file_validation.test3_8b_minimal_speed") %> :</label> + <label><%= @file_validation.test3_8b_minimal_speed %></label> / + <label><%= @file_validation.test3_8b_maximal_speed %></label> + <br> + <label class="label"><%= t("activerecord.attributes.file_validation.test3_8c_minimal_speed") %> :</label> + <label><%= @file_validation.test3_8c_minimal_speed %></label> / + <label><%= @file_validation.test3_8c_maximal_speed %></label> + <br> + <label class="label"><%= t("activerecord.attributes.file_validation.test3_8d_minimal_speed") %> :</label> + <label><%= @file_validation.test3_8d_minimal_speed %></label> / + <label><%= @file_validation.test3_8d_maximal_speed %></label> + <br> + <label class="label"><%= t("activerecord.attributes.file_validation.test3_9_minimal_speed") %> :</label> + <label><%= @file_validation.test3_9_minimal_speed %></label> / + <label><%= @file_validation.test3_9_maximal_speed %></label> + <br> + <label class="label"><%= t("activerecord.attributes.file_validation.test3_10_minimal_distance") %> :</label> + <label><%= @file_validation.test3_10_minimal_distance %></label> + <br> + <label class="label"><%= t("activerecord.attributes.file_validation.test3_15_minimal_time") %> :</label> + <label><%= @file_validation.test3_15_minimal_time %></label> + <br> + <label class="label"><%= t("activerecord.attributes.file_validation.test3_16_1_maximal_time") %> :</label> + <label><%= @file_validation.test3_16_1_maximal_time %></label> + <br> + <label class="label"><%= t("activerecord.attributes.file_validation.test3_16_3a_maximal_time") %> :</label> + <label><%= @file_validation.test3_16_3a_maximal_time %></label> + <br> + <label class="label"><%= t("activerecord.attributes.file_validation.test3_16_3b_maximal_time") %> :</label> + <label><%= @file_validation.test3_16_3b_maximal_time %></label> + <br> + <label class="label"><%= t("activerecord.attributes.file_validation.test3_21a_minimal_speed") %> :</label> + <label><%= @file_validation.test3_21a_minimal_speed %></label> / + <label><%= @file_validation.test3_21a_maximal_speed %></label> + <br> + <label class="label"><%= t("activerecord.attributes.file_validation.test3_21b_minimal_speed") %> :</label> + <label><%= @file_validation.test3_21b_minimal_speed %></label> / + <label><%= @file_validation.test3_21b_maximal_speed %></label> + <br> + <label class="label"><%= t("activerecord.attributes.file_validation.test3_21c_minimal_speed") %> :</label> + <label><%= @file_validation.test3_21c_minimal_speed %></label> / + <label><%= @file_validation.test3_21c_maximal_speed %></label> + <br> + <label class="label"><%= t("activerecord.attributes.file_validation.test3_21d_minimal_speed") %> :</label> + <label><%= @file_validation.test3_21d_minimal_speed %></label> / + <label><%= @file_validation.test3_21d_maximal_speed %></label> + <br> + <label class="label"><%= t("activerecord.attributes.file_validation.projection_reference") %> :</label> + <label><%= @file_validation.projection_reference %></label> + + </div> + + <% end %> +</div> +<% content_for :sidebar do %> +<ul class="actions"> + <li><%= link_to t('file_validations.actions.destroy'), file_validation_path(@file_validation), :method => :delete, :confirm => t('file_validations.actions.destroy_confirm'), :class => "remove" %></li> +</ul> +<% end %> diff --git a/app/views/help/faq.textile b/app/views/help/faq.textile new file mode 100644 index 000000000..5fb8cfa9a --- /dev/null +++ b/app/views/help/faq.textile @@ -0,0 +1,6 @@ +--- +layout: default +title: Foire aux questions +--- + +Rédaction ultérieure
\ No newline at end of file diff --git a/app/views/help/schema.textile b/app/views/help/schema.textile new file mode 100644 index 000000000..ffefaa680 --- /dev/null +++ b/app/views/help/schema.textile @@ -0,0 +1,6 @@ +--- +layout: default +title: Vue d'ensemble +--- + +Rédaction ultérieure
\ No newline at end of file diff --git a/app/views/help/toc.textile b/app/views/help/toc.textile index 1ce35cac2..2c2bd096c 100644 --- a/app/views/help/toc.textile +++ b/app/views/help/toc.textile @@ -8,6 +8,7 @@ h3. Sommaire # "Généralités":introduction ## "Normalisation":normalisation ## "Documentation":documentation +## "Vue d'ensemble":schema # "Espaces de données":dataspaces # "Réseaux":networks # "Transporteurs":companies @@ -26,4 +27,5 @@ h3. Sommaire ## Validation # Divers ## "API Rest":restapis +## "FAQ":faq diff --git a/app/views/imports/new.html.erb b/app/views/imports/new.html.erb index 1b797b0d6..206967073 100644 --- a/app/views/imports/new.html.erb +++ b/app/views/imports/new.html.erb @@ -18,10 +18,9 @@ <%= form.input :resources, :as => :file %> <% end %> - <%= form.buttons do %> - <%= form.commit_button true %> - <li><%= t('or') %></li> - <li><%= link_to t('cancel'), :back %></li> - <% end %> + <%= form.actions do %> + <%= form.action :submit, :as => :button , :label => t( 'formtastic.import' ) %> + <%= form.action :cancel, :as => :link %> + <% end %> <% end %> <% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a40159079..83e4e14fa 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -34,8 +34,8 @@ <% if help_page? %> <li><%= link_to "Aide", help_path, :class => "current" %></li> <% elsif ! selected_referential? %> - <li><%= tab_link_to Referential, referentials_path, :class => "current" %></li> - <li><%= tab_link_to FileValidation, file_validations_path, :class => "current" %></li> + <li><%= tab_link_to Referential, referentials_path, :class => ("current" if current_page?(referentials_path)) %></li> + <li><%= tab_link_to FileValidation, file_validations_path %></li> <% else %> <li><%= link_to t("layouts.tabs.dashboard"), referential_path(@referential), :class => ("current" if current_page?(referential_path(@referential))) %></li> <li><%= tab_link_to Chouette::Network, referential_networks_path(@referential) %></li> diff --git a/app/views/routes/_route.html.erb b/app/views/routes/_route.html.erb index 4ec720e5d..e99f418b1 100644 --- a/app/views/routes/_route.html.erb +++ b/app/views/routes/_route.html.erb @@ -12,7 +12,6 @@ <% end %> <%= route.human_attribute_name('wayback_code') %> <%= (route.wayback=="A") ? t('route.wayback.positive') : t('wayback.negative') %> <div class="actions"> - <%= link_to t("routes.actions.edit"), edit_referential_line_route_path(@referential, @line, route), :class => "edit" %> | <%= link_to t("vehicle_journeys.actions.index"), referential_line_route_vehicle_journeys_path(@referential, @line, route), :class => "link" %> </div> </div> diff --git a/app/views/stop_areas/add_routing_lines.html.erb b/app/views/stop_areas/add_routing_lines.html.erb index 967d502d8..e0750a758 100644 --- a/app/views/stop_areas/add_routing_lines.html.erb +++ b/app/views/stop_areas/add_routing_lines.html.erb @@ -6,11 +6,10 @@ <%= form.input :routing_line_ids, :as => :text, :input_html => { :"data-pre" => ( @lines.map { |line| { :id => line.id.to_s, :name => "#{line.number} - #{line.name}" } } ).to_json } %> <% end %> - <%= form.buttons do %> - <%= form.commit_button %> - <%= t('or') %> - <%= link_to t('cancel'), [@referential, @stop_area] %> - <% end %> + <%= form.actions do %> + <%= form.action :submit, :as => :button %> + <%= form.action :cancel, :as => :link %> + <% end %> </div> <% end %> diff --git a/app/views/stop_areas/add_routing_stops.html.erb b/app/views/stop_areas/add_routing_stops.html.erb index 49c0cad7a..5fc2326f0 100644 --- a/app/views/stop_areas/add_routing_stops.html.erb +++ b/app/views/stop_areas/add_routing_stops.html.erb @@ -6,11 +6,10 @@ <%= form.input :routing_stop_ids, :as => :text, :input_html => { :"data-pre" => ( @stops.map { |stop| { :id => stop.id.to_s, :name => "#{stop.name} #{stop.country_code}" } } ).to_json } %> <% end %> - <%= form.buttons do %> - <%= form.commit_button %> - <%= t('or') %> - <%= link_to t('cancel'), [@referential, @stop_area] %> - <% end %> + <%= form.actions do %> + <%= form.action :submit, :as => :button %> + <%= form.action :cancel, :as => :link %> + <% end %> </div> <% end %> diff --git a/app/views/time_table_dates/_form.html.erb b/app/views/time_table_dates/_form.html.erb index decc0b3cc..e3d07e128 100644 --- a/app/views/time_table_dates/_form.html.erb +++ b/app/views/time_table_dates/_form.html.erb @@ -1,6 +1,6 @@ <%= semantic_form_for [@referential, @time_table, @time_table_date] do |form| %> <%= form.inputs do %> - <%= form.input :date, :as => :date, :label => @time_table_date.human_attribute_name("date") %> + <%= form.input :date, :as => :date_picker, :label => @time_table_date.human_attribute_name("date") %> <% end %> <%= form.actions do %> diff --git a/app/views/time_table_periods/_form.html.erb b/app/views/time_table_periods/_form.html.erb index 71f8f3fd1..cd7681df6 100644 --- a/app/views/time_table_periods/_form.html.erb +++ b/app/views/time_table_periods/_form.html.erb @@ -1,7 +1,7 @@ <%= semantic_form_for [@referential, @time_table, @time_table_period] do |form| %> <%= form.inputs do %> - <%= form.input :period_start, :as => :date, :label => @time_table_period.human_attribute_name("period_start") %> - <%= form.input :period_end, :as => :date, :label => @time_table_period.human_attribute_name("period_end") %> + <%= form.input :period_start, :as => :date_picker, :label => @time_table_period.human_attribute_name("period_start") %> + <%= form.input :period_end, :as => :date_picker, :label => @time_table_period.human_attribute_name("period_end") %> <% end %> <%= form.actions do %> <%= form.action :submit, :as => :button %> diff --git a/app/views/time_tables/_form.erb b/app/views/time_tables/_form.erb index f72e081da..87f6f890a 100644 --- a/app/views/time_tables/_form.erb +++ b/app/views/time_tables/_form.erb @@ -29,7 +29,6 @@ <%= form.action :cancel, :as => :link %> <% end %> <% end %> -<h3 class="dates"><%= t('.dates') %></h3> -<%= render "dates" %> + |
