Skip to content

Commit 36c0be3

Browse files
Make sure the ballot raw data is also changed. (#467)
* Make sure the ballot raw data is also changed. only export the non-spoiled ballots * updated version number
1 parent 5f2ac24 commit 36c0be3

4 files changed

Lines changed: 8 additions & 5 deletions

File tree

src/electionguard-ui/ElectionGuard.UI.Lib/Services/Database/BallotService.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ public async Task<List<BallotRecord>> GetByElectionIdAsync(string electionId)
4242
/// <param name="electionId">election id to search for</param>
4343
public async Task<IAsyncCursor<BallotRecord>> GetCursorByElectionIdAsync(string electionId)
4444
{
45-
var filter = FilterBuilder.Eq(Constants.ElectionId, electionId);
45+
var filter = FilterBuilder.And(
46+
FilterBuilder.Eq(Constants.ElectionId, electionId),
47+
FilterBuilder.Ne(Constants.BallotState, BallotBoxState.Spoiled));
4648
return await GetCursorByFilterAsync(filter);
4749
}
4850

src/electionguard-ui/ElectionGuard.UI/ElectionGuard.UI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ApplicationIdGuid>c0679a79-bc22-46ad-9c49-93de983e3fa2</ApplicationIdGuid>
1919

2020
<!-- Versions -->
21-
<ApplicationDisplayVersion>1.91.15</ApplicationDisplayVersion>
21+
<ApplicationDisplayVersion>1.91.16</ApplicationDisplayVersion>
2222
<ApplicationVersion>14</ApplicationVersion>
2323

2424
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.3</SupportedOSPlatformVersion>

src/electionguard-ui/ElectionGuard.UI/Platforms/Windows/Package.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
55
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap rescap">
66

7-
<Identity Name="ElectionGuard.Admin" Publisher="CN=Microsoft" Version="1.91.15.0" />
7+
<Identity Name="ElectionGuard.Admin" Publisher="CN=Microsoft" Version="1.91.16.0" />
88

99
<mp:PhoneIdentity PhoneProductId="F7E69798-9268-43DC-A51E-3A95FA4992AD" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
1010

src/electionguard-ui/ElectionGuard.UI/ViewModels/BallotUploadViewModel.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,9 @@ await Parallel.ForEachAsync(ballots, async (currentBallot, cancellationToken) =>
168168
try
169169
{
170170
var filename = Path.GetFileName(currentBallot);
171-
var ballotData = await ReadFileAsync(currentBallot, cancellationToken);
172-
using var ballot = new CiphertextBallot(RemoveSpoiled(ballotData));
171+
var ballotOriginalData = await ReadFileAsync(currentBallot, cancellationToken);
172+
var ballotData = RemoveSpoiled(ballotOriginalData);
173+
using var ballot = new CiphertextBallot(ballotData);
173174

174175
if (ballot.Timestamp < startDate)
175176
{

0 commit comments

Comments
 (0)