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

Jump to bottom

Fix first round deadline and update homepage text #639

Merged
merged 1 commit into from
Mar 22, 2024
Merged

Fix first round deadline and update homepage text #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/models/apps/president_vote_app/application_form.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,11 @@ def request_sending_remaining_days
end

def pickup_expired?
pickup_remaining_days < 1
pickup_remaining_days < 0
end

def first_round_expired?
(FIRST_ROUND_DATE - Date.current).to_i < 1
(FIRST_ROUND_DATE - Date.current).to_i < 0
end

def request_sending_expired?
Expand Down
3 changes: 1 addition & 2 deletions app/views/apps/president_vote_app/application_forms/start.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
<h1 class="govuk-heading-xl">Prezidentské voľby</h1>
<p class="govuk-body-l">Prezidentské voľby na Slovensku budú 23. marca a prípadné druhé kolo 6. apríla 2024. Hlasovať je možné <strong>jedine osobne na území Slovenska</strong>.</p>
<p class="govuk-body-lead">Ak budete počas volieb mimo trvalého bydliska, táto služba vám pomôže vytvoriť <strong>žiadosť o hlasovací preukaz</strong> tak, aby ste na nič dôležité nezabudli. Je to veľmi jednoduché a trvá to <strong>len pár minút.</strong></p>
<p class="govuk-body-lead">Žiadosť o hlasovací preukaz pre druhé kolo musíte následne <strong>sami odoslať emailom</strong> do 14. marca.</p>
<p class="govuk-body-lead">O hlasovací preukaz pre prvé kolo ešte <strong>môžete požiadať osobne na úrade do 22. marca</strong>.</p>
<p class="govuk-body-lead">O hlasovací preukaz môžete požiadať <strong>osobne na úrade</strong> pre prvé kolo ešte <strong> do 22. marca</strong> a pre druhé kolo <strong>do 5. apríla</strong>.</p>
<p class="govuk-body-s">Používaním tejto služby súhlasíte so spracovaním osobných údajov v rozsahu nevyhnutnom pre určenie spôsobu voľby a vytvorenie žiadosti o hlasovací preukaz. Následne sú všetky údaje nenávratne zmazané.</p>
<%= form_for @application_form do |f| %>
<div class="govuk-form-group">
Expand Down
Loading