deblan-mirror/TableFilter
1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2024-05-21 07:46:42 +02:00
Code Issues Releases Wiki Activity

Added _buildSubmit button method

Browse source
This commit is contained in:
Max Guglielmi 2016-01-09 13:42:33 +11:00
parent 4a7f935272
commit fe2e06e637
13 changed files with 127 additions and 10195 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dist/tablefilter/style/colsVisibility.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.5 by Max Guglielmi
* build date: 2016-01-08T05:07:53.560Z
* build date: 2016-01-09T02:39:28.460Z
* 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
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.5 by Max Guglielmi
* build date: 2016-01-08T05:07:53.560Z
* build date: 2016-01-09T02:39:28.460Z
* 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
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.5 by Max Guglielmi
* build date: 2016-01-08T05:07:53.560Z
* build date: 2016-01-09T02:39:28.460Z
* MIT License
*/
.activeHeader{background-color:#66afe9 !important;color:#fff !important}

2
dist/tablefilter/style/themes/default/default.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.5 by Max Guglielmi
* build date: 2016-01-08T05:07:53.560Z
* build date: 2016-01-09T02:39:28.460Z
* MIT License
*/
table.TF{border-left:1px solid #ccc !important;border-top:none !important;border-right:none !important;border-bottom:none !important;}table.TF th{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;color:#333 !important}table.TF td{border-bottom:1px dotted #999 !important;padding:5px !important}.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}

2
dist/tablefilter/style/themes/mytheme/mytheme.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.5 by Max Guglielmi
* build date: 2016-01-08T05:07:53.560Z
* build date: 2016-01-09T02:39:28.460Z
* MIT License
*/
table.TF{border-left:1px dotted #81963b !important;border-top:none !important;border-right:0 !important;border-bottom:none !important;}table.TF th{background:#39424b url("images/bg_headers.jpg") left top repeat-x !important;border-bottom:0 !important;border-right:1px dotted #d0d0d0 !important;border-left:0 !important;border-top:0 !important;color:#fff !important}table.TF td{border-bottom:1px dotted #81963b;border-right:1px dotted #81963b;padding:5px !important}.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}

2
dist/tablefilter/style/themes/skyblue/skyblue.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.5 by Max Guglielmi
* build date: 2016-01-08T05:07:53.560Z
* build date: 2016-01-09T02:39:28.460Z
* 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}

7962
dist/tablefilter/tablefilter.js vendored
View file

File diff suppressed because one or more lines are too long

2191
dist/tablefilter/tf-1.js vendored
View file

File diff suppressed because one or more lines are too long

22
src/modules/checkList.js
View file

@ -275,7 +275,7 @@ export class CheckList extends Feature{
addChecks(colIndex, ul){
let tf = this.tf;
let chkCt = this.addTChecks(colIndex, ul);
let fltArr = []; //remember grid values
// let fltArr = []; //remember grid values
// let store = tf.feature('store');
// let tmpVal = store ?
// store.getFilterValues(tf.fltsValuesCookie)[colIndex] : null;
@ -312,16 +312,16 @@ export class CheckList extends Feature{
}
/*** remember grid values ***/
if(tf.rememberGridValues){
if((tf.hasCustomSlcOptions &&
tf.customSlcOptions.cols.indexOf(colIndex) != -1 &&
fltArr.toString().indexOf(val) != -1) ||
Arr.has(fltArr,
Str.matchCase(val, tf.matchCase), tf.matchCase)){
li.check.checked = true;
this.setCheckListValues(li.check);
}
}
// if(tf.rememberGridValues){
// if((tf.hasCustomSlcOptions &&
// tf.customSlcOptions.cols.indexOf(colIndex) != -1 &&
// fltArr.toString().indexOf(val) != -1) ||
// Arr.has(fltArr,
// Str.matchCase(val, tf.matchCase), tf.matchCase)){
// li.check.checked = true;
// this.setCheckListValues(li.check);
// }
// }
}
}

43
src/modules/dropdown.js
View file

@ -122,7 +122,7 @@ export class Dropdown extends Feature{
}
/*** remember grid values ***/
let fltsValues = [], fltArr = [];
// let fltsValues = [], fltArr = [];
// if(tf.rememberGridValues){
// fltsValues = tf.feature('store').getFilterValues(
// tf.fltsValuesCookie);
@ -258,7 +258,7 @@ export class Dropdown extends Feature{
//populates drop-down
this.addOptions(
colIndex, slc, isLinked, excludedOpts, fltsValues, fltArr);
colIndex, slc, isLinked, excludedOpts/*, fltsValues, fltArr*/);
this.emitter.emit('after-populating-filter', tf, colIndex, slc);
}
@ -272,7 +272,7 @@ export class Dropdown extends Feature{
* @param {Array} fltsValues Collection of persisted filter values
* @param {Array} fltArr Collection of persisted filter values
*/
addOptions(colIndex, slc, isLinked, excludedOpts, fltsValues, fltArr){
addOptions(colIndex, slc, isLinked, excludedOpts/*, fltsValues, fltArr*/){
let tf = this.tf,
fillMethod = Str.lower(this.slcFillingMethod),
slcValue = slc.value;
@ -311,24 +311,25 @@ export class Dropdown extends Feature{
tf.getFilterType(colIndex) === tf.fltTypeSlc){
opt = Dom.createOpt(lbl, val, true);
} else {
if(tf.getFilterType(colIndex) !== tf.fltTypeMulti){
opt = Dom.createOpt(
lbl,
val,
(fltsValues[colIndex]!==' ' &&
val===fltsValues[colIndex]) ? true : false
);
} else {
opt = Dom.createOpt(
lbl,
val,
(Arr.has(fltArr,
Str.matchCase(this.opts[y], tf.matchCase),
tf.matchCase) ||
fltArr.toString().indexOf(val)!== -1) ?
true : false
);
}
opt = Dom.createOpt(lbl, val, false);
// if(tf.getFilterType(colIndex) !== tf.fltTypeMulti){
// opt = Dom.createOpt(
// lbl,
// val,
// (fltsValues[colIndex]!==' ' &&
// val===fltsValues[colIndex]) ? true : false
// );
// } else {
// opt = Dom.createOpt(
// lbl,
// val,
// (Arr.has(fltArr,
// Str.matchCase(this.opts[y], tf.matchCase),
// tf.matchCase) ||
// fltArr.toString().indexOf(val)!== -1) ?
// true : false
// );
// }
}
if(isDisabled){
opt.disabled = true;

64
src/tablefilter.js
View file

@ -660,9 +660,9 @@ export class TableFilter {
this.emitter.emit('before-filter-init', this, i);
let fltcell = Dom.create(this.fltCellTag),
col = this.getFilterType(i),
col = this.getFilterType(i)/*,
externalFltTgtId = this.isExternalFlt ?
this.externalFltTgtIds[i] : null;
this.externalFltTgtIds[i] : null*/;
if(this.singleSearchFlt){
fltcell.colSpan = this.nbCells;
@ -808,19 +808,20 @@ export class TableFilter {
}
// this adds submit button
if(i==n-1 && this.displayBtn){
let btn = Dom.create(this.fltTypeInp,
['id', this.prfxValButton+i+'_'+this.id],
['type', 'button'], ['value', this.btnText]);
btn.className = this.btnCssClass;
this._buildSubmitButton(i, fltcell);
// let btn = Dom.create(this.fltTypeInp,
// ['id', this.prfxValButton+i+'_'+this.id],
// ['type', 'button'], ['value', this.btnText]);
// btn.className = this.btnCssClass;
//filter is appended in desired element
if(externalFltTgtId){
Dom.id(externalFltTgtId).appendChild(btn);
} else{
fltcell.appendChild(btn);
}
// //filter is appended in desired element
// if(externalFltTgtId){
// Dom.id(externalFltTgtId).appendChild(btn);
// } else{
// fltcell.appendChild(btn);
// }
Event.add(btn, 'click', ()=> this.filter());
// Event.add(btn, 'click', ()=> this.filter());
}//if
this.emitter.emit('after-filter-init', this, i);
@ -912,6 +913,9 @@ export class TableFilter {
this.emitter.emit('initialized', this);
}
/**
* Insert filters row at initialization
*/
_insertFiltersRow() {
if(this.gridLayout){
return;
@ -941,6 +945,9 @@ export class TableFilter {
return fltrow;
}
/**
* Initialize filtersless table
*/
_initNoFilters(){
if(this.fltGrid){
return;
@ -954,6 +961,12 @@ export class TableFilter {
this.nbRows = this.nbFilterableRows + this.refRow;
}
/**
* Build input filter type
* @param {Number} colIndex Column index
* @param {String} cssClass Css class applied to filter
* @param {DOMElement} container Container DOM element
*/
_buildInputFilter(colIndex, cssClass, container){
let col = this.getFilterType(colIndex);
let externalFltTgtId = this.isExternalFlt ?
@ -995,6 +1008,29 @@ export class TableFilter {
// }
}
/**
* Build submit button
* @param {Number} colIndex Column index
* @param {DOMElement} container Container DOM element
*/
_buildSubmitButton(colIndex, container){
let externalFltTgtId = this.isExternalFlt ?
this.externalFltTgtIds[colIndex] : null;
let btn = Dom.create(this.fltTypeInp,
['id', this.prfxValButton+colIndex+'_'+this.id],
['type', 'button'], ['value', this.btnText]);
btn.className = this.btnCssClass;
//filter is appended in desired element
if(externalFltTgtId){
Dom.id(externalFltTgtId).appendChild(btn);
} else{
container.appendChild(btn);
}
Event.add(btn, 'click', ()=> this.filter());
}
/**
* Return a feature instance for a given name
* @param {String} name Name of the feature
@ -1157,7 +1193,7 @@ export class TableFilter {
let rows = this.tbl.rows,
Mod = this.Mod;
this.clearFilters();
// this.clearFilters();
if(this.isExternalFlt && !this.popupFilters){
this.removeExternalFlts();

7
static/templates/grouped-headers.html
View file

@ -36,9 +36,10 @@
<script data-config>
var tfConfig = {
base_path: '../dist/tablefilter/',
col_0: "multiple",
col_1: "select",
col_2: "checklist",
btn: true,
col_0: 'multiple',
col_1: 'select',
col_2: 'checklist',
col_number_format: [
null, null, 'US',
'US', 'US', 'US',

21
test/test-store.js
View file

@ -57,17 +57,32 @@ test('Page length value', function() {
});
module('Check filters persistence');
test('Filters value', function() {
test('Filters value in cookie', function() {
tf.setFilterValue(0, 'Sydney');
tf.setFilterValue(3, '1.5');
tf.filter();
var cookieName = tf.fltsValuesCookie;
deepEqual(tf.feature('store').getFilterValues(cookieName)[0], 'Sydney', 'Filter 0 value');
deepEqual(tf.feature('store').getFilterValues(cookieName)[3], '1.5', 'Filter 3 value');
tf.destroy();
});
test('Apply cookie filters value', function() {
tf.setFilterValue(0, 'Adelaide');
tf.setFilterValue(3, '>=2');
tf.filter();
tf.destroy();
tf.init();
deepEqual(tf.getFilterValue(0), 'Adelaide', 'Applied filter value');
deepEqual(tf.getFilterValue(3), '>=2', 'Applied filter value');
});
module('Tear-down');
test('TableFilter removed', function() {
tf.destroy();
removeCookie(tf.fltsValuesCookie);
removeCookie(tf.pgNbCookie);
removeCookie(tf.pgLenCookie);
});
deepEqual(tf.hasGrid(), false, 'Filters removed');
});