widget_list 1.0.6 → 1.0.7

data/lib/widget_list.rb

@@ -1,4 +1,3 @@
-require 'widget_list/sequel'
 require 'widget_list/version'
 require 'widget_list/hash'
 require 'widget_list/string'
@@ -10,8 +9,6 @@ require 'csv'
 require 'json'
 require 'uri'
 require 'extensions/action_controller_base'
-require 'sequel'
-
 
 module WidgetList
 
@@ -27,192 +24,143 @@ module WidgetList
 
     include ActionView::Helpers::SanitizeHelper
 
-    def self.determine_db_type(db_type)
-      the_type, void = db_type.split("://")
-      if the_type == 'sqlite:/'
-        the_type = 'sqlite'
-      end
-      return the_type.downcase
-    end
-
-    def self.connect
-
-      begin
-        if Rails.root.join("config", "widget-list.yml").file?
-          config = YAML.load(ERB.new(File.new(Rails.root.join("config", "widget-list.yml")).read).result)[Rails.env]
-          if config.nil?
-            throw 'Configuration file widget-list.yml has no data.  Check that (' + Rails.env + ') Rails.env matches the pointers in the file'
-          end
-          @primary_conn   = config[:primary]
-          @secondary_conn = config[:secondary]
-        else
-          throw 'widget-list.yml not found'
-        end
-
-        $DATABASE  = Sequel.connect(@primary_conn) if @primary_conn != 'false' and @primary_conn != false
-        $DATABASE2 = Sequel.connect(@secondary_conn) if @secondary_conn != 'false' and @secondary_conn != false
-
-        if @primary_conn.class.name != 'false' and @primary_conn != false
-          $DATABASE.db_type = determine_db_type(@primary_conn)
-        end
-
-        if @primary_conn.class.name != 'false' and @secondary_conn != false
-          $DATABASE2.db_type = determine_db_type(@secondary_conn)
-        end
-      rescue Exception => e
-        p "widget-list.yml and connection to \$DATABASE failed.  Please fix and try again (" + e.to_s + ")"
-      end
-
-    end
-
-    def self.get_database
-      case $current_db_selection
-        when 'primary'
-          $DATABASE
-        when 'secondary'
-          $DATABASE2
-        else
-          $DATABASE
-      end
-    end
-
     # @param [Hash] list
     def initialize(list={})
 
+      # Defaults for all configs
+      # See https://github.com/davidrenne/widget_list/blob/master/README.md#feature-configurations
       @items = {
-          'name'                => ([*('A'..'Z'),*('0'..'9')]-%w(0 1 I O)).sample(16).join,
-          'database'            => 'primary',
-          'title'               => '',# will add <h1> title and horizontal rule
-          'listDescription'     => '',# will add grey header box
-          'pageId'              => $_SERVER['PATH_INFO'],
-          'sql'                 => '',
-          'table'               => '',
-          'view'                => '',
-          'data'                => {},
-          'mode'                => 'passive',
-          'collClass'           => '',
-          'collAlign'           => '',
-          'fields'              => {},
-          'columns'             => {},
-          'bindVars'            => [],
-          'bindVarsLegacy'      => {},
-          'links'               => {},
-          'results'             => {},
-          'buttons'             => {},
-          'inputs'              => {},
-          'filter'              => [],
-          'rowStart'            => 0,
-          'rowLimit'            => 10,
-          'orderBy'             => '',
-          'allowHTML'           => true,
-          'strlength'           => 30,
-          'searchClear'         => false, # build a custom conditional for each page to clear session
-          'searchClearAll'      => false, # build a custom conditional for each page to clear session
-          'showPagination'      => true,
-          'searchSession'       => true,  #on list render use last filter
+        'errors'              => [],
+        'name'                => ([*('A'..'Z'),*('0'..'9')]-%w(0 1 I O)).sample(16).join,
+        'database'            => 'primary', #
+        'title'               => '',
+        'listDescription'     => '',
+        'pageId'              => $_SERVER['PATH_INFO'],
+        'view'                => '',
+        'data'                => {},
+        'collClass'           => '',
+        'collAlign'           => '',
+        'fields'              => {},
+        'fieldsHidden'        => [],
+        'bindVars'            => [],
+        'bindVarsLegacy'      => {},
+        'links'               => {},
+        'buttons'             => {},
+        'inputs'              => {},
+        'filter'              => [],
+        'groupBy'             => '',
+        'rowStart'            => 0,
+        'rowLimit'            => 10,
+        'orderBy'             => '',
+        'allowHTML'           => true,
+        'searchClear'         => false,
+        'searchClearAll'      => false,
+        'showPagination'      => true,
+        'searchSession'       => true,
 
-          #
-          # Custom count query
-          #
-          'force_count_sql'     => '',
-          'force_query_sql'     => '',
+        #
+        # carryOverRequests will allow you to post custom things from request to all sort/paging URLS for each ajax
+        #
+        'carryOverRequsts'    => ['switch_grouping'],
 
-          #
-          # Ajax
-          #
-          'ajax_action'         => '',
-          'ajax_function'       => 'ListJumpMin',
-          'ajax_search_function'=> 'ListJumpMin',
+        #
+        # Head/Foot
+        #
 
-          #
-          #  Search
-          #
-          'showSearch'          => true,
-          'searchOnkeyup'       => '',
-          'searchOnclick'       => '',
-          'searchIdCol'         => 'id',         #By default `id` column is here because typically if you call your PK's id and are auto-increment
-          'searchInputLegacyCSS'=> false,
-          'searchBtnName'       => 'Search by Id or a list of Ids and more',
-          'searchTitle'         => '',
-          'searchFieldsIn'      => {},            #White list of fields to include in a alpha-numeric based search
-          'searchFieldsOut'     => {'id'=>true},  #Black list of fields to include in a alpha-numeric based search (default `id` to NEVER search when alpha seach)
+        'customFooter'        => '',
+        'customHeader'        => '',
 
-          #
-          #  Export
-          #
-          'showExport'          => true,
+        #
+        # Ajax
+        #
+        'ajaxFunctionAll'   => '',
+        'ajaxFunction'       => 'ListJumpMin',
 
-          #
-          # Group By Box
-          #
-          'groupByItems'        => [],    #array of strings (each a new "select option")
-          'groupBySelected'     => false, #initially selected grouping - defaults to first in list if not
-          'groupByLabel'        => 'Group By',
+        #
+        #  Search
+        #
+        'showSearch'          => true,
+        'searchOnkeyup'       => '',
+        'searchOnclick'       => '',
+        'searchIdCol'         => 'id',
+        'searchTitle'         => 'Search by Id or a list of Ids and more',
+        'searchFieldsIn'      => {},
+        'searchFieldsOut'     => {'id'=>true},
+        'templateFilter'      => '',
 
+        #
+        #  Export
+        #
+        'showExport'          => true,
+        'exportButtonTitle'   => 'Export CSV',
 
-          #
-          # Advanced searching
-          #
-          'list_search_form'    => '', #The HTML form used for the advanced search drop down
-          'list_search_attribs' => {}, #widgetinput "search_ahead" attributes
+        #
+        # Group By Box
+        #
+        'groupByItems'        => [],
+        'groupBySelected'     => false,
+        'groupByLabel'        => 'Group By',
+        'groupByClick'        => '',
+        'groupByClickDefault' => "ListChangeGrouping('<!--NAME-->', this);",
 
-          #
-          # Column Specific
-          #
-          'columnStyle'         => {},
-          'columnClass'         => {},
-          'columnPopupTitle'    => {},
-          'columnSort'          => {},
-          'columnWidth'         => {},
-          'columnNoSort'        => {},
-          'columnFilter'        => {},
 
-          #
-          # Column Border (on right)
-          #
-          'borderedColumns'     => false,
-          'borderColumnStyle'   => '1px solid #CCCCCC',
+        #
+        # Advanced searching
+        #
+        'listSearchForm'    => '',
 
-          #
-          # Row specifics
-          #
-          'rowColor'            => '#FFFFFF',
-          'rowClass'            => '',
-          'rowColorByStatus'    => {},
-          'rowStylesByStatus'   => {},
-          'offsetRows'          => true,
-          'rowOffsets'          => ['FFFFFF','FFFFFF'],
-
-          'class'               => 'listContainerPassive',
-          'tableclass'          => 'tableBlowOutPreventer',
-          'noDataMessage'       => 'Currently no data.',
-          'useSort'             => true,
-          'headerClass'         => {},
-          'groupBy'             => '',
-          'fieldFunction'       => {},
-          'buttonVal'           => 'templateListJump',
-          'linkFunction'        => 'ButtonLinkPost',
-          'template'            => '',
-          'templateFilter'      => '',
-          'pagerFull'          => true,
-          'LIST_COL_SORT_ORDER' => 'ASC',
-          'LIST_COL_SORT'       => '',
-          'LIST_FILTER_ALL'     => '',
-          'ROW_LIMIT'           => '',
-          'LIST_SEQUENCE'       => 1,
-          'NEW_SEARCH'          => false,
+        #
+        # Column Specific
+        #
+        'columnStyle'         => {},
+        'columnClass'         => {},
+        'columnPopupTitle'    => {},
+        'columnSort'          => {},
+        'columnWidth'         => {},
+        'columnNoSort'        => {},
 
-          #
-          # Checkbox
-          #
-          'checked_class'       => 'widgetlist-checkbox',
-          'checked_flag'        => {},
+        #
+        # Column Border (on right)
+        #
+        'borderedColumns'     => false,
+        'borderColumnStyle'   => '1px solid #CCCCCC',
 
-          #
-          # Hooks
-          #
-          'column_hooks'        => {},
-          'row_hooks'           => {}
+        #
+        # Row specifics
+        #
+        'rowClass'            => '',
+        'rowColorByStatus'    => {},
+        'rowStylesByStatus'   => {},
+        'rowOffsets'          => ['FFFFFF','FFFFFF'],
+
+        'class'               => 'listContainerPassive',
+        'tableclass'          => 'tableBlowOutPreventer',
+        'noDataMessage'       => 'Currently no data.',
+        'useSort'             => true,
+        'headerClass'         => {},
+        'fieldFunction'       => {},
+        'buttonVal'           => 'templateListJump',
+        'linkFunction'        => 'ButtonLinkPost',
+        'template'            => '',
+        'LIST_COL_SORT_ORDER' => 'ASC',
+        'LIST_COL_SORT'       => '',
+        'LIST_FILTER_ALL'     => '',
+        'ROW_LIMIT'           => '',
+        'LIST_SEQUENCE'       => 1,
+        'NEW_SEARCH'          => false,
+
+        #
+        # Checkbox
+        #
+        'checkedClass'       => 'widgetlist-checkbox',
+        'checkedFlag'        => {},
+        'storeSessionChecks' => false,
+
+        #
+        # Hooks
+        #
+        'columnHooks'        => {},
+        'rowHooks'           => {}
       }
 
       @csv          = []
@@ -233,9 +181,10 @@ module WidgetList
 
       #the main template and outer shell
       @items.deep_merge!({'template' =>
-                              '
+                            '
                               <!--WRAP_START-->
                               <!--HEADER-->
+                              <!--CUSTOM_CONTENT_TOP-->
                               <div class="<!--CLASS-->" id="<!--NAME-->">
                                  <table class="widget_list <!--TABLE_CLASS-->" style="<!--INLINE_STYLE-->" border="0" width="100%" cellpadding="0" cellspacing="0">
                                     <!--LIST_TITLE-->
@@ -243,7 +192,7 @@ module WidgetList
                                        <!--DATA-->
                                     <tr>
                                        <td colspan="<!--COLSPAN_FULL-->" align="left" style="padding:0px;margin:0px;text-align:left">
-                                          <div style="background-color:#ECECEC;height:50px;"><div style="padding:10px"><!--CUSTOM_CONTENT--></div>
+                                          <div style="background-color:#ECECEC;height:50px;"><div style="padding:10px"><!--CUSTOM_CONTENT_BOTTOM--></div>
                                        </td>
                                     </tr>
                                  </table>
@@ -256,69 +205,69 @@ module WidgetList
                          })
 
       @items.deep_merge!({'row' =>
-                              '
+                            '
                                           <tr style="background-color:<!--BGCOLOR-->;<!--ROWSTYLE-->" class="<!--ROWCLASS-->"><!--CONTENT--></tr>
                               '
                          })
 
       @items.deep_merge!({'list_description' =>
-                              '
+                            '
                                           <tr class="summary">
-                                             <td id="<!--LIST_NAME-->_list_description" class="header" style="text-align: left;padding-bottom: 2px;padding-top: 7px;font-size: 20px;" colspan="<!--COLSPAN-->"><!--LIST_DESCRIPTION--></td>
+                                             <td id="<!--LIST_NAME-->_list_description" class="header" style="text-align: left;padding-bottom: 2px;padding-top: 7px;font-size: 14px;" colspan="<!--COLSPAN-->"><!--LIST_DESCRIPTION--></td>
                                           </tr>
                               '
                          })
 
       @items.deep_merge!({'col' =>
-                              '
+                            '
                                           <td class="<!--CLASS-->" align="<!--ALIGN-->" title="<!--TITLE-->" onclick="<!--ONCLICK-->" style="<!--STYLE-->"><!--CONTENT--></td>
                               '
                          })
 
       @items.deep_merge!({'templateSequence' =>
-                              '
+                            '
                                           <!--LIST_SEQUENCE--> of <!--TOTAL_PAGES-->
                               '
                          })
       #Sorting
       #
       @items.deep_merge!({'templateSortColumn' =>
-                              '
-                                          <td style="font-weight:bold;<!--INLINE_STYLE--><!--INLINE_STYLE-->" id="<!--COL_HEADER_ID-->" class="<!--COL_HEADER_CLASS-->" valign="middle"><span onclick="<!--FUNCTION-->(\'<!--COLSORTURL-->\',\'<!--NAME-->\')" style="cursor:pointer;background:none;" title="<!--TITLE_POPUP-->"><!--TITLE--><!--COLSORTICON-></span></td>
+                            '
+                                          <td style="font-weight:bold;<!--INLINE_STYLE--><!--INLINE_STYLE-->" id="<!--COL_HEADER_ID-->" class="<!--COL_HEADER_CLASS-->" title="<!--TITLE_POPUP-->" valign="middle"><span onclick="<!--FUNCTION-->(\'<!--COLSORTURL-->\',\'<!--NAME-->\');<!--FUNCTION_ALL-->" style="cursor:pointer;background:none;"><!--TITLE--><!--COLSORTICON-></span></td>
                               '
                          })
 
       @items.deep_merge!({'templateNoSortColumn' =>
-                              '
+                            '
                                           <td style="font-weight:bold;<!--INLINE_STYLE-->" title="<!--TITLE_POPUP-->" id="<!--COL_HEADER_ID-->" class="<!--COL_HEADER_CLASS-->" valign="middle"><span style="background:none;"><!--TITLE--></span></td>
                               '
                          })
 
       @items.deep_merge!({'statement' =>
-                              {'select'=>
-                                   {'view' =>
-                                        '
+                            {'select'=>
+                               {'view' =>
+                                  '
                                    SELECT <!--FIELDS--> FROM <!--SOURCE--> <!--WHERE--> <!--GROUPBY--> <!--ORDERBY--> <!--LIMIT-->
                                    '
-                                   }
-                              }
+                               }
+                            }
                          })
 
       @items.deep_merge!({'statement' =>
-                              {'count'=>
-                                   {'view' =>
-                                        '
-                                   SELECT count(1) total FROM <!--VIEW--> <!--WHERE-->
-                                   '
-                                   }
-                              }
+                            {'count'=>
+                               {'view' =>
+                                  '
+                                   SELECT count(1) total FROM <!--VIEW--> <!--WHERE--> <!--GROUPBY-->
+                                  '
+                               }
+                            }
                          })
 
       #Pagintion
       #
 
       @items.deep_merge!({'template_pagination_wrapper' =>
-                              '
+                            '
                               <ul id="pagination" class="page_legacy">
                                  Page <!--PREVIOUS_BUTTON-->
                                  <input type="text" value="<!--SEQUENCE-->" size="1" style="width:15px;padding:0px;font-size:10px;" onblur="">
@@ -330,55 +279,55 @@ module WidgetList
                          })
 
       @items.deep_merge!({'template_pagination_next_active' =>
-                              "
-                            <li><span onclick=\"<!--FUNCTION-->('<!--NEXT_URL-->','<!--LIST_NAME-->')\" style=\"cursor:pointer;background: transparent url(<!--HTTP_SERVER-->images/page-next.gif) no-repeat\">&nbsp;</span></li>
+                            "
+                            <li><span onclick=\"<!--FUNCTION-->('<!--NEXT_URL-->','<!--LIST_NAME-->');<!--FUNCTION_ALL-->\" style=\"cursor:pointer;background: transparent url(<!--HTTP_SERVER-->images/page-next.gif) no-repeat\">&nbsp;</span></li>
                             "
                          })
 
       @items.deep_merge!({'template_pagination_next_disabled' =>
-                              "
+                            "
                             <li><span style=\"opacity:0.4;filter:alpha(opacity=40);background: transparent url(<!--HTTP_SERVER-->images/page-next.gif) no-repeat\">&nbsp;</span></li>
                             "
                          })
 
       @items.deep_merge!({'template_pagination_previous_active' =>
-                              "
-                            <li><span onclick=\"<!--FUNCTION-->('<!--PREVIOUS_URL-->','<!--LIST_NAME-->')\" style=\"cursor:pointer;background: transparent url(<!--HTTP_SERVER-->images/page-back.gif) no-repeat\">&nbsp;</span></li>
+                            "
+                            <li><span onclick=\"<!--FUNCTION-->('<!--PREVIOUS_URL-->','<!--LIST_NAME-->');<!--FUNCTION_ALL-->\" style=\"cursor:pointer;background: transparent url(<!--HTTP_SERVER-->images/page-back.gif) no-repeat\">&nbsp;</span></li>
                             "
                          })
 
       @items.deep_merge!({'template_pagination_previous_disabled' =>
-                              "
+                            "
                             <li><span style=\"opacity:0.4;filter:alpha(opacity=40);background: transparent url(<!--HTTP_SERVER-->images/page-back.gif) no-repeat\">&nbsp;</span></li>
                             "
                          })
 
       @items.deep_merge!({'template_pagination_jump_active' =>
-                              '
+                            '
                             <li><div class="active"><!--SEQUENCE--></div></li>
                             '
                          })
 
       @items.deep_merge!({'template_pagination_jump_unactive' =>
-                              '
-                            <li onclick="<!--FUNCTION-->(\'<!--JUMP_URL-->\',\'<!--LIST_NAME-->\')"><div><!--SEQUENCE--></div></li>
+                            '
+                            <li onclick="<!--FUNCTION-->(\'<!--JUMP_URL-->\',\'<!--LIST_NAME-->\');<!--FUNCTION_ALL-->"><div><!--SEQUENCE--></div></li>
                             '
                          })
 
       @items = WidgetList::Widgets::populate_items(list,@items)
 
       # current_db is a flag of the last known primary or secondary YML used or defaulted when running a list
-      $current_db_selection = @items['database']
+      @current_db_selection = @items['database']
 
-      if WidgetList::List.get_database.db_type == 'oracle'
+      if get_database.db_type == 'oracle'
         @items.deep_merge!({'statement' =>
-                                {'select'=>
-                                     {'view' =>
-                                          '
-                                        SELECT <!--FIELDS-->, rn FROM ( SELECT ' + ( (!@items['view'].include?('(')) ? '<!--SOURCE-->' : @items['view'].strip.split(" ").last ) + '.*, rank() over (<!--ORDERBY-->) rn FROM <!--SOURCE--> ) a <!--WHERE--> <!--GROUPBY--> <!--ORDERBY--> <!--LIMIT-->
-                                        '
-                                     }
-                                }
+                              {'select'=>
+                                 {'view' =>
+                                    '
+                                        SELECT <!--FIELDS_PLAIN--> FROM ( SELECT a.*, DENSE_RANK() over (<!--ORDERBY-->) rn FROM ( SELECT ' + ( (!get_view().include?('(')) ? '<!--SOURCE-->' : get_view().strip.split(" ").last ) + '.* FROM <!--SOURCE--> ) a <!--WHERE--> <!--ORDERBY--> ) <!--LIMIT--> ' + ((!@active_record_model) ? '<!--GROUPBY-->' : '') + '
+                                    '
+                                 }
+                              }
                            })
 
       end
@@ -421,13 +370,13 @@ module WidgetList
 
           clear_sort_get_vars()
 
-          if $_REQUEST.key?('list_action') && $_REQUEST['list_action'] == 'ajax_widgetlist_checks'
+          if $_REQUEST.key?('list_action') && $_REQUEST['list_action'] == 'ajax_widgetlist_checks' && @items['storeSessionChecks']
             ajax_maintain_checks()
           end
 
         end
 
-        @items['groupByClick'] = "ListChangeGrouping('" + @items['name']  + "')"
+        @items['groupByClick'] = WidgetList::Utils::fill({'<!--NAME-->' => @items['name']}, @items['groupByClickDefault'] + @items['groupByClick'])
 
         if $_REQUEST.key?('searchClear')
           clear_search_session()
@@ -464,11 +413,17 @@ module WidgetList
               @items['filter'] << filterString
             end
 
-            fieldsToSearch = @items['fields']
+            fieldsToSearch = @items['fields'].dup
 
-            @items['columns'].each { |columnPivot|
-              fieldsToSearch[columnPivot] = columnPivot
-            }
+            if @items['fieldsHidden'].class.name == 'Array'
+              @items['fieldsHidden'].each { |columnPivot|
+                fieldsToSearch[columnPivot] = strip_aliases(columnPivot)
+              }
+            elsif @items['fieldsHidden'].class.name == 'Hash'
+              @items['fieldsHidden'].each { |columnPivot|
+                fieldsToSearch[columnPivot[0]] = strip_aliases(columnPivot[0])
+              }
+            end
 
             searchCriteria = searchFilter.strip_or_self()
             searchSQL      = []
@@ -545,10 +500,15 @@ module WidgetList
 
               fieldsToSearch.each { |fieldName,fieldTitle|
 
+                fieldName = strip_aliases(fieldName)
                 # new lodgette. if fieldFunction exists, find all matches and skip them
 
                 if @items['fieldFunction'].key?(fieldName)
-                  theField = @items['fieldFunction'][fieldName]  + cast_col()
+                  if get_database.db_type == 'oracle'
+                    theField = fieldName
+                  else
+                    theField = @items['fieldFunction'][fieldName]  + cast_col()
+                  end
                 else
                   theField = tick_field() + "#{fieldName}" + cast_col() + tick_field()
                 end
@@ -607,7 +567,7 @@ module WidgetList
 
         if ! $_REQUEST.key?('BUTTON_VALUE') && !@items['title'].empty?
           @items['templateHeader'] = '
-                                       <h1><!--TITLE--></h1><div class="horizontal_rule"></div>
+                                       <h1 style="font-size:24px;"><!--TITLE--></h1><div class="horizontal_rule"></div>
                                        <!--FILTER_HEADER-->
                                      '
         elsif !$_REQUEST.key?('BUTTON_VALUE')
@@ -674,7 +634,7 @@ module WidgetList
     end
 
     def tick_field()
-      case WidgetList::List.get_database.db_type
+      case get_database.db_type
         when 'postgres'
         when 'oracle'
           ''
@@ -684,7 +644,7 @@ module WidgetList
     end
 
     def cast_col()
-      case WidgetList::List.get_database.db_type
+      case get_database.db_type
         when 'postgres'
           '::char(1000)'
         else
@@ -694,12 +654,17 @@ module WidgetList
 
     def ajax_maintain_checks()
 
+      if !$_SESSION.key?('list_checks')
+        $_SESSION['list_checks'] = {}
+      end
+
       #
       # A list must be provided
       #
       if $_REQUEST.key?('LIST_NAME')
-        listName = $_REQUEST['LIST_NAME']
-        sqlHash  = $_REQUEST['SQL_HASH']
+        listName  = $_REQUEST['LIST_NAME']
+        sqlHash   = $_REQUEST['SQL_HASH']
+        sequence  = $_REQUEST['LIST_SEQUENCE'].to_s
 
         #
         # The placeholder is created when the list initially forms. This validates it and makes it so
@@ -729,18 +694,18 @@ module WidgetList
         #
         # Check All
         #
-        if $_REQUEST.key?('checked_all')
+        if $_REQUEST.key?('checked_all') && $_REQUEST['checked_all'] == '1'
           if $_SESSION.key?('list_checks')
 
-            if $_SESSION['list_checks'].key?('check_all_' + sqlHash + $_REQUEST['LIST_NAME'] + $_REQUEST['LIST_SEQUENCE'])
+            if $_SESSION['list_checks'].key?('check_all_' + sqlHash + listName + sequence)
               if $_REQUEST['checked_all'].empty?
-                $_SESSION['list_checks'].delete('check_all_' + sqlHash + $_REQUEST['LIST_NAME'] + $_REQUEST['LIST_SEQUENCE'])
+                $_SESSION['list_checks'].delete('check_all_' + sqlHash + listName + sequence)
               else
-                $_SESSION.deep_merge!({'list_checks' => { 'check_all_' + sqlHash + $_REQUEST['LIST_NAME'] +  $_REQUEST['LIST_SEQUENCE'] => true } })
+                $_SESSION.deep_merge!({'list_checks' => { 'check_all_' + sqlHash + listName + sequence => true } })
               end
             else
               if ! $_REQUEST['checked_all'].empty?
-                $_SESSION.deep_merge!({'list_checks' => { 'check_all_' + sqlHash + $_REQUEST['LIST_NAME'] +  $_REQUEST['LIST_SEQUENCE'] => true } })
+                $_SESSION.deep_merge!({'list_checks' => { 'check_all_' + sqlHash + listName +  $_REQUEST['LIST_SEQUENCE'] => true } })
               end
             end
           end
@@ -758,6 +723,12 @@ module WidgetList
         $_SESSION.delete('DRILL_DOWNS')
       end
 
+      $_SESSION['list_checks'].keys.each { |key|
+        if key.include?(name)
+          $_SESSION['list_checks'].delete(key)
+        end
+      } if $_SESSION.key?('list_checks')
+
     end
 
     def clear_search_session(all=false)
@@ -852,12 +823,14 @@ module WidgetList
 
       if @sequence.to_i > 1 && ! @items['NEW_SEARCH']
         subtractLimit = 0
-        if WidgetList::List.get_database.db_type != 'oracle'
+        if get_database.db_type != 'oracle'
           subtractLimit = @items['rowLimit']
         end
         @items['bindVarsLegacy']['LOW'] = (((@sequence * @items['rowLimit']) -  subtractLimit))
-        if WidgetList::List.get_database.db_type == 'oracle'
+        if get_database.db_type == 'oracle'
           @items['bindVarsLegacy']['HIGH'] = ((((@sequence + 1) * @items['rowLimit'])))
+          @items['bindVarsLegacy']['LOW'] = @items['bindVarsLegacy']['LOW'] - @items['rowLimit']
+          @items['bindVarsLegacy']['HIGH'] = @items['bindVarsLegacy']['HIGH'] - @items['rowLimit']
         end
 
       end
@@ -909,44 +882,39 @@ module WidgetList
         listJumpUrl['LIST_NAME']           = @items['name']
         listJumpUrl['SQL_HASH']            = @sqlHash
 
-        if @items.key?('ajax_action')
-          listJumpUrl['list_action'] = @items['ajax_action']
-        end
-
         if $_REQUEST.key?('switch_grouping')
           listJumpUrl['switch_grouping'] = $_REQUEST['switch_grouping']
         end
 
-
-
-
-        @templateFill['<!--WRAP_START-->']    = ''
-        @templateFill['<!--WRAP_END-->']      = ''
+        @templateFill['<!--CUSTOM_CONTENT_BOTTOM-->']= @items['customFooter']
+        @templateFill['<!--CUSTOM_CONTENT_TOP-->']   = @items['customHeader']
+        @templateFill['<!--WRAP_START-->']           = ''
+        @templateFill['<!--WRAP_END-->']             = ''
         if !$_REQUEST.key?('BUTTON_VALUE')
-          @templateFill['<!--WRAP_START-->']  = '<div class="widget_list_outer">
+          @templateFill['<!--WRAP_START-->']         = '<div class="widget_list_outer">
                                                    <input type="hidden" id="<!--NAME-->_jump_url_original" value="<!--JUMP_URL-->"/>'
-          @templateFill['<!--WRAP_END-->']    = '</div>'
+          @templateFill['<!--WRAP_END-->']           = '</div>'
         end
 
-        @templateFill['<!--HEADER-->']        = @items['templateHeader']
-        @templateFill['<!--TITLE-->']         = @items['title']
-        @templateFill['<!--NAME-->']          = @items['name']
-        @templateFill['<!--JUMP_URL-->']      = WidgetList::Utils::build_url(@items['pageId'],listJumpUrl,(!$_REQUEST.key?('BUTTON_VALUE')))
-        @templateFill['<!--JUMP_URL_NAME-->'] = @items['name'] + '_jump_url'
-        @templateFill['<!--CLASS-->']         = @items['class']
+        @templateFill['<!--HEADER-->']               = @items['templateHeader']
+        @templateFill['<!--TITLE-->']                = @items['title']
+        @templateFill['<!--NAME-->']                 = @items['name']
+        @templateFill['<!--JUMP_URL-->']             = WidgetList::Utils::build_url(@items['pageId'],listJumpUrl,(!$_REQUEST.key?('BUTTON_VALUE')))
+        @templateFill['<!--JUMP_URL_NAME-->']        = @items['name'] + '_jump_url'
+        @templateFill['<!--CLASS-->']                = @items['class']
 
         if @totalRowCount > 0
-          @templateFill['<!--INLINE_STYLE-->'] = ''
-          @templateFill['<!--TABLE_CLASS-->']  = @items['tableclass']
+          @templateFill['<!--INLINE_STYLE-->']       = ''
+          @templateFill['<!--TABLE_CLASS-->']        = @items['tableclass']
         else
-          @templateFill['<!--INLINE_STYLE-->'] = 'table-layout:auto;'
+          @templateFill['<!--INLINE_STYLE-->']       = 'table-layout:auto;'
         end
 
         #Filter form
         #
         if @items['showSearch'] === true
           if ! @items['templateFilter'].empty?
-            @templateFill['<!--FILTER_HEADER-->'] = @items['templateFilter']
+            @templateFill['<!--FILTER_HEADER-->']    = @items['templateFilter']
           else
             if !$_REQUEST.key?('search_filter') && !@isJumpingList
 
@@ -966,13 +934,13 @@ module WidgetList
               filterParameters['PAGE_ID']      = @items['pageId']
               filterParameters['LIST_NAME']    = @items['name']
               filterParameters['SQL_HASH']     = @sqlHash
-              if @items.key?('ajax_action') && ! @items['ajax_action'].empty?
-                filterParameters['list_action'] = @items['ajax_action']
-              end
 
-              if $_REQUEST.key?('switch_grouping')
-                filterParameters['switch_grouping'] = $_REQUEST['switch_grouping']
-              end
+              @items['carryOverRequsts'].each { |value|
+                if $_REQUEST.key?(value)
+                  filterParameters[value] = $_REQUEST[value]
+                end
+              }
+
               searchUrl =  WidgetList::Utils::build_url(@items['pageId'], filterParameters, (!$_REQUEST.key?('BUTTON_VALUE')))
 
               list_search  = {}
@@ -993,17 +961,17 @@ module WidgetList
               list_search['list-search'] = true
               list_search['width']       = '500'
               list_search['input_class'] = 'info-input'
-              list_search['title']       = (@items['searchTitle'].empty?) ? @items['searchBtnName'] :@items['searchTitle']
+              list_search['title']       = @items['searchTitle']
               list_search['id']          = 'list_search_id_' + @items['name']
               list_search['name']        = 'list_search_name_' + @items['name']
               list_search['class']       = 'inputOuter widget-search-outer ' + @items['name'].downcase + '-search'
               list_search['search_ahead']       = {
-                  'url'          => searchUrl,
-                  'skip_queue'   => false,
-                  'target'       => @items['name'],
-                  'search_form'  => @items['list_search_form'],
-                  'onclick'      => (! @items['searchOnclick'].empty? && ! @items['list_search_form'].empty?) ? @items['searchOnclick'] : '',
-                  'onkeyup'      => (! @items['searchOnkeyup'].empty?) ? @items['searchOnkeyup'] : ''
+                'url'          => searchUrl,
+                'skip_queue'   => false,
+                'target'       => @items['name'],
+                'search_form'  => @items['listSearchForm'],
+                'onclick'      => (! @items['searchOnclick'].empty? && ! @items['listSearchForm'].empty?) ? @items['searchOnclick'] : '',
+                'onkeyup'      => (! @items['searchOnkeyup'].empty?) ? @items['searchOnkeyup'] : ''
               }
 
               @templateFill['<!--FILTER_HEADER-->'] = WidgetList::Widgets::widget_input(list_search)
@@ -1038,21 +1006,23 @@ module WidgetList
                 className     = 'widget-search-results-row-selected'
               end
 
+              num = 1
               @items['groupByItems'].each { |grouping|
                 if @items['groupBySelected'] && @items['groupBySelected'] === grouping
                   className     = 'widget-search-results-row-selected'
                 end
-                groupRows << '<div class="widget-search-results-row ' +  className + '" title="' + grouping + '" onmouseover="jQuery(\'.widget-search-results-row\').removeClass(\'widget-search-results-row-selected\')" onclick="SelectBoxSetValue(\'' + grouping + '\',\'' + @items['name'] + '\');' + @items['groupByClick'] + '">' + grouping + '</div>'
+                groupRows << '<div class="widget-search-results-row ' +  className + '" id="' + @items['name'] + '_row_' + num.to_s + '" title="' + grouping + '" onmouseover="jQuery(\'.widget-search-results-row\').removeClass(\'widget-search-results-row-selected\')" onclick="SelectBoxSetValue(\'' + grouping + '\',\'' + @items['name'] + '\');' + @items['groupByClick'] + '">' + grouping + '</div>'
                 className = ''
+                num = num + 1
               }
 
               list_group['search_ahead']  = {
-                  'skip_queue' => false,
-                  'search_form'=>  '
+                'skip_queue' => false,
+                'search_form'=>  '
                                  <div id="advanced-search-container" style="height:100% !important;">
                                     ' + groupRows.join("\n") + '
                                  </div>',
-                  'onclick'    => @items['searchOnclick']
+                'onclick'    => @items['searchOnclick']
               }
               if !@templateFill.key?('<!--FILTER_HEADER-->')
                 @templateFill['<!--FILTER_HEADER-->'] = ''
@@ -1060,7 +1030,7 @@ module WidgetList
               @templateFill['<!--FILTER_HEADER-->']  += '<div class="fake-select"><div class="label">' + @items['groupByLabel'] + ':</div> ' + WidgetList::Widgets::widget_input(list_group) + '</div>'
 
               if @items['showExport']
-                @templateFill['<!--FILTER_HEADER-->']  +=  WidgetList::Widgets::widget_button('Export CSV', {'onclick' => 'ListExport(\'' + @items['name'] + '\');'}, true)
+                @templateFill['<!--FILTER_HEADER-->']  +=  WidgetList::Widgets::widget_button(@items['exportButtonTitle'], {'onclick' => 'ListExport(\'' + @items['name'] + '\');'}, true)
               end
 
             end
@@ -1124,14 +1094,11 @@ module WidgetList
         }
       end
 
-      if @items.key?('ajax_action') && ! @items['ajax_action'].empty?
-        urlTags['list_action'] = @items['ajax_action']
-      end
-
-      if $_REQUEST.key?('switch_grouping')
-        urlTags['switch_grouping'] = $_REQUEST['switch_grouping']
-      end
-
+      @items['carryOverRequsts'].each { |value|
+        if $_REQUEST.key?(value)
+          urlTags[value] = $_REQUEST[value]
+        end
+      }
       if (@sequence == @totalPages || ! (@totalPages > 0))
         showNext = false
       else
@@ -1157,11 +1124,12 @@ module WidgetList
       #Assemble navigation buttons
       #
       pieces = {
-          '<!--NEXT_URL-->'     => nextUrl,
-          '<!--LIST_NAME-->'    => @items['name'],
-          '<!--HTTP_SERVER-->'  => $_SERVER['rack.url_scheme'] + '://' + $_SERVER['HTTP_HOST'] + '/assets/',
-          '<!--PREVIOUS_URL-->' => prevUrl,
-          '<!--FUNCTION-->'     => @items['ajax_function']
+        '<!--NEXT_URL-->'     => nextUrl,
+        '<!--LIST_NAME-->'    => @items['name'],
+        '<!--HTTP_SERVER-->'  => $_SERVER['rack.url_scheme'] + '://' + $_SERVER['HTTP_HOST'] + '/assets/',
+        '<!--PREVIOUS_URL-->' => prevUrl,
+        '<!--FUNCTION-->'     => @items['ajaxFunction'],
+        '<!--FUNCTION_ALL-->' => @items['ajaxFunctionAll'],
       }
 
       templates['btn_next']     = WidgetList::Utils::fill(pieces,templates['btn_next'])
@@ -1175,9 +1143,11 @@ module WidgetList
       urlTags['LIST_SEQUENCE'] = @sequence
       urlTags['ROW_LIMIT']     = 10
 
-      if $_REQUEST.key?('switch_grouping')
-        urlTags['switch_grouping'] = $_REQUEST['switch_grouping']
-      end
+      @items['carryOverRequsts'].each { |value|
+        if $_REQUEST.key?(value)
+          urlTags[value] = $_REQUEST[value]
+        end
+      }
 
       # Automate select box and rules
       #
@@ -1204,7 +1174,7 @@ module WidgetList
 
       # WidgetSelect( todo)
       pageSelect = <<-EOD
-        <select onchange="#{@items['ajax_function']}(this.value,'#{@items['name']}')" style="width:58px">
+        <select onchange="#{@items['ajaxFunction']}(this.value,'#{@items['name']}');#{@items['ajaxFunctionAll']}" style="width:58px">
           #{options}
         </select>
       EOD
@@ -1261,18 +1231,24 @@ module WidgetList
           jumpTemplate = @items['template_pagination_jump_unactive']
         end
 
-        jumpSection << WidgetList::Utils::fill({'<!--SEQUENCE-->'=>page,'<!--JUMP_URL-->'=>jumpUrl,'<!--LIST_NAME-->'=>@items['name'],'<!--FUNCTION-->'=>@items['ajax_function']}, jumpTemplate)
+        jumpSection << WidgetList::Utils::fill({
+                                                 '<!--SEQUENCE-->'     => page,
+                                                 '<!--JUMP_URL-->'     => jumpUrl,
+                                                 '<!--LIST_NAME-->'    => @items['name'],
+                                                 '<!--FUNCTION-->'     => @items['ajaxFunction'],
+                                                 '<!--FUNCTION_ALL-->' => @items['ajaxFunctionAll'],
+                                               }, jumpTemplate)
       end
 
       pieces = {
-          '<!--PREVIOUS_BUTTON-->'         => templates['btn_previous'],
-          '<!--SEQUENCE-->'                => @sequence,
-          '<!--NEXT_BUTTON-->'             => templates['btn_next'],
-          '<!--TOTAL_PAGES-->'             => @totalPages,
-          '<!--TOTAL_ROWS-->'              => @totalRows,
-          '<!--PAGE_SEQUENCE_JUMP_LIST-->' => pageSelect,
-          '<!--JUMP-->'                    => jumpSection.join(''),
-          '<!--LIST_NAME-->'               => @items['name'],
+        '<!--PREVIOUS_BUTTON-->'         => templates['btn_previous'],
+        '<!--SEQUENCE-->'                => @sequence,
+        '<!--NEXT_BUTTON-->'             => templates['btn_next'],
+        '<!--TOTAL_PAGES-->'             => @totalPages,
+        '<!--TOTAL_ROWS-->'              => @totalRows,
+        '<!--PAGE_SEQUENCE_JUMP_LIST-->' => pageSelect,
+        '<!--JUMP-->'                    => jumpSection.join(''),
+        '<!--LIST_NAME-->'               => @items['name'],
       }
 
       paginationOutput = WidgetList::Utils::fill(pieces,@items['template_pagination_wrapper'])
@@ -1389,7 +1365,7 @@ module WidgetList
 
           if (
           ( (@items.key?('LIST_COL_SORT') && !@items['LIST_COL_SORT'].empty?) && @items['LIST_COL_SORT'] == colSort['LIST_COL_SORT']) ||
-              ( $_SESSION.key?('LIST_COL_SORT') &&  $_SESSION['LIST_COL_SORT'].key?(@sqlHash) && $_SESSION['LIST_COL_SORT'][@sqlHash].key?(field))
+            ( $_SESSION.key?('LIST_COL_SORT') &&  $_SESSION['LIST_COL_SORT'].key?(@sqlHash) && $_SESSION['LIST_COL_SORT'][@sqlHash].key?(field))
           )
             changedSession = false
             if @items.key?('LIST_COL_SORT') && !@items['LIST_COL_SORT'].empty?
@@ -1428,13 +1404,12 @@ module WidgetList
             end
           end
 
-          if $_REQUEST.key?('switch_grouping')
-            colSort['switch_grouping'] = $_REQUEST['switch_grouping']
-          end
+          @items['carryOverRequsts'].each { |value|
+            if $_REQUEST.key?(value)
+              colSort[value] = $_REQUEST[value]
+            end
+          }
 
-          if @items.key?('ajax_action') && ! @items['ajax_action'].empty?
-            colSort['list_action'] = @items['ajax_action']
-          end
           colSort['SQL_HASH'] = @sqlHash
 
           pieces = {      '<!--COLSORTURL-->'       => WidgetList::Utils::build_url(@items['pageId'],colSort,(!$_REQUEST.key?('BUTTON_VALUE'))),
@@ -1445,7 +1420,8 @@ module WidgetList
                           '<!--TITLE_POPUP-->'      => popupTitle,
                           '<!--COL_HEADER_CLASS-->' => colClass,
                           '<!--TITLE-->'            => fieldTitle,
-                          '<!--FUNCTION-->'         => @items['ajax_function']
+                          '<!--FUNCTION-->'         => @items['ajaxFunction'],
+                          '<!--FUNCTION_ALL-->'     => @items['ajaxFunctionAll'],
           }
           headers << WidgetList::Utils::fill(pieces, @items[templateIdx])
         else
@@ -1463,13 +1439,6 @@ module WidgetList
 
       @templateFill['<!--COLSPAN_FULL-->'] = headers.count()
 
-      if @items['mode'] != 'passive'
-        pieces = {'<!--LIST_SEQUENCE-->' => @sequence,
-                  '<!--TOTAL_PAGES-->'   => @totalPages}
-
-        @templateFill['<!--PAGE_SEQUENCE_DISPLAY-->'] = WidgetList::Utils::fill(pieces, @items['templateSequence'])
-      end
-
       @templateFill['<!--PAGINATION_LIST-->'] = build_pagination()
       @templateFill['<!--HEADERS-->']         = headers.join('')
 
@@ -1566,9 +1535,9 @@ module WidgetList
           #
           # Checkbox is checked or not per query value
           #
-          if ! @items['checked_flag'].empty?
-            if @items['checked_flag'].key?(column)
-              input['checked'] =  !!@results[ @items['checked_flag'][column].upcase ][row]
+          if ! @items['checkedFlag'].empty?
+            if @items['checkedFlag'].key?(column)
+              input['checked'] =  !!@results[ @items['checkedFlag'][column].upcase ][row]
             end
           end
 
@@ -1596,24 +1565,118 @@ module WidgetList
       return content
     end
 
+    # build_list controls a default AJAX/Export and full HTML return output
+    # in some cases you should copy and paste this logic for custom scenarios in your controller, but in most cases, this is okay
+
+    def self.build_list(list_parms)
+
+      list = WidgetList::List.new(list_parms)
+
+      #
+      # If AJAX, send back JSON
+      #
+      if $_REQUEST.key?('BUTTON_VALUE') && $_REQUEST['LIST_NAME'] == list_parms['name']
+
+        if $_REQUEST.key?('export_widget_list')
+          return ['export',list.render()]
+        end
+
+        ret = {}
+
+        if $_REQUEST['list_action'] != 'ajax_widgetlist_checks'
+          ret['list']     = list.render()
+          ret['list_id']  = list_parms['name']
+          ret['callback'] = 'ListSearchAheadResponse'
+        end
+
+        return ['json',WidgetList::Utils::json_encode(ret)]
+      else
+        #
+        # Else assign to variable for view
+        #
+        return ['html', list.render() ]
+      end
+
+    end
+
+    # checkbox_helper just builds the proper Hashes to setup a checkbox widget row
+    # it assumes you have a fake column called '' AS checkbox to fill in with the widget_check
+
+    def self.checkbox_helper(list_parms,primary_key)
+
+      list_parms.deep_merge!({'inputs' =>
+                                {'checkbox'=>
+                                   {'type' => 'checkbox'
+                                   }
+                                }
+                             })
+
+      list_parms.deep_merge!({'inputs' =>
+                                {'checkbox'=>
+                                   {'items' =>
+                                      {
+                                        'name'          => list_parms['name'] + '_visible_checks[]',
+                                        'value'         => primary_key, #the value should be a column name mapping
+                                        'class_handle'  => list_parms['name'] + '_info_tables',
+                                      }
+                                   }
+                                }
+                             })
+
+      list_parms.deep_merge!({'inputs' =>
+                                {'checkbox_header'=>
+                                   {'type' => 'checkbox'
+                                   }
+                                }
+                             })
+
+      list_parms.deep_merge!({'inputs' =>
+                                {'checkbox_header'=>
+                                   {'items' =>
+                                      {
+                                        'check_all'     => true,
+                                        'id'            => list_parms['name'] + '_info_tables_check_all',
+                                        'class_handle'  => list_parms['name'] + '_info_tables',
+                                      }
+                                   }
+                                }
+                             })
+      return list_parms
+    end
+
     def self.drill_down_back(list_name='')
       '<div class="goback" onclick="ListHome(\'' + list_name + '\');" title="Go Back"></div>'
     end
 
-    def self.build_drill_down_link(listId,drillDownName,dataToPassFromView,columnToShow,columnAlias='',functionName='ListDrillDown',columnClass='',color='blue')
+    def self.build_drill_down_link(listId,drillDownName,dataToPassFromView,columnToShow,columnAlias='',extraFunction='',functionName='ListDrillDown',columnClass='',color='blue',extraJSFunctionParams='',primary=true)
       if columnAlias.empty?
         columnAlias = columnToShow
       end
 
       if !columnClass.empty?
-        columnClass = ' "' + WidgetList::List::concat_string() + columnClass + WidgetList::List::concat_string() + '"'
+        columnClass = ' "' + WidgetList::List::concat_string(primary) + columnClass + WidgetList::List::concat_string(primary) + '"'
+      end
+
+      if WidgetList::List.get_db_type(primary) == 'oracle'
+        if $_REQUEST.key?('export_widget_list')
+          link = "#{columnToShow} #{WidgetList::List::is_sequel(primary) ? " as #{columnAlias} " : ""}"
+        else
+          link = %[q'[<a style='cursor:pointer;color:#{color};' class='#{columnAlias}_drill#{columnClass}' onclick='#{functionName}("#{drillDownName}", ListDrillDownGetRowValue(this) ,"#{listId}"#{extraJSFunctionParams});#{extraFunction}'>]' #{WidgetList::List::concat_string(primary)}#{columnToShow}#{WidgetList::List::concat_string(primary)}q'[</a><script class='val-db' type='text'>]' #{WidgetList::List::concat_string(primary)} #{dataToPassFromView} #{WidgetList::List::concat_string(primary)} q'[</script>]' #{WidgetList::List::concat_outer(primary)} #{WidgetList::List::is_sequel(primary) ? " as #{columnAlias} " : ""}]
+        end
+      else
+        if $_REQUEST.key?('export_widget_list')
+          link = "#{columnToShow} #{WidgetList::List::is_sequel(primary) ? " as #{columnAlias} " : ""}"
+        else
+          link = %[#{WidgetList::List::concat_inner(primary)}"<a style='cursor:pointer;color:#{color};' class='#{columnAlias}_drill#{columnClass}' onclick='#{functionName}(#{WidgetList::List::double_quote(primary)}#{drillDownName}#{WidgetList::List::double_quote(primary)}, ListDrillDownGetRowValue(this) ,#{WidgetList::List::double_quote(primary)}#{listId}#{WidgetList::List::double_quote(primary)}#{extraJSFunctionParams});#{extraFunction}'>"#{WidgetList::List::concat_string(primary)}#{columnToShow}#{WidgetList::List::concat_string(primary)}"</a><script class='val-db' type='text'>"#{WidgetList::List::concat_string(primary)} #{dataToPassFromView} #{WidgetList::List::concat_string(primary)}"</script>"#{WidgetList::List::concat_outer(primary)} #{WidgetList::List::is_sequel(primary) ? " as #{columnAlias} " : ""}]
+        end
       end
 
-      link = %[#{WidgetList::List::concat_inner()}"<a style='cursor:pointer;color:#{color};' class='#{columnAlias}_drill#{columnClass}' onclick='#{functionName}(#{WidgetList::List::double_quote()}#{drillDownName}#{WidgetList::List::double_quote()}, ListDrillDownGetRowValue(this) ,#{WidgetList::List::double_quote()}#{listId}#{WidgetList::List::double_quote()});'>"#{WidgetList::List::concat_string()}#{columnToShow}#{WidgetList::List::concat_string()}"</a><script class='val-db' type='text'>"#{WidgetList::List::concat_string()} #{dataToPassFromView} #{WidgetList::List::concat_string()}"</script>"#{WidgetList::List::concat_outer()}  as #{columnAlias},]
+
     end
 
-    def self.concat_string
-      case WidgetList::List.get_database.db_type
+    def self.concat_string(primary)
+
+      case WidgetList::List.get_db_type(primary)
         when 'mysql'
           ' , '
         when 'oracle','sqlite'
@@ -1623,8 +1686,8 @@ module WidgetList
       end
     end
 
-    def self.double_quote
-      case WidgetList::List.get_database.db_type
+    def self.double_quote(primary)
+      case WidgetList::List.get_db_type(primary)
         when 'mysql'
           '\\"'
         when 'oracle','sqlite'
@@ -1634,8 +1697,8 @@ module WidgetList
       end
     end
 
-    def self.concat_outer
-      case WidgetList::List.get_database.db_type
+    def self.concat_outer(primary)
+      case WidgetList::List.get_db_type(primary)
         when 'mysql'
           ')'
         else
@@ -1643,8 +1706,8 @@ module WidgetList
       end
     end
 
-    def self.concat_inner
-      case WidgetList::List.get_database.db_type
+    def self.concat_inner(primary)
+      case WidgetList::List.get_db_type(primary)
         when 'mysql'
           'CONCAT('
         else
@@ -1673,15 +1736,15 @@ module WidgetList
             if @results.key?(tag.upcase) && @results[tag.upcase][j]
 
               buttonAttribs.deep_merge!({'args' =>
-                                             {
-                                                 tagName => @results[tag.upcase][j]
-                                             }
+                                           {
+                                             tagName => @results[tag.upcase][j]
+                                           }
                                         })
             else
               buttonAttribs.deep_merge!({'args' =>
-                                             {
-                                                 tagName => tag
-                                             }
+                                           {
+                                             tagName => tag
+                                           }
                                         })
             end
           }
@@ -1722,18 +1785,6 @@ module WidgetList
       function   = @items['linkFunction']
       parameters = ''
 
-      if links.key?('PAGE_ID') && ! links['PAGE_ID'].empty?
-        url['PAGE_ID'] = links['PAGE_ID']
-      end
-
-      if links.key?('ACTION') && ! links['ACTION'].empty?
-        url['list_action'] = links['ACTION']
-      end
-
-      if links.key?('BUTTON_VALUE') && ! links['BUTTON_VALUE'].empty?
-        url['BUTTON_VALUE'] = links['BUTTON_VALUE']
-      end
-
       #todo unit test this and all of column links
       if links.key?('tags')
         links['tags'].each { | tagName, tag |
@@ -1759,12 +1810,8 @@ module WidgetList
         end
       end
 
-      if @items.key?('ajax_action') && !@items['ajax_action'].empty?
-        url['list_action'] = @items['ajax_action']
-      end
-
       url['SQL_HASH']      = @sqlHash
-      linkUrl = WidgetList::Utils::build_url(@items['pageId'],(!$_REQUEST.key?('BUTTON_VALUE')))
+      linkUrl = WidgetList::Utils::build_url(@items['pageId'], url, (!$_REQUEST.key?('BUTTON_VALUE')))
 
       "#{function}('#{linkUrl}'#{parameters})"
     end
@@ -1775,12 +1822,12 @@ module WidgetList
         if @items['data'].empty?
           #Run the actual statement
           #
-          @totalRowCount = WidgetList::List.get_database._select(sql, @items['bindVars'], @items['bindVarsLegacy'])
+          @totalRowCount = get_database._select(sql , @items['bindVars'], @items['bindVarsLegacy'], @active_record_model)
         end
 
         if @totalRowCount > 0
           if @items['data'].empty?
-            @results = WidgetList::List.get_database.final_results
+            @results = get_database.final_results
           else
             @results = @items['data']
           end
@@ -1801,6 +1848,8 @@ module WidgetList
             #
 
             @items['fields'].each { |column , fieldTitle|
+              column = strip_aliases(column)
+
               colPieces        = {}
               colClasses       = []
               theStyle         = ''
@@ -1833,7 +1882,7 @@ module WidgetList
                 # Column is an input
                 #
               elsif @items['inputs'].key?(column) && @items['inputs'][column].class.name == 'Hash'
-                colClasses << @items['checked_class']
+                colClasses << @items['checkedClass']
                 content = build_column_input(column, j)
 
 
@@ -1861,7 +1910,7 @@ module WidgetList
                   content = strip_tags(content)
                 end
 
-                content = WidgetList::List.get_database._bind(content, @items['bindVarsLegacy'])
+                content = get_database._bind(content, @items['bindVarsLegacy'])
 
                 # Column color
                 #
@@ -1958,14 +2007,11 @@ module WidgetList
             if @items['rowColorByStatus'].empty? &&  @items['rowStylesByStatus'].empty?
               #Set the row color
               #
-              rowColor = @items['rowColor']
 
-              if @items['offsetRows']
-                if( j % 2 ==0)
-                  rowColor = @items['rowOffsets'][1]
-                else
-                  rowColor = @items['rowOffsets'][0]
-                end
+              if( j % 2 ==0)
+                rowColor = @items['rowOffsets'][1]
+              else
+                rowColor = @items['rowOffsets'][0]
               end
 
               #Draw default color
@@ -1986,7 +2032,7 @@ module WidgetList
 
         else
 
-          err_message = (WidgetList::List.get_database.errors) ? @items['noDataMessage'] + ' <span style="color:red">(An error occurred)</span>' : @items['noDataMessage']
+          err_message = (get_database.errors) ? @items['noDataMessage'] + ' <span style="color:red">(An error occurred)</span>' : @items['noDataMessage']
 
           @templateFill['<!--DATA-->'] = '<tr><td colspan="50"><div id="noListResults">' + generate_error_output() + err_message + '</div></td></tr>'
 
@@ -1994,7 +2040,7 @@ module WidgetList
 
       else
 
-        err_message = (WidgetList::List.get_database.errors) ? @items['noDataMessage'] + ' <span style="color:red">(An error occurred)</span>' : @items['noDataMessage']
+        err_message = (get_database.errors) ? @items['noDataMessage'] + ' <span style="color:red">(An error occurred)</span>' : @items['noDataMessage']
 
         @templateFill['<!--DATA-->'] = '<tr><td colspan="50"><div id="noListResults">' + generate_error_output() + err_message + '</div></td></tr>'
       end
@@ -2003,50 +2049,91 @@ module WidgetList
 
     def generate_error_output(ex='')
       sqlDebug = ""
+
+      if !@items['errors'].empty?
+        sqlDebug += "<br/><br/><strong style='color:red'>(" + @items['errors'].join(', ') + ")</strong>"
+      end
+
       if Rails.env == 'development'
-        sqlDebug += "<br/><br/><textarea style='width:100%;height:400px;'>" + WidgetList::List.get_database.last_sql.to_s + "</textarea>"
+        sqlDebug += "<br/><br/><textarea style='width:100%;height:400px;'>" + get_database.last_sql.to_s + "</textarea>"
       end
 
-      if Rails.env == 'development' && WidgetList::List.get_database.errors
-        sqlDebug += "<br/><br/><strong style='color:red'>(" + WidgetList::List.get_database.last_error.to_s + ")</strong>"
+      if Rails.env == 'development' && get_database.errors
+        sqlDebug += "<br/><br/><strong style='color:red'>(" + get_database.last_error.to_s + ")</strong>"
       end
 
       if Rails.env == 'development' && ex != ''
         sqlDebug += "<br/><br/><strong style='color:red'>(" + ex.to_s + ") <pre>"  + $!.backtrace.join("\n\n") +  "</pre></strong>"
       end
+      Rails.logger.info sqlDebug
 
       sqlDebug
     end
 
     def build_statement()
-      statement = ''
-      pieces    =       { '<!--FIELDS-->'  => '',
-                          '<!--SOURCE-->'  => '',
-                          '<!--WHERE-->'   => '',
-                          '<!--GROUPBY-->' => '',
-                          '<!--ORDERBY-->' => '',
-                          '<!--LIMIT-->'   => ''}
+      statement  = ''
+      @fieldList      = []
+      @fieldListPlain = []
+      pieces     =      { '<!--FIELDS_PLAIN-->'  => '',
+                          '<!--FIELDS-->'        => '',
+                          '<!--SOURCE-->'        => '',
+                          '<!--WHERE-->'         => '',
+                          '<!--GROUPBY-->'       => '',
+                          '<!--ORDERBY-->'       => '',
+                          '<!--LIMIT-->'         => ''}
 
       #Build out a list of columns to select from
       #
+
       @items['fields'].each { |column, fieldTitle|
+        @fieldListPlain << strip_aliases(column)
         if @items['fieldFunction'].key?(column) && !@items['fieldFunction'][column].empty?
           # fieldFunction's should not have an alias, just the database functions
           column = @items['fieldFunction'][column] + " " + column
         end
-
         @fieldList << column
       }
 
-      #Add any columns without corresponding header titles
-      #
-      @items['columns'].each { |column|
-        @fieldList << column
-      }
+
+      if get_database.db_type == 'oracle'
+        if !@items['groupBy'].empty?
+          @fieldList << 'MAX(rn) as rn'
+        else
+          @fieldList << 'rn'
+        end
+        @fieldListPlain << 'rn'
+      end
+
+      if @items['fieldsHidden'].class.name == 'Array'
+        @items['fieldsHidden'].each { |column|
+          if !@items['fields'].key?(column)
+            @fieldListPlain << strip_aliases(column)
+            if @items['fieldFunction'].key?(column) && !@items['fieldFunction'][column].empty?
+              # fieldFunction's should not have an alias, just the database functions
+              column = @items['fieldFunction'][column] + " " + column
+            end
+            @fieldList << column
+          end
+        }
+      elsif @items['fieldsHidden'].class.name == 'Hash'
+        @items['fieldsHidden'].each { |column|
+          col = column[0]
+          if !@items['fields'].key?(col)
+            @fieldListPlain << strip_aliases(col)
+            if @items['fieldFunction'].key?(column[0]) && !@items['fieldFunction'][column[0]].empty?
+              # fieldFunction's should not have an alias, just the database functions
+              col = @items['fieldFunction'][column[0]] + " " + column[0]
+            end
+            @fieldList << col
+          end
+        }
+      end
+
 
       viewPieces = {}
+      viewPieces['<!--FIELDS_PLAIN-->'] = @fieldListPlain.join(',')
       viewPieces['<!--FIELDS-->'] = @fieldList.join(',')
-      viewPieces['<!--SOURCE-->'] = @items['view']
+      viewPieces['<!--SOURCE-->'] = get_view()
 
       statement = WidgetList::Utils::fill(viewPieces, @items['statement']['select']['view'])
 
@@ -2066,7 +2153,9 @@ module WidgetList
       end
 
       if !@items['groupBy'].empty?
-        pieces['<!--GROUPBY-->'] += ' GROUP BY ' + @items['groupBy']
+        pieces['<!--GROUPBY-->'] = ' GROUP BY ' + @items['groupBy']
+      else
+        pieces['<!--GROUPBY-->'] = ''
       end
 
       if !@items['LIST_COL_SORT'].empty? || ($_SESSION.key?('LIST_COL_SORT') && $_SESSION['LIST_COL_SORT'].class.name == 'Hash' && $_SESSION['LIST_COL_SORT'].key?(@sqlHash))
@@ -2091,28 +2180,34 @@ module WidgetList
         pieces['<!--ORDERBY-->'] += ' ORDER BY ' + @items['orderBy']
       end
 
-      if WidgetList::List.get_database.db_type == 'oracle' && pieces['<!--ORDERBY-->'].empty?
-        keys = @items['fields'].keys
-        pieces['<!--ORDERBY-->'] += ' ORDER BY ' + keys.first + ' ASC'
+      if get_database.db_type == 'oracle' && pieces['<!--ORDERBY-->'].empty?
+        #oracle needs a field to perform the rank() over
+        #if field is not an "inputs" or a "buttons"
+        #if field is all NULL, then you better watch out as paging will NOT work
+        tmp  = @items['fields'].dup.reject { |val|
+          if (!@items['inputs'].key?(val) && !@items['buttons'].key?(val))
+            false
+          else
+            true
+          end
+        }
+
+        keys = tmp.keys
+        pieces['<!--ORDERBY-->'] += ' ORDER BY ' + keys[0] + ' ASC'
       end
 
-      case WidgetList::List.get_database.db_type
+      case get_database.db_type
         when 'postgres'
           pieces['<!--LIMIT-->'] = ' LIMIT :HIGH OFFSET :LOW'
         when 'oracle'
-          pieces['<!--LIMIT-->'] = ''
 
-          if !@filter.empty?
-            and_where = ' AND '
-          else
-            and_where = ' WHERE '
-          end
-          pieces['<!--WHERE-->'] += and_where +
-              '
+          pieces['<!--LIMIT-->'] =
+            '
+            WHERE
             (
-                 a.rn >= :LOW
+                 rn >' + (@sequence > 1 ? '' : '=') + ' :LOW
               AND
-                 a.rn <= :HIGH
+                 rn <= :HIGH
             )
             '
         else
@@ -2122,7 +2217,7 @@ module WidgetList
 
       statement = WidgetList::Utils::fill(pieces, statement)
 
-      if @items['rowLimit'] >= @totalRows
+      if @items['rowLimit'].to_i >= @totalRows
         @items['bindVarsLegacy']['LOW'] = 0
         @sequence = 1
       end
@@ -2130,6 +2225,10 @@ module WidgetList
       statement
     end
 
+    def strip_aliases(name='')
+      ((name.include?('.')) ? name.split('.').last.gsub(/'||"/,'') : name.gsub(/'||"/,''))
+    end
+
     def auto_column_name(name='')
       name.gsub(/\_/,' ').gsub(/\-/,' ').capitalize
     end
@@ -2141,10 +2240,8 @@ module WidgetList
       sql    = ''
       hashed = false
 
-      if !@items['force_count_sql'].empty?
-        sql = @items['force_count_sql']
-      elsif !@items['view'].empty?
-        sql = WidgetList::Utils::fill({'<!--VIEW-->' => @items['view']}, @items['statement']['count']['view'])
+      if !get_view().empty?
+        sql = WidgetList::Utils::fill({'<!--VIEW-->' => get_view(),'<!--GROUPBY-->' => !@items['groupBy'].empty? ? ' GROUP BY ' + @items['groupBy'] : '' }, @items['statement']['count']['view'])
       end
 
       if ! @filter.empty?
@@ -2155,13 +2252,13 @@ module WidgetList
 
       if ! sql.empty?
         if @items['showPagination']
-          if WidgetList::List.get_database._select(sql, @items['bindVars'], @items['bindVarsLegacy']) > 0
-            rows = WidgetList::List.get_database.final_results['TOTAL'][0]
+          if get_database._select(sql, @items['bindVars'], @items['bindVarsLegacy'], @active_record_model) > 0
+            rows = get_database.final_results['TOTAL'][0]
           else
             rows = 0
           end
           if rows > 0
-            @totalRows = rows
+            @totalRows = rows.to_i
           end
         else
           rows = 1
@@ -2177,6 +2274,212 @@ module WidgetList
       rows
     end
 
+    def self.determine_db_type(db_type)
+      if db_type.include?('://')
+        the_type, void = db_type.split("://")
+        if the_type == 'sqlite:/'
+          the_type = 'sqlite'
+        end
+        return the_type.downcase
+      else
+        begin
+          WidgetList::List::load_widget_list_database_yml()
+
+          if $widget_list_db_conf.key?(db_type)
+            if $widget_list_db_conf[db_type]['adapter'].include?('mysql')
+              return 'mysql'
+            elsif $widget_list_db_conf[db_type]['adapter'].include?('postgres')
+              return 'postgres'
+            elsif $widget_list_db_conf[db_type]['adapter'].include?('oracle')
+              return 'oracle'
+            elsif $widget_list_db_conf[db_type]['adapter'].include?('sqlite')
+              return 'sqlite'
+            elsif $widget_list_db_conf[db_type]['adapter'].include?('sqlserver')
+              return 'sqlserver'
+            elsif $widget_list_db_conf[db_type]['adapter'].include?('ibm')
+              return 'db2'
+            end
+          end
+        rescue
+          return ''
+        end
+
+      end
+    end
+
+    def self.load_widget_list_yml
+      if $widget_list_conf.nil?
+        $widget_list_conf = YAML.load(ERB.new(File.new(Rails.root.join("config", "widget-list.yml")).read).result)[Rails.env]
+      end
+    end
+
+    def self.load_widget_list_database_yml
+      if $widget_list_db_conf.nil?
+        $widget_list_db_conf = YAML.load(ERB.new(File.new(Rails.root.join("config", "database.yml")).read).result)
+      end
+    end
+
+    def self.get_db_type(primary)
+      WidgetList::List::load_widget_list_yml()
+      if primary
+        database_conn = $widget_list_conf[:primary]
+      else
+        database_conn = $widget_list_conf[:secondary]
+      end
+      WidgetList::List::determine_db_type(database_conn)
+    end
+
+    def get_db_type(primary)
+      WidgetList::List::get_db_type(primary)
+    end
+
+    def get_view
+      @active_record_model = false
+      if @is_sequel
+        return @items['view']
+      elsif @items['view'].respond_to?('scoped') && @items['view'].scoped.respond_to?('to_sql')
+        @active_record_model = @items['view'].name.constantize
+
+        new_columns = []
+
+        @items['fields'].each { |column, fieldTitle|
+          if @items['fieldFunction'].key?(column) && !@items['fieldFunction'][column].empty?
+            # fieldFunction's should not have an alias, just the database functions
+            column = @items['fieldFunction'][column] + " " + column
+          end
+          new_columns << column
+        }
+
+        if @items['fieldsHidden'].class.name == 'Array' && !@items['fieldsHidden'].empty?
+          @items['fieldsHidden'].each { |columnPivot|
+            if !@items['fields'].key?(columnPivot)
+              if @items['fieldFunction'].key?(columnPivot) && !@items['fieldFunction'][columnPivot].empty?
+                # fieldFunction's should not have an alias, just the database functions
+                columnPivot = @items['fieldFunction'][columnPivot] + " " + columnPivot
+              end
+              new_columns << columnPivot
+            end
+          }
+        elsif @items['fieldsHidden'].class.name == 'Hash' && !@items['fieldsHidden'].empty?
+          @items['fieldsHidden'].each { |columnPivot|
+            if !@items['fields'].key?(columnPivot[0])
+              if @items['fieldFunction'].key?(columnPivot[0]) && !@items['fieldFunction'][columnPivot[0]].empty?
+                # fieldFunction's should not have an alias, just the database functions
+                columnPivot[0] = @items['fieldFunction'][columnPivot[0]] + " " + columnPivot[0]
+              end
+              new_columns << columnPivot[0]
+            end
+          }
+        end
+
+        view     = @items['view'].scoped.to_sql
+        sql_from = view[view.index(/FROM/),view.length]
+        view     = "SELECT #{new_columns.join(',')} " + sql_from
+
+        return "( #{view} <!--GROUPBY-->) a"
+      else
+        return ""
+      end
+    end
+
+    def connect
+      @has_connected = true
+      begin
+        if Rails.root.join("config", "widget-list.yml").file?
+          WidgetList::List::load_widget_list_yml()
+          if $widget_list_conf.nil?
+            throw 'Configuration file widget-list.yml has no data.  Check that (' + Rails.env + ') Rails.env matches the pointers in the file'
+          end
+          @primary_conn   = $widget_list_conf[:primary]
+          @secondary_conn = $widget_list_conf[:secondary]
+        else
+          throw 'widget-list.yml not found'
+        end
+
+        @is_sequel                         = true
+        if @primary_conn != false && ! @primary_conn.include?('://')
+          @is_sequel                       = false
+        end
+
+        if @secondary_conn != false && !@secondary_conn.include?('://')
+          @is_sequel                       = false
+        end
+
+        if @primary_conn != false
+          if @primary_conn.include?('://')
+            @widget_list_sequel_conn         = Sequel.connect(@primary_conn)
+            @widget_list_sequel_conn.db_type = WidgetList::List::determine_db_type(@primary_conn)
+          else
+            @widget_list_ar_conn             = WidgetListActiveRecord.new
+            @widget_list_ar_conn.db_type     = WidgetList::List::determine_db_type(@primary_conn)
+          end
+        end
+
+        if @secondary_conn != false
+          if @secondary_conn.include?('://')
+            @widget_list_sequel_conn2         = Sequel.connect(@secondary_conn)
+            @widget_list_sequel_conn2.db_type = WidgetList::List::determine_db_type(@secondary_conn)
+          else
+            @widget_list_ar_conn2             = WidgetListActiveRecord.new
+            @widget_list_ar_conn2.db_type     = WidgetList::List::determine_db_type(@secondary_conn)
+          end
+        end
+
+      rescue Exception => e
+        p "widget-list.yml and connection to @widget_list_sequel_conn or @widget_list_sequel_conn2 failed.  Please fix and try again (" + e.to_s + ")"
+      end
+
+    end
+
+
+    def self.is_sequel(primary)
+      WidgetList::List::load_widget_list_yml()
+      if primary
+        database_conn = $widget_list_conf[:primary]
+      else
+        database_conn = $widget_list_conf[:secondary]
+      end
+      is_sequel = true
+      if database_conn != false && ! database_conn.include?('://')
+        is_sequel = false
+      end
+      return is_sequel
+    end
+
+    def get_database
+
+      if @has_connected.nil?
+        connect
+      end
+
+      if @is_sequel
+        begin
+          if @widget_list_sequel_conn.class.name.to_s.split('::').first == 'Sequel'
+            if @current_db_selection == 'primary' || @current_db_selection.nil?
+              @widget_list_sequel_conn.test_connection
+            end
+            if @current_db_selection == 'secondary'
+              @widget_list_sequel_conn2.test_connection
+            end
+          else
+            connect
+          end
+        rescue
+          connect
+        end
+      end
+
+      case @current_db_selection
+        when 'primary'
+          return (@is_sequel) ? @widget_list_sequel_conn : @widget_list_ar_conn
+        when 'secondary'
+          return (@is_sequel) ? @widget_list_sequel_conn2 : @widget_list_ar_conn2
+        else
+          return (@is_sequel) ? @widget_list_sequel_conn : @widget_list_ar_conn
+      end
+
+    end
+
   end
 
 end