diff options
| author | Zakaria BOUZIANE | 2015-04-13 13:45:30 +0200 |
|---|---|---|
| committer | Zakaria BOUZIANE | 2015-04-13 13:45:30 +0200 |
| commit | 6f684fa9535ce87fc5dabc7dfbefd63517d3f2f9 (patch) | |
| tree | a13573514a0b493ecd163cfbc9e2482ca6c8eefe /app/views | |
| parent | 77bb0938431a40088e7aba33afeba83adebd2b89 (diff) | |
| download | chouette-core-6f684fa9535ce87fc5dabc7dfbefd63517d3f2f9.tar.bz2 | |
Adding validation index and show
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/exports/_export.erb | 2 | ||||
| -rw-r--r-- | app/views/imports/_import.erb | 2 | ||||
| -rw-r--r-- | app/views/validations/_results_dashboard.html.erb | 35 | ||||
| -rw-r--r-- | app/views/validations/_validation.erb | 26 | ||||
| -rw-r--r-- | app/views/validations/_validations.html.erb | 9 | ||||
| -rw-r--r-- | app/views/validations/index.html.erb | 12 | ||||
| -rw-r--r-- | app/views/validations/index.js.erb | 1 | ||||
| -rw-r--r-- | app/views/validations/show.html.erb | 17 | ||||
| -rw-r--r-- | app/views/validations/show.js.coffee | 45 |
9 files changed, 147 insertions, 2 deletions
diff --git a/app/views/exports/_export.erb b/app/views/exports/_export.erb index 8fb310e55..cc3cb9757 100644 --- a/app/views/exports/_export.erb +++ b/app/views/exports/_export.erb @@ -2,7 +2,7 @@ <div class="panel-heading"> <div class="panel-title clearfix"> <span class="pull-right"> - <%= link_to "#{Rails.application.config.iev_url}#{export.datas.links[4].href}", :method => :delete, :data => {:confirm => t('exports.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %> + <%= link_to "#{export.datas.links[4].href}", :method => :delete, :data => {:confirm => t('exports.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %> <span class="fa fa-trash-o"></span> <% end %> </span> diff --git a/app/views/imports/_import.erb b/app/views/imports/_import.erb index 4acc4586b..68a87dd1f 100644 --- a/app/views/imports/_import.erb +++ b/app/views/imports/_import.erb @@ -2,7 +2,7 @@ <div class="panel-heading"> <div class="panel-title clearfix"> <span class="pull-right"> - <%= link_to "#{Rails.application.config.iev_url}#{import.datas.links[4].href}", :method => :delete, :data => {:confirm => t('import_tasks.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %> + <%= link_to "#{import.datas.links[4].href}", :method => :delete, :data => {:confirm => t('import_tasks.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %> <span class="fa fa-trash-o"></span> <% end %> </span> diff --git a/app/views/validations/_results_dashboard.html.erb b/app/views/validations/_results_dashboard.html.erb new file mode 100644 index 000000000..30015df7c --- /dev/null +++ b/app/views/validations/_results_dashboard.html.erb @@ -0,0 +1,35 @@ +<div class="resume row"> + <div class="col-md-4"> + <!-- % file_title = (@validation.filename_extension==".zip") ? t("validations.show.graph.files.title_zip") : t("validations.show.graph.files.title_default", :extension => @validation.filename_extension)% --> + <div class="caption"><!-- %= file_title % --></div> + <div id="files_statistics"></div> + </div> + <div class="col-md-8"> + <div class="caption"><%= t "validations.show.graph.lines.title" %></div> + <div id="objects_statistics"></div> + </div> +</div> + +<div class="report"> + <div class="lines"> + <table class="table table-hover table-striped"> + <thead> + <tr> + <th><%= t("validation_tasks.show.table.line.name") %></th> + <th><%= t("validation_tasks.show.table.line.save") %></th> + </tr> + </thead> + <tbody> + <% @validation.report.line_items.each_with_index do |line_item, index| %> + <% tr_class = (line_item.status == "saved") ? '' : 'class=\'danger\''%> + <tr <%= tr_class %>> + <td><%= line_item.name %></td> + <td><%= t("validation_tasks.show.table.line." + line_item.status ) %></td> + </tr> + <% end %> + </tbody> + </table> + </div> +</div> +<%= javascript_include_tag referential_validation_path(@referential, @validation.id,:format => :js) %> + diff --git a/app/views/validations/_validation.erb b/app/views/validations/_validation.erb new file mode 100644 index 000000000..876002aee --- /dev/null +++ b/app/views/validations/_validation.erb @@ -0,0 +1,26 @@ +<div id="index_item" class="panel panel-default"> + <div class="panel-heading"> + <div class="panel-title clearfix"> + <span class="pull-right"> + <%= link_to "#{validation.datas.links[4].href}", :method => :delete, :data => {:confirm => t('validation_tasks.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %> + <span class="fa fa-trash-o"></span> + <% end %> + </span> + <h5> + <%= link_to( referential_validation_path(@referential, validation.id), :class => "preview", :title => "#{ValidationTask.model_name.human.capitalize} #{validation.name}") do %> + <span class="name"> + <% if !validation.no_save %><i class="fa fa-save"></i><% end %> <%= truncate(validation.name, :length => 20) %> + </span> + <% end %> + </h5> + </div> + </div> + <div class="panel-body"> + </div> + <div class="panel-footer"> + <%= validation_progress_bar_tag(validation) %> + <div class="history"> + <%= validation.created_at %> | <%= validation.user_name %> + </div> + </div> +</div> diff --git a/app/views/validations/_validations.html.erb b/app/views/validations/_validations.html.erb new file mode 100644 index 000000000..9490519a0 --- /dev/null +++ b/app/views/validations/_validations.html.erb @@ -0,0 +1,9 @@ +<div class="page_info"> + <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @validations %> +</div> +<div class="validations paginated_content"> + <%= paginated_content @validations, "validations/validation" %> +</div> +<div class="pagination"> + <%= will_paginate @validations, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer %> +</div> diff --git a/app/views/validations/index.html.erb b/app/views/validations/index.html.erb new file mode 100644 index 000000000..b11911791 --- /dev/null +++ b/app/views/validations/index.html.erb @@ -0,0 +1,12 @@ +<%= title_tag t('.title') %> +<div class="warning"><%= t('.warning') %> </div> + +<div id="validations"><%= render 'validations' %></div> + + +<% content_for :sidebar do %> + <ul class="actions"> + <li><%= link_to t('validations.actions.new'), new_referential_validation_path(@referential), :class => "add" %></li> + <li><%= link_to t('rule_parameter_sets.actions.index'), referential_rule_parameter_sets_path(@referential), :class => "link" %></li> + </ul> +<% end %> diff --git a/app/views/validations/index.js.erb b/app/views/validations/index.js.erb new file mode 100644 index 000000000..67844d1f4 --- /dev/null +++ b/app/views/validations/index.js.erb @@ -0,0 +1 @@ +$('#validations').html('<%= escape_javascript(render("validations")) %>');
\ No newline at end of file diff --git a/app/views/validations/show.html.erb b/app/views/validations/show.html.erb new file mode 100644 index 000000000..b7b655850 --- /dev/null +++ b/app/views/validations/show.html.erb @@ -0,0 +1,17 @@ +<div class="test"> + <% title = @validation.no_save ? "": "<i class='fa fa-save'></i>" %> + <%= title_tag "#{title} #{@validation.name} <span class='status status_#{@validation.status}'>#{ t('validations.statuses.'+ @validation.status) }</span>" %> +</div> + +<div class="validation_show"> + <%= render( :partial => "results_dashboard", :locals => { :referential => @referential} ) %> +</div> + +<% content_for :sidebar do %> + <ul class="actions"> + <li><%= link_to t('validations.actions.destroy'), referential_validation_path(@referential, @validation.id), :method => :delete, :data => {:confirm => t('validations.actions.destroy_confirm')}, :class => "remove" %></li> + </ul> + + <%= history_tag(@validation) %> + +<% end %> diff --git a/app/views/validations/show.js.coffee b/app/views/validations/show.js.coffee new file mode 100644 index 000000000..e74612354 --- /dev/null +++ b/app/views/validations/show.js.coffee @@ -0,0 +1,45 @@ +jQuery -> + + get_validation_results = (html_container, html_element) -> + html_container.children().each -> + if( $( this ).is(html_element) ) + $( this ).show() + else + $( this ).hide() + + Morris.Donut({ + element: 'files_statistics', + data: [ + {label: "<%= t 'validations.show.graph.files.error' %>", value: <%= @validation.report.error_files.count %> }, + {label: "<%= t 'validations.show.graph.files.ignored' %>", value: <%= @validation.report.ignored_files.count %> }, + {label: "<%= t 'validations.show.graph.files.ok' %>", value: <%= @validation.report.ok_files.count %> } + ] + colors: [ "#e22b1b", "#898e7f", "#8fc861" ] + }).on('click', update = (i, row) -> + switch i + when 0 then get_validation_results( $(".report"), $(".files_error")) + when 1 then get_validation_results( $(".report"), $(".files_ignored")) + when 2 then get_validation_results( $(".report"), $(".files_ok")) + else console.log "Error no other value for donut chart") + + Morris.Bar({ + element: 'objects_statistics', + data: [ + { object: "<%= t("validations.show.graph.lines.lines_stats").html_safe %>", value: <%= @validation.report.lines %> }, + { object: "<%= t("validations.show.graph.lines.routes_stats").html_safe %>", value: <%= @validation.report.routes %> }, + { object: "<%= t("validations.show.graph.lines.connection_links_stats").html_safe %>", value: <%= @validation.report.connection_links %> }, + { object: "<%= t("validations.show.graph.lines.time_tables_stats").html_safe %>", value: <%= @validation.report.time_tables %> }, + { object: "<%= t("validations.show.graph.lines.stop_areas_stats").html_safe %>", value: <%= @validation.report.stop_areas %> }, + { object: "<%= t("validations.show.graph.lines.access_points_stats").html_safe %>", value: <%= @validation.report.access_points %> }, + { object: "<%= t("validations.show.graph.lines.vehicle_journeys_stats").html_safe %>", value: <%= @validation.report.vehicle_journeys %> }, + { object: "<%= t("validations.show.graph.lines.journey_patterns_stats").html_safe %>", value: <%= @validation.report.journey_patterns %> }, + ], + xkey: 'object', + ykeys: ['value'], + labels: ['<%= t "validations.show.graph.lines.objects_label" %>'] + xLabelAngle: 40, + xAxisLabelTopPadding: 7, + padding: 40, + hideHover: true + }).on('click', update = (i, row) -> + get_validation_results( $(".report"), $(".lines")) )
\ No newline at end of file |
