From 4ef9bd8a42c659a963592cb1e117c0031ec47800 Mon Sep 17 00:00:00 2001 From: Bing Zhang Date: Tue, 24 Jan 2023 12:28:44 -0600 Subject: [PATCH 1/2] fix scheduler to take input from setting page --- CHANGELOG.md | 1 + scheduler.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f81e896..1ca85ebc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fix the style of badge and checkbox of the filter. [#1011](https://github.com/rokwire/events-manager/issues/1011) - Fix the height of Create Event button. [#1021](https://github.com/rokwire/events-manager/issues/1021) - Fix the hover text decoration and color of Edit button in the event detail page. [#1023](https://github.com/rokwire/events-manager/issues/1023) +- Fix the scheduler to take the input from setting page. [#1030](https://github.com/rokwire/events-manager/issues/1023) ### Changed - Change the GUI of text input field box. [#991](https://github.com/rokwire/events-manager/issues/991) diff --git a/scheduler.py b/scheduler.py index 7928078a..41bcd088 100644 --- a/scheduler.py +++ b/scheduler.py @@ -65,7 +65,7 @@ def func_wrapper(func, *args, **kwargs): def create_scheduler(app): today = datetime.today() startDate = datetime(today.year, today.month, today.day, int(app.config['SCHEDULER_HOUR']), int(app.config['SCHEDULER_MINS']), 00, 00) - scheduler = BackgroundScheduler() + scheduler = BackgroundScheduler({'apscheduler.timezone': 'US/Central'}) scheduler.add_listener(event_exception_listener, EVENT_JOB_ERROR) scheduler.add_listener(event_start_listener, EVENT_SCHEDULER_STARTED) scheduler.add_listener(event_shutdown_listener, EVENT_SCHEDULER_SHUTDOWN) From 3f2703b5c2debfb0da0732c84c04bc266221a373 Mon Sep 17 00:00:00 2001 From: Bing Zhang Date: Thu, 26 Jan 2023 09:12:00 -0600 Subject: [PATCH 2/2] update setting page timezone message --- templates/events/setting.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/events/setting.html b/templates/events/setting.html index d9b0652c..2c28a97b 100644 --- a/templates/events/setting.html +++ b/templates/events/setting.html @@ -90,7 +90,7 @@

{{sourceval[0]}}

Daily time configuration

- +