diff --git a/employee/scheduler.py b/employee/scheduler.py index 6a7e385e0..9144602b1 100644 --- a/employee/scheduler.py +++ b/employee/scheduler.py @@ -1,4 +1,5 @@ import datetime +import sys from datetime import timedelta from apscheduler.schedulers.background import BackgroundScheduler @@ -131,7 +132,13 @@ def block_unblock_disciplinary(): return -scheduler = BackgroundScheduler() -scheduler.add_job(update_experience, "interval", hours=4) -scheduler.add_job(block_unblock_disciplinary, "interval", seconds=25) -scheduler.start() +if not any( + cmd in sys.argv for cmd in ["makemigrations", "migrate", "compilemessages", "flush"] +): + """ + Initializes and starts background tasks using APScheduler when the server is running. + """ + scheduler = BackgroundScheduler() + scheduler.add_job(update_experience, "interval", hours=4) + scheduler.add_job(block_unblock_disciplinary, "interval", seconds=25) + scheduler.start() diff --git a/leave/scheduler.py b/leave/scheduler.py index 87db958b2..f019286c6 100644 --- a/leave/scheduler.py +++ b/leave/scheduler.py @@ -1,5 +1,6 @@ import calendar import datetime as dt +import sys from datetime import datetime, timedelta from apscheduler.schedulers.background import BackgroundScheduler @@ -46,7 +47,13 @@ def leave_reset(): leave_type.save() -scheduler = BackgroundScheduler() -scheduler.add_job(leave_reset, "interval", seconds=20) +if not any( + cmd in sys.argv for cmd in ["makemigrations", "migrate", "compilemessages", "flush"] +): + """ + Initializes and starts background tasks using APScheduler when the server is running. + """ + scheduler = BackgroundScheduler() + scheduler.add_job(leave_reset, "interval", seconds=20) -scheduler.start() + scheduler.start() diff --git a/leave/templates/leave/leave_type_view.html b/leave/templates/leave/leave_type_view.html deleted file mode 100644 index 648bf3841..000000000 --- a/leave/templates/leave/leave_type_view.html +++ /dev/null @@ -1,139 +0,0 @@ -{% extends 'index.html' %} -{% block content %} -{% load static %} -{% load i18n %} - -{% if messages %} -
- {% for message in messages %} -
-
- {{ message }} -
-
- {% endfor %} -
-{% endif %} - -
-
-

{% trans "Leave Types" %}

- - - -
-
-
- - -
-
-
- -
- - -
-
-
-
- -
- -
-
-
-
- -
- {% include 'leave/leave_type/leave_types.html' %} -
- - - - - - - - - - - -{% endblock %} diff --git a/recruitment/scheduler.py b/recruitment/scheduler.py index dbf1839cc..c51c0a2d1 100644 --- a/recruitment/scheduler.py +++ b/recruitment/scheduler.py @@ -1,5 +1,6 @@ import calendar import datetime as dt +import sys from datetime import datetime, timedelta from apscheduler.schedulers.background import BackgroundScheduler @@ -9,7 +10,10 @@ def recruitment_close(): + """ + Closes recruitment campaigns that have reached their end date. + """ from recruitment.models import Recruitment today_date = today.date() @@ -25,7 +29,9 @@ def recruitment_close(): def candidate_convert(): - + """ + Converts candidates to a "converted" state if they already exist as users. + """ from django.contrib.auth.models import User from recruitment.models import Candidate @@ -41,8 +47,14 @@ def candidate_convert(): cand.save() -scheduler = BackgroundScheduler() -scheduler.add_job(candidate_convert, "interval", seconds=10) -scheduler.add_job(recruitment_close, "interval", hours=1) +if not any( + cmd in sys.argv for cmd in ["makemigrations", "migrate", "compilemessages", "flush"] +): + """ + Initializes and starts background tasks using APScheduler when the server is running. + """ + scheduler = BackgroundScheduler() + scheduler.add_job(candidate_convert, "interval", seconds=10) + scheduler.add_job(recruitment_close, "interval", hours=1) -scheduler.start() + scheduler.start()