From bbd71315dc25e56faaadcae3f7f174e4fa41b37b Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Sat, 19 May 2018 20:39:09 +0100
Subject: [Jams] Basics may now be edited at any point

---
 pysite/views/staff/jams/edit_basics.py |  3 ---
 templates/main/jams/index.html         |  6 ++++++
 templates/staff/jams/index.html        | 19 +++----------------
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/pysite/views/staff/jams/edit_basics.py b/pysite/views/staff/jams/edit_basics.py
index eb56e7d4..462cba14 100644
--- a/pysite/views/staff/jams/edit_basics.py
+++ b/pysite/views/staff/jams/edit_basics.py
@@ -32,9 +32,6 @@ class StaffView(RouteView, DBMixin):
         if not jam_obj:
             return NotFound()
 
-        if not jam_obj["state"] == "planning":
-            return BadRequest()
-
         for key in REQUIRED_KEYS:
             arg = request.form.get(key)
 
diff --git a/templates/main/jams/index.html b/templates/main/jams/index.html
index 5e14e934..5c2df182 100644
--- a/templates/main/jams/index.html
+++ b/templates/main/jams/index.html
@@ -92,6 +92,12 @@
                         <span class="uk-label uk-label-danger">
                             {{ format_datetime(jam.date_end) }} UTC
                         </span>
+
+                        {% if jam.state in ["running", "judging", "finished"] %}
+                            <span class="uk-label uk-align-right">
+                            Theme: {{ jam.theme }}
+                            </span>
+                        {% endif %}
                     <p>
 
                     </p>
diff --git a/templates/staff/jams/index.html b/templates/staff/jams/index.html
index 158a4127..2ed83702 100644
--- a/templates/staff/jams/index.html
+++ b/templates/staff/jams/index.html
@@ -77,15 +77,9 @@
                             <i class="uk-icon fa-fw far fa-pencil"></i> &nbsp;State
                         </a>
 
-                        {% if jam.state == "planning" %}
-                            <a class="uk-button uk-button-default uk-width-expand" data-jam="{{ jam.number }}" id="jam-{{ jam.number }}-button-basics" href="{{ url_for("staff.jams.edit.basics", jam=jam.number) }}">
-                                <i class="uk-icon fa-fw far fa-pencil"></i> &nbsp;Basics
-                            </a>
-                        {% else %}
-                            <a class="uk-button uk-button-default uk-width-expand" hidden="hidden" data-jam="{{ jam.number }}" id="jam-{{ jam.number }}-button-basics" href="{{ url_for("staff.jams.edit.basics", jam=jam.number) }}">
-                                <i class="uk-icon fa-fw far fa-pencil"></i> &nbsp;Basics
-                            </a>
-                        {% endif %}
+                        <a class="uk-button uk-button-default uk-width-expand" data-jam="{{ jam.number }}" id="jam-{{ jam.number }}-button-basics" href="{{ url_for("staff.jams.edit.basics", jam=jam.number) }}">
+                            <i class="uk-icon fa-fw far fa-pencil"></i> &nbsp;Basics
+                        </a>
 
                         {% if jam.state in ["planning", "preparing", "announced"] %}
                             <a class="uk-button uk-button-default uk-width-expand" data-jam="{{ jam.number }}" id="jam-{{ jam.number }}-button-info" href="{{ url_for("staff.jams.edit.info", jam=jam.number) }}">
@@ -202,49 +196,42 @@
                                 case "planning":
                                     document.getElementById("state-" + jam + "-planning").removeAttribute("hidden");
 
-                                    document.getElementById("jam-" + jam + "-button-basics").removeAttribute("hidden");
                                     document.getElementById("jam-" + jam + "-button-info").removeAttribute("hidden");
                                     document.getElementById("jam-" + jam + "-button-ending").setAttribute("hidden", "hidden");
                                     break;
                                 case "announced":
                                     document.getElementById("state-" + jam + "-announced").removeAttribute("hidden");
 
-                                    document.getElementById("jam-" + jam + "-button-basics").setAttribute("hidden", "hidden");
                                     document.getElementById("jam-" + jam + "-button-info").removeAttribute("hidden");
                                     document.getElementById("jam-" + jam + "-button-ending").setAttribute("hidden", "hidden");
                                     break;
                                 case "preparing":
                                     document.getElementById("state-" + jam + "-preparing").removeAttribute("hidden");
 
-                                    document.getElementById("jam-" + jam + "-button-basics").setAttribute("hidden", "hidden");
                                     document.getElementById("jam-" + jam + "-button-info").removeAttribute("hidden");
                                     document.getElementById("jam-" + jam + "-button-ending").setAttribute("hidden", "hidden");
                                     break;
                                 case "running":
                                     document.getElementById("state-" + jam + "-running").removeAttribute("hidden");
 
-                                    document.getElementById("jam-" + jam + "-button-basics").setAttribute("hidden", "hidden");
                                     document.getElementById("jam-" + jam + "-button-info").setAttribute("hidden", "hidden");
                                     document.getElementById("jam-" + jam + "-button-ending").setAttribute("hidden", "hidden");
                                     break;
                                 case "judging":
                                     document.getElementById("state-" + jam + "-judging").removeAttribute("hidden");
 
-                                    document.getElementById("jam-" + jam + "-button-basics").setAttribute("hidden", "hidden");
                                     document.getElementById("jam-" + jam + "-button-info").setAttribute("hidden", "hidden");
                                     document.getElementById("jam-" + jam + "-button-ending").removeAttribute("hidden");
                                     break;
                                 case "finished":
                                     document.getElementById("state-" + jam + "-finished").removeAttribute("hidden");
 
-                                    document.getElementById("jam-" + jam + "-button-basics").setAttribute("hidden", "hidden");
                                     document.getElementById("jam-" + jam + "-button-info").setAttribute("hidden", "hidden");
                                     document.getElementById("jam-" + jam + "-button-ending").setAttribute("hidden", "hidden");
                                     break;
                                 default:
                                     document.getElementById("state-" + jam + "-unknown").removeAttribute("hidden");
 
-                                    document.getElementById("jam-" + jam + "-button-basics").setAttribute("hidden", "hidden");
                                     document.getElementById("jam-" + jam + "-button-info").setAttribute("hidden", "hidden");
                                     document.getElementById("jam-" + jam + "-button-ending").setAttribute("hidden", "hidden");
                                     break;
-- 
cgit v1.2.3