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

Fixed sorting for filter options with numeric values

Browse source
This commit is contained in:
Max Guglielmi 2016-02-02 18:24:16 +11:00
parent 9f992b0cba
commit 69f0c6fcc8
16 changed files with 140 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dist/starter.html vendored
View file

@ -1,10 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tablefilter v0.1.10 - Starter</title>
<title>tablefilter v0.1.11 - Starter</title>
</head>
<body>
<h1>tablefilter v0.1.10</h1>
<h1>tablefilter v0.1.11</h1>

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.10 by Max Guglielmi
* build date: 2016-02-01T07:07:05.361Z
* tablefilter v0.1.11 by Max Guglielmi
* build date: 2016-02-02T07:18:48.677Z
* 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}

4
dist/tablefilter/style/filtersVisibility.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.10 by Max Guglielmi
* build date: 2016-02-01T07:07:05.361Z
* tablefilter v0.1.11 by Max Guglielmi
* build date: 2016-02-02T07:18:48.677Z
* 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}

4
dist/tablefilter/style/tablefilter.css vendored
View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.10 by Max Guglielmi
* build date: 2016-02-01T07:07:05.361Z
* tablefilter v0.1.11 by Max Guglielmi
* build date: 2016-02-02T07:18:48.677Z
* MIT License
*/
.activeHeader{background-color:#66afe9 !important;color:#fff !important}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.10 by Max Guglielmi
* build date: 2016-02-01T07:07:05.361Z
* tablefilter v0.1.11 by Max Guglielmi
* build date: 2016-02-02T07:18:48.677Z
* 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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.10 by Max Guglielmi
* build date: 2016-02-01T07:07:05.361Z
* tablefilter v0.1.11 by Max Guglielmi
* build date: 2016-02-02T07:18:48.677Z
* 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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.10 by Max Guglielmi
* build date: 2016-02-01T07:07:05.361Z
* tablefilter v0.1.11 by Max Guglielmi
* build date: 2016-02-02T07:18:48.677Z
* 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}

12
dist/tablefilter/tablefilter.js vendored
View file

File diff suppressed because one or more lines are too long

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.1.10 by Max Guglielmi
* build date: 2016-02-01T07:07:05.275Z
* tablefilter v0.1.11 by Max Guglielmi
* build date: 2016-02-02T07:18:48.608Z
* MIT License
*/

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "tablefilter",
"version": "0.1.10",
"version": "0.1.11",
"description": "A Javascript library making HTML tables filterable and a bit more",
"license": "MIT",
"author": {

36
src/modules/checkList.js
View file

@ -5,6 +5,9 @@ import Str from '../string';
import Sort from '../sort';
import Event from '../event';
const SORT_ERROR = 'Filter options for column {0} cannot be sorted in ' +
'{1} manner.';
export class CheckList extends Feature{
/**
@ -226,42 +229,33 @@ export class CheckList extends Feature{
}
}
//asc sort
if(tf.sortNumAsc && tf.sortNumAsc.indexOf(colIndex) != -1){
if(tf.sortNumAsc.indexOf(colIndex) != -1){
try{
this.opts.sort(numSortAsc);
this.opts.sort(Sort.numSortAsc);
if(this.excludedOpts){
this.excludedOpts.sort(numSortAsc);
this.excludedOpts.sort(Sort.numSortAsc);
}
if(this.isCustom){
this.optsTxt.sort(numSortAsc);
this.optsTxt.sort(Sort.numSortAsc);
}
} catch(e) {
this.opts.sort();
if(this.excludedOpts){
this.excludedOpts.sort();
}
if(this.isCustom){
this.optsTxt.sort();
}
throw new Error(SORT_ERROR.replace('{0}', colIndex)
.replace('{1}', 'ascending'));
}//in case there are alphanumeric values
}
//desc sort
if(tf.sortNumDesc && tf.sortNumDesc.indexOf(colIndex) != -1){
if(tf.sortNumDesc.indexOf(colIndex) != -1){
try{
this.opts.sort(numSortDesc);
this.opts.sort(Sort.numSortDesc);
if(this.excludedOpts){
this.excludedOpts.sort(numSortDesc);
this.excludedOpts.sort(Sort.numSortDesc);
}
if(this.isCustom){
this.optsTxt.sort(numSortDesc);
this.optsTxt.sort(Sort.numSortDesc);
}
} catch(e) {
this.opts.sort();
if(this.excludedOpts){
this.excludedOpts.sort(); }
if(this.isCustom){
this.optsTxt.sort();
}
throw new Error(SORT_ERROR.replace('{0}', colIndex)
.replace('{1}', 'descending'));
}//in case there are alphanumeric values
}

37
src/modules/dropdown.js
View file

@ -5,6 +5,9 @@ import Str from '../string';
import Sort from '../sort';
import Event from '../event';
const SORT_ERROR = 'Filter options for column {0} cannot be sorted in ' +
'{1} manner.';
export class Dropdown extends Feature{
/**
@ -229,43 +232,33 @@ export class Dropdown extends Feature{
}
//asc sort
if(tf.sortNumAsc && tf.sortNumAsc.indexOf(colIndex) != -1){
if(tf.sortNumAsc.indexOf(colIndex) != -1){
try{
this.opts.sort( numSortAsc );
this.opts.sort(Sort.numSortAsc);
if(excludedOpts){
excludedOpts.sort(numSortAsc);
excludedOpts.sort(Sort.numSortAsc);
}
if(this.isCustom){
this.optsTxt.sort(numSortAsc);
this.optsTxt.sort(Sort.numSortAsc);
}
} catch(e) {
this.opts.sort();
if(excludedOpts){
excludedOpts.sort();
}
if(this.isCustom){
this.optsTxt.sort();
}
throw new Error(SORT_ERROR.replace('{0}', colIndex)
.replace('{1}', 'ascending'));
}//in case there are alphanumeric values
}
//desc sort
if(tf.sortNumDesc && tf.sortNumDesc.indexOf(colIndex) != -1){
if(tf.sortNumDesc.indexOf(colIndex) != -1){
try{
this.opts.sort(numSortDesc);
this.opts.sort(Sort.numSortDesc);
if(excludedOpts){
excludedOpts.sort(numSortDesc);
excludedOpts.sort(Sort.numSortDesc);
}
if(this.isCustom){
this.optsTxt.sort(numSortDesc);
this.optsTxt.sort(Sort.numSortDesc);
}
} catch(e) {
this.opts.sort();
if(excludedOpts){
excludedOpts.sort();
}
if(this.isCustom){
this.optsTxt.sort();
}
throw new Error(SORT_ERROR.replace('{0}', colIndex)
.replace('{1}', 'ascending'));
}//in case there are alphanumeric values
}

6
src/sort.js
View file

@ -5,5 +5,11 @@ export default {
let x = Str.lower(a);
let y = Str.lower(b);
return ((x < y) ? -1 : ((x > y) ? 1 : 0));
},
numSortAsc(a, b){
return (a - b);
},
numSortDesc(a, b){
return (b - a);
}
};

4
src/tablefilter.js
View file

@ -252,10 +252,10 @@ export class TableFilter {
this.sortSlc = f.sort_select===false ? false : true;
//enables/disables ascending numeric options sorting
this.isSortNumAsc = Boolean(f.sort_num_asc);
this.sortNumAsc = this.isSortNumAsc ? f.sort_num_asc : null;
this.sortNumAsc = this.isSortNumAsc ? f.sort_num_asc : [];
//enables/disables descending numeric options sorting
this.isSortNumDesc = Boolean(f.sort_num_desc);
this.sortNumDesc = this.isSortNumDesc ? f.sort_num_desc : null;
this.sortNumDesc = this.isSortNumDesc ? f.sort_num_desc : [];
//Select filters are populated on demand
this.loadFltOnDemand = Boolean(f.load_filters_on_demand);
this.hasCustomOptions = Types.isObj(f.custom_options);

51
test/test-checklist.js
View file

@ -45,6 +45,57 @@ test('Can select options', function() {
notEqual(flt1.getAttribute('value').indexOf('.6'), -1, 'Option selected');
});
// Issue 113, addressing option sorting for numeric values
module('Options sorting');
test('Can sort options', function() {
tf.clearFilters();
tf.destroy();
tf = new TableFilter('demo', {
base_path: '../dist/tablefilter/',
col_2: 'checklist',
col_3: 'checklist',
col_4: 'checklist',
sort_num_asc: [2, 3],
sort_num_desc: [4]
});
tf.init();
var flt2 = id(tf.fltIds[2]);
var flt3 = id(tf.fltIds[3]);
var flt4 = id(tf.fltIds[4]);
deepEqual(
flt2.getElementsByTagName('li')[1].firstChild.firstChild.value,
'286',
'First option value for column 2'
);
deepEqual(
flt2.getElementsByTagName('li')[7].firstChild.firstChild.value,
'2781',
'Last option value for column 2'
);
deepEqual(
flt3.getElementsByTagName('li')[1].firstChild.firstChild.value,
'.6',
'First option value for column 3'
);
deepEqual(
flt3.getElementsByTagName('li')[7].firstChild.firstChild.value,
'3.1',
'Last option value for column 3'
);
deepEqual(
flt4.getElementsByTagName('li')[1].firstChild.firstChild.value,
'40',
'First option value for column 4'
);
deepEqual(
flt4.getElementsByTagName('li')[7].firstChild.firstChild.value,
'4.3',
'Last option value for column 4'
);
});
test('TableFilter removed', function() {
tf.destroy();
deepEqual(id(tf.fltIds[3]), null, 'CheckList UL element');

30
test/test-dropdown.js
View file

@ -3,8 +3,7 @@ var id = function (id){ return document.getElementById(id); };
var tf = new TableFilter('demo', {
base_path: '../dist/tablefilter/',
col_2: 'multiple',
col_3: 'select',
load_filters_on_demand: false
col_3: 'select'
});
tf.init();
@ -48,6 +47,33 @@ test('Can select options', function() {
deepEqual(flt1.options[6].selected, true, 'Option selected');
});
// Issue 113, addressing option sorting for numeric values
module('Options sorting');
test('Can sort options', function() {
tf.clearFilters();
tf.destroy();
tf = new TableFilter('demo', {
base_path: '../dist/tablefilter/',
col_2: 'multiple',
col_3: 'select',
col_4: 'multiple',
sort_num_asc: [2, 3],
sort_num_desc: [4]
});
tf.init();
var flt2 = id(tf.fltIds[2]);
var flt3 = id(tf.fltIds[3]);
var flt4 = id(tf.fltIds[4]);
deepEqual(flt2.options[1].value, '286', 'First option value for column 2');
deepEqual(flt2.options[7].value, '2781', 'Last option value for column 2');
deepEqual(flt3.options[1].value, '.6', 'First option value for column 3');
deepEqual(flt3.options[7].value, '3.1', 'Last option value for column 3');
deepEqual(flt4.options[1].value, '40', 'First option value for column 4');
deepEqual(flt4.options[7].value, '4.3', 'Last option value for column 4');
});
test('TableFilter removed', function() {
tf.destroy();
deepEqual(id(tf.fltIds[3]), null, 'Filter is removed');