syncing master

helix/user_values.py

@@ -8,7 +8,7 @@ from helix.constants.panel_type import PanelType
 from helix.constants.system_type import SystemType
 from helix.models.coordinate import Coordinate
 from helix.models.panel import PanelData, Panel
-
+from helix.models.sql.inverter_brands import InverterBrand
 
 class UserValues(object):
     def __init__(self, store, site):
@@ -60,6 +60,9 @@ class UserValues(object):
     def power_monitors(self):
         return [power_monitor.to_json() for power_monitor in self.site.power_monitors]
 
+    def inverter_brands(self):
+        return [inverter_brands.to_json() for inverter_brands in self.site.inverter_brands]
+
     def csv(self):
         csv_data = self.site.cad_file
         if not csv_data:
@@ -156,4 +159,3 @@ class UserValues(object):
         else:
             return False # should not happen, but if it does rather not show the warning
 
-