Skip to content
Snippets Groups Projects
Commit 4410641d authored by Alexa Valentová's avatar Alexa Valentová
Browse files

move career closing date by a day

parent d1cce6c2
No related branches found
No related tags found
2 merge requests!1225Release,!1224Move career closing date by a day
Pipeline #20646 passed
...@@ -481,7 +481,7 @@ class MainCareersPage( ...@@ -481,7 +481,7 @@ class MainCareersPage(
current_date = date.today() current_date = date.today()
if not show_closed: if not show_closed:
filter = filter & models.Q(closing_date__gt=current_date) filter = filter & models.Q(closing_date__gte=current_date)
if category is not None: if category is not None:
filter = filter & models.Q(category=category) filter = filter & models.Q(category=category)
...@@ -609,8 +609,8 @@ class MainCareerPage( ...@@ -609,8 +609,8 @@ class MainCareerPage(
if ( if (
request.method == "POST" request.method == "POST"
and self.closing_date > current_date and self.closing_date >= current_date
and self.submission_end_date > current_date and self.submission_end_date >= current_date
): ):
form = CareerSubmissionForm(request.POST, request.FILES) form = CareerSubmissionForm(request.POST, request.FILES)
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div class="bg-red-400 border border-solid border-red-600 p-4 inline-block mb-6"> <div class="bg-red-400 border border-solid border-red-600 p-4 inline-block mb-6">
<strong>Výběrové řízení uzavřeno.</strong> <strong>Výběrové řízení uzavřeno.</strong>
</div> </div>
{% elif page.submission_end_date <= current_date %} {% elif page.submission_end_date < current_date %}
<div class="bg-red-400 border border-solid border-red-600 p-4 inline-block mb-6"> <div class="bg-red-400 border border-solid border-red-600 p-4 inline-block mb-6">
<strong>Přihlášky uzavřeny.</strong> <strong>Přihlášky uzavřeny.</strong>
</div> </div>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</div> </div>
{% endif %} {% endif %}
{% if page.closing_date > current_date and page.submission_end_date > current_date %} {% if page.closing_date >= current_date and page.submission_end_date >= current_date %}
<div data-micromodal-trigger="modal-1" class="lg:mb-3 mb-12 inline-block"> <div data-micromodal-trigger="modal-1" class="lg:mb-3 mb-12 inline-block">
{% include "styleguide2/includes/atoms/buttons/round_button.html" with text="Přihlásit se" show_arrow_on_hover=True %} {% include "styleguide2/includes/atoms/buttons/round_button.html" with text="Přihlásit se" show_arrow_on_hover=True %}
</div> </div>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
</section> </section>
</main> </main>
{% if page.closing_date > current_date and page.submission_end_date > current_date %} {% if page.closing_date >= current_date and page.submission_end_date >= current_date %}
<div class="modal micromodal-slide" id="modal-1" aria-hidden="true"> <div class="modal micromodal-slide" id="modal-1" aria-hidden="true">
<div class="modal__overlay" tabindex="-1"> <div class="modal__overlay" tabindex="-1">
<form <form
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment