From 8002d3968a8f38e1040862186e0f09a89064362b Mon Sep 17 00:00:00 2001
From: Mark Steward <marksteward@gmail.com>
Date: Mon, 27 May 2024 18:59:22 +0100
Subject: [PATCH] Make herald page work when a venue has no more content

---
 apps/schedule/base.py                | 27 ++++++++++++++++-----------
 templates/schedule/herald/venue.html |  4 ++++
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/apps/schedule/base.py b/apps/schedule/base.py
index f1cc9e5f3..8464967be 100644
--- a/apps/schedule/base.py
+++ b/apps/schedule/base.py
@@ -460,14 +460,17 @@ class HeraldStageForm(Form):
 @schedule.route("/herald/<string:venue_name>", methods=["GET", "POST"])
 @v_user_required
 def herald_venue(venue_name):
-    def herald_message(message, proposal):
+    def herald_message(message, proposal=None):
         app.logger.info(f"Creating new message {message}")
-        end = proposal.scheduled_time + timedelta(minutes=proposal.scheduled_duration)
+        if proposal is None:
+            end = datetime.now() + timedelta(days=1)
+        else:
+            end = proposal.scheduled_time + timedelta(minutes=proposal.scheduled_duration)
         return AdminMessage(
             f"[{venue_name}] -- {message}", current_user, end=end, topic="heralds"
         )
 
-    now, next = (
+    proposals = (
         Proposal.query.join(Venue, Venue.id == Proposal.scheduled_venue_id)
         .filter(
             Venue.name == venue_name,
@@ -480,12 +483,13 @@ def herald_message(message, proposal):
         .limit(2)
         .all()
     )
+    now, next = (proposals + [None, None])[:2]
 
     form = HeraldStageForm()
 
     if form.validate_on_submit():
         if form.now.update.data:
-            if form.now.talk_id.data != now.id:
+            if now is None or form.now.talk_id.data != now.id:
                 flash("'now' changed, please refresh")
                 return redirect(url_for(".herald_venue", venue_name=venue_name))
 
@@ -494,7 +498,7 @@ def herald_message(message, proposal):
             now.may_record = form.now.may_record.data
 
         elif form.next.update.data:
-            if form.next.talk_id.data != next.id:
+            if next is None or form.next.talk_id.data != next.id:
                 flash("'next' changed, please refresh")
                 return redirect(url_for(".herald_venue", venue_name=venue_name))
             change = "may" if form.next.may_record else "may not"
@@ -508,8 +512,7 @@ def herald_message(message, proposal):
             msg = herald_message(f"{next.user.name}, arrived.", next)
 
         elif form.send_message.data:
-            # in lieu of a better time set TTL to end of next talk
-            msg = herald_message(form.message.data, next)
+            msg = herald_message(form.message.data)
 
         db.session.add(msg)
         db.session.commit()
@@ -517,11 +520,13 @@ def herald_message(message, proposal):
 
     messages = AdminMessage.get_all_for_topic("heralds")
 
-    form.now.talk_id.data = now.id
-    form.now.may_record.data = now.may_record
+    if now:
+        form.now.talk_id.data = now.id
+        form.now.may_record.data = now.may_record
 
-    form.next.talk_id.data = next.id
-    form.next.may_record.data = next.may_record
+    if next:
+        form.next.talk_id.data = next.id
+        form.next.may_record.data = next.may_record
 
     return render_template(
         "schedule/herald/venue.html",
diff --git a/templates/schedule/herald/venue.html b/templates/schedule/herald/venue.html
index 59f2c5984..2ef78b0ce 100644
--- a/templates/schedule/herald/venue.html
+++ b/templates/schedule/herald/venue.html
@@ -7,6 +7,7 @@ <h1>Now &amp; next on: {{ venue_name }}</h1>
 
   <form method="post">
     {{ form.hidden_tag() }}
+    {% if now %}
     <h2>Now</h2>
     <dl class="dl-horizontal">
       <dt>Title</dt>
@@ -26,7 +27,9 @@ <h2>Now</h2>
     <p>&nbsp;</p>
     {{ render_field(form.now.speaker_here, horizontal=8) }}
     <p>&nbsp;</p>
+    {% endif %}
 
+    {% if next %}
     <h2>Next</h2>
     <dl class="dl-horizontal">
       <dt>Title</dt>
@@ -46,6 +49,7 @@ <h2>Next</h2>
     <p>&nbsp;</p>
     {{ render_field(form.next.speaker_here, horizontal=8) }}
     <p>&nbsp;</p>
+    {% endif %}
 
     <h2>Send message to the Greenroom</h2>