Merge pull request #402 from vingerha/0.9.2

Various
MyElectricalData · Aug 25, 2023 · f407ddd · f407ddd
2 parents 91502a8 + be23428
commit f407ddd
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/models/export_home_assistant.py b/app/models/export_home_assistant.py
@@ -243,12 +243,14 @@ def ecowatt_delta(self, name, delta):
         current_date = datetime.combine(datetime.now(), datetime.min.time()) + timedelta(days=delta)
         fetch_date = current_date - timedelta(days=1)
         ecowatt_data = self.db.get_ecowatt_range(fetch_date, fetch_date, "asc")
+        dayValue=""
         if ecowatt_data:
             forecast = {}
             for data in ecowatt_data:
                 for date, value in json.loads(data.detail.replace("'", '"')).items():
                     date = datetime.strptime(date, self.date_format_detail)
                     forecast[f'{date.strftime("%H")} h'] = value
+                dayValue=data.value
             attributes = {
                 "date": current_date.strftime(self.date_format),
                 "forecast": forecast,
@@ -258,7 +260,7 @@ def ecowatt_delta(self, name, delta):
                 name=f"{self.usage_point_id}.EcoWatt{name}",
                 uniq_id=uniq_id,
                 attributes=attributes,
-                state=123456.00
+                state=dayValue
             )
 
     def myelectricaldata_usage_point_id(self, measurement_direction):
@@ -628,4 +630,4 @@ def myelectricaldata_usage_point_id(self, measurement_direction):
             attributes=attributes,
             state=convert_kw(state),
             device_class="energy"
-        )
+        )