1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2024-04-30 13:52:53 +02:00

Added comments

This commit is contained in:
Max Guglielmi 2017-01-15 00:09:28 +11:00
parent 1f5ad88a39
commit dcfe5d44c7
12 changed files with 388 additions and 225 deletions

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.4.34 by Max Guglielmi
* build date: 2017-01-13T05:02:11.907Z
* build date: 2017-01-13T06:45:45.214Z
* 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.34 by Max Guglielmi
* build date: 2017-01-13T05:02:11.907Z
* build date: 2017-01-13T06:45:45.214Z
* 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.34 by Max Guglielmi
* build date: 2017-01-13T05:02:11.907Z
* build date: 2017-01-13T06:45:45.214Z
* MIT License
*/
.activeHeader{background-color:#66afe9 !important;color:#fff !important}

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.4.34 by Max Guglielmi
* build date: 2017-01-13T05:02:11.907Z
* build date: 2017-01-13T06:45:45.214Z
* 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.34 by Max Guglielmi
* build date: 2017-01-13T05:02:11.907Z
* build date: 2017-01-13T06:45:45.214Z
* 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.34 by Max Guglielmi
* build date: 2017-01-13T05:02:11.907Z
* build date: 2017-01-13T06:45:45.214Z
* 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}

View file

@ -1,6 +1,6 @@
/**
* tablefilter v0.4.34 by Max Guglielmi
* build date: 2017-01-13T05:02:11.907Z
* build date: 2017-01-13T06:45:45.214Z
* MIT License
*/
table.TF{padding:0;color:inherit;border-right:1px solid transparent;border-top:1px solid transparent;border-left:1px solid transparent;border-bottom:0;}table.TF th{margin:0;color:inherit;background-color:transparent;border-color:transparent;border-width:1px;border-style:solid;}table.TF th:last-child{border-right:1px solid transparent}table.TF td{margin:0;padding:5px;color:inherit;border-bottom:1px solid transparent;border-left:0;border-top:0;border-right:0}.fltrow{background-color:transparent;}.fltrow th,.fltrow td{padding:1px 3px 1px 3px;border-bottom:1px solid transparent !important;}.fltrow th:last-child,.fltrow td:last-child{border-right:1px solid transparent}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #a4bed4}input.flt{width:99% !important}.inf{background-color:transparent;border:1px solid transparent;height:$min-height;color:inherit}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:#f7f7f7 url("images/btn_next_page.gif") center center no-repeat !important;border:1px solid #f7f7f7 !important}.previousPage{background:transparent url("images/btn_prev_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.previousPage:hover{background:#f7f7f7 url("images/btn_prev_page.gif") center center no-repeat !important;border:1px solid #f7f7f7 !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.firstPage:hover{background:#f7f7f7 url("images/btn_first_page.gif") center center no-repeat !important;border:1px solid #f7f7f7 !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.lastPage:hover{background:#f7f7f7 url("images/btn_last_page.gif") center center no-repeat !important;border:1px solid #f7f7f7 !important}.activeHeader{background:#f7f7f7 !important;border:1px solid transparent;color:inherit !important}div.grd_Cont{-webkit-box-shadow:0 0 0 0 rgba(50,50,50,0.75);-moz-box-shadow:0 0 0 0 rgba(50,50,50,0.75);box-shadow:0 0 0 0 rgba(50,50,50,0.75);background-color:transparent;border:1px solid transparent;padding:0 !important;}div.grd_Cont .even{background-color:transparent}div.grd_Cont .odd{background-color:#f7f7f7}div.grd_headTblCont{background-color:transparent;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:transparent;border-bottom:1px solid transparent;border-right:1px solid transparent !important;border-left:1px solid transparent;border-top:1px solid transparent}div.grd_tblCont table td{border-bottom:1px solid transparent;border-right:0 !important;border-left:0 !important;border-top:0 !important}.grd_inf{background-color:transparent;color:inherit;border-top:1px solid transparent;}.grd_inf a{text-decoration:none;font-weight:bold}.loader{background-color:#f7f7f7;border:1px solid #f7f7f7;border-radius:5px;color:#000;text-shadow:none}.even{background-color:transparent}.odd{background-color:#f7f7f7}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.ezActiveRow{background-color:#ccc !important;color:inherit}.ezSelectedRow{background-color:#ccc !important;color:inherit}.ezActiveCell{background-color:transparent;color:inherit;font-weight:bold}.ezETSelectedCell{background-color:transparent;font-weight:bold;color:inherit}

View file

@ -83,7 +83,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ script.charset = 'utf-8';
/******/ script.async = true;
/******/
/******/ script.src = __webpack_require__.p + "tf-" + ({}[chunkId]||chunkId) + "-" + {"1":"48eaa6bffe5054f82ce9"}[chunkId] + ".js";
/******/ script.src = __webpack_require__.p + "tf-" + ({}[chunkId]||chunkId) + "-" + {"1":"05a734fa5f686a5bcd3d"}[chunkId] + ".js";
/******/ head.appendChild(script);
/******/ }
/******/ };

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,6 @@
import {Feature} from '../../feature';
import {createText, elm} from '../../dom';
import {isArray, isFn, isUndef, EMPTY_FN} from '../../types';
import {isArray, isFn, isUndef, isEmpty, EMPTY_FN} from '../../types';
import {numSortAsc} from '../../sort';
const EVENTS = [
@ -9,6 +9,14 @@ const EVENTS = [
'after-page-length-change'
];
const SUM = 'sum';
const MEAN = 'mean';
const MIN = 'min';
const MAX = 'max';
const MEDIAN = 'median';
const Q1 = 'q1';
const Q3 = 'q3';
/**
* Column calculations extension
*/
@ -43,6 +51,51 @@ export default class ColOps extends Feature {
*/
this.opts = opts;
/**
* List of DOM element IDs containing column's calculation result
* @type {Array}
*/
this.labelIds = opts.id || [];
/**
* List of columns' indexes for calculations
* @type {Array}
*/
this.colIndexes = opts.col || [];
/**
* List of operations - possible values: 'sum', 'mean', 'min', 'max',
* 'median', 'q1', 'q3'
* @type {Array}
*/
this.operations = opts.operation || [];
/**
* List of write methods used to write the result - possible values:
* 'innerHTML', 'setValue', 'createTextNode'
* @type {Array}
*/
this.outputTypes = opts.write_method || [];
/**
* List of row indexes displaying the results
* @type {Array}
*/
this.totRowIndexes = opts.tot_row_index || [];
/**
* List of row indexes excluded from calculations
* @type {Array}
*/
this.excludeRows = opts.exclude_row || [];
/**
* List of decimal precision for calculation results
* @type {Array}
*/
this.decimalPrecisions = isUndef(opts.decimal_precision) ?
2 : opts.decimal_precision;
this.enable();
}
@ -54,13 +107,11 @@ export default class ColOps extends Feature {
return;
}
// subscribe to events
this.emitter.on(EVENTS, () => this.calc());
this.emitter.on(EVENTS, () => this.calcAll());
this.calc();
this.calcAll();
/**
* @inherited
*/
/** @inherited */
this.initialized = true;
}
@ -80,7 +131,7 @@ export default class ColOps extends Feature {
* (1) optimized the routine (now it will only process each column once),
* (2) added calculations for the median, lower and upper quartile.
*/
calc() {
calcAll() {
let tf = this.tf;
if (!tf.isInitialized()) {
return;
@ -89,266 +140,338 @@ export default class ColOps extends Feature {
this.onBeforeOperation(tf, this);
this.emitter.emit('before-column-operation', tf, this);
let opts = this.opts,
labelId = opts.id,
colIndexes = opts.col,
operation = opts.operation,
outputType = opts.write_method,
totRowIndex = opts.tot_row_index,
excludeRow = opts.exclude_row,
decimalPrecision = isUndef(opts.decimal_precision) ?
2 : opts.decimal_precision;
let colIndexes = this.colIndexes,
colOperations = this.operations,
outputTypes = this.outputTypes,
totRowIndexes = this.totRowIndexes,
excludeRows = this.excludeRows,
decimalPrecisions = isUndef(this.decimalPrecisions) ?
2 : this.decimalPrecisions;
//nuovella: determine unique list of columns to operate on
let uColIdx = [],
uColMax = 0;
uColIdx[uColMax] = colIndexes[0];
let uIndexes = [],
nbCols = 0;
// uIndexes[nbCols] = colIndexes[0];
for (let ii = 1; ii < colIndexes.length; ii++) {
let saved = 0;
//see if colIndexes[ii] is already in the list of unique indexes
for (let jj = 0; jj <= uColMax; jj++) {
if (uColIdx[jj] === colIndexes[ii]) {
saved = 1;
// for (let ii = 1; ii < colIndexes.length; ii++) {
// let saved = 0;
// //see if colIndexes[ii] is already in the list of unique indexes
// for (let jj = 0; jj <= nbCols; jj++) {
// if (uIndexes[jj] === colIndexes[ii]) {
// saved = 1;
// }
// }
// //if not saved then, save the index
// if (saved === 0) {
// nbCols++;
// uIndexes[nbCols] = colIndexes[ii];
// }
// }
colIndexes.forEach((val) => {
if (uIndexes.indexOf(val) === -1) {
uIndexes.push(val);
}
});
nbCols = uIndexes.length - 1;
console.log('uIndexes',uIndexes, 'colIndexes',colIndexes)
let rows = tf.tbl.rows,
colValues = [];
for (let u = 0; u <= nbCols; u++) {
//this retrieves col values
//use uIndexes because we only want to pass through this loop
//once for each column get the values in this unique column
colValues.push(tf
.getFilteredDataCol(uIndexes[u], false, true, excludeRows)
);
let curValues = colValues[u];
//next: calculate all operations for this column
let result = 0,
// meanValue = 0,
// sumValue = 0,
// minValue = null,
// maxValue = null,
// q1Value = null,
// medValue = null,
// q3Value = null,
// meanFlag = false,
// sumFlag = false,
// minFlag = false,
// maxFlag = false,
// q1Flag = false,
// medFlag = false,
// q3Flag = false,
operations = [],
precisions = [],
labels = [],
writeType,
idx = -1/*,
k = 0,
i = 0*/;
for (let k = 0; k < colIndexes.length; k++) {
if (colIndexes[k] !== uIndexes[u]) {
continue;
}
}
//if not saved then, save the index
if (saved === 0) {
uColMax++;
uColIdx[uColMax] = colIndexes[ii];
}
}
if (isArray(labelId) && isArray(colIndexes) && isArray(operation)) {
let rows = tf.tbl.rows,
colValues = [],
uCol = 0;
idx++;
operations[idx] = colOperations[k].toLowerCase();
precisions[idx] = decimalPrecisions[k];
labels[idx] = this.labelIds[k];
writeType = isArray(outputTypes) ? outputTypes[k] : null;
for (; uCol <= uColMax; uCol++) {
//this retrieves col values
//use uColIdx because we only want to pass through this loop
//once for each column get the values in this unique column
colValues.push(tf
.getFilteredDataCol(uColIdx[uCol], false, true, excludeRow)
// switch (operations[idx]) {
// case MEAN:
// meanFlag = true;
// break;
// case SUM:
// sumFlag = true;
// break;
// case MIN:
// minFlag = true;
// break;
// case MAX:
// maxFlag = true;
// break;
// case MEDIAN:
// medFlag = true;
// break;
// case Q1:
// q1Flag = true;
// break;
// case Q3:
// q3Flag = true;
// break;
// }
}
//sort the values for calculation of median and quartiles
// if (q1Flag || q3Flag || medFlag) {
// curValues = this.sortColumnValues(curValues, numSortAsc);
// }
// if (sumFlag || meanFlag) {
// sumValue = this.calcSum(curValues);
// }
// if (maxFlag) {
// maxValue = this.calcMax(curValues);
// }
// if (minFlag) {
// minValue = this.calcMin(curValues);
// }
// if (meanFlag) {
// meanValue = sumValue / curValues.length;
// }
// if (medFlag) {
// medValue = this.calcMedian(curValues);
// }
// if (q1Flag) {
// q1Value = this.calcQ1(curValues);
// }
// if (q3Flag) {
// q3Value = this.calcQ3(curValues);
// }
for (let i = 0; i <= idx; i++) {
result = this.calc(curValues, operations[i], null);
result = Number(result);
this.emitter.emit(
'column-calc',
this.tf,
this,
uIndexes[u],
result,
operations[i],
precisions[i]
);
let curValues = colValues[uCol];
// switch (operations[i]) {
// case MEAN:
// result = this.columnCalc(null, MEAN, null,curValues);
// // result = meanValue;
// break;
// case SUM:
// // result = sumValue;
// result = this.columnCalc(null, SUM, null, curValues);
// break;
// case MIN:
// // result = minValue;
// result = this.columnCalc(null, MIN, null, curValues);
// break;
// case MAX:
// // result = maxValue;
// result = this.columnCalc(null, MAX, null, curValues);
// break;
// case MEDIAN:
// // result = medValue;
// result = this.columnCalc(null,MEDIAN,null,curValues);
// break;
// case Q1:
// // result = q1Value;
// result = this.columnCalc(null, Q1, null, curValues);
// break;
// case Q3:
// result = this.columnCalc(null, Q3, null, curValues);
// break;
// }
//next: calculate all operations for this column
let result,
meanValue = 0,
sumValue = 0,
minValue = null,
maxValue = null,
q1Value = null,
medValue = null,
q3Value = null,
meanFlag = false,
sumFlag = false,
minFlag = false,
maxFlag = false,
q1Flag = false,
medFlag = false,
q3Flag = false,
operations = [],
precisions = [],
labels = [],
this.writeResult(
result,
labels[i],
writeType,
idx = -1,
k = 0,
i = 0;
precisions[i]
);
for (; k < colIndexes.length; k++) {
if (colIndexes[k] !== uColIdx[uCol]) {
continue;
}
}//for i
idx++;
operations[idx] = operation[k].toLowerCase();
precisions[idx] = decimalPrecision[k];
labels[idx] = labelId[k];
writeType = isArray(outputType) ? outputType[k] : null;
switch (operations[idx]) {
case 'mean':
meanFlag = true;
break;
case 'sum':
sumFlag = true;
break;
case 'min':
minFlag = true;
break;
case 'max':
maxFlag = true;
break;
case 'median':
medFlag = true;
break;
case 'q1':
q1Flag = true;
break;
case 'q3':
q3Flag = true;
break;
}
}
//sort the values for calculation of median and quartiles
if (q1Flag || q3Flag || medFlag) {
curValues = this.sortColumnValues(curValues, numSortAsc);
}
if (sumFlag || meanFlag) {
sumValue = this.calcSum(curValues);
}
if (maxFlag) {
maxValue = this.calcMax(curValues);
}
if (minFlag) {
minValue = this.calcMin(curValues);
}
if (meanFlag) {
meanValue = sumValue / curValues.length;
}
if (medFlag) {
medValue = this.calcMedian(curValues);
}
if (q1Flag) {
q1Value = this.calcQ1(curValues);
}
if (q3Flag) {
q3Value = this.calcQ3(curValues);
}
for (; i <= idx; i++) {
switch (operations[i]) {
case 'mean':
result = meanValue;
break;
case 'sum':
result = sumValue;
break;
case 'min':
result = minValue;
break;
case 'max':
result = maxValue;
break;
case 'median':
result = medValue;
break;
case 'q1':
result = q1Value;
break;
case 'q3':
result = q3Value;
break;
}
this.writeResult(
result,
labels[i],
writeType,
precisions[i]
);
}//for i
// row(s) with result are always visible
let totRow = totRowIndex && totRowIndex[uCol] ?
rows[totRowIndex[uCol]] : null;
if (totRow) {
totRow.style.display = '';
}
}//for uCol
}//if typeof
// row(s) with result are always visible
let totRow = totRowIndexes && totRowIndexes[u] ?
rows[totRowIndexes[u]] : null;
if (totRow) {
totRow.style.display = '';
}
}//for u
this.onAfterOperation(tf, this);
this.emitter.emit('after-column-operation', tf, this);
}
columnCalc(colIndex, operation = 'sum', precision = 2) {
let result;
let colValues = [];
let excludeRows = this.opts.exclude_row || [];
let sumValue = 0;
colValues =
/**
* Make desired calculation on specified column.
* @param {Number} colIndex Column index
* @param {any} [operation=SUM] Operation type
* @param {any} precision Decimal precision
* @returns {Number}
*/
columnCalc(colIndex, operation = SUM, precision) {
let excludeRows = this.excludeRows || [];
let colValues =
this.tf.getFilteredDataCol(colIndex, false, true, excludeRows);
if (operation === 'q1' || operation === 'q3' ||
operation === 'median') {
return this.calc(colValues, operation, precision);
}
/**
* Make calculation on passed values.
* @param {Array} values List of values
* @param {String} [operation=SUM] Optional operation type
* @param {Number} precision Optional result precision
* @returns {Number}
* @private
*/
calc(colValues, operation = SUM, precision) {
let result = 0;
let sumValue = 0;
if (operation === Q1 || operation === Q3 || operation === MEDIAN) {
colValues = this.sortColumnValues(colValues, numSortAsc);
}
if (operation === 'sum' || operation === 'mean') {
if (operation === SUM || operation === MEAN) {
sumValue = this.calcSum(colValues);
}
switch (operation) {
case 'mean':
case MEAN:
result = sumValue / colValues.length;
break;
case 'sum':
case SUM:
result = sumValue;
break;
case 'min':
case MIN:
result = this.calcMin(colValues);
break;
case 'max':
case MAX:
result = this.calcMax(colValues);
break;
case 'median':
case MEDIAN:
result = this.calcMedian(colValues);
break;
case 'q1':
case Q1:
result = this.calcQ1(colValues);
break;
case 'q3':
case Q3:
result = this.calcQ3(colValues);
break;
}
return result.toFixed(precision);
return isEmpty(precision) ? result : result.toFixed(precision);
}
/**
* Calculate the sum of passed values.
* @param {Array} [values=[]] List of values
* @returns {Number}
*/
calcSum(values = []) {
console.log(values);
return values.reduce((x, y) => x + y);
let result = values.reduce((x, y) => x + y);
return Number(result);
}
/**
* Calculate the max value of passed values.
* @param {Array} [values=[]] List of values
* @returns {Number}
*/
calcMax(values = []) {
return Math.max.apply(null, values);
}
/**
* Calculate the min value of passed values.
* @param {Array} [values=[]] List of values
* @returns {Number}
*/
calcMin(values = []) {
return Math.min.apply(null, values);
}
/**
* Calculate the median of passed values.
* @param {Array} [values=[]] List of values
* @returns {Number}
*/
calcMedian(values = []) {
let nbValues = values.length;
let aux = 0;
if (nbValues % 2 === 1) {
aux = Math.floor(nbValues / 2);
return values[aux];
} else {
return (values[nbValues / 2] +
values[((nbValues / 2) - 1)]) / 2;
return Number(values[aux]);
}
return Number(
(values[nbValues / 2] +
values[((nbValues / 2) - 1)]) / 2
);
}
/**
* Calculate the lower quartile of passed values.
* @param {Array} [values=[]] List of values
* @returns {Number}
*/
calcQ1(values = []) {
let nbValues = values.length;
let posa = 0.0;
posa = Math.floor(nbValues / 4);
if (4 * posa === nbValues) {
return (values[posa - 1] + values[posa]) / 2;
} else {
return values[posa];
return Number(
(values[posa - 1] + values[posa]) / 2
);
}
return Number(values[posa]);
}
/**
* Calculate the upper quartile of passed values.
* @param {Array} [values=[]] List of values
* @returns {Number}
*/
calcQ3(values = []) {
let nbValues = values.length;
let posa = 0.0;
@ -356,16 +479,32 @@ export default class ColOps extends Feature {
posa = Math.floor(nbValues / 4);
if (4 * posa === nbValues) {
posb = 3 * posa;
return (values[posb] + values[posb - 1]) / 2;
} else {
return values[nbValues - posa - 1];
return Number(
(values[posb] + values[posb - 1]) / 2
);
}
return Number(values[nbValues - posa - 1]);
}
/**
* Sort passed values with supplied sorter function.
* @param {Array} [values=[]] List of values to be sorted
* @param {Function} sorter Sorter function
* @returns {Array}
*/
sortColumnValues(values = [], sorter) {
return values.sort(sorter);
}
/**
* Write calculation result in passed DOM element with supplied write method
* and decimal precision.
* @param {Number} [result=0] Calculation result
* @param {DOMElement} label DOM element
* @param {String} [writeType='innerhtml'] Write method
* @param {Number} [precision=2] Applied decimal precision
* @private
*/
writeResult(result = 0, label, writeType = 'innerhtml', precision = 2) {
let labelElm = elm(label);
@ -386,23 +525,20 @@ export default class ColOps extends Feature {
labelElm.value = result;
break;
case 'createtextnode':
let oldnode = labelElm.firstChild;
let txtnode = createText(result);
labelElm.replaceChild(txtnode, oldnode);
let oldNode = labelElm.firstChild;
let txtNode = createText(result);
labelElm.replaceChild(txtNode, oldNode);
break;
}
}
/**
* Remove extension
*/
/** Remove extension */
destroy() {
if (!this.initialized) {
return;
}
// unsubscribe to events
this.emitter.off(EVENTS, () => this.calc());
this.emitter.off(EVENTS, () => this.calcAll());
this.initialized = false;
}

View file

@ -27,6 +27,18 @@
<td></td>
<td></td>
</tr>
<tr>
<td>Tot</td>
<td></td>
<td></td>
<td id="sum3" align="right"></td>
<td id="sum4" align="right"></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</tfoot>
<tbody>
<tr>
@ -350,4 +362,4 @@
<td>88.233.19.89</td>
</tr>
</tbody>
</table>
</table>

View file

@ -88,7 +88,7 @@ var tfConfig = {
{ type: 'date', locale: 'en', format: ['{dd}-{months}-{yyyy|yy}'] },
'ipaddress'
],
rows_always_visible: [totRowIndex],
rows_always_visible: [totRowIndex-1, totRowIndex],
on_filters_loaded: function(tf){
tf.setFilterValue(3, '>1.000');
tf.setFilterValue(4, '<2,500');
@ -100,13 +100,28 @@ var tfConfig = {
{ name: 'sort' },
{
name: 'colOps',
id: ['sum1', 'sum2'],
col: [3, 4],
operation: ['sum', 'mean'],
write_method: ['innerhtml', 'innerhtml'],
exclude_row: [totRowIndex],
decimal_precision: [2, 2],
tot_row_index: [totRowIndex],
id: [
'sum1', 'sum3',
'sum2', 'sum4'
],
col: [
3, 3,
4, 4
],
operation: [
'sum', 'mean',
'max', 'q3'
],
write_method: [
'innerhtml', 'innerhtml',
'innerhtml', 'innerhtml'
],
exclude_row: [totRowIndex-1, totRowIndex],
decimal_precision: [
2, 1,
2, 1
],
tot_row_index: [totRowIndex-1, totRowIndex],
on_after_operation: formatTotals
}
]