it-logica-application-backbone 1.2.22 → 1.2.23

data/VERSION

@@ -1 +1 @@
-1.2.22
+1.2.23

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

@@ -2,42 +2,37 @@ class EditableTableAligner
   @align_table: (obj, xhr) ->
     # move colhead class to left column
     EditableTableAligner.align_static_left_columns(obj, xhr)
-    console.log("left columns moved")
-
 
     # allowing of paired scrolling
     EditableTableAligner.paired_left_right_scrolling(obj)
-    console.log("left right scrolling paired")
     EditableTableAligner.paired_up_down_scrolling(obj)
-    console.log("up down scrolling paired")
-
 
     # align widths and heights at last after moving all columns
     # align withs of header and body of table
     EditableTableAligner.align_widths(obj)
-    console.log("align widths")
-
 
     # aligning heights of static left or right columns and center content of table
     EditableTableAligner.align_heights(obj)
-    console.log("align heights")
+
 
     if (obj.editable_table_automatic_size? && obj.editable_table_automatic_size)
       if !xhr
         EditableTableAligner.register_align_table_size()
 
   @align_after_rows_update: (obj) ->
+    # tr_class td_class, etc
+    apply_modifiers_of_the_table($("#" + obj.form_id));
+
     # move colhead class to left column
     EditableTableAligner.align_static_left_columns_after_row_update(obj)
-    console.log("left columns moved")
 
     # align widths and heights at last after moving all columns
     # align withs of header and body of table
     EditableTableAligner.align_widths(obj)
-    console.log("roew align widths")
+
     # aligning heights of static left or right columns and center content of table
     EditableTableAligner.align_heights(obj)
-    console.log("roew align heights")
+
 
   #########################
   ### private methods #########
@@ -50,6 +45,7 @@ class EditableTableAligner
 
     # going trough headers th
     #    console.log($("#" + obj.form_id).find('td[data-width-align-id]'))
+    # todo ladas !!!!!!!1 kdyz upravuju prvni radek tak se tabulka hybe, jako prvni radek bych mozna mel dat prazdny radek s vyskou 0
     $("#" + obj.form_id).find('th[data-width-align-id]').each (index, element) =>
 
       # loading paired td and th
@@ -134,7 +130,7 @@ class EditableTableAligner
     head  = $("#" + obj.form_id).find(".fixedLeftColumn .table_head thead")
     # first clear the head, but only if not by XHR, head is not sent by ajax
 
-    console.log(xhr)
+    
     if xhr? && !xhr
       head.html("")
       # then fill it with actual data

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

@@ -50,7 +50,7 @@ class EditableTableBuilder
       do (row) ->
         row_count += 1
         EditableTableBuilder.html += '<tr data-row-count-number="' + row_count + '"'
-        console.log(EditableTableBuilder.obj.row_colors)
+
         if EditableTableBuilder.obj.row_colors?
           if EditableTableBuilder.obj.row_colors[row.row_id]?
             style = 'color:' + EditableTableBuilder.obj.row_colors[row.row_id]["color"]
@@ -102,7 +102,18 @@ class EditableTableBuilder
             summarize_page += '<div class="summarize_page non-breakable-collumn">'
             summarize_page += if col.summarize_page_label? then col.summarize_page_label else ''
             summarize_page += '<span class="value">'
-            summarize_page += if col.summarize_page_value? then col.summarize_page_value else 0
+            # todo ladas toto je treba uzavrit do formatovani jedne bunky
+            if col.summarize_page_value?
+              if (is_hash(col.summarize_page_value ))
+                if col.summarize_page_value.name?
+                  summarize_page += col.summarize_page_value.name
+                else
+                  summarize_page += 0
+              else
+                summarize_page += col.summarize_page_value
+            else
+              summarize_page += 0
+
             summarize_page += '</span>'
             summarize_page += '</div>'
 
@@ -141,7 +152,17 @@ class EditableTableBuilder
             summarize_all += '<div class="summarize_all non-breakable-collumn">'
             summarize_all += if col.summarize_all_label? then col.summarize_all_label else ''
             summarize_all += '<span class="value">'
-            summarize_all += if col.summarize_all_value? then col.summarize_all_value else 0
+            # todo ladas toto je treba uzavrit do formatovani jedne bunky
+            if col.summarize_all_value?
+              if (is_hash(col.summarize_all_value ))
+                if col.summarize_all_value.name?
+                  summarize_all += col.summarize_all_value.name
+                else
+                  summarize_all += 0
+              else
+                summarize_all += col.summarize_all_value
+            else
+              summarize_all += 0
             summarize_all += '</span>'
             summarize_all += '</div>'
           summarize_all += '</td>'
@@ -237,21 +258,29 @@ class EditableTableBuilder
         EditableTableBuilder.html += '<div class="non-breakable-collumn">' if true
         #col.non_breakable? && col.non_breakable
 
-        if (is_hash(row[col.table + '_' + col.name]))
+        active_cell
+        if EditableTableBuilder.valid_table(col.table)
+          active_cell = row[col.table + '_' + col.name]
+        else
+          active_cell = row[col.name]
+
+
+
+        if (is_hash(active_cell))
           # hash span or href (styled as button)
-          button_settings = row[col.table + '_' + col.name]
+          button_settings = active_cell
           button_settings = {} if !button_settings?
           EditableTableBuilder.make_column_from_hash(button_settings, row, col)
 
-        else if (is_array(row[col.table + '_' + col.name]))
+        else if (is_array(active_cell))
           # array of hashes (probably buttons)
-          one_cell_buttons = row[col.table + '_' + col.name]
+          one_cell_buttons = active_cell
           for one_cell_button in one_cell_buttons
             do (one_cell_button) ->
               one_cell_button = {} if !one_cell_buttons?
               EditableTableBuilder.make_column_from_hash(one_cell_button, row, col)
 
-        else if (is_string(row[col.table + '_' + col.name]))
+        else if (is_string(active_cell))
           # its just string
           text = ""
           text = row[col.table + '_' + col.name] if row[col.table + '_' + col.name]?
@@ -331,7 +360,11 @@ class EditableTableBuilder
     else
       EditableTableBuilder.html += '</span>'
 
-
+  @valid_table: (table_name) ->
+    if (table_name == "___sql_expression___")
+      false
+    else
+      true
 
 
   @make_row_function_button: (button_settings, row, col) ->

data/app/views/helpers/editable_table/_build_table_ajax_callback_code.html.erb

@@ -32,14 +32,14 @@
                 <% if settings[:template].blank? %>
                 var parsed_settings = jQuery.parseJSON(parsed_response['settings'])
                 var html_from_json = EditableTableBuilder.render_tbody(parsed_settings);
-                console.log("created")
+
                 TableSummaries.refresh(parsed_settings);
-                console.log("summaries")
+
 
                 $("#<%= settings[:form_id] %>_ajax_content").html(html_from_json);
                 apply_modifiers_of_the_table($("#<%= settings[:form_id] %>_ajax_content"));
                 EditableTableAligner.align_table(parsed_settings, true);
-                console.log("aligned")
+
 
                 <% else %>
                 var raw_html = parsed_response['settings']

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.22"
+  s.version = "1.2.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ladas"]
-  s.date = "2012-11-15"
+  s.date = "2012-11-26"
   s.description = "longer description of your gem"
   s.email = "ladislav.smola@it-logica.cz"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.2.22
+  version: 1.2.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &75696700 !ruby/object:Gem::Requirement
+  requirement: &81606180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75696700
+  version_requirements: *81606180
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &75696260 !ruby/object:Gem::Requirement
+  requirement: &81605730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75696260
+  version_requirements: *81605730
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &75695800 !ruby/object:Gem::Requirement
+  requirement: &81605270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *75695800
+  version_requirements: *81605270
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &75695230 !ruby/object:Gem::Requirement
+  requirement: &81604680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *75695230
+  version_requirements: *81604680
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &75694680 !ruby/object:Gem::Requirement
+  requirement: &81604140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *75694680
+  version_requirements: *81604140
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &75694330 !ruby/object:Gem::Requirement
+  requirement: &81603800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75694330
+  version_requirements: *81603800
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -618,7 +618,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -574375823
+      hash: 397464157
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: