deblan-mirror/TableFilter
1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2024-05-10 02:16:40 +02:00
Code Issues Releases Wiki Activity

Added tests to drop-down filter module

Browse source
This commit is contained in:
Max Guglielmi 2015-02-15 15:04:57 +11:00
parent c121f730af
commit 28181a5646
10 changed files with 179 additions and 335 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dist/filtergrid.css vendored
View file

@ -1,6 +1,6 @@
/*------------------------------------------------------------------------
- TableFilter stylesheet by Max Guglielmi
- (build date: Sun Feb 15 2015 14:22:06)
- (build date: Sun Feb 15 2015 15:02:22)
- Edit below for your projects' needs
------------------------------------------------------------------------*/

10
dist/tablefilter.js vendored
View file

File diff suppressed because one or more lines are too long

58
src-es6/modules/checkList.js
View file

@ -119,36 +119,38 @@ export class CheckList{
var ncells = cells.length;
// checks if row has exact cell #
if(ncells === tf.nbCells && !this.isCustom){
// this loop retrieves cell data
for(var j=0; j<ncells; j++){
if((colIndex===j && (!tf.refreshFilters ||
(tf.refreshFilters && tf.disableExcludedOptions)))||
(colIndex===j && tf.refreshFilters &&
((rows[k].style.display === '' && !tf.paging) ||
(tf.paging && ((!activeFlt || activeFlt===colIndex )||
(activeFlt!=colIndex &&
array.has(tf.validRowsIndex, k))) )))){
var cell_data = tf.GetCellData(j, cells[j]);
//Vary Peter's patch
var cell_string = Str.matchCase(
cell_data, tf.matchCase);
// checks if celldata is already in array
if(!array.has(this.opts, cell_string, tf.matchCase)){
this.opts.push(cell_data);
if(ncells !== tf.nbCells || this.isCustom){
continue;
}
// this loop retrieves cell data
for(var j=0; j<ncells; j++){
if((colIndex===j && (!tf.refreshFilters ||
(tf.refreshFilters && tf.disableExcludedOptions)))||
(colIndex===j && tf.refreshFilters &&
((rows[k].style.display === '' && !tf.paging) ||
(tf.paging && ((!activeFlt || activeFlt===colIndex )||
(activeFlt!=colIndex &&
array.has(tf.validRowsIndex, k))) )))){
var cell_data = tf.GetCellData(j, cells[j]);
//Vary Peter's patch
var cell_string = Str.matchCase(
cell_data, tf.matchCase);
// checks if celldata is already in array
if(!array.has(this.opts, cell_string, tf.matchCase)){
this.opts.push(cell_data);
}
var filteredCol = filteredDataCol[j];
if(tf.refreshFilters && tf.disableExcludedOptions){
if(!filteredCol){
filteredDataCol[j] = tf.GetFilteredDataCol(j);
}
var filteredCol = filteredDataCol[j];
if(tf.refreshFilters && tf.disableExcludedOptions){
if(!filteredCol){
filteredDataCol[j] = tf.GetFilteredDataCol(j);
}
if(!array.has(filteredCol,
if(!array.has(filteredCol,
cell_string, tf.matchCase) &&
!array.has(excludedOpts,
cell_string, tf.matchCase) &&
!array.has(excludedOpts,
cell_string, tf.matchCase) &&
!tf.isFirstLoad){
excludedOpts.push(cell_data);
}
!tf.isFirstLoad){
excludedOpts.push(cell_data);
}
}
}

279
src/core.js
View file

@ -772,7 +772,6 @@ function TableFilter(id) {
// select is populated when element has focus
if(o.fillSlcOnDemand && this.getAttribute('filled') === '0'){
var ct = this.getAttribute('ct');
// o.PopulateSelect(ct);
o.Cpt.dropdown._build(ct);
}
if(o.popUpFilters){
@ -1021,20 +1020,15 @@ TableFilter.prototype = {
this.fltIds.push(this.prfxFlt+i+'_'+this.id);
if(!this.fillSlcOnDemand){
// this._PopulateSelect(i);
dropdown._build(i);
}
// slc.onkeypress = this.Evt._DetectKey;
evt.add(slc, 'keypress', this.Evt._DetectKey);
// slc.onchange = this.Evt._OnSlcChange;
evt.add(slc, 'change', this.Evt._OnSlcChange);
// slc.onfocus = this.Evt._OnSlcFocus;
evt.add(slc, 'focus', this.Evt._OnSlcFocus);
// slc.onblur = this.Evt._OnSlcBlur;
evt.add(slc, 'blur', this.Evt._OnSlcBlur);
//1st option is created here since PopulateSelect isn't
//1st option is created here since dropdown.build isn't
//invoked
if(this.fillSlcOnDemand){
var opt0 = dom.createOpt(this.displayAllText, '');
@ -1240,10 +1234,8 @@ TableFilter.prototype = {
break;
case o.Evt.name.dropdown:
if(o.refreshFilters){
// o._PopulateSelect(slcIndex, true);
o.Cpt.dropdown._build(slcIndex, true);
} else {
// o._PopulateSelect(slcIndex, false, slcExternal, slcId);
o.Cpt.dropdown._build(
slcIndex, false, slcExternal, slcId);
}
@ -2146,266 +2138,6 @@ TableFilter.prototype = {
}
},
// PopulateSelect: function(colIndex,isExternal,extSlcId){
// this.EvtManager(
// this.Evt.name.dropdown,
// { slcIndex:colIndex, slcExternal:isExternal, slcId:extSlcId }
// );
// },
/*====================================================
- populates drop-down filters
=====================================================*/
// _PopulateSelect: function(colIndex,isRefreshed,isExternal,extSlcId) {
// isExternal = isExternal===undefined ? false : isExternal;
// var slcId = this.fltIds[colIndex];
// if((!dom.id(slcId) && !isExternal) ||
// (!dom.id(extSlcId) && isExternal)){
// return;
// }
// var slc = !isExternal ? dom.id(slcId) : dom.id(extSlcId),
// o = this,
// row = this.tbl.rows,
// matchCase = this.matchCase,
// fillMethod = str.lower(this.slcFillingMethod),
// optArray = [],
// slcInnerHtml = '',
// opt0,
// //custom select test
// isCustomSlc = (this.hasCustomSlcOptions &&
// array.has(this.customSlcOptions.cols, colIndex));
// //custom selects text
// var optTxt = [],
// activeFlt;
// if(isRefreshed && this.activeFilterId){
// activeFlt = this.activeFilterId.split('_')[0];
// activeFlt = activeFlt.split(this.prfxFlt)[1];
// }
// /*** remember grid values ***/
// var flts_values = [], fltArr = [];
// if(this.rememberGridValues){
// // flts_values = cookie.valueToArray(
// // this.fltsValuesCookie, this.separator);
// flts_values = this.Cpt.store.getFilterValues(this.fltsValuesCookie);
// if(flts_values && !str.isEmpty(flts_values.toString())){
// if(isCustomSlc){
// fltArr.push(flts_values[colIndex]);
// } else {
// fltArr = flts_values[colIndex].split(' '+o.orOperator+' ');
// }
// }
// }
// var excludedOpts = null,
// filteredDataCol = null;
// if(isRefreshed && this.disableExcludedOptions){
// excludedOpts = [];
// filteredDataCol = [];
// }
// for(var k=this.refRow; k<this.nbRows; k++){
// // always visible rows don't need to appear on selects as always
// // valid
// if(this.hasVisibleRows && array.has(this.visibleRows, k) &&
// !this.paging){
// continue;
// }
// var cell = row[k].cells,
// nchilds = cell.length;
// // checks if row has exact cell #
// if(nchilds === this.nbCells && !isCustomSlc){
// // this loop retrieves cell data
// for(var j=0; j<nchilds; j++){
// if((colIndex===j &&
// (!isRefreshed ||
// (isRefreshed && this.disableExcludedOptions))) ||
// (colIndex==j && isRefreshed &&
// ((row[k].style.display === '' && !this.paging) ||
// (this.paging && (!this.validRowsIndex ||
// (this.validRowsIndex &&
// array.has(this.validRowsIndex, k))) &&
// ((activeFlt===undefined || activeFlt==colIndex) ||
// (activeFlt!=colIndex &&
// array.has(this.validRowsIndex, k) ))) ))){
// var cell_data = this.GetCellData(j, cell[j]),
// //Vary Peter's patch
// cell_string = str.matchCase(cell_data, matchCase);
// // checks if celldata is already in array
// if(!array.has(optArray, cell_string, matchCase)){
// optArray.push(cell_data);
// }
// if(isRefreshed && this.disableExcludedOptions){
// var filteredCol = filteredDataCol[j];
// if(!filteredCol){
// filteredCol = this.GetFilteredDataCol(j);
// }
// if(!array.has(filteredCol,cell_string, matchCase) &&
// !array.has(
// excludedOpts,cell_string,matchCase) &&
// !this.isFirstLoad){
// excludedOpts.push(cell_data);
// }
// }
// }//if colIndex==j
// }//for j
// }//if
// }//for k
// //Retrieves custom values
// if(isCustomSlc){
// var customValues = this.__getCustomValues(colIndex);
// optArray = customValues[0];
// optTxt = customValues[1];
// }
// if(this.sortSlc && !isCustomSlc){
// if (!matchCase){
// optArray.sort(Sort.ignoreCase);
// if(excludedOpts){
// excludedOpts.sort(Sort.ignoreCase);
// }
// } else {
// optArray.sort();
// if(excludedOpts){ excludedOpts.sort(); }
// }
// }
// //asc sort
// if(this.sortNumAsc && array.has(this.sortNumAsc, colIndex)){
// try{
// optArray.sort( numSortAsc );
// if(excludedOpts){
// excludedOpts.sort( numSortAsc );
// }
// if(isCustomSlc){
// optTxt.sort( numSortAsc );
// }
// } catch(e) {
// optArray.sort();
// if(excludedOpts){
// excludedOpts.sort();
// }
// if(isCustomSlc){
// optTxt.sort();
// }
// }//in case there are alphanumeric values
// }
// //desc sort
// if(this.sortNumDesc && array.has(this.sortNumDesc, colIndex)){
// try{
// optArray.sort( numSortDesc );
// if(excludedOpts){
// excludedOpts.sort( numSortDesc );
// }
// if(isCustomSlc){
// optTxt.sort( numSortDesc );
// }
// } catch(e) {
// optArray.sort();
// if(excludedOpts){ excludedOpts.sort(); }
// if(isCustomSlc){
// optTxt.sort();
// }
// }//in case there are alphanumeric values
// }
// AddOpts();//populates drop-down
// // adds 1st option
// function AddOpt0(){
// if(fillMethod === 'innerhtml'){
// slcInnerHtml +='<option value="">'+o.displayAllText+'</option>';
// }
// else {
// var opt0 = dom.createOpt(
// (!o.enableSlcResetFilter ? '' : o.displayAllText),'');
// if(!o.enableSlcResetFilter){
// opt0.style.display = 'none';
// }
// slc.appendChild(opt0);
// if(o.enableEmptyOption){
// var opt1 = dom.createOpt(o.emptyText,o.emOperator);
// slc.appendChild(opt1);
// }
// if(o.enableNonEmptyOption){
// var opt2 = dom.createOpt(o.nonEmptyText,o.nmOperator);
// slc.appendChild(opt2);
// }
// }
// }
// // populates select
// function AddOpts(){
// var slcValue = slc.value;
// slc.innerHTML = '';
// AddOpt0();
// for(var y=0; y<optArray.length; y++){
// if(optArray[y]===''){
// continue;
// }
// var val = optArray[y]; //option value
// var lbl = isCustomSlc ? optTxt[y] : val; //option text
// var isDisabled = false;
// if(isRefreshed && o.disableExcludedOptions &&
// array.has(excludedOpts,
// str.matchCase(val, o.matchCase), o.matchCase)){
// isDisabled = true;
// }
// if(fillMethod === 'innerhtml'){
// var slcAttr = '';
// if(o.fillSlcOnDemand && slcValue==optArray[y]){
// slcAttr = 'selected="selected"';
// }
// slcInnerHtml += '<option value="'+val+'" ' + slcAttr +
// (isDisabled ? 'disabled="disabled"' : '')+ '>' +
// lbl+'</option>';
// } else {
// var opt;
// //fill select on demand
// if(o.fillSlcOnDemand && slcValue==optArray[y] &&
// o['col'+colIndex]===o.fltTypeSlc){
// opt = dom.createOpt(lbl, val, true);
// } else {
// if(o['col'+colIndex]!=o.fltTypeMulti){
// opt = dom.createOpt(
// lbl,
// val,
// (flts_values[colIndex]!==' ' &&
// val==flts_values[colIndex]) ? true : false
// );
// } else {
// opt = dom.createOpt(
// lbl,
// val,
// (array.has(fltArr,
// str.matchCase(optArray[y],o.matchCase),
// o.matchCase) ||
// fltArr.toString().indexOf(val)!== -1) ?
// true : false
// );
// }
// }
// if(isDisabled){
// opt.disabled = true;
// }
// slc.appendChild(opt);
// }
// }// for y
// if(fillMethod === 'innerhtml'){
// slc.innerHTML += slcInnerHtml;
// }
// slc.setAttribute('filled','1');
// }// fn AddOpt
// },
/*====================================================
- IE bug: it seems there is no way to make
multiple selections programatically, only last
@ -3981,7 +3713,6 @@ TableFilter.prototype = {
if(array.has(slcA3, slcIndex[i])){
this.Cpt.checkList._build(slcIndex[i]);
} else {
// this._PopulateSelect(slcIndex[i], true);
this.Cpt.dropdown._build(slcIndex[i], true);
}
@ -4026,11 +3757,9 @@ TableFilter.prototype = {
colFltType !== this.fltTypeInp){
if(colFltType === this.fltTypeSlc ||
colFltType === this.fltTypeMulti){
// this.PopulateSelect(ct);
this.Cpt.dropdown.build(ct);
}
if(colFltType === this.fltTypeCheckList){
// this.PopulateCheckList(ct);
this.Cpt.checkList.build(ct);
}
}
@ -4275,12 +4004,6 @@ function numSortAsc(a, b){ return (a-b); }
function numSortDesc(a, b){ return (b-a); }
// function ignoreCaseSort(a, b){
// var x = str.lower(a);
// var y = str.lower(b);
// return ((x < y) ? -1 : ((x > y) ? 1 : 0));
// }
function removeNbFormat(data, format){
if(!data){
return;

2
src/index.html
View file

@ -104,7 +104,7 @@
// remember_page_number: true,
// remember_page_length: true,
fill_slc_on_demand: false,
refresh_filters: true,
refresh_filters: false,
alternate_rows: true,
highlight_keywords: true,
match_case: false,

38
src/modules/checkList.js
View file

@ -108,25 +108,27 @@ define(["exports", "../dom", "../array", "../string", "../sort", "../event"], fu
var ncells = cells.length;
// checks if row has exact cell #
if (ncells === tf.nbCells && !this.isCustom) {
// this loop retrieves cell data
for (var j = 0; j < ncells; j++) {
if ((colIndex === j && (!tf.refreshFilters || (tf.refreshFilters && tf.disableExcludedOptions))) || (colIndex === j && tf.refreshFilters && ((rows[k].style.display === "" && !tf.paging) || (tf.paging && ((!activeFlt || activeFlt === colIndex) || (activeFlt != colIndex && array.has(tf.validRowsIndex, k))))))) {
var cell_data = tf.GetCellData(j, cells[j]);
//Vary Peter's patch
var cell_string = Str.matchCase(cell_data, tf.matchCase);
// checks if celldata is already in array
if (!array.has(this.opts, cell_string, tf.matchCase)) {
this.opts.push(cell_data);
if (ncells !== tf.nbCells || this.isCustom) {
continue;
}
// this loop retrieves cell data
for (var j = 0; j < ncells; j++) {
if ((colIndex === j && (!tf.refreshFilters || (tf.refreshFilters && tf.disableExcludedOptions))) || (colIndex === j && tf.refreshFilters && ((rows[k].style.display === "" && !tf.paging) || (tf.paging && ((!activeFlt || activeFlt === colIndex) || (activeFlt != colIndex && array.has(tf.validRowsIndex, k))))))) {
var cell_data = tf.GetCellData(j, cells[j]);
//Vary Peter's patch
var cell_string = Str.matchCase(cell_data, tf.matchCase);
// checks if celldata is already in array
if (!array.has(this.opts, cell_string, tf.matchCase)) {
this.opts.push(cell_data);
}
var filteredCol = filteredDataCol[j];
if (tf.refreshFilters && tf.disableExcludedOptions) {
if (!filteredCol) {
filteredDataCol[j] = tf.GetFilteredDataCol(j);
}
var filteredCol = filteredDataCol[j];
if (tf.refreshFilters && tf.disableExcludedOptions) {
if (!filteredCol) {
filteredDataCol[j] = tf.GetFilteredDataCol(j);
}
if (!array.has(filteredCol, cell_string, tf.matchCase) && !array.has(excludedOpts, cell_string, tf.matchCase) && !tf.isFirstLoad) {
excludedOpts.push(cell_data);
}
if (!array.has(filteredCol, cell_string, tf.matchCase) && !array.has(excludedOpts, cell_string, tf.matchCase) && !tf.isFirstLoad) {
excludedOpts.push(cell_data);
}
}
}

2
src/modules/checkList.js.map
View file

File diff suppressed because one or more lines are too long

3
test/test-checklist.js
View file

@ -31,7 +31,4 @@ requirejs(['test-config', '../src/core'], function(config, TableFilter){
tf.RemoveGrid();
deepEqual(dom.id(tf.fltIds[3]), null, 'CheckList UL element');
});
// tf.fObj.fill_slc_on_demand = false;
// tf.RefreshGrid(tf.fObj);
});

82
test/test-dropdown.html Normal file
View file

@ -0,0 +1,82 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>TableFilter drop-down filter</title>
<link rel="stylesheet" href="libs/qunit/qunit.css">
<link rel="stylesheet" href="../dist/filtergrid.css">
<script src="libs/qunit/qunit.js"></script>
<script>
// Defer Qunit so RequireJS can work its magic and resolve all modules.
QUnit.config.autostart = false;
QUnit.config.autoload = false;
</script>
</head>
<body>
<table id="demo" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<th>From</th>
<th>Destination</th>
<th>Road Distance (km)</th>
<th>By Air (hrs)</th>
<th>By Rail (hrs)</th>
</tr>
<tr>
<td><strong>Sydney</strong></td>
<td>Adelaide</td>
<td>1412</td>
<td>1.4</td>
<td>25.3</td>
</tr>
<tr>
<td><strong>Sydney</strong></td>
<td>Brisbane</td>
<td>982</td>
<td>1.5</td>
<td>16</td>
</tr>
<tr>
<td><strong>Sydney</strong></td>
<td>Canberra</td>
<td>286</td>
<td>.6</td>
<td>4.3</td>
</tr>
<tr>
<td><strong>Sydney</strong></td>
<td>Melbourne</td>
<td>872</td>
<td>1.1</td>
<td>10.5</td>
</tr>
<tr>
<td><strong>Adelaide</strong></td>
<td>Perth</td>
<td>2781</td>
<td>3.1</td>
<td>38</td>
</tr>
<tr>
<td><strong>Adelaide</strong></td>
<td>Alice Springs</td>
<td>1533</td>
<td>2</td>
<td>20.25</td>
</tr>
<tr>
<td><strong>Adelaide</strong></td>
<td>Brisbane</td>
<td>2045</td>
<td>2.15</td>
<td>40</td>
</tr>
</tbody>
</table>
<script data-main="test-dropdown" src="../libs/requirejs/require.js"></script>
<div id="qunit"></div>
<div id="qunit-fixture"></div>
</body>
</html>

38
test/test-dropdown.js Normal file
View file

@ -0,0 +1,38 @@
requirejs(['test-config', '../src/core'], function(config, TableFilter){
QUnit.start();
var Dropdown = require('modules/dropdown').Dropdown,
types = require('types').Types,
dom = require('dom').Dom;
var tf = new TableFilter('demo', {
col_2: 'multiple',
col_3: 'select',
fill_slc_on_demand: false
});
tf.init();
var dropdown = tf.Cpt.dropdown;
module('Sanity checks');
test('Drop-down component', function() {
deepEqual(dropdown instanceof Dropdown, true, 'DropDown type');
notEqual(dropdown, null, 'DropDown instanciated');
deepEqual(types.isArray(dropdown.opts), true, 'Type of opts property');
});
module('UI elements');
test('Drop-down UI elements', function() {
var flt1 = dom.id(tf.fltIds[3]);
var flt2 = dom.id(tf.fltIds[2]);
notEqual(flt1, null, 'DropDown SELECT element exists');
notEqual(flt2, null, 'DropDown SELECT element exists');
deepEqual(flt2.hasAttribute('multiple'), true, 'Multiple select exists');
});
test('TableFilter removed', function() {
tf.RemoveGrid();
deepEqual(dom.id(tf.fltIds[3]), null, 'Filter is removed');
});
});