Merge pull request #9 from gisce/add-suffix-indicator

Add suffix to indicator
gisce · May 14, 2024 · 68ba20b · 68ba20b
2 parents e395950 + 47ca178
commit 68ba20b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/ooui/graph/indicator.py b/ooui/graph/indicator.py
@@ -51,6 +51,8 @@ def process(self, value, total=0):
             'value': value,
             'total': total,
         }
+        if self.suffix:
+            res['suffix'] = self.suffix
         if self.show_percent:
             res['percent'] = round_number(value / total * 100)
         if self.color:

diff --git a/spec/graph/graph_spec.py b/spec/graph/graph_spec.py
@@ -20,7 +20,7 @@
 
     with it('should suport indicatorField graphs'):
         xml = """<?xml version="1.0"?>
-        <graph string="My indicator" showPercent="1" type="indicatorField" color="red:debt>0;green:debt==0" icon="slack">
+        <graph string="My indicator" showPercent="1" type="indicatorField" color="red:debt>0;green:debt==0" icon="slack" suffix="kW">
             <field name="potencia" operator="+" />
         </graph>
         """
@@ -33,6 +33,7 @@
         expect(graph.fields).to(contain_only('potencia'))
         expect(graph.total_domain).to(be_none)
         expect(graph.show_percent).to(be_true)
+        expect(graph.suffix).to(equal('kW'))
 
     with it("should parse a chart graph XML with type line"):
         xml = """<?xml version="1.0"?>

diff --git a/spec/graph/processor_spec.py b/spec/graph/processor_spec.py
@@ -48,7 +48,7 @@ def get_graph_data(xml, model):
 
     with it('should process indicatorField graph'):
         xml = """<?xml version="1.0"?>
-        <graph string="My indicator" showPercent="1" type="indicatorField" color="red:value>0;green:value==0" totalDomain="[]" icon="slack">
+        <graph string="My indicator" showPercent="1" type="indicatorField" color="red:value>0;green:value==0" totalDomain="[]" icon="slack" suffix="kW">
             <field name="potencia" operator="+" />
         </graph>
         """
@@ -66,6 +66,7 @@ def get_graph_data(xml, model):
             total=275.72,
             color='red',
             icon='slack',
+            suffix='kW',
         ))
 
     with it('should process indicator graph'):