From 28f67a173e0456a45a88e9b2504be59fa7365d92 Mon Sep 17 00:00:00 2001
From: SteveMaier-IRT <steve.maier@infernored.com>
Date: Tue, 12 Sep 2023 17:13:40 -0400
Subject: [PATCH] Removed the totals and perentages from the tally display.
 Fixed the export of the guardian data Updated version numbers

---
 .../ElectionGuard.UI/Controls/ContestControl.xaml    | 12 ++++++------
 .../ElectionGuard.UI/ElectionGuard.UI.csproj         |  2 +-
 .../Helpers/ElectionRecordGenerator.cs               |  5 +++--
 .../Platforms/Windows/Package.appxmanifest           |  2 +-
 .../ViewModels/ViewTallyViewModel.cs                 | 10 +++++-----
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/electionguard-ui/ElectionGuard.UI/Controls/ContestControl.xaml b/src/electionguard-ui/ElectionGuard.UI/Controls/ContestControl.xaml
index 70b77fd07..b0a922277 100644
--- a/src/electionguard-ui/ElectionGuard.UI/Controls/ContestControl.xaml
+++ b/src/electionguard-ui/ElectionGuard.UI/Controls/ContestControl.xaml
@@ -39,10 +39,10 @@
                     Grid.Column="2"
                     FontAttributes="Bold"
                     Text="{helper:Translate VotesText}" />
-                <Label
+                <!--<Label
                     Grid.Column="3"
                     FontAttributes="Bold"
-                    Text="{helper:Translate PercentText}" />
+                    Text="{helper:Translate PercentText}" />-->
             </Grid>
             <Line
                 BackgroundColor="{StaticResource Gray950}"
@@ -70,11 +70,11 @@
                             Grid.Column="2"
                             Margin="10"
                             Text="{Binding Votes}" />
-                        <Label
+                        <!--<Label
                             Grid.Column="3"
                             Margin="10"
                             Text="{Binding Percent, StringFormat='{0:F1}'}"
-                            VerticalOptions="End" />
+                            VerticalOptions="End" />-->
                     </Grid>
                 </DataTemplate>
             </CollectionView.ItemTemplate>
@@ -83,7 +83,7 @@
             Grid.Row="3"
             BackgroundColor="{StaticResource Gray400}"
             ColumnDefinitions="4*, 2*, *, *">
-            <Label
+            <!--<Label
                 Grid.Column="0"
                 Margin="10"
                 FontAttributes="Bold,Italic"
@@ -97,7 +97,7 @@
                 Grid.Column="3"
                 Margin="10"
                 FontAttributes="Bold"
-                Text="100.0%" />
+                Text="100.0%" />-->
         </Grid>
     </Grid>
 </ContentView>
diff --git a/src/electionguard-ui/ElectionGuard.UI/ElectionGuard.UI.csproj b/src/electionguard-ui/ElectionGuard.UI/ElectionGuard.UI.csproj
index e9d9a8587..e318e077f 100644
--- a/src/electionguard-ui/ElectionGuard.UI/ElectionGuard.UI.csproj
+++ b/src/electionguard-ui/ElectionGuard.UI/ElectionGuard.UI.csproj
@@ -18,7 +18,7 @@
 		<ApplicationIdGuid>c0679a79-bc22-46ad-9c49-93de983e3fa2</ApplicationIdGuid>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>1.90.0</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>1.90.2.1</ApplicationDisplayVersion>
 		<ApplicationVersion>2</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.3</SupportedOSPlatformVersion>
diff --git a/src/electionguard-ui/ElectionGuard.UI/Helpers/ElectionRecordGenerator.cs b/src/electionguard-ui/ElectionGuard.UI/Helpers/ElectionRecordGenerator.cs
index 9be7d107d..59b4e3e2c 100644
--- a/src/electionguard-ui/ElectionGuard.UI/Helpers/ElectionRecordGenerator.cs
+++ b/src/electionguard-ui/ElectionGuard.UI/Helpers/ElectionRecordGenerator.cs
@@ -1,7 +1,8 @@
 using System.IO.Compression;
 using System.Text.Json;
 using MongoDB.Driver;
-
+using Newtonsoft.Json;
+
 namespace ElectionGuard.UI.Helpers;
 
 public static class ElectionRecordGenerator
@@ -67,7 +68,7 @@ private static async Task ExportGuardiansAsync(string guardianFolder, string key
         var guardians = await guardianPublicKeyService.GetAllByKeyCeremonyIdAsync(keyCeremonyId);
         foreach (var guardian in guardians)
         {
-            await File.WriteAllTextAsync(Path.Combine(guardianFolder, $"{GUARDIAN_PREFIX}{guardian.GuardianId}.json"), JsonSerializer.Serialize(guardian.PublicKey));
+            await File.WriteAllTextAsync(Path.Combine(guardianFolder, $"{GUARDIAN_PREFIX}{guardian.GuardianId}.json"), JsonConvert.SerializeObject(guardian.PublicKey));
         }
     }
 
diff --git a/src/electionguard-ui/ElectionGuard.UI/Platforms/Windows/Package.appxmanifest b/src/electionguard-ui/ElectionGuard.UI/Platforms/Windows/Package.appxmanifest
index 488a3b78d..733a277b1 100644
--- a/src/electionguard-ui/ElectionGuard.UI/Platforms/Windows/Package.appxmanifest
+++ b/src/electionguard-ui/ElectionGuard.UI/Platforms/Windows/Package.appxmanifest
@@ -6,7 +6,7 @@
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   IgnorableNamespaces="uap rescap">
 
-  <Identity Name="ElectionGuard.Admin" Publisher="CN=Microsoft" Version="0.0.0.0" />
+  <Identity Name="ElectionGuard.Admin" Publisher="CN=Microsoft" Version="1.90.2.1" />
 
   <mp:PhoneIdentity PhoneProductId="F7E69798-9268-43DC-A51E-3A95FA4992AD" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
diff --git a/src/electionguard-ui/ElectionGuard.UI/ViewModels/ViewTallyViewModel.cs b/src/electionguard-ui/ElectionGuard.UI/ViewModels/ViewTallyViewModel.cs
index 380d169ff..15f2eef04 100644
--- a/src/electionguard-ui/ElectionGuard.UI/ViewModels/ViewTallyViewModel.cs
+++ b/src/electionguard-ui/ElectionGuard.UI/ViewModels/ViewTallyViewModel.cs
@@ -204,11 +204,11 @@ 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 });
+            //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 });
 
             Contests.Add(contestItem);
         }