With changes according to Yam's review and with fixes due to Ode's changes.

Author: Tamar

app/routers/dayview.py

@@ -81,23 +81,6 @@ def _check_color(self, color: str) -> str:
             return self.DEFAULT_COLOR
         return color
 
-    def _minutes_position(self, minutes: int) -> Union[int, None]:
-        min_minutes = self.MIN_MINUTES
-        max_minutes = self.MAX_MINUTES
-        for i in range(self.GRID_BAR_QUARTER, self.FULL_GRID_BAR + 1):
-            if min_minutes < minutes <= max_minutes:
-                return i
-            min_minutes = max_minutes
-            max_minutes += 15
-        return None
-
-    def _get_position(self, time: datetime) -> int:
-        grid_hour_position = time.hour * self.FULL_GRID_BAR
-        grid_minutes_modifier = self._minutes_position(time.minute)
-        if grid_minutes_modifier is None:
-            grid_minutes_modifier = 0
-        return grid_hour_position + grid_minutes_modifier + self.BASE_GRID_BAR
-
     def _set_grid_position(self) -> str:
         if self.start_multiday:
             start = self.FIRST_GRID_BAR
@@ -172,12 +155,12 @@ def get_events_and_attributes(
     day: datetime,
     session,
     user_id: int,
-) -> Iterator[Tuple[Event, DivAttributes]]:
+) -> Iterator[Tuple[Event, EventsAttributes]]:
     events = get_all_user_events(session, user_id)
     day_end = day + timedelta(hours=24)
     for event in events:
         if is_specific_time_event_in_day(event, day, day_end):
-            yield event, DivAttributes(event, day)
+            yield event, EventsAttributes(event, day)
 
 
 def get_all_day_events(
@@ -189,7 +172,7 @@ def get_all_day_events(
     day_end = day + timedelta(hours=24)
     for event in events:
         if is_all_day_event_in_day(event=event, day=day, day_end=day_end):
-            yield (event)
+            yield CurrentTimeAttributes(event)
 
 
 @router.get("/day/{date}", include_in_schema=False)
@@ -200,8 +183,7 @@ async def dayview(
     view="day",
 ):
     # TODO: add a login session
-    # user = session.query(User).filter_by(username="test_username").first()
-    user = session.query(User).filter_by(username="tamar").first()
+    user = session.query(User).filter_by(username="test_username").first()
     if not user:
         error_message = "User not found."
         raise HTTPException(
@@ -213,7 +195,7 @@ async def dayview(
     except ValueError as err:
         raise HTTPException(status_code=404, detail=f"{err}")
     zodiac_obj = zodiac.get_zodiac_of_day(session, day)
-    events_n_attrs = get_events_and_attributes(
+    events_with_attrs = get_events_and_attributes(
         day=day,
         session=session,
         user_id=user.id,
@@ -223,18 +205,18 @@ async def dayview(
         session=session,
         user_id=user.id,
     )
-    current_time_n_attrs = CurrentTimeAttributes(date=day)
+    current_time_with_attrs = CurrentTimeAttributes(date=day)
     month = day.strftime("%B").upper()
     return templates.TemplateResponse(
         "calendar_day_view.html",
         {
             "request": request,
-            "events": events_n_attrs,
+            "events": events_with_attrs,
             "all_day_events": all_day_events,
             "month": month,
             "day": day.day,
             "zodiac": zodiac_obj,
             "view": view,
-            "current_time": current_time_n_attrs
+            "current_time": current_time_with_attrs
         },
     )

app/routers/event.py

@@ -101,11 +101,9 @@ async def create_new_event(
     availability = data.get("availability", "True") == "True"
     location = data["location"]
     all_day = data["event_type"] and data["event_type"] == "on"
-
     vc_link = data["vc_link"]
     category_id = data.get("category_id")
     is_google_event = data.get("is_google_event", "True") == "True"
-
     invited_emails = get_invited_emails(data["invited"])
     uninvited_contacts = get_uninvited_regular_emails(
         session,

app/static/dayview.css

@@ -42,24 +42,24 @@ body {
   grid-column: 1 / -1;
 }
 
-.timegrid {
-  display: grid;
+.event-grid {
   grid-row: 1 / -1;
   grid-column: 1 / -1;
-  grid-template-rows: repeat(100, 0.375rem);
-  z-index: 43;
-}
-
-.sub-timegrid {
   display: grid;
-  grid-template-rows: repeat(15, 1fr);
+  grid-template-rows: repeat(100, auto);
 }
 
-.event-grid {
+.timegrid {
   grid-row: 1 / -1;
   grid-column: 1 / -1;
   display: grid;
-  grid-template-rows: repeat(100, 1fr);
+  grid-template-rows: repeat(100, auto);
+  z-index: 43;
+}
+
+.sub-timegrid {
+  display: grid;
+  grid-template-rows: repeat(15, auto);
 }
 
 .hour-block {
@@ -177,3 +177,7 @@ body {
   width: 1.2rem;
   height: 1.2rem;
 }
+
+#current_time_cursor {
+  border-bottom: 2.5px dotted rgba(255, 0, 0, 0.808);
+}

app/templates/calendar_day_view.html

@@ -34,6 +34,14 @@
           </div>
         {% endfor %}
     </div>
+    <div class="timegrid">
+      {% if current_time.is_viewed %}
+        <div class="sub-timegrid" style="grid-row: {{ current_time.grid_position }};">
+            <div id="current_time_cursor" style="grid-row: {{ current_time.sub_grid_position}};">
+            </div>
+        </div>
+      {% endif %}
+    </div>
     <div class="event-grid">
       {% for event, attr in events %}
       <div id="event{{event.id}}" class="d-flex flex-column text-truncate px-2 event"

app/templates/dayview.html

@@ -60,6 +60,11 @@
         </select>
     </div>
     <div class="form_row_end">
+        <label for="event_type">All-day:</label>
+        <select name="event_type" required>
+            <option value="on">Yes</option>
+            <option value="off" selected>No</option>
+        </select>
         <label for="availability">Availability:</label>
         <select id="availability" name="availability">
             <option value="free">Free</option>
@@ -70,6 +75,11 @@
             <option value="private">Private</option>
             <option value="public" selected>Public</option>
         </select>
+        <label for="is_google_event">Google event:</label>
+        <select id="is_google_event" name="is_google_event">
+            <option value="True">Yes</option>
+            <option value="False" selected>No</option>
+        </select>
     </div>
 </div>