Merge remote-tracking branch 'origin/master'

custom_components/fpl/sensor_DailyUsageSensor.py

@@ -9,19 +9,34 @@ class FplDailyUsageSensor(FplMoneyEntity):
     def state(self):
         data = self.getData("daily_usage")
 
-        if len(data) > 0:
-            return data[-1]["cost"]
-
-        return None
+        try:
+            self._state = data[-1]["cost"]
+        except:
+            pass
+        return self._state
 
     def defineAttributes(self):
         """Return the state attributes."""
         data = self.getData("daily_usage")
-
-        if len(data) > 0:
-            return {"date": data[-1]["date"]}
-
-        return {}
+        attributes = {}
+        attributes["friendly_name"] = "Daily Usage"
+        attributes["device_class"] = "monetary"
+        attributes["state_class"] = "total_increasing"
+        attributes["unit_of_measurement"] = "$"
+        if data is not None:
+            if (
+                (len(data) > 0)
+                and (data[-1] is not None)
+                and (data[-1]["readTime"] is not None)
+            ):
+                attributes["date"] = data[-1]["readTime"]
+            if (
+                (len(data) > 1)
+                and (data[-2] is not None)
+                and (data[-2]["readTime"] is not None)
+            ):
+                attributes["last_reset"] = data[-2]["readTime"]
+        return attributes
 
 
 class FplDailyUsageKWHSensor(FplEnergyEntity):
@@ -32,16 +47,126 @@ class FplDailyUsageKWHSensor(FplEnergyEntity):
     def state(self):
         data = self.getData("daily_usage")
 
-        if len(data) > 0:
-            return data[-1]["usage"]
-
-        return None
+        try:
+            self._state = data[-1]["usage"]
+        except:
+            pass
+        return self._state
 
     def defineAttributes(self):
         """Return the state attributes."""
         data = self.getData("daily_usage")
 
-        if len(data) > 0:
-            return {"date": data[-1]["date"]}
+        attributes = {}
+        attributes["friendly_name"] = "Daily Usage"
+        attributes["device_class"] = "energy"
+        attributes["state_class"] = "total_increasing"
+        attributes["unit_of_measurement"] = "kWh"
 
+        if data is not None:
+            if (
+                (len(data) > 0)
+                and (data[-1] is not None)
+                and (data[-1]["readTime"] is not None)
+            ):
+                attributes["date"] = data[-1]["readTime"]
+            if (
+                (len(data) > 1)
+                and (data[-2] is not None)
+                and (data[-2]["readTime"] is not None)
+            ):
+                attributes["last_reset"] = data[-2]["readTime"]
+
+        return attributes
+
+    @property
+    def icon(self):
+        return "mdi:flash"
+
+
+class FplDailyReceivedKWHSensor(FplEntity):
+    def __init__(self, coordinator, config, account):
+        super().__init__(coordinator, config, account, "Daily Received KWH")
+
+    @property
+    def state(self):
+        data = self.getData("daily_usage")
+        try:
+            self._state = data[-1]["netReceivedKwh"]
+        except:
+            pass
+        return self._state
+
+    def defineAttributes(self):
+        """Return the state attributes."""
+        data = self.getData("daily_usage")
+
+        attributes = {}
+        attributes["friendly_name"] = "Daily Return to Grid"
+        attributes["device_class"] = "energy"
+        attributes["state_class"] = "total_increasing"
+        attributes["unit_of_measurement"] = "kWh"
+        if data is not None:
+            if (
+                (len(data) > 0)
+                and (data[-1] is not None)
+                and (data[-1]["readTime"] is not None)
+            ):
+                attributes["date"] = data[-1]["readTime"]
+            if (
+                (len(data) > 1)
+                and (data[-2] is not None)
+                and (data[-2]["readTime"] is not None)
+            ):
+                attributes["last_reset"] = data[-2]["readTime"]
+        return attributes
+
+    @property
+    def icon(self):
+        return "mdi:flash"
+
+
+class FplDailyDeliveredKWHSensor(FplEntity):
+    def __init__(self, coordinator, config, account):
+        super().__init__(coordinator, config, account, "Daily Delivered KWH")
+
+    @property
+    def state(self):
+        data = self.getData("daily_usage")
+        try:
+            self._state = data[-1]["netDeliveredKwh"]
+        except:
+            pass
+        return self._state
+
+    def defineAttributes(self):
+        """Return the state attributes."""
+        data = self.getData("daily_usage")
+
+<<<<<<< HEAD
         return {}
+=======
+        attributes = {}
+        attributes["friendly_name"] = "Daily Consumption"
+        attributes["device_class"] = "energy"
+        attributes["state_class"] = "total_increasing"
+        attributes["unit_of_measurement"] = "kWh"
+        if data is not None:
+            if (
+                (len(data) > 0)
+                and (data[-1] is not None)
+                and (data[-1]["readTime"] is not None)
+            ):
+                attributes["date"] = data[-1]["readTime"]
+            if (
+                (len(data) > 1)
+                and (data[-2] is not None)
+                and (data[-2]["readTime"] is not None)
+            ):
+                attributes["last_reset"] = data[-2]["readTime"]
+        return attributes
+
+    @property
+    def icon(self):
+        return "mdi:flash"
+>>>>>>> master