added ability to edit events

Author: Mole1424

config.py

@@ -30,11 +30,11 @@
     f.stem for f in Path("static/icons").iterdir() if f.is_file() and f.suffix == ".svg"
 ]
 
-# phosphor icons from static/icons/phosphor-bold.css
+# load all phosphor icons from CSS file
 phosphor_icons = sorted(
     set(
         re.findall(
-            r"\.ph-([a-z0-9-]+)::before",
+            r"\.ph-bold\.ph-([a-z0-9-]+):before",
             Path("static/icons/phosphor-bold.css").read_text(),
         )
     )

events/ui.py

@@ -1,10 +1,12 @@
-from flask import Blueprint, flash, redirect, render_template, request, url_for
+from flask import Blueprint, abort, flash, redirect, render_template, request, url_for
+from werkzeug.datastructures import ImmutableMultiDict
 from werkzeug.wrappers import Response
 
 from auth.auth import is_exec_wrapper
-from config import colours, icons
+from config import colours, custom_icons
 from events.utils import (
     create_event,
+    edit_event,
     get_all_tags,
     get_datetime_from_string,
     get_event_by_slug,
@@ -15,9 +17,64 @@
 events_ui_bp = Blueprint("events_ui", __name__, url_prefix="/events")
 
 
+def parse_form_data(form_data: ImmutableMultiDict) -> dict | str:
+    """Parse event from form data"""
+    # parse colour
+    text_colour = form_data.get("text_colour", None)
+    color_colour = form_data.get("color_colour", None)
+
+    text_colour = text_colour.strip().lower() if text_colour else None
+    color_colour = color_colour.strip().lower() if color_colour else None
+
+    if (error := validate_colour(text_colour, color_colour)) is not None:
+        return error
+
+    # prefer text_colour if both are provided (in case these colours change)
+    colour = text_colour if text_colour else color_colour
+
+    # parse dates and duration
+    start_time = get_datetime_from_string(form_data["start_time"])
+    if isinstance(start_time, str):
+        return start_time
+
+    duration = (
+        get_timedelta_from_string(form_data["duration"])
+        if form_data["duration"]
+        else None
+    )
+    if isinstance(duration, str):
+        return duration
+
+    end_time = (
+        get_datetime_from_string(form_data["end_time"])
+        if form_data["end_time"]
+        else None
+    )
+    if isinstance(end_time, str):
+        return end_time
+
+    # parse tags
+    tags = form_data.getlist("tags[]")
+    tags = [tag.strip().lower() for tag in tags if tag.strip()]
+
+    return {
+        "name": form_data["name"],
+        "description": form_data["description"],
+        "draft": "draft" in form_data,
+        "location": form_data["location"],
+        "location_url": form_data.get("location_url", None),
+        "icon": form_data.get("icon", None),
+        "colour": colour,
+        "start_time": start_time,
+        "duration": duration,
+        "end_time": end_time,
+        "tags": tags,
+    }
+
+
 @events_ui_bp.route("/create", methods=["GET", "POST"])
 @is_exec_wrapper
-def create(error: str | None = None) -> str | Response:  # noqa: PLR0911
+def create() -> str | Response:
     """Create a new event."""
 
     tags = [tag.name for tag in get_all_tags()]
@@ -26,11 +83,9 @@ def create(error: str | None = None) -> str | Response:  # noqa: PLR0911
     if request.method == "GET":
         return render_template(
             "events/form.html",
-            error=error,
             action="events_ui.create",
             method="POST",
-            event=None,
-            icons=icons,
+            icons=custom_icons,
             colours=colours,
             tags=tags,
         )
@@ -39,67 +94,92 @@ def create(error: str | None = None) -> str | Response:  # noqa: PLR0911
 
     print("Creating event with data:", request.form)
 
-    # parse colour
-    text_colour = request.form.get("text_colour", None)
-    color_colour = request.form.get("color_colour", None)
-
-    text_colour = text_colour.strip().lower() if text_colour else None
-    color_colour = color_colour.strip().lower() if color_colour else None
-
-    if (colour := validate_colour(text_colour, color_colour)) is not None:
-        flash(colour, "error")
+    # parse form data
+    data = parse_form_data(request.form)
+    if isinstance(data, str):
+        flash(data, "error")
         return redirect(url_for("events_ui.create"))
 
-    # prefer text_colour if both are provided (in case these colours change)
-    colour = text_colour if text_colour else color_colour
+    # attempt to create the event
+    event = create_event(**data)
 
-    # parse dates and duration
-    start_time = get_datetime_from_string(request.form["start_time"])
-    if isinstance(start_time, str):
-        flash(start_time, "error")
+    # if failed, redirect to the create page with an error
+    if isinstance(event, str):
+        flash(event, "error")
         return redirect(url_for("events_ui.create"))
 
-    duration = (
-        get_timedelta_from_string(request.form["duration"])
-        if request.form["duration"]
-        else None
+    # if successful, redirect to the event page
+    return redirect(
+        url_for(
+            "events_ui.view",
+            year=event.date.academic_year,
+            term=event.date.term,
+            week=event.date.week,
+            slug=event.slug,
+        )
     )
-    if isinstance(duration, str):
-        flash(duration, "error")
-        return redirect(url_for("events_ui.create"))
 
-    end_time = (
-        get_datetime_from_string(request.form["end_time"])
-        if request.form["end_time"]
-        else None
-    )
-    if isinstance(end_time, str):
-        flash(end_time, "error")
-        return redirect(url_for("events_ui.create"))
 
-    # parse tags
-    tags = request.form.getlist("tags[]")
-    tags = [tag.strip().lower() for tag in tags if tag.strip()] if tags else []
+@events_ui_bp.route(
+    "/<int:year>/<int:term>/<int:week>/<string:slug>/edit", methods=["GET", "POST"]
+)
+@is_exec_wrapper
+def edit(
+    year: int, term: int, week: int, slug: str, error: str | None = None
+) -> str | Response:
+    """Edit an existing event by its year, term, week, and slug."""
 
-    # attempt to create the event
-    event = create_event(
-        request.form["name"],
-        request.form["description"],
-        "draft" in request.form,
-        request.form["location"],
-        request.form.get("location_url", None),
-        request.form.get("icon", None),
-        colour,
-        start_time,
-        duration,
-        end_time,
-        tags,
-    )
+    event = get_event_by_slug(year, term, week, slug)
 
-    # if failed, redirect to the create page with an error
+    if event is None:
+        return abort(404, description="Event not found")
+
+    tags = [tag.name for tag in get_all_tags()]
+
+    # if getting, return the ui for editing the event
+    if request.method == "GET":
+        return render_template(
+            "events/form.html",
+            error=error,
+            action="events_ui.edit",
+            method="POST",
+            event=event,
+            icons=custom_icons,
+            colours=colours,
+            tags=tags,
+        )
+
+    # if posting, update the event
+
+    # parse form data
+    data = parse_form_data(request.form)
+    if isinstance(data, str):
+        flash(data, "error")
+        return redirect(
+            url_for(
+                "events_ui.edit",
+                year=year,
+                term=term,
+                week=week,
+                slug=slug,
+            )
+        )
+
+    # attempt to edit the event
+    event = edit_event(event.id, **data)
+
+    # if failed, redirect to the edit page with an error
     if isinstance(event, str):
         flash(event, "error")
-        return redirect(url_for("events_ui.create", error=event))
+        return redirect(
+            url_for(
+                "events_ui.edit",
+                year=year,
+                term=term,
+                week=week,
+                slug=slug,
+            )
+        )
 
     # if successful, redirect to the event page
     return redirect(
@@ -113,16 +193,16 @@ def create(error: str | None = None) -> str | Response:  # noqa: PLR0911
     )
 
 
-# TODO: other event management UI
-
-
 @events_ui_bp.route("/<int:year>/<int:term>/<int:week>/<string:slug>")
 def view(year: int, term: int, week: int, slug: str) -> str:
     """View an event by its year, term, week, and slug."""
 
     event = get_event_by_slug(year, term, week, slug)
 
     if event is None:
-        return "Event not found"
+        return abort(404, description="Event not found")
 
     return str(event.to_dict())
+
+
+# TODO: combos of events

events/utils.py

@@ -4,6 +4,7 @@
 
 import pytz
 import requests
+from sqlalchemy import and_, exists
 
 from config import colours
 from schema import Event, Tag, Week, db
@@ -118,7 +119,7 @@ def get_week_from_date(date: datetime) -> Week | None:  # noqa: PLR0912
     """Get the week from a given date"""
 
     week = Week.query.filter(
-        (date.date >= Week.start_date) & (date.date <= Week.end_date)  # type: ignore
+        (date >= Week.start_date) & (date <= Week.end_date)  # type: ignore
     ).first()
 
     if week is None:
@@ -247,8 +248,18 @@ def clean_weeks() -> None:
     """Clean weeks that are not associated with any events"""
     weeks = Week.query.all()
     for week in weeks:
-        if not week.events:  # type: ignore
+        has_events = db.session.query(
+            exists().where(
+                and_(
+                    Event.start_time >= week.start_date,
+                    Event.start_time <= week.end_date,
+                )
+            )
+        ).scalar()
+
+        if not has_events:  # type: ignore
             db.session.delete(week)
+
     db.session.commit()
 
 

static/js/event-management.js

@@ -118,7 +118,6 @@ document.addEventListener("DOMContentLoaded", () => {
                 hours.toString().padStart(2, '0'),
                 minutes.toString().padStart(2, '0')
             ].join(':');
-            console.log(`Duration: ${formattedDuration}`);
             durationInput.value = formattedDuration;
         }
     }
@@ -194,4 +193,11 @@ document.addEventListener("DOMContentLoaded", () => {
             colourText.value = "#" + colourText.value;
         }
     }, false);
+
+    // trigger events on load
+    [iconInput, colourText, startTimeInput, endTimeInput].forEach(input => {
+        if (input && input.value) {
+            input.dispatchEvent(new Event('input', { bubbles: true }));
+        }
+    });
 });