Merge pull request #372 from af83/6146-line-states

6146 Line state update

3 files changed, 26 insertions, 13 deletions

diff --git a/app/helpers/referentials_helper.rb b/app/helpers/referentials_helper.rb
index e464ec8a5..9c3852322 100644
--- a/app/helpers/referentials_helper.rb
+++ b/app/helpers/referentials_helper.rb
@@ -2,12 +2,12 @@ module ReferentialsHelper
   # Outputs a green check icon and the text "Oui" or a red exclamation mark
   # icon and the text "Non" based on `status`
   def line_status(status)
-    if status
+     if status
       content_tag(:span, nil, class: 'fa fa-exclamation-circle fa-lg text-danger') +
-        t('false')
+      t('activerecord.attributes.line.deactivated')
     else
       content_tag(:span, nil, class: 'fa fa-check-circle fa-lg text-success') +
-        t('true')
+      t('activerecord.attributes.line.activated')
     end
   end
 
diff --git a/app/helpers/table_builder_helper.rb b/app/helpers/table_builder_helper.rb
index d16858678..63125b161 100644
--- a/app/helpers/table_builder_helper.rb
+++ b/app/helpers/table_builder_helper.rb
@@ -208,7 +208,7 @@ module TableBuilderHelper
   end
 
   def tr item, columns, selectable, links, overhead, model_name, action
-    klass = "#{model_name}-#{item.id}"
+    klass = "#{model_name} #{model_name}-#{item.id}"
     content_tag :tr, class: klass do
       bcont = []
       if selectable
@@ -221,13 +221,14 @@ module TableBuilderHelper
 
       columns.each do |column|
         value = column.value(item)
+        extra_class = column.td_class(item)
 
         if column.linkable?
           path = column.link_to(item)
           link = value.present? && path.present? ? link_to(value, path) : ""
 
           if overhead.empty?
-            bcont << content_tag(:td, link, title: 'Voir')
+            bcont << content_tag(:td, link, title: 'Voir', class: extra_class)
 
           else
             i = columns.index(column)
@@ -236,22 +237,22 @@ module TableBuilderHelper
               if (i > 0) && (overhead[i - 1][:width] > 1)
                 clsArrayAlt = overhead[i - 1][:cls].split
 
-                bcont << content_tag(:td, link, title: 'Voir', class: td_cls(clsArrayAlt))
+                bcont << content_tag(:td, link, title: 'Voir', class: td_cls(clsArrayAlt, extra_class))
 
               else
-                bcont << content_tag(:td, link, title: 'Voir')
+                bcont << content_tag(:td, link, title: 'Voir', class: extra_class)
               end
 
             else
               clsArray = overhead[columns.index(column)][:cls].split
 
-              bcont << content_tag(:td, link, title: 'Voir', class: td_cls(clsArray))
+              bcont << content_tag(:td, link, title: 'Voir', class: td_cls(clsArray, extra_class))
             end
           end
 
         else
           if overhead.empty?
-            bcont << content_tag(:td, value)
+            bcont << content_tag(:td, value, class: extra_class)
 
           else
             i = columns.index(column)
@@ -260,10 +261,10 @@ module TableBuilderHelper
               if (i > 0) && (overhead[i - 1][:width] > 1)
                 clsArrayAlt = overhead[i - 1][:cls].split
 
-                bcont << content_tag(:td, value, class: td_cls(clsArrayAlt))
+                bcont << content_tag(:td, value, class: td_cls(clsArrayAlt, extra_class))
 
               else
-                bcont << content_tag(:td, value)
+                bcont << content_tag(:td, value, class: extra_class)
               end
 
             else
@@ -299,12 +300,15 @@ module TableBuilderHelper
     end
   end
 
-  def td_cls(a)
+  def td_cls(a, extra_class="")
+    out = [extra_class]
     if a.include? 'full-border'
       a.slice!(a.index('full-border'))
 
-      return a.join(' ')
+      out += a
     end
+    out = out.select(&:present?).join(' ')
+    out.present? ? out : nil
   end
 
   def build_links(item, links, action)
diff --git a/app/helpers/table_builder_helper/column.rb b/app/helpers/table_builder_helper/column.rb
index 907707670..f16fc66be 100644
--- a/app/helpers/table_builder_helper/column.rb
+++ b/app/helpers/table_builder_helper/column.rb
@@ -13,6 +13,7 @@ module TableBuilderHelper
       @sortable = sortable
       @link_to = link_to
       @condition = opts[:if]
+      @extra_class = opts[:class]
     end
 
     def value(obj)
@@ -52,6 +53,14 @@ module TableBuilderHelper
       end
       !!condition_val
     end
+
+    def td_class(obj)
+      out = []
+      out << @attribute if @attribute.is_a?(String) || @attribute.is_a?(Symbol)
+      out << @extra_class
+      out = out.compact.join ' '
+      out.present? ? out : nil
+    end
   end