use datetime now, convewrt to local timezone, highlight now running p…

…rograms
joshinils · Sep 5, 2020 · aefc545 · aefc545
1 parent 52d73aa
commit aefc545
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/models/day.py b/models/day.py
@@ -1,6 +1,6 @@
 from .channel import Channel
 from typing import List
-from datetime import datetime
+from datetime import datetime, timedelta, timezone
 from .programme import Programme
 
 
@@ -20,6 +20,10 @@ def addProgram(self, prog: Programme):
     def getDate(self) -> str:
         return str(self.date)
 
+    def isToday(self) -> bool:
+        LOCAL_TIMEZONE = datetime.now(timezone(timedelta(0))).astimezone().tzinfo
+        return self.date == datetime.now(LOCAL_TIMEZONE).date()
+
     def getWochentag(self) -> str:
         weekdays = {0: "Montag",
                     1: "Dienstag",

diff --git a/models/programme.py b/models/programme.py
@@ -1,21 +1,27 @@
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import Dict
 from .channelName import ChannelName
 
+LOCAL_TIMEZONE = datetime.now(timezone(timedelta(0))).astimezone().tzinfo
+
 
 class Programme:
     def __init__(self, channelName: ChannelName, start: datetime, stop: datetime):
         self.channelName: ChannelName = channelName
         date_format: str = "%Y%m%d%H%M%S %z"
-        self.start = datetime.strptime(start, date_format) + timedelta(hours=2)
-        self.stop = datetime.strptime(stop, date_format) + timedelta(hours=2)
+
+        self.start = datetime.strptime(start, date_format).astimezone(LOCAL_TIMEZONE)
+        self.stop = datetime.strptime(stop, date_format).astimezone(LOCAL_TIMEZONE)
+
         self.data: Dict = {}
         self.prominent = False
         if self.start.hour >= 20 and self.start.minute >= 1:
             self.prominent = True
         if self.start.hour >= 21:
             self.prominent = True
         self.onPrevDay = False
+        now = datetime.now(LOCAL_TIMEZONE)
+        self.nowRunning = now >= self.start and now <= self.stop
 
     def startTime(self) -> str:
         return self.start.strftime("%H:%M")

diff --git a/static/style.css b/static/style.css
@@ -65,6 +65,10 @@ body {
     display: inline;
 }
 
+.nowRunning {
+    background-color: #ffffcc !important;
+}
+
 .prominent {
     /* https://stackoverflow.com/questions/17158253/indent-starting-from-the-second-line-of-a-paragraph-with-css */
     padding-left: 1.5em;

diff --git a/templates/hello.html b/templates/hello.html
@@ -11,7 +11,7 @@
         {% for day in guide.days.items() %}
         <tr class="channelDay">
             <td>
-                <div class="date">
+                <div class="date{% if day[1].isToday() %} nowRunning{% endif %}">
                     <div class="wochentag">
                         {{ day[1].getWochentag() }}
                     </div>
@@ -25,7 +25,7 @@
                         {{ channel[1].name.name }}
                     </div>
                     {% for prog in channel[1].programs %}
-                    <div class="programme{% if prog.prominent %} prominent{% else %} nonprominent{% endif %}{% if prog.onPrevDay %} onPrevDay{% else %} onDay{% endif %} {{ prog.catgy() }}">
+                    <div class="programme{% if prog.prominent %} prominent{% else %} nonprominent{% endif %}{% if prog.onPrevDay %} onPrevDay{% else %} onDay{% endif %}{% if prog.nowRunning %} nowRunning{% endif %} {{ prog.catgy() }}">
                         <div class="start">
                             {{ prog.startTime() }}
                         </div>