@gisce/ooui 2.41.0 → 2.42.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/ooui",
-  "version": "2.41.0",
+  "version": "2.42.0",
   "engines": {
     "node": "20.5.0"
   },

package/src/Graph/GraphIndicator.ts

@@ -23,6 +23,16 @@ export class GraphIndicator extends Graph {
     return this._showPercent;
   }
 
+  _progressbar: boolean = false;
+  get progressbar(): boolean {
+    return this._progressbar;
+  }
+
+  _showTotal: boolean = true;
+  get showTotal(): boolean {
+    return this._showTotal;
+  }
+
   _suffix: string | null = null;
   get suffix(): string | null {
     return this._suffix;
@@ -43,5 +53,10 @@ export class GraphIndicator extends Graph {
     this._suffix = element.attributes.suffix || null;
     this._totalDomain = replaceEntities(element.attributes.totalDomain) || null;
     this._showPercent = parseBoolAttribute(element.attributes.showPercent);
+    this._progressbar = parseBoolAttribute(element.attributes.progressbar);
+    this._showTotal =
+      element.attributes.showTotal !== undefined
+        ? parseBoolAttribute(element.attributes.showTotal)
+        : !!this._totalDomain;
   }
 }

package/src/spec/Graph.spec.ts

@@ -55,6 +55,66 @@ describe("A Graph", () => {
     expect(graph.field).toBe("potencia");
     expect(graph.operator).toBe("+");
   });
+  it("should parse progressbar, showPercent and showTotal attributes", () => {
+    const xml1 = `<?xml version="1.0"?>
+    <graph string="My indicator" type="indicator" progressbar="1" />
+    `;
+
+    const graph1 = parseGraph(xml1) as GraphIndicator;
+    expect(graph1.progressbar).toBe(true);
+    expect(graph1.showPercent).toBe(false);
+    expect(graph1.showTotal).toBe(false); // No totalDomain, should default to false
+
+    const xml2 = `<?xml version="1.0"?>
+    <graph string="My indicator" type="indicator" showPercent="1" />
+    `;
+
+    const graph2 = parseGraph(xml2) as GraphIndicator;
+    expect(graph2.showPercent).toBe(true);
+    expect(graph2.progressbar).toBe(false);
+    expect(graph2.showTotal).toBe(false); // No totalDomain, should default to false
+
+    const xml3 = `<?xml version="1.0"?>
+    <graph string="My indicator" type="indicator" />
+    `;
+
+    const graph3 = parseGraph(xml3) as GraphIndicator;
+    expect(graph3.showPercent).toBe(false);
+    expect(graph3.progressbar).toBe(false);
+    expect(graph3.showTotal).toBe(false); // No totalDomain, should default to false
+
+    const xml4 = `<?xml version="1.0"?>
+    <graph string="My indicator" type="indicator" showTotal="0" />
+    `;
+
+    const graph4 = parseGraph(xml4) as GraphIndicator;
+    expect(graph4.showTotal).toBe(false);
+  });
+  it("should set showTotal to true when totalDomain is defined", () => {
+    const xml1 = `<?xml version="1.0"?>
+    <graph string="My indicator" type="indicator" totalDomain="[('state','=','open')]" />
+    `;
+
+    const graph1 = parseGraph(xml1) as GraphIndicator;
+    expect(graph1.totalDomain).toBe("[('state','=','open')]");
+    expect(graph1.showTotal).toBe(true); // totalDomain is defined, should default to true
+
+    const xml2 = `<?xml version="1.0"?>
+    <graph string="My indicator" type="indicator" totalDomain="[('state','=','open')]" showTotal="0" />
+    `;
+
+    const graph2 = parseGraph(xml2) as GraphIndicator;
+    expect(graph2.totalDomain).toBe("[('state','=','open')]");
+    expect(graph2.showTotal).toBe(false); // Explicitly set to false
+
+    const xml3 = `<?xml version="1.0"?>
+    <graph string="My indicator" type="indicator" totalDomain="[('state','=','open')]" showTotal="1" />
+    `;
+
+    const graph3 = parseGraph(xml3) as GraphIndicator;
+    expect(graph3.totalDomain).toBe("[('state','=','open')]");
+    expect(graph3.showTotal).toBe(true); // Explicitly set to true
+  });
   it("should parse a graph with timerange parameter", () => {
     const xml = `<?xml version="1.0"?>
     <graph type="line" timerange="day">