From e858cc8e4c644568766db0e2609b243248402379 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 30 Jan 2022 15:23:36 +0000 Subject: Dates class problem in heating --- date.py | 18 ------------------ dates.py | 18 ++++++++++++++++++ heating.py | 8 ++++---- 3 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 date.py create mode 100644 dates.py diff --git a/date.py b/date.py deleted file mode 100644 index 77df9ab..0000000 --- a/date.py +++ /dev/null @@ -1,18 +0,0 @@ -import time -from datetime import datetime - - -class date: - def __init__(self): - pass - - def day(self): - return int(datetime.now().strftime("%Y%m%d")) - - def time(self): - return int(datetime.now().strftime("%H%M%S")) - - def date(self): - return int(datetime.now().strftime("%A")) - - diff --git a/dates.py b/dates.py new file mode 100644 index 0000000..77df9ab --- /dev/null +++ b/dates.py @@ -0,0 +1,18 @@ +import time +from datetime import datetime + + +class date: + def __init__(self): + pass + + def day(self): + return int(datetime.now().strftime("%Y%m%d")) + + def time(self): + return int(datetime.now().strftime("%H%M%S")) + + def date(self): + return int(datetime.now().strftime("%A")) + + diff --git a/heating.py b/heating.py index 42401ad..1290d24 100644 --- a/heating.py +++ b/heating.py @@ -2,7 +2,7 @@ from abc import ABC, abstractmethod from circular_queue import circular_queue import time import os -import date +import dates # Abstract Class for heating class heating(ABC): @@ -10,7 +10,7 @@ class heating(ABC): self.temperature = 0 self.target = 19 self.on = False - self.date = date.date() + self.date = dates.date() self.db = db self.queue = circular_queue(20) @@ -34,11 +34,11 @@ class heating(ABC): self.turn_off() self.db.exec( "insert into temperature values (?,?,?,?)", - (date.day(), date.time(), self.temperature, self.target), + (self.date.day(), self.date.time(), self.temperature, self.target), ) self.db.exec( "insert into history values (?,?,?)", - (date.day(), date.time(), heatingon(int)), + (self.date.day(), self.date.time(), heatingon(int)), ) """ -- cgit v1.2.3