Changeset 17757


Ignore:
Timestamp:
Sep 5, 2012, 4:07:58 PM (8 years ago)
Author:
grum
Message:

version 3.5.4
GPCExport

. Improve ODS formatting
. Fix bug in SQLite export options

FilterBox

. add 'not between' filter

Location:
extensions/GrumPluginClasses
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/GrumPluginClasses/classes/GPCExport.class.inc.php

    r17735 r17757  
    470470
    471471    $sheet=new odsTable($this->options['sheetName']);
     472    $sheet->setVerticalSplit(1);
    472473
    473474    // columns name
     
    544545      switch($option)
    545546      {
    546         case 'separator':
    547           if($value=='tab') $value=chr(9);
     547        case 'tableName':
    548548          $this->options[$option]=$value;
    549           break;
    550         case 'decimalDot':
    551           if($value=='.' or $value==',')
    552             $this->options[$option]=$value;
    553           break;
    554         case 'useQuotes':
    555           if($value==true or $value==false)
    556             $this->options[$option]=$value;
    557           break;
    558         case 'lineFeed':
    559           if($value=='unix')
    560           {
    561             $value="\x0A";
    562           }
    563           elseif($value=='windows')
    564           {
    565             $value="\x0D\x0A";
    566           }
    567 
    568           if($value=="\x0A" or $value=="\x0D\x0A")
    569             $this->options[$option]=$value;
    570549          break;
    571550      }
  • extensions/GrumPluginClasses/js/ui.inputFilterBox.js

    r17735 r17757  
    4444    '!=':'Different than',
    4545    'between':'Between',
     46    'not between':'Not between',
    4647    'and':'and',
    4748    'like':'Like',
     
    289290                   value.filterOperators[i]=='=' ||
    290291                   value.filterOperators[i]=='!=' ||
    291                    value.filterOperators[i]=='between') options.filterOperators.push(value.filterOperators[i]);
     292                   value.filterOperators[i]=='between' ||
     293                   value.filterOperators[i]=='not between') options.filterOperators.push(value.filterOperators[i]);
    292294              }
    293295              break;
     
    303305                  value.filterOperators[i]=='like' ||
    304306                  value.filterOperators[i]=='not like' ||
    305                   value.filterOperators[i]=='between') options.filterOperators.push(value.filterOperators[i]);
     307                  value.filterOperators[i]=='between' ||
     308                  value.filterOperators[i]=='not between') options.filterOperators.push(value.filterOperators[i]);
    306309              }
    307310              break;
     
    672675          properties.filter.operator=value;
    673676
    674           if(value=='between')
     677          if(value=='between' || value=='not between')
    675678          {
    676679            objects.valueBox1.css('display', 'none');
     
    861864          {
    862865            case 'numeric':
    863               if(properties.filter.operator=='between')
     866              if(properties.filter.operator=='between' || properties.filter.operator=='not between')
    864867              {
    865868                return(objects.value1.inputNum('isValid') && objects.value2.inputNum('isValid'));
     
    871874              break;
    872875            case 'string':
    873               if(properties.filter.operator=='between')
     876              if(properties.filter.operator=='between' || properties.filter.operator=='not between')
    874877              {
    875878                return(objects.value1.inputText('isValid') && objects.value2.inputText('isValid'));
     
    883886            case 'time':
    884887            case 'datetime':
    885               if(properties.filter.operator=='between')
     888              if(properties.filter.operator=='between' || properties.filter.operator=='not between')
    886889              {
    887890                return(objects.value1.inputDate('isValid') && objects.value2.inputDate('isValid'));
     
    994997           filter.filterOperators[i]=='=' ||
    995998           filter.filterOperators[i]=='!=' ||
    996            filter.filterOperators[i]=='between') validFilterTypes.push(filter.filterOperators[i]);
     999           filter.filterOperators[i]=='between' ||
     1000           filter.filterOperators[i]=='not between') validFilterTypes.push(filter.filterOperators[i]);
    9971001      }
    9981002      break;
     
    10081012          filter.filterOperators[i]=='like' ||
    10091013          filter.filterOperators[i]=='not like' ||
    1010           filter.filterOperators[i]=='between') validFilterTypes.push(filter.filterOperators[i]);
     1014          filter.filterOperators[i]=='between' ||
     1015          filter.filterOperators[i]=='not between') validFilterTypes.push(filter.filterOperators[i]);
    10111016      }
    10121017      break;
  • extensions/GrumPluginClasses/language/en_UK/plugin.lang.php

    r17735 r17757  
    2828$lang['filter_notEqual']='Different than';
    2929$lang['filter_between']='Between';
     30$lang['filter_notbetween']='Not between';
    3031$lang['filter_and']='and';
    3132$lang['filter_like']='Like';
  • extensions/GrumPluginClasses/language/fr_FR/plugin.lang.php

    r17735 r17757  
    4242$lang['filter_notEqual']='Différent de';
    4343$lang['filter_between']='Entre';
     44$lang['filter_notbetween']='N\'est pas entre';
    4445$lang['filter_and']='et';
    4546$lang['filter_like']='Ressemble à';
Note: See TracChangeset for help on using the changeset viewer.