Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix scheduler to take input from setting page #1032

Merged
merged 3 commits into from
Feb 21, 2023
Merged

fix scheduler to take input from setting page #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ef9bd8
fix scheduler to take input from setting page
bingzhang Jan 24, 2023
3f2703b
update setting page timezone message
bingzhang Jan 26, 2023
9456fdd
Merge branch 'develop' into 1030-bug-scheduler-cannot-take-the-input-…
bingzhang Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
- Fix the display of the orange line under the dropdown menu. [#1042](https://github.com/rokwire/events-manager/issues/1042)

### Changed
Expand Down
2 changes: 1 addition & 1 deletion scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion templates/events/setting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ <h4>{{sourceval[0]}}</h4>

<h2>Daily time configuration</h2>
<div>
<label for="scheduletime">Events from these calendars will be crawled, parsed, and published every day at the scheduled time displayed below. The default is 11:00 PM. You can select a different time here:</label>
<label for="scheduletime">Events from these calendars will be crawled, parsed, and published daily at the scheduled time displayed below. The default scheduled time is 11:00 PM (Central Time). You can set a different time below.</label>
<input type="time" id="scheduletime" name="scheduletime" value={{ schedule_time }} }} required>
<button type="button" class="btn btn-primary orange-background-button" id="schedulebutton">Schedule</button>
</div>
Expand Down