Showing lsValidation from imports

8 files changed, 58 insertions, 15 deletions

diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb
index 51607b835..ae0ac063b 100644
--- a/app/controllers/imports_controller.rb
+++ b/app/controllers/imports_controller.rb
@@ -64,6 +64,19 @@ class ImportsController < ChouetteController
       redirect_to referential_path(@referential)
     end
   end
+
+  def compliance_check
+    begin
+      build_breadcrumb :show
+      @import = resource
+      #@compliance_check = ComplianceCheck.new @import.datas
+      render "compliance_checks/show"
+    rescue Ievkit::Error => error
+      logger.error("Iev failure : #{error.message}")
+      flash[:error] = t('iev.failure')
+      redirect_to referential_path(@referential)
+    end
+  end
   
   protected
   alias_method :import, :resource
diff --git a/app/models/import.rb b/app/models/import.rb
index ff6faab03..54075ebcb 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -42,10 +42,9 @@ class Import
   def compliance_check
     compliance_check_path = links["validation_report"]
     if compliance_check_path
-      response = Ievkit.get(compliance_check_path)
-      ComplianceCheckResult.new(response)
+      ::JSON.load( open(compliance_check_path).read )
     else
-      raise Ievkit::Error("Impossible to access compliance check path link for import")
+      false
     end
   end
 
diff --git a/app/views/compliance_checks/show.html.erb b/app/views/compliance_checks/show.html.erb
index eb0a6df22..f83c3f7d2 100644
--- a/app/views/compliance_checks/show.html.erb
+++ b/app/views/compliance_checks/show.html.erb
@@ -1,21 +1,28 @@
-<%= title_tag "#{@compliance_check.name} <span class='status status_#{@compliance_check.status}'>#{ t('compliance_checks.statuses.'+@compliance_check.status) }</span>" %>
-<% @title = "#{@compliance_check.name}" %>
+<% if @import %>
+  <%= title_tag "#{t('imports.show.compliance_check_of')} #{title} #{@import.name} <span class='status status_#{@import.status}'>(#{ t('imports.statuses.'+ @import.status) })</span>" %>
+  <% @title = "#{@import.name}" %>
+<% else %> 
+  <%= title_tag "#{@compliance_check.name} <span class='status status_#{@compliance_check.status}'>(#{ t('compliance_checks.statuses.'+@compliance_check.status) })</span>" %>
+  <% @title = "#{@compliance_check.name}" %>
+<% end %>
 
 <div class="compliance_check_show">
-   <div class="links">
-     <% if @compliance_check.rule_parameter_set %>
+  <div class="links">
+     <% if !@import && @compliance_check.rule_parameter_set %>
        <%= link_to image_tag('icons/link_page.png') + t("compliance_checks.rule_parameter_set"), rule_parameter_set_referential_compliance_check_path(@referential, @compliance_check.id) %>
      <% end %>
      <div class="btn-group pull-right">
+       <% if !@import %>
        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
          <%= t(".export") %> <span class="caret"></span>
        </button>
        <ul class="dropdown-menu" role="menu">
          <li><%= link_to t(".export_csv"), export_referential_compliance_check_path(@referential, @compliance_check.id)   %></li>
+	 <% end %>
        </ul>
      </div>  
    </div>
-  <% if @compliance_check.status == 'terminated'%>
+  <% if (@import && @import.status == 'terminated') || @compliance_check.status == 'terminated'%>
    <div class="resume">
      <div class="col1">
        <div class="caption"><%= t "error", :scope => "compliance_check_result.severities" %></div>
@@ -32,13 +39,25 @@
 
    <div class="report"></div>
    <% end %>
-  <%= javascript_include_tag referential_compliance_check_path(@referential, @compliance_check.id,:format => :js) %>
+   <% if @import %>
+   <%= javascript_include_tag referential_compliance_check_path(@referential, @import.id,:format => :js) %>
+   <% else %>
+   <%= javascript_include_tag referential_compliance_check_path(@referential, @compliance_check.id,:format => :js) %>
+   <% end %>
 </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>
+  <li>
+    <% if @import %>
+      <%= link_to image_tag("icons/link_page.png") + t("imports.show.import_of_validation"), referential_import_path(@referential, @import.id) %>
+    <% else %>
+      <%= 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) %>
-
+<% if !@import %>
+  <%= history_tag(@compliance_check) %>
+<% end %>
+  
 <% end %>
diff --git a/app/views/compliance_checks/show.js.coffee b/app/views/compliance_checks/show.js.coffee
index ec638c4d7..92739f610 100644
--- a/app/views/compliance_checks/show.js.coffee
+++ b/app/views/compliance_checks/show.js.coffee
@@ -4,9 +4,9 @@ jQuery ->
     h = new Object()
     h["status"] = status if status
     h["severity"] = severity if severity    
-      
+
     $.get(
-        "<%= @compliance_check.id %>/compliance_check_results",
+        "compliance_check_results",
         h,
         update = (data) ->
           html_container.empty()
diff --git a/app/views/imports/_import.erb b/app/views/imports/_import.erb
index 89669bdf1..6824b9bf7 100644
--- a/app/views/imports/_import.erb
+++ b/app/views/imports/_import.erb
@@ -19,7 +19,10 @@
     <p><%= link_to image_tag("icons/file_#{import.filename_extension}.png") + t("imports.show.imported_file"), imported_file_referential_import_path(@referential, import.id) %></p>
     <% if import.rule_parameter_set %> 
     <p><%= link_to image_tag("icons/link_page.png") + t("imports.show.rule_parameter_set"), rule_parameter_set_referential_import_path(@referential, import.id) %></p>
-    <% end %> 
+    <% end %>
+    <% if import.compliance_check %> 
+    <p><%= link_to image_tag("icons/link_page.png") + t("imports.show.compliance_check"), compliance_check_referential_import_path(@referential, import.id) %></p>
+    <% end %>
   </div>
   <div class="panel-footer">
     <%= progress_bar_tag(import) %>    
diff --git a/config/locales/imports.en.yml b/config/locales/imports.en.yml
index e6c82e382..f1e478ed7 100644
--- a/config/locales/imports.en.yml
+++ b/config/locales/imports.en.yml
@@ -11,6 +11,9 @@ en:
       report: "Report"
       imported_file: "Imported file"
       rule_parameter_set: "Rule parameter set"
+      compliance_check: "Validation"
+      compliance_check_of: "Validation of import: "
+      import_of_validation: "Import of the validation"
       graph:
         files:
           title_zip: "Import results for files in zip"
diff --git a/config/locales/imports.fr.yml b/config/locales/imports.fr.yml
index d95bf50a9..6e24bab2c 100644
--- a/config/locales/imports.fr.yml
+++ b/config/locales/imports.fr.yml
@@ -11,6 +11,9 @@ fr:
       report: "Rapport"
       imported_file: "Fichier importé"
       rule_parameter_set: "Jeu de paramètres"
+      compliance_check: "Validation"
+      compliance_check_of: "Validation de l'import : "
+      import_of_validation: "L'import de la validation"
       graph:
         files:
           title_zip: "Résultat d'import des fichiers du zip"
diff --git a/config/routes.rb b/config/routes.rb
index bc76ab1cf..fb1568dea 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -83,7 +83,10 @@ ChouetteIhm::Application.routes.draw do
       member do
         get "imported_file"
         get "rule_parameter_set"
+        get "compliance_check"
       end
+      #resources :compliance_checks, :only => [:show]
+      resources :compliance_check_results
     end
 
     resources :export_tasks, :only => [:new, :create]