@gisce/ooui 0.3.3 → 0.4.0

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.
@@ -7,9 +7,12 @@ export declare class GraphAxis {
7
7
  get axis(): Axis | undefined;
8
8
  _operator: Operator | undefined;
9
9
  get operator(): Operator | undefined;
10
- constructor({ name, axis, operator, }: {
10
+ _label: string | undefined;
11
+ get label(): string | undefined;
12
+ constructor({ name, axis, operator, label, }: {
11
13
  name: string;
12
14
  axis: Axis;
13
15
  operator?: Operator;
16
+ label: string | undefined;
14
17
  });
15
18
  }
@@ -1,9 +1,10 @@
1
1
  var GraphAxis = /** @class */ (function () {
2
2
  function GraphAxis(_a) {
3
- var name = _a.name, axis = _a.axis, operator = _a.operator;
3
+ var name = _a.name, axis = _a.axis, operator = _a.operator, label = _a.label;
4
4
  this._name = name;
5
5
  this._axis = axis;
6
6
  this._operator = operator;
7
+ this._label = label;
7
8
  }
8
9
  Object.defineProperty(GraphAxis.prototype, "name", {
9
10
  get: function () {
@@ -26,6 +27,13 @@ var GraphAxis = /** @class */ (function () {
26
27
  enumerable: false,
27
28
  configurable: true
28
29
  });
30
+ Object.defineProperty(GraphAxis.prototype, "label", {
31
+ get: function () {
32
+ return this._label;
33
+ },
34
+ enumerable: false,
35
+ configurable: true
36
+ });
29
37
  return GraphAxis;
30
38
  }());
31
39
  export { GraphAxis };
@@ -1 +1 @@
1
- {"version":3,"file":"GraphAxis.js","sourceRoot":"","sources":["../../src/Graph/GraphAxis.ts"],"names":[],"mappings":"AAGA;IAgBE,mBAAY,EAQX;YAPC,IAAI,UAAA,EACJ,IAAI,UAAA,EACJ,QAAQ,cAAA;QAMR,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC5B,CAAC;IA1BD,sBAAI,2BAAI;aAAR;YACE,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;;;OAAA;IAGD,sBAAI,2BAAI;aAAR;YACE,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;;;OAAA;IAGD,sBAAI,+BAAQ;aAAZ;YACE,OAAO,IAAI,CAAC,SAAS,CAAC;QACxB,CAAC;;;OAAA;IAeH,gBAAC;AAAD,CAAC,AA7BD,IA6BC"}
1
+ {"version":3,"file":"GraphAxis.js","sourceRoot":"","sources":["../../src/Graph/GraphAxis.ts"],"names":[],"mappings":"AAGA;IAqBE,mBAAY,EAUX;YATC,IAAI,UAAA,EACJ,IAAI,UAAA,EACJ,QAAQ,cAAA,EACR,KAAK,WAAA;QAOL,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAlCD,sBAAI,2BAAI;aAAR;YACE,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;;;OAAA;IAGD,sBAAI,2BAAI;aAAR;YACE,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;;;OAAA;IAGD,sBAAI,+BAAQ;aAAZ;YACE,OAAO,IAAI,CAAC,SAAS,CAAC;QACxB,CAAC;;;OAAA;IAGD,sBAAI,4BAAK;aAAT;YACE,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;;;OAAA;IAkBH,gBAAC;AAAD,CAAC,AArCD,IAqCC"}
@@ -3,6 +3,8 @@ import { GraphChart } from "./GraphChart";
3
3
  var GraphTypes = {
4
4
  indicator: GraphIndicator,
5
5
  line: GraphChart,
6
+ bar: GraphChart,
7
+ pie: GraphChart,
6
8
  };
7
9
  export var parseGraph = function (xml) {
8
10
  var parser = new DOMParser();
@@ -1 +1 @@
1
- {"version":3,"file":"GraphFactory.js","sourceRoot":"","sources":["../../src/Graph/GraphFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,IAAM,UAAU,GAA2B;IACzC,SAAS,EAAE,cAAc;IACzB,IAAI,EAAE,UAAU;CACjB,CAAC;AAEF,MAAM,CAAC,IAAM,UAAU,GAAG,UAAC,GAAW;IACpC,IAAM,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;IAC/B,IAAM,IAAI,GAAa,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAE/D,IAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAEvD,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CAAI,IAAI,0BAAuB,CAAC,CAAC;KACjD;IAED,IAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAEpC,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAI,IAAI,+BAA4B,CAAC,CAAC;KACtD;IAED,OAAO,IAAI,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;AACpD,CAAC,CAAC"}
1
+ {"version":3,"file":"GraphFactory.js","sourceRoot":"","sources":["../../src/Graph/GraphFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,IAAM,UAAU,GAA2B;IACzC,SAAS,EAAE,cAAc;IACzB,IAAI,EAAE,UAAU;IAChB,GAAG,EAAE,UAAU;IACf,GAAG,EAAE,UAAU;CAChB,CAAC;AAEF,MAAM,CAAC,IAAM,UAAU,GAAG,UAAC,GAAW;IACpC,IAAM,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;IAC/B,IAAM,IAAI,GAAa,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAE/D,IAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAEvD,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CAAI,IAAI,0BAAuB,CAAC,CAAC;KACjD;IAED,IAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAEpC,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAI,IAAI,+BAA4B,CAAC,CAAC;KACtD;IAED,OAAO,IAAI,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;AACpD,CAAC,CAAC"}
@@ -8,6 +8,7 @@ export var parseXYAxis = function (nodes) {
8
8
  var axis = child.getAttribute("axis");
9
9
  var operator = child.getAttribute("operator");
10
10
  var name_1 = child.getAttribute("name");
11
+ var label = child.getAttribute("label");
11
12
  if (!axis) {
12
13
  throw new Error("Field " + name_1 + " doesn't have an axis");
13
14
  }
@@ -18,6 +19,7 @@ export var parseXYAxis = function (nodes) {
18
19
  axis: axis,
19
20
  name: name_1,
20
21
  operator: operator,
22
+ label: label || undefined,
21
23
  });
22
24
  if (axis === "x") {
23
25
  xyAxis.x = graphAxis;
@@ -1 +1 @@
1
- {"version":3,"file":"graphHelper.js","sourceRoot":"","sources":["../../src/Graph/graphHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,SAAS,EAAY,MAAM,GAAG,CAAC;AAO9C,MAAM,CAAC,IAAM,WAAW,GAAG,UAAC,KAA4B;IACtD,IAAM,MAAM,GAAQ,EAAE,CAAC;IAEvB,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,UAAC,KAAc;QACjD,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,YAAY,EAAE;YACzC,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,EAAE;aAC/B;YACD,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;YAExC,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,IAAM,SAAS,GAAG,IAAI,SAAS,CAAC;gBAC9B,IAAI,EAAE,IAAY;gBAClB,IAAI,QAAA;gBACJ,QAAQ,EAAE,QAAoB;aAC/B,CAAC,CAAC;YAEH,IAAI,IAAI,KAAK,GAAG,EAAE;gBAChB,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;aACtB;iBAAM,IAAI,IAAI,KAAK,GAAG,EAAE;gBACvB,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;aACtB;SACF;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAgB,CAAC;AAC1B,CAAC,CAAC"}
1
+ {"version":3,"file":"graphHelper.js","sourceRoot":"","sources":["../../src/Graph/graphHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,SAAS,EAAY,MAAM,GAAG,CAAC;AAQ9C,MAAM,CAAC,IAAM,WAAW,GAAG,UAAC,KAA4B;IACtD,IAAM,MAAM,GAAQ,EAAE,CAAC;IAEvB,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,UAAC,KAAc;QACjD,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,YAAY,EAAE;YACzC,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,EAAE;aAC/B;YACD,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,CAAC;YAE1C,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,IAAM,SAAS,GAAG,IAAI,SAAS,CAAC;gBAC9B,IAAI,EAAE,IAAY;gBAClB,IAAI,QAAA;gBACJ,QAAQ,EAAE,QAAoB;gBAC9B,KAAK,EAAE,KAAK,IAAI,SAAS;aAC1B,CAAC,CAAC;YAEH,IAAI,IAAI,KAAK,GAAG,EAAE;gBAChB,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;aACtB;iBAAM,IAAI,IAAI,KAAK,GAAG,EAAE;gBACvB,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;aACtB;SACF;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAgB,CAAC;AAC1B,CAAC,CAAC"}
@@ -15,10 +15,17 @@ var evaluateCondition = function (_a) {
15
15
  if (fields[fieldName] === undefined) {
16
16
  return false;
17
17
  }
18
- if (values[fieldName] === undefined && fields[fieldName].type !== "boolean") {
18
+ if (values[fieldName] === undefined &&
19
+ fields[fieldName].type !== "boolean" &&
20
+ fields[fieldName].type !== "many2one") {
19
21
  return false;
20
22
  }
21
23
  var filteredExpectedValue = expectedValue;
24
+ if (fields[fieldName].type === "many2one" &&
25
+ expectedValue === false &&
26
+ values[fieldName] === undefined) {
27
+ filteredExpectedValue = undefined;
28
+ }
22
29
  if (fields[fieldName].type === "boolean" &&
23
30
  (expectedValue === 0 || expectedValue === 1)) {
24
31
  filteredExpectedValue = expectedValue === 0 ? false : true;
@@ -1 +1 @@
1
- {"version":3,"file":"attributeParser.js","sourceRoot":"","sources":["../../src/helpers/attributeParser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"attributeParser.js","sourceRoot":"","sources":["../../src/helpers/attributeParser.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gisce/ooui",
3
- "version": "0.3.3",
3
+ "version": "0.4.0",
4
4
  "dependencies": {},
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -17,17 +17,25 @@ export class GraphAxis {
17
17
  return this._operator;
18
18
  }
19
19
 
20
+ _label: string | undefined;
21
+ get label(): string | undefined {
22
+ return this._label;
23
+ }
24
+
20
25
  constructor({
21
26
  name,
22
27
  axis,
23
28
  operator,
29
+ label,
24
30
  }: {
25
31
  name: string;
26
32
  axis: Axis;
27
33
  operator?: Operator;
34
+ label: string | undefined;
28
35
  }) {
29
36
  this._name = name;
30
37
  this._axis = axis;
31
38
  this._operator = operator;
39
+ this._label = label;
32
40
  }
33
41
  }
@@ -4,6 +4,8 @@ import { GraphChart } from "./GraphChart";
4
4
  const GraphTypes: { [key: string]: any } = {
5
5
  indicator: GraphIndicator,
6
6
  line: GraphChart,
7
+ bar: GraphChart,
8
+ pie: GraphChart,
7
9
  };
8
10
 
9
11
  export const parseGraph = (xml: string): GraphIndicator | GraphChart => {
@@ -1,4 +1,5 @@
1
1
  import { Axis, GraphAxis, Operator } from ".";
2
+ import { Label } from "..";
2
3
 
3
4
  export type XYAxis = {
4
5
  x: GraphAxis;
@@ -15,6 +16,7 @@ export const parseXYAxis = (nodes: NodeListOf<ChildNode>): XYAxis => {
15
16
  const axis = child.getAttribute("axis");
16
17
  const operator = child.getAttribute("operator");
17
18
  const name = child.getAttribute("name");
19
+ const label = child.getAttribute("label");
18
20
 
19
21
  if (!axis) {
20
22
  throw new Error(`Field ${name} doesn't have an axis`);
@@ -28,6 +30,7 @@ export const parseXYAxis = (nodes: NodeListOf<ChildNode>): XYAxis => {
28
30
  axis: axis as Axis,
29
31
  name,
30
32
  operator: operator as Operator,
33
+ label: label || undefined,
31
34
  });
32
35
 
33
36
  if (axis === "x") {
@@ -13,12 +13,24 @@ const evaluateCondition = ({
13
13
  return false;
14
14
  }
15
15
 
16
- if (values[fieldName] === undefined && fields[fieldName].type !== "boolean") {
16
+ if (
17
+ values[fieldName] === undefined &&
18
+ fields[fieldName].type !== "boolean" &&
19
+ fields[fieldName].type !== "many2one"
20
+ ) {
17
21
  return false;
18
22
  }
19
23
 
20
24
  let filteredExpectedValue = expectedValue;
21
25
 
26
+ if (
27
+ fields[fieldName].type === "many2one" &&
28
+ expectedValue === false &&
29
+ values[fieldName] === undefined
30
+ ) {
31
+ filteredExpectedValue = undefined;
32
+ }
33
+
22
34
  if (
23
35
  fields[fieldName].type === "boolean" &&
24
36
  (expectedValue === 0 || expectedValue === 1)
@@ -28,6 +28,9 @@ const fields = {
28
28
  change_adm: {
29
29
  type: "boolean",
30
30
  },
31
+ autoconsum_id: {
32
+ type: "many2one",
33
+ },
31
34
  };
32
35
 
33
36
  describe("An Attribute Parser", () => {
@@ -169,5 +172,29 @@ describe("An Attribute Parser", () => {
169
172
  });
170
173
  expect(evaluatedAttrs.invisible).toBeTruthy();
171
174
  });
175
+ it("should properly parse a many2one attribute with false value", () => {
176
+ const tagAttributes = {
177
+ attrs: "{'invisible': [('autoconsum_id', '=', False)]}",
178
+ };
179
+ const values = { autoconsum_id: false };
180
+ const evaluatedAttrs = evaluateAttributes({
181
+ tagAttributes,
182
+ values,
183
+ fields,
184
+ });
185
+ expect(evaluatedAttrs.invisible).toBeTruthy();
186
+ });
187
+ it.only("should properly parse a many2one attribute with undefined value", () => {
188
+ const tagAttributes = {
189
+ attrs: "{'invisible': [('autoconsum_id', '=', False)]}",
190
+ };
191
+ const values = { autoconsum_id: undefined };
192
+ const evaluatedAttrs = evaluateAttributes({
193
+ tagAttributes,
194
+ values,
195
+ fields,
196
+ });
197
+ expect(evaluatedAttrs.invisible).toBeTruthy();
198
+ });
172
199
  });
173
200
  });