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.

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

new GUI modal: tabulation confirmation page #812

Merged
merged 26 commits into from
Jun 11, 2024
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a4846c0
new GUI modal: tabulation confirmation page
artoonie Mar 23, 2024
743dc18
open in finder after tabulation; handle new file creation
artoonie Mar 24, 2024
22ed426
handle edge casess: trim CSV ranking, handle moved config file
artoonie Mar 25, 2024
6cb8d9f
handle tabulation success/failure/in-progress states
artoonie Mar 25, 2024
e18c5f7
lint
artoonie Mar 30, 2024
fc56e93
exclude spotbugs error
artoonie Mar 31, 2024
256b816
UI updates
artoonie Apr 13, 2024
e38b70b
Merge remote-tracking branch 'origin/develop' into feature/issue-679_…
artoonie Apr 21, 2024
842fa95
three-step gui tabulation
artoonie Apr 21, 2024
3eca021
don't allow change in ballot stats between loading and tabulating
artoonie Apr 29, 2024
8fdb759
gui improvements / timing
artoonie May 8, 2024
718efc3
Merge remote-tracking branch 'origin/develop' into feature/issue-679_…
artoonie May 30, 2024
83b58eb
style updates
artoonie May 30, 2024
91d30ae
make the log output faster, and add colors too (#832)
artoonie May 31, 2024
ee0d49d
Merge remote-tracking branch 'origin/develop' into feature/issue-679_…
artoonie Jun 4, 2024
2668ad4
comma-separate large number of ballots
artoonie Jun 4, 2024
d594e4c
Fixes unreliable usage of `.isEmpty()` for Strings in favor of `.isBl…
HEdingfield Jun 4, 2024
0c00788
address PR comments
artoonie Jun 4, 2024
bcb4c60
only pop up tabulate window if validation passes
artoonie Jun 4, 2024
85c4e51
Update error message, other PR comments
artoonie Jun 4, 2024
82c25a1
Fixes bug with `buttonOpenResultsClicked` not opening window to corre…
HEdingfield Jun 6, 2024
db9a51a
address PR comments
artoonie Jun 6, 2024
0e84c5b
delete temp file on Tabulate Window close
artoonie Jun 6, 2024
beaf358
Nits.
HEdingfield Jun 7, 2024
ffdf589
PR updates
artoonie Jun 7, 2024
89c370e
Merge remote-tracking branch 'origin/develop' into feature/issue-679_…
artoonie Jun 10, 2024
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
13 changes: 13 additions & 0 deletions config/spotbugs/exclude.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,17 @@
<Field name="xmlns"/>
<Bug code="UrF"/>
</Match>
<Match>
<Class name="~network\.brightspots\.rcv\.GuiTabulateController"/>
<Method name="initialize"/>
<Bug code="EI2"/>
HEdingfield marked this conversation as resolved.
Show resolved Hide resolved
</Match>
<Match>
<Class name="~network\.brightspots\.rcv\.TabulatorSession\$LoadedCvrData"/>
<Bug code="EI2"/>
</Match>
<Match>
<Class name="~network\.brightspots\.rcv\.TabulatorSession\$LoadedCvrData"/>
<Bug code="EI"/>
HEdingfield marked this conversation as resolved.
Show resolved Hide resolved
</Match>
</FindBugsFilter>
6 changes: 3 additions & 3 deletions src/main/java/network/brightspots/rcv/ContestConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ Set<ValidationError> validate() {
Logger.info("Contest config validation successful.");
} else {
Logger.severe(
"Contest config validation failed! Please modify the contest config file and try again.\n"
"Contest config validation failed! Modify the contest config file and try again.\n"
+ "See config_file_documentation.txt for more details.");
}
return validationErrors;
Expand Down Expand Up @@ -545,8 +545,8 @@ private void validateOutputSettings() {
Logger.severe(
"To ensure read-only access to RCTab output files, users must not"
+ " set the output path to user account folders like Documents,"
+ " Desktop, etc. -- any path under \"%s\" is prohibited. Please"
+ " specify a new path outside this folder in the Output tab of the"
+ " Desktop, etc. -- any path under \"%s\" is prohibited."
+ " Specify a new path outside this folder in the Output tab of the"
+ " app (e.g. C:\\RCTab\\output).",
rootUsersDirectory);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ static void migrateConfigVersion(ContestConfig config)
WinnerElectionMode.MULTI_SEAT_SEQUENTIAL_WINNER_TAKES_ALL.getInternalLabel();
default -> {
Logger.warning(
"winnerElectionMode \"%s\" is unrecognized! Please supply a valid "
"winnerElectionMode \"%s\" is unrecognized! Supply a valid "
+ "winnerElectionMode.",
oldWinnerElectionMode);
rules.winnerElectionMode = null;
Expand Down Expand Up @@ -123,8 +123,7 @@ static void migrateConfigVersion(ContestConfig config)
rules.tiebreakMode = tiebreakModeMigrationMap.get(oldTiebreakMode).getInternalLabel();
} else {
Logger.warning(
"tiebreakMode \"%s\" is unrecognized! Please supply a valid tiebreakMode.",
oldTiebreakMode);
"tiebreakMode \"%s\" is unrecognized! Supply a valid tiebreakMode.", oldTiebreakMode);
rules.tiebreakMode = null;
}
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/network/brightspots/rcv/CsvCvrReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ void readCastVoteRecords(List<CastVoteRecord> castVoteRecords)
}
int rankAsInt;
try {
rankAsString = rankAsString.trim();
rankAsInt = Integer.parseInt(rankAsString);
} catch (NumberFormatException e) {
Logger.severe(
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/network/brightspots/rcv/DominionCvrReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,9 @@ private int parseCvrFile(
String batchId = session.get("BatchId").toString();
Integer recordId = (Integer) session.get("RecordId");
String suppliedId = recordId.toString();
String computedId = Stream.of(tabulatorId, batchId, Integer.toString(recordId))
.filter(s -> s != null && !s.isEmpty())
String computedId =
Stream.of(tabulatorId, batchId, Integer.toString(recordId))
.filter(s -> s != null && !s.isBlank())
.collect(Collectors.joining("|"));

// filter out records which are not current and replace them with adjudicated ones
Expand Down
Loading
Loading