Remove overvote / undervote #416

Election-Tech-Initiative · Aug 8, 2023 · b4ab13a · b4ab13a
1 parent 094fadd
commit b4ab13a
Showing 1 changed file with 21 additions and 7 deletions.
diff --git a/src/electionguard-ui/ElectionGuard.UI/ViewModels/ViewTallyViewModel.cs b/src/electionguard-ui/ElectionGuard.UI/ViewModels/ViewTallyViewModel.cs
@@ -1,6 +1,7 @@
 using CommunityToolkit.Maui.Storage;
 using CommunityToolkit.Mvvm.Input;
 using ElectionGuard.Decryption.Tally;
+using ElectionGuard.UI.Lib.Models;
 using ElectionGuard.UI.Models;
 using Newtonsoft.Json;
 
@@ -180,8 +181,6 @@ private void GenerateContestData()
             var contest = CurrentManifest.Contests.Single(c => c.ObjectId == item.ObjectId);
             var contestItem = new ContestItem() { Name = contest.Name, TotalVotes = contest.VotesAllowed * (ulong)Tally.CastBallotCount };
             ulong writeInTotal = 0;
-            ulong overVoteTotal = 0;
-            ulong underVoteTotal = 0;
             ulong totalVotes = 0;
 
             foreach (var (skey, selection) in item.Selections)
@@ -204,16 +203,31 @@ private void GenerateContestData()
                 var percent = (float)writeInTotal / (contest.VotesAllowed * (ulong)Tally.CastBallotCount) * 100;
                 contestItem.Selections.Add(new() { Name = "Write-ins", Party = string.Empty, Votes = writeInTotal, Percent = percent });
             }
-            underVoteTotal = (contest.VotesAllowed * (ulong)Tally.CastBallotCount) - totalVotes;
-            var underPercent = (float)underVoteTotal / (contest.VotesAllowed * (ulong)Tally.CastBallotCount) * 100;
-            contestItem.Selections.Add(new() { Name = "Undervotes", Party = string.Empty, Votes = underVoteTotal, Percent = underPercent });
-            var overPercent = (float)overVoteTotal / (contest.VotesAllowed * (ulong)Tally.CastBallotCount) * 100;
-            contestItem.Selections.Add(new() { Name = "Overvotes", Party = string.Empty, Votes = overVoteTotal, Percent = overPercent });
+
+            // TallyOverVoteUndervote(contest, Tally, contestItem, totalVotes);
 
             Contests.Add(contestItem);
         }
     }
 
+    // TODO: Fix calculation and add to contest item.
+    private void TallyOverVoteUndervote(ContestDescriptionWithPlaceholders contest, ContestItem contestItem, ulong totalVotes)
+    {
+        if (Tally == null)
+        {
+            return;
+        }
+
+        var overVoteTotal = 0UL;
+        var underVoteTotal = (contest.VotesAllowed * (ulong)Tally.CastBallotCount) - totalVotes;
+        var underPercent = (float)underVoteTotal / (contest.VotesAllowed * (ulong)Tally.CastBallotCount) * 100;
+
+        contestItem.Selections.Add(new() { Name = "Undervotes", Party = string.Empty, Votes = underVoteTotal, Percent = underPercent });
+        var overPercent = (float)overVoteTotal / (contest.VotesAllowed * (ulong)Tally.CastBallotCount) * 100;
+
+        contestItem.Selections.Add(new() { Name = "Overvotes", Party = string.Empty, Votes = overVoteTotal, Percent = overPercent });
+    }
+
     public override async Task OnLeavingPage()
     {
         OriginalManifest?.Dispose();