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

Addressed #332 and continued #319

This commit is contained in:
Max Guglielmi 2016-11-02 23:01:31 +11:00
parent ad3335e488
commit b99405997a
13 changed files with 145 additions and 42 deletions

4
dist/starter.html vendored
View file

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

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.4.5 by Max Guglielmi
* build date: 2016-11-02T03:16:19.797Z
* tablefilter v0.4.6 by Max Guglielmi
* build date: 2016-11-02T11:56:53.090Z
* 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}

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.4.5 by Max Guglielmi
* build date: 2016-11-02T03:16:19.797Z
* tablefilter v0.4.6 by Max Guglielmi
* build date: 2016-11-02T11:56:53.090Z
* 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}

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.4.5 by Max Guglielmi
* build date: 2016-11-02T03:16:19.797Z
* tablefilter v0.4.6 by Max Guglielmi
* build date: 2016-11-02T11:56:53.090Z
* MIT License
*/
.activeHeader{background-color:#66afe9 !important;color:#fff !important}

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.4.5 by Max Guglielmi
* build date: 2016-11-02T03:16:19.797Z
* tablefilter v0.4.6 by Max Guglielmi
* build date: 2016-11-02T11:56:53.090Z
* 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}

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.4.5 by Max Guglielmi
* build date: 2016-11-02T03:16:19.797Z
* tablefilter v0.4.6 by Max Guglielmi
* build date: 2016-11-02T11:56:53.090Z
* 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}

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.4.5 by Max Guglielmi
* build date: 2016-11-02T03:16:19.797Z
* tablefilter v0.4.6 by Max Guglielmi
* build date: 2016-11-02T11:56:53.090Z
* 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}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,6 @@
{
"name": "tablefilter",
"version": "0.4.5",
"version": "0.4.6",
"description": "A Javascript library making HTML tables filterable and a bit more",
"license": "MIT",
"author": {
@ -28,7 +28,7 @@
"tag": "next"
},
"devDependencies": {
"babel-core": "^6.18.0",
"babel-core": "^6.18.2",
"babel-eslint": "7.1.0",
"babel-loader": "^6.2.6",
"babel-plugin-transform-es2015-classes": "^6.18.0",

View file

@ -2,6 +2,12 @@ import {Feature} from '../../feature';
import {createText, elm} from '../../dom';
import {isArray, isFn, isUndef} from '../../types';
const EVENTS = [
'after-filtering',
'after-page-change',
'after-page-length-change'
];
/**
* Column calculations extension
*/
@ -47,7 +53,7 @@ export default class ColOps extends Feature {
return;
}
// subscribe to events
this.emitter.on(['after-filtering'], () => this.calc());
this.emitter.on(EVENTS, () => this.calc());
this.calc();
@ -124,7 +130,8 @@ export default class ColOps extends Feature {
//use ucolIndex because we only want to pass through this loop
//once for each column get the values in this unique column
colvalues.push(
tf.getColValues(ucolIndex[ucol], false, true, excludeRow));
tf.getColValues(ucolIndex[ucol], false, true, excludeRow)
);
//next: calculate all operations for this column
let result,
@ -355,7 +362,8 @@ export default class ColOps extends Feature {
return;
}
// unsubscribe to events
this.emitter.off(['after-filtering'], () => this.calc());
this.emitter.off(EVENTS, () => this.calc());
this.initialized = false;
}

View file

@ -136,24 +136,12 @@ export default class ColsVisibility extends Feature {
*/
this.stylesheet = f.stylesheet || 'colsVisibility.css';
/**
* Extension's prefix
* @private
*/
this.prfx = 'colVis_';
/**
* Css for columns manager UI span
* @type {String}
*/
this.spanCssClass = f.span_css_class || 'colVisSpan';
/**
* Main container prefix
* @private
*/
this.prfxCont = this.prfx + 'Cont_';
/**
* Css for columns manager UI main container
* @type {String}
@ -378,7 +366,7 @@ export default class ColsVisibility extends Feature {
return;
}
let tf = this.tf;
let span = createElm('span', ['id', this.prfx + tf.id]);
let span = createElm('span');
span.className = this.spanCssClass;
//Container element (rdiv or custom element)
@ -431,7 +419,7 @@ export default class ColsVisibility extends Feature {
let tf = this.tf;
let container = !this.contElTgtId ?
createElm('div', ['id', this.prfxCont + tf.id]) :
createElm('div') :
elm(this.contElTgtId);
container.className = this.contCssClass;
@ -441,7 +429,7 @@ export default class ColsVisibility extends Feature {
container.appendChild(extNameLabel);
//Headers list
let ul = createElm('ul', ['id', 'ul' + this.name + '_' + tf.id]);
let ul = createElm('ul');
ul.className = this.listCssClass;
let tbl = this.headersTbl ? this.headersTbl : tf.tbl;

View file

@ -124,9 +124,115 @@ test('Column operations after filtering', function() {
tf.clearFilters();
});
module('Behaviour checks with grid layout');
module('Behaviour checks with paging enabled');
test('Column operations', function() {
tf.destroy();
tf = new TableFilter('demo', {
base_path: '../dist/tablefilter/',
paging: true,
paging_length: 4,
rows_always_visible: [
totRowIndex-6,
totRowIndex-5,
totRowIndex-4,
totRowIndex-3,
totRowIndex-2,
totRowIndex-1,
totRowIndex,
],
extensions: [{
name: 'colOps',
id: [
'sum1', 'sum2',
'mean1', 'mean2',
'min1', 'min2',
'max1', 'max2',
'median1', 'median2',
'q1-1', 'q1-2',
'q3-1', 'q3-2'
],
col: [
2, 3,
2, 3,
2, 3,
2, 3,
2, 3,
2, 3,
2, 3
],
operation: [
'sum', 'sum',
'mean', 'mean',
'min', 'min',
'max', 'max',
'median', 'median',
'q1', 'q1',
'q3', 'q3'
],
write_method: [
'innerhtml', 'innerhtml',
'innerhtml', 'innerhtml',
'innerhtml', 'innerhtml',
'innerhtml', 'innerhtml',
'innerhtml', 'innerhtml',
'innerhtml', 'innerhtml',
'innerhtml', 'innerhtml'
],
exclude_row: [
totRowIndex-6,
totRowIndex-5,
totRowIndex-4,
totRowIndex-3,
totRowIndex-2,
totRowIndex-1,
totRowIndex
],
decimal_precision: [
0, 2,
0, 2,
0, 2,
0, 2,
0, 2,
0, 2,
0, 2
],
tot_row_index: [
totRowIndex-6, totRowIndex-6,
totRowIndex-5, totRowIndex-5,
totRowIndex-4, totRowIndex-4,
totRowIndex-3, totRowIndex-3,
totRowIndex-2, totRowIndex-2,
totRowIndex-1, totRowIndex-1,
totRowIndex, totRowIndex
]
}]
});
tf.init();
var paging = tf.feature('paging');
// change page
paging.changePage(1);
equal(id('sum1').innerHTML, 6359, 'Sum result after page change');
equal(id('sum2').innerHTML, 7.25, 'Sum result after page change');
equal(id('mean1').innerHTML, 2120, 'Mean result after page change');
equal(id('mean2').innerHTML, 2.42, 'Mean result after page change');
equal(id('min1').innerHTML, 1533, 'Min result after page change');
equal(id('min2').innerHTML, 2.00, 'Min result after page change');
equal(id('max1').innerHTML, 2781, 'Max result after page change');
equal(id('max2').innerHTML, 3.10, 'Max result after page change');
equal(id('median1').innerHTML, 2045, 'Median result after page change');
equal(id('median2').innerHTML, 2.15, 'Median result after page change');
equal(id('q1-1').innerHTML, 1533, 'Q1 result after page change');
equal(id('q1-2').innerHTML, 2.00, 'Q1 result after page change');
equal(id('q3-1').innerHTML, 2781, 'Q3 result after page change');
equal(id('q3-2').innerHTML, 3.10, 'Q3 result after page change');
tf.destroy();
});
module('Behaviour checks with grid layout');
test('Column operations', function() {
totRowIndex = totRowIndex-2;
tf = new TableFilter('demo', {
base_path: '../dist/tablefilter/',
@ -208,6 +314,7 @@ test('Column operations', function() {
}]
});
tf.init();
tf.clearFilters();
equal(id('sum1').innerHTML, 9911, 'Sum result');
equal(id('sum2').innerHTML, 11.85, 'Sum result');