mirror of
https://github.com/koalyptus/TableFilter.git
synced 2024-05-07 00:46:39 +02:00
Added results formatting to ColOps
This commit is contained in:
Max Guglielmi
parent
d05a3c4dc0
commit
c49eb2e50f
4
dist/starter.html
vendored
4
dist/starter.html
vendored
|
|
@ -1,10 +1,10 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>tablefilter v0.5.2 - Starter</title>
|
||||
<title>tablefilter v0.5.3 - Starter</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>tablefilter v0.5.2</h1>
|
||||
<h1>tablefilter v0.5.3</h1>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
4
dist/tablefilter/style/colsVisibility.css
vendored
4
dist/tablefilter/style/colsVisibility.css
vendored
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.5.2 by Max Guglielmi
|
||||
* build date: 2017-03-16T04:00:25.872Z
|
||||
* tablefilter v0.5.3 by Max Guglielmi
|
||||
* build date: 2017-03-17T22:06:10.963Z
|
||||
* 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
4
dist/tablefilter/style/filtersVisibility.css
vendored
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.5.2 by Max Guglielmi
|
||||
* build date: 2017-03-16T04:00:25.872Z
|
||||
* tablefilter v0.5.3 by Max Guglielmi
|
||||
* build date: 2017-03-17T22:06:10.963Z
|
||||
* 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
4
dist/tablefilter/style/tablefilter.css
vendored
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.5.2 by Max Guglielmi
|
||||
* build date: 2017-03-16T04:00:25.872Z
|
||||
* tablefilter v0.5.3 by Max Guglielmi
|
||||
* build date: 2017-03-17T22:06:10.963Z
|
||||
* MIT License
|
||||
*/
|
||||
.activeHeader{background-color:#66afe9 !important;color:#fff !important}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.5.2 by Max Guglielmi
|
||||
* build date: 2017-03-16T04:00:25.872Z
|
||||
* tablefilter v0.5.3 by Max Guglielmi
|
||||
* build date: 2017-03-17T22:06:10.963Z
|
||||
* 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.5.2 by Max Guglielmi
|
||||
* build date: 2017-03-16T04:00:25.872Z
|
||||
* tablefilter v0.5.3 by Max Guglielmi
|
||||
* build date: 2017-03-17T22:06:10.963Z
|
||||
* 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.5.2 by Max Guglielmi
|
||||
* build date: 2017-03-16T04:00:25.872Z
|
||||
* tablefilter v0.5.3 by Max Guglielmi
|
||||
* build date: 2017-03-17T22:06:10.963Z
|
||||
* 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.5.2 by Max Guglielmi
|
||||
* build date: 2017-03-16T04:00:25.872Z
|
||||
* tablefilter v0.5.3 by Max Guglielmi
|
||||
* build date: 2017-03-17T22:06:10.963Z
|
||||
* 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}
|
||||
12
dist/tablefilter/tablefilter.js
vendored
12
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
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
9
dist/tablefilter/tf-0-c333c675ce1d3b1a3d3c.js
vendored
Normal file
9
dist/tablefilter/tf-0-c333c675ce1d3b1a3d3c.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
dist/tablefilter/tf-0-c333c675ce1d3b1a3d3c.js.map
vendored
Normal file
1
dist/tablefilter/tf-0-c333c675ce1d3b1a3d3c.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "tablefilter",
|
||||
"version": "0.5.2",
|
||||
"version": "0.5.3",
|
||||
"description": "A Javascript library making HTML tables filterable and a bit more",
|
||||
"license": "MIT",
|
||||
"author": {
|
||||
|
|
@ -46,6 +46,7 @@
|
|||
"clean-webpack-plugin": "^0.1.16",
|
||||
"codecov": "2.0.1",
|
||||
"diacritics": "1.3.0",
|
||||
"format-number": "2.0.2",
|
||||
"grunt": "^1.0.1",
|
||||
"grunt-babel": "^6.0.0",
|
||||
"grunt-cli": "1.2.0",
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@ import {Feature} from '../../feature';
|
|||
import {createText, elm} from '../../dom';
|
||||
import {isArray, isFn, isUndef, isEmpty, EMPTY_FN} from '../../types';
|
||||
import {numSortAsc} from '../../sort';
|
||||
import {FORMATTED_NUMBER} from '../../const';
|
||||
import formatNumber from 'format-number';
|
||||
|
||||
const EVENTS = [
|
||||
'after-filtering',
|
||||
|
|
@ -77,6 +79,14 @@ export default class ColOps extends Feature {
|
|||
*/
|
||||
this.outputTypes = opts.write_method || [];
|
||||
|
||||
/**
|
||||
* List of format objects used for formatting the result -
|
||||
* refer to https://github.com/componitable/format-number to check
|
||||
* configuration options
|
||||
* @type {Array}
|
||||
*/
|
||||
this.formatResults = opts.format_result || [];
|
||||
|
||||
/**
|
||||
* List of row indexes displaying the results
|
||||
* @type {Array}
|
||||
|
|
@ -140,12 +150,9 @@ export default class ColOps extends Feature {
|
|||
this.onBeforeOperation(tf, this);
|
||||
this.emitter.emit('before-column-operation', tf, this);
|
||||
|
||||
let colIndexes = this.colIndexes,
|
||||
colOperations = this.operations,
|
||||
outputTypes = this.outputTypes,
|
||||
totRowIndexes = this.totRowIndexes,
|
||||
excludeRows = this.excludeRows,
|
||||
decimalPrecisions = isUndef(this.decimalPrecisions) ?
|
||||
let { colIndexes, operations: colOperations, outputTypes,
|
||||
totRowIndexes, excludeRows, formatResults } = this;
|
||||
let decimalPrecisions = isUndef(this.decimalPrecisions) ?
|
||||
2 : this.decimalPrecisions;
|
||||
|
||||
//nuovella: determine unique list of columns to operate on
|
||||
|
|
@ -176,6 +183,7 @@ export default class ColOps extends Feature {
|
|||
precisions = [],
|
||||
labels = [],
|
||||
writeType,
|
||||
formatResult = [],
|
||||
idx = 0;
|
||||
|
||||
for (let k = 0; k < colIndexes.length; k++) {
|
||||
|
|
@ -186,6 +194,8 @@ export default class ColOps extends Feature {
|
|||
precisions[idx] = decimalPrecisions[k];
|
||||
labels[idx] = this.labelIds[k];
|
||||
writeType = isArray(outputTypes) ? outputTypes[k] : null;
|
||||
formatResult[idx] =
|
||||
this.configureFormat(uIndexes[u], formatResults[k]);
|
||||
idx++;
|
||||
}
|
||||
|
||||
|
|
@ -219,7 +229,8 @@ export default class ColOps extends Feature {
|
|||
result,
|
||||
labels[i],
|
||||
writeType,
|
||||
precisions[i]
|
||||
precisions[i],
|
||||
formatResult[i]
|
||||
);
|
||||
|
||||
}//for i
|
||||
|
|
@ -402,7 +413,8 @@ export default class ColOps extends Feature {
|
|||
* @param {Number} [precision=2] Applied decimal precision
|
||||
* @private
|
||||
*/
|
||||
writeResult(result = 0, label, writeType = 'innerhtml', precision = 2) {
|
||||
writeResult(result = 0, label, writeType = 'innerhtml',
|
||||
precision = 2, format = {}) {
|
||||
let labelElm = elm(label);
|
||||
|
||||
if (!labelElm) {
|
||||
|
|
@ -412,6 +424,8 @@ export default class ColOps extends Feature {
|
|||
result = result.toFixed(precision);
|
||||
if (isNaN(result) || !isFinite(result)) {
|
||||
result = '';
|
||||
} else {
|
||||
result = formatNumber(format)(result);
|
||||
}
|
||||
|
||||
switch (writeType.toLowerCase()) {
|
||||
|
|
@ -429,6 +443,31 @@ export default class ColOps extends Feature {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Configure the format options used to format the operation result based
|
||||
* on column type.
|
||||
* @param {Number} colIndex Column index
|
||||
* @param {Object} [format={}] Format object
|
||||
* @returns {Object}
|
||||
* @private
|
||||
*/
|
||||
configureFormat(colIndex, format = {}) {
|
||||
let tf = this.tf;
|
||||
if (tf.hasType(colIndex, [FORMATTED_NUMBER])) {
|
||||
let colType = tf.colTypes[colIndex];
|
||||
if (colType.decimal && !format.decimal) {
|
||||
format.decimal = colType.decimal;
|
||||
}
|
||||
if (colType.thousands && !format.integerSeparator) {
|
||||
format.integerSeparator = colType.thousands;
|
||||
}
|
||||
} else {
|
||||
format.decimal = format.decimal || '';
|
||||
format.integerSeparator = format.integerSeparator || '';
|
||||
}
|
||||
return format;
|
||||
}
|
||||
|
||||
/** Remove extension */
|
||||
destroy() {
|
||||
if (!this.initialized) {
|
||||
|
|
|
|||
|
|
@ -871,13 +871,6 @@ export class TableFilter {
|
|||
*/
|
||||
this.decimalSeparator = f.decimal_separator || '.';
|
||||
|
||||
/**
|
||||
* Determine whether table has columns data types
|
||||
* @type {Boolean}
|
||||
* @private
|
||||
*/
|
||||
this.hasColTypes = isArray(f.col_types);
|
||||
|
||||
/**
|
||||
* Define data types on a column basis, possible values 'string',
|
||||
* 'number', 'formatted-number', 'date', 'ipaddress' ie:
|
||||
|
|
@ -892,7 +885,7 @@ export class TableFilter {
|
|||
* information on date parsing formats supported by Sugar Date
|
||||
* @type {Array}
|
||||
*/
|
||||
this.colTypes = this.hasColTypes ? f.col_types : [];
|
||||
this.colTypes = isArray(f.col_types) ? f.col_types : [];
|
||||
|
||||
/*** ids prefixes ***/
|
||||
/**
|
||||
|
|
@ -2283,7 +2276,7 @@ export class TableFilter {
|
|||
return parseNb(value, decimal);
|
||||
}
|
||||
else if (this.hasType(colIndex, [NUMBER])) {
|
||||
return Number(value);
|
||||
return Number(value) || parseNb(value);
|
||||
}
|
||||
else if (this.hasType(colIndex, [DATE])){
|
||||
let dateType = this.Mod.dateType;
|
||||
|
|
@ -2942,7 +2935,7 @@ export class TableFilter {
|
|||
* @returns {Boolean}
|
||||
*/
|
||||
hasType(colIndex, types = []) {
|
||||
if (!this.hasColTypes) {
|
||||
if (this.colTypes.length === 0) {
|
||||
return false;
|
||||
}
|
||||
let colType = this.colTypes[colIndex];
|
||||
|
|
|
|||
|
|
@ -32,40 +32,6 @@ var id = function (id){
|
|||
var table = id('demo-tot');
|
||||
var totRowIndex = table.getElementsByTagName('tr').length;
|
||||
|
||||
function addCommas(nStr){
|
||||
nStr += '';
|
||||
var x = nStr.split('.');
|
||||
var x1 = x[0];
|
||||
var x2 = x.length > 1 ? '.' + x[1] : '';
|
||||
var rgx = /(\d+)(\d{3})/;
|
||||
while (rgx.test(x1)) {
|
||||
x1 = x1.replace(rgx, '$1' + ',' + '$2');
|
||||
}
|
||||
return x1 + x2;
|
||||
}
|
||||
|
||||
function addDots(nStr){
|
||||
nStr += '';
|
||||
var x = nStr.split('.');
|
||||
var x1 = x[0];
|
||||
var x2 = x.length > 1 ? ',' + x[1] : '';
|
||||
var rgx = /(\d+)(\d{3})/;
|
||||
while (rgx.test(x1)) {
|
||||
x1 = x1.replace(rgx, '$1' + '.' + '$2');
|
||||
}
|
||||
return x1 + x2;
|
||||
}
|
||||
|
||||
function formatTotals(){
|
||||
var tot1 = id('sum1').innerHTML;
|
||||
tot1 = addDots(tot1);
|
||||
id('sum1').innerHTML = tot1;
|
||||
|
||||
var tot2 = id('sum2').innerHTML;
|
||||
tot2 = addCommas(tot2);
|
||||
id('sum2').innerHTML = tot2;
|
||||
}
|
||||
|
||||
/* EXAMPLE 1
|
||||
*********************** */
|
||||
var tfConfig = {
|
||||
|
|
@ -107,7 +73,10 @@ var tfConfig = {
|
|||
exclude_row: [totRowIndex],
|
||||
decimal_precision: [2, 2],
|
||||
tot_row_index: [totRowIndex],
|
||||
on_after_operation: formatTotals
|
||||
format_result: [
|
||||
{ prefix: '€ ' },
|
||||
{ prefix: '$ ' }
|
||||
]
|
||||
}
|
||||
]
|
||||
};
|
||||
|
|
|
|||
|
|
@ -140,6 +140,61 @@ test('Can make column calculations', function() {
|
|||
deepEqual(result2, 2781, 'columnCalc max');
|
||||
});
|
||||
|
||||
test('Can make column calculations with formated results', function() {
|
||||
// setup
|
||||
var colOps = tf.extension('colOps');
|
||||
colOps.formatResults[2] = { suffix: ' Km' };
|
||||
colOps.formatResults[4] = { suffix: ' Km' };
|
||||
colOps.formatResults[6] = { suffix: ' Km' };
|
||||
tf.colTypes[2] = { type: 'formatted-number', decimal: '.', thousands: ',' };
|
||||
|
||||
// act
|
||||
colOps.calcAll();
|
||||
|
||||
// assert
|
||||
deepEqual(id('mean1').innerHTML, '1,416 Km', 'Formatted mean result');
|
||||
deepEqual(id('min1').innerHTML, '286 Km', 'Formatted min result');
|
||||
deepEqual(id('max1').innerHTML, '2,781 Km', 'Formatted max result');
|
||||
|
||||
colOps.formatResults[2] = undefined;
|
||||
colOps.formatResults[4] = undefined;
|
||||
colOps.formatResults[6] = undefined;
|
||||
tf.colTypes[2] = undefined;
|
||||
});
|
||||
|
||||
test('Can configure result format', function() {
|
||||
// setup
|
||||
var colOps = tf.extension('colOps');
|
||||
var format = { prefix: '$', suffix: '/item' };
|
||||
|
||||
// act
|
||||
var format = colOps.configureFormat(2, format);
|
||||
|
||||
// assert
|
||||
deepEqual(format.prefix, '$', 'prefix');
|
||||
deepEqual(format.suffix, '/item', 'suffix');
|
||||
deepEqual(format.decimal, '', 'decimal separator');
|
||||
deepEqual(format.integerSeparator, '', 'thousands separator');
|
||||
});
|
||||
|
||||
test('Can configure result format for formatted number column', function() {
|
||||
// setup
|
||||
var colOps = tf.extension('colOps');
|
||||
var format = { prefix: '$', suffix: '/item' };
|
||||
tf.colTypes = [null, null, null, null, null];
|
||||
tf.colTypes[3] = { type: 'formatted-number', decimal: ',', thousands: '.' };
|
||||
|
||||
// act
|
||||
var format = colOps.configureFormat(3, format);
|
||||
|
||||
// assert
|
||||
deepEqual(format.prefix, '$', 'prefix');
|
||||
deepEqual(format.suffix, '/item', 'suffix');
|
||||
deepEqual(format.decimal, ',', 'decimal separator');
|
||||
deepEqual(format.integerSeparator, '.', 'thousands separator');
|
||||
tf.colTypes[3] = undefined;
|
||||
});
|
||||
|
||||
module('Tear-down');
|
||||
test('can destroy', function() {
|
||||
tf.destroy();
|
||||
|
|
|
|||
Loading…
Reference in a new issue