mirror of
https://github.com/koalyptus/TableFilter.git
synced 2024-05-09 18:06:53 +02:00
Cleaned code
This commit is contained in:
parent
dcfe5d44c7
commit
77e606cf12
2
dist/tablefilter/style/colsVisibility.css
vendored
2
dist/tablefilter/style/colsVisibility.css
vendored
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.4.34 by Max Guglielmi
|
||||
* build date: 2017-01-13T06:45:45.214Z
|
||||
* build date: 2017-01-15T03:47:16.414Z
|
||||
* 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}
|
2
dist/tablefilter/style/filtersVisibility.css
vendored
2
dist/tablefilter/style/filtersVisibility.css
vendored
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.4.34 by Max Guglielmi
|
||||
* build date: 2017-01-13T06:45:45.214Z
|
||||
* build date: 2017-01-15T03:47:16.414Z
|
||||
* 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}
|
2
dist/tablefilter/style/tablefilter.css
vendored
2
dist/tablefilter/style/tablefilter.css
vendored
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.4.34 by Max Guglielmi
|
||||
* build date: 2017-01-13T06:45:45.214Z
|
||||
* build date: 2017-01-15T03:47:16.414Z
|
||||
* MIT License
|
||||
*/
|
||||
.activeHeader{background-color:#66afe9 !important;color:#fff !important}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.4.34 by Max Guglielmi
|
||||
* build date: 2017-01-13T06:45:45.214Z
|
||||
* build date: 2017-01-15T03:47:16.414Z
|
||||
* 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}
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.4.34 by Max Guglielmi
|
||||
* build date: 2017-01-13T06:45:45.214Z
|
||||
* build date: 2017-01-15T03:47:16.414Z
|
||||
* 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}
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.4.34 by Max Guglielmi
|
||||
* build date: 2017-01-13T06:45:45.214Z
|
||||
* build date: 2017-01-15T03:47:16.414Z
|
||||
* 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}
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.4.34 by Max Guglielmi
|
||||
* build date: 2017-01-13T06:45:45.214Z
|
||||
* build date: 2017-01-15T03:47:16.414Z
|
||||
* 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}
|
21526
dist/tablefilter/tablefilter.js
vendored
21526
dist/tablefilter/tablefilter.js
vendored
File diff suppressed because one or more lines are too long
2
dist/tablefilter/tablefilter.js.map
vendored
2
dist/tablefilter/tablefilter.js.map
vendored
File diff suppressed because one or more lines are too long
|
@ -151,22 +151,6 @@ export default class ColOps extends Feature {
|
|||
//nuovella: determine unique list of columns to operate on
|
||||
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 <= 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) {
|
||||
|
@ -175,8 +159,6 @@ export default class ColOps extends Feature {
|
|||
});
|
||||
nbCols = uIndexes.length - 1;
|
||||
|
||||
console.log('uIndexes',uIndexes, 'colIndexes',colIndexes)
|
||||
|
||||
let rows = tf.tbl.rows,
|
||||
colValues = [];
|
||||
|
||||
|
@ -192,27 +174,11 @@ export default class ColOps extends Feature {
|
|||
|
||||
//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*/;
|
||||
idx = -1;
|
||||
|
||||
for (let k = 0; k < colIndexes.length; k++) {
|
||||
if (colIndexes[k] !== uIndexes[u]) {
|
||||
|
@ -224,66 +190,25 @@ export default class ColOps extends Feature {
|
|||
precisions[idx] = decimalPrecisions[k];
|
||||
labels[idx] = this.labelIds[k];
|
||||
writeType = isArray(outputTypes) ? outputTypes[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 (let i = 0; i <= idx; i++) {
|
||||
result = this.calc(curValues, operations[i], null);
|
||||
result = Number(result);
|
||||
|
||||
this.emitter.emit(
|
||||
'before-column-calc',
|
||||
tf,
|
||||
this,
|
||||
uIndexes[u],
|
||||
curValues,
|
||||
operations[i],
|
||||
precisions[i]
|
||||
);
|
||||
|
||||
result = Number(this.calc(curValues, operations[i], null));
|
||||
|
||||
this.emitter.emit(
|
||||
'column-calc',
|
||||
this.tf,
|
||||
tf,
|
||||
this,
|
||||
uIndexes[u],
|
||||
result,
|
||||
|
@ -291,36 +216,6 @@ export default class ColOps extends Feature {
|
|||
precisions[i]
|
||||
);
|
||||
|
||||
// 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;
|
||||
// }
|
||||
|
||||
this.writeResult(
|
||||
result,
|
||||
labels[i],
|
||||
|
@ -367,22 +262,17 @@ export default class ColOps extends Feature {
|
|||
*/
|
||||
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) {
|
||||
sumValue = this.calcSum(colValues);
|
||||
}
|
||||
|
||||
switch (operation) {
|
||||
case MEAN:
|
||||
result = sumValue / colValues.length;
|
||||
result = this.calcMean(colValues);
|
||||
break;
|
||||
case SUM:
|
||||
result = sumValue;
|
||||
result = this.calcSum(colValues);
|
||||
break;
|
||||
case MIN:
|
||||
result = this.calcMin(colValues);
|
||||
|
@ -410,10 +300,23 @@ export default class ColOps extends Feature {
|
|||
* @returns {Number}
|
||||
*/
|
||||
calcSum(values = []) {
|
||||
if (isEmpty(values)) {
|
||||
return 0;
|
||||
}
|
||||
let result = values.reduce((x, y) => x + y);
|
||||
return Number(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* Calculate the mean of passed values.
|
||||
* @param {Array} [values=[]] List of values
|
||||
* @returns {Number}
|
||||
*/
|
||||
calcMean(values = []) {
|
||||
let result = this.calcSum(values) / values.length;
|
||||
return Number(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* Calculate the max value of passed values.
|
||||
* @param {Array} [values=[]] List of values
|
||||
|
|
|
@ -2383,6 +2383,8 @@ export class TableFilter {
|
|||
* @param {Boolean} includeHeaders Optional: include headers row
|
||||
* @param {Boolean} num Optional: return unformatted number
|
||||
* @param {Array} exclude Optional: list of row indexes to be excluded
|
||||
* @param {Boolean} visible Optional: return only visible data
|
||||
* (relevant for paging)
|
||||
* @return {Array} Flat list of values ['val0','val1','val2'...]
|
||||
*
|
||||
* TODO: provide an API returning data in JSON format
|
||||
|
@ -2391,14 +2393,12 @@ export class TableFilter {
|
|||
colIndex,
|
||||
includeHeaders = false,
|
||||
num = false,
|
||||
exclude = []
|
||||
exclude = [],
|
||||
visible = true
|
||||
) {
|
||||
if (isUndef(colIndex)) {
|
||||
return [];
|
||||
}
|
||||
// retrieve column values
|
||||
let colValues =
|
||||
this.getColValues(colIndex, includeHeaders, num, exclude);
|
||||
|
||||
let rows = this.tbl.rows;
|
||||
|
||||
|
@ -2406,7 +2406,9 @@ export class TableFilter {
|
|||
// displayed
|
||||
let validRows = this.getValidRows(true).filter((rowIdx) => {
|
||||
return exclude.indexOf(rowIdx) === -1 &&
|
||||
this.getRowDisplay(rows[rowIdx]) !== 'none';
|
||||
(visible ?
|
||||
this.getRowDisplay(rows[rowIdx]) !== 'none' :
|
||||
true);
|
||||
});
|
||||
|
||||
let decimal = this.decimalSeparator;
|
||||
|
@ -2423,16 +2425,11 @@ export class TableFilter {
|
|||
return num ? Number(val) || parseNb(val, decimal) : val;
|
||||
});
|
||||
|
||||
// retain column values in valid rows only
|
||||
colValues = colValues.filter((value) => {
|
||||
return validColValues.indexOf(value) !== -1;
|
||||
});
|
||||
|
||||
if (includeHeaders) {
|
||||
colValues.unshift(this.getHeadersText()[colIndex]);
|
||||
validColValues.unshift(this.getHeadersText()[colIndex]);
|
||||
}
|
||||
|
||||
return colValues;
|
||||
return validColValues;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -63,7 +63,7 @@ export const isUndef = (obj) => obj === UNDEFINED;
|
|||
* @param {Any} obj
|
||||
* @return {Boolean}
|
||||
*/
|
||||
export const isNull = obj => obj === null;
|
||||
export const isNull = (obj) => obj === null;
|
||||
|
||||
/**
|
||||
* Check passed argument is empty (undefined, null or empty string)
|
||||
|
|
Loading…
Reference in a new issue