Merge branch 'develop' into feat/derived-columns-export

SEED-platform · Jun 22, 2021 · 8a0e677 · 8a0e677
2 parents 923db52 + 88749bf
commit 8a0e677
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/seed/models/building_file.py b/seed/models/building_file.py
@@ -289,13 +289,14 @@ def process(self, organization_id, cycle, property_view=None):
                 )
                 meter.source = m.get('source')
                 meter.type = m.get('type')
+                if meter.type is None:
+                    meter.type = Meter.OTHER
                 meter.is_virtual = m.get('is_virtual')
                 if meter.is_virtual is None:
                     meter.is_virtual = False
                 meter.save()
 
                 # meterreadings
-
                 if meter.type in energy_types:
                     meter_type = energy_types[meter.type]
                 else:
@@ -310,10 +311,9 @@ def process(self, organization_id, cycle, property_view=None):
                         meter_id=meter.id,
                         conversion_factor=meter_conversions.get(mr.get('source_unit'), 1.00)
                     )
-                    for mr
-                    in m.get('readings', [])
+                    for mr in m.get('readings', [])
+                    if mr.get('start_time') is not None and mr.get('end_time') is not None
                 }
-
                 MeterReading.objects.bulk_create(readings)
 
         # merge or create the property state's view

diff --git a/seed/utils/meters.py b/seed/utils/meters.py
@@ -228,7 +228,7 @@ def _build_column_def(self, meter, column_defs):
 
         if meter.type == Meter.COST:
             display_unit = "{} Dollars".format(self._org_country)
-            conversion_factor = 1
+            conversion_factor = 1.00
         else:
             display_unit = self.org_meter_display_settings[type_text]
             conversion_factor = self.factors[type_text][display_unit]