it-logica-application-backbone 0.2.10 → 0.2.11

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.11

data/app/assets/javascripts/backbone_js/ladas_paginate.js

@@ -2,7 +2,7 @@ function formatLinkForPaginationURL(form_id) {
     var matchedString;
     var page_number;
     //$("#" + paginate_wrapper).find("a").each(function() {
-    $("."+ form_id +"_pager").find("a").each(function() {
+    $("." + form_id + "_pager").find("a").each(function () {
         var linkElement = $(this);
         var paginationURL = linkElement.attr("href");
         var matchedString = paginationURL.match(/(\?|\&)page=(\d+)/);
@@ -12,11 +12,11 @@ function formatLinkForPaginationURL(form_id) {
         }
 
         linkElement.attr({
-            "url": paginationURL,
-            "href": "#"
+            "url":paginationURL,
+            "href":"#"
         });
 
-        linkElement.click(function() {
+        linkElement.click(function () {
             $("#" + form_id + "_page").val(page_number);
             $("#" + form_id).submit();
             return false;
@@ -29,7 +29,7 @@ function formatLinkForPagination(container_class) {
     var matchedString;
     var page_number;
     //$("#" + paginate_wrapper).find("a").each(function() {
-    $("."+ container_class).find("a").each(function() {
+    $("." + container_class).find("a").each(function () {
         var linkElement = $(this);
         var paginationURL = linkElement.attr("href");
         var matchedString = paginationURL.match(/(\?|\&)page=(\d+)/);
@@ -41,10 +41,12 @@ function formatLinkForPagination(container_class) {
         linkElement.attr({
 //            "url": paginationURL,
 //            "href": "#"
-            "data-remote": true
+            "data-remote":true
         });
 
-        linkElement.bind('ajax:beforeSend', function(evt, xhr, settings) { ajax_beforeSend_std(evt, xhr, settings) });
+        linkElement.bind('ajax:beforeSend', function (evt, xhr, settings) {
+            ajax_beforeSend_std(evt, xhr, settings)
+        });
         linkElement.bind('ajax:success', function (evt, data, status, xhr) {
                 ajax_success_std(evt, data, status, xhr, ["list"]);
                 set_anchors_to_alu_items();
@@ -52,7 +54,7 @@ function formatLinkForPagination(container_class) {
 
             }
         );
-        linkElement.bind('ajax:error', function(evt, xhr, status, error) {
+        linkElement.bind('ajax:error', function (evt, xhr, status, error) {
             ajax_error_std(evt, xhr, status, error);
             $('#spinner').hide();
         });
@@ -93,17 +95,63 @@ function formatLinkForPagination(container_class) {
 
 function filter_sort(form_id, order_by_value, dir, obj) {
     var order_by_id = '#' + form_id + '_order_by';
-    var order_by_direction_id = '#' + form_id + '_order_by_direction';
+    var default_order_by_val = $('#' + form_id + '_default_order_by').val();
+
+    var order_by_array = $(order_by_id).val().split(",");
+    //console.log(order_by_value)
+    //console.log(dir)
+    //console.log(order_by_array);
 
-    $(order_by_id).val(order_by_value);
-    $(order_by_direction_id).val(dir);
+    if (order_by_array.indexOf(order_by_value + " " + dir) >= 0) { // the value is already there, if I click on it again I want to cancel the sorting by this value
+        //console.log("mazu");
+        var index = order_by_array.indexOf(order_by_value + " " + dir);
+        order_by_array.splice(index, 1);
+        if (order_by_array.length <= 0) {
+            // the ordering is empty I will fill it with default
+            order_by_array.push(default_order_by_val);
+        }
+        //console.log(order_by_array);
+    }
+    else if ((dir == "DESC" && order_by_array.indexOf(order_by_value + " ASC") >= 0) || (dir == "ASC" && order_by_array.indexOf(order_by_value + " DESC") >= 0)) {
+        // there is other variant of the column DESC or ASC, I will swith it to the other variant
+        //console.log("menim dir");
+        if (dir == "DESC") {
+            var index = order_by_array.indexOf(order_by_value + " ASC");
+            order_by_array[index] = order_by_value + " DESC";
+        }
+        else {
+            var index = order_by_array.indexOf(order_by_value + " DESC");
+            order_by_array[index] = order_by_value + " ASC";
+        }
+        //console.log(order_by_array);
+    }
+    else { // i am not ordering by this value, I will append it to end
+        //console.log("pridavam");
+        order_by_array.push(order_by_value + " " + dir);
+        //console.log(order_by_array);
+    }
 
-    $("#" + form_id + " .sort_button").each(function() {
+    $("#" + form_id + " .sort_button").each(function () {
         $(this).removeClass("active");
         $(this).addClass("inactive");  // give all disabled class
     });
-    $(obj).removeClass("inactive");  // remove disabled from this one
-    $(obj).addClass("active");
+
+    var new_order_by_val = "";
+    $.each(order_by_array, function (i, item) {
+        if (new_order_by_val != "") {
+            new_order_by_val += ",";
+        }
+        //console.log(item);
+        new_order_by_val += item;
+
+        var order_by_button_id = "#" + item.replace(" ", "___").replace(".", "___");
+        $(order_by_button_id).removeClass("inactive");
+        $(order_by_button_id).addClass("active");
+    });
+    //console.log(new_order_by_val);
+
+    $(order_by_id).val(new_order_by_val);
+
 
     $('#' + form_id).submit();
     return false;

data/app/views/helpers/_build_table_filter.html.erb

@@ -5,8 +5,9 @@
   <%#= submit_tag "Filter",{:class => 'button'} %>
 </fieldset>
 
-<%= hidden_field_tag :order_by, settings[:default][:order_by], :id => settings[:form_id] + '_order_by' %>
-<%= hidden_field_tag :order_by_direction, settings[:default][:order_by_direction], :id => settings[:form_id] + '_order_by_direction' %>
+<%= hidden_field_tag :default_order_by, settings[:default][:order].blank? ? settings[:default][:order_by] + " " + settings[:default][:order_by_direction] : settings[:default][:order], :id => settings[:form_id] + '_default_order_by' %>
+<%= hidden_field_tag :order_by, settings[:params][:order_by], :id => settings[:form_id] + '_order_by' %>
+<%#= hidden_field_tag :order_by_direction, settings[:default][:order_by_direction], :id => settings[:form_id] + '_order_by_direction' %>
 <%= hidden_field_tag :page, settings[:default][:page], :id => settings[:form_id] + '_page' %>
 
 <%# end %>

data/app/views/helpers/_build_table_wrapper.html.erb

@@ -9,7 +9,10 @@
     <% if !settings[:row].blank? && !settings[:row][:functions].blank? %>
         <th></th>
     <% end %>
+    <% order_by_arr = settings[:params][:order_by].split(",") %>
     <% settings[:columns].each do |col| %>
+        <% order_asc_id = (col[:table] + "___" + col[:name] + "___ASC") %>
+        <% order_desc_id = (col[:table] + "___" + col[:name] + "___DESC") %>
         <th class="<%= col[:class] %>">
           <div class="th_label">
             <span><%= col[:label].html_safe %></span>
@@ -21,39 +24,41 @@
 
           <span onclick="filter_sort('<%= settings[:form_id] %>','<%= col[:table] + "." +col[:name] %>', 'ASC', this); return false;"
                 title="Seřadit vzestupně"
-                class="icon-arrow-up sort_button sort-up <%= (settings[:params][:order_by] == (col[:table] + "." + col[:name]) && settings[:params][:order_by_direction]=="ASC") ? "active" : "inactive" %>">
+                class="icon-arrow-up sort_button sort-up <%= (order_by_arr.include?(col[:table] + "." + col[:name] + " ASC")) ? "active" : "inactive" %>"
+                id="<%= order_asc_id %>">
             <span class="oos"></span></span>
            <span onclick="filter_sort('<%= settings[:form_id] %>','<%= col[:table] + "." +col[:name] %>', 'DESC', this); return false;"
                  title="Seřadit sestupně"
-                 class="icon-arrow-down sort_button sort-down <%= (settings[:params][:order_by] == (col[:table] + "." + col[:name]) && settings[:params][:order_by_direction]=="DESC") ? "active" : "inactive" %>">
+                 class="icon-arrow-down sort_button sort-down <%= (order_by_arr.include?(col[:table] + "." + col[:name] + " DESC")) ? "active" : "inactive" %>"
+                 id="<%= order_desc_id %>">
             <span class="oos "></span></span>
             <% end %>
-            <% case col[:filter] %>
+              <% case col[:filter] %>
             <% when :find %>
                 <% saved_param = (!settings[:params].blank? && !settings[:params]['find'].blank? && !settings[:params]['find']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['find']["#{col[:table]}.#{col[:name]}"] : "" %>
-                <span><%= text_field_tag "find[#{col[:table]}.#{col[:name]}]", saved_param,
-                                         {:class => "input-small text #{settings[:form_id] + '_column_find'}"} %>
+                  <span><%= text_field_tag "find[#{col[:table]}.#{col[:name]}]", saved_param,
+                                           {:class => "input-small text #{settings[:form_id] + '_column_find'}"} %>
                      </span>
             <% when :multichoice %>
                 <% saved_param = (!settings[:params].blank? && !settings[:params]['multichoice'].blank? && !settings[:params]['multichoice']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['multichoice']["#{col[:table]}.#{col[:name]}"] : [] %>
-                <span><%= select_tag("multichoice[#{col[:table]}.#{col[:name]}]", options_for_select(col[:filter_data], saved_param),
-                                     :onchange => "form_submit_watcher('#{settings[:form_id]}')",
-                                     :multiple => true,
-                                     :class => "multiselect_class") %></span>
+                  <span><%= select_tag("multichoice[#{col[:table]}.#{col[:name]}]", options_for_select(col[:filter_data], saved_param),
+                                       :onchange => "form_submit_watcher('#{settings[:form_id]}')",
+                                       :multiple => true,
+                                       :class => "multiselect_class") %></span>
             <% when :date %>
                 <% saved_param = (!settings[:params].blank? && !settings[:params]['date_from'].blank? && !settings[:params]['date_from']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['date_from']["#{col[:table]}.#{col[:name]}"] : "" %>
-                <%#= label_tag "date_from[#{col[:table]}.#{col[:name]}]", "Od", :class => "datetime_class_label" %>
-                <%= text_field_tag "date_from[#{col[:table]}.#{col[:name]}]", saved_param, {:class => "datetime_class input-small",
+                  <%#= label_tag "date_from[#{col[:table]}.#{col[:name]}]", "Od", :class => "datetime_class_label" %>
+                  <%= text_field_tag "date_from[#{col[:table]}.#{col[:name]}]", saved_param, {:class => "datetime_class input-small",
+                                                                                              :onchange => "form_submit_watcher('#{settings[:form_id]}')",
+                                                                                              :title => "Datum od"} %>
+                  <% saved_param = (!settings[:params].blank? && !settings[:params]['date_to'].blank? && !settings[:params]['date_to']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['date_to']["#{col[:table]}.#{col[:name]}"] : "" %>
+                  <%#= label_tag "date_to[#{col[:table]}.#{col[:name]}]", "Do", :class => "datetime_class_label" %>
+                  <%= text_field_tag "date_to[#{col[:table]}.#{col[:name]}]", saved_param, {:class => "datetime_class input-small",
                                                                                             :onchange => "form_submit_watcher('#{settings[:form_id]}')",
-                                                                                            :title => "Datum od"} %>
-                <% saved_param = (!settings[:params].blank? && !settings[:params]['date_to'].blank? && !settings[:params]['date_to']["#{col[:table]}.#{col[:name]}"].blank?) ? settings[:params]['date_to']["#{col[:table]}.#{col[:name]}"] : "" %>
-                <%#= label_tag "date_to[#{col[:table]}.#{col[:name]}]", "Do", :class => "datetime_class_label" %>
-                <%= text_field_tag "date_to[#{col[:table]}.#{col[:name]}]", saved_param, {:class => "datetime_class input-small",
-                                                                                          :onchange => "form_submit_watcher('#{settings[:form_id]}')",
-                                                                                          :title => "Datum do"} %>
-                <span></span>
+                                                                                            :title => "Datum do"} %>
+                  <span></span>
             <% else %>
-            <% end %>
+              <% end %>
             </span>
           </div>
         </th>

data/it-logica-application-backbone.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "it-logica-application-backbone"
-  s.version = "0.2.10"
+  s.version = "0.2.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ladas"]

data/lib/controller_mixins/renderer_instance_methods.rb

@@ -6,7 +6,11 @@ module ControllerMixins
       class_obj = data.respond_to?(:klass) ? data.klass : data
       if action_name == "filter"
         default_params = params
-        default_params = @settings[:default] if !params.blank? && params["clear"]
+        if !params.blank? && params["clear"]
+          default_params = @settings[:default].dup
+          default_params[:order_by] = @settings[:default][:order_by] + " " + @settings[:default][:order_by_direction] if !@settings[:default][:order_by].blank? && !@settings[:default][:order_by_direction].blank?
+          default_params[:order_by] = @settings[:default][:order] if !@settings[:default][:order].blank?
+        end
 
         @settings = class_obj.prepare_settings(logged_user, data, @settings, default_params)
         if !params.blank? && params["clear"]

data/lib/model_mixins/table_builder_class_methods.rb

@@ -2,10 +2,15 @@ module ModelMixins
   module TableBuilderClassMethods
     def prepare_settings(logged_user, object, settings, params, per_page = 10)
       params[:page] = 1 if params[:page].blank?
-      params[:order_by] = settings[:default][:order_by] if params[:order_by].blank?
-      params[:order_by_direction] = settings[:default][:order_by_direction] if params[:order_by_direction].blank?
+      params[:order_by] = settings[:default][:order_by] + " " + settings[:default][:order_by_direction] if params[:order_by].blank? && !settings[:default][:order_by].blank? && !settings[:default][:order_by_direction].blank?
+
+      params[:order_by] = settings[:default][:order] if params[:order_by].blank? && !settings[:default][:order].blank?
+
+
       params[:per_page] = per_page
 
+      # method below can change this if there were some virtual non exixtent columns
+      params[:real_order_by] = params[:order_by]
       check_non_existing_colum_order_by(settings, params)
 
       not_selected_items = object.filter(settings, params, per_page)
@@ -147,7 +152,7 @@ module ModelMixins
     end
 
     def filter(settings, params, per_page = 10)
-      order_by = params[:order_by] +' '+ params[:order_by_direction]
+      order_by = params[:real_order_by]
 
       cond_str = ""
       cond_hash = {}
@@ -239,19 +244,24 @@ module ModelMixins
 
 
     def check_non_existing_colum_order_by(settings, params)
-      if params[:order_by].match(/^.*?non_existing_column___.*$/i)
-        identifier = params[:order_by].split("non_existing_column___").second
-        settings[:columns].each do |col|
-          if !col[:select_as].blank? && !col[:format_method].blank? && col[:format_method] == identifier
-            params[:order_by] = col[:order_by].gsub(",", " #{params[:order_by_direction]} ,")
-          else
-            ""
+      order_by_arr = params[:order_by].split(",")
+      order_by_arr.each_with_index do |one_order_by, index|
+        if one_order_by.match(/^.*?non_existing_column___.*$/i)
+          identifier_and_direction = one_order_by.split("non_existing_column___").second
+          identifier = identifier_and_direction.split(" ").first
+          order_by_direction = identifier_and_direction.split(" ").second
+          settings[:columns].each do |col|
+            if !col[:select_as].blank? && !col[:format_method].blank? && col[:format_method] == identifier
+              order_by_arr[index] = col[:order_by].gsub(",", " #{order_by_direction} ,") + " #{order_by_direction}"
+            else
+              ""
+            end
           end
+        else
+          ""
         end
-      else
-
       end
-
+      params[:real_order_by] = order_by_arr*","
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &72065910 !ruby/object:Gem::Requirement
+  requirement: &83291580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72065910
+  version_requirements: *83291580
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &72065660 !ruby/object:Gem::Requirement
+  requirement: &83291330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72065660
+  version_requirements: *83291330
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &72065350 !ruby/object:Gem::Requirement
+  requirement: &83291020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *72065350
+  version_requirements: *83291020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &72065060 !ruby/object:Gem::Requirement
+  requirement: &83290750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *72065060
+  version_requirements: *83290750
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &72064800 !ruby/object:Gem::Requirement
+  requirement: &83290480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *72064800
+  version_requirements: *83290480
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &72064550 !ruby/object:Gem::Requirement
+  requirement: &83290230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72064550
+  version_requirements: *83290230
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -560,7 +560,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 700838909
+      hash: -428679615
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: