widget_list 1.0.3 → 1.0.4

data/.idea/workspace.xml

@@ -4,6 +4,7 @@
     <list default="true" id="0bede1c9-1aed-4d82-8d14-4184b67697c4" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.rakeTasks" afterPath="$PROJECT_DIR$/.idea/.rakeTasks" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/assets/images/gobblecons/README.rtf" afterPath="$PROJECT_DIR$/vendor/assets/images/gobblecons/README.rtf" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/widget_list.rb" afterPath="$PROJECT_DIR$/lib/widget_list.rb" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/widget_list/sequel.rb" afterPath="$PROJECT_DIR$/lib/widget_list/sequel.rb" />
@@ -44,7 +45,7 @@
       <file leaf-file-name="README.md" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="327" column="0" selection-start="11641" selection-end="11641" vertical-scroll-proportion="0.9592391">
+            <state line="289" column="0" selection-start="10689" selection-end="11027" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -116,7 +117,7 @@
       <file leaf-file-name="widget_list.rb" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/widget_list.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="2082" column="3" selection-start="75983" selection-end="75983" vertical-scroll-proportion="-13.033334">
+            <state line="2082" column="3" selection-start="75983" selection-end="75983" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -158,7 +159,7 @@
     <option name="x" value="-5" />
     <option name="y" value="25" />
     <option name="width" value="1690" />
-    <option name="height" value="889" />
+    <option name="height" value="937" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -205,56 +206,6 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="widget_list" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="widget_list" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="widget_list" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="widget_list" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="widget_list" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="widget_list" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="widget_list" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="extensions" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
         </subPane>
       </pane>
     </panes>
@@ -374,14 +325,14 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-5" y="25" width="1690" height="889" extended-state="6" />
-    <editor active="true" />
+    <frame x="-5" y="25" width="1690" height="937" extended-state="6" />
+    <editor active="false" />
     <layout>
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1988984" sideWeight="0.5763547" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1988984" sideWeight="0.5763547" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.56913185" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -530,7 +481,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/widget_list.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="2082" column="3" selection-start="75983" selection-end="75983" vertical-scroll-proportion="-13.033334">
+        <state line="2082" column="3" selection-start="75983" selection-end="75983" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
@@ -544,7 +495,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="327" column="0" selection-start="11641" selection-end="11641" vertical-scroll-proportion="0.9592391">
+        <state line="289" column="0" selection-start="10689" selection-end="11027" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>

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 DRILL_DOWNS ROW_LIMIT list_checks SEARCH_FILTER LIST_SEQUENCE LIST_COL_SORT list_count DRILL_DOWNS DRILL_DOWN_FILTERS).each { |key|
+      %w(pageDisplayLimit DRILL_DOWNS 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.0.3"
+  VERSION = "1.0.4"
 end

data/lib/widget_list.rb

@@ -28,6 +28,9 @@ module WidgetList
 
     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
 
@@ -416,46 +419,6 @@ module WidgetList
 
         @items['groupByClick'] = "ListChangeGrouping('" + @items['name']  + "')"
 
-=begin
-      #todo
-      @items['fieldNames'] = {};
-      if (empty(@items['fields']) && empty(@items['data']))
-      {
-         #Lazy mode where new columns added to view show up in list (unless you name the column "HIDE_xxxxx")
-         #
-         if (@items['sql'])
-         {
-            #tick_field()....
-            preg_match("/\s+from\s+`?([a-z\d_]+)`?/i", @items['sql'], $match);
-            $viewName = $match[1];
-         }
-         elseif (@items['view'])
-         {
-            $viewName = @items['view'];
-         }
-
-         if ($this->DATABASE->Select("SHOW FULL COLUMNS IN ".$viewName))
-         {
-            foreach($this->DATABASE->results['FIELD'] as $col)
-            {
-               @items['fieldNames'][] = $col;
-               $columnUpper = strtoupper($col);
-               $columnLower = strtolower($col);
-               if (substr($columnUpper,0,5) != 'HIDE_')
-               {
-                  #any columns named HIDE_ will not show
-                  #
-                  @items['fields'][$columnLower] = $this->autoColumnName($columnUpper);
-                  if ($columnLower != 'features')
-                  {
-                     @items['columnSort'][$columnLower] = $columnLower;
-                  }
-               }
-            }
-         }
-      }
-=end
-
         if $_REQUEST.key?('searchClear')
           clear_search_session()
         end
@@ -629,7 +592,7 @@ module WidgetList
 
           #Initialize page load/Session stuff whe list first loads
           #
-          clear_check_box_session(@items['name'])
+          WidgetList::List::clear_check_box_session(@items['name'])
         end
 
 
@@ -773,7 +736,7 @@ module WidgetList
       end
     end
 
-    def clear_check_box_session(name='')
+    def self.clear_check_box_session(name='')
 
       if $_SESSION.key?('DRILL_DOWN_FILTERS')
         $_SESSION.delete('DRILL_DOWN_FILTERS')
@@ -825,6 +788,33 @@ module WidgetList
 
     end
 
+    def self.get_filter_and_drilldown(listId)
+      filter = ''
+      drillDown = ''
+      if !$_REQUEST.key?('BUTTON_VALUE')
+        # Initialize page load/Session stuff whe list first loads
+        #
+        WidgetList::List::clear_check_box_session(listId)
+      end
+
+      if $_REQUEST.key?('drill_down')
+        drillDown = $_REQUEST['drill_down']
+        $_SESSION.deep_merge!({'DRILL_DOWNS' => { listId => drillDown} })
+      elsif $_SESSION.key?('DRILL_DOWNS') && $_SESSION['DRILL_DOWNS'].key?(listId)
+        drillDown = $_SESSION['DRILL_DOWNS'][listId]
+      else
+        drillDown = 'default'
+      end
+
+      if $_REQUEST.key?('filter')
+        filter = $_REQUEST['filter']
+        $_SESSION.deep_merge!({'DRILL_DOWN_FILTERS' => { listId => filter} })
+      elsif $_SESSION.key?('DRILL_DOWN_FILTERS') && $_SESSION['DRILL_DOWN_FILTERS'].key?(listId)
+        filter = $_SESSION['DRILL_DOWN_FILTERS'][listId]
+      end
+      return drillDown, filter
+    end
+
     def clear_sort_get_vars()
       $_REQUEST.delete('LIST_FILTER_ALL')
       $_REQUEST.delete('ROW_LIMIT')
@@ -1531,6 +1521,60 @@ module WidgetList
       return content
     end
 
+    def self.build_drill_down_link(listId,drillDownName,dataToPassFromView,columnToShow,columnAlias='',functionName='ListDrillDown',columnClass='')
+      if columnAlias.empty?
+        columnAlias = columnToShow
+      end
+
+      if !columnClass.empty?
+        columnClass = ' "' + WidgetList::List::concat_string() + columnClass + WidgetList::List::concat_string() + '"'
+      end
+
+      return %[#{WidgetList::List::concat_inner()}"<a style='cursor:pointer;color:blue;' class='#{columnAlias}_drill#{columnClass}' onclick='#{functionName}(#{WidgetList::List::double_quote()}#{drillDownName}#{WidgetList::List::double_quote()},#{WidgetList::List::double_quote()}"#{WidgetList::List::concat_string()} #{dataToPassFromView} #{WidgetList::List::concat_string()} "#{WidgetList::List::double_quote()},#{WidgetList::List::double_quote()}#{listId}#{WidgetList::List::double_quote()})'>"#{WidgetList::List::concat_string()}#{columnToShow}#{WidgetList::List::concat_string()}"</a>"#{WidgetList::List::concat_outer()}  as #{columnAlias},]
+    end
+
+    def self.concat_string
+      case WidgetList::List.get_database.db_type
+        when 'mysql'
+          ' , '
+        when 'oracle'
+        when 'sqlite'
+          ' || '
+        else
+          ','
+      end
+    end
+
+    def self.double_quote
+      case WidgetList::List.get_database.db_type
+        when 'mysql'
+          '\\"'
+        when 'oracle'
+        when 'sqlite'
+          '""'
+        else
+          '"'
+      end
+    end
+
+    def self.concat_outer
+      case WidgetList::List.get_database.db_type
+        when 'mysql'
+          ')'
+        else
+          ''
+      end
+    end
+
+    def self.concat_inner
+      case WidgetList::List.get_database.db_type
+        when 'mysql'
+          'CONCAT('
+        else
+          ''
+      end
+    end
+
     def build_column_button(column,j)
       buttons     = @items['buttons'][column]
       columnValue = @results[column.upcase][j]
@@ -1720,64 +1764,18 @@ module WidgetList
               else
                 cleanData = strip_tags(@results[column.upcase][j].to_s)
 
-                if cleanData.length > @items['strlength']
-=begin
-                 $contentTitle = $cleanData;
-
-                 $possibleMatches = array("/(.*)(\(<a.*?>.*?<\/a>\)\s)(.*)/i" => array(3), #<a>(id)</a> Text
-                                          "/(.*)(<a.*?>)(.*)(<\/a>)(.*)/i"    => array(3)  #<a>Text</a> other text
-                                         );
-
-                 foreach($possibleMatches as $regex => $toFix)
-                 {
-                    $matched = preg_match_all($regex, @results[strtoupper($column)][$j], $matches, PREG_PATTERN_ORDER);
-
-                    if(! empty($matched))
-                    {
-                       $pieces = {};
-
-                       unset($matches[0]);
-
-                       foreach($matches as $key => $theText)
-                       {
-                          $fixedText = '';
-
-                          if(in_array($key, $toFix))
-                          {
-                             $fixedText = substr($theText[0], 0, @items['strlength']) . '...';
-                          }
-                          else
-                          {
-                             $fixedText = $theText[0];
-                          }
-
-                          $pieces[] = $fixedText;
-                       }
-
-                       $content = implode('', $pieces);
-
-                       break;
-                    }
-                 }
+                #
+                # For now disable length parser
+                #
+                if false && cleanData.length > @items['strlength']
 
-                 if(empty($matched))
-                 {
-                    if ((strpos(@results[strtoupper($column)][$j],'&#') !== false && strpos(@results[strtoupper($column)][$j],';') !== false))
-                    {
-                       $content = @results[strtoupper($column)][$j];
-                    }
-                    else
-                    {
-                       $content = substr(@results[strtoupper($column)][$j], 0, @items['strlength']) . '...';
-                    }
-                 }
-=end
                   content = @results[column.upcase][j].to_s[ 0, @items['strlength'] ] + '...'
 
                 else
                   content = @results[column.upcase][j].to_s
                 end
 
+                #
                 #Strip HTML
                 #
                 if !@items['allowHTML']
@@ -2080,4 +2078,4 @@ module WidgetList
 
   end
 
-end
+endx

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: widget_list
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-30 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel