Show discrepancies for ballot comparisons in UI

votingworks · Nov 4, 2024 · 852d21d · 852d21d
1 parent 18e5d31
commit 852d21d
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 22 deletions.
diff --git a/client/src/components/AuditAdmin/Progress/JurisdictionDiscrepancies.tsx b/client/src/components/AuditAdmin/Progress/JurisdictionDiscrepancies.tsx
@@ -48,6 +48,19 @@ function getChoiceName(
   return choice.name
 }
 
+function displayDiscrepancy(val: string | number | undefined): string | number {
+  switch (val) {
+    case 'o':
+      return 'Overvote'
+    case 'u':
+      return 'Undervote'
+    case undefined:
+      return 0
+    default:
+      return val
+  }
+}
+
 export interface IJurisdictionDiscrepanciesProps {
   electionId: string
   handleClose: () => void
@@ -69,7 +82,7 @@ const JurisdictionDiscrepancies: React.FC<IJurisdictionDiscrepanciesProps> = ({
     return null
   }
 
-  const discrepanciesByBatch = discrepancyQuery.data[jurisdiction.id]
+  const discrepanciesByBatchOrBallot = discrepancyQuery.data[jurisdiction.id]
   const contests = contestsQuery.data
 
   return (
@@ -80,13 +93,13 @@ const JurisdictionDiscrepancies: React.FC<IJurisdictionDiscrepanciesProps> = ({
       title={`${jurisdiction.name} Discrepancies`}
     >
       <div className={Classes.DIALOG_BODY} style={{ marginBottom: 0 }}>
-        {Object.entries(discrepanciesByBatch).map(
-          ([batchName, discrepanciesByContest]) => {
+        {Object.entries(discrepanciesByBatchOrBallot).map(
+          ([batchOrBallotName, discrepanciesByContest]) => {
             return Object.entries(discrepanciesByContest).map(
               ([contestId, contestDiscrepancies]) => (
                 <div key={contestId}>
                   <TableHeader>
-                    {batchName} - {getContestName(contests, contestId)}
+                    {batchOrBallotName} - {getContestName(contests, contestId)}
                   </TableHeader>
                   <ContestDiscrepanciesTable>
                     <thead>
@@ -98,24 +111,33 @@ const JurisdictionDiscrepancies: React.FC<IJurisdictionDiscrepanciesProps> = ({
                       </tr>
                     </thead>
                     <tbody>
-                      {Object.keys(contestDiscrepancies.discrepancies).map(
-                        choiceId => (
+                      {Object.keys(contestDiscrepancies.discrepancies)
+                        .filter(
+                          choiceID =>
+                            contestDiscrepancies.discrepancies[choiceID] !== 0
+                        )
+                        .map(choiceId => (
                           <tr key={choiceId}>
                             <td>
                               {getChoiceName(contests, contestId, choiceId)}
                             </td>
                             <td>
-                              {contestDiscrepancies.reportedVotes[choiceId]}
+                              {displayDiscrepancy(
+                                contestDiscrepancies.reportedVotes[choiceId]
+                              )}
                             </td>
                             <td>
-                              {contestDiscrepancies.auditedVotes[choiceId]}
+                              {displayDiscrepancy(
+                                contestDiscrepancies.auditedVotes[choiceId]
+                              )}
                             </td>
                             <td>
-                              {contestDiscrepancies.discrepancies[choiceId]}
+                              {displayDiscrepancy(
+                                contestDiscrepancies.discrepancies[choiceId]
+                              )}
                             </td>
                           </tr>
-                        )
-                      )}
+                        ))}
                     </tbody>
                   </ContestDiscrepanciesTable>
                 </div>

diff --git a/client/src/components/AuditAdmin/Progress/Progress.tsx b/client/src/components/AuditAdmin/Progress/Progress.tsx
@@ -76,8 +76,6 @@ const Progress: React.FC<IProgressProps> = ({
   const showDiscrepancies =
     Boolean(round) &&
     (auditType === 'BALLOT_COMPARISON' || auditType === 'BATCH_COMPARISON')
-  const showDiscrepanciesReview =
-    Boolean(round) && auditType === 'BATCH_COMPARISON'
   const discrepancyCountsQuery = useDiscrepancyCountsByJurisdiction(
     electionId,
     { enabled: showDiscrepancies }
@@ -330,12 +328,6 @@ const Progress: React.FC<IProgressProps> = ({
             )
           }
           if (!value) return null
-          if (!showDiscrepanciesReview)
-            return (
-              <>
-                <Icon icon="flag" intent="danger" /> {value.toLocaleString()}
-              </>
-            )
           return (
             <Button
               onClick={() => setJurisdictionDiscrepanciesId(jurisdiction.id)}

diff --git a/client/src/components/useJurisdictions.ts b/client/src/components/useJurisdictions.ts
@@ -175,9 +175,9 @@ export type DiscrepanciesByJurisdiction = Record<
 >
 
 type ContestDiscrepancies = {
-  reportedVotes: Record<string, number> // `Record` keys are choiceId
-  auditedVotes: Record<string, number>
-  discrepancies: Record<string, number>
+  reportedVotes: Record<string, number | string> // `Record` keys are choiceId
+  auditedVotes: Record<string, number | string> // `Record` values are discrepancy counts or "o" (overvote), "u" (undervote)
+  discrepancies: Record<string, number | string>
 }
 
 const discrepanciesByJurisdictionQueryKey = (electionId: string): string[] =>