active_list 6.6.2 → 6.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07c85cc2a20ffb149c1acf358af1b596175b36f7
-  data.tar.gz: f2581de3877caed78f8ecd7cfb7154948fe958a2
+  metadata.gz: 775b3110948e7e0da35e95a8e44f6c0ffe2e01c0
+  data.tar.gz: a5d9ae7e758ea41b87666316ddcd35be1510283e
 SHA512:
-  metadata.gz: 8e1c2e01f8c3f0a7ce7cfaecc0418928ea83322fc6cdc858505efe3aa367580f88e9fa6b683747f78b50c693873bbc14a32c7bfde92b7922acc50cee22b71a6f
-  data.tar.gz: 8cbae458b67ae355bd2c79feed69c9bec09c6699f5de16a03a7ca0965c1435f8dce7eec5a6417c398d90fa9823809c7bbaf69e8d244fbb56c56d25f7aa8d8f04
+  metadata.gz: bd143bcd93b403eef747ba74b118d5c30f5ffec7beee2625ece0a6272e0a54180f83329790f2fab3c99c9cf0e26cfc76dfdec4977cc4ee5ab60d278c700d0407
+  data.tar.gz: 77cd8e43c60e2d63cc95eeb6c681a66bb21193c26184c556e3717e5be642ec6e0dad8a4d7fb00cd1b8f97a677dc460427ab32a0adb8d0a0c05b0f8175e4b5f14

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

@@ -2,7 +2,7 @@ ActiveList = {}
 
 (($, AL) ->
   "use strict"
-  
+
   # Main function which reload table with specified data parameters
   AL.refresh = (list, options) ->
     table = list.find("table[data-current-page]").first()
@@ -25,16 +25,14 @@ ActiveList = {}
         list_control = content.find(".list-control")
         for type in ["actions", "pagination", "settings"]
           $("*[data-list-ref='#{list_id}'].list-#{type}").replaceWith list_control.find(".list-#{type}")
-        
         list.find(".list-data").html(list_data)
-        
-        # list.html data
         selection = list.prop('selection')
         if selection?
-          for id in selection
+          for id in Object.keys(selection)
             list.find("input[data-list-selector='#{id}']")
               .attr('checked', 'checked')
               .closest('tr').addClass('selected')
+          AL.updateResults list
           AL.checkGlobalButtons list
         list.trigger('page:change')
         $(document).trigger('list:page:change')
@@ -42,35 +40,86 @@ ActiveList = {}
 
     false
 
+  values_for_computation_of_rows = (list, row, existing_hash) ->
+    computes = {}
+    computes = existing_hash if existing_hash?
+    for cell in row.find('td')
+      continue unless AL.computation_for(list, cell)?
+      col_number = AL.column_number(list, cell)
+      computes[col_number] = [] unless computes[col_number]?
+      computes[col_number].push parseFloat(AL.unaltered_value(cell))
+    computes
+
+  AL.column_for = (list, cell) ->
+    if typeof(cell) == "string"
+      column = cell
+    else
+      column = $(cell).data('list-column-header')
+    list.find("th[data-list-column-cells='#{column}']")
+
+  AL.computation_for = (list, cell) ->
+    AL.column_for(list, cell).data('list-column-computation')
+
+  AL.column_number = (list, cell) ->
+    AL.column_for(list, cell).data('list-column-cells')
+
+  AL.unaltered_value = (cell) ->
+    $(cell).data('list-cell-value')
 
   # Select a row of "many" buttons
   AL.select = (checkbox) ->
     list = checkbox.closest('*[data-list-source]')
     row = checkbox.closest('tr')
-    if list.prop('selection')?
-      selection = list.prop('selection')
-    else
-      selection = []
+    selection = if list.prop('selection')? then list.prop('selection') else {}
     key = checkbox.data('list-selector')
-    index = selection.indexOf(key)
+    present = String(key) in Object.keys(selection)
     if checkbox.is ":checked"
-      if index < 0 
-        selection.push(key)
+      selection[key] = values_for_computation_of_rows(list, row, selection[key]) unless present
       row.addClass("selected")
     else
-      if index >= 0 
-        selection.splice(index, 1)
+      delete selection[key] if present
       row.removeClass("selected")
     list.prop('selection', selection)
+
+    AL.updateResults list
     AL.checkGlobalButtons list
 
+  AL.updateResults = (list) ->
+    results = {}
+    selection = if list.prop('selection')? then list.prop('selection') else {}
+    for key, columns of selection
+      for column, values of columns
+        computation = AL.computation_for(list, column)
+        unless computation == 'sum' || computation == 'average'
+          console.log "Don't know how to handle computation #{computation}. Skipping."
+          continue
+        results[column] = [] if typeof(results[column]) == "undefined"
+        results[column] = results[column].concat values
+
+    for column, values of results
+      float_values = (parseFloat(e) for e in values)
+      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)
+        rounded = Math.round(total * magnitude) / magnitude
+        displayable_total = "#{rounded} #{currency_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')
+      continue unless typeof(results[col_number]) == "undefined" or results[col_number].length == 0
+      list.removeAttr("data-list-result-#{col_number}")
+      list.find("#computation-results td[data-list-result-for=\"#{col_number}\"] #list-computation-result").html('')
 
   # Hide/show needed global buttons
-  AL.checkGlobalButtons = (list) -> 
+  AL.checkGlobalButtons = (list) ->
     selection = list.prop('selection')
     list_id = list.attr('id')
     actions = $("*[data-list-ref='#{list_id}']")
-    if selection.length > 0
+    if Object.keys(selection).length > 0
       actions.find("*[data-list-actioner='none']:visible").hide()
       actions.find("*[data-list-actioner='none']:visible").hide()
       actions.find("*[data-list-actioner='many']:hidden").show()
@@ -82,7 +131,7 @@ ActiveList = {}
       unless button.prop('hrefPattern')?
         button.prop('hrefPattern', button.attr('href'))
       pattern = button.prop('hrefPattern')
-      url = pattern.replace(encodeURIComponent("##IDS##"), selection.join(','), 'g')
+      url = pattern.replace(encodeURIComponent("##IDS##"), Object.keys(selection).join(','), 'g')
       button.attr("href", url)
 
   # Move to given page
@@ -107,15 +156,15 @@ ActiveList = {}
   $(document).on "click", "*[data-list-source] input[data-list-selector]", (event) ->
     AL.select $(this)
     true
-  
+
   # Adds title attribute based on link name
   $(document).on "hover", "*[data-list-source] tbody tr td.act a", (event) ->
     element = $(this)
     title = element.attr("title")
     element.attr "title", element.html() unless title?
-    return    
+    return
+
 
-  
   # Change number of item per page
   $(document).on "click", "*[data-list-ref] *[data-list-change-page-size]", (event) ->
     sizer = $(this)
@@ -128,7 +177,6 @@ ActiveList = {}
         per_page: per_page
     false
 
-  
   # Toggle visibility of a column
   $(document).on "click", "*[data-list-ref] *[data-list-toggle-column]", (event) ->
     toggler = $(this)
@@ -136,7 +184,7 @@ ActiveList = {}
     columnId = toggler.data("list-toggle-column")
     list = $("##{toggler.closest('*[data-list-ref]').data('list-ref')}")
     column = list.find("th[data-list-column=\"#{columnId}\"]")
-    
+
     className = column.data("list-column-cells")
     className = columnId unless className?
     search = ".#{className}"
@@ -159,7 +207,6 @@ ActiveList = {}
         column: columnId
     false
 
-  
   # Change page of table on link clicks
   $(document).on "click", "*[data-list-ref] a[data-list-move-to-page]", (event) ->
     pager = $(this)

data/lib/active_list/definition/abstract_column.rb

@@ -27,6 +27,10 @@ module ActiveList
         false
       end
 
+      def computable?
+        false
+      end
+
       # Unique identifier of the column in the application
       def unique_id
         "#{@table.name}-#{@name}"

data/lib/active_list/definition/attribute_column.rb

@@ -1,7 +1,7 @@
 module ActiveList
   module Definition
     class AttributeColumn < DataColumn
-      attr_reader :column, :label_method, :sort_column
+      attr_reader :column, :label_method, :sort_column, :computation_method
 
       def initialize(table, name, options = {})
         super(table, name, options)
@@ -15,6 +15,7 @@ module ActiveList
             @sort_column = nil
           end
         end
+        @computation_method = options[:on_select]
         @column = @table.model.columns_hash[@label_method.to_s]
       end
 
@@ -42,6 +43,10 @@ module ActiveList
         !sort_column.nil?
       end
 
+      def computable?
+        !computation_method.nil?
+      end
+
       def enumerize?
         table.model.send(@label_method).send(:values)
         return true

data/lib/active_list/definition/data_column.rb

@@ -69,7 +69,7 @@ module ActiveList
       def sortable?
         return true
         # not self.action? and
-        !options[:through] && !@column.nil?
+        #!options[:through] && !@column.nil?
       end
 
       # Generate code in order to get the (foreign) record of the column

data/lib/active_list/definition/table.rb

@@ -55,7 +55,7 @@ module ActiveList
       end
 
       def selectable?
-        action_columns.select(&:use_many?).any?
+        @options[:selectable] || action_columns.select(&:use_many?).any?
       end
 
       # Retrieves all columns in database

data/lib/active_list/locales/ar.yml

@@ -1,6 +1,9 @@
 ar: &ar
   list:
     # columns: "Columns"
+    # results:
+    #   sum: "Total"
+    #   average: "Moyenne"
     export:
       false_value: "زائف"
       formats:

data/lib/active_list/locales/en.yml

@@ -1,5 +1,8 @@
 en: &en
   list:
+    results:
+      sum: "Total"
+      average: "Average"
     columns: "Columns"
     export:
       false_value: "FALSE"

data/lib/active_list/locales/es.yml

@@ -1,6 +1,9 @@
 es: &es
   list:
     columns: "Columnas"
+    # results:
+    #   sum: "Total"
+    #   average: "Moyenne"
     export:
       false_value: "FALSO"
       formats:

data/lib/active_list/locales/fr.yml

@@ -1,6 +1,9 @@
 fr: &fr
   list:
     columns: "Colonnes"
+    results:
+      sum: "Total"
+      average: "Moyenne"
     export:
       false_value: "FAUX"
       formats:

data/lib/active_list/locales/jp.yml

@@ -1,6 +1,9 @@
 jp: &jp
   list:
     columns: "列"
+    # results:
+    #   sum: "Total"
+    #   average: "Moyenne"
     export:
       false_value: "偽"
       formats:

data/lib/active_list/renderers/simple_renderer.rb

@@ -70,6 +70,31 @@ module ActiveList
         #   code << "    end\n"
         # end
         code << "  end\n"
+
+        if table.columns.any?(&:computable?)
+          code << "  #{var_name(:tbody)} << content_tag(:tr, id: :'computation-results') do\n"
+          code << "    computation_row = ''\n"
+          code << " computation_row << '<td></td>'\n" if table.selectable?
+          table.columns.each do |column|
+            classes = []
+            value = ''
+            code << "    computation_row << \"<td"
+            if column.computable?
+              code << " data-list-result-for='#{column.short_id}'"
+              value = "<div><span><strong>#{I18n.translate("list.results.#{column.computation_method}")}:</strong></span>"
+              value << "<span id='list-computation-result'></span></div>"
+            end
+            if column.is_a? ActiveList::Definition::DataColumn
+              code << "\#\{' class=hidden' if #{var_name(:params)}[:hidden_columns].include?(:#{column.name})\}"
+            end
+            code << ">"
+            code << value
+            code << "</td>\"\n"
+          end
+          code << "    computation_row.html_safe\n"
+          code << "  end\n"
+        end
+
         code << "else\n"
         code << "  #{var_name(:tbody)} << '<tr class=\"empty\"><td colspan=\"#{table.columns.size + 1}\">' + ::I18n.translate('list.no_records') + '</td></tr>'\n"
         code << "end\n"
@@ -108,6 +133,7 @@ module ActiveList
 
         # Build whole
         code << "return ('<div id=\"#{uid}\" data-list-source=\"'+h(url_for(options.merge(:action => '#{generator.controller_method_name}')))+'\" data-list-redirect=\"' + params[:redirect].to_s + '\" class=\"active-list\">' + #{var_name(:content)} + '</div>').html_safe\n"
+        # File.open('debug-activelist', 'w') { |file| file.write code }
         code
       end
 
@@ -210,7 +236,10 @@ module ActiveList
           else
             value_code = "'&#160;&#8709;&#160;'.html_safe"
           end
-          code << "content_tag(:td, :class => \"#{column_classes(column)}\") do\n"
+          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 << " } ) do\n"
           code << value_code.dig
           code << "end +\n"
         end
@@ -271,6 +300,11 @@ module ActiveList
           code << "<th data-list-column=\"#{column.sort_id}\""
           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 column.is_a?(ActiveList::Definition::DataColumn) && column.options[:currency]
+            code << " data-list-column-currency-symbol=\"' + Nomen::Currencies[#{generator.records_variable_name}.first.currency].symbol + '\""
+            code << " data-list-column-currency-precision=\"' + Nomen::Currencies[#{generator.records_variable_name}.first.currency].precision.to_s + '\""
+          end
           code << " class=\"#{column_classes(column, true, true)}\""
           code << '>'
           code << "' + h(#{column.header_code}) + '"

data/lib/active_list/version.rb

@@ -1,3 +1,3 @@
 module ActiveList
-  VERSION = '6.6.2'
+  VERSION = '6.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_list
 version: !ruby/object:Gem::Version
-  version: 6.6.2
+  version: 6.7.0
 platform: ruby
 authors:
 - Brice Texier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple interactive tables for Rails app