@datarailsshared/dr_renderer 1.2.207-wizards → 1.2.209
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 +35 -46
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 = {"'":"'","<":"<",">":">"," ":" ","¡":"¡","¢":"¢","£":"£","¤":"¤","¥":"¥","¦":"¦","§":"§","¨":"¨","©":"©","ª":"ª","«":"«","¬":"¬","®":"®","¯":"¯","°":"°","±":"±","²":"²","³":"³","´":"´","µ":"µ","¶":"¶","·":"·","¸":"¸","¹":"¹","º":"º","»":"»","¼":"¼","½":"½","¾":"¾","¿":"¿","À":"À","Á":"Á","Â":"Â","Ã":"Ã","Ä":"Ä","Å":"Å","Æ":"Æ","Ç":"Ç","È":"È","É":"É","Ê":"Ê","Ë":"Ë","Ì":"Ì","Í":"Í","Î":"Î","Ï":"Ï","Ð":"Ð","Ñ":"Ñ","Ò":"Ò","Ó":"Ó","Ô":"Ô","Õ":"Õ","Ö":"Ö","×":"×","Ø":"Ø","Ù":"Ù","Ú":"Ú","Û":"Û","Ü":"Ü","Ý":"Ý","Þ":"Þ","ß":"ß","à":"à","á":"á","â":"â","ã":"ã","ä":"ä","å":"å","æ":"æ","ç":"ç","è":"è","é":"é","ê":"ê","ë":"ë","ì":"ì","í":"í","î":"î","ï":"ï","ð":"ð","ñ":"ñ","ò":"ò","ó":"ó","ô":"ô","õ":"õ","ö":"ö","÷":"÷","ø":"ø","ù":"ù","ú":"ú","û":"û","ü":"ü","ý":"ý","þ":"þ","ÿ":"ÿ","Œ":"Œ","œ":"œ","Š":"Š","š":"š","Ÿ":"Ÿ","ƒ":"ƒ","ˆ":"ˆ","˜":"˜","Α":"Α","Β":"Β","Γ":"Γ","Δ":"Δ","Ε":"Ε","Ζ":"Ζ","Η":"Η","Θ":"Θ","Ι":"Ι","Κ":"Κ","Λ":"Λ","Μ":"Μ","Ν":"Ν","Ξ":"Ξ","Ο":"Ο","Π":"Π","Ρ":"Ρ","Σ":"Σ","Τ":"Τ","Υ":"Υ","Φ":"Φ","Χ":"Χ","Ψ":"Ψ","Ω":"Ω","α":"α","β":"β","γ":"γ","δ":"δ","ε":"ε","ζ":"ζ","η":"η","θ":"θ","ι":"ι","κ":"κ","λ":"λ","μ":"μ","ν":"ν","ξ":"ξ","ο":"ο","π":"π","ρ":"ρ","ς":"ς","σ":"σ","τ":"τ","υ":"υ","φ":"φ","χ":"χ","ψ":"ψ","ω":"ω","ϑ":"ϑ","ϒ":"&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) {
|
|
@@ -1339,15 +1339,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
1339
1339
|
return chart_series;
|
|
1340
1340
|
}
|
|
1341
1341
|
|
|
1342
|
-
highchartsRenderer.ptCreateWaterfallBreakdownSeries = function (pivotData,
|
|
1342
|
+
highchartsRenderer.ptCreateWaterfallBreakdownSeries = function (pivotData, additionOptions, opts) {
|
|
1343
1343
|
const colorOptions = opts.breakdown_options.colors;
|
|
1344
|
-
|
|
1345
|
-
|
|
1346
|
-
|
|
1347
|
-
|
|
1348
|
-
if (row_n_keys.length === 0) {
|
|
1349
|
-
row_n_keys.push([]);
|
|
1350
|
-
}
|
|
1344
|
+
const chart_series = [];
|
|
1345
|
+
const row_n_keys = pivotData.getRowKeys();
|
|
1346
|
+
const col_n_keys = pivotData.getColKeys();
|
|
1347
|
+
const hasBreakdownValues = lodash.get(opts, 'breakdown_options.values.breakdown.length');
|
|
1351
1348
|
|
|
1352
1349
|
let resultObject = {
|
|
1353
1350
|
data: [],
|
|
@@ -1363,56 +1360,46 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
1363
1360
|
};
|
|
1364
1361
|
resultObject = highchartsRenderer.getDataLabelsOptions(additionOptions, resultObject);
|
|
1365
1362
|
|
|
1366
|
-
const breakdownValues = [];
|
|
1367
1363
|
lodash.forEach(col_n_keys, function(col_n_value, col_index) {
|
|
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();
|
|
1372
|
-
|
|
1373
|
-
if (val != null && $.isNumeric(val)) {
|
|
1374
|
-
val = parseFloat(val);
|
|
1375
|
-
} else if (onlyNumbers) {
|
|
1376
|
-
val = NaN;
|
|
1377
|
-
} else {
|
|
1378
|
-
val = 0;
|
|
1379
|
-
}
|
|
1380
|
-
|
|
1381
|
-
breakdownValues[col_index][row_index] = val;
|
|
1382
1364
|
|
|
1383
|
-
|
|
1384
|
-
|
|
1365
|
+
const totalColumnValue = pivotData.getAggregator([], col_n_value).value();
|
|
1366
|
+
const nextTotalColumnKey = col_n_keys[col_index + 1];
|
|
1367
|
+
const nextTotalColumnValue = nextTotalColumnKey ? pivotData.getAggregator([], nextTotalColumnKey).value() : null;
|
|
1368
|
+
resultObject.data.push({
|
|
1369
|
+
y: totalColumnValue,
|
|
1370
|
+
name: lodash.unescape(col_n_value).replace('DR_Others', highchartsRenderer.getOthersName(opts)),
|
|
1371
|
+
isSum: !!col_index,
|
|
1372
|
+
isTotal: true,
|
|
1373
|
+
color: colorOptions.total,
|
|
1374
|
+
});
|
|
1385
1375
|
|
|
1386
|
-
|
|
1387
|
-
|
|
1388
|
-
|
|
1389
|
-
|
|
1390
|
-
|
|
1391
|
-
|
|
1376
|
+
if (col_index !== col_n_keys.length - 1) {
|
|
1377
|
+
lodash.forEach(row_n_keys, function (row_n_value) {
|
|
1378
|
+
const agg = pivotData.getAggregator(row_n_value, col_n_value);
|
|
1379
|
+
let val = hasBreakdownValues
|
|
1380
|
+
? agg.value()
|
|
1381
|
+
: nextTotalColumnValue - totalColumnValue;
|
|
1382
|
+
|
|
1383
|
+
val = $.isNumeric(val) ? parseFloat(val) : 0;
|
|
1384
|
+
if (val) {
|
|
1385
|
+
const tmoobj = {};
|
|
1386
|
+
const key = lodash.isArray(row_n_value) ? row_n_value[0] : row_n_value;
|
|
1392
1387
|
tmoobj.name = lodash.unescape(key);
|
|
1393
|
-
|
|
1388
|
+
|
|
1394
1389
|
if (tmoobj.name) {
|
|
1395
1390
|
tmoobj.name = tmoobj.name.replace('DR_Others', highchartsRenderer.getOthersName(opts));
|
|
1396
1391
|
}
|
|
1397
|
-
|
|
1398
1392
|
if (lodash.isEmpty(String(tmoobj.name))) {
|
|
1399
1393
|
tmoobj.name = lodash.unescape(col_n_value);
|
|
1400
1394
|
tmoobj.visible = false;
|
|
1401
1395
|
}
|
|
1402
|
-
|
|
1396
|
+
|
|
1397
|
+
tmoobj.y = val;
|
|
1403
1398
|
tmoobj.colKeys = [lodash.unescape(col_n_keys[col_index - 1]), lodash.unescape(col_n_value)];
|
|
1404
1399
|
resultObject.data.push(tmoobj);
|
|
1405
1400
|
}
|
|
1406
|
-
}
|
|
1407
|
-
}
|
|
1408
|
-
|
|
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
|
-
});
|
|
1401
|
+
});
|
|
1402
|
+
}
|
|
1416
1403
|
});
|
|
1417
1404
|
|
|
1418
1405
|
chart_series.push(resultObject);
|
|
@@ -3190,6 +3177,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
3190
3177
|
? opts.chartOptions
|
|
3191
3178
|
: highchartsRenderer.getDefaultValueForChart(highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN);
|
|
3192
3179
|
|
|
3180
|
+
pivotData.colKeys = lodash.map(lodash.keys(pivotData.colTotals), key => [key]);
|
|
3181
|
+
|
|
3193
3182
|
chartOptions.chart = {
|
|
3194
3183
|
type: 'waterfall',
|
|
3195
3184
|
zoomType: additionOptions && additionOptions.chart && additionOptions.chart.zoom_type ? additionOptions.chart.zoom_type : 'None',
|
|
@@ -3240,7 +3229,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
3240
3229
|
chartOptions.colors = opts.paletteOptions.dashboardPalette.colors;
|
|
3241
3230
|
}
|
|
3242
3231
|
chartOptions.series = highchartsRenderer
|
|
3243
|
-
.ptCreateWaterfallBreakdownSeries(pivotData,
|
|
3232
|
+
.ptCreateWaterfallBreakdownSeries(pivotData, additionOptions, opts);
|
|
3244
3233
|
|
|
3245
3234
|
chartOptions = highchartsRenderer.prepareAxisX(chartOptions, additionOptions, pivotData.getColKeys());
|
|
3246
3235
|
chartOptions.plotOptions = {
|
|
@@ -8694,7 +8683,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
8694
8683
|
rows = [];
|
|
8695
8684
|
} else {
|
|
8696
8685
|
rows = cols;
|
|
8697
|
-
cols = [];
|
|
8686
|
+
cols = [point.colKeys[1]];
|
|
8698
8687
|
}
|
|
8699
8688
|
return { rows, cols };
|
|
8700
8689
|
}
|