widget_list 1.1.4 → 1.1.5

data/README.md

@@ -287,21 +287,24 @@ Style a row based on the value of the column.
       #
       # Handle Dynamic Filters
       #
-      if $_REQUEST.key?('switch_grouping') && $_REQUEST['switch_grouping'] == 'Item Name'
-        groupByFilter                  = 'item'
-        countSQL                       = 'COUNT(1) as cnt,'
-        groupBySQL                     = 'GROUP BY name'
-        groupByDesc                    = ' (Grouped By Name)'
-      elsif  $_REQUEST.key?('switch_grouping') && $_REQUEST['switch_grouping'] == 'Sku Number'
-        groupByFilter                  = 'sku'
-        countSQL                       = 'COUNT(1) as cnt,'
-        groupBySQL                     = 'GROUP BY sku'
-        groupByDesc                    = ' (Grouped By Sku Number)'
-      else
-        groupByFilter                  = 'none'
-        countSQL                       = ''
-        groupBySQL                     = ''
-        groupByDesc                    = ''
+      groupBy  = WidgetList::List::get_group_by_selection(list_parms)
+
+      case groupBy
+        when 'Item Name'
+          groupByFilter                  = 'item'
+          countSQL                       = 'COUNT(1) as cnt,'
+          groupBySQL                     = 'GROUP BY name'
+          groupByDesc                    = ' (Grouped By Name)'
+        when 'Sku Number'
+          groupByFilter                  = 'sku'
+          countSQL                       = 'COUNT(1) as cnt,'
+          groupBySQL                     = 'GROUP BY sku'
+          groupByDesc                    = ' (Grouped By Sku Number)'
+        else
+          groupByFilter                  = 'none'
+          countSQL                       = ''
+          groupBySQL                     = ''
+          groupByDesc                    = ''
       end
 
       list_parms['filter']    = []

data/lib/extensions/action_controller_base.rb

@@ -13,7 +13,7 @@ ActionController::Base.class_eval {
     def store_session
       # Store pre-defined widget_list session items to the actual session
 
-      %w(pageDisplayLimit DRILL_DOWNS ROW_LIMIT list_checks SEARCH_FILTER LIST_SEQUENCE LIST_COL_SORT list_count DRILL_DOWN_FILTERS).each { |key|
+      %w(pageDisplayLimit DRILL_DOWNS CURRENT_GROUPING ROW_LIMIT list_checks SEARCH_FILTER LIST_SEQUENCE LIST_COL_SORT list_count DRILL_DOWN_FILTERS).each { |key|
         self.session[key] = $_SESSION[key]
       }
 

data/lib/widget_list/version.rb

@@ -1,3 +1,3 @@
 module WidgetList
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/lib/widget_list.rb

@@ -893,7 +893,7 @@ module WidgetList
 
       if $_REQUEST.key?('drill_down') && !$_REQUEST.key?('searchClear')
         drillDown = $_REQUEST['drill_down']
-        $_SESSION.deep_merge!({'DRILL_DOWNS' => { listId => drillDown} }) && !$_REQUEST.key?('searchClear')
+        $_SESSION.deep_merge!({'DRILL_DOWNS' => { listId => drillDown} })
       elsif $_SESSION.key?('DRILL_DOWNS') && $_SESSION['DRILL_DOWNS'].key?(listId) && !$_REQUEST.key?('searchClear')
         drillDown = $_SESSION['DRILL_DOWNS'][listId]
       else
@@ -909,6 +909,22 @@ module WidgetList
       return drillDown, filter
     end
 
+    def self.get_group_by_selection(list_parms)
+      groupBy = ''
+
+      if $_REQUEST.key?('switch_grouping')
+        groupBy = $_REQUEST['switch_grouping']
+        $_SESSION.deep_merge!({'CURRENT_GROUPING' => { list_parms['name'] => groupBy} })
+      elsif $_SESSION.key?('CURRENT_GROUPING') && $_SESSION['CURRENT_GROUPING'].key?(list_parms['name'])
+        groupBy = $_SESSION['CURRENT_GROUPING'][list_parms['name']]
+        list_parms['groupBySelected'] =  groupBy
+      else
+        groupBy = ''
+      end
+
+      return groupBy
+    end
+
     def clear_sort_get_vars()
       $_REQUEST.delete('LIST_FILTER_ALL')
       $_REQUEST.delete('ROW_LIMIT')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: widget_list
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel