active_list 6.8.3 → 6.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b851e2a8c9d9bf79fb4f6144365b4152f22f168
-  data.tar.gz: ea34cb17e3124b0d3d469cc3d7b56e79c3aa36c7
+  metadata.gz: 43cd0de92791ecf694d3312c293f8746eb1d5ac9
+  data.tar.gz: 3d67108f2fd9b1bf609a0cb163c4324ecd214cf7
 SHA512:
-  metadata.gz: 93cc660abf2fdec078118c19780a4268b73c7b09103fc6aa865c8293ec5056295af4b45f59e3398d02a2251a0750e23dd18707d77b07ba1f5aaabd5408a8e11a
-  data.tar.gz: 43a0985fbb79b11a6b43e7506737ba5ed4e809cde2ebddc9c79c9ea84df8f657793f97ecd673f7d8e48251faf32728ab0a373b32bb3865d5475a69818e54a1a0
+  metadata.gz: 977c013131fd6e3131df738f996cd605d3112e2118635c2dad4d4675868528f65292369f0e8302e449acb56d12a50f19dc320a73ed897b9d5bc655d552c2eca7
+  data.tar.gz: 3b45a3a9d72e5090af3659075a475c068bc117221aa22e3e186818759662d0a6343b7f9319449c2adba77130605f4d0d6da78482f445aaa732153634e2b1f306

data/app/assets/javascripts/active_list.jquery.js.coffee

@@ -101,12 +101,12 @@ ActiveList = {}
       total = values.reduce (t, s) -> t + s
       total /= values.length if AL.computation_for(list, column) == 'average'
       list.attr("data-list-result-#{column}", total)
-      currency_precision = parseInt(AL.column_for(list, column).data('list-column-currency-precision'))
-      currency_symbol    = AL.column_for(list, column).data('list-column-currency-symbol')
-      if currency_precision and currency_symbol
-        magnitude = Math.pow(10, currency_precision)
+      unit_precision = parseInt(AL.column_for(list, column).data('list-column-unit-precision'))
+      unit_symbol    = AL.column_for(list, column).data('list-column-unit-symbol')
+      if unit_precision and unit_symbol
+        magnitude = Math.pow(10, unit_precision)
         rounded = Math.round(total * magnitude) / magnitude
-        displayable_total = "#{rounded.toFixed(currency_precision)} #{currency_symbol}"
+        displayable_total = "#{rounded.toFixed(unit_precision)} #{unit_symbol}"
       list.find("#computation-results td[data-list-result-for=\"#{column}\"] #list-computation-result").html(displayable_total)
     for column in list.find("th[data-list-column-computation]")
       col_number = $(column).data('list-column-cells')

data/lib/active_list/definition/attribute_column.rb

@@ -1,11 +1,16 @@
 module ActiveList
   module Definition
     class AttributeColumn < DataColumn
-      attr_reader :column, :label_method, :sort_column, :computation_method
+      attr_reader :column, :value_method, :label_method, :sort_column, :computation_method
 
       def initialize(table, name, options = {})
         super(table, name, options)
         @label_method = (options[:label_method] || @name).to_sym
+        if options[:value_method].present?
+          @value_method = options[:value_method].to_sym
+        else
+          @value_method = @label_method.to_s.gsub('human_', '').to_sym
+        end
         unless @sort_column = options[:sort]
           @sort_column = if @table.model.columns_hash[@label_method.to_s]
                            @label_method
@@ -25,13 +30,27 @@ module ActiveList
                    'nil'
                  else
                    "#{record}.#{table.options[:children]}.#{@options[:children] || @label_method}"
-                        end
+                 end
                else
                  "#{record}.#{@label_method}"
                end
         code.c
       end
 
+      def datum_value(record = 'record of the death', child = false)
+        code = ''
+        code = if child
+                 if @options[:childer].is_a?(FalseClass)
+                   'nil'
+                 else
+                   "#{record}.#{table.options[:children]}.#{@options[:children] || @value_method}"
+                 end
+               else
+                 "#{record}.#{@value_method}"
+               end
+        code.c
+      end
+
       # Returns the class name of the used model
       def class_name
         table.model.name

data/lib/active_list/renderers/simple_renderer.rb

@@ -237,7 +237,7 @@ module ActiveList
           end
           code << "content_tag(:td, :class => \"#{column_classes(column)}\","
           code << " data: { 'list-column-header' => '#{column.short_id}'"
-          code << ", 'list-cell-value' => \"\#{#{column.datum_code(record, children_mode)}}\"" if column.computable?
+          code << ", 'list-cell-value' => \"\#{#{column.datum_value(record, children_mode)}.to_f}\"" if column.computable?
           code << " } ) do\n"
           code << value_code.dig
           code << "end +\n"
@@ -304,9 +304,18 @@ module ActiveList
           code << " data-list-column-cells=\"#{column.short_id}\""
           code << " data-list-column-sort=\"'+(#{var_name(:params)}[:sort] != '#{column.sort_id}' ? 'asc' : #{var_name(:params)}[:dir] == 'asc' ? 'desc' : 'asc')+'\"" if column.sortable?
           code << " data-list-column-computation=\"#{column.computation_method}\"" if column.computable?
-          if table.selectable? && column.is_a?(ActiveList::Definition::DataColumn) && column.options[:currency] &&
-             code << " data-list-column-currency-symbol=\"' + (#{generator.records_variable_name}.any? ? Nomen::Currency.find(#{column.currency_for(generator.records_variable_name + '.first').inspect} || 'EUR').symbol.to_s : '') + '\""
-            code << " data-list-column-currency-precision=\"' + (#{generator.records_variable_name}.any? ? Nomen::Currency.find(#{column.currency_for(generator.records_variable_name + '.first').inspect} || 'EUR').precision.to_s : '') + '\""
+          if table.selectable? && column.is_a?(ActiveList::Definition::DataColumn) && (column.options[:currency] || column.computable?)
+            unit = "''"
+            precision = "''"
+            if column.options[:currency]
+              unit = "Nomen::Currency.find(#{column.currency_for(generator.records_variable_name + '.first').inspect} || 'EUR').symbol.to_s"
+              precision = "Nomen::Currency.find(#{column.currency_for(generator.records_variable_name + '.first').inspect} || 'EUR').precision.to_s" 
+            elsif column.computable?
+              unit = "#{generator.records_variable_name}.first.#{column.value_method}.symbol"
+              precision = "'2'"
+            end
+            code << " data-list-column-unit-symbol=\"' + (#{generator.records_variable_name}.any? ? #{unit} : '') + '\""
+            code << " data-list-column-unit-precision=\"' + (#{generator.records_variable_name}.any? ? #{precision} : '') + '\""
           end
           code << " class=\"#{column_classes(column, true, true)}\""
           code << '>'

data/lib/active_list/version.rb

@@ -1,3 +1,3 @@
 module ActiveList
-  VERSION = '6.8.3'.freeze
+  VERSION = '6.9.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_list
 version: !ruby/object:Gem::Version
-  version: 6.8.3
+  version: 6.9.0
 platform: ruby
 authors:
 - Brice Texier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails