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

feat(admin): Ballot Count Report Builder #4019

Merged
merged 15 commits into from
Oct 4, 2023
Merged

feat(admin): Ballot Count Report Builder #4019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
da6714c
update filter and group by components to allow using Party as a dimen…
adghayes Oct 3, 2023
6a447c5
change tally report print logging
adghayes Oct 3, 2023
ece2502
refactor: update export report PDF button to allow supporting ballot …
adghayes Oct 3, 2023
c056bf9
refactor: rename tally report csv button to be consistent with backen…
adghayes Oct 3, 2023
d2bff38
renaming: rename button from 'Export CSV Results' to 'Export Report C…
adghayes Oct 3, 2023
4756f58
add title and filename generating utils for ballot count reports
adghayes Oct 3, 2023
4c397fe
add component to export ballot count report CSV from backend, akin to…
adghayes Oct 3, 2023
47d18e8
deprecate old test util for mocking the card counts endpoint
adghayes Oct 3, 2023
bff4a0a
ui: add subtitle to ballot count reports
adghayes Oct 3, 2023
fe88fa9
add ballot count report viewer component
adghayes Oct 3, 2023
887a18c
add ballot count report builder screen
adghayes Oct 3, 2023
996ff2b
routing: add link to ballot count report builder to reports screen
adghayes Oct 3, 2023
c9d412b
add report names for party reports, and testing
adghayes Oct 3, 2023
45ded8d
use party short name instead of abbreviation in ballot count reports,…
adghayes Oct 3, 2023
69003aa
test coverage tiny tweak
adghayes Oct 3, 2023
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
18 changes: 16 additions & 2 deletions apps/admin/frontend/src/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,9 +424,16 @@ export const getCardCounts = {
queryKey(input?: GetCardCountsInput): QueryKey {
return input ? ['getCardCounts', input] : ['getCardCounts'];
},
useQuery(input: GetCardCountsInput = { groupBy: {} }) {
useQuery(
input: GetCardCountsInput = { groupBy: {} },
options: { enabled: boolean } = { enabled: true }
) {
const apiClient = useApiClient();
return useQuery(this.queryKey(input), () => apiClient.getCardCounts(input));
return useQuery(
this.queryKey(input),
() => apiClient.getCardCounts(input),
options
);
},
} as const;

Expand Down Expand Up @@ -674,6 +681,13 @@ export const exportTallyReportCsv = {
},
} as const;

export const exportBallotCountReportCsv = {
useMutation() {
const apiClient = useApiClient();
return useMutation(apiClient.exportBallotCountReportCsv);
},
} as const;

export const saveBallotPackageToUsb = {
useMutation() {
const apiClient = useApiClient();
Expand Down
24 changes: 12 additions & 12 deletions apps/admin/frontend/src/components/ballot_counts_table.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ describe('Ballot Counts by Precinct', () => {
];

it('renders as expected when there is no tally data', async () => {
apiMock.expectGetCardCounts(
apiMock.deprecatedExpectGetCardCounts(
mockBallotCountsTableGroupBy({ groupByPrecinct: true }),
[]
);
Expand Down Expand Up @@ -86,7 +86,7 @@ describe('Ballot Counts by Precinct', () => {
});

it('renders as expected when there is tally data', async () => {
apiMock.expectGetCardCounts(
apiMock.deprecatedExpectGetCardCounts(
mockBallotCountsTableGroupBy({ groupByPrecinct: true }),
cardCountsByPrecinct
);
Expand Down Expand Up @@ -144,7 +144,7 @@ describe('Ballot Counts by Scanner', () => {
const scannerIds = ['scanner-1', 'scanner-2'];

it('renders as expected when there is no tally data', async () => {
apiMock.expectGetCardCounts(
apiMock.deprecatedExpectGetCardCounts(
mockBallotCountsTableGroupBy({ groupByScanner: true }),
[]
);
Expand All @@ -165,7 +165,7 @@ describe('Ballot Counts by Scanner', () => {
});

it('renders as expected when there is tally data', async () => {
apiMock.expectGetCardCounts(
apiMock.deprecatedExpectGetCardCounts(
mockBallotCountsTableGroupBy({ groupByScanner: true }),
cardCountsByScanner
);
Expand Down Expand Up @@ -206,7 +206,7 @@ describe('Ballot Counts by Scanner', () => {
});

it('renders as expected when there is tally data and manual data', async () => {
apiMock.expectGetCardCounts(
apiMock.deprecatedExpectGetCardCounts(
mockBallotCountsTableGroupBy({ groupByScanner: true }),
cardCountsByScanner
);
Expand Down Expand Up @@ -263,7 +263,7 @@ describe('Ballots Counts by Party', () => {
];

it('renders as expected when there is no data', async () => {
apiMock.expectGetCardCounts(
apiMock.deprecatedExpectGetCardCounts(
mockBallotCountsTableGroupBy({ groupByParty: true }),
[]
);
Expand Down Expand Up @@ -303,7 +303,7 @@ describe('Ballots Counts by Party', () => {
});

it('renders as expected when there is tally data', async () => {
apiMock.expectGetCardCounts(
apiMock.deprecatedExpectGetCardCounts(
mockBallotCountsTableGroupBy({ groupByParty: true }),
cardCountsByParty
);
Expand Down Expand Up @@ -369,7 +369,7 @@ describe('Ballots Counts by VotingMethod', () => {
];

it('renders as expected when there is no data', async () => {
apiMock.expectGetCardCounts(
apiMock.deprecatedExpectGetCardCounts(
mockBallotCountsTableGroupBy({ groupByVotingMethod: true }),
[]
);
Expand Down Expand Up @@ -402,7 +402,7 @@ describe('Ballots Counts by VotingMethod', () => {
});

it('renders as expected when there is tally data', async () => {
apiMock.expectGetCardCounts(
apiMock.deprecatedExpectGetCardCounts(
mockBallotCountsTableGroupBy({ groupByVotingMethod: true }),
cardCountsByVotingMethod
);
Expand Down Expand Up @@ -483,7 +483,7 @@ describe('Ballots Counts by Batch', () => {
];

it('renders as expected when there is no data', async () => {
apiMock.expectGetCardCounts(
apiMock.deprecatedExpectGetCardCounts(
mockBallotCountsTableGroupBy({ groupByBatch: true }),
[]
);
Expand Down Expand Up @@ -521,7 +521,7 @@ describe('Ballots Counts by Batch', () => {
];

it('renders as expected when there is tally data', async () => {
apiMock.expectGetCardCounts(
apiMock.deprecatedExpectGetCardCounts(
mockBallotCountsTableGroupBy({ groupByBatch: true }),
cardCountsByBatch
);
Expand Down Expand Up @@ -561,7 +561,7 @@ describe('Ballots Counts by Batch', () => {
});

it('renders as expected where there is tally data and manual data', async () => {
apiMock.expectGetCardCounts(
apiMock.deprecatedExpectGetCardCounts(
mockBallotCountsTableGroupBy({ groupByBatch: true }),
cardCountsByBatch
);
Expand Down
4 changes: 4 additions & 0 deletions apps/admin/frontend/src/components/election_manager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import { checkPin } from '../api';
import { canViewAndPrintBallots } from '../utils/can_view_and_print_ballots';
import { WriteInsAdjudicationScreen } from '../screens/write_ins_adjudication_screen';
import { TallyReportBuilder } from '../screens/tally_report_builder';
import { BallotCountReportBuilder } from '../screens/ballot_count_report_builder';

export function ElectionManager(): JSX.Element {
const { electionDefinition, configuredAt, auth, hasCardReaderAttached } =
Expand Down Expand Up @@ -206,6 +207,9 @@ export function ElectionManager(): JSX.Element {
<Route exact path={routerPaths.tallyAllPrecinctsReport}>
<AllPrecinctsTallyReportScreen />
</Route>
<Route exact path={routerPaths.ballotCountReportBuilder}>
<BallotCountReportBuilder />
</Route>
<Route
exact
path={routerPaths.tallyVotingMethodReport({
Expand Down
Loading