@datarailsshared/dr_renderer 1.2.206-dragons → 1.2.207-wizards
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/dr_pivottable.js +1 -1
- package/src/highcharts_renderer.js +52 -56
package/package.json
CHANGED
package/src/dr_pivottable.js
CHANGED
|
@@ -865,7 +865,7 @@ let initDRPivotTable = function($, window, document) {
|
|
|
865
865
|
if(!string_val || typeof(string_val) != 'string' ){
|
|
866
866
|
return string_val;
|
|
867
867
|
}
|
|
868
|
-
var entityMap = {"'":"'","<":"<",">":">"," ":"
|
|
868
|
+
var entityMap = {"'":"'","<":"<",">":">"," ":"\u00a0","¡":"¡","¢":"¢","£":"£","¤":"¤","¥":"¥","¦":"¦","§":"§","¨":"¨","©":"©","ª":"ª","«":"«","¬":"¬","®":"®","¯":"¯","°":"°","±":"±","²":"²","³":"³","´":"´","µ":"µ","¶":"¶","·":"·","¸":"¸","¹":"¹","º":"º","»":"»","¼":"¼","½":"½","¾":"¾","¿":"¿","À":"À","Á":"Á","Â":"Â","Ã":"Ã","Ä":"Ä","Å":"Å","Æ":"Æ","Ç":"Ç","È":"È","É":"É","Ê":"Ê","Ë":"Ë","Ì":"Ì","Í":"Í","Î":"Î","Ï":"Ï","Ð":"Ð","Ñ":"Ñ","Ò":"Ò","Ó":"Ó","Ô":"Ô","Õ":"Õ","Ö":"Ö","×":"×","Ø":"Ø","Ù":"Ù","Ú":"Ú","Û":"Û","Ü":"Ü","Ý":"Ý","Þ":"Þ","ß":"ß","à":"à","á":"á","â":"â","ã":"ã","ä":"ä","å":"å","æ":"æ","ç":"ç","è":"è","é":"é","ê":"ê","ë":"ë","ì":"ì","í":"í","î":"î","ï":"ï","ð":"ð","ñ":"ñ","ò":"ò","ó":"ó","ô":"ô","õ":"õ","ö":"ö","÷":"÷","ø":"ø","ù":"ù","ú":"ú","û":"û","ü":"ü","ý":"ý","þ":"þ","ÿ":"ÿ","Œ":"Œ","œ":"œ","Š":"Š","š":"š","Ÿ":"Ÿ","ƒ":"ƒ","ˆ":"ˆ","˜":"˜","Α":"Α","Β":"Β","Γ":"Γ","Δ":"Δ","Ε":"Ε","Ζ":"Ζ","Η":"Η","Θ":"Θ","Ι":"Ι","Κ":"Κ","Λ":"Λ","Μ":"Μ","Ν":"Ν","Ξ":"Ξ","Ο":"Ο","Π":"Π","Ρ":"Ρ","Σ":"Σ","Τ":"Τ","Υ":"Υ","Φ":"Φ","Χ":"Χ","Ψ":"Ψ","Ω":"Ω","α":"α","β":"β","γ":"γ","δ":"δ","ε":"ε","ζ":"ζ","η":"η","θ":"θ","ι":"ι","κ":"κ","λ":"λ","μ":"μ","ν":"ν","ξ":"ξ","ο":"ο","π":"π","ρ":"ρ","ς":"ς","σ":"σ","τ":"τ","υ":"υ","φ":"φ","χ":"χ","ψ":"ψ","ω":"ω","ϑ":"ϑ","ϒ":"&Upsih;","ϖ":"ϖ","–":"–","—":"—","‘":"‘","’":"’","‚":"‚","“":"“","”":"”","„":"„","†":"†","‡":"‡","•":"•","…":"…","‰":"‰","′":"′","″":"″","‹":"‹","›":"›","‾":"‾","⁄":"⁄","€":"€","ℑ":"ℑ","℘":"℘","ℜ":"ℜ","™":"™","ℵ":"ℵ","←":"←","↑":"↑","→":"→","↓":"↓","↔":"↔","↵":"↵","⇐":"⇐","⇑":"&UArr;","⇒":"⇒","⇓":"⇓","⇔":"⇔","∀":"∀","∂":"∂","∃":"∃","∅":"∅","∇":"∇","∈":"∈","∉":"∉","∋":"∋","∏":"∏","∑":"∑","−":"−","∗":"∗","√":"√","∝":"∝","∞":"∞","∠":"∠","∧":"∧","∨":"∨","∩":"∩","∪":"∪","∫":"∫","∴":"∴","∼":"∼","≅":"≅","≈":"≈","≠":"≠","≡":"≡","≤":"≤","≥":"≥","⊂":"⊂","⊃":"⊃","⊄":"⊄","⊆":"⊆","⊇":"⊇","⊕":"⊕","⊗":"⊗","⊥":"⊥","⋅":"⋅","⌈":"⌈","⌉":"⌉","⌊":"⌊","⌋":"⌋","⟨":"⟨","⟩":"⟩","◊":"◊","♠":"♠","♣":"♣","♥":"♥","♦":"♦"};
|
|
869
869
|
string_val = string_val.replace(/&/g, '&');
|
|
870
870
|
string_val = string_val.replace(/"/g, '"');
|
|
871
871
|
for (var key in entityMap) {
|
|
@@ -87,10 +87,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
87
87
|
EXCEL_VIEWER: 'excel_viewer',
|
|
88
88
|
};
|
|
89
89
|
|
|
90
|
-
highchartsRenderer.VIRTUAL_FIELDS = {
|
|
91
|
-
WATERFALL_VARIANCE: 'DR_WATERFALL_VARIANCE',
|
|
92
|
-
};
|
|
93
|
-
|
|
94
90
|
highchartsRenderer.highcharts_theme = {
|
|
95
91
|
"colors": highchartsRenderer.defaults_colors,
|
|
96
92
|
"chart": {
|
|
@@ -1343,11 +1339,15 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
1343
1339
|
return chart_series;
|
|
1344
1340
|
}
|
|
1345
1341
|
|
|
1346
|
-
highchartsRenderer.ptCreateWaterfallBreakdownSeries = function (pivotData, additionOptions, opts) {
|
|
1342
|
+
highchartsRenderer.ptCreateWaterfallBreakdownSeries = function (pivotData, onlyNumbers, additionOptions, opts) {
|
|
1347
1343
|
const colorOptions = opts.breakdown_options.colors;
|
|
1348
|
-
|
|
1349
|
-
|
|
1350
|
-
|
|
1344
|
+
var chart_series = [],
|
|
1345
|
+
row_n_keys = pivotData.getRowKeys(),
|
|
1346
|
+
col_n_keys = pivotData.getColKeys();
|
|
1347
|
+
|
|
1348
|
+
if (row_n_keys.length === 0) {
|
|
1349
|
+
row_n_keys.push([]);
|
|
1350
|
+
}
|
|
1351
1351
|
|
|
1352
1352
|
let resultObject = {
|
|
1353
1353
|
data: [],
|
|
@@ -1363,45 +1363,60 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
1363
1363
|
};
|
|
1364
1364
|
resultObject = highchartsRenderer.getDataLabelsOptions(additionOptions, resultObject);
|
|
1365
1365
|
|
|
1366
|
+
const breakdownValues = [];
|
|
1366
1367
|
lodash.forEach(col_n_keys, function(col_n_value, col_index) {
|
|
1367
|
-
|
|
1368
|
-
|
|
1369
|
-
|
|
1370
|
-
|
|
1371
|
-
isSum: !!col_index,
|
|
1372
|
-
isTotal: true,
|
|
1373
|
-
color: colorOptions.total,
|
|
1374
|
-
});
|
|
1368
|
+
breakdownValues.push([]);
|
|
1369
|
+
lodash.forEach(row_n_keys, function (row_n_value, row_index) {
|
|
1370
|
+
var agg = pivotData.getAggregator(row_n_value, col_n_value);
|
|
1371
|
+
var val = agg.value();
|
|
1375
1372
|
|
|
1376
|
-
|
|
1377
|
-
|
|
1378
|
-
|
|
1379
|
-
|
|
1373
|
+
if (val != null && $.isNumeric(val)) {
|
|
1374
|
+
val = parseFloat(val);
|
|
1375
|
+
} else if (onlyNumbers) {
|
|
1376
|
+
val = NaN;
|
|
1377
|
+
} else {
|
|
1378
|
+
val = 0;
|
|
1379
|
+
}
|
|
1380
1380
|
|
|
1381
|
-
|
|
1382
|
-
if (val) {
|
|
1383
|
-
const tmoobj = {};
|
|
1384
|
-
const key = lodash.isArray(row_n_value) ? row_n_value[0] : row_n_value;
|
|
1385
|
-
tmoobj.name = lodash.unescape(key);
|
|
1381
|
+
breakdownValues[col_index][row_index] = val;
|
|
1386
1382
|
|
|
1383
|
+
if (col_index) {
|
|
1384
|
+
const value = val - breakdownValues[col_index - 1][row_index];
|
|
1385
|
+
|
|
1386
|
+
if (value) {
|
|
1387
|
+
var tmoobj = {};
|
|
1388
|
+
var key = row_n_value;
|
|
1389
|
+
if (lodash.isArray(row_n_value)) {
|
|
1390
|
+
key = row_n_value[0];
|
|
1391
|
+
}
|
|
1392
|
+
tmoobj.name = lodash.unescape(key);
|
|
1393
|
+
|
|
1387
1394
|
if (tmoobj.name) {
|
|
1388
1395
|
tmoobj.name = tmoobj.name.replace('DR_Others', highchartsRenderer.getOthersName(opts));
|
|
1389
1396
|
}
|
|
1397
|
+
|
|
1390
1398
|
if (lodash.isEmpty(String(tmoobj.name))) {
|
|
1391
1399
|
tmoobj.name = lodash.unescape(col_n_value);
|
|
1392
1400
|
tmoobj.visible = false;
|
|
1393
1401
|
}
|
|
1394
|
-
|
|
1395
|
-
tmoobj.y = val;
|
|
1402
|
+
tmoobj.y = value;
|
|
1396
1403
|
tmoobj.colKeys = [lodash.unescape(col_n_keys[col_index - 1]), lodash.unescape(col_n_value)];
|
|
1397
1404
|
resultObject.data.push(tmoobj);
|
|
1398
1405
|
}
|
|
1406
|
+
}
|
|
1407
|
+
});
|
|
1399
1408
|
|
|
1400
|
-
|
|
1401
|
-
|
|
1409
|
+
resultObject.data.push({
|
|
1410
|
+
y: pivotData.colTotals[col_n_value].sum,
|
|
1411
|
+
name: lodash.unescape(col_n_value).replace('DR_Others', highchartsRenderer.getOthersName(opts)),
|
|
1412
|
+
isSum: !!col_index,
|
|
1413
|
+
isTotal: true,
|
|
1414
|
+
color: colorOptions.total,
|
|
1415
|
+
});
|
|
1402
1416
|
});
|
|
1403
1417
|
|
|
1404
1418
|
chart_series.push(resultObject);
|
|
1419
|
+
|
|
1405
1420
|
opts.chart_series = [];
|
|
1406
1421
|
if (!lodash.isEqual(row_n_keys, EMPTY_ROW_N_KEYS)) {
|
|
1407
1422
|
chart_series.forEach(series => {
|
|
@@ -3175,8 +3190,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
3175
3190
|
? opts.chartOptions
|
|
3176
3191
|
: highchartsRenderer.getDefaultValueForChart(highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN);
|
|
3177
3192
|
|
|
3178
|
-
pivotData.colKeys = lodash.map(lodash.keys(pivotData.colTotals), key => [key]);
|
|
3179
|
-
|
|
3180
3193
|
chartOptions.chart = {
|
|
3181
3194
|
type: 'waterfall',
|
|
3182
3195
|
zoomType: additionOptions && additionOptions.chart && additionOptions.chart.zoom_type ? additionOptions.chart.zoom_type : 'None',
|
|
@@ -3227,7 +3240,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
3227
3240
|
chartOptions.colors = opts.paletteOptions.dashboardPalette.colors;
|
|
3228
3241
|
}
|
|
3229
3242
|
chartOptions.series = highchartsRenderer
|
|
3230
|
-
.ptCreateWaterfallBreakdownSeries(pivotData, additionOptions, opts);
|
|
3243
|
+
.ptCreateWaterfallBreakdownSeries(pivotData, null, additionOptions, opts);
|
|
3231
3244
|
|
|
3232
3245
|
chartOptions = highchartsRenderer.prepareAxisX(chartOptions, additionOptions, pivotData.getColKeys());
|
|
3233
3246
|
chartOptions.plotOptions = {
|
|
@@ -4952,28 +4965,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
4952
4965
|
}
|
|
4953
4966
|
});
|
|
4954
4967
|
|
|
4955
|
-
// add virtual fields to rows if required
|
|
4956
|
-
let rows = widgetOptions.rows;
|
|
4957
|
-
if (!lodash.get(widgetOptions, 'rows.length') && widgetOptions.options.breakdown_options) {
|
|
4958
|
-
rows = [
|
|
4959
|
-
{
|
|
4960
|
-
id: -1,
|
|
4961
|
-
name: highchartsRenderer.VIRTUAL_FIELDS.WATERFALL_VARIANCE,
|
|
4962
|
-
type: 'Text',
|
|
4963
|
-
},
|
|
4964
|
-
];
|
|
4965
|
-
}
|
|
4966
|
-
|
|
4967
4968
|
// fill rows fields
|
|
4968
|
-
lodash.forEach(rows, function (valObj) {
|
|
4969
|
-
|
|
4970
|
-
|
|
4971
|
-
|
|
4972
|
-
|
|
4973
|
-
if (fieldOb) {
|
|
4974
|
-
legendFields.push(fieldOb);
|
|
4975
|
-
lodash.remove(fields, {id: fieldOb.id});
|
|
4976
|
-
}
|
|
4969
|
+
lodash.forEach(widgetOptions.rows, function (valObj) {
|
|
4970
|
+
fieldOb = lodash.find(fields, {id: valObj.id});
|
|
4971
|
+
if (fieldOb) {
|
|
4972
|
+
legendFields.push(fieldOb);
|
|
4973
|
+
lodash.remove(fields, {id: fieldOb.id});
|
|
4977
4974
|
}
|
|
4978
4975
|
});
|
|
4979
4976
|
|
|
@@ -7941,7 +7938,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
7941
7938
|
};
|
|
7942
7939
|
|
|
7943
7940
|
highchartsRenderer.createDateFromString = function (dateString, format) {
|
|
7944
|
-
if (
|
|
7941
|
+
if ((format && !highchartsRenderer.isDateFormat(dateString, format)) || !highchartsRenderer.isDate(dateString)) {
|
|
7945
7942
|
return null;
|
|
7946
7943
|
}
|
|
7947
7944
|
const utcDate = format
|
|
@@ -8095,7 +8092,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
8095
8092
|
filter.is_excluded = false;
|
|
8096
8093
|
} else {
|
|
8097
8094
|
filter = highchartsRenderer.createDrillDownFilterObject(widget, widget.cols[0], colKey[0]);
|
|
8098
|
-
filters.push(filter);
|
|
8099
8095
|
}
|
|
8100
8096
|
filter.values = [];
|
|
8101
8097
|
for (let i = 0; i < colKey.length; i++) {
|
|
@@ -8698,7 +8694,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
8698
8694
|
rows = [];
|
|
8699
8695
|
} else {
|
|
8700
8696
|
rows = cols;
|
|
8701
|
-
cols = [
|
|
8697
|
+
cols = [];
|
|
8702
8698
|
}
|
|
8703
8699
|
return { rows, cols };
|
|
8704
8700
|
}
|