Changeset 17757 for extensions/GrumPluginClasses/js/ui.inputFilterBox.js

Timestamp:

Sep 5, 2012, 4:07:58 PM (12 years ago)

Author:

grum

Message:

version 3.5.4
GPCExport

. Improve ODS formatting
. Fix bug in SQLite export options

FilterBox

. add 'not between' filter

File:

• extensions/GrumPluginClasses/js/ui.inputFilterBox.js (modified) (9 diffs)

extensions/GrumPluginClasses/js/ui.inputFilterBox.js

@@ -44 +44 @@
     '!=':'Different than',
     'between':'Between',
+    'not between':'Not between',
     'and':'and',
     'like':'Like',
@@ -289 +290 @@
                    value.filterOperators[i]=='=' ||
                    value.filterOperators[i]=='!=' ||
-                   value.filterOperators[i]=='between') options.filterOperators.push(value.filterOperators[i]);
+                   value.filterOperators[i]=='between' ||
+                   value.filterOperators[i]=='not between') options.filterOperators.push(value.filterOperators[i]);
               }
               break;
@@ -303 +305 @@
                   value.filterOperators[i]=='like' ||
                   value.filterOperators[i]=='not like' ||
-                  value.filterOperators[i]=='between') options.filterOperators.push(value.filterOperators[i]);
+                  value.filterOperators[i]=='between' ||
+                  value.filterOperators[i]=='not between') options.filterOperators.push(value.filterOperators[i]);
               }
               break;
@@ -672 +675 @@
           properties.filter.operator=value;
 
-          if(value=='between')
+          if(value=='between' || value=='not between')
           {
             objects.valueBox1.css('display', 'none');
@@ -861 +864 @@
           {
             case 'numeric':
-              if(properties.filter.operator=='between')
+              if(properties.filter.operator=='between' || properties.filter.operator=='not between')
               {
                 return(objects.value1.inputNum('isValid') && objects.value2.inputNum('isValid'));
@@ -871 +874 @@
               break;
             case 'string':
-              if(properties.filter.operator=='between')
+              if(properties.filter.operator=='between' || properties.filter.operator=='not between')
               {
                 return(objects.value1.inputText('isValid') && objects.value2.inputText('isValid'));
@@ -883 +886 @@
             case 'time':
             case 'datetime':
-              if(properties.filter.operator=='between')
+              if(properties.filter.operator=='between' || properties.filter.operator=='not between')
               {
                 return(objects.value1.inputDate('isValid') && objects.value2.inputDate('isValid'));
@@ -994 +997 @@
            filter.filterOperators[i]=='=' ||
            filter.filterOperators[i]=='!=' ||
-           filter.filterOperators[i]=='between') validFilterTypes.push(filter.filterOperators[i]);
+           filter.filterOperators[i]=='between' ||
+           filter.filterOperators[i]=='not between') validFilterTypes.push(filter.filterOperators[i]);
       }
       break;
@@ -1008 +1012 @@
           filter.filterOperators[i]=='like' ||
           filter.filterOperators[i]=='not like' ||
-          filter.filterOperators[i]=='between') validFilterTypes.push(filter.filterOperators[i]);
+          filter.filterOperators[i]=='between' ||
+          filter.filterOperators[i]=='not between') validFilterTypes.push(filter.filterOperators[i]);
       }
       break;