From 86388cbb9f40bf59722fce524009348aad759a22 Mon Sep 17 00:00:00 2001
From: dgtlmoon <dgtlmoon@gmail.com>
Date: Thu, 28 Nov 2024 14:15:29 +0100
Subject: [PATCH] Tidy up fields, use placeholder as default so its easier to
 understand

---
 changedetectionio/flask_app.py                |  3 ++-
 changedetectionio/forms.py                    | 23 ++++++++++++++++---
 changedetectionio/model/Watch.py              |  2 +-
 changedetectionio/static/js/watch-settings.js |  8 +++++--
 changedetectionio/templates/_helpers.html     |  2 +-
 5 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/changedetectionio/flask_app.py b/changedetectionio/flask_app.py
index 554d1cdb3b9..35270ccc1b5 100644
--- a/changedetectionio/flask_app.py
+++ b/changedetectionio/flask_app.py
@@ -717,7 +717,8 @@ def edit_page(uuid):
 
         form = form_class(formdata=request.form if request.method == 'POST' else None,
                           data=default,
-                          extra_notification_tokens=default.extra_notification_token_values()
+                          extra_notification_tokens=default.extra_notification_token_values(),
+                          default_system_settings=datastore.data['settings']
                           )
 
         # For the form widget tag UUID back to "string name" for the field
diff --git a/changedetectionio/forms.py b/changedetectionio/forms.py
index 31d92aa8a36..9825236bdda 100644
--- a/changedetectionio/forms.py
+++ b/changedetectionio/forms.py
@@ -185,8 +185,8 @@ class ScheduleLimitForm(Form):
     saturday = FormField(ScheduleLimitDaySubForm, label="")
     sunday = FormField(ScheduleLimitDaySubForm, label="")
 
-    timezone_offset = StringField("Timezone to run in",
-                                  render_kw={"list": "timezones", "placeholder": "Default"},
+    timezone = StringField("Timezone to run in",
+                                  render_kw={"list": "timezones"},
                                   validators=[validateTimeZoneName()]
                                   )
     def __init__(
@@ -522,7 +522,7 @@ def __init__(self, formdata=None, obj=None, prefix="", data=None, meta=None, **k
     notification_title = StringField('Notification Title', default='ChangeDetection.io Notification - {{ watch_url }}', validators=[validators.Optional(), ValidateJinja2Template()])
     notification_urls = StringListField('Notification URL List', validators=[validators.Optional(), ValidateAppRiseServers(), ValidateJinja2Template()])
     processor = RadioField( label=u"Processor - What do you want to achieve?", choices=processors.available_processors(), default="text_json_diff")
-    timezone = StringField("Timezone to run in", render_kw={"list": "timezones", "placeholder": "Default"}, validators=[validateTimeZoneName()])
+    timezone = StringField("Timezone to run in", render_kw={"list": "timezones"}, validators=[validateTimeZoneName()])
     webdriver_delay = IntegerField('Wait seconds before extracting text', validators=[validators.Optional(), validators.NumberRange(min=1, message="Should contain one or more seconds")])
 
 
@@ -655,6 +655,23 @@ def validate(self, **kwargs):
 
         return result
 
+    def __init__(
+            self,
+            formdata=None,
+            obj=None,
+            prefix="",
+            data=None,
+            meta=None,
+            **kwargs,
+    ):
+        super().__init__(formdata, obj, prefix, data, meta, **kwargs)
+
+        default_tz = kwargs.get('default_system_settings').get('application', {}).get('timezone')
+        if default_tz:
+            self.time_schedule_limit.form.timezone.render_kw['placeholder'] = default_tz
+
+
+
 class SingleExtraProxy(Form):
 
     # maybe better to set some <script>var..
diff --git a/changedetectionio/model/Watch.py b/changedetectionio/model/Watch.py
index b0bc8cf1a58..c50f55cc9fd 100644
--- a/changedetectionio/model/Watch.py
+++ b/changedetectionio/model/Watch.py
@@ -638,7 +638,7 @@ def watch_recheck_is_within_schedule(self, default_tz="UTC"):
         time_schedule_limit = self.get('time_schedule_limit')
         if time_schedule_limit and time_schedule_limit.get('enabled'):
             # Get the timezone the time schedule is in, so we know what day it is there
-            tz_name = time_schedule_limit.get('timezone_offset', '').strip()
+            tz_name = time_schedule_limit.get('timezone', '').strip()
             if not tz_name:
                 tz_name = default_tz
 
diff --git a/changedetectionio/static/js/watch-settings.js b/changedetectionio/static/js/watch-settings.js
index 43cb34ef2b4..eb68228c640 100644
--- a/changedetectionio/static/js/watch-settings.js
+++ b/changedetectionio/static/js/watch-settings.js
@@ -80,9 +80,13 @@ function request_textpreview_update() {
 $(document).ready(function () {
 
     window.setInterval(function () {
-        if ($("#time_schedule_limit-timezone_offset").val().length) {
+        if ($("#time_schedule_limit-timezone").val().length) {
             document.getElementById('local-time-in-tz').textContent =
-                getTimeInTimezone($("#time_schedule_limit-timezone_offset").val());
+                getTimeInTimezone($("#time_schedule_limit-timezone").val());
+        } else {
+            // So maybe use what is in the placeholder (which will be the default settings)
+            document.getElementById('local-time-in-tz').textContent =
+                getTimeInTimezone($("#time_schedule_limit-timezone").attr('placeholder'));
         }
     }, 500);
 
diff --git a/changedetectionio/templates/_helpers.html b/changedetectionio/templates/_helpers.html
index 7553db8df7f..46c979e9de5 100644
--- a/changedetectionio/templates/_helpers.html
+++ b/changedetectionio/templates/_helpers.html
@@ -126,7 +126,7 @@
             </li>
         {% endfor %}
         <li id="timezone-info">
-            {{  render_field(form.time_schedule_limit.timezone_offset) }} <span id="local-time-in-tz"></span>
+            {{  render_field(form.time_schedule_limit.timezone) }} <span id="local-time-in-tz"></span>
             <datalist id="timezones" style="display: none;">
                 {% for timezone in available_timezones %}
                     <option value="{{ timezone }}">{{ timezone }}</option>