IMP Allow S21 with empty energies

gisce · Dec 24, 2024 · eb261c7 · eb261c7
1 parent fe9c519
commit eb261c7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/primestg/report/base.py b/primestg/report/base.py
@@ -169,12 +169,12 @@ def active_reactive(self, measure, measure_type):
         :return: a dict with the active and reactive measures
         """
         return {
-            'ai': int(measure.get('AI{}'.format(measure_type), 0)),
-            'ae': int(measure.get('AE{}'.format(measure_type), 0)),
-            'r1': int(measure.get('R1{}'.format(measure_type), 0)),
-            'r2': int(measure.get('R2{}'.format(measure_type), 0)),
-            'r3': int(measure.get('R3{}'.format(measure_type), 0)),
-            'r4': int(measure.get('R4{}'.format(measure_type), 0)),
+            'ai': int(measure.get('AI{}'.format(measure_type), 0) or 0),
+            'ae': int(measure.get('AE{}'.format(measure_type), 0) or 0),
+            'r1': int(measure.get('R1{}'.format(measure_type), 0) or 0),
+            'r2': int(measure.get('R2{}'.format(measure_type), 0) or 0),
+            'r3': int(measure.get('R3{}'.format(measure_type), 0) or 0),
+            'r4': int(measure.get('R4{}'.format(measure_type), 0) or 0),
         }
 
 

diff --git a/primestg/report/reports.py b/primestg/report/reports.py
@@ -117,7 +117,7 @@ def values(self):
                     'power_factor3': get_float_value(get('PF3')),
                     'active_quadrant_phase3': get_integer_value(get('Ca3')),
 
-                    'phase_presence': [get_integer_value(i) for i in (get('PP')).split(",")],
+                    'phase_presence': [get_integer_value(i) for i in (get('PP')).split(",") if i != ''],
                     'meter_phase': get_integer_value(get('Fc')),
                     'current_switch_state': get_integer_value(get('Eacti')),
                     'previous_switch_state': get_integer_value(get('Eanti')),