Add format for iev jobs

9 files changed, 39 insertions, 28 deletions

diff --git a/app/assets/stylesheets/main/compliance_checks.css.scss b/app/assets/stylesheets/main/compliance_checks.css.scss
index 35d0de92e..68db0deb9 100644
--- a/app/assets/stylesheets/main/compliance_checks.css.scss
+++ b/app/assets/stylesheets/main/compliance_checks.css.scss
@@ -4,11 +4,8 @@
 
 #workspace.compliance_checks.show, #workspace.imports.compliance_check{
   @import "../modules/job_status_colors";
-  @import "../modules/links";
-
-  h2{
-    i{ margin: 0 5px 0 0; }
-  }
+  @import "../modules/job_status_title";
+  @import "../modules/links";  
 
     .status {
         margin-left: 10px;                 
diff --git a/app/assets/stylesheets/main/exports.css.scss b/app/assets/stylesheets/main/exports.css.scss
index 4c02738b8..9fb11765e 100644
--- a/app/assets/stylesheets/main/exports.css.scss
+++ b/app/assets/stylesheets/main/exports.css.scss
@@ -9,10 +9,7 @@
 #workspace.exports.show {
   @import "../partials/ie_report";
   @import "../modules/job_status_colors";
+  @import "../modules/job_status_title";
   @import "../modules/links";
-
-  h2{
-    i{ margin: 0 5px 0 0; }
-  }
  
 }
diff --git a/app/assets/stylesheets/main/imports.css.scss b/app/assets/stylesheets/main/imports.css.scss
index c45d5361c..185800be2 100644
--- a/app/assets/stylesheets/main/imports.css.scss
+++ b/app/assets/stylesheets/main/imports.css.scss
@@ -5,10 +5,7 @@
 #workspace.imports.show {
     @import "../partials/ie_report";
     @import "../modules/job_status_colors";
-    @import "../modules/links";
-
-    h2{
-      i{ margin: 0 5px 0 0; }
-    }
+    @import "../modules/job_status_title";
+    @import "../modules/links";    
     
 }
diff --git a/app/assets/stylesheets/modules/index_item.css.scss b/app/assets/stylesheets/modules/index_item.css.scss
index fe0ba8940..251b96d48 100644
--- a/app/assets/stylesheets/modules/index_item.css.scss
+++ b/app/assets/stylesheets/modules/index_item.css.scss
@@ -34,10 +34,16 @@
             margin: 0px;
             padding-top: 4.5px;
 
-            .name{
+            span.name{
               .fa{
                 margin-right: 5px;                                
-                }                
+              }                
+            }
+
+            p.format{
+              color: $gray;
+              margin: 0px 0px 0px 0px;
+              font-size: 10px;
             }
               
             @import "job_status_colors"  
diff --git a/app/assets/stylesheets/modules/job_status_title.css.scss b/app/assets/stylesheets/modules/job_status_title.css.scss
new file mode 100644
index 000000000..0c2f74705
--- /dev/null
+++ b/app/assets/stylesheets/modules/job_status_title.css.scss
@@ -0,0 +1,8 @@
+h2{
+  i{ margin: 0 5px 0 0; }
+
+  p.format{
+    color: $gray;
+    font-size: 12px;
+  }
+}
diff --git a/app/helpers/job_status_icon_helper.rb b/app/helpers/job_status_icon_helper.rb
index 7dc325d30..0e8f05e90 100644
--- a/app/helpers/job_status_icon_helper.rb
+++ b/app/helpers/job_status_icon_helper.rb
@@ -3,17 +3,27 @@ module JobStatusIconHelper
   def job_status_title(object)
     status = object.status
     name = object.name
+    object_name = object.class.model_name.human.capitalize
     
     title = ""
     if %w{ aborted canceled }.include?(status)
-      title += "<span class='aborted'><i class='fa fa-times'></i>"
+      title += "<span class='name aborted'><i class='fa fa-times'></i>"
     elsif %w{ created scheduled }.include?(status)
-      title += "<span class='processed'><i class='fa fa-spinner fa-spin'></i>"
+      title += "<span class='name processed'><i class='fa fa-spinner fa-spin'></i>"
     elsif %w{ terminated}.include?(status)
-      title += "<span class='terminated'><i class='fa fa-check'></i>"
+      title += "<span class='name terminated'><i class='fa fa-check'></i>"
     end
 
-    title += "#{truncate(name, :length => 20)}</span>"
+    title += "#{object_name} #{truncate(name, :length => 20)}</span>"
+    title += "<p class='format'>[#{object.format.upcase}]</p>" if object.format.present?
+    title.html_safe
+  end
+
+  def job_status_short_title(object)
+    name = object.name
+    object_name = object.class.model_name.human.capitalize   
+
+    title = "#{object_name} #{truncate(name, :length => 20)}"
     title.html_safe
   end
   
diff --git a/app/models/concerns/job_concern.rb b/app/models/concerns/job_concern.rb
index 2578d33bf..b0c26baa9 100644
--- a/app/models/concerns/job_concern.rb
+++ b/app/models/concerns/job_concern.rb
@@ -62,5 +62,9 @@ module JobConcern
   def updated_at
     Time.at(datas.updated.to_i / 1000) if datas.updated
   end
+
+  def format
+    datas.type
+  end
   
 end
diff --git a/app/models/export.rb b/app/models/export.rb
index fc627e9f0..8c38d6684 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -50,8 +50,4 @@ class Export
     File.extname(filename).gsub(".", "") if filename
   end 
   
-  def format
-    datas.format
-  end
-  
 end
diff --git a/app/models/import.rb b/app/models/import.rb
index 77a566680..87f5058ec 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -84,10 +84,6 @@ class Import
   def filename_extension
     File.extname(filename).gsub(".", "") if filename
   end
-
-  def format
-    datas.type
-  end
   
   def no_save
     datas.action_parameters.no_save