added event creation form

Author: Mole1424

.gitignore

@@ -1,4 +1,6 @@
 # ignore auto-generated css files (compile using sass pls)
 static/css/main.css
 # ignore env
-.env
+.env
+# ignore database
+volume/

events/api.py

@@ -1,5 +1,3 @@
-from datetime import datetime
-
 from flask import Blueprint, Response, jsonify, request
 
 from auth.auth import valid_api_auth
@@ -165,12 +163,12 @@ def create_event_api() -> tuple[Response, int]:  # noqa: PLR0911
         in: body
         type: string
         required: true
-        description: The start time of the event in 'YYYY-MM-DD' format.
+        description: The start time of the event in 'YYYY-MM-DDTHH:MM' format.
       - name: end_time
         in: body
         type: string
         required: false
-        description: The end time of the event in 'YYYY-MM-DD' format (if duration also provided must match the duration).
+        description: The end time of the event in 'YYYY-MM-DDTHH:MM' format (if duration also provided must match the duration).
       - name: duration
         in: body
         type: string
@@ -296,17 +294,17 @@ def create_repeat_event_api() -> tuple[Response, int]:  # noqa: PLR0911
         type: array
         items:
           type : string
-          example : "2023-10-01"
-          example : "2023-10-08"
+          example : "2025-06-24T22:05"
+          example : "2025-06-25T12:05"
         required: true
         description: A list of start times for the events in 'YYYY-MM-DD' format.
       - name: end_times
         in: body
         type: array
         items:
           type : string
-          example : "2023-10-01"
-          example : "2023-10-08"
+          example : "2025-06-24T23:05"
+          example : "2025-06-25T13:05"
         required: false
         description: A list of end times for the events in 'YYYY-MM-DD' format (if duration also provided must match the duration).
       - name: duration
@@ -444,12 +442,12 @@ def edit_event_api(event_id: int) -> tuple[Response, int]:
         in: body
         type: string
         required: false
-        description: The new start time of the event in 'YYYY-MM-DD' format.
+        description: The new start time of the event in 'YYYY-MM-DDTHH:MM' format.
       - name: end_time
         in: body
         type: string
         required: false
-        description: The new end time of the event in 'YYYY-MM-DD' format (if duration also provided must match the duration).
+        description: The new end time of the event in 'YYYY-MM-DDTHH:MM' format (if duration also provided must match the duration).
       - name: duration
         in: body
         type: string
@@ -639,7 +637,7 @@ def get_week_by_date(date_str: str) -> tuple[Response, int]:
         in: path
         type: string
         required: true
-        description: The date in 'YYYY-MM-DD' format.
+        description: The date in 'YYYY-MM-DDTHH:MM' format.
     security: []
     responses:
         200:
@@ -651,10 +649,9 @@ def get_week_by_date(date_str: str) -> tuple[Response, int]:
         404:
             description: Week not found for the given date.
     """
-    try:
-        date = datetime.fromisoformat(date_str)
-    except ValueError:
-        return jsonify({"error": "Invalid date format"}), 400
+    date = get_datetime_from_string(date_str)
+    if isinstance(date, str):
+        return jsonify({"error": date}), 400
 
     week = Week.query.filter(
         (date >= Week.start_date) & (date <= Week.end_date)  # type: ignore

events/ui.py

@@ -0,0 +1,154 @@
+from flask import Blueprint, redirect, render_template, request, url_for
+from werkzeug.wrappers import Response
+
+from auth.auth import is_exec_wrapper
+from events.utils import (
+    create_event,
+    get_datetime_from_string,
+    get_event_by_slug,
+    get_timedelta_from_string,
+    validate_colour,
+)
+
+events_ui_bp = Blueprint("events_ui", __name__, url_prefix="/events")
+
+
+@events_ui_bp.route("/create", methods=["GET", "POST"])
+@is_exec_wrapper
+def create(error: str | None = None) -> str | Response:  # noqa: PLR0911
+    # if getting, return the ui for creating an event
+    if request.method == "GET":
+        return render_template(
+            "events/form.html",
+            error=error,
+            action="events_ui.create",
+            method="POST",
+            event=None,
+        )
+
+    # if posting, create the event
+
+    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:
+        return redirect(
+            url_for(
+                "events_ui.create",
+                error=error,
+                action="events_ui.create",
+                method="POST",
+                event=None,
+            )
+        )
+
+    colour = color_colour if color_colour else text_colour
+
+    # parse dates and duration
+    start_time = get_datetime_from_string(request.form["start_time"])
+    if isinstance(start_time, str):
+        return redirect(
+            url_for(
+                "events_ui.create",
+                error=start_time,
+                action="events_ui.create",
+                method="POST",
+                event=None,
+            )
+        )
+    duration = (
+        get_timedelta_from_string(request.form["duration"])
+        if request.form["duration"]
+        else None
+    )
+    if isinstance(duration, str):
+        return redirect(
+            url_for(
+                "events_ui.create",
+                error=duration,
+                action="events_ui.create",
+                method="POST",
+                event=None,
+            )
+        )
+    end_time = (
+        get_datetime_from_string(request.form["end_time"])
+        if request.form["end_time"]
+        else None
+    )
+    if isinstance(end_time, str):
+        return redirect(
+            url_for(
+                "events_ui.create",
+                error=end_time,
+                action="events_ui.create",
+                method="POST",
+                event=None,
+            )
+        )
+
+    # parse tags
+    tags = (
+        [tag.strip() for tag in request.form["tags"].split(",")]
+        if request.form["tags"]
+        else []
+    )
+
+    # 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,
+    )
+
+    # if failed, redirect to the create page with an error
+    if isinstance(event, str):
+        return redirect(
+            url_for(
+                "events_ui.create",
+                error=event,
+                action="events_ui.create",
+                method="POST",
+                event=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,
+        )
+    )
+
+
+# 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 str(event.to_dict())

events/utils.py

@@ -18,10 +18,20 @@ def get_timedelta_from_string(duration_str: str) -> timedelta | str:
 
 
 def get_datetime_from_string(date_str: str) -> datetime | str:
+    """Convert a date string in the format 'YYYY-MM-DDTHH:MM' to a datetime object."""
+    try:
+        return datetime.strptime(date_str, "%Y-%m-%dT%H:%M").astimezone(
+            pytz.timezone("Europe/London")
+        )
+    except ValueError:
+        return "Invalid date format, expected 'YYYY-MM-DDTHH:MM'"
+
+
+def get_date_from_string(date_str: str) -> datetime | str:
     """Convert a date string in the format 'YYYY-MM-DD' to a datetime object."""
     try:
-        return datetime.strptime(date_str, "%Y-%m-%d").replace(
-            tzinfo=pytz.timezone("Europe/London")
+        return datetime.strptime(date_str, "%Y-%m-%d").astimezone(
+            pytz.timezone("Europe/London")
         )
     except ValueError:
         return "Invalid date format, expected 'YYYY-MM-DD'"
@@ -41,13 +51,14 @@ def create_event(  # noqa: PLR0913
     tags: list[str],
 ) -> Event | str:
     """Create an event"""
+
     # convert start_time and normalise end_time
-    start_time = pytz.timezone("Europe/London").localize(start_time)
+    start_time = start_time.astimezone(pytz.timezone("Europe/London"))
 
     if end_time is None:
         end_time = start_time + duration if duration else None
     else:
-        end_time = pytz.timezone("Europe/London").localize(end_time)
+        end_time = end_time.astimezone(pytz.timezone("Europe/London"))
         if duration is not None and end_time != start_time + duration:
             return "End time does not match the duration"
     if end_time and end_time < start_time:
@@ -71,10 +82,14 @@ def create_event(  # noqa: PLR0913
 
     # validate the event
     if error := event.validate():
+        db.session.rollback()
         return error
 
-    # attach week to the event
-    event.date = get_week_from_date(start_time)  # type: ignore
+    # create week from the start_time
+    week = get_week_from_date(start_time)
+    if week is None:
+        db.session.rollback()
+        return "Unable to find or create a week for the event date"
 
     # attach tags to the event
     # check all tags exist, create if not
@@ -116,10 +131,10 @@ def get_week_from_date(date: datetime) -> Week | None:  # noqa: PLR0912
             ).json()
 
             for w in warwick_week["weeks"]:
-                start_date = get_datetime_from_string(w["startDate"])
+                start_date = get_date_from_string(w["start"])
                 if isinstance(start_date, str):
                     return None
-                end_date = get_datetime_from_string(w["endDate"])
+                end_date = get_date_from_string(w["end"])
                 if isinstance(end_date, str):
                     return None
                 if start_date.date() <= date.date() <= end_date.date():
@@ -147,7 +162,7 @@ def get_week_from_date(date: datetime) -> Week | None:  # noqa: PLR0912
             with Path("olddates.json").open("r") as f:
                 old_dates = load(f)
             for w in old_dates:
-                start_date = get_datetime_from_string(w["startDate"])
+                start_date = get_date_from_string(w["date"])
                 if isinstance(start_date, str):
                     return None
                 if start_date.date() <= date.date():
@@ -295,12 +310,12 @@ def edit_event(  # noqa: PLR0913
     event.icon = icon.lower() if icon else event.icon
     event.colour = colour if colour else event.colour
     event.start_time = (
-        pytz.timezone("Europe/London").localize(start_time)
+        start_time.astimezone(pytz.timezone("Europe/London"))
         if start_time
         else event.start_time
     )
     event.end_time = (
-        pytz.timezone("Europe/London").localize(end_time)
+        end_time.astimezone(pytz.timezone("Europe/London"))
         if end_time
         else event.end_time
     )
@@ -350,3 +365,43 @@ def delete_event(event_id: int) -> bool | str:
     clean_weeks()
     clean_tags()
     return True
+
+
+def validate_colour(text_colour: str | None, hex_colour: str | None) -> str | None:
+    """Validate the colour input"""
+
+    # check if the colours match
+    if text_colour == hex_colour:
+        return None
+
+    # if either colour is None, validation succeeds
+    if text_colour is None or hex_colour is None:
+        return None
+
+    # attemp to convert text_colour to hex
+    text_colour = get_hex_from_name(text_colour)
+    if text_colour is None:
+        return "Invalid colour name"
+
+    # check if the converted text_colour matches the hex_colour
+    if text_colour.lower() != hex_colour.lower():
+        return "Colour name does not match hex code"
+
+    return None
+
+
+def get_hex_from_name(name: str) -> str | None:
+    """Get the hex colour from a name"""
+    with Path("colours.json").open("r") as f:
+        colours = load(f)
+    return colours.get(name.lower(), None)  # type: ignore
+
+
+def get_name_from_hex(hex_colour: str) -> str | None:
+    """Get the name of a colour from its hex code"""
+    with Path("colours.json").open("r") as f:
+        colours = load(f)
+    for name, hex_code in colours.items():
+        if hex_code.lower() == hex_colour.lower():
+            return name
+    return None