current election cycle shoud return quarter cycle if it can't find a cycle.
This commit is contained in:
@@ -21,7 +21,7 @@ from utils import (
|
||||
build_highcouncil_votes_str,
|
||||
get_cl_election_name,
|
||||
get_dm_election_name,
|
||||
get_election_cycle_name,
|
||||
get_election_name,
|
||||
)
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ class VoteSelect(nextcord.ui.StringSelect):
|
||||
# should never happen
|
||||
raise ValueError('election type was not "cl" or "dm"')
|
||||
|
||||
cycle: str = get_election_cycle_name(self.config)
|
||||
cycle: str = get_election_name(self.config)
|
||||
with Session(engine) as session:
|
||||
stmt = select(ElectionInformation.HighCouncilVoteMsgId).where(
|
||||
ElectionInformation.ElectionCycle == cycle
|
||||
@@ -135,7 +135,7 @@ class VoteHighcouncilView(nextcord.ui.View):
|
||||
)
|
||||
return
|
||||
|
||||
cycle: str = get_election_cycle_name(self.config)
|
||||
cycle: str = get_election_name(self.config)
|
||||
election: str = get_cl_election_name(self.config)
|
||||
|
||||
with Session(engine) as session:
|
||||
@@ -154,9 +154,11 @@ class VoteHighcouncilView(nextcord.ui.View):
|
||||
|
||||
options = [
|
||||
SelectOption(
|
||||
label=f"{self.guild.get_member(nominee).display_name} ☑️"
|
||||
if voted_for == nominee
|
||||
else f"{self.guild.get_member(nominee).display_name}",
|
||||
label=(
|
||||
f"{self.guild.get_member(nominee).display_name} ☑️"
|
||||
if voted_for == nominee
|
||||
else f"{self.guild.get_member(nominee).display_name}"
|
||||
),
|
||||
value=str(nominee),
|
||||
)
|
||||
for nominee in sorted(
|
||||
@@ -211,7 +213,7 @@ class VoteHighcouncilView(nextcord.ui.View):
|
||||
)
|
||||
return
|
||||
|
||||
cycle: str = get_election_cycle_name(self.config)
|
||||
cycle: str = get_election_name(self.config)
|
||||
election: str = get_dm_election_name(self.config)
|
||||
|
||||
with Session(engine) as session:
|
||||
@@ -230,9 +232,11 @@ class VoteHighcouncilView(nextcord.ui.View):
|
||||
|
||||
options = [
|
||||
SelectOption(
|
||||
label=f"{self.guild.get_member(nominee).display_name} ☑️"
|
||||
if voted_for == nominee
|
||||
else f"{self.guild.get_member(nominee).display_name}",
|
||||
label=(
|
||||
f"{self.guild.get_member(nominee).display_name} ☑️"
|
||||
if voted_for == nominee
|
||||
else f"{self.guild.get_member(nominee).display_name}"
|
||||
),
|
||||
value=str(nominee),
|
||||
)
|
||||
for nominee in sorted(
|
||||
|
||||
Reference in New Issue
Block a user