diff options
| author | jpl | 2016-07-28 15:49:27 +0200 |
|---|---|---|
| committer | jpl | 2016-07-28 15:49:37 +0200 |
| commit | 893573d9e102409891ef7b0a98d0225c85ca62ed (patch) | |
| tree | 407f879988dc38f527ea13c6b9d530e5dc3f55fa | |
| parent | c73fc634eee6e306594df37f7ec21be7a6366dbd (diff) | |
| download | chouette-core-893573d9e102409891ef7b0a98d0225c85ca62ed.tar.bz2 | |
Refs #1295: convert erb to slim (compliance_checks)
18 files changed, 267 insertions, 226 deletions
diff --git a/app/views/compliance_checks/_compliance_check.html.erb b/app/views/compliance_checks/_compliance_check.html.erb deleted file mode 100644 index 8fc21d6ab..000000000 --- a/app/views/compliance_checks/_compliance_check.html.erb +++ /dev/null @@ -1,24 +0,0 @@ -<div id="index_item" class="panel panel-default"> - <div class="panel-heading"> - <div class="panel-title clearfix"> - <span class="pull-right"> - <%= link_to referential_compliance_check_path(@referential, compliance_check.id), :method => :delete, :data => {:confirm => t('compliance_checks.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %> - <span class="fa fa-trash-o"></span> - <% end %> - </span> - <h5> - <%= link_to( referential_compliance_check_path(@referential, compliance_check.id), :class => "preview", :title => "#{ComplianceCheck.model_name.human.capitalize} #{compliance_check.name}") do %> - <%= job_status_title(compliance_check) %> - <% end %> - </h5> - </div> - </div> - <div class="panel-body"> - <p><%= link_to( font_awesome_classic_tag("fa-external-link") + t("compliance_checks.actions.report"), report_referential_compliance_check_path(@referential, compliance_check.id)) if compliance_check.report? %></p> - </div> - <div class="panel-footer"> - <div class="history"> - <%= l compliance_check.created_at, :format => "%d/%m/%Y %H:%M" %> | <%= compliance_check.user_name %> - </div> - </div> -</div> diff --git a/app/views/compliance_checks/_compliance_check.html.slim b/app/views/compliance_checks/_compliance_check.html.slim new file mode 100644 index 000000000..db4753563 --- /dev/null +++ b/app/views/compliance_checks/_compliance_check.html.slim @@ -0,0 +1,17 @@ +#index_item.panel.panel-default + .panel-heading + .panel-title.clearfix + span.pull-right + = link_to referential_compliance_check_path(@referential, compliance_check.id), :method => :delete, :data => {:confirm => t('compliance_checks.actions.destroy_confirm')}, class: 'btn btn-danger btn-sm' do + span.fa.fa-trash-o + h5 + = link_to referential_compliance_check_path(@referential, compliance_check.id), class: 'preview', title: "#{ComplianceCheck.model_name.human.capitalize} #{compliance_check.name}" do + = job_status_title(compliance_check) + + .panel-body + p + = link_to font_awesome_classic_tag("fa-external-link") + t("compliance_checks.actions.report"), report_referential_compliance_check_path(@referential, compliance_check.id)) if compliance_check.report? + .panel-footer + .history + = l compliance_check.created_at, :format => "%d/%m/%Y %H:%M" + = " | #{compliance_check.user_name}"
\ No newline at end of file diff --git a/app/views/compliance_checks/_compliance_check_results.erb b/app/views/compliance_checks/_compliance_check_results.erb deleted file mode 100644 index 28d5a289e..000000000 --- a/app/views/compliance_checks/_compliance_check_results.erb +++ /dev/null @@ -1,101 +0,0 @@ -<p> -<form class="form-inline"> - <div class="form-group"> - <label><%= t("shared.ie_report.search") %></label> - <input id="filter" type="text" class="form-control"> - </div> - <div class="form-group"> - <label><%=ComplianceCheckResult.human_attribute_name(:severity)%></label> - <select class="filter-severity form-control"> - <option></option> - <option value="severity-error"><%= t("compliance_check_result.severities.error") %></option> - <option value="severity-warning"><%= t("compliance_check_result.severities.warning") %></option> - </select> - </div> - <div class="form-group"> - <label><%=ComplianceCheckResult.human_attribute_name(:status)%></label> - <select class="filter-status form-control"> - <option></option> - <option value="status-ok"><%= t("compliance_check_result.statuses.ok") %></option> - <option value="status-nok"><%= t("compliance_check_result.statuses.nok") %></option> - <option value="status-uncheck"><%= t("compliance_check_result.statuses.uncheck") %></option> - </select> - </div> -</form> -</p> -<table class="table table-hover toggle-circle toggle-medium" - data-filter="#filter" - data-page-size="20" - data-title-nok="<%=t('compliance_check_result.statuses.nok') %>" - data-title-uncheck="<%=t('compliance_check_result.statuses.uncheck') %>" - data-title-ok="<%=t('compliance_check_result.statuses.ok') %>"> - <thead> - <tr> - <th data-sort-ignore="true"><%= ComplianceCheckResult.human_attribute_name(:status) %></th> - <th class="col-md-1" data-sort-ignore="true"><%= ComplianceCheckResult.human_attribute_name(:severity) %></th> - <th class="col-md-3"><%= ComplianceCheckResult.human_attribute_name(:rule_code) %></th> - <th class="col-md-2"><%=t('compliance_check_results.errors') %></th> - <th class="col-md-6" data-toggle="true" data-sort-ignore="true"><%= ComplianceCheckResult.human_attribute_name(:detail) %></th> - <th data-hide="all" data-sort-ignore="true"></th> - </tr> - </thead> - <tbody> - <% if compliance_check_validation_report %> - <% compliance_check_validation_report.tests.each_with_index do |test, index| %> - <tr class='<%= "#{test.result}_#{test.severity}" %>'> - <td data-value="<%="status-#{test.result}"%>"><%= status_icon( test.result, test.severity ) %> </td> - <td data-value="<%="severity-#{test.severity}"%>"><%= t("compliance_check_result.severities.#{test.severity}_txt") %></td> - <td data-value="<%= "#{test.result}_#{test.severity}" %>"> - <%= link_to test.test_id, test_definition(test.test_id), title: ComplianceCheckResult.human_attribute_name(test.test_id), target: "compliance_check" %> - </td> - <td> - <%= ("#{test.error_count || 0} #{ComplianceCheckResult.human_attribute_name(:violation_count)}") if test.errors.present? %> - </td> - <td> - <%= truncate(t("activemodel.attributes.compliance_check_result.#{test.test_id}"), length: 50)%> - </td> - <td> - <p><b><%=t("activemodel.attributes.compliance_check_result.#{test.test_id}")%></b></p> - <% if test.errors.present? %> - <% test.errors.first(10).each do |error| %> - <dl class="inline"> - <dt> - <% if error["source"].present? %> - <% if error[:source].object_path.present? %> - <% if error[:source].label.present? %> - <%= link_to error[:source].label, object_url(@referential.id, error), target: :_blank %> - <% else %> - <%= link_to "#{error[:source].object_path.type} (#{error[:source].object_path.id})", object_url(@referential.id, error), target: :_blank %> - <% end %> - <% end %> - <% if error[:source].file.present? %> - <%= error[:source].objectid if error[:source].objectid.present? %> - <% end %> - <% end %> - </dt> - <dd><%=t("compliance_check_result.details.detail_#{error[:error_id]}", object_labels_hash(error))%></dd> - </dl> - <% if error[:source].file.present? %> - <p class="file_error"> - <%= error[:source].file.filename %> - <%= ", li: #{error[:source].file.line_number}" if error[:source].file.line_number.present? %> - <%= ", co: #{error[:source].file.column_number}" if error[:source].file.column_number.present? %> - </p> - <% end %> - <% end %> - <% end %> - </td> - </tr> - <% end %> - <% else %> - <tr> - <td colspan="6"><%= t('compliance_check_results.in_progress') %></td> - </tr> - <% end %> - </tbody> - <tfoot class="hide-if-no-paging"> - <tr> - <td colspan="5"><ul class="pagination pagination-centered"></ul></td> - </tr> - </tfoot> -</table> diff --git a/app/views/compliance_checks/_compliance_check_results.html.slim b/app/views/compliance_checks/_compliance_check_results.html.slim new file mode 100644 index 000000000..e2b8cb6f4 --- /dev/null +++ b/app/views/compliance_checks/_compliance_check_results.html.slim @@ -0,0 +1,92 @@ +p + form.form-inline + .form-group + label = t('shared.ie_report.search') + input#filter.form-control type="text" + + .form-group + label = ComplianceCheckResult.human_attribute_name(:severity) + select.filter-severity.form-control + option + option value="severity-error" + = t('compliance_check_result.severities.error') + option value="severity-warning" + = t('compliance_check_result.severities.warning') + + .form-group + label = ComplianceCheckResult.human_attribute_name(:status) + select.filter-status.form-control + option + option value="status-ok" + = t('compliance_check_result.statuses.ok') + option value="status-nok" + = t('compliance_check_result.statuses.nok') + option value="status-uncheck" + = t('compliance_check_result.statuses.uncheck') + + +table.table.table-hover.toggle-circle.toggle-medium data-filter="#filter" data-page-size="20" data-title-nok="#{t('compliance_check_result.statuses.nok')}" data-title-uncheck="#{t('compliance_check_result.statuses.uncheck')}" data-title-ok="#{t('compliance_check_result.statuses.ok')} + thead + tr + th data-sort-ignore="true" + = ComplianceCheckResult.human_attribute_name(:status) + th.col-md-1 data-sort-ignore="true" + = ComplianceCheckResult.human_attribute_name(:severity) + th.col-md-3 + = ComplianceCheckResult.human_attribute_name(:rule_code) + th.col-md-2 + = t('compliance_check_results.errors') + th.col-md-6 data-toggle="true" data-sort-ignore="true" + = ComplianceCheckResult.human_attribute_name(:detail) + th data-hide="all" data-sort-ignore="true" + + tbody + - if compliance_check_validation_report + - compliance_check_validation_report.tests.each_with_index do |test, index| + tr class="#{test.result}_#{test.severity}" + td data-value="status-#{test.result}" + = status_icon( test.result, test.severity ) + td data-value="severity-#{test.severity}" + = t("compliance_check_result.severities.#{test.severity}_txt") + td data-value="#{test.result}_#{test.severity}" + = link_to test.test_id, test_definition(test.test_id), title: ComplianceCheckResult.human_attribute_name(test.test_id), target: "compliance_check" + td + = "#{test.error_count || 0} #{ComplianceCheckResult.human_attribute_name(:violation_count)}" if test.errors.present? + td + = truncate(t("activemodel.attributes.compliance_check_result.#{test.test_id}"), length: 50) + td + p + b + = t("activemodel.attributes.compliance_check_result.#{test.test_id}") + + - if test.errors.present? + - test.errors.first(10).each do |error| + dl.inline + dt + - if error["source"].present? + - if error[:source].object_path.present? + - if error[:source].label.present? + = link_to error[:source].label, object_url(@referential.id, error), target: :_blank + - else + = link_to "#{error[:source].object_path.type} (#{error[:source].object_path.id})", object_url(@referential.id, error), target: :_blank + + - if error[:source].file.present? + = error[:source].objectid if error[:source].objectid.present? + + dd = t("compliance_check_result.details.detail_#{error[:error_id]}", object_labels_hash(error)) + + - if error[:source].file.present? + p.file_error + = error[:source].file.filename + = ", li: #{error[:source].file.line_number}" if error[:source].file.line_number.present? + = ", co: #{error[:source].file.column_number}" if error[:source].file.column_number.present? + + - else + tr + td colspan="6" + = t('compliance_check_results.in_progress') + + tfoot.hide-if-no-paging + tr + td colspan="5" + ul.pagination.pagination-centered
\ No newline at end of file diff --git a/app/views/compliance_checks/_compliance_checks.html.erb b/app/views/compliance_checks/_compliance_checks.html.erb deleted file mode 100644 index e28af86fc..000000000 --- a/app/views/compliance_checks/_compliance_checks.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -<div class="page_info"> - <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @compliance_checks %> -</div> -<div class="compliance_checks paginated_content"> - <%= paginated_content @compliance_checks, "compliance_checks/compliance_check" %> -</div> -<div class="pagination"> - <%= will_paginate @compliance_checks, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer %> -</div> diff --git a/app/views/compliance_checks/_compliance_checks.html.slim b/app/views/compliance_checks/_compliance_checks.html.slim new file mode 100644 index 000000000..48db9ae94 --- /dev/null +++ b/app/views/compliance_checks/_compliance_checks.html.slim @@ -0,0 +1,9 @@ +.page_info + span.search = t('will_paginate.page_entries_info.search') + = page_entries_info @compliance_checks + +.compliance_checks.paginated_content + = paginated_content @compliance_checks, "compliance_checks/compliance_check" + +.pagination + = will_paginate @compliance_checks, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer
\ No newline at end of file diff --git a/app/views/compliance_checks/detailed_errors_index.csv.erb b/app/views/compliance_checks/detailed_errors_index.csv.erb deleted file mode 100644 index 9ab7598ea..000000000 --- a/app/views/compliance_checks/detailed_errors_index.csv.erb +++ /dev/null @@ -1,2 +0,0 @@ -<%= I18n.t("activemodel.attributes.compliance_check_result.severity") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.rule_code") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.object") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.resource") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.title") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.detail") %> -<% @compliance_check.compliance_check_validation_report.tests.each do |r| %><% if r.errors.present? %><% r.errors.first(10).each do |error| %><% case r.severity %><% when "warning" %><%= I18n.t "compliance_check_result.severities.warning_txt" %><% when "error" %><%= I18n.t "compliance_check_result.severities.error_txt" %><% end %>;<%= r.test_id %>;<% if error["source"].present? %><%= error["source"]["objectid"] if error["source"]["objectid"].present? %>;<% if error["source"]["object_path"].present? %><%= object_url(@referential_id, error) %><% elsif error["source"]["file"].present? %><%= File.basename(error["source"]["file"]["filename"]) +" - " %><%= I18n.t "compliance_check_results.index.column" %>:<%= error["source"]["file"]["column_number"] %>,<%= I18n.t "compliance_check_results.index.line" %>:<%= error["source"]["file"]["line_number"] %><% end %>;<% else %>;;<% end %><%= I18n.t("activemodel.attributes.compliance_check_result."+r.test_id) %>;<%= I18n.t("compliance_check_result.details.detail_#{error['error_id']}", object_labels_hash(error) )%><%= "\n" %><% end %><% end %><% end %> diff --git a/app/views/compliance_checks/detailed_errors_index.csv.slim b/app/views/compliance_checks/detailed_errors_index.csv.slim new file mode 100644 index 000000000..0b2c3f24f --- /dev/null +++ b/app/views/compliance_checks/detailed_errors_index.csv.slim @@ -0,0 +1,37 @@ += I18n.t('activemodel.attributes.compliance_check_result.severity'); += I18n.t('activemodel.attributes.compliance_check_result.rule_code'); += I18n.t('activemodel.attributes.compliance_check_result.object'); += I18n.t('activemodel.attributes.compliance_check_result.resource'); += I18n.t('activemodel.attributes.compliance_check_result.title'); += I18n.t('activemodel.attributes.compliance_check_result.detail') + +- @compliance_check.compliance_check_validation_report.tests.each do |r| + - if r.errors.present? + - r.errors.first(10).each do |error| + - case r.severity + - when "warning" + = I18n.t('compliance_check_result.severities.warning_txt') + - when "error" + = I18n.t('compliance_check_result.severities.error_txt') + + = r.test_id; + + - if error["source"].present? + = error["source"]["objectid"] if error["source"]["objectid"].present? + + - if error["source"]["object_path"].present? + = object_url(@referential_id, error) + - elsif error["source"]["file"].present? + = File.basename(error["source"]["file"]["filename"]) + " - " + = I18n.t("compliance_check_results.index.column") + ":" + = error["source"]["file"]["column_number"] + "," + = I18n.t("compliance_check_results.index.line") + ":" + = error["source"]["file"]["line_number"] + + - else + = I18n.t("activemodel.attributes.compliance_check_result."+r.test_id); + = I18n.t("compliance_check_result.details.detail_#{error['error_id']}", object_labels_hash(error) ) + = "\n" + +/ <%= I18n.t("activemodel.attributes.compliance_check_result.severity") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.rule_code") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.object") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.resource") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.title") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.detail") %> +/ <% @compliance_check.compliance_check_validation_report.tests.each do |r| %><% if r.errors.present? %><% r.errors.first(10).each do |error| %><% case r.severity %><% when "warning" %><%= I18n.t "compliance_check_result.severities.warning_txt" %><% when "error" %><%= I18n.t "compliance_check_result.severities.error_txt" %><% end %>;<%= r.test_id %>;<% if error["source"].present? %><%= error["source"]["objectid"] if error["source"]["objectid"].present? %>;<% if error["source"]["object_path"].present? %><%= object_url(@referential_id, error) %><% elsif error["source"]["file"].present? %><%= File.basename(error["source"]["file"]["filename"]) +" - " %><%= I18n.t "compliance_check_results.index.column" %>:<%= error["source"]["file"]["column_number"] %>,<%= I18n.t "compliance_check_results.index.line" %>:<%= error["source"]["file"]["line_number"] %><% end %>;<% else %>;;<% end %><%= I18n.t("activemodel.attributes.compliance_check_result."+r.test_id) %>;<%= I18n.t("compliance_check_result.details.detail_#{error['error_id']}", object_labels_hash(error) )%><%= "\n" %><% end %><% end %><% end %> diff --git a/app/views/compliance_checks/index.html.erb b/app/views/compliance_checks/index.html.erb deleted file mode 100644 index 4a3470ad5..000000000 --- a/app/views/compliance_checks/index.html.erb +++ /dev/null @@ -1,11 +0,0 @@ -<%= title_tag t('.title') %> -<div class="warning"><%= t('.warning') %> </div> - -<div id="compliance_checks"><%= render 'compliance_checks' %></div> - -<% content_for :sidebar do %> -<ul class="actions"> - <li><%= link_to t('compliance_check_tasks.actions.new'), new_referential_compliance_check_task_path(), :class => "add" %></li> - <li><%= link_to t('rule_parameter_sets.actions.index'), organisation_rule_parameter_sets_path, :class => "link" %></li> -</ul> -<% end %> diff --git a/app/views/compliance_checks/index.html.slim b/app/views/compliance_checks/index.html.slim new file mode 100644 index 000000000..392c46663 --- /dev/null +++ b/app/views/compliance_checks/index.html.slim @@ -0,0 +1,14 @@ += title_tag t('.title') + +.warning + = t('.warning') + +#compliance_checks + = render 'compliance_checks' + +- content_for :sidebar do + ul.actions + li + = link_to t('compliance_check_tasks.actions.new'), new_referential_compliance_check_task_path(), class: 'add' + li + = link_to t('rule_parameter_sets.actions.index'), organisation_rule_parameter_sets_path, class: 'link'
\ No newline at end of file diff --git a/app/views/compliance_checks/index.js.erb b/app/views/compliance_checks/index.js.erb deleted file mode 100644 index 236a9068c..000000000 --- a/app/views/compliance_checks/index.js.erb +++ /dev/null @@ -1 +0,0 @@ -$('#compliance_checks').html('<%= escape_javascript(render("compliance_checks")) %>');
\ No newline at end of file diff --git a/app/views/compliance_checks/index.js.slim b/app/views/compliance_checks/index.js.slim new file mode 100644 index 000000000..43ef88a36 --- /dev/null +++ b/app/views/compliance_checks/index.js.slim @@ -0,0 +1 @@ +$('#compliance_checks').html("#{escape_javascript(render('compliance_checks'))}");
\ No newline at end of file diff --git a/app/views/compliance_checks/report.html.erb b/app/views/compliance_checks/report.html.erb deleted file mode 100644 index 7bd0d7a92..000000000 --- a/app/views/compliance_checks/report.html.erb +++ /dev/null @@ -1,49 +0,0 @@ -<%= title_tag job_status_title(@compliance_check) %> - -<div class="compliance_check_show"> - <div class="links"> - <% if @compliance_check.class == Import %> - <%= link_to(font_awesome_classic_tag('fa-eye') + t("compliance_checks.report.action_report"), referential_import_path(@referential, @compliance_check.id)) %> - <%= link_to font_awesome_classic_tag("fa-external-link") + t("compliance_checks.rule_parameter_set"), rule_parameter_set_referential_import_path(@referential, @compliance_check.id) if @compliance_check.rule_parameter_set? %> - <% else %> - <%= link_to(font_awesome_classic_tag('fa-eye') + t("compliance_checks.report.action_report"), referential_compliance_check_path(@referential, @compliance_check.id)) %> - <%= link_to font_awesome_classic_tag("fa-external-link") + t("compliance_checks.rule_parameter_set"), rule_parameter_set_referential_compliance_check_path(@referential, @compliance_check.id) if @compliance_check.rule_parameter_set? %> - <% end %> - <div class="btn-group pull-right"> - <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> - <%= t("compliance_checks.show.export") %> <span class="caret"></span> - </button> - <ul class="dropdown-menu" role="menu"> - <li> - <% if @compliance_check.class == Import %> - <%= link_to t("compliance_checks.show.export_csv"), export_referential_import_path(@referential, @compliance_check.id) %> - <% else %> - <%= link_to t("compliance_checks.show.export_csv"), export_referential_compliance_check_path(@referential, @compliance_check.id) %> - <% end %> - </li> - </ul> - </div> - </div> - <div class="report" data-refresh-interval="<%= job_refresh_interval(@compliance_check) %>"> - <%= render :partial => "compliance_checks/compliance_check_results", locals: { compliance_check_validation_report: @compliance_check.compliance_check_validation_report } %> - </div> -</div> - -<% content_for :sidebar do %> - <% if @compliance_check.compliance_check_validation_report && @compliance_check.compliance_check_validation_report.nok_error.blank? %> - <div class="row"> - <%=font_awesome_classic_tag('fa-thumbs-up fa-5x col-md-3')%> - <p class='col-md-7' id='validation_success'><%=t('.validation_success')%></p> - </div> - <% end %> - <ul class="actions"> - <li> - <% if @compliance_check.class != Import %> - <%= link_to t('compliance_checks.actions.destroy'), referential_compliance_check_path(@referential, @compliance_check.id), :method => :delete, :data => {:confirm => t('compliance_checks.actions.destroy_confirm')}, :class => "remove" %> - <% end %> - </li> - </ul> - <%= history_tag(@compliance_check) %> - <div id="error" class="graph"></div> - <div id="warning" class="graph"></div> -<% end %> diff --git a/app/views/compliance_checks/report.html.slim b/app/views/compliance_checks/report.html.slim new file mode 100644 index 000000000..be2bb8adc --- /dev/null +++ b/app/views/compliance_checks/report.html.slim @@ -0,0 +1,41 @@ += title_tag job_status_title(@compliance_check) + +.compliance_check_show + .links + - if @compliance_check.class == Import + = link_to(font_awesome_classic_tag('fa-eye') + t("compliance_checks.report.action_report"), referential_import_path(@referential, @compliance_check.id)) + = link_to font_awesome_classic_tag("fa-external-link") + t("compliance_checks.rule_parameter_set"), rule_parameter_set_referential_import_path(@referential, @compliance_check.id) if @compliance_check.rule_parameter_set? + - else + = link_to(font_awesome_classic_tag('fa-eye') + t("compliance_checks.report.action_report"), referential_compliance_check_path(@referential, @compliance_check.id)) + = link_to font_awesome_classic_tag("fa-external-link") + t("compliance_checks.rule_parameter_set"), rule_parameter_set_referential_compliance_check_path(@referential, @compliance_check.id) if @compliance_check.rule_parameter_set? + + .btn-group.pull-right + button.btn.btn-default.dropdown-toggle type="button" data-toggle="dropdown" aria-expanded="false" + = t('compliance_checks.show.export') + span.caret + + ul.dropdown-menu role="menu" + li + - if @compliance_check.class == Import + = link_to t('compliance_checks.show.export_csv'), export_referential_import_path(@referential, @compliance_check.id) + - else + = link_to t("compliance_checks.show.export_csv"), export_referential_compliance_check_path(@referential, @compliance_check.id) + + .report data-refresh-interval="#{job_refresh_interval(@compliance_check)}" + = render partial: 'compliance_checks/compliance_check_results', locals: { compliance_check_validation_report: @compliance_check.compliance_check_validation_report } + +- content_for :sidebar do + - if @compliance_check.compliance_check_validation_report && @compliance_check.compliance_check_validation_report.nok_error.blank? + .row + = font_awesome_classic_tag('fa-thumbs-up fa-5x col-md-3') + p#validation_success.col-md-7 + = t('.validation_success') + + ul.actions + li + - if @compliance_check.class != Import + = link_to t('compliance_checks.actions.destroy'), referential_compliance_check_path(@referential, @compliance_check.id), method: :delete, :data => {:confirm => t('compliance_checks.actions.destroy_confirm')}, class: 'remove' + + = history_tag(@compliance_check) + #error.graph + #warning.graph
\ No newline at end of file diff --git a/app/views/compliance_checks/show.html.erb b/app/views/compliance_checks/show.html.erb deleted file mode 100644 index 1b656692e..000000000 --- a/app/views/compliance_checks/show.html.erb +++ /dev/null @@ -1,26 +0,0 @@ -<div class="test"> - <%= title_tag job_status_title(@compliance_check) %> -</div> -<% if @compliance_check.report.failure_code? %> -<div class="alert alert-danger"> - <%= t("iev.failure.#{@compliance_check.report.failure_code}") %> -</div> -<% end %> -<div class="progress_bars"> - <%= progress_bar_tag(@compliance_check) %> -</div> -<div class="compliance_check show"> - <div class="links"> - <%= link_to font_awesome_classic_tag("fa-external-link") + t("compliance_checks.actions.report"), report_referential_compliance_check_path(@referential, @compliance_check.id) if @compliance_check.compliance_check_validation_report? %> - </div> - <%= render(partial: "shared/ie_report", locals: { job: @compliance_check, type: :validation, line_items: @line_items } ) %> -</div> - -<% content_for :sidebar do %> - <ul class="actions"> - <li><%= link_to t('compliance_checks.actions.destroy'), referential_compliance_check_path(@referential, @compliance_check.id), method: :delete, data: {confirm: t('compliance_checks.actions.destroy_confirm')}, class: "remove" %></li> - </ul> - - <%= history_tag(@compliance_check) %> - -<% end %> diff --git a/app/views/compliance_checks/show.html.slim b/app/views/compliance_checks/show.html.slim new file mode 100644 index 000000000..8c6900981 --- /dev/null +++ b/app/views/compliance_checks/show.html.slim @@ -0,0 +1,22 @@ +.test + = title_tag job_status_title(@compliance_check) + +- if @compliance_check.report.failure_code? + .alert.alert-danger + = t("iev.failure.#{@compliance_check.report.failure_code}") + +.progress_bars + = progress_bar_tag(@compliance_check) + +.compliance_check.show + .links + = link_to font_awesome_classic_tag("fa-external-link") + t("compliance_checks.actions.report"), report_referential_compliance_check_path(@referential, @compliance_check.id) if @compliance_check.compliance_check_validation_report? + + = render partial: "shared/ie_report", locals: { job: @compliance_check, type: :validation, line_items: @line_items } + +- content_for :sidebar do + ul.actions + li + = link_to t('compliance_checks.actions.destroy'), referential_compliance_check_path(@referential, @compliance_check.id), method: :delete, data: {confirm: t('compliance_checks.actions.destroy_confirm')}, class: 'remove' + + = history_tag(@compliance_check)
\ No newline at end of file diff --git a/app/views/compliance_checks/summary_errors_index.csv.erb b/app/views/compliance_checks/summary_errors_index.csv.erb deleted file mode 100644 index ff915f700..000000000 --- a/app/views/compliance_checks/summary_errors_index.csv.erb +++ /dev/null @@ -1,3 +0,0 @@ -<%= I18n.t("activemodel.attributes.compliance_check_result.severity") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.status") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.rule_code") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.title") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.url") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.violation_count_txt") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.objects") %> -<% @compliance_check.compliance_check_validation_report.tests.each do |r| %><% case r.severity %><% when "warning" %><%= I18n.t "compliance_check_result.severities.warning_txt" %><% when "error" %><%= I18n.t "compliance_check_result.severities.error_txt" %><% end %>;<%= r.result %>;<%= r.test_id %>;<%= I18n.t("activemodel.attributes.compliance_check_result."+r.test_id) %>;<%= Rails.application.config.validation_spec + I18n.locale.to_s + "/" + r.test_id + ".html" %>;<%= r.error_count %><% if r.error_count > 0 %><% if r.errors.present? %>;<% r.errors.first(10).each do |error| %><% if error["source"] %><%= error["source"]["objectid"] + " " %><% else %><%= " " %><% end %><% end %><% end %><% end %> -<% end %> diff --git a/app/views/compliance_checks/summary_errors_index.csv.slim b/app/views/compliance_checks/summary_errors_index.csv.slim new file mode 100644 index 000000000..bbb2c8c88 --- /dev/null +++ b/app/views/compliance_checks/summary_errors_index.csv.slim @@ -0,0 +1,34 @@ += I18n.t("activemodel.attributes.compliance_check_result.severity"); += I18n.t("activemodel.attributes.compliance_check_result.status"); += I18n.t("activemodel.attributes.compliance_check_result.rule_code"); += I18n.t("activemodel.attributes.compliance_check_result.title"); += I18n.t("activemodel.attributes.compliance_check_result.url"); += I18n.t("activemodel.attributes.compliance_check_result.violation_count_txt"); += I18n.t("activemodel.attributes.compliance_check_result.objects") + +- @compliance_check.compliance_check_validation_report.tests.each do |r| + - case r.severity + - when "warning" + = I18n.t("compliance_check_result.severities.warning_txt") + - when "error" + = I18n.t("compliance_check_result.severities.error_txt") + + = r.result; + = r.test_id; + + = I18n.t("activemodel.attributes.compliance_check_result." + r.test_id); + = Rails.application.config.validation_spec + I18n.locale.to_s + "/" + r.test_id + ".html"; + + = r.error_count + + - if r.error_count > 0 + - if r.errors.present? + - r.errors.first(10).each do |error| + - if error["source"] + = error["source"]["objectid"] + " " + - else + = " " + +/ <%= I18n.t("activemodel.attributes.compliance_check_result.severity") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.status") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.rule_code") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.title") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.url") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.violation_count_txt") %>;<%= I18n.t("activemodel.attributes.compliance_check_result.objects") %> +/ <% @compliance_check.compliance_check_validation_report.tests.each do |r| %><% case r.severity %><% when "warning" %><%= I18n.t "compliance_check_result.severities.warning_txt" %><% when "error" %><%= I18n.t "compliance_check_result.severities.error_txt" %><% end %>;<%= r.result %>;<%= r.test_id %>;<%= I18n.t("activemodel.attributes.compliance_check_result."+r.test_id) %>;<%= Rails.application.config.validation_spec + I18n.locale.to_s + "/" + r.test_id + ".html" %>;<%= r.error_count %><% if r.error_count > 0 %><% if r.errors.present? %>;<% r.errors.first(10).each do |error| %><% if error["source"] %><%= error["source"]["objectid"] + " " %><% else %><%= " " %><% end %><% end %><% end %><% end %> +/ <% end %> |
