mirror of
https://github.com/koalyptus/TableFilter.git
synced 2024-05-17 05:46:39 +02:00
Refactored date helper module
This commit is contained in:
Max Guglielmi
parent
b6c4fd6675
commit
3434185dbe
4
dist/starter.html
vendored
4
dist/starter.html
vendored
|
|
@ -1,10 +1,10 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>tablefilter v0.2.29 - Starter</title>
|
||||
<title>tablefilter v0.2.30 - Starter</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>tablefilter v0.2.29</h1>
|
||||
<h1>tablefilter v0.2.30</h1>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
2
dist/tablefilter/style/colsVisibility.css
vendored
2
dist/tablefilter/style/colsVisibility.css
vendored
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.30 by Max Guglielmi
|
||||
* build date: 2016-05-20T06:47:31.896Z
|
||||
* build date: 2016-05-21T01:26:55.419Z
|
||||
* 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.2.30 by Max Guglielmi
|
||||
* build date: 2016-05-20T06:47:31.896Z
|
||||
* build date: 2016-05-21T01:26:55.419Z
|
||||
* 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.2.30 by Max Guglielmi
|
||||
* build date: 2016-05-20T06:47:31.896Z
|
||||
* build date: 2016-05-21T01:26:55.419Z
|
||||
* MIT License
|
||||
*/
|
||||
.activeHeader{background-color:#66afe9 !important;color:#fff !important}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.30 by Max Guglielmi
|
||||
* build date: 2016-05-20T06:47:31.896Z
|
||||
* build date: 2016-05-21T01:26:55.419Z
|
||||
* 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.2.30 by Max Guglielmi
|
||||
* build date: 2016-05-20T06:47:31.896Z
|
||||
* build date: 2016-05-21T01:26:55.419Z
|
||||
* 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.2.30 by Max Guglielmi
|
||||
* build date: 2016-05-20T06:47:31.896Z
|
||||
* build date: 2016-05-21T01:26:55.419Z
|
||||
* 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}
|
||||
8179
dist/tablefilter/tablefilter.js
vendored
8179
dist/tablefilter/tablefilter.js
vendored
File diff suppressed because one or more lines are too long
2367
dist/tablefilter/tf-1.js
vendored
2367
dist/tablefilter/tf-1.js
vendored
File diff suppressed because one or more lines are too long
273
src/date.js
273
src/date.js
|
|
@ -2,170 +2,169 @@
|
|||
* Date utilities
|
||||
*/
|
||||
|
||||
export default {
|
||||
isValid(dateStr, format){
|
||||
if(!format) {
|
||||
format = 'DMY';
|
||||
}
|
||||
format = format.toUpperCase();
|
||||
if(format.length !== 3) {
|
||||
if(format === 'DDMMMYYYY'){
|
||||
let d = this.format(dateStr, format);
|
||||
dateStr = d.getDate() +'/'+ (d.getMonth()+1) +'/'+
|
||||
d.getFullYear();
|
||||
format = 'DMY';
|
||||
}
|
||||
}
|
||||
if((format.indexOf('M') === -1) || (format.indexOf('D') === -1) ||
|
||||
(format.indexOf('Y') === -1)){
|
||||
format = 'DMY';
|
||||
}
|
||||
let reg1, reg2;
|
||||
// If the year is first
|
||||
if(format.substring(0, 1) === 'Y') {
|
||||
reg1 = /^\d{2}(\-|\/|\.)\d{1,2}\1\d{1,2}$/;
|
||||
reg2 = /^\d{4}(\-|\/|\.)\d{1,2}\1\d{1,2}$/;
|
||||
} else if(format.substring(1, 2) === 'Y') { // If the year is second
|
||||
reg1 = /^\d{1,2}(\-|\/|\.)\d{2}\1\d{1,2}$/;
|
||||
reg2 = /^\d{1,2}(\-|\/|\.)\d{4}\1\d{1,2}$/;
|
||||
} else { // The year must be third
|
||||
reg1 = /^\d{1,2}(\-|\/|\.)\d{1,2}\1\d{2}$/;
|
||||
reg2 = /^\d{1,2}(\-|\/|\.)\d{1,2}\1\d{4}$/;
|
||||
}
|
||||
// If it doesn't conform to the right format (with either a 2 digit year
|
||||
// or 4 digit year), fail
|
||||
if(reg1.test(dateStr) === false && reg2.test(dateStr) === false) {
|
||||
return false;
|
||||
}
|
||||
// Split into 3 parts based on what the divider was
|
||||
let parts = dateStr.split(RegExp.$1);
|
||||
let mm, dd, yy;
|
||||
// Check to see if the 3 parts end up making a valid date
|
||||
if(format.substring(0, 1) === 'M'){
|
||||
mm = parts[0];
|
||||
} else if(format.substring(1, 2) === 'M'){
|
||||
mm = parts[1];
|
||||
} else {
|
||||
mm = parts[2];
|
||||
}
|
||||
if(format.substring(0, 1) === 'D'){
|
||||
dd = parts[0];
|
||||
} else if(format.substring(1, 2) === 'D'){
|
||||
dd = parts[1];
|
||||
} else {
|
||||
dd = parts[2];
|
||||
}
|
||||
if(format.substring(0, 1) === 'Y'){
|
||||
yy = parts[0];
|
||||
} else if(format.substring(1, 2) === 'Y'){
|
||||
yy = parts[1];
|
||||
} else {
|
||||
yy = parts[2];
|
||||
}
|
||||
if(parseInt(yy, 10) <= 50){
|
||||
yy = (parseInt(yy, 10) + 2000).toString();
|
||||
}
|
||||
if(parseInt(yy, 10) <= 99){
|
||||
yy = (parseInt(yy, 10) + 1900).toString();
|
||||
}
|
||||
let dt = new Date(
|
||||
parseInt(yy, 10), parseInt(mm, 10)-1, parseInt(dd, 10),
|
||||
0, 0, 0, 0);
|
||||
if(parseInt(dd, 10) !== dt.getDate()){
|
||||
return false;
|
||||
}
|
||||
if(parseInt(mm, 10)-1 !== dt.getMonth()){
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
},
|
||||
format(dateStr, formatStr) {
|
||||
if(!formatStr){
|
||||
formatStr = 'DMY';
|
||||
}
|
||||
if(!dateStr || dateStr === ''){
|
||||
return new Date(1001, 0, 1);
|
||||
}
|
||||
let oDate;
|
||||
let parts;
|
||||
|
||||
switch(formatStr.toUpperCase()){
|
||||
case 'DDMMMYYYY':
|
||||
parts = dateStr.replace(/[- \/.]/g,' ').split(' ');
|
||||
oDate = new Date(y2kDate(parts[2]),mmm2mm(parts[1])-1,parts[0]);
|
||||
break;
|
||||
case 'DMY':
|
||||
/* eslint-disable */
|
||||
parts = dateStr.replace(
|
||||
/^(0?[1-9]|[12][0-9]|3[01])([- \/.])(0?[1-9]|1[012])([- \/.])((\d\d)?\d\d)$/,'$1 $3 $5').split(' ');
|
||||
oDate = new Date(y2kDate(parts[2]),parts[1]-1,parts[0]);
|
||||
/* eslint-enable */
|
||||
break;
|
||||
case 'MDY':
|
||||
/* eslint-disable */
|
||||
parts = dateStr.replace(
|
||||
/^(0?[1-9]|1[012])([- \/.])(0?[1-9]|[12][0-9]|3[01])([- \/.])((\d\d)?\d\d)$/,'$1 $3 $5').split(' ');
|
||||
oDate = new Date(y2kDate(parts[2]),parts[0]-1,parts[1]);
|
||||
/* eslint-enable */
|
||||
break;
|
||||
case 'YMD':
|
||||
/* eslint-disable */
|
||||
parts = dateStr.replace(/^((\d\d)?\d\d)([- \/.])(0?[1-9]|1[012])([- \/.])(0?[1-9]|[12][0-9]|3[01])$/,'$1 $4 $6').split(' ');
|
||||
oDate = new Date(y2kDate(parts[0]),parts[1]-1,parts[2]);
|
||||
/* eslint-enable */
|
||||
break;
|
||||
default: //in case format is not correct
|
||||
/* eslint-disable */
|
||||
parts = dateStr.replace(/^(0?[1-9]|[12][0-9]|3[01])([- \/.])(0?[1-9]|1[012])([- \/.])((\d\d)?\d\d)$/,'$1 $3 $5').split(' ');
|
||||
oDate = new Date(y2kDate(parts[2]),parts[1]-1,parts[0]);
|
||||
/* eslint-enable */
|
||||
break;
|
||||
}
|
||||
return oDate;
|
||||
export const isValidDate = (dateStr, format) => {
|
||||
if (!format) {
|
||||
format = 'DMY';
|
||||
}
|
||||
};
|
||||
format = format.toUpperCase();
|
||||
if (format.length !== 3) {
|
||||
if (format === 'DDMMMYYYY') {
|
||||
let d = formatDate(dateStr, format);
|
||||
dateStr = d.getDate() + '/' + (d.getMonth() + 1) + '/' +
|
||||
d.getFullYear();
|
||||
format = 'DMY';
|
||||
}
|
||||
}
|
||||
if ((format.indexOf('M') === -1) || (format.indexOf('D') === -1) ||
|
||||
(format.indexOf('Y') === -1)) {
|
||||
format = 'DMY';
|
||||
}
|
||||
let reg1, reg2;
|
||||
// If the year is first
|
||||
if (format.substring(0, 1) === 'Y') {
|
||||
reg1 = /^\d{2}(\-|\/|\.)\d{1,2}\1\d{1,2}$/;
|
||||
reg2 = /^\d{4}(\-|\/|\.)\d{1,2}\1\d{1,2}$/;
|
||||
} else if (format.substring(1, 2) === 'Y') { // If the year is second
|
||||
reg1 = /^\d{1,2}(\-|\/|\.)\d{2}\1\d{1,2}$/;
|
||||
reg2 = /^\d{1,2}(\-|\/|\.)\d{4}\1\d{1,2}$/;
|
||||
} else { // The year must be third
|
||||
reg1 = /^\d{1,2}(\-|\/|\.)\d{1,2}\1\d{2}$/;
|
||||
reg2 = /^\d{1,2}(\-|\/|\.)\d{1,2}\1\d{4}$/;
|
||||
}
|
||||
// If it doesn't conform to the right format (with either a 2 digit year
|
||||
// or 4 digit year), fail
|
||||
if (reg1.test(dateStr) === false && reg2.test(dateStr) === false) {
|
||||
return false;
|
||||
}
|
||||
// Split into 3 parts based on what the divider was
|
||||
let parts = dateStr.split(RegExp.$1);
|
||||
let mm, dd, yy;
|
||||
// Check to see if the 3 parts end up making a valid date
|
||||
if (format.substring(0, 1) === 'M') {
|
||||
mm = parts[0];
|
||||
} else if (format.substring(1, 2) === 'M') {
|
||||
mm = parts[1];
|
||||
} else {
|
||||
mm = parts[2];
|
||||
}
|
||||
if (format.substring(0, 1) === 'D') {
|
||||
dd = parts[0];
|
||||
} else if (format.substring(1, 2) === 'D') {
|
||||
dd = parts[1];
|
||||
} else {
|
||||
dd = parts[2];
|
||||
}
|
||||
if (format.substring(0, 1) === 'Y') {
|
||||
yy = parts[0];
|
||||
} else if (format.substring(1, 2) === 'Y') {
|
||||
yy = parts[1];
|
||||
} else {
|
||||
yy = parts[2];
|
||||
}
|
||||
if (parseInt(yy, 10) <= 50) {
|
||||
yy = (parseInt(yy, 10) + 2000).toString();
|
||||
}
|
||||
if (parseInt(yy, 10) <= 99) {
|
||||
yy = (parseInt(yy, 10) + 1900).toString();
|
||||
}
|
||||
let dt = new Date(
|
||||
parseInt(yy, 10), parseInt(mm, 10) - 1, parseInt(dd, 10),
|
||||
0, 0, 0, 0);
|
||||
if (parseInt(dd, 10) !== dt.getDate()) {
|
||||
return false;
|
||||
}
|
||||
if (parseInt(mm, 10) - 1 !== dt.getMonth()) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function y2kDate(yr){
|
||||
if(yr === undefined){
|
||||
export const formatDate = (dateStr, formatStr) => {
|
||||
if (!formatStr) {
|
||||
formatStr = 'DMY';
|
||||
}
|
||||
if (!dateStr || dateStr === '') {
|
||||
return new Date(1001, 0, 1);
|
||||
}
|
||||
let oDate;
|
||||
let parts;
|
||||
|
||||
switch (formatStr.toUpperCase()) {
|
||||
case 'DDMMMYYYY':
|
||||
parts = dateStr.replace(/[- \/.]/g, ' ').split(' ');
|
||||
oDate = new Date(y2kDate(parts[2]), mmm2mm(parts[1]) - 1, parts[0]);
|
||||
break;
|
||||
case 'DMY':
|
||||
/* eslint-disable */
|
||||
parts = dateStr.replace(
|
||||
/^(0?[1-9]|[12][0-9]|3[01])([- \/.])(0?[1-9]|1[012])([- \/.])((\d\d)?\d\d)$/, '$1 $3 $5').split(' ');
|
||||
oDate = new Date(y2kDate(parts[2]), parts[1] - 1, parts[0]);
|
||||
/* eslint-enable */
|
||||
break;
|
||||
case 'MDY':
|
||||
/* eslint-disable */
|
||||
parts = dateStr.replace(
|
||||
/^(0?[1-9]|1[012])([- \/.])(0?[1-9]|[12][0-9]|3[01])([- \/.])((\d\d)?\d\d)$/, '$1 $3 $5').split(' ');
|
||||
oDate = new Date(y2kDate(parts[2]), parts[0] - 1, parts[1]);
|
||||
/* eslint-enable */
|
||||
break;
|
||||
case 'YMD':
|
||||
/* eslint-disable */
|
||||
parts = dateStr.replace(/^((\d\d)?\d\d)([- \/.])(0?[1-9]|1[012])([- \/.])(0?[1-9]|[12][0-9]|3[01])$/, '$1 $4 $6').split(' ');
|
||||
oDate = new Date(y2kDate(parts[0]), parts[1] - 1, parts[2]);
|
||||
/* eslint-enable */
|
||||
break;
|
||||
default: //in case format is not correct
|
||||
/* eslint-disable */
|
||||
parts = dateStr.replace(/^(0?[1-9]|[12][0-9]|3[01])([- \/.])(0?[1-9]|1[012])([- \/.])((\d\d)?\d\d)$/, '$1 $3 $5').split(' ');
|
||||
oDate = new Date(y2kDate(parts[2]), parts[1] - 1, parts[0]);
|
||||
/* eslint-enable */
|
||||
break;
|
||||
}
|
||||
return oDate;
|
||||
}
|
||||
|
||||
function y2kDate(yr) {
|
||||
if (yr === undefined) {
|
||||
return 0;
|
||||
}
|
||||
if(yr.length>2){
|
||||
if (yr.length > 2) {
|
||||
return yr;
|
||||
}
|
||||
let y;
|
||||
//>50 belong to 1900
|
||||
if(yr <= 99 && yr>50){
|
||||
if (yr <= 99 && yr > 50) {
|
||||
y = '19' + yr;
|
||||
}
|
||||
//<50 belong to 2000
|
||||
if(yr<50 || yr === '00'){
|
||||
if (yr < 50 || yr === '00') {
|
||||
y = '20' + yr;
|
||||
}
|
||||
return y;
|
||||
}
|
||||
|
||||
function mmm2mm(mmm){
|
||||
if(mmm === undefined){
|
||||
function mmm2mm(mmm) {
|
||||
if (mmm === undefined) {
|
||||
return 0;
|
||||
}
|
||||
let mondigit;
|
||||
let MONTH_NAMES = [
|
||||
'january','february','march','april','may','june','july',
|
||||
'august','september','october','november','december',
|
||||
'jan','feb','mar','apr','may','jun','jul','aug','sep','oct',
|
||||
'nov','dec'
|
||||
'january', 'february', 'march', 'april', 'may', 'june', 'july',
|
||||
'august', 'september', 'october', 'november', 'december',
|
||||
'jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', 'aug', 'sep', 'oct',
|
||||
'nov', 'dec'
|
||||
];
|
||||
for(let m_i=0; m_i < MONTH_NAMES.length; m_i++){
|
||||
for (let m_i = 0; m_i < MONTH_NAMES.length; m_i++) {
|
||||
let month_name = MONTH_NAMES[m_i];
|
||||
if (mmm.toLowerCase() === month_name){
|
||||
mondigit = m_i+1;
|
||||
if (mmm.toLowerCase() === month_name) {
|
||||
mondigit = m_i + 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(mondigit > 11 || mondigit < 23){
|
||||
if (mondigit > 11 || mondigit < 23) {
|
||||
mondigit = mondigit - 12;
|
||||
}
|
||||
if(mondigit < 1 || mondigit > 12){
|
||||
if (mondigit < 1 || mondigit > 12) {
|
||||
return 0;
|
||||
}
|
||||
return mondigit;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import {Feature} from '../../feature';
|
|||
import {isArray, isFn, isUndef} from '../../types';
|
||||
import Dom from '../../dom';
|
||||
import Event from '../../event';
|
||||
import DateHelper from '../../date';
|
||||
import {formatDate} from '../../date';
|
||||
import {removeNbFormat} from '../../helpers';
|
||||
import {NONE, CELL_TAG, HEADER_TAG} from '../../const';
|
||||
|
||||
|
|
@ -388,7 +388,7 @@ function euNumberConverter(s) {
|
|||
return removeNbFormat(s, 'eu');
|
||||
}
|
||||
function dateConverter(s, format) {
|
||||
return DateHelper.format(s, format);
|
||||
return formatDate(s, format);
|
||||
}
|
||||
function dmyDateConverter(s) {
|
||||
return dateConverter(s, 'DMY');
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import {contains, matchCase, rgxEsc, trim} from './string';
|
|||
import {isEmpty as isEmptyString} from './string';
|
||||
import {isArray, isEmpty, isFn, isNumber, isObj, isString, isUndef}
|
||||
from './types';
|
||||
import DateHelper from './date';
|
||||
import {formatDate, isValidDate} from './date';
|
||||
import {removeNbFormat} from './helpers';
|
||||
|
||||
import {root} from './root';
|
||||
|
|
@ -1205,51 +1205,45 @@ export class TableFilter {
|
|||
hasRE = re_re.test(sA);
|
||||
|
||||
//Search arg dates tests
|
||||
let isLDate = hasLO &&
|
||||
DateHelper.isValid(sA.replace(re_l, ''), dtType);
|
||||
let isLEDate = hasLE &&
|
||||
DateHelper.isValid(sA.replace(re_le, ''), dtType);
|
||||
let isGDate = hasGR &&
|
||||
DateHelper.isValid(sA.replace(re_g, ''), dtType);
|
||||
let isGEDate = hasGE &&
|
||||
DateHelper.isValid(sA.replace(re_ge, ''), dtType);
|
||||
let isDFDate = hasDF &&
|
||||
DateHelper.isValid(sA.replace(re_d, ''), dtType);
|
||||
let isEQDate = hasEQ &&
|
||||
DateHelper.isValid(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 dte1, dte2;
|
||||
//dates
|
||||
if (DateHelper.isValid(cellData, dtType)) {
|
||||
dte1 = DateHelper.format(cellData, dtType);
|
||||
if (isValidDate(cellData, dtType)) {
|
||||
dte1 = formatDate(cellData, dtType);
|
||||
// lower date
|
||||
if (isLDate) {
|
||||
dte2 = DateHelper.format(sA.replace(re_l, ''), dtType);
|
||||
dte2 = formatDate(sA.replace(re_l, ''), dtType);
|
||||
occurence = dte1 < dte2;
|
||||
}
|
||||
// lower equal date
|
||||
else if (isLEDate) {
|
||||
dte2 = DateHelper.format(sA.replace(re_le, ''), dtType);
|
||||
dte2 = formatDate(sA.replace(re_le, ''), dtType);
|
||||
occurence = dte1 <= dte2;
|
||||
}
|
||||
// greater equal date
|
||||
else if (isGEDate) {
|
||||
dte2 = DateHelper.format(sA.replace(re_ge, ''), dtType);
|
||||
dte2 = formatDate(sA.replace(re_ge, ''), dtType);
|
||||
occurence = dte1 >= dte2;
|
||||
}
|
||||
// greater date
|
||||
else if (isGDate) {
|
||||
dte2 = DateHelper.format(sA.replace(re_g, ''), dtType);
|
||||
dte2 = formatDate(sA.replace(re_g, ''), dtType);
|
||||
occurence = dte1 > dte2;
|
||||
}
|
||||
// different date
|
||||
else if (isDFDate) {
|
||||
dte2 = DateHelper.format(sA.replace(re_d, ''), dtType);
|
||||
dte2 = formatDate(sA.replace(re_d, ''), dtType);
|
||||
occurence = dte1.toString() !== dte2.toString();
|
||||
}
|
||||
// equal date
|
||||
else if (isEQDate) {
|
||||
dte2 = DateHelper.format(sA.replace(re_eq, ''), dtType);
|
||||
dte2 = formatDate(sA.replace(re_eq, ''), dtType);
|
||||
occurence = dte1.toString() === dte2.toString();
|
||||
}
|
||||
// searched keyword with * operator doesn't have to be a date
|
||||
|
|
@ -1257,8 +1251,8 @@ export class TableFilter {
|
|||
occurence = contains(sA.replace(re_lk, ''), cellData,
|
||||
false, this.caseSensitive);
|
||||
}
|
||||
else if (DateHelper.isValid(sA, dtType)) {
|
||||
dte2 = DateHelper.format(sA, dtType);
|
||||
else if (isValidDate(sA, dtType)) {
|
||||
dte2 = formatDate(sA, dtType);
|
||||
occurence = dte1.toString() === dte2.toString();
|
||||
}
|
||||
//empty
|
||||
|
|
|
|||
Loading…
Reference in a new issue