rich_table_component 0.0.10 → 0.0.13

data/app/helpers/component_helper.rb

@@ -205,6 +205,27 @@ module ComponentHelper
     result.html_safe
   end
 
+
+  def fake_pagination(rtc_controller_name)
+    per_page_options = [5, 10, 20, 50, 100, 200]
+    result = '<div class="pagination">'
+    result += '<span class="first_page disabled">&lt;&lt;</span>'
+    result += '<span class="previous_page disabled">&lt;</span>'
+    result += '<div class="current_page_part">Hal. 1 dari 1'
+    result += '</div>'
+    result += '<span class="previous_page disabled">&lt;</span>'
+    result += '<span class="last_page disabled">&gt;&gt;</span>'
+    result += '<div class="per_page_part">'
+    result += (select_tag 'per_page', (per_page_options.map{|m| "<option #{(m==params[:per_page].to_i ? 'selected=selected' : '')}>#{m}</option>"}.join.html_safe))
+    result += '</div>'
+    result += '<div class="go_to_page_part">'
+    result += '<input type="text" value="1" name="page">'
+    result += (link_to "Go", {controller: rtc_controller_name}, remote: true, class: "gotopage btn-mini")
+    result += 'Pedr hal.</div>'
+    result += '</div>'
+    result.html_safe
+  end
+
 end
 
 

data/app/views/application/create.js.erb

@@ -17,6 +17,11 @@ $rtc.find('.rtc_empty_message').remove();
 
 $('.modal').modal('hide');
 
+<% if flash[:error].present? %>
+  showGlobalNotification('<%= flash[:error] %>', {type: ERROR});
+<% else %>
+  showGlobalNotification('<%= flash[:notice] %>', {type: SUCCESS});
+<% end %>
 
 <% flash[:error].try(:clear) %>
 <% flash[:notice].try(:clear) %>

data/app/views/application/update.js.erb

@@ -16,7 +16,12 @@ $('.lvr_entry_edited').removeClass('lvr_entry_edited');
 
 $('.modal').modal('hide');
 
-showGlobalNotification('<%= flash[:notice] %>', {type: SUCCESS});
+
+<% if flash[:error].present? %>
+  showGlobalNotification('<%= flash[:error] %>', {type: ERROR});
+<% else %>
+  showGlobalNotification('<%= flash[:notice] %>', {type: SUCCESS});
+<% end %>
 
 <% flash[:error].try(:clear) %>
 <% flash[:notice].try(:clear) %>

data/app/views/rich_table_component/_pagination.html.haml

@@ -2,7 +2,7 @@
 - @controller_names = instance_variable_get("@#{rtc_controller_name}")
 - if @controller_names.respond_to?(:total_pages)
   - if @controller_names.length > 0
-    = will_paginate(@controller_names, :renderer => PaginationListLinkRenderer, params: params, remote: true, :page => params[:page], :per_page => params[:per_page].presence || @controller_names.per_page)
+    = will_paginate(@controller_names, :renderer => PaginationListLinkRenderer, params: params, remote: true, :page => params[:page], :per_page => params[:per_page].presence || @controller_names.per_page) || fake_pagination(rtc_controller_name)
     .page_entries_info
       = page_entries_info @controller_names
       

data/app/views/rich_table_component/rtc/_advanced_search.html.haml

@@ -64,12 +64,12 @@
           .control-group.string.optional.range
             %label.string.optional.control-label{for: "q_#{attribute_name}_gteq"}= t(label_name)
             .controls
-              %input.string.optional.datepicker{id: "q_#{attribute_name}_gteq", name: "q[#{attribute_name}_gteq]", size: "50", type: "text"}
+              %input.string.optional.datepicker{id: "q_#{rtc_controller_name}_#{attribute_name}_gteq", name: "q[#{attribute_name}_gteq]", size: "50", type: "text"}
                 %p.help-block DD-MM-YYYY
             %span.floating
               = t('to')
             .controls.floating
-              %input.string.optional.datepicker{id: "q_#{attribute_name}_lteq", name: "q[#{attribute_name}_lteq]", size: "50", type: "text"}
+              %input.string.optional.datepicker{id: "q_#{rtc_controller_name}_#{attribute_name}_lteq", name: "q[#{attribute_name}_lteq]", size: "50", type: "text"}
                 %p.help-block DD-MM-YYYY
         - else
           = f.input "#{underscore_attribute}_eq".to_sym, label: label_name, required: false, input_html: { class: 'datepicker' }, hint: 'DD-MM-YYYY'
@@ -78,15 +78,15 @@
           .control-group.string.optional.range
             %label.string.optional.control-label{for: "q_#{attribute_name}_gteq"}= t(label_name)
             .controls
-              %input.string.optional.datepicker{id: "q_#{attribute_name}_gteq", name: "q[#{attribute_name}_gteq]", size: "50", type: "text"}
+              %input.string.optional.datepicker{id: "q_#{rtc_controller_name}_#{attribute_name}_gteq", name: "q[#{attribute_name}_gteq]", size: "50", type: "text"}
                 %p.help-block DD-MM-YYYY
             %span.floating
               = t('to')
             .controls.floating
-              %input.string.optional.datepicker{id: "q_#{attribute_name}_lteq", name: "q[#{attribute_name}_lteq]", size: "50", type: "text"}
+              %input.string.optional.datepicker{id: "q_#{rtc_controller_name}_#{attribute_name}_lteq", name: "q[#{attribute_name}_lteq]", size: "50", type: "text"}
                 %p.help-block DD-MM-YYYY
         - else
-          = f.input "#{underscore_attribute}_eq".to_sym, label: label_name, required: false, input_html: { class: 'datepicker' }, hint: 'DD-MM-YYYY'
+          = f.input "#{rtc_controller_name}_#{underscore_attribute}_eq".to_sym, label: label_name, required: false, input_html: { class: 'datepicker' }, hint: 'DD-MM-YYYY'
 
   .form-actions
     %button{type: 'submit', class: 'btn btn-primary'}

data/app/views/rich_table_component/rtc/_advanced_search_recapitulation.html.haml

@@ -65,13 +65,13 @@
           .control-group.string.optional.range
             %label.string.optional.control-label{for: "q_#{attribute_name}_gteq"}= t(label_name)
             .controls
-              %input.string.optional.datepicker{id: "q_#{attribute_name}_gteq", name: "q[#{attribute_name}_gteq]", size: "50", type: "text"}
+              %input.string.optional.datepicker{id: "q_recap_#{recapitulation_model.tableize}_#{attribute_name}_gteq", name: "q[#{attribute_name}_gteq]", size: "50", type: "text"}
                 %p.help-block DD-MM-YYYY
           .control-group.string.optional.range
             %label.string.optional.control-label
               = t('to')
             .controls
-              %input.string.optional.datepicker{id: "q_#{attribute_name}_lteq", name: "q[#{attribute_name}_lteq]", size: "50", type: "text"}
+              %input.string.optional.datepicker{id: "q_recap_#{recapitulation_model.tableize}_#{attribute_name}_lteq", name: "q[#{attribute_name}_lteq]", size: "50", type: "text"}
                 %p.help-block DD-MM-YYYY
       - else
         = f.input "#{underscore_attribute}_eq".to_sym, label: label_name, required: false, input_html: { class: 'datepicker' }, hint: 'DD-MM-YYYY'
@@ -79,9 +79,9 @@
       - if range
         .range_input
           .control-group.string.optional.range
-            %label.string.optional.control-label{for: "q_#{attribute_name}_gteq"}= t(label_name)
+            %label.string.optional.control-label{for: "q_recap_#{recapitulation_model.tableize}_#{attribute_name}_gteq"}= t(label_name)
             .controls
-              %input.string.optional.datepicker{id: "q_#{attribute_name}_gteq", name: "q[#{attribute_name}_gteq]", size: "50", type: "text"}
+              %input.string.optional.datepicker{id: "q_recap_#{recapitulation_model.tableize}_#{attribute_name}_gteq", name: "q[#{attribute_name}_gteq]", size: "50", type: "text"}
                 %p.help-block DD-MM-YYYY
           .control-group.string.optional.range
             %label.string.optional.control-label
@@ -90,4 +90,4 @@
               %input.string.optional.datepicker{id: "q_#{attribute_name}_lteq", name: "q[#{attribute_name}_lteq]", size: "50", type: "text"}
                 %p.help-block DD-MM-YYYY
       - else
-        = f.input "#{underscore_attribute}_eq".to_sym, label: label_name, required: false, input_html: { class: 'datepicker' }, hint: 'DD-MM-YYYY'
+        = f.input "recap_#{recapitulation_model.tableize}_#{underscore_attribute}_eq".to_sym, label: label_name, required: false, input_html: { class: 'datepicker' }, hint: 'DD-MM-YYYY'

data/app/views/rich_table_component/rtc/_content.html.haml

@@ -21,7 +21,13 @@
 
     - headers.each_with_index do |header, i|
       .rtc_gh_item{'data-column-width' => columns_width[i]}
-        = header.present? ? sort_link(header, rtc_controller_name: rtc_controller_name, params: params, rtc_partial: rtc_partial) : raw(" ")
+        - if header.present?
+          - if header.instance_of?(Array) && header.try(:first).nil?
+            %span= raw(t(header.try(:last)))
+          - else
+            = sort_link(header, rtc_controller_name: rtc_controller_name, params: params, rtc_partial: rtc_partial)
+        - else
+          = raw(" ")
 
   .rtc_grid
     = render "rich_table_component/rtc/table", 

data/lib/pagination_list_link_renderer.rb

@@ -18,8 +18,7 @@ class PaginationListLinkRenderer < WillPaginate::ActionView::LinkRenderer
   protected
 
     def pagination
-      #[ :first_page, :previous_page, :current_page_info, :next_page, :last_page, :per_page_navigator, :input_page_navigator ]
-      [ :first_page, :previous_page, :current_page_info, :next_page, :last_page, :input_page_navigator ]
+      [ :first_page, :previous_page, :current_page_info, :next_page, :last_page, :per_page_navigator, :input_page_navigator ]
     end
 
     def first_page
@@ -39,8 +38,8 @@ class PaginationListLinkRenderer < WillPaginate::ActionView::LinkRenderer
     end
     
     def per_page_navigator
-      per_page_options = [2, 5, 10, 20, 50, 100]
-      '<div class="per_page_part">' + (tag(:select, per_page_options.map{|m| "<option #{(m==@options[:per_page]? 'selected=selected' : '')}>#{m}</option>"}.join, :data_value => @options[:per_page], :name => "per_page").html_safe) + I18n.t("will_paginate.per_page") + '</div>'
+      per_page_options = [5, 10, 20, 50, 100, 200]
+      '<div class="per_page_part">' + (tag(:select, per_page_options.map{|m| "<option #{(m==@options[:per_page].to_i ? 'selected=selected' : '')}>#{m}</option>"}.join, :data_value => @options[:per_page], :name => "per_page").html_safe) + I18n.t("will_paginate.per_page") + '</div>'
     end
 
     def link(text, target, attributes = {})

data/lib/rich_table_component/version.rb

@@ -1,3 +1,3 @@
 module RichTableComponent
-  VERSION = "0.0.10"
+  VERSION = "0.0.13"
 end

data/lib/rich_table_component.rb

@@ -44,6 +44,12 @@ module RichTableComponent
     end
 
 
+      # get session per page for pagination
+      def session_per_page
+        session[:per_page] ||= DEFAULT_PER_PAGE
+      end
+
+
 
 
       # Removes leading and trailing whitespace from ransack search params
@@ -140,7 +146,8 @@ module RichTableComponent
 
         if pagination
           params[:page] ||= 1
-          params[:per_page] ||= WillPaginate.per_page
+          params[:per_page] ||= session_per_page
+          session[:per_page] = params[:per_page]
           relation = relation.page(params[:page].to_i).per_page(params[:per_page].to_i)
         end
 
@@ -179,7 +186,13 @@ module RichTableComponent
           case join_model.columns_hash[group_attr].type
           when :date
             old_since = splitter_time[2].eql?('old') ? "#{splitter_time[1]}(curdate()) - " : ""
-            group_db = "(#{old_since}#{splitter_time[1]}(#{group_attr}))"
+
+            if old_since.eql?("") && splitter_time[1].eql?('month')
+              group_db = "(concat(year(#{group_attr}), '/', LPAD(month(#{group_attr}), 2, '0')  ))" 
+            else
+              group_db = "(#{old_since}#{splitter_time[1]}(#{group_attr}))"  
+            end
+
             if splitter_time[3].presence
               group_db = "(floor((#{group_db}) / #{splitter_time[3].to_i}))"
             end
@@ -195,7 +208,7 @@ module RichTableComponent
 
       def get_as_group_db(group_db)
         as_group_db = "#{group_db.to_s.gsub('.', '__')}"
-        as_group_db = 'datetime_calculation' if as_group_db.index('curdate').present? || as_group_db.index('year(').present?
+        as_group_db = 'datetime_calculation' if as_group_db.index('curdate').present? || as_group_db.downcase.index('year(').present? || as_group_db.downcase.index('month(').present?
         as_group_db
       end
 
@@ -499,13 +512,13 @@ module RichTableComponent
         respond_to do |format|
           case act
           when :create
-            flash[:notice] = "#{obj.class.name.tableize} was successfully created."
+            flash[:notice] ||= "#{obj.class.name.tableize} was successfully created."
             format.html { redirect_to controller: obj.class.name.tableize, action: :edit, id: obj.id }
           when :update
-            flash[:notice] = "#{obj.class.name.tableize} was successfully updated."
+            flash[:notice] ||= "#{obj.class.name.tableize} was successfully updated."
             format.html { redirect_to controller: obj.class.name.tableize, action: :edit, id: obj.id }
           when :destroy
-            flash[:notice] = "#{obj.class.name.tableize} was successfully deleted."
+            flash[:notice] ||= "#{obj.class.name.tableize} was successfully deleted."
             format.html { redirect_to controller: obj.class.name.tableize, action: :index }
           else
             format.html # index.html.erb
@@ -543,10 +556,10 @@ module RichTableComponent
       def format_remote(format, act = action_name, obj = instance_variable_get("@#{controller_name}"), html_redirect = nil)
         case act
         when :create
-          flash[:notice] = "#{obj.class.name.tableize} was successfully created."
+          flash[:notice] ||= "#{obj.class.name.tableize} was successfully created."
           format.html { redirect_to controller: obj.class.name.tableize, action: html_redirect.presence || :edit, id: obj.id }
         when :update
-          flash[:notice] = "#{obj.class.name.tableize} was successfully updated."
+          flash[:notice] ||= "#{obj.class.name.tableize} was successfully updated."
           format.html { redirect_to controller: obj.class.name.tableize, action: html_redirect.presence || :edit, id: obj.id }
         else
           format.html { render action: act }

data/rich_table_component.gemspec

@@ -31,5 +31,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'wicked_pdf'
 
   gem.add_dependency 'compass-rails'  
-  gem.add_dependency 'twitter-bootstrap-rails'
+  gem.add_dependency 'twitter-bootstrap-rails', '2.2.4'
 end

data/vendor/assets/javascripts/admin/starqle.grid.js

@@ -89,7 +89,7 @@ var ajaxifyTableGrid = function(){
       params.page = $pagination.find('input').val();
       $href = $(this).parents('.pagination').find('a').eq(0).get(0).href;
     }
-    //params.per_page = $pagination.find('select').val();
+    params.per_page = $.cookie('unm_pp');
     if($elmt.find('input#search').val() != '') {
       params.search = $elmt.find('input#search').val(); 
     }
@@ -114,6 +114,7 @@ var ajaxifyTableGrid = function(){
     });
     
     var params = {};
+    params.per_page = $.cookie('unm_pp');
     if($elmt.find('input#search').val() != ''){
       params = getSerializeArray($elmt.find('input#search').serializeArray());
     }
@@ -128,8 +129,6 @@ var ajaxifyTableGrid = function(){
   }).live('ajax:success', function(){
     var $ths = $(this);
     var $elmt = $(this).parents('.rich_table_component');
-    $select = $elmt.find('.pagination_area').find('select[name=per_page]');
-    $select.find('option').filter(function(index) { return $(this).text() === $select.attr('data_value'); }).attr('selected', true);
     
     $elmt.find('.rtc_gh_item a').removeClass('asc').removeClass('desc');
     if($ths.attr('href').indexOf("=asc") != -1){
@@ -165,12 +164,14 @@ var ajaxifyTableGrid = function(){
 
     var params = getSerializeArray($elmt.find('form#filter_form').serializeArray());
     $.extend(params, getSerializeArray($(this).serializeArray()));
-    params['page'] = 1;
+    params.page = 1;
+    params.per_page = $.cookie('unm_pp');
     
     var $this_button = $ths.find('input[type=submit]');
     if($this_button.is('.disabled, .pressed')){return false;}
     $this_button.addClass('pressed');
     
+    settings.url += (settings.url.indexOf('?') >= 0 ? '&' : '?') + $.param(params);
   }).live('ajax:success', function(){
     var $this_button = $(this).find('input[type=submit]');
     $this_button.removeClass('pressed');
@@ -230,7 +231,7 @@ var ajaxifyTableGrid = function(){
   // SEARCHING (advanced)
   $(
     'form.rtc_advanced_search'
-  ).live('ajax:before', function(){
+  ).live('ajax:beforeSend', function(event, xhr, settings){
     var $el = $(this);
     var $elmt = $(this).parents('.rich_table_component');
     $('.rich_table_component.updating').removeClass('updating');
@@ -246,11 +247,16 @@ var ajaxifyTableGrid = function(){
       $(this).clone().appendTo($adv_ff);
     });
     $adv_ff.find('input[name=page]').val('1');
+    $adv_ff.find('input[name=per_page]').val($.cookie('unm_pp'));
 
     $elmt.st_tableGrid_loading({
       message: t("searching"),
       image: LOADING_IMAGE
     });
+    
+    params.page = 1;
+    params.per_page = $.cookie('unm_pp');
+    settings.url += (settings.url.indexOf('?') >= 0 ? '&' : '?') + $.param(params);
   }).live('ajax:complete', function(event, xhr, status){
     var $el = $(this);
     $el.find('.advanced_filter_form').remove();
@@ -295,6 +301,20 @@ var ajaxifyTableGrid = function(){
   initActiveTab();
   initRecapitulation();
   initMultipleSelection();
+
+  initCookies();
+};
+
+var initCookies = function(){
+  if($.cookie('unm_pp') == undefined){
+    $.cookie('unm_pp', $('.per_page_part').find('select').val());
+  }
+  $('.per_page_part').live('change', function(){
+    var $elmt = $(this).parents('.rich_table_component');
+    $.cookie('unm_pp', $(this).find('select').val());
+    $elmt.find('.go_to_page_part').find('input').val(1);
+    $elmt.find('.gotopage').trigger('click');
+  });
 };
 
 

data/vendor/assets/javascripts/admin/starqle.ui.jquery.js

@@ -842,7 +842,8 @@ jQuery.fn.st_recapitulationMatrix = function(options){
     var $elmt = jQuery(this);
 
     var columns = '';
-    label_col = opts.recapitulation_matrix.shift();
+    var copy_recapitulation_matrix = $.extend(true, [], opts.recapitulation_matrix);
+    label_col = copy_recapitulation_matrix.shift();
     for(var i=0; i<label_col.length; i++){
       columns += '<div class="rtc_gh_item" title="' + label_col[i] +  '"><a>' + label_col[i] + '</a></div>';
     }
@@ -881,7 +882,7 @@ jQuery.fn.st_recapitulationMatrix = function(options){
     markup.append(list_view_row);
 
     $.template( 'entry_template', markup );
-    $.tmpl( 'entry_template', opts.recapitulation_matrix ).appendTo( $elmt.find('.rtc_content .rtc_grid > table') );
+    $.tmpl( 'entry_template', copy_recapitulation_matrix ).appendTo( $elmt.find('.rtc_content .rtc_grid > table') );
 
     $elmt.find('.component_content').st_tableGrid();
 

data/vendor/assets/javascripts/jquery.tokeninput.js

@@ -733,7 +733,7 @@ $.TokenList = function (input, url_or_data, settings) {
     // Do a search and show the "searching" dropdown if the input is longer
     // than settings.minChars
     function do_search() {
-        var query = input_box.val().toLowerCase();
+        var query = input_box.val(); //.toLowerCase();
 
         if(query && query.length) {
             if(selected_token) {
@@ -795,7 +795,8 @@ $.TokenList = function (input, url_or_data, settings) {
                   cache.add(cache_key, settings.jsonContainer ? results[settings.jsonContainer] : results);
 
                   // only populate the dropdown if the results are associated with the active search query
-                  if(input_box.val().toLowerCase() === query) {
+                  //if(input_box.val().toLowerCase() === query) {
+                  if(input_box.val() === query) {
                       populate_dropdown(query, settings.jsonContainer ? results[settings.jsonContainer] : results);
                   }
                 };
@@ -805,7 +806,8 @@ $.TokenList = function (input, url_or_data, settings) {
             } else if(settings.local_data) {
                 // Do the search through local data
                 var results = $.grep(settings.local_data, function (row) {
-                    return row[settings.propertyToSearch].toLowerCase().indexOf(query.toLowerCase()) > -1;
+                    // return row[settings.propertyToSearch].toLowerCase().indexOf(query.toLowerCase()) > -1;
+                    return row[settings.propertyToSearch].indexOf(query) > -1;
                 });
 
                 if($.isFunction(settings.onResult)) {

data/vendor/assets/javascripts/rich_table_component.js

@@ -15,6 +15,7 @@
 //= require jquery-ui-1.8.13.custom.min
 //= require jquery.tmpl.min
 //= require jquery.tokeninput
+//= require jquery.cookie
 //= require twitter/bootstrap
 //= require jquery.fileupload
 //= require jquery.fileupload-ui

data/vendor/assets/stylesheets/partial/_starqle.ui.grid.sass

@@ -432,8 +432,9 @@ $separator_border_right: transparentize(white, 0.1)
           margin-right: 15px
           select
             margin-top: -1px
-            height: 23px
-            padding: 1px 2px
+            margin-bottom: 0px
+            height: 19px
+            padding: 0px 2px 2px
             width: 50px
             text-align: right
             margin-right: 3px

data/vendor/assets/stylesheets/partial/_style.sass

@@ -47,7 +47,7 @@ body
   color: $first_color
 
   #wrapper
-    background: $body_bgcolor url($images_dir + "unm_pinisi.png") no-repeat center bottom
+    background: $body_bgcolor
     overflow: hidden
     #header_region.region
       background-color: lighten($dark_color, 95)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rich_table_component
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-rails
@@ -224,17 +224,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.4
 description: Rich Table Component with advanced search, export file, and generate
   recapitulation
 email:
@@ -482,7 +482,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Just what the description said