@gisce/ooui 0.6.4 → 0.6.7
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/dist/Graph/GraphYAxis.d.ts +4 -1
- package/dist/Graph/GraphYAxis.js +9 -1
- package/dist/Graph/GraphYAxis.js.map +1 -1
- package/dist/Graph/graphHelper.js +2 -0
- package/dist/Graph/graphHelper.js.map +1 -1
- package/dist/Graph/processor/graphProcessor.d.ts +2 -0
- package/dist/Graph/processor/graphProcessor.js +16 -0
- package/dist/Graph/processor/graphProcessor.js.map +1 -1
- package/package.json +1 -1
- package/src/Graph/GraphYAxis.ts +8 -0
- package/src/Graph/graphHelper.ts +2 -0
- package/src/Graph/processor/graphProcessor.ts +17 -1
- package/src/spec/attributeParser.spec.ts +1 -1
- package/src/spec/graphProcessor.spec.ts +8 -5
|
@@ -5,9 +5,12 @@ export declare class GraphYAxis extends GraphAxis {
|
|
|
5
5
|
get operator(): Operator;
|
|
6
6
|
_label: string | undefined;
|
|
7
7
|
get label(): string | undefined;
|
|
8
|
-
|
|
8
|
+
_stacked: string | undefined;
|
|
9
|
+
get stacked(): string | undefined;
|
|
10
|
+
constructor({ name, operator, label, stacked, }: {
|
|
9
11
|
name: string;
|
|
10
12
|
operator: Operator;
|
|
11
13
|
label?: string;
|
|
14
|
+
stacked?: string;
|
|
12
15
|
});
|
|
13
16
|
}
|
package/dist/Graph/GraphYAxis.js
CHANGED
|
@@ -15,10 +15,11 @@ import { GraphAxis } from ".";
|
|
|
15
15
|
var GraphYAxis = /** @class */ (function (_super) {
|
|
16
16
|
__extends(GraphYAxis, _super);
|
|
17
17
|
function GraphYAxis(_a) {
|
|
18
|
-
var name = _a.name, operator = _a.operator, label = _a.label;
|
|
18
|
+
var name = _a.name, operator = _a.operator, label = _a.label, stacked = _a.stacked;
|
|
19
19
|
var _this = _super.call(this, { name: name, axis: "y" }) || this;
|
|
20
20
|
_this._operator = operator;
|
|
21
21
|
_this._label = label;
|
|
22
|
+
_this._stacked = stacked;
|
|
22
23
|
return _this;
|
|
23
24
|
}
|
|
24
25
|
Object.defineProperty(GraphYAxis.prototype, "operator", {
|
|
@@ -35,6 +36,13 @@ var GraphYAxis = /** @class */ (function (_super) {
|
|
|
35
36
|
enumerable: false,
|
|
36
37
|
configurable: true
|
|
37
38
|
});
|
|
39
|
+
Object.defineProperty(GraphYAxis.prototype, "stacked", {
|
|
40
|
+
get: function () {
|
|
41
|
+
return this._stacked;
|
|
42
|
+
},
|
|
43
|
+
enumerable: false,
|
|
44
|
+
configurable: true
|
|
45
|
+
});
|
|
38
46
|
return GraphYAxis;
|
|
39
47
|
}(GraphAxis));
|
|
40
48
|
export { GraphYAxis };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GraphYAxis.js","sourceRoot":"","sources":["../../src/Graph/GraphYAxis.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,CAAC;AAI9B;IAAgC,8BAAS;
|
|
1
|
+
{"version":3,"file":"GraphYAxis.js","sourceRoot":"","sources":["../../src/Graph/GraphYAxis.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,CAAC;AAI9B;IAAgC,8BAAS;IAgBvC,oBAAY,EAUX;YATC,IAAI,UAAA,EACJ,QAAQ,cAAA,EACR,KAAK,WAAA,EACL,OAAO,aAAA;QAJT,YAWE,kBAAM,EAAE,IAAI,MAAA,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,SAI3B;QAHC,KAAI,CAAC,SAAS,GAAG,QAAS,CAAC;QAC3B,KAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,KAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;;IAC1B,CAAC;IA7BD,sBAAI,gCAAQ;aAAZ;YACE,OAAO,IAAI,CAAC,SAAS,CAAC;QACxB,CAAC;;;OAAA;IAGD,sBAAI,6BAAK;aAAT;YACE,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;;;OAAA;IAGD,sBAAI,+BAAO;aAAX;YACE,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;;;OAAA;IAkBH,iBAAC;AAAD,CAAC,AAhCD,CAAgC,SAAS,GAgCxC"}
|
|
@@ -8,6 +8,7 @@ export var parseXYAxis = function (nodes) {
|
|
|
8
8
|
var operator = child.getAttribute("operator");
|
|
9
9
|
var name_1 = child.getAttribute("name");
|
|
10
10
|
var label = child.getAttribute("label") || undefined;
|
|
11
|
+
var stacked = child.getAttribute("stacked") || undefined;
|
|
11
12
|
if (!axis) {
|
|
12
13
|
throw new Error("Field " + name_1 + " doesn't have an axis");
|
|
13
14
|
}
|
|
@@ -24,6 +25,7 @@ export var parseXYAxis = function (nodes) {
|
|
|
24
25
|
name: name_1,
|
|
25
26
|
operator: operator,
|
|
26
27
|
label: label,
|
|
28
|
+
stacked: stacked,
|
|
27
29
|
}));
|
|
28
30
|
}
|
|
29
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphHelper.js","sourceRoot":"","sources":["../../src/Graph/graphHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAY,MAAM,GAAG,CAAC;AAOrD,MAAM,CAAC,IAAM,WAAW,GAAG,UAAC,KAA4B;IACtD,IAAM,aAAa,GAAiB,EAAE,CAAC;IACvC,IAAI,KAAK,CAAC;IAEV,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,UAAC,KAAc;QACjD,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,EAAE;YACvE,IAAM,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YACxC,IAAM,QAAQ,GAAG,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YAChD,IAAM,MAAI,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YACxC,IAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"graphHelper.js","sourceRoot":"","sources":["../../src/Graph/graphHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAY,MAAM,GAAG,CAAC;AAOrD,MAAM,CAAC,IAAM,WAAW,GAAG,UAAC,KAA4B;IACtD,IAAM,aAAa,GAAiB,EAAE,CAAC;IACvC,IAAI,KAAK,CAAC;IAEV,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,UAAC,KAAc;QACjD,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,EAAE;YACvE,IAAM,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YACxC,IAAM,QAAQ,GAAG,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YAChD,IAAM,MAAI,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YACxC,IAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC;YACvD,IAAM,OAAO,GAAG,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC;YAE3D,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,WAAS,MAAI,0BAAuB,CAAC,CAAC;aACvD;YAED,IAAI,CAAC,MAAI,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;aACrD;YAED,IAAI,IAAI,KAAK,GAAG,EAAE;gBAChB,KAAK,GAAG,IAAI,UAAU,CAAC;oBACrB,IAAI,QAAA;iBACL,CAAC,CAAC;aACJ;iBAAM,IAAI,IAAI,KAAK,GAAG,EAAE;gBACvB,aAAa,CAAC,IAAI,CAChB,IAAI,UAAU,CAAC;oBACb,IAAI,QAAA;oBACJ,QAAQ,EAAE,QAAoB;oBAC9B,KAAK,OAAA;oBACL,OAAO,SAAA;iBACR,CAAC,CACH,CAAC;aACH;SACF;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;KACpC;IAED,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;QACzB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;KACjE;IAED,OAAO;QACL,CAAC,EAAE,KAAK;QACR,CAAC,EAAE,aAAa;KACjB,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -51,6 +51,8 @@ export var processGraphData = function (_a) {
|
|
|
51
51
|
yFields: __spread(new Set(ooui.y.map(function (item) { return getYAxisFieldname(item); }))),
|
|
52
52
|
seriesFields: ooui.y.filter(function (yField) { return yField.label; }).length !== 0
|
|
53
53
|
? __spread(new Set(ooui.y.map(function (item) { return item.label; }))) : undefined,
|
|
54
|
+
isGroup: false,
|
|
55
|
+
isStack: false,
|
|
54
56
|
};
|
|
55
57
|
var data = [];
|
|
56
58
|
ooui.y.forEach(function (yField) {
|
|
@@ -129,6 +131,20 @@ export var processGraphData = function (_a) {
|
|
|
129
131
|
});
|
|
130
132
|
return __assign({ data: processedData }, fieldsData);
|
|
131
133
|
}
|
|
134
|
+
var yFieldsWithLabel = ooui.y.filter(function (yField) { return yField.label; }).length;
|
|
135
|
+
var yFieldsWithStacked = ooui.y.filter(function (yField) { return yField.stacked; }).length;
|
|
136
|
+
if (yFieldsWithLabel > 0 && yFieldsWithStacked === 0) {
|
|
137
|
+
fieldsData.isGroup = true;
|
|
138
|
+
fieldsData.isStack = false;
|
|
139
|
+
}
|
|
140
|
+
else if (yFieldsWithLabel === 1 && yFieldsWithStacked === 1) {
|
|
141
|
+
fieldsData.isGroup = false;
|
|
142
|
+
fieldsData.isStack = true;
|
|
143
|
+
}
|
|
144
|
+
else if (yFieldsWithLabel > 1 && yFieldsWithStacked > 1) {
|
|
145
|
+
fieldsData.isGroup = true;
|
|
146
|
+
fieldsData.isStack = true;
|
|
147
|
+
}
|
|
132
148
|
return __assign({ data: data }, fieldsData);
|
|
133
149
|
};
|
|
134
150
|
export function getValueForOperator(_a) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphProcessor.js","sourceRoot":"","sources":["../../../src/Graph/processor/graphProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAMxD,MAAM,CAAC,IAAM,iBAAiB,GAAG;IAC/B,KAAK,EAAE,OAAO;IACd,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,UAAU;IACf,GAAG,EAAE,UAAU;IACf,GAAG,EAAE,SAAS;IACd,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,KAAK;CACX,CAAC;AAEF,MAAM,CAAC,IAAM,gBAAgB,GAAG,UAAC,EAQhC;QAPC,IAAI,UAAA,EACJ,MAAM,YAAA,EACN,MAAM,YAAA;IAMN,IAAM,gBAAgB,GAAG,uBAAuB,CAAC;QAC/C,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI;QACtB,MAAM,QAAA;QACN,MAAM,QAAA;KACP,CAAC,CAAC;IAEH,
|
|
1
|
+
{"version":3,"file":"graphProcessor.js","sourceRoot":"","sources":["../../../src/Graph/processor/graphProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAMxD,MAAM,CAAC,IAAM,iBAAiB,GAAG;IAC/B,KAAK,EAAE,OAAO;IACd,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,UAAU;IACf,GAAG,EAAE,UAAU;IACf,GAAG,EAAE,SAAS;IACd,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,KAAK;CACX,CAAC;AAEF,MAAM,CAAC,IAAM,gBAAgB,GAAG,UAAC,EAQhC;QAPC,IAAI,UAAA,EACJ,MAAM,YAAA,EACN,MAAM,YAAA;IAMN,IAAM,gBAAgB,GAAG,uBAAuB,CAAC;QAC/C,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI;QACtB,MAAM,QAAA;QACN,MAAM,QAAA;KACP,CAAC,CAAC;IAEH,IAAI,UAAU,GAAG;QACf,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI;QACnB,OAAO,WAAM,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,iBAAiB,CAAC,IAAI,CAAC,EAAvB,CAAuB,CAAC,CAAC,CAAC;QACpE,YAAY,EACV,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,KAAK,EAAZ,CAAY,CAAC,CAAC,MAAM,KAAK,CAAC;YAClD,CAAC,UAAK,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,IAAI,CAAC,KAAK,EAAV,CAAU,CAAC,CAAC,EAC/C,CAAC,CAAC,SAAS;QACf,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;KACf,CAAC;IAEF,IAAM,IAAI,GAA6B,EAAE,CAAC;IAE1C,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,UAAC,MAAM;QACpB,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,UAAC,MAAM;;YAC3C,IAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC;YAC9C,IAAM,gBAAgB,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YAE1D,IAAI,MAAM,CAAC,KAAK,EAAE;gBAChB,IAAM,uBAAqB,GAAG,uBAAuB,CAAC;oBACpD,SAAS,EAAE,MAAM,CAAC,KAAK;oBACvB,MAAM,EAAE,gBAAgB;oBACxB,MAAM,QAAA;iBACP,CAAC,CAAC;gBAEH,MAAM,CAAC,IAAI,CAAC,uBAAqB,CAAC,CAAC,OAAO,CAAC,UAAC,YAAY;;oBACtD,IAAM,OAAO,GAAG,uBAAqB,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;oBAC5D,IAAM,KAAK,GAAG,uBAAqB,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC;oBACxD,IAAM,eAAe,GAAG,OAAO;yBAC5B,GAAG,CAAC,UAAC,GAAG;wBACP,OAAO,wBAAwB,CAAC;4BAC9B,SAAS,EAAE,MAAM,CAAC,IAAI;4BACtB,MAAM,EAAE,GAAG;4BACX,MAAM,EAAE,MAAM;yBACf,CAAC,CAAC;oBACL,CAAC,CAAC;yBACD,GAAG,CAAC,UAAC,EAAgB;4BAAd,KAAK,WAAA,EAAE,KAAK,WAAA;wBAClB,OAAO,KAAK,CAAC;oBACf,CAAC,CAAC,CAAC;oBACL,IAAM,UAAU,GAAG,mBAAmB,CAAC;wBACrC,MAAM,EAAE,eAAe;wBACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ;qBAC1B,CAAC,CAAC;oBACH,IAAI,CAAC,IAAI;wBACP,GAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAG,MAAM,IAAI,KAAK;wBAC9B,GAAI,MAAM,CAAC,IAAI,SACb,iBAAiB,CAAC,MAAM,CAAC,QAAS,CAClC,IAAG,UAAU;wBACf,GAAC,MAAM,CAAC,KAAM,IAAG,KAAK;4BACtB,CAAC;gBACL,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACL,IAAM,eAAe,GAAG,gBAAgB;qBACrC,GAAG,CAAC,UAAC,GAAG;oBACP,OAAO,wBAAwB,CAAC;wBAC9B,SAAS,EAAE,MAAM,CAAC,IAAI;wBACtB,MAAM,EAAE,GAAG;wBACX,MAAM,EAAE,MAAM;qBACf,CAAC,CAAC;gBACL,CAAC,CAAC;qBACD,GAAG,CAAC,UAAC,EAAgB;wBAAd,KAAK,WAAA,EAAE,KAAK,WAAA;oBAClB,OAAO,KAAK,CAAC;gBACf,CAAC,CAAC,CAAC;gBAEL,IAAM,UAAU,GAAG,mBAAmB,CAAC;oBACrC,MAAM,EAAE,eAAe;oBACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ;iBAC1B,CAAC,CAAC;gBAEH,IAAI,CAAC,IAAI;oBACP,GAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAG,MAAM,IAAI,KAAK;oBAC9B,GAAC,iBAAiB,CAAC,MAAM,CAAC,IAAG,UAAU;wBACvC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,mEAAmE;IACnE,2CAA2C;IAC3C,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,KAAK,EAAZ,CAAY,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACxD,IAAM,WAAW,YAAO,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAjB,CAAiB,CAAC,CAAC,CAAC,CAAC;QACxE,IAAM,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,UAAC,GAAG;YACxC,IAAM,YAAY,GAAG,EAAE,CAAC;YACxB,IAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,UAAC,IAAI,IAAK,OAAA,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,EAAzB,CAAyB,CAAC,CAAC;YACtE,YAAY,CAAC,OAAO,CAAC,UAAC,IAAI;gBACxB,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;YACH,OAAO,YAAsC,CAAC;QAChD,CAAC,CAAC,CAAC;QACH,kBAAS,IAAI,EAAE,aAAa,IAAK,UAAU,EAAG;KAC/C;IAED,IAAM,gBAAgB,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,KAAK,EAAZ,CAAY,CAAC,CAAC,MAAM,CAAC;IACxE,IAAM,kBAAkB,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,OAAO,EAAd,CAAc,CAAC,CAAC,MAAM,CAAC;IAE5E,IAAI,gBAAgB,GAAG,CAAC,IAAI,kBAAkB,KAAK,CAAC,EAAE;QACpD,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;QAC1B,UAAU,CAAC,OAAO,GAAG,KAAK,CAAC;KAC5B;SAAM,IAAI,gBAAgB,KAAK,CAAC,IAAI,kBAAkB,KAAK,CAAC,EAAE;QAC7D,UAAU,CAAC,OAAO,GAAG,KAAK,CAAC;QAC3B,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;KAC3B;SAAM,IAAI,gBAAgB,GAAG,CAAC,IAAI,kBAAkB,GAAG,CAAC,EAAE;QACzD,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;QAC1B,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;KAC3B;IAED,kBACE,IAAI,MAAA,IACD,UAAU,EACb;AACJ,CAAC,CAAC;AAEF,MAAM,UAAU,mBAAmB,CAAC,EAMnC;QALC,QAAQ,cAAA,EACR,MAAM,YAAA;IAKN,QAAQ,QAAQ,EAAE;QAChB,KAAK,OAAO,CAAC,CAAC;YACZ,OAAO,MAAM,CAAC,MAAM,CAAC;SACtB;QACD,KAAK,GAAG,CAAC,CAAC;YACR,OAAO,WAAW,CAChB,MAAM,CAAC,MAAM,CAAC,UAAU,aAAkB,EAAE,YAAiB;gBAC3D,OAAO,aAAa,GAAG,YAAY,CAAC;YACtC,CAAC,CAAC,CACH,CAAC;SACH;QACD,KAAK,GAAG,CAAC,CAAC;YACR,OAAO,WAAW,CAChB,MAAM,CAAC,MAAM,CAAC,UAAU,aAAkB,EAAE,YAAiB;gBAC3D,OAAO,aAAa,GAAG,YAAY,CAAC;YACtC,CAAC,CAAC,CACH,CAAC;SACH;QACD,KAAK,GAAG,CAAC,CAAC;YACR,OAAO,WAAW,CAChB,MAAM,CAAC,MAAM,CAAC,UAAU,aAAkB,EAAE,YAAiB;gBAC3D,OAAO,aAAa,GAAG,YAAY,CAAC;YACtC,CAAC,CAAC,CACH,CAAC;SACH;QACD,KAAK,KAAK,CAAC,CAAC;YACV,IAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,UAAC,CAAM,EAAE,CAAM,IAAK,OAAA,CAAC,GAAG,CAAC,EAAL,CAAK,EAAE,CAAC,CAAC,CAAC;YACxD,IAAM,GAAG,GAAG,GAAG,GAAG,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC;YACrC,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;SACzB;QACD,KAAK,KAAK,CAAC,CAAC;YACV,OAAO,IAAI,CAAC,GAAG,OAAR,IAAI,WAAQ,MAAM,GAAE;SAC5B;QACD,KAAK,KAAK,CAAC,CAAC;YACV,OAAO,IAAI,CAAC,GAAG,OAAR,IAAI,WAAQ,MAAM,GAAE;SAC5B;KACF;AACH,CAAC;AAED,SAAS,WAAW,CAAC,GAAW;IAC9B,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,EAQvC;QAPC,SAAS,eAAA,EACT,MAAM,YAAA,EACN,MAAM,YAAA;IAMN,IAAM,aAAa,GAAkB,EAAE,CAAC;IAExC,MAAM,CAAC,OAAO,CAAC,UAAC,KAAK;QACb,IAAA,KAAmB,wBAAwB,CAAC;YAChD,MAAM,QAAA;YACN,MAAM,EAAE,KAAK;YACb,SAAS,WAAA;SACV,CAAC,EAJM,KAAK,WAAA,EAAE,KAAK,WAIlB,CAAC;QAEH,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YACzB,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,OAAA,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;SAC/C;QAED,aAAa,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,OAAsB;IACjE,IAAI,YAAY,GAAU,EAAE,CAAC;IAC7B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,UAAC,GAAG;QAC/B,IAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3B,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IACH,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,CAAa;IAC7C,IAAI,CAAC,CAAC,QAAQ,EAAE;QACd,OAAO,CAAC,CAAC,IAAI,GAAG,GAAG,GAAG,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;KACrD;IACD,OAAO,CAAC,CAAC,IAAK,CAAC;AACjB,CAAC"}
|
package/package.json
CHANGED
package/src/Graph/GraphYAxis.ts
CHANGED
|
@@ -13,17 +13,25 @@ export class GraphYAxis extends GraphAxis {
|
|
|
13
13
|
return this._label;
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
+
_stacked: string | undefined;
|
|
17
|
+
get stacked(): string | undefined {
|
|
18
|
+
return this._stacked;
|
|
19
|
+
}
|
|
20
|
+
|
|
16
21
|
constructor({
|
|
17
22
|
name,
|
|
18
23
|
operator,
|
|
19
24
|
label,
|
|
25
|
+
stacked,
|
|
20
26
|
}: {
|
|
21
27
|
name: string;
|
|
22
28
|
operator: Operator;
|
|
23
29
|
label?: string;
|
|
30
|
+
stacked?: string;
|
|
24
31
|
}) {
|
|
25
32
|
super({ name, axis: "y" });
|
|
26
33
|
this._operator = operator!;
|
|
27
34
|
this._label = label;
|
|
35
|
+
this._stacked = stacked;
|
|
28
36
|
}
|
|
29
37
|
}
|
package/src/Graph/graphHelper.ts
CHANGED
|
@@ -15,6 +15,7 @@ export const parseXYAxis = (nodes: NodeListOf<ChildNode>): XYAxis => {
|
|
|
15
15
|
const operator = child.getAttribute("operator");
|
|
16
16
|
const name = child.getAttribute("name");
|
|
17
17
|
const label = child.getAttribute("label") || undefined;
|
|
18
|
+
const stacked = child.getAttribute("stacked") || undefined;
|
|
18
19
|
|
|
19
20
|
if (!axis) {
|
|
20
21
|
throw new Error(`Field ${name} doesn't have an axis`);
|
|
@@ -34,6 +35,7 @@ export const parseXYAxis = (nodes: NodeListOf<ChildNode>): XYAxis => {
|
|
|
34
35
|
name,
|
|
35
36
|
operator: operator as Operator,
|
|
36
37
|
label,
|
|
38
|
+
stacked,
|
|
37
39
|
})
|
|
38
40
|
);
|
|
39
41
|
}
|
|
@@ -30,13 +30,15 @@ export const processGraphData = ({
|
|
|
30
30
|
fields,
|
|
31
31
|
});
|
|
32
32
|
|
|
33
|
-
|
|
33
|
+
let fieldsData = {
|
|
34
34
|
xField: ooui.x.name,
|
|
35
35
|
yFields: [...new Set(ooui.y.map((item) => getYAxisFieldname(item)))],
|
|
36
36
|
seriesFields:
|
|
37
37
|
ooui.y.filter((yField) => yField.label).length !== 0
|
|
38
38
|
? [...new Set(ooui.y.map((item) => item.label))]
|
|
39
39
|
: undefined,
|
|
40
|
+
isGroup: false,
|
|
41
|
+
isStack: false,
|
|
40
42
|
};
|
|
41
43
|
|
|
42
44
|
const data: { [key: string]: any }[] = [];
|
|
@@ -120,6 +122,20 @@ export const processGraphData = ({
|
|
|
120
122
|
return { data: processedData, ...fieldsData };
|
|
121
123
|
}
|
|
122
124
|
|
|
125
|
+
const yFieldsWithLabel = ooui.y.filter((yField) => yField.label).length;
|
|
126
|
+
const yFieldsWithStacked = ooui.y.filter((yField) => yField.stacked).length;
|
|
127
|
+
|
|
128
|
+
if (yFieldsWithLabel > 0 && yFieldsWithStacked === 0) {
|
|
129
|
+
fieldsData.isGroup = true;
|
|
130
|
+
fieldsData.isStack = false;
|
|
131
|
+
} else if (yFieldsWithLabel === 1 && yFieldsWithStacked === 1) {
|
|
132
|
+
fieldsData.isGroup = false;
|
|
133
|
+
fieldsData.isStack = true;
|
|
134
|
+
} else if (yFieldsWithLabel > 1 && yFieldsWithStacked > 1) {
|
|
135
|
+
fieldsData.isGroup = true;
|
|
136
|
+
fieldsData.isStack = true;
|
|
137
|
+
}
|
|
138
|
+
|
|
123
139
|
return {
|
|
124
140
|
data,
|
|
125
141
|
...fieldsData,
|
|
@@ -184,7 +184,7 @@ describe("An Attribute Parser", () => {
|
|
|
184
184
|
});
|
|
185
185
|
expect(evaluatedAttrs.invisible).toBeTruthy();
|
|
186
186
|
});
|
|
187
|
-
it
|
|
187
|
+
it("should properly parse a many2one attribute with undefined value", () => {
|
|
188
188
|
const tagAttributes = {
|
|
189
189
|
attrs: "{'invisible': [('autoconsum_id', '=', False)]}",
|
|
190
190
|
};
|
|
@@ -224,17 +224,20 @@ describe("in processGraphData method", () => {
|
|
|
224
224
|
const values = model.data;
|
|
225
225
|
const fields = model.fields;
|
|
226
226
|
|
|
227
|
-
const { data, xField, yFields, seriesFields } = processGraphData(
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
227
|
+
const { data, xField, yFields, seriesFields, isGroup } = processGraphData(
|
|
228
|
+
{
|
|
229
|
+
ooui: parsedGraph,
|
|
230
|
+
values: values as any,
|
|
231
|
+
fields: fields as any,
|
|
232
|
+
}
|
|
233
|
+
);
|
|
232
234
|
|
|
233
235
|
expect(xField).toBe("name");
|
|
234
236
|
expect(yFields!.length).toBe(1);
|
|
235
237
|
expect(yFields![0]).toBe("consum_sum");
|
|
236
238
|
expect(seriesFields!.length).toBe(1);
|
|
237
239
|
expect(seriesFields![0]).toBe("periode");
|
|
240
|
+
expect(isGroup).toBe(true);
|
|
238
241
|
|
|
239
242
|
expect(data.length).toBe(15);
|
|
240
243
|
expect(data.find((d) => d.name === "2020-09-30")).toBeTruthy();
|