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

Merge pull request #287 from koalyptus/refactor-col-ops

Browse source 
Refactor col ops
This commit is contained in:
koalyptus 2016-09-02 13:41:03 +10:00 committed by GitHub
parent 8ab9fca0e1 aee9c11551
commit 84b5287d73
13 changed files with 90 additions and 61 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.2.59 - Starter</title>
<title>tablefilter v0.2.60 - Starter</title>
</head>
<body>
<h1>tablefilter v0.2.59</h1>
<h1>tablefilter v0.2.60</h1>

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.59 by Max Guglielmi
* build date: 2016-08-31T11:05:21.483Z
* tablefilter v0.2.60 by Max Guglielmi
* build date: 2016-09-02T03:28:08.309Z
* 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.2.59 by Max Guglielmi
* build date: 2016-08-31T11:05:21.483Z
* tablefilter v0.2.60 by Max Guglielmi
* build date: 2016-09-02T03:28:08.309Z
* 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.2.59 by Max Guglielmi
* build date: 2016-08-31T11:05:21.483Z
* tablefilter v0.2.60 by Max Guglielmi
* build date: 2016-09-02T03:28:08.309Z
* 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.2.59 by Max Guglielmi
* build date: 2016-08-31T11:05:21.483Z
* tablefilter v0.2.60 by Max Guglielmi
* build date: 2016-09-02T03:28:08.309Z
* 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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.59 by Max Guglielmi
* build date: 2016-08-31T11:05:21.483Z
* tablefilter v0.2.60 by Max Guglielmi
* build date: 2016-09-02T03:28:08.309Z
* 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}

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

@ -1,6 +1,6 @@
/**
* tablefilter v0.2.59 by Max Guglielmi
* build date: 2016-08-31T11:05:21.483Z
* tablefilter v0.2.60 by Max Guglielmi
* build date: 2016-09-02T03:28:08.309Z
* 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}

10
dist/tablefilter/tablefilter.js vendored
View file

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

4
package.json
View file

@ -1,6 +1,6 @@
{
"name": "tablefilter",
"version": "0.2.59",
"version": "0.2.60",
"description": "A Javascript library making HTML tables filterable and a bit more",
"license": "MIT",
"author": {
@ -50,7 +50,7 @@
"script-loader": "^0.7.0",
"string-replace-webpack-plugin": "^0.0.3",
"webpack": "^1.13.2",
"webpack-dev-server": "^1.15.0"
"webpack-dev-server": "^1.15.1"
},
"dependencies": {},
"bugs": {

85
src/extensions/colOps/colOps.js
View file

@ -2,34 +2,58 @@ import {Feature} from '../../feature';
import {createText, elm} from '../../dom';
import {isArray, isFn, isUndef} from '../../types';
/**
* Column calculations extension
*/
export default class ColOps extends Feature {
/**
* Column calculations
* @param {Object} tf TableFilter instance
* Creates an instance of ColOps
*
* @param {TableFilter} tf TableFilter instance
* @param {Object} opts Configuration object
*/
constructor(tf, opts) {
super(tf, opts.name);
//calls function before col operation
/**
* Callback fired before columns operations start
* @type {Function}
*/
this.onBeforeOperation = isFn(opts.on_before_operation) ?
opts.on_before_operation : null;
//calls function after col operation
/**
* Callback fired after columns operations are completed
* @type {Function}
*/
this.onAfterOperation = isFn(opts.on_after_operation) ?
opts.on_after_operation : null;
/**
* Configuration options
* @type {Object}
*/
this.opts = opts;
this.enable();
}
/**
* Initializes ColOps instance
*/
init() {
if (this.initialized) {
return;
}
// subscribe to events
this.tf.emitter.on(['after-filtering'], () => this.calc());
this.emitter.on(['after-filtering'], () => this.calc());
this.calc();
/**
* @inherited
*/
this.initialized = true;
}
@ -50,16 +74,17 @@ export default class ColOps extends Feature {
* (2) added calculations for the median, lower and upper quartile.
*/
calc() {
var tf = this.tf;
let tf = this.tf;
if (!tf.isInitialized()) {
return;
}
if (this.onBeforeOperation) {
this.onBeforeOperation.call(null, tf);
this.onBeforeOperation.call(null, tf, this);
}
this.emitter.emit('before-column-operation', tf, this);
var opts = this.opts,
let opts = this.opts,
labelId = opts.id,
colIndex = opts.col,
operation = opts.operation,
@ -70,14 +95,14 @@ export default class ColOps extends Feature {
2 : opts.decimal_precision;
//nuovella: determine unique list of columns to operate on
var ucolIndex = [],
let ucolIndex = [],
ucolMax = 0;
ucolIndex[ucolMax] = colIndex[0];
for (var ii = 1; ii < colIndex.length; ii++) {
var saved = 0;
for (let ii = 1; ii < colIndex.length; ii++) {
let saved = 0;
//see if colIndex[ii] is already in the list of unique indexes
for (var jj = 0; jj <= ucolMax; jj++) {
for (let jj = 0; jj <= ucolMax; jj++) {
if (ucolIndex[jj] === colIndex[ii]) {
saved = 1;
}
@ -90,10 +115,10 @@ export default class ColOps extends Feature {
}
if (isArray(labelId) && isArray(colIndex) && isArray(operation)) {
var rows = tf.tbl.rows,
let rows = tf.tbl.rows,
colvalues = [];
for (var ucol = 0; ucol <= ucolMax; ucol++) {
for (let ucol = 0; ucol <= ucolMax; ucol++) {
//this retrieves col values
//use ucolIndex because we only want to pass through this loop
//once for each column get the values in this unique column
@ -101,7 +126,7 @@ export default class ColOps extends Feature {
tf.getColValues(ucolIndex[ucol], false, true, excludeRow));
//next: calculate all operations for this column
var result,
let result,
nbvalues = 0,
temp,
meanValue = 0,
@ -125,7 +150,7 @@ export default class ColOps extends Feature {
oTypeThisCol = [],
mThisCol = -1;
for (var k = 0; k < colIndex.length; k++) {
for (let k = 0; k < colIndex.length; k++) {
if (colIndex[k] === ucolIndex[ucol]) {
mThisCol++;
opsThisCol[mThisCol] = operation[k].toLowerCase();
@ -160,7 +185,7 @@ export default class ColOps extends Feature {
}
}
for (var j = 0; j < colvalues[ucol].length; j++) {
for (let j = 0; j < colvalues[ucol].length; j++) {
//sort the list for calculation of median and quartiles
if ((q1Flag === 1) || (q3Flag === 1) || (medFlag === 1)) {
if (j < colvalues[ucol].length - 1) {
@ -176,7 +201,7 @@ export default class ColOps extends Feature {
}
}
}
var cvalue = parseFloat(colvalues[ucol][j]);
let cvalue = parseFloat(colvalues[ucol][j]);
theList[j] = parseFloat(cvalue);
if (!isNaN(cvalue)) {
@ -206,7 +231,7 @@ export default class ColOps extends Feature {
meanValue = sumValue / nbvalues;
}
if (medFlag === 1) {
var aux = 0;
let aux = 0;
if (nbvalues % 2 === 1) {
aux = Math.floor(nbvalues / 2);
medValue = theList[aux];
@ -215,7 +240,7 @@ export default class ColOps extends Feature {
theList[((nbvalues / 2) - 1)]) / 2;
}
}
var posa;
let posa;
if (q1Flag === 1) {
posa = 0.0;
posa = Math.floor(nbvalues / 4);
@ -227,7 +252,7 @@ export default class ColOps extends Feature {
}
if (q3Flag === 1) {
posa = 0.0;
var posb = 0.0;
let posb = 0.0;
posa = Math.floor(nbvalues / 4);
if (4 * posa === nbvalues) {
posb = 3 * posa;
@ -237,7 +262,7 @@ export default class ColOps extends Feature {
}
}
for (var i = 0; i <= mThisCol; i++) {
for (let i = 0; i <= mThisCol; i++) {
switch (opsThisCol[i]) {
case 'mean':
result = meanValue;
@ -262,7 +287,7 @@ export default class ColOps extends Feature {
break;
}
var precision = !isNaN(decThisCol[i]) ? decThisCol[i] : 2;
let precision = !isNaN(decThisCol[i]) ? decThisCol[i] : 2;
//if outputType is defined
if (oTypeThisCol && result) {
@ -282,9 +307,9 @@ export default class ColOps extends Feature {
elm(labThisCol[i]).value = result;
break;
case 'createtextnode':
var oldnode =
let oldnode =
elm(labThisCol[i]).firstChild;
var txtnode = createText(result);
let txtnode = createText(result);
elm(labThisCol[i])
.replaceChild(txtnode, oldnode);
break;
@ -304,7 +329,7 @@ export default class ColOps extends Feature {
}//for i
// row(s) with result are always visible
var totRow = totRowIndex && totRowIndex[ucol] ?
let totRow = totRowIndex && totRowIndex[ucol] ?
rows[totRowIndex[ucol]] : null;
if (totRow) {
totRow.style.display = '';
@ -313,16 +338,20 @@ export default class ColOps extends Feature {
}//if typeof
if (this.onAfterOperation) {
this.onAfterOperation.call(null, tf);
this.onAfterOperation.call(null, tf, this);
}
this.emitter.emit('after-column-operation', tf, this);
}
/**
* Remove extension
*/
destroy() {
if (!this.initialized) {
return;
}
// unsubscribe to events
this.tf.emitter.off(['after-filtering'], () => this.calc());
this.emitter.off(['after-filtering'], () => this.calc());
this.initialized = false;
}

10
src/modules/clearButton.js
View file

@ -35,6 +35,12 @@ export class ClearButton extends Feature {
*/
this.text = f.btn_reset_text || 'Reset';
/**
* Css class for reset button
* @type {String}
*/
this.cssClass = f.btn_reset_css_class || 'reset';
/**
* Tooltip text for the clear button
* @type {String}
@ -47,7 +53,7 @@ export class ClearButton extends Feature {
*/
this.html = f.btn_reset_html ||
(!tf.enableIcons ? null :
'<input type="button" value="" class="' + tf.btnResetCssClass +
'<input type="button" value="" class="' + this.cssClass +
'" ' + 'title="' + this.tooltip + '" />');
/**
@ -90,7 +96,7 @@ export class ClearButton extends Feature {
if (!this.html) {
let fltreset = createElm('a', ['href', 'javascript:void(0);']);
fltreset.className = tf.btnResetCssClass;
fltreset.className = this.cssClass;
fltreset.appendChild(createText(this.text));
resetspan.appendChild(fltreset);
addEvt(fltreset, 'click', () => this.onClick());

6
src/tablefilter.js
View file

@ -764,12 +764,6 @@ export class TableFilter {
*/
this.btnReset = Boolean(f.btn_reset);
/**
* Css class for reset button
* @type {String}
*/
this.btnResetCssClass = f.btn_reset_css_class || 'reset';
/**
* Callback fired before filters are cleared
* @type {Function}