From caa8f92d659b1829bba418c4083505194367e2c1 Mon Sep 17 00:00:00 2001
From: AKP <tom@tdpain.net>
Date: Wed, 9 Nov 2022 00:13:22 +0000
Subject: [PATCH] Alter 4 files

Update `selectSite.js`
Update `submit.js`
Update `index.html`
Update `web.py`
---
 circuit-laundry-notifier/static/selectSite.js | 16 ++++++++++++++++
 circuit-laundry-notifier/static/submit.js     | 16 ++++++++++++++++
 circuit-laundry-notifier/templates/index.html |  1 +
 circuit-laundry-notifier/web.py               | 10 ++++++++--
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/circuit-laundry-notifier/static/selectSite.js b/circuit-laundry-notifier/static/selectSite.js
index a6e0bf9..2536c54 100644
--- a/circuit-laundry-notifier/static/selectSite.js
+++ b/circuit-laundry-notifier/static/selectSite.js
@@ -4,6 +4,22 @@ const selectSiteBlock = document.getElementById("select_site");
     const nextButton = document.getElementById("select_site__next_button")
     const siteIDInput = document.getElementById("select_site__site_id_input")
 
+    siteIDInput.addEventListener("change", () => {
+        if (siteIDInput.value.trim() === "") {
+            localStorage.removeItem("site")
+        } else {
+            localStorage.setItem("site", siteIDInput.value.trim())
+        }
+    })
+
+    document.addEventListener("load", () => {
+        const x = localStorage.getItem("site")
+        if (x === undefined) {
+            return
+        }
+        siteIDInput.value = x
+    })
+
     nextButton.addEventListener("click", () => {
         hide(errorIndicator)
         hide(selectSiteBlock)
diff --git a/circuit-laundry-notifier/static/submit.js b/circuit-laundry-notifier/static/submit.js
index 7f0121a..d4d4a49 100644
--- a/circuit-laundry-notifier/static/submit.js
+++ b/circuit-laundry-notifier/static/submit.js
@@ -4,6 +4,22 @@ const submitBlock = document.getElementById("submit")
     const nextButton = document.getElementById("submit__next_button")
     const ntfyTopicInput = document.getElementById("submit__ntfy_topic")
 
+    ntfyTopicInput.addEventListener("change", () => {
+        if (ntfyTopicInput.value.trim() === "") {
+            localStorage.removeItem("ntfy_topic")
+        } else {
+            localStorage.setItem("ntfy_topic", ntfyTopicInput.value.trim())
+        }
+    })
+
+    document.addEventListener("load", () => {
+        const x = localStorage.getItem("ntfy_topic")
+        if (x === undefined) {
+            return
+        }
+        ntfyTopicInput.value = x
+    })
+
     nextButton.addEventListener("click", () => {
         hide(errorIndicator)
         hide(submitBlock)
diff --git a/circuit-laundry-notifier/templates/index.html b/circuit-laundry-notifier/templates/index.html
index fb54cb3..2b15376 100644
--- a/circuit-laundry-notifier/templates/index.html
+++ b/circuit-laundry-notifier/templates/index.html
@@ -27,6 +27,7 @@
                 <input type="text" class="form-control" id="select_site__site_id_input" placeholder="0000">
             </div>
             <button type="button" class="btn btn-primary" id="select_site__next_button">Next</button>
+            <p class="pt-2">You can find the Circuit site ID by going to <a href="https://www.circuit.co.uk/circuit-view" target="_blank">this page</a>, and selecting your accommodation. The site ID is the four digit number at the end of the URL.</p>
         </div>
 
         <div id="select_machine" style="display:none;">
diff --git a/circuit-laundry-notifier/web.py b/circuit-laundry-notifier/web.py
index 4ecf0f8..9e2f86c 100644
--- a/circuit-laundry-notifier/web.py
+++ b/circuit-laundry-notifier/web.py
@@ -195,10 +195,10 @@ def _api_run_watcher() -> Union[any, Tuple[any, int]]:
             completed_items.append(i)
             continue
 
-        if target_machine.state == MachineState.Completed:
+        if target_machine.state == MachineState.Completed or target_machine.state == MachineState.Available:
             requests.post(
                 f"https://ntfy.sh/{ws.ntfy_topic}",
-                data=f"{target_machine.type} {target_machine.number} is finished!",
+                data=f"{_first_letter_upper(target_machine.type.value.lower())} {target_machine.number} is finished!",
                 headers={
                     "Title": (
                                  "Washing"
@@ -219,3 +219,9 @@ def _api_run_watcher() -> Union[any, Tuple[any, int]]:
     job_lock.release()
 
     return "", 204
+
+
+def _first_letter_upper(x: str) -> str:
+    if len(x) == 0:
+        return ""
+    return x[0].upper() + x[1:]