Skip to content

Commit d127031

Browse files
committed
bug fix (tests working)
1 parent c286e1d commit d127031

7 files changed

Lines changed: 343 additions & 465 deletions

File tree

src/electiondata/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2829,7 +2829,7 @@ def display_options(
28292829
try:
28302830
filters_mapped = ui.get_contest_type_mappings(filters)
28312831
results = ui.get_filtered_input_options(
2832-
self.session, input_str, filters_mapped, self.repository_content_root
2832+
self.session, input_str, filters_mapped, self.major_subdivision_type
28332833
)
28342834
except Exception as exc:
28352835
results = None

src/electiondata/userinterface/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,7 @@ def get_contest_type_display(item: str) -> str:
928928

929929

930930
def get_filtered_input_options(
931-
session: Session, menu_type: str, filters: List[str], repository_content_root: str
931+
session: Session, menu_type: str, filters: List[str], major_subdivision_type: Dict[str, str]
932932
) -> List[Dict[str, Any]]:
933933
"""Display dropdown menu options for menu <menu_type>, limited to any strings in <filters>
934934
(unless <filters> is None, in which case all are displayed. Sort as necessary"""
@@ -957,7 +957,7 @@ def get_filtered_input_options(
957957
if filters:
958958
df = df[df["parent"].isin(filters)]
959959
elif menu_type == "contest_type":
960-
contest_df = db.get_relevant_contests(session, filters, repository_content_root)
960+
contest_df = db.get_relevant_contests(session, filters, major_subdivision_type)
961961
contest_types = contest_df["type"].unique()
962962
contest_types.sort()
963963
dropdown_options = {
@@ -988,7 +988,7 @@ def get_filtered_input_options(
988988
]
989989
).sort_values(by=["parent", "type", "name"])
990990
# define input options for each particular contest
991-
contest_df = db.get_relevant_contests(session, filters, repository_content_root)
991+
contest_df = db.get_relevant_contests(session, filters, major_subdivision_type)
992992
contest_df = contest_df[contest_df["type"].isin(filters)].sort_values(
993993
by=["parent", "type", "name"]
994994
)

tests/000_data_for_pytest/nist_v1_wy20g.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)