Show event location (#8)

* Larger calendar section * Show event location * poetry update
stefanthoss · Dec 11, 2024 · 88c9ce2 · 88c9ce2
1 parent 18285aa
commit 88c9ce2
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 27 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/src/ics_cal/ics.py b/src/ics_cal/ics.py
@@ -46,4 +46,4 @@ def get_events(self, ics_url, calStartDatetime, calEndDatetime, displayTZ, numDa
             else:
                 calDict.setdefault(event["startDatetime"].date(), []).append(event)
 
-        return calDict
+        return sorted(calDict.items(), key=lambda x: x[0])
diff --git a/src/ics_cal/icshelper.py b/src/ics_cal/icshelper.py
@@ -39,8 +39,11 @@ def retrieve_events(self, ics_url, startDatetime, endDatetime, localTZ):
             ) and event.begin < arrow.Arrow.fromdatetime(endDatetime):
                 # extracting and converting events data into a new list
                 new_event = {"summary": event.name}
-                new_event["allday"] = event.all_day
 
+                if event.location:
+                    new_event["location"] = event.location
+
+                new_event["allday"] = event.all_day
                 if new_event["allday"]:
                     # All-day events are always midnight UTC to midnight UTC, therefore timezone needs to be set
                     new_event["startDatetime"] = dt.datetime.fromisoformat(
@@ -61,9 +64,7 @@ def retrieve_events(self, ics_url, startDatetime, endDatetime, localTZ):
                 new_event["isMultiday"] = (
                     new_event["endDatetime"] - new_event["startDatetime"]
                 ) > dt.timedelta(days=1)
+
                 event_list.append(new_event)
 
-        # We need to sort eventList because the event will be sorted in "calendar order" instead of hours order
-        # TODO: improve because of double cycle for now is not much cost
-        event_list = sorted(event_list, key=lambda k: k["startDatetime"])
         return event_list
diff --git a/src/main.py b/src/main.py
@@ -66,9 +66,6 @@ def get_image() -> FileResponse:
         cfg.DISPLAY_TZ,
         cfg.NUM_CAL_DAYS_TO_QUERY,
     )
-    events_sorted = sorted(
-        events.items(), key=lambda x: x[0]
-    )  # sort by date so we can later take the first N days
 
     end_time = time.time()
     logger.info(f"Completed data retrieval in {round(end_time - start_time, 3)} seconds.")
@@ -84,7 +81,7 @@ def get_image() -> FileResponse:
             current_weather,
             hourly_forecast,
             daily_forecast,
-            events_sorted[: cfg.NUM_DAYS_IN_TEMPLATE],
+            events[: cfg.NUM_DAYS_IN_TEMPLATE],
             tf.name,
         )
 

diff --git a/src/render/css/styles.css b/src/render/css/styles.css
@@ -13,18 +13,14 @@
     src: url('../font/TiltWarp-Regular.ttf');
 }
 
-h1, h2, p, span, .h1, .h2, .p, .span  {
+h1, h2, h3, p, span {
     font-family: "Lexend-Regular", sans-serif;
 }
 
 .list-unstyled {
     text-overflow: ellipsis;
 }
 
-.event-time {
-    color: gray
-}
-
 .big-day {
     font-family: "TiltWarp-Regular", sans-serif;
     font-size: 18rem;
@@ -42,6 +38,15 @@ h1, h2, p, span, .h1, .h2, .p, .span  {
     text-overflow: ellipsis;
 }
 
+.event-time, .event-location {
+    color: gray
+}
+
+.weather-forecast {
+    font-family: "Lexend-Regular", sans-serif;
+    font-size: 2rem;
+}
+
 .info-bar {
     font-family: "Lexend-Light", sans-serif;
     font-size: 1.5rem;

diff --git a/src/render/dashboard_template.html b/src/render/dashboard_template.html
@@ -12,7 +12,7 @@
         <div class="container">
             <div class="row justify-content-center">
                 <!-- Weather -->
-                <div class="col-md-6">
+                <div class="col-md-5">
                     <div class="row">
                         <div class="col-md-12">
                             <div class="row">
@@ -55,7 +55,8 @@ <h2>{current_weather_text} | {current_weather_temp}°</h2>
                             </div>
                             <div class="row align-items-start ">
                                 <div class="col-md-12 text-center">
-                                    <h3>Today<br />{today_weather_pop}% | {today_weather_min}-{today_weather_max}°</h3>
+                                    <h3>Today</h3>
+                                    <div class="weather-forecast">{today_weather_pop}% | {today_weather_min}-{today_weather_max}°</div>
                                 </div>
                             </div>
                         </div>
@@ -67,7 +68,8 @@ <h3>Today<br />{today_weather_pop}% | {today_weather_min}-{today_weather_max}°<
                             </div>
                             <div class="row align-items-start ">
                                 <div class="col-md-12 text-center">
-                                    <h3>Tomorrow<br />{tomorrow_weather_pop}% | {tomorrow_weather_min}-{tomorrow_weather_max}°</h3>
+                                    <h3>Tomorrow</h3>
+                                    <div class="weather-forecast">{tomorrow_weather_pop}% | {tomorrow_weather_min}-{tomorrow_weather_max}°</div>
                                 </div>
                             </div>
                         </div>
@@ -79,7 +81,8 @@ <h3>Tomorrow<br />{tomorrow_weather_pop}% | {tomorrow_weather_min}-{tomorrow_wea
                             </div>
                             <div class="row align-items-start ">
                                 <div class="col-md-12 text-center">
-                                    <h3>{dayaftertomorrow}<br />{dayafter_weather_pop}% | {dayafter_weather_min}-{dayafter_weather_max}°</h3>
+                                    <h3>{dayaftertomorrow}</h3>
+                                    <div class="weather-forecast">{dayafter_weather_pop}% | {dayafter_weather_min}-{dayafter_weather_max}°</div>
                                 </div>
                             </div>
                         </div>
@@ -89,7 +92,7 @@ <h3>{dayaftertomorrow}<br />{dayafter_weather_pop}% | {dayafter_weather_min}-{da
                     </div>
                 </div>
                 <!-- Calendar -->
-                <div class="col-md-6">
+                <div class="col-md-7">
                     <div class="row align-items-start ">
                         <div class="col-md-12 text-right info-bar"  style="height: 25px">
                             Last Updated: {update_time}

diff --git a/src/render/render.py b/src/render/render.py
@@ -107,6 +107,10 @@ def process_inputs(
                         + "</span> "
                         + event["summary"]
                     )
+                    if "location" in event:
+                        cal_events_text += (
+                            '<span class="event-location"> at ' + event["location"] + "</span>"
+                        )
                 cal_events_text += "</div>\n"
             if d == current_date:
                 cal_events_days.append("Today")