fix: Revert conversion of dates to UTC

 - update panel registration (deprecated)

Author: kevin-briand

custom_components/heatger/frontend/dist/heatger-panel.js

@@ -1,2 +1,2 @@
-export const VERSION = '1.0'
+export const VERSION = '1.03'
 export const STOP_FROSTFREE_PAYLOAD = '2023-01-01T00:00'

custom_components/heatger/frontend/src/panel/consts.ts

@@ -8,7 +8,6 @@ import { localize } from '../../localize/localize'
 import { style } from '../../style'
 import { heatgerGetZones } from '../websocket/ha-ws'
 import { heatgerAddProg, heatgerRemoveAllProg, heatgerRemoveProg } from '../api/ha-api'
-import { progToUTC } from '../../utils/convert/convert'
 import { type ZoneInfo } from '../websocket/dto/zone-info.dto'
 
 @customElement('heatger-prog-card')
@@ -44,13 +43,14 @@ export class HeatgerProgCard extends LitElement {
       }
     }
     const time = form.time.value
+    console.log(time);
     const state = parseInt(form.state.value)
     const zone = parseInt(form.zone.value)
     if (selectedDays.length === 0 || time === '') return
 
     const progs: Prog[] = []
     selectedDays.forEach((day) => {
-      progs.push(progToUTC({ day, hour: time, state }))
+      progs.push({ day, hour: time, state })
     })
     void heatgerAddProg(this.hass, `zone${zone}`, progs).then(() => {
       this.updateZonesData()
@@ -59,7 +59,7 @@ export class HeatgerProgCard extends LitElement {
 
   handleDelete (prog: Prog): void {
     const zoneNumber = this.currentTab + 1
-    void heatgerRemoveProg(this.hass, `zone${zoneNumber}`, progToUTC(prog)).then(() => {
+    void heatgerRemoveProg(this.hass, `zone${zoneNumber}`, prog).then(() => {
       this.updateZonesData()
     })
   }

custom_components/heatger/frontend/src/panel/prog/prog.ts

@@ -1,7 +1,7 @@
 import { type CSSResultGroup, html, LitElement, type TemplateResult } from 'lit'
 import { customElement, property } from 'lit/decorators.js'
 import { type Prog } from '../api/prog/dto/prog'
-import { dayToStr, orderToStr, progFromUTC } from '../../utils/convert/convert';
+import { dayToStr, orderToStr } from '../../utils/convert/convert';
 import { localize } from '../../localize/localize'
 import { type HomeAssistant } from 'custom-card-helpers'
 import { style } from '../../style'
@@ -47,7 +47,7 @@ export class HeatgerProgTable extends LitElement {
                     </thead>
                     <tbody>
                     ${this.datas.map((value) => {
-                        return this.addRow(progFromUTC(value))
+                        return this.addRow(value)
                     })}
                     </tbody>
                 </table>

custom_components/heatger/frontend/src/panel/prog/table_prog.ts

@@ -1,17 +1,16 @@
 from homeassistant.components import frontend
 from homeassistant.components import panel_custom
+from homeassistant.components.http import StaticPathConfig
 
 from custom_components.heatger import DOMAIN
 
 
 async def async_register_panel(hass):
     url = F'custom_components/{DOMAIN}/frontend/dist/heatger-panel.js'
 
-    hass.http.register_static_path(
-        '/api/panel_custom/heatger',
-        url,
-        cache_headers=False
-    )
+    await hass.http.async_register_static_paths([
+        StaticPathConfig('/api/panel_custom/heatger',url, False)
+    ])
 
     await panel_custom.async_register_panel(
         hass,

custom_components/heatger/panel.py

@@ -1,6 +1,6 @@
 """Base class"""
 import abc
-from datetime import datetime, time, timedelta
+import datetime
 
 from custom_components.heatger.shared.timer.timer import Timer
 
@@ -21,10 +21,10 @@ def get_remaining_time(self) -> int:
         return self.timer.get_remaining_time()
 
     @staticmethod
-    def get_next_day(weekday: int, hour: time) -> datetime:
+    def get_next_day(weekday: int, hour: datetime.time) -> datetime:
         """return a datetime"""
-        now = datetime.utcnow()
-        actual_weekday = datetime.utcnow().weekday()
+        now = datetime.datetime.now()
+        actual_weekday = datetime.datetime.now().weekday()
         if actual_weekday > weekday:
             next_day = (7 - actual_weekday) + weekday
         elif actual_weekday == weekday and \
@@ -33,8 +33,8 @@ def get_next_day(weekday: int, hour: time) -> datetime:
         else:
             next_day = weekday - actual_weekday
 
-        delta = timedelta(days=next_day)
-        result = datetime.fromtimestamp(datetime.utcnow().timestamp() + delta.total_seconds())
+        delta = datetime.timedelta(days=next_day)
+        result = datetime.datetime.fromtimestamp(datetime.datetime.now().timestamp() + delta.total_seconds())
         return result.replace(hour=hour.hour, minute=hour.minute, second=0, microsecond=0)
 
     async def stop_loop(self):

custom_components/heatger/zone/base.py

@@ -1,7 +1,7 @@
 """Zone class"""
 import re
 
-from datetime import datetime
+import datetime
 from typing import Optional, Dict
 
 from homeassistant.core import HomeAssistant
@@ -99,9 +99,10 @@ async def get_next_schedule(self) -> Optional[ScheduleDto]:
         if list_schedules is None or len(list_schedules) == 0:
             return None
 
-        current_schedule = ScheduleDto(datetime.utcnow().weekday(), datetime.utcnow().time(), State.ECO)
+        current_schedule = ScheduleDto(datetime.datetime.now().weekday(), datetime.datetime.now().time(), State.ECO)
         next_schedule: Optional[ScheduleDto] = None
         for schedule in list_schedules:
+            Logs.info("DEBUG", F"current: {current_schedule.to_value()} - next: {schedule.to_value()}")
             if current_schedule.to_value() < schedule.to_value():
                 next_schedule = schedule
                 break
@@ -113,7 +114,7 @@ async def get_next_schedule(self) -> Optional[ScheduleDto]:
     def get_remaining_time_from_schedule(schedule: ScheduleDto) -> int:
         """Return the remaining time between the next schedule and now"""
         schedule_date = Zone.get_next_day(schedule.day, schedule.hour)
-        return int(schedule_date.timestamp() - datetime.utcnow().timestamp())
+        return int(schedule_date.timestamp() - datetime.datetime.now().timestamp())
 
     async def launch_ping(self) -> None:
         """Start users presence check"""

custom_components/heatger/zone/zone.py

@@ -1,5 +1,5 @@
 """Zone manager class"""
-from datetime import datetime
+import datetime
 from typing import Optional
 import voluptuous as vol
 
@@ -42,7 +42,6 @@ async def init_zones(self) -> None:
             await self.init_zones_from_config_file()
         except KeyError:
             Logs.info('INIT', len(self.zones))
-            pass
 
     async def init_zones_from_config_file(self) -> None:
         """Initialize zones from config file"""
@@ -96,11 +95,11 @@ async def toggle_frost_free(self, end_date: str = None) -> None:
             Logs.error(CLASSNAME, F'{State.FROSTFREE} - empty data')
             return
         try:
-            end_date = datetime.strptime(end_date, '%Y-%m-%dT%H:%M:%S.%fZ')
+            end_date = datetime.datetime.strptime(end_date, '%Y-%m-%dT%H:%M:%S.%fZ')
         except ValueError:
             Logs.error(CLASSNAME, F'{State.FROSTFREE} - invalid date format')
             return
-        if end_date > datetime.now():
+        if end_date > datetime.datetime.now():
             await self.frostfree.start(end_date)
         else:
             await self.frostfree.stop()