it-logica-application-backbone 1.2.5 → 1.2.6

data/VERSION

@@ -1 +1 @@
-1.2.5
+1.2.6

data/app/assets/javascripts/backbone_js/ladas_editable_table_aligner.js.coffee

@@ -253,8 +253,8 @@ class EditableTableAligner
 
   @align_table_size: ->
 
-    #    console.log $(window).width()
-    #    console.log $(window).height()
+    #console.log $(window).width()
+    #console.log $(window).height()
     #    console.log $(document).width()
     #    console.log $(document).height()
     scroller_size = 16
@@ -266,14 +266,14 @@ class EditableTableAligner
     center_width = $(window).width() - left_column_width - scroller_size - width_border
     table_height  = $(window).height() - upper_panel_size
 
-    console.log left_column_width
+    #console.log left_column_width
     #    console.log center_width
 
 
-    $(".tableContainer").css({'width': (left_column_width + center_width + scroller_size + width_border)})
+    $(".tableContainer").css({'width': (left_column_width + center_width + scroller_size + width_border/2)})
 
-    $(".centerContainer .detachedTableContainer").css({'width': (center_width + scroller_size), 'height': (table_height + scroller_size)})
-    $(".centerContainer .scrollTargetContainter").css({'width': center_width })
+    $(".centerContainer .detachedTableContainer").css({'width': (center_width + scroller_size + width_border/4), 'height': (table_height + scroller_size)})
+    $(".centerContainer .scrollTargetContainter").css({'width': (center_width + width_border/4) })
 
     $(".fixedLeftColumn .detachedTableContainer").css({'height': table_height})
     $(".fixedLeftColumn table").css({'width': left_column_width})

data/it-logica-application-backbone.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "it-logica-application-backbone"
-  s.version = "1.2.5"
+  s.version = "1.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ladas"]
-  s.date = "2012-11-06"
+  s.date = "2012-11-07"
   s.description = "longer description of your gem"
   s.email = "ladislav.smola@it-logica.cz"
   s.extra_rdoc_files = [

data/lib/model_mixins/table_builder_class_methods.rb

@@ -49,6 +49,9 @@ module ModelMixins
       all_items = items.all # maybe can be done more optimal
       all_items_row_ids = all_items.collect { |x| x.row_id }.uniq
 
+      # summarization will be in one query, otherwise it takes a lot of time to do it in many
+      summarized_paged_cols = []
+      summarized_all_cols = []
 
       if settings[:template].blank?
         # initialize another_global_formats,another_formats and column_methods
@@ -61,13 +64,15 @@ module ModelMixins
             # passing all_items.total_entries because I don't want it to count again
             if all_items.kind_of?(WillPaginate::Collection)
               # if this is not will paginate collection, it means there is no pagination, so there wont be summary of page
-              col[:summarize_page_value] = sumarize(object, col, object.filter(object, settings, params, per_page, all_items.total_entries).selection(settings))
+              #col[:summarize_page_value] = sumarize(object, col, object.filter(object, settings, params, per_page, all_items.total_entries).selection(settings))
+              summarized_paged_cols << col
             end
           end
 
           if !col[:summarize_all].blank? && col[:summarize_all]
             # mysql SUM of the collumn off all data
-            col[:summarize_all_value] = sumarize(object, col, object.filter(object, settings, params, false).selection(settings))
+            #col[:summarize_all_value] = sumarize(object, col, object.filter(object, settings, params, false).selection(settings))
+            summarized_all_cols << col
           end
 
 
@@ -96,6 +101,14 @@ module ModelMixins
           end
         end
 
+        # making all summarizations in 2 queries
+        summarized_paged_cols_arel = nil
+        summarized_all_cols_arel = nil
+
+        summarized_paged_cols_arel = object.filter(object, settings, params, per_page, all_items.total_entries).selection(settings) unless summarized_paged_cols.blank?
+        summarized_all_cols_arel = object.filter(object, settings, params, false).selection(settings) unless summarized_all_cols.blank?
+        make_sumarizations!(object, summarized_paged_cols, summarized_paged_cols_arel, summarized_all_cols, summarized_all_cols_arel)
+
 
         # same as template_items below, loads objects so column method are better to use
         # todo think about, but I dont need object, because it's making the same query twice, I just need class and with one outer join it return filtered data, and i include includes to it
@@ -223,6 +236,68 @@ module ModelMixins
       settings
     end
 
+    def make_sumarizations!(object, summarized_paged_cols, paged_cols_arel, summarized_all_cols, all_cols_arel)
+      # make summarizations, will set it in the given cols
+      unless summarized_paged_cols.blank?
+        sumarize_collection!(object, summarized_paged_cols, paged_cols_arel, :page)
+      end
+      unless summarized_all_cols.blank?
+        sumarize_collection!(object, summarized_all_cols, all_cols_arel, :all)
+      end
+    end
+
+    def sumarize_collection!(object, cols, items_arel, type)
+      # make the col_name aliases and the query
+      col_names = {}
+      sum_query = ""
+      cols.each do |col|
+        col_name = col[:name]
+        col_name_alias = col_name + "_sum"
+
+        sum_query += ", " unless sum_query.blank?
+        sum_query += "SUM(#{col_name}) AS #{col_name_alias}"
+      end
+
+      #make the query
+      if object.respond_to?(:klass)
+        mysql_sums = object.klass.find_by_sql("SELECT #{sum_query} FROM (" + items_arel.to_sql + ") counts")
+      else
+        mysql_sums = object.find_by_sql("SELECT #{sum_query} FROM (" + items_arel.to_sql + ") counts")
+      end
+      sums = mysql_sums.first
+
+      # set the summarization results back to cols
+      cols.each do |col|
+        col_name = col[:name]
+        col_name_alias = col_name + "_sum"
+
+        # getting summarization value
+        sum_value = sums[col_name_alias]
+
+        # formating sum_value, if there is formating method
+        format_method = nil
+        format_method = col[:format_method] unless col[:format_method].blank?
+        format_method = col[:global_format_method] unless col[:global_format_method].blank?
+
+        unless format_method.blank?
+          if object.respond_to?(:klass)
+            sum_value = object.klass.new.send(format_method.to_sym, sum_value)
+          else
+            sum_value = object.new.send(format_method.to_sym, sum_value)
+          end
+        end
+
+
+        # assigning back to col by type
+        case type
+          when :all
+            col[:summarize_all_value] = sum_value
+          when :page
+            col[:summarize_page_value] = sum_value
+        end
+      end
+    end
+
     def sumarize(object, col, items)
       #method for sumarizing values in column
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &74127050 !ruby/object:Gem::Requirement
+  requirement: &81859830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74127050
+  version_requirements: *81859830
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &74126660 !ruby/object:Gem::Requirement
+  requirement: &81859490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74126660
+  version_requirements: *81859490
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &74126240 !ruby/object:Gem::Requirement
+  requirement: &81859190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *74126240
+  version_requirements: *81859190
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &74125760 !ruby/object:Gem::Requirement
+  requirement: &81858880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *74125760
+  version_requirements: *81858880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &74125170 !ruby/object:Gem::Requirement
+  requirement: &81858450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *74125170
+  version_requirements: *81858450
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &74124610 !ruby/object:Gem::Requirement
+  requirement: &81858010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74124610
+  version_requirements: *81858010
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -617,7 +617,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 875019469
+      hash: 674166125
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: