mirror of
https://github.com/koalyptus/TableFilter.git
synced 2024-05-10 02:16:40 +02:00
Started date type
This commit is contained in:
Max Guglielmi
parent
035801dc7e
commit
a3c4f2158b
2
dist/tablefilter/style/colsVisibility.css
vendored
2
dist/tablefilter/style/colsVisibility.css
vendored
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.3.0 by Max Guglielmi
|
||||
* build date: 2016-09-10T14:01:17.213Z
|
||||
* build date: 2016-09-12T09:16:33.045Z
|
||||
* MIT License
|
||||
*/
|
||||
span.colVisSpan{text-align:left;}span.colVisSpan a.colVis{display:inline-block;padding:7px 5px 0;font-size:inherit;font-weight:inherit;vertical-align:top}div.colVisCont{position:relative;background:#fff;-webkit-box-shadow:3px 3px 2px #888;-moz-box-shadow:3px 3px 2px #888;box-shadow:3px 3px 2px #888;position:absolute;display:none;border:1px solid #ccc;height:auto;width:250px;background-color:#fff;margin:35px 0 0 -100px;z-index:10000;padding:10px 10px 10px 10px;text-align:left;font-size:12px;}div.colVisCont:after,div.colVisCont:before{bottom:100%;left:50%;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}div.colVisCont:after{border-color:rgba(255,255,255,0);border-bottom-color:#fff;border-width:10px;margin-left:-10px}div.colVisCont:before{border-color:rgba(255,255,255,0);border-bottom-color:#ccc;border-width:12px;margin-left:-12px}div.colVisCont p{margin:6px auto 6px auto}div.colVisCont a.colVis{display:initial;font-weight:inherit}ul.cols_checklist{padding:0;margin:0;list-style:none;}ul.cols_checklist label{display:block}ul.cols_checklist input{vertical-align:middle;margin:2px 5px 2px 1px}li.cols_checklist_item{padding:4px;margin:0;}li.cols_checklist_item:hover{background-color:#335ea8;color:#fff}.cols_checklist_slc_item{background-color:#335ea8;color:#fff}
|
||||
2
dist/tablefilter/style/filtersVisibility.css
vendored
2
dist/tablefilter/style/filtersVisibility.css
vendored
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.3.0 by Max Guglielmi
|
||||
* build date: 2016-09-10T14:01:17.213Z
|
||||
* build date: 2016-09-12T09:16:33.045Z
|
||||
* MIT License
|
||||
*/
|
||||
span.expClpFlt a.btnExpClpFlt{width:35px;height:35px;display:inline-block;}span.expClpFlt a.btnExpClpFlt:hover{background-color:#f4f4f4}span.expClpFlt img{padding:8px 11px 11px 11px}
|
||||
2
dist/tablefilter/style/tablefilter.css
vendored
2
dist/tablefilter/style/tablefilter.css
vendored
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.3.0 by Max Guglielmi
|
||||
* build date: 2016-09-10T14:01:17.213Z
|
||||
* build date: 2016-09-12T09:16:33.045Z
|
||||
* MIT License
|
||||
*/
|
||||
.activeHeader{background-color:#66afe9 !important;color:#fff !important}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.3.0 by Max Guglielmi
|
||||
* build date: 2016-09-10T14:01:17.213Z
|
||||
* build date: 2016-09-12T09:16:33.045Z
|
||||
* MIT License
|
||||
*/
|
||||
table.TF{border-left:1px solid #ccc;border-top:none;border-right:none;border-bottom:none;}table.TF th{background:#ebecee url("images/bg_th.jpg") left top repeat-x;border-bottom:1px solid #d0d0d0;border-right:1px solid #d0d0d0;border-left:1px solid #fff;border-top:1px solid #fff;color:#333}table.TF td{border-bottom:1px dotted #999;padding:5px}.fltrow{background-color:#ebecee !important;}.fltrow th,.fltrow td{border-bottom:1px dotted #666 !important;padding:1px 3px 1px 3px !important}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #999 !important}input.flt{width:99% !important}.inf{height:$min-height;background:#d7d7d7 url("images/bg_infDiv.jpg") 0 0 repeat-x !important}input.reset{background:transparent url("images/btn_eraser.gif") center center no-repeat !important}.helpBtn:hover{background-color:transparent}.nextPage{background:transparent url("images/btn_next_page.gif") center center no-repeat !important;}.nextPage:hover{background:transparent url("images/btn_over_next_page.gif") center center no-repeat !important}.previousPage{background:transparent url("images/btn_previous_page.gif") center center no-repeat !important;}.previousPage:hover{background:transparent url("images/btn_over_previous_page.gif") center center no-repeat !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important;}.firstPage:hover{background:transparent url("images/btn_over_first_page.gif") center center no-repeat !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important;}.lastPage:hover{background:transparent url("images/btn_over_last_page.gif") center center no-repeat !important}div.grd_Cont{background-color:#ebecee !important;border:1px solid #ccc !important;padding:0 !important;}div.grd_Cont .even{background-color:#fff}div.grd_Cont .odd{background-color:#d5d5d5}div.grd_headTblCont{background-color:#ebecee !important;border-bottom:none !important;}div.grd_headTblCont table{border-right:none !important}div.grd_tblCont table th,div.grd_headTblCont table th,div.grd_headTblCont table td{background:#ebecee url("images/bg_th.jpg") left top repeat-x !important;border-bottom:1px solid #d0d0d0 !important;border-right:1px solid #d0d0d0 !important;border-left:1px solid #fff !important;border-top:1px solid #fff !important}div.grd_tblCont table td{border-bottom:1px solid #999 !important}.grd_inf{background:#d7d7d7 url("images/bg_infDiv.jpg") 0 0 repeat-x !important;border-top:1px solid #d0d0d0 !important}.loader{border:1px solid #999}.defaultLoader{width:32px;height:32px;background:transparent url("images/img_loading.gif") 0 0 no-repeat !important}.even{background-color:#fff}.odd{background-color:#d5d5d5}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.activeHeader{background:#999 !important}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.3.0 by Max Guglielmi
|
||||
* build date: 2016-09-10T14:01:17.213Z
|
||||
* build date: 2016-09-12T09:16:33.045Z
|
||||
* MIT License
|
||||
*/
|
||||
table.TF{border-left:1px dotted #81963b;border-top:none;border-right:0;border-bottom:none;}table.TF th{background:#39424b url("images/bg_headers.jpg") left top repeat-x;border-bottom:0;border-right:1px dotted #d0d0d0;border-left:0;border-top:0;color:#fff}table.TF td{border-bottom:1px dotted #81963b;border-right:1px dotted #81963b;padding:5px}.fltrow{background-color:#81963b !important;}.fltrow th,.fltrow td{border-bottom:1px dotted #39424b !important;border-right:1px dotted #fff !important;border-left:0 !important;border-top:0 !important;padding:1px 3px 1px 3px !important}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #687830 !important}input.flt{width:99% !important}.inf{background:#d8d8d8;height:$min-height}input.reset{width:53px;background:transparent url("images/btn_filter.png") center center no-repeat !important}.helpBtn:hover{background-color:transparent}.nextPage{background:transparent url("images/btn_next_page.gif") center center no-repeat !important}.previousPage{background:transparent url("images/btn_previous_page.gif") center center no-repeat !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important}div.grd_Cont{background:#81963b url("images/bg_headers.jpg") left top repeat-x !important;border:1px solid #ccc !important;padding:0 1px 1px 1px !important;}div.grd_Cont .even{background-color:#bccd83}div.grd_Cont .odd{background-color:#fff}div.grd_headTblCont{background-color:#ebecee !important;border-bottom:none !important}div.grd_tblCont table{border-right:none !important;}div.grd_tblCont table td{border-bottom:1px dotted #81963b;border-right:1px dotted #81963b}div.grd_tblCont table th,div.grd_headTblCont table th{background:transparent url("images/bg_headers.jpg") 0 0 repeat-x !important;border-bottom:0 !important;border-right:1px dotted #d0d0d0 !important;border-left:0 !important;border-top:0 !important;padding:0 4px 0 4px !important;color:#fff !important;height:35px !important}div.grd_headTblCont table td{border-bottom:1px dotted #39424b !important;border-right:1px dotted #fff !important;border-left:0 !important;border-top:0 !important;background-color:#81963b !important;padding:1px 3px 1px 3px !important}.grd_inf{background-color:#d8d8d8;border-top:1px solid #d0d0d0 !important}.loader{border:0 !important;background:#81963b !important}.defaultLoader{width:32px;height:32px;background:transparent url("images/img_loading.gif") 0 0 no-repeat !important}.even{background-color:#bccd83}.odd{background-color:#fff}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.activeHeader{background:#81963b !important}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.3.0 by Max Guglielmi
|
||||
* build date: 2016-09-10T14:01:17.213Z
|
||||
* build date: 2016-09-12T09:16:33.045Z
|
||||
* MIT License
|
||||
*/
|
||||
table.TF{padding:0;color:#000;border-right:1px solid #a4bed4;border-top:1px solid #a4bed4;border-left:1px solid #a4bed4;border-bottom:0;}table.TF th{margin:0;color:inherit;background:#d1e5fe url("images/bg_skyblue.gif") 0 0 repeat-x;border-color:#fdfdfd #a4bed4 #a4bed4 #fdfdfd;border-width:1px;border-style:solid}table.TF td{margin:0;padding:5px;color:inherit;border-bottom:1px solid #a4bed4;border-left:0;border-top:0;border-right:0}.fltrow{background-color:#d1e5fe !important;}.fltrow th,.fltrow td{padding:1px 3px 1px 3px !important}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #a4bed4 !important}input.flt{width:99% !important}.inf{background-color:#e3efff !important;border:1px solid #a4bed4;height:$min-height;color:#004a6f}div.tot,div.status{border-right:0 !important}.helpBtn:hover{background-color:transparent}input.reset{background:transparent url("images/icn_clear_filters.png") center center no-repeat !important}.nextPage{background:transparent url("images/btn_next_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.nextPage:hover{background:#ffe4ab url("images/btn_next_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.previousPage{background:transparent url("images/btn_prev_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.previousPage:hover{background:#ffe4ab url("images/btn_prev_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.firstPage:hover{background:#ffe4ab url("images/btn_first_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.lastPage:hover{background:#ffe4ab url("images/btn_last_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.activeHeader{background:#ffe4ab !important;border:1px solid #ffb552 !important;color:inherit !important}div.grd_Cont{background-color:#d9eaed !important;border:1px solid #9cc !important;padding:0 !important;}div.grd_Cont .even{background-color:#fff}div.grd_Cont .odd{background-color:#e3efff}div.grd_headTblCont{background-color:#d9eaed !important;border-bottom:none !important}div.grd_tblCont table{border-right:none !important}div.grd_tblCont table th,div.grd_headTblCont table th,div.grd_headTblCont table td{background:#d9eaed url("images/bg_skyblue.gif") left top repeat-x;border-bottom:1px solid #a4bed4;border-right:1px solid #a4bed4 !important;border-left:1px solid #fff !important;border-top:1px solid #fff !important}div.grd_tblCont table td{border-bottom:1px solid #a4bed4 !important;border-right:0 !important;border-left:0 !important;border-top:0 !important}.grd_inf{background-color:#cce2fe;color:#004a6f;border-top:1px solid #9cc !important;}.grd_inf a{text-decoration:none;font-weight:bold}.loader{background-color:#2d8eef;border:1px solid #cce2fe;border-radius:5px}.even{background-color:#fff}.odd{background-color:#e3efff}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.ezActiveRow{background-color:#ffdc61 !important;color:inherit}.ezSelectedRow{background-color:#ffe4ab !important;color:inherit}.ezActiveCell{background-color:#fff !important;color:#000 !important;font-weight:bold}.ezETSelectedCell{background-color:#fff !important;font-weight:bold;color:#000 !important}
|
||||
20925
dist/tablefilter/tablefilter.js
vendored
20925
dist/tablefilter/tablefilter.js
vendored
File diff suppressed because one or more lines are too long
3040
dist/tablefilter/tf-1.js
vendored
3040
dist/tablefilter/tf-1.js
vendored
File diff suppressed because one or more lines are too long
|
|
@ -31,8 +31,8 @@
|
|||
"babel-core": "^6.14.0",
|
||||
"babel-eslint": "6.1.2",
|
||||
"babel-loader": "^6.2.5",
|
||||
"babel-preset-es2015": "^6.14.0",
|
||||
"babel-plugin-transform-es2015-classes": "^6.14.0",
|
||||
"babel-preset-es2015": "^6.14.0",
|
||||
"clean-webpack-plugin": "^0.1.9",
|
||||
"grunt": "^1.0.1",
|
||||
"grunt-babel": "^6.0.0",
|
||||
|
|
@ -49,6 +49,7 @@
|
|||
"grunt-webpack": "^1.0.14",
|
||||
"script-loader": "^0.7.0",
|
||||
"string-replace-webpack-plugin": "^0.0.3",
|
||||
"sugar-date": "2.0.0",
|
||||
"webpack": "^1.13.2",
|
||||
"webpack-dev-server": "^1.15.1"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -101,6 +101,12 @@ export const FORMATTED_NUMBER = 'formatted-number';
|
|||
*/
|
||||
export const FORMATTED_NUMBER_EU = 'formatted-number-eu';
|
||||
|
||||
/**
|
||||
*Date
|
||||
* @type {String}
|
||||
*/
|
||||
export const DATE = 'date';
|
||||
|
||||
/**
|
||||
*IP address
|
||||
* @type {String}
|
||||
|
|
|
|||
28
src/date.js
28
src/date.js
|
|
@ -1,7 +1,25 @@
|
|||
// import moment from 'moment';
|
||||
// console.log(moment, moment());
|
||||
// import 'datejs';
|
||||
|
||||
// import {DateType} from 'safe_datejs';
|
||||
// console.log(DateType);
|
||||
|
||||
import {Date as sugarDate} from 'sugar-date';
|
||||
import 'sugar-date/locales';
|
||||
|
||||
// console.log(sugarDate.create, sugarDate.isValid);
|
||||
|
||||
/**
|
||||
* Date utilities
|
||||
*/
|
||||
|
||||
// export const
|
||||
|
||||
// export const dateFormatFromSetting = (setting) => {
|
||||
// return setting.indexOf('=') !== -1 ? setting.split('=')[1] : null;
|
||||
// }
|
||||
|
||||
/**
|
||||
* Verifies passed formatted date string is valid
|
||||
* @param {String} dateStr Formatted date string
|
||||
|
|
@ -9,6 +27,16 @@
|
|||
* @return {Boolean}
|
||||
*/
|
||||
export const isValidDate = (dateStr, format) => {
|
||||
sugarDate.setLocale('it');
|
||||
console.log( sugarDate.getAllLocales() );
|
||||
// sugarDate.getLocale('en').addFormat('{dd}/{MM}/{yyyy}');
|
||||
// sugarDate.getLocale('en').addFormat('{MM}/{dd}/{yyyy}');
|
||||
// sugarDate.getLocale('en').addFormat('{dd}-{months}-{yyyy|yy}');
|
||||
// sugarDate.getLocale('en').addFormat('{dd}-{MM}-{yyyy|yy}');
|
||||
var d = sugarDate.create(dateStr);
|
||||
console.log(dateStr + ' is valid date', d, sugarDate.isValid(d));
|
||||
// console.log(dateStr + ' is valid date', Date.parse(dateStr));
|
||||
// console.log(dateStr + ' is valid date', moment(dateStr, 'DD/MM/YYYY'));
|
||||
if (!format) {
|
||||
format = 'DMY';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import {addEvt} from '../../event';
|
|||
import {formatDate} from '../../date';
|
||||
import {unformat as unformatNb} from '../../number';
|
||||
import {
|
||||
NONE, CELL_TAG, HEADER_TAG, STRING, NUMBER, FORMATTED_NUMBER,
|
||||
NONE, CELL_TAG, HEADER_TAG, STRING, NUMBER, DATE, FORMATTED_NUMBER,
|
||||
FORMATTED_NUMBER_EU, IP_ADDRESS
|
||||
} from '../../const';
|
||||
|
||||
|
|
@ -421,7 +421,7 @@ export default class AdapterSortableTable extends Feature {
|
|||
//Custom sort types
|
||||
this.addSortType(NUMBER, Number);
|
||||
this.addSortType('caseinsensitivestring', SortableTable.toUpperCase);
|
||||
this.addSortType('date', SortableTable.toDate);
|
||||
this.addSortType(DATE, SortableTable.toDate);
|
||||
this.addSortType(STRING);
|
||||
this.addSortType(FORMATTED_NUMBER, usNumberConverter);
|
||||
this.addSortType(FORMATTED_NUMBER_EU, euNumberConverter);
|
||||
|
|
|
|||
55
src/modules/dateType.js
Normal file
55
src/modules/dateType.js
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
import {Date as SuDate} from 'sugar-date';
|
||||
import 'sugar-date/locales';
|
||||
import {isObj} from '../types';
|
||||
|
||||
export class DateType {
|
||||
|
||||
constructor(tf) {
|
||||
this.tf = tf;
|
||||
this.locale = tf.locale;
|
||||
this.suDate = SuDate;
|
||||
this.emitter = tf.emitter;
|
||||
|
||||
// Global locale
|
||||
this.suDate.setLocale(this.locale);
|
||||
}
|
||||
|
||||
init() {
|
||||
// let locale = this.suDate.getLocale(this.locale);
|
||||
|
||||
// Add formats from column types configuration
|
||||
this._addConfigFormats();
|
||||
// locale.addFormat('{dd}/{MM}/{yyyy}');
|
||||
// locale.addFormat('{MM}/{dd}/{yyyy}');
|
||||
// locale.addFormat('{dd}-{months}-{yyyy|yy}');
|
||||
// locale.addFormat('{dd}-{MM}-{yyyy|yy}');
|
||||
}
|
||||
|
||||
parse(dateStr, localeCode) {console.log('parse', localeCode);
|
||||
return this.suDate.create(dateStr, localeCode);
|
||||
}
|
||||
|
||||
isValid(dateStr, localeCode) {
|
||||
console.log(dateStr, localeCode, this.parse(dateStr, localeCode),
|
||||
this.suDate.isValid(this.parse(dateStr, localeCode)));
|
||||
return this.suDate.isValid(this.parse(dateStr, localeCode));
|
||||
}
|
||||
|
||||
getOptions(colIndex) {
|
||||
let colType = this.tf.colTypes[colIndex];
|
||||
return isObj(colType) ? colType : {};
|
||||
}
|
||||
|
||||
_addConfigFormats() {
|
||||
this.tf.colTypes.forEach((type, idx) => {
|
||||
let options = this.getOptions(idx);
|
||||
if (options.hasOwnProperty('format')) {
|
||||
let locale = this.suDate.getLocale(
|
||||
options.locale || this.locale
|
||||
);
|
||||
console.log(options.format);
|
||||
locale.addFormat(options.format);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -5,9 +5,10 @@ import {
|
|||
} from './dom';
|
||||
import {contains, matchCase, rgxEsc, trim} from './string';
|
||||
import {isEmpty as isEmptyString} from './string';
|
||||
import {isArray, isEmpty, isFn, isNumber, isObj, isString, isUndef}
|
||||
from './types';
|
||||
import {formatDate, isValidDate} from './date';
|
||||
import {
|
||||
isArray, isEmpty, isFn, isNumber, isObj, isString, isUndef
|
||||
} from './types';
|
||||
// import {formatDate, isValidDate} from './date';
|
||||
import {unformat as unformatNb} from './number'
|
||||
|
||||
import {root} from './root';
|
||||
|
|
@ -26,11 +27,13 @@ import {Help} from './modules/help';
|
|||
import {AlternateRows} from './modules/alternateRows';
|
||||
import {NoResults} from './modules/noResults';
|
||||
import {State} from './modules/state';
|
||||
import {DateType} from './modules/dateType';
|
||||
|
||||
import {
|
||||
INPUT, SELECT, MULTIPLE, CHECKLIST, NONE,
|
||||
ENTER_KEY, TAB_KEY, ESC_KEY, UP_ARROW_KEY, DOWN_ARROW_KEY,
|
||||
CELL_TAG, AUTO_FILTER_DELAY, NUMBER, FORMATTED_NUMBER, FORMATTED_NUMBER_EU
|
||||
CELL_TAG, AUTO_FILTER_DELAY, NUMBER, DATE, FORMATTED_NUMBER,
|
||||
FORMATTED_NUMBER_EU
|
||||
} from './const';
|
||||
|
||||
let doc = root.document;
|
||||
|
|
@ -838,11 +841,15 @@ export class TableFilter {
|
|||
this.state = isObj(f.state) || Boolean(f.state);
|
||||
|
||||
/*** data types ***/
|
||||
|
||||
|
||||
this.locale = f.locale || 'en';
|
||||
|
||||
/**
|
||||
* Define default date type (DMY)
|
||||
* @type {String}
|
||||
*/
|
||||
this.defaultDateType = f.default_date_type || 'DMY';
|
||||
this.defaultDateType = f.default_date_type || 'ISO8601';
|
||||
|
||||
/**
|
||||
* Define thousands separator ',' or '.', defaults to ','
|
||||
|
|
@ -861,7 +868,7 @@ export class TableFilter {
|
|||
* @type {Boolean}
|
||||
* @private
|
||||
*/
|
||||
this.hasColDateType = isArray(f.col_date_type);
|
||||
// this.hasColDateType = isArray(f.col_date_type);
|
||||
|
||||
/**
|
||||
* Define date format on a column basis, possible values 'DMY', 'MDY',
|
||||
|
|
@ -869,7 +876,7 @@ export class TableFilter {
|
|||
* col_date_type : [null, 'DMY', 'MDY', 'YMD', null, 'DDMMMYYYY']
|
||||
* @type {Array}
|
||||
*/
|
||||
this.colDateType = this.hasColDateType ? f.col_date_type : null;
|
||||
// this.colDateType = this.hasColDateType ? f.col_date_type : null;
|
||||
|
||||
/**
|
||||
* Determine whether table has columns data types
|
||||
|
|
@ -1020,6 +1027,12 @@ export class TableFilter {
|
|||
this.loadThemes();
|
||||
}
|
||||
|
||||
// Instanciate sugar date wrapper
|
||||
if (!Mod.dateType) {
|
||||
Mod.dateType = new DateType(this);
|
||||
Mod.dateType.init();
|
||||
}
|
||||
|
||||
// Instantiate help feature and initialise only if set true
|
||||
if (!Mod.help) {
|
||||
Mod.help = new Help(this);
|
||||
|
|
@ -1777,12 +1790,15 @@ export class TableFilter {
|
|||
}
|
||||
|
||||
//looks for search argument in current row
|
||||
function hasArg(sA, cellData, j) {
|
||||
function hasArg(sA, cellData, colIdx) {
|
||||
sA = matchCase(sA, this.caseSensitive);
|
||||
|
||||
let occurence;
|
||||
let dtType = this.hasColDateType ?
|
||||
this.colDateType[j] : this.defaultDateType;
|
||||
let dateType = this.Mod.dateType;
|
||||
// let dtType = this.hasColDateType ?
|
||||
// this.colDateType[colIdx] : this.defaultDateType;
|
||||
// let dtType = this.hasType(colIdx, [DATE]) ?
|
||||
// this.colTypes[colIdx] : this.defaultDateType;
|
||||
|
||||
//Search arg operator tests
|
||||
let hasLO = re_l.test(sA),
|
||||
|
|
@ -1800,45 +1816,60 @@ export class TableFilter {
|
|||
hasRE = re_re.test(sA);
|
||||
|
||||
//Search arg dates tests
|
||||
let isLDate = hasLO && isValidDate(sA.replace(re_l, ''), dtType);
|
||||
let isLEDate = hasLE && isValidDate(sA.replace(re_le, ''), dtType);
|
||||
let isGDate = hasGR && isValidDate(sA.replace(re_g, ''), dtType);
|
||||
let isGEDate = hasGE && isValidDate(sA.replace(re_ge, ''), dtType);
|
||||
let isDFDate = hasDF && isValidDate(sA.replace(re_d, ''), dtType);
|
||||
let isEQDate = hasEQ && isValidDate(sA.replace(re_eq, ''), dtType);
|
||||
// let isLDate = hasLO && isValidDate(sA.replace(re_l, ''), dtType);
|
||||
// let isLEDate=hasLE && isValidDate(sA.replace(re_le, ''), dtType);
|
||||
// let isGDate = hasGR && isValidDate(sA.replace(re_g, ''), dtType);
|
||||
// let isGEDate=hasGE && isValidDate(sA.replace(re_ge, ''), dtType);
|
||||
// let isDFDate=hasDF && isValidDate(sA.replace(re_d, ''), dtType);
|
||||
// let isEQDate=hasEQ && isValidDate(sA.replace(re_eq, ''), dtType);
|
||||
let isLDate = hasLO && dateType.isValid(sA.replace(re_l, ''));
|
||||
let isLEDate = hasLE && dateType.isValid(sA.replace(re_le, ''));
|
||||
let isGDate = hasGR && dateType.isValid(sA.replace(re_g, ''));
|
||||
let isGEDate = hasGE && dateType.isValid(sA.replace(re_ge, ''));
|
||||
let isDFDate = hasDF && dateType.isValid(sA.replace(re_d, ''));
|
||||
let isEQDate = hasEQ && dateType.isValid(sA.replace(re_eq, ''));
|
||||
|
||||
let dte1, dte2;
|
||||
//dates
|
||||
if (isValidDate(cellData, dtType)) {
|
||||
dte1 = formatDate(cellData, dtType);
|
||||
if (this.hasType(colIdx, [DATE]) && dateType.isValid(cellData)
|
||||
/*isValidDate(cellData, dtType)*/) {
|
||||
let locale = dateType.getOptions(colIdx).locale || this.locale;
|
||||
// dte1 = formatDate(cellData, dtType);
|
||||
dte1 = dateType.parse(cellData, locale);
|
||||
// lower date
|
||||
if (isLDate) {
|
||||
dte2 = formatDate(sA.replace(re_l, ''), dtType);
|
||||
dte2 = dateType.parse(sA.replace(re_l, ''), locale);
|
||||
// dte2 = formatDate(sA.replace(re_l, ''), dtType);
|
||||
occurence = dte1 < dte2;
|
||||
}
|
||||
// lower equal date
|
||||
else if (isLEDate) {
|
||||
dte2 = formatDate(sA.replace(re_le, ''), dtType);
|
||||
dte2 = dateType.parse(sA.replace(re_le, ''), locale);
|
||||
// dte2 = formatDate(sA.replace(re_le, ''), dtType);
|
||||
occurence = dte1 <= dte2;
|
||||
}
|
||||
// greater equal date
|
||||
else if (isGEDate) {
|
||||
dte2 = formatDate(sA.replace(re_ge, ''), dtType);
|
||||
dte2 = dateType.parse(sA.replace(re_ge, ''), locale);
|
||||
// dte2 = formatDate(sA.replace(re_ge, ''), dtType);
|
||||
occurence = dte1 >= dte2;
|
||||
}
|
||||
// greater date
|
||||
else if (isGDate) {
|
||||
dte2 = formatDate(sA.replace(re_g, ''), dtType);
|
||||
dte2 = dateType.parse(sA.replace(re_g, ''), locale);
|
||||
// dte2 = formatDate(sA.replace(re_g, ''), dtType);
|
||||
occurence = dte1 > dte2;
|
||||
}
|
||||
// different date
|
||||
else if (isDFDate) {
|
||||
dte2 = formatDate(sA.replace(re_d, ''), dtType);
|
||||
dte2 = dateType.parse(sA.replace(re_d, ''), locale);
|
||||
// dte2 = formatDate(sA.replace(re_d, ''), dtType);
|
||||
occurence = dte1.toString() !== dte2.toString();
|
||||
}
|
||||
// equal date
|
||||
else if (isEQDate) {
|
||||
dte2 = formatDate(sA.replace(re_eq, ''), dtType);
|
||||
dte2 = dateType.parse(sA.replace(re_eq, ''), locale);
|
||||
// dte2 = formatDate(sA.replace(re_eq, ''), dtType);
|
||||
occurence = dte1.toString() === dte2.toString();
|
||||
}
|
||||
// searched keyword with * operator doesn't have to be a date
|
||||
|
|
@ -1846,8 +1877,10 @@ export class TableFilter {
|
|||
occurence = contains(sA.replace(re_lk, ''), cellData,
|
||||
false, this.caseSensitive);
|
||||
}
|
||||
else if (isValidDate(sA, dtType)) {
|
||||
dte2 = formatDate(sA, dtType);
|
||||
else if (dateType.isValid(sA)
|
||||
/*isValidDate(sA, dtType)*/) {
|
||||
// dte2 = formatDate(sA, dtType);
|
||||
dte2 = dateType.parse(sA, locale);
|
||||
occurence = dte1.toString() === dte2.toString();
|
||||
}
|
||||
//empty
|
||||
|
|
@ -1858,20 +1891,20 @@ export class TableFilter {
|
|||
else if (hasNM) {
|
||||
occurence = !isEmptyString(cellData);
|
||||
} else {
|
||||
occurence = contains(sA, cellData, this.isExactMatch(j),
|
||||
this.caseSensitive);
|
||||
occurence = contains(sA, cellData,
|
||||
this.isExactMatch(colIdx), this.caseSensitive);
|
||||
}
|
||||
}
|
||||
|
||||
else {
|
||||
//first numbers need to be unformatted
|
||||
if (this.hasType(j, [NUMBER])) {
|
||||
if (this.hasType(colIdx, [NUMBER])) {
|
||||
numCellData = Number(cellData);
|
||||
}
|
||||
else if (this.hasType(j,
|
||||
else if (this.hasType(colIdx,
|
||||
[FORMATTED_NUMBER, FORMATTED_NUMBER_EU])) {
|
||||
numCellData = unformatNb(cellData, this.colTypes[j]);
|
||||
nbFormat = this.colTypes[j];
|
||||
numCellData = unformatNb(cellData, this.colTypes[colIdx]);
|
||||
nbFormat = this.colTypes[colIdx];
|
||||
} else {
|
||||
if (this.thousandsSeparator === ',' &&
|
||||
this.decimalSeparator === '.') {
|
||||
|
|
@ -1964,7 +1997,7 @@ export class TableFilter {
|
|||
// If numeric type data, perform a strict equality test and
|
||||
// fallback to unformatted number string comparison
|
||||
if (numCellData &&
|
||||
this.hasType(j,
|
||||
this.hasType(colIdx,
|
||||
[NUMBER, FORMATTED_NUMBER, FORMATTED_NUMBER_EU]) &&
|
||||
!this.singleSearchFlt) {
|
||||
// unformatNb can return 0 for strings which are not
|
||||
|
|
@ -1973,11 +2006,11 @@ export class TableFilter {
|
|||
sA = unformatNb(sA, nbFormat) || sA;
|
||||
occurence = numCellData === sA ||
|
||||
contains(sA.toString(), numCellData.toString(),
|
||||
this.isExactMatch(j), this.caseSensitive);
|
||||
this.isExactMatch(colIdx), this.caseSensitive);
|
||||
} else {
|
||||
// Finally test search term is contained in cell data
|
||||
occurence = contains(sA, cellData, this.isExactMatch(j),
|
||||
this.caseSensitive);
|
||||
occurence = contains(sA, cellData,
|
||||
this.isExactMatch(colIdx), this.caseSensitive);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2845,8 +2878,14 @@ export class TableFilter {
|
|||
* @returns {Boolean}
|
||||
*/
|
||||
hasType(colIndex, types = []) {
|
||||
return this.hasColTypes &&
|
||||
types.indexOf(this.colTypes[colIndex]) !== -1;
|
||||
if (!this.hasColTypes) {
|
||||
return false;
|
||||
}
|
||||
let colType = this.colTypes[colIndex];
|
||||
if (isObj(colType)) {
|
||||
colType = colType.type;
|
||||
}
|
||||
return types.indexOf(colType) !== -1;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -78,15 +78,17 @@ var tfConfig = {
|
|||
col_types: [
|
||||
null, null, null,
|
||||
'formatted-number-eu', 'formatted-number', null,
|
||||
null, null, null,
|
||||
{ type: 'date', locale: 'fr'/*, format: '{dd}/{MM}/{yyyy}'*/},
|
||||
{ type: 'date', locale: 'en'/*, format: '{MM}/{dd}/{yyyy}'*/},
|
||||
'date',
|
||||
'ipaddress'
|
||||
],
|
||||
col_date_type: [
|
||||
null, null, null,
|
||||
null, null, null,
|
||||
'dmy', 'mdy', 'ddmmmyyyy',
|
||||
null
|
||||
],
|
||||
// col_date_type: [
|
||||
// null, null, null,
|
||||
// null, null, null,
|
||||
// 'dmy', 'mdy', 'ddmmmyyyy',
|
||||
// null
|
||||
// ],
|
||||
rows_always_visible: [totRowIndex],
|
||||
on_filters_loaded: function(o){
|
||||
o.setFilterValue(3, '>1.000');
|
||||
|
|
|
|||
Loading…
Reference in a new issue