Skip to content

import timetable from EE - #2780

Merged
chris48s merged 8 commits into
masterfrom
timetables20260713
Jul 22, 2026
Merged

import timetable from EE#2780
chris48s merged 8 commits into
masterfrom
timetables20260713

Conversation

@chris48s

Copy link
Copy Markdown
Member

No description provided.

Comment thread pyproject.toml
"djangorestframework==3.16.1",
"drf-yasg==1.21.11",
"uk-election-timetables==4.4.0",
"uk-election-timetables==5.0.0",

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might seem like an odd thing to be doing, but in order to write the backfill migration I still need the lib, and it needs to be able to give me the right dates for both close_of_nominations and sopn_publish_deadline. I'll remove this in a follow-up PR

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

every time I remember this file exists I get sad

Comment on lines -93 to +102
We expect the official list of candidates to be published on or after
<strong>{{ ballot.expected_sopn_date }}</strong>.</p>
{% if ballot.close_of_nominations and ballot.sopn_publish_deadline %}
We expect the official list of candidates to be published between
<strong>{{ ballot.close_of_nominations }}</strong> and
<strong>{{ ballot.sopn_publish_deadline }}</strong>
{% endif %}

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This template seems like the one place where we do want to differentiate between close_of_nominations and sopn_publish_deadline but if we think this is just clunky, let me know and I'll put it back to just using close_of_nominations.

@chris48s
chris48s force-pushed the timetables20260713 branch from b1dc550 to f0260eb Compare July 13, 2026 13:49
<p class="clearfix">
{% if not ballot.has_sopn %}
{% include "elections/includes/_ballot_add_candidate.html" with position='left' %}
{% if ballot.close_of_nominations and ballot.sopn_publish_deadline %}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there any cases where these are the same?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. These are always 2 different dates in all the situations we cover

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assume you mean "No. These..." here 馃憤

@symroe symroe left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assuming the logic to show dates doesn't end up showing the same date twice in some situations, I think this is good 馃憤

I think we can delete get_election_timetable in this PR too?

@symroe symroe left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, marked as approved by mistake, but I think get_election_timetable needs to be removed

@chris48s

Copy link
Copy Markdown
Member Author

The get_election_timetable function is removed in commit c7d4a6a

@symroe

symroe commented Jul 22, 2026

Copy link
Copy Markdown
Member

The get_election_timetable function is removed in commit c7d4a6a

Oh I'm sorry, I was looking at the line diffs and didn't notice the whole file was gone 馃憤

@chris48s
chris48s merged commit 1c0acab into master Jul 22, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants