@gisce/ooui 0.3.2 → 0.3.5

package/dist/Graph/{GraphLine.d.ts → GraphChart.d.ts}

@@ -1,9 +1,9 @@
 import { GraphAxis } from ".";
-import { Graph } from "./Graph";
-export declare class GraphLine extends Graph {
+import { Graph, GraphType } from "./Graph";
+export declare class GraphChart extends Graph {
     _x: GraphAxis | undefined;
     get x(): GraphAxis | undefined;
     _y: GraphAxis | undefined;
     get y(): GraphAxis | undefined;
-    constructor(element: HTMLElement);
+    constructor(type: GraphType, element: HTMLElement);
 }

package/dist/Graph/{GraphLine.js → GraphChart.js}

@@ -13,31 +13,31 @@ var __extends = (this && this.__extends) || (function () {
 })();
 import { Graph } from "./Graph";
 import { parseXYAxis } from "./graphHelper";
-var GraphLine = /** @class */ (function (_super) {
-    __extends(GraphLine, _super);
-    function GraphLine(element) {
+var GraphChart = /** @class */ (function (_super) {
+    __extends(GraphChart, _super);
+    function GraphChart(type, element) {
         var _this = _super.call(this, element) || this;
-        _this._type = "line";
+        _this._type = type;
         var xyAxis = parseXYAxis(element.childNodes);
         _this._x = xyAxis.x;
         _this._y = xyAxis.y;
         return _this;
     }
-    Object.defineProperty(GraphLine.prototype, "x", {
+    Object.defineProperty(GraphChart.prototype, "x", {
         get: function () {
             return this._x;
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(GraphLine.prototype, "y", {
+    Object.defineProperty(GraphChart.prototype, "y", {
         get: function () {
             return this._y;
         },
         enumerable: false,
         configurable: true
     });
-    return GraphLine;
+    return GraphChart;
 }(Graph));
-export { GraphLine };
-//# sourceMappingURL=GraphLine.js.map
+export { GraphChart };
+//# sourceMappingURL=GraphChart.js.map

package/dist/Graph/GraphChart.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GraphChart.js","sourceRoot":"","sources":["../../src/Graph/GraphChart.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,OAAO,EAAE,KAAK,EAAa,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C;IAAgC,8BAAK;IAUnC,oBAAY,IAAe,EAAE,OAAoB;QAAjD,YACE,kBAAM,OAAO,CAAC,SAOf;QALC,KAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAElB,IAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC/C,KAAI,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;QACnB,KAAI,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;;IACrB,CAAC;IAhBD,sBAAI,yBAAC;aAAL;YACE,OAAO,IAAI,CAAC,EAAE,CAAC;QACjB,CAAC;;;OAAA;IAGD,sBAAI,yBAAC;aAAL;YACE,OAAO,IAAI,CAAC,EAAE,CAAC;QACjB,CAAC;;;OAAA;IAUH,iBAAC;AAAD,CAAC,AAnBD,CAAgC,KAAK,GAmBpC"}

package/dist/Graph/GraphFactory.d.ts

@@ -1,3 +1,3 @@
 import { GraphIndicator } from "./GraphIndicator";
-import { GraphLine } from "./GraphLine";
-export declare const parseGraph: (xml: string) => GraphIndicator | GraphLine;
+import { GraphChart } from "./GraphChart";
+export declare const parseGraph: (xml: string) => GraphIndicator | GraphChart;

package/dist/Graph/GraphFactory.js

@@ -1,8 +1,10 @@
 import { GraphIndicator } from "./GraphIndicator";
-import { GraphLine } from "./GraphLine";
+import { GraphChart } from "./GraphChart";
 var GraphTypes = {
     indicator: GraphIndicator,
-    line: GraphLine,
+    line: GraphChart,
+    bar: GraphChart,
+    pie: GraphChart,
 };
 export var parseGraph = function (xml) {
     var parser = new DOMParser();
@@ -15,6 +17,6 @@ export var parseGraph = function (xml) {
     if (!graphModel) {
         throw new Error(type + " not found as a GraphModel");
     }
-    return new graphModel(view.documentElement);
+    return new graphModel(type, view.documentElement);
 };
 //# sourceMappingURL=GraphFactory.js.map

package/dist/Graph/GraphFactory.js.map

@@ -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,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,IAAM,UAAU,GAA2B;IACzC,SAAS,EAAE,cAAc;IACzB,IAAI,EAAE,SAAS;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,CAAC,eAAe,CAAC,CAAC;AAC9C,CAAC,CAAC"}
+{"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"}

package/dist/Graph/GraphIndicator.d.ts

@@ -1,4 +1,4 @@
-import { Graph } from "./Graph";
+import { Graph, GraphType } from "./Graph";
 export declare class GraphIndicator extends Graph {
     _color: string | null;
     get color(): string | null;
@@ -10,5 +10,5 @@ export declare class GraphIndicator extends Graph {
     get showPercent(): boolean;
     _suffix: string | null;
     get suffix(): string | null;
-    constructor(element: HTMLElement);
+    constructor(type: GraphType, element: HTMLElement);
 }

package/dist/Graph/GraphIndicator.js

@@ -14,14 +14,14 @@ var __extends = (this && this.__extends) || (function () {
 import { Graph } from "./Graph";
 var GraphIndicator = /** @class */ (function (_super) {
     __extends(GraphIndicator, _super);
-    function GraphIndicator(element) {
+    function GraphIndicator(type, element) {
         var _this = _super.call(this, element) || this;
         _this._color = null;
         _this._icon = null;
         _this._totalDomain = null;
         _this._showPercent = false;
         _this._suffix = null;
-        _this._type = "indicator";
+        _this._type = type;
         _this._color = element.getAttribute("color");
         _this._icon = element.getAttribute("icon");
         _this._suffix = element.getAttribute("suffix");

package/dist/Graph/GraphIndicator.js.map

@@ -1 +1 @@
-{"version":3,"file":"GraphIndicator.js","sourceRoot":"","sources":["../../src/Graph/GraphIndicator.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC;IAAoC,kCAAK;IA0BvC,wBAAY,OAAoB;QAAhC,YACE,kBAAM,OAAO,CAAC,SAgBf;QA1CD,YAAM,GAAkB,IAAI,CAAC;QAK7B,WAAK,GAAkB,IAAI,CAAC;QAK5B,kBAAY,GAAkB,IAAI,CAAC;QAKnC,kBAAY,GAAY,KAAK,CAAC;QAK9B,aAAO,GAAkB,IAAI,CAAC;QAQ5B,KAAI,CAAC,KAAK,GAAG,WAAW,CAAC;QACzB,KAAI,CAAC,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC5C,KAAI,CAAC,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC1C,KAAI,CAAC,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC9C,KAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QACxD,IAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QAExD,IACE,WAAW;YACX,CAAC,WAAW,KAAK,GAAG;gBAClB,CAAC,OAAO,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,IAAI,CAAC,CAAC,EAC7D;YACA,KAAI,CAAC,YAAY,GAAG,IAAI,CAAC;SAC1B;;IACH,CAAC;IAzCD,sBAAI,iCAAK;aAAT;YACE,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;;;OAAA;IAGD,sBAAI,gCAAI;aAAR;YACE,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;;;OAAA;IAGD,sBAAI,uCAAW;aAAf;YACE,OAAO,IAAI,CAAC,YAAY,CAAC;QAC3B,CAAC;;;OAAA;IAGD,sBAAI,uCAAW;aAAf;YACE,OAAO,IAAI,CAAC,YAAY,CAAC;QAC3B,CAAC;;;OAAA;IAGD,sBAAI,kCAAM;aAAV;YACE,OAAO,IAAI,CAAC,OAAO,CAAC;QACtB,CAAC;;;OAAA;IAoBH,qBAAC;AAAD,CAAC,AA5CD,CAAoC,KAAK,GA4CxC"}
+{"version":3,"file":"GraphIndicator.js","sourceRoot":"","sources":["../../src/Graph/GraphIndicator.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAa,MAAM,SAAS,CAAC;AAE3C;IAAoC,kCAAK;IA0BvC,wBAAY,IAAe,EAAE,OAAoB;QAAjD,YACE,kBAAM,OAAO,CAAC,SAgBf;QA1CD,YAAM,GAAkB,IAAI,CAAC;QAK7B,WAAK,GAAkB,IAAI,CAAC;QAK5B,kBAAY,GAAkB,IAAI,CAAC;QAKnC,kBAAY,GAAY,KAAK,CAAC;QAK9B,aAAO,GAAkB,IAAI,CAAC;QAQ5B,KAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,KAAI,CAAC,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC5C,KAAI,CAAC,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC1C,KAAI,CAAC,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC9C,KAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QACxD,IAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QAExD,IACE,WAAW;YACX,CAAC,WAAW,KAAK,GAAG;gBAClB,CAAC,OAAO,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,IAAI,CAAC,CAAC,EAC7D;YACA,KAAI,CAAC,YAAY,GAAG,IAAI,CAAC;SAC1B;;IACH,CAAC;IAzCD,sBAAI,iCAAK;aAAT;YACE,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;;;OAAA;IAGD,sBAAI,gCAAI;aAAR;YACE,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;;;OAAA;IAGD,sBAAI,uCAAW;aAAf;YACE,OAAO,IAAI,CAAC,YAAY,CAAC;QAC3B,CAAC;;;OAAA;IAGD,sBAAI,uCAAW;aAAf;YACE,OAAO,IAAI,CAAC,YAAY,CAAC;QAC3B,CAAC;;;OAAA;IAGD,sBAAI,kCAAM;aAAV;YACE,OAAO,IAAI,CAAC,OAAO,CAAC;QACtB,CAAC;;;OAAA;IAoBH,qBAAC;AAAD,CAAC,AA5CD,CAAoC,KAAK,GA4CxC"}

package/dist/Graph/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./Graph";
 export * from "./GraphFactory";
 export * from "./GraphIndicator";
-export * from "./GraphLine";
+export * from "./GraphChart";
 export * from "./GraphAxis";

package/dist/Graph/index.js

@@ -1,6 +1,6 @@
 export * from "./Graph";
 export * from "./GraphFactory";
 export * from "./GraphIndicator";
-export * from "./GraphLine";
+export * from "./GraphChart";
 export * from "./GraphAxis";
 //# sourceMappingURL=index.js.map

package/dist/Graph/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Graph/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Graph/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC"}

package/dist/helpers/attributeParser.js

@@ -15,10 +15,17 @@ var evaluateCondition = function (_a) {
     if (fields[fieldName] === undefined) {
         return false;
     }
-    if (values[fieldName] === undefined && fields[fieldName].type !== "boolean") {
+    if (values[fieldName] === undefined &&
+        fields[fieldName].type !== "boolean" &&
+        fields[fieldName].type !== "many2one") {
         return false;
     }
     var filteredExpectedValue = expectedValue;
+    if (fields[fieldName].type === "many2one" &&
+        expectedValue === false &&
+        values[fieldName] === undefined) {
+        filteredExpectedValue = undefined;
+    }
     if (fields[fieldName].type === "boolean" &&
         (expectedValue === 0 || expectedValue === 1)) {
         filteredExpectedValue = expectedValue === 0 ? false : true;

package/dist/helpers/attributeParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"attributeParser.js","sourceRoot":"","sources":["../../src/helpers/attributeParser.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,IAAM,iBAAiB,GAAG,UAAC,EAQ1B;QAPC,KAAK,WAAA,EACL,MAAM,YAAA,EACN,MAAM,YAAA;IAMC,IAAA,SAAS,GAA6B,KAAK,GAAlC,EAAE,QAAQ,GAAmB,KAAK,GAAxB,EAAE,aAAa,GAAI,KAAK,GAAT,CAAU;IAEnD,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE;QACnC,OAAO,KAAK,CAAC;KACd;IAED,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,KAAK,SAAS,EAAE;QAC3E,OAAO,KAAK,CAAC;KACd;IAED,IAAI,qBAAqB,GAAG,aAAa,CAAC;IAE1C,IACE,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,KAAK,SAAS;QACpC,CAAC,aAAa,KAAK,CAAC,IAAI,aAAa,KAAK,CAAC,CAAC,EAC5C;QACA,qBAAqB,GAAG,aAAa,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;KAC5D;IAED,IAAM,KAAK,GACT,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,KAAK,SAAS;QAClC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC;QACrB,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAExB,QAAQ,QAAQ,CAAC,WAAW,EAAE,EAAE;QAC9B,KAAK,GAAG,CAAC;QACT,KAAK,IAAI;YACP,OAAO,KAAK,KAAK,qBAAqB,CAAC;QACzC,KAAK,IAAI,CAAC;QACV,KAAK,IAAI;YACP,OAAO,KAAK,KAAK,qBAAqB,CAAC;QACzC,KAAK,GAAG;YACN,OAAO,KAAK,GAAG,qBAAqB,CAAC;QACvC,KAAK,IAAI;YACP,OAAO,KAAK,IAAI,qBAAqB,CAAC;QACxC,KAAK,GAAG;YACN,OAAO,KAAK,GAAG,qBAAqB,CAAC;QACvC,KAAK,IAAI;YACP,OAAO,KAAK,IAAI,qBAAqB,CAAC;QACxC,KAAK,IAAI;YACP,OAAO,qBAAqB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC/C,KAAK,QAAQ;YACX,OAAO,CAAC,qBAAqB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChD;YACE,OAAO,KAAK,CAAC;KAChB;AACH,CAAC,CAAC;AAEF,IAAM,eAAe,GAAG,UAAC,EAQxB;QAPC,KAAK,WAAA,EACL,MAAM,YAAA,EACN,MAAM,YAAA;IAMN,IAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACxC,IAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACzC,IAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC/C,IAAM,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACzD,IAAM,YAAY,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC5D,IAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC9C,IAAM,aAAa,GAAQ,EAAE,CAAC;IAE9B,KAAwB,UAAyB,EAAzB,KAAA,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAzB,cAAyB,EAAzB,IAAyB,EAAE;QAA9C,IAAM,SAAS,SAAA;QAClB,IAAM,OAAO,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;QACxC,IAAM,gBAAgB,GAAc,OAAO,CAAC,GAAG,CAAC,UAAC,KAAU;YACzD,OAAO,iBAAiB,CAAC,EAAE,KAAK,OAAA,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAE,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QACH,aAAa,CAAC,SAAS,CAAC,GAAG,gBAAgB,CAAC,KAAK,CAC/C,UAAC,CAAU,IAAK,OAAA,CAAC,KAAK,IAAI,EAAV,CAAU,CAC3B,CAAC;KACH;IAED,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AAEF,IAAM,kBAAkB,GAAG,UAAC,EAQ3B;QAPC,aAAa,mBAAA,EACb,MAAM,YAAA,EACN,MAAM,YAAA;IAMN,IAAM,gBAAgB,GAAG,aAAa,CAAC,KAAK;QAC1C,CAAC,CAAC,eAAe,CAAC;YACd,KAAK,EAAE,aAAa,CAAC,KAAK;YAC1B,MAAM,QAAA;YACN,MAAM,QAAA;SACP,CAAC;QACJ,CAAC,CAAC,EAAE,CAAC;IAEP,sCAAY,aAAa,GAAK,gBAAgB,KAAE,KAAK,EAAE,SAAS,IAAG;AACrE,CAAC,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"attributeParser.js","sourceRoot":"","sources":["../../src/helpers/attributeParser.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -33,5 +33,5 @@ import Timeline from "./Timeline";
 import Indicator from "./Indicator";
 import Dashboard from "./Dashboard";
 import DashboardItem from "./DashboardItem";
-import { Graph, GraphAxis, GraphIndicator, GraphLine, GraphType, parseGraph, Operator } from "./Graph";
-export { Char, Selection, Many2one, Field, Widget, Form, Tree, Boolean, One2many, Integer, Float, FloatTime, Date, DateTime, Many2many, SearchFilter, Container, ContainerWidget, Text, ProgressBar, Notebook, Group, Page, Label, Separator, Button, Reference, Binary, Image, parseContext, transformDomainForChildWidget, Timeline, Indicator, Dashboard, DashboardItem, Graph, GraphAxis, GraphIndicator, GraphLine, GraphType, parseGraph, Operator, };
+import { Graph, GraphAxis, GraphIndicator, GraphChart, GraphType, parseGraph, Operator } from "./Graph";
+export { Char, Selection, Many2one, Field, Widget, Form, Tree, Boolean, One2many, Integer, Float, FloatTime, Date, DateTime, Many2many, SearchFilter, Container, ContainerWidget, Text, ProgressBar, Notebook, Group, Page, Label, Separator, Button, Reference, Binary, Image, parseContext, transformDomainForChildWidget, Timeline, Indicator, Dashboard, DashboardItem, Graph, GraphAxis, GraphIndicator, GraphChart, GraphType, parseGraph, Operator, };

package/dist/index.js

@@ -33,6 +33,6 @@ import Timeline from "./Timeline";
 import Indicator from "./Indicator";
 import Dashboard from "./Dashboard";
 import DashboardItem from "./DashboardItem";
-import { Graph, GraphAxis, GraphIndicator, GraphLine, parseGraph, } from "./Graph";
-export { Char, Selection, Many2one, Field, Widget, Form, Tree, Boolean, One2many, Integer, Float, FloatTime, Date, DateTime, Many2many, SearchFilter, Container, ContainerWidget, Text, ProgressBar, Notebook, Group, Page, Label, Separator, Button, Reference, Binary, Image, parseContext, transformDomainForChildWidget, Timeline, Indicator, Dashboard, DashboardItem, Graph, GraphAxis, GraphIndicator, GraphLine, parseGraph, };
+import { Graph, GraphAxis, GraphIndicator, GraphChart, parseGraph, } from "./Graph";
+export { Char, Selection, Many2one, Field, Widget, Form, Tree, Boolean, One2many, Integer, Float, FloatTime, Date, DateTime, Many2many, SearchFilter, Container, ContainerWidget, Text, ProgressBar, Notebook, Group, Page, Label, Separator, Button, Reference, Binary, Image, parseContext, transformDomainForChildWidget, Timeline, Indicator, Dashboard, DashboardItem, Graph, GraphAxis, GraphIndicator, GraphChart, parseGraph, };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,KAAK,EACL,SAAS,EACT,cAAc,EACd,SAAS,EAET,UAAU,GAEX,MAAM,SAAS,CAAC;AAEjB,OAAO,EACL,IAAI,EACJ,SAAS,EACT,QAAQ,EACR,KAAK,EACL,MAAM,EACN,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,OAAO,EACP,KAAK,EACL,SAAS,EACT,IAAI,EACJ,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,SAAS,EACT,eAAe,EACf,IAAI,EACJ,WAAW,EACX,QAAQ,EACR,KAAK,EACL,IAAI,EACJ,KAAK,EACL,SAAS,EACT,MAAM,EACN,SAAS,EACT,MAAM,EACN,KAAK,EACL,YAAY,EACZ,6BAA6B,EAC7B,QAAQ,EACR,SAAS,EACT,SAAS,EACT,aAAa,EACb,KAAK,EACL,SAAS,EACT,cAAc,EACd,SAAS,EAET,UAAU,GAEX,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,KAAK,EACL,SAAS,EACT,cAAc,EACd,UAAU,EAEV,UAAU,GAEX,MAAM,SAAS,CAAC;AAEjB,OAAO,EACL,IAAI,EACJ,SAAS,EACT,QAAQ,EACR,KAAK,EACL,MAAM,EACN,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,OAAO,EACP,KAAK,EACL,SAAS,EACT,IAAI,EACJ,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,SAAS,EACT,eAAe,EACf,IAAI,EACJ,WAAW,EACX,QAAQ,EACR,KAAK,EACL,IAAI,EACJ,KAAK,EACL,SAAS,EACT,MAAM,EACN,SAAS,EACT,MAAM,EACN,KAAK,EACL,YAAY,EACZ,6BAA6B,EAC7B,QAAQ,EACR,SAAS,EACT,SAAS,EACT,aAAa,EACb,KAAK,EACL,SAAS,EACT,cAAc,EACd,UAAU,EAEV,UAAU,GAEX,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/ooui",
-  "version": "0.3.2",
+  "version": "0.3.5",
   "dependencies": {},
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/Graph/{GraphLine.ts → GraphChart.ts}

@@ -1,8 +1,8 @@
 import { GraphAxis } from ".";
-import { Graph } from "./Graph";
+import { Graph, GraphType } from "./Graph";
 import { parseXYAxis } from "./graphHelper";
 
-export class GraphLine extends Graph {
+export class GraphChart extends Graph {
   _x: GraphAxis | undefined;
   get x(): GraphAxis | undefined {
     return this._x;
@@ -12,10 +12,10 @@ export class GraphLine extends Graph {
   get y(): GraphAxis | undefined {
     return this._y;
   }
-  constructor(element: HTMLElement) {
+  constructor(type: GraphType, element: HTMLElement) {
     super(element);
 
-    this._type = "line";
+    this._type = type;
 
     const xyAxis = parseXYAxis(element.childNodes);
     this._x = xyAxis.x;

package/src/Graph/GraphFactory.ts

@@ -1,12 +1,14 @@
 import { GraphIndicator } from "./GraphIndicator";
-import { GraphLine } from "./GraphLine";
+import { GraphChart } from "./GraphChart";
 
 const GraphTypes: { [key: string]: any } = {
   indicator: GraphIndicator,
-  line: GraphLine,
+  line: GraphChart,
+  bar: GraphChart,
+  pie: GraphChart,
 };
 
-export const parseGraph = (xml: string): GraphIndicator | GraphLine => {
+export const parseGraph = (xml: string): GraphIndicator | GraphChart => {
   const parser = new DOMParser();
   const view: Document = parser.parseFromString(xml, "text/xml");
 
@@ -22,5 +24,5 @@ export const parseGraph = (xml: string): GraphIndicator | GraphLine => {
     throw new Error(`${type} not found as a GraphModel`);
   }
 
-  return new graphModel(view.documentElement);
+  return new graphModel(type, view.documentElement);
 };

package/src/Graph/GraphIndicator.ts

@@ -1,4 +1,4 @@
-import { Graph } from "./Graph";
+import { Graph, GraphType } from "./Graph";
 
 export class GraphIndicator extends Graph {
   _color: string | null = null;
@@ -26,10 +26,10 @@ export class GraphIndicator extends Graph {
     return this._suffix;
   }
 
-  constructor(element: HTMLElement) {
+  constructor(type: GraphType, element: HTMLElement) {
     super(element);
 
-    this._type = "indicator";
+    this._type = type;
     this._color = element.getAttribute("color");
     this._icon = element.getAttribute("icon");
     this._suffix = element.getAttribute("suffix");

package/src/Graph/index.ts

@@ -1,5 +1,5 @@
 export * from "./Graph";
 export * from "./GraphFactory";
 export * from "./GraphIndicator";
-export * from "./GraphLine";
+export * from "./GraphChart";
 export * from "./GraphAxis";

package/src/helpers/attributeParser.ts

@@ -13,12 +13,24 @@ const evaluateCondition = ({
     return false;
   }
 
-  if (values[fieldName] === undefined && fields[fieldName].type !== "boolean") {
+  if (
+    values[fieldName] === undefined &&
+    fields[fieldName].type !== "boolean" &&
+    fields[fieldName].type !== "many2one"
+  ) {
     return false;
   }
 
   let filteredExpectedValue = expectedValue;
 
+  if (
+    fields[fieldName].type === "many2one" &&
+    expectedValue === false &&
+    values[fieldName] === undefined
+  ) {
+    filteredExpectedValue = undefined;
+  }
+
   if (
     fields[fieldName].type === "boolean" &&
     (expectedValue === 0 || expectedValue === 1)

package/src/index.ts

@@ -37,7 +37,7 @@ import {
   Graph,
   GraphAxis,
   GraphIndicator,
-  GraphLine,
+  GraphChart,
   GraphType,
   parseGraph,
   Operator,
@@ -82,7 +82,7 @@ export {
   Graph,
   GraphAxis,
   GraphIndicator,
-  GraphLine,
+  GraphChart,
   GraphType,
   parseGraph,
   Operator,

package/src/spec/Graph.spec.ts

@@ -1,4 +1,4 @@
-import { GraphIndicator, GraphLine, parseGraph } from "..";
+import { GraphIndicator, GraphChart, parseGraph } from "..";
 
 describe("A Graph", () => {
   it("should parse a basic XML title and type indicator", () => {
@@ -21,7 +21,7 @@ describe("A Graph", () => {
     </graph>
     `;
 
-    const graph = parseGraph(xml) as GraphLine;
+    const graph = parseGraph(xml) as GraphChart;
     expect(graph.type).toBe("line");
     expect(graph.x).toBeDefined();
     expect(graph.y).toBeDefined();

package/src/spec/attributeParser.spec.ts

@@ -28,6 +28,9 @@ const fields = {
   change_adm: {
     type: "boolean",
   },
+  autoconsum_id: {
+    type: "many2one",
+  },
 };
 
 describe("An Attribute Parser", () => {
@@ -169,5 +172,29 @@ describe("An Attribute Parser", () => {
       });
       expect(evaluatedAttrs.invisible).toBeTruthy();
     });
+    it("should properly parse a many2one attribute with false value", () => {
+      const tagAttributes = {
+        attrs: "{'invisible': [('autoconsum_id', '=', False)]}",
+      };
+      const values = { autoconsum_id: false };
+      const evaluatedAttrs = evaluateAttributes({
+        tagAttributes,
+        values,
+        fields,
+      });
+      expect(evaluatedAttrs.invisible).toBeTruthy();
+    });
+    it.only("should properly parse a many2one attribute with undefined value", () => {
+      const tagAttributes = {
+        attrs: "{'invisible': [('autoconsum_id', '=', False)]}",
+      };
+      const values = { autoconsum_id: undefined };
+      const evaluatedAttrs = evaluateAttributes({
+        tagAttributes,
+        values,
+        fields,
+      });
+      expect(evaluatedAttrs.invisible).toBeTruthy();
+    });
   });
 });

package/dist/Graph/GraphLine.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"GraphLine.js","sourceRoot":"","sources":["../../src/Graph/GraphLine.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C;IAA+B,6BAAK;IAUlC,mBAAY,OAAoB;QAAhC,YACE,kBAAM,OAAO,CAAC,SAOf;QALC,KAAI,CAAC,KAAK,GAAG,MAAM,CAAC;QAEpB,IAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC/C,KAAI,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;QACnB,KAAI,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;;IACrB,CAAC;IAhBD,sBAAI,wBAAC;aAAL;YACE,OAAO,IAAI,CAAC,EAAE,CAAC;QACjB,CAAC;;;OAAA;IAGD,sBAAI,wBAAC;aAAL;YACE,OAAO,IAAI,CAAC,EAAE,CAAC;QACjB,CAAC;;;OAAA;IAUH,gBAAC;AAAD,CAAC,AAnBD,CAA+B,KAAK,GAmBnC"}