Added IncorrectTotal error for voters_recounts to mock api

kiesraad · Jul 19, 2024 · 7ff58b8 · 7ff58b8
1 parent 93ab121
commit 7ff58b8
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 46 deletions.
diff --git a/backend/src/polling_station/structs.rs b/backend/src/polling_station/structs.rs
@@ -78,17 +78,19 @@ impl Validate for PollingStationResults {
         validation_results: &mut ValidationResults,
         field_name: String,
     ) {
-        if self.recounted && self.voters_recounts.is_none() {
-            validation_results.errors.push(ValidationResult {
-                fields: vec![
-                    format!("{field_name}.voters_recounts.poll_card_recount"),
-                    format!("{field_name}.voters_recounts.proxy_certificate_recount"),
-                    format!("{field_name}.voters_recounts.voter_card_recount"),
-                    format!("{field_name}.voters_recounts.total_admitted_voters_recount"),
-                ],
-                code: ValidationResultCode::MissingRecounts,
-            });
-        }
+        // TODO: This needs to be implemented differently, because once you submit empty fields this
+        //  error does not trigger, while it does trigger when you arrive at the empty Voters and Votes page
+        // if self.recounted && self.voters_recounts.is_none() {
+        //     validation_results.errors.push(ValidationResult {
+        //         fields: vec![
+        //             format!("{field_name}.voters_recounts.poll_card_recount"),
+        //             format!("{field_name}.voters_recounts.proxy_certificate_recount"),
+        //             format!("{field_name}.voters_recounts.voter_card_recount"),
+        //             format!("{field_name}.voters_recounts.total_admitted_voters_recount"),
+        //         ],
+        //         code: ValidationResultCode::MissingRecounts,
+        //     });
+        // }
 
         self.voters_counts.validate(
             election,

diff --git a/frontend/app/component/form/candidates_votes_form/CandidatesVotesForm.tsx b/frontend/app/component/form/candidates_votes_form/CandidatesVotesForm.tsx
@@ -60,7 +60,7 @@ export function CandidatesVotesForm({ group }: CandidatesVotesFormProps) {
 
   const errorsAndWarnings = useErrorsAndWarnings(errors, warnings, inputMaskWarnings);
 
-  //const blocker =  useBlocker() use const blocker to render confirmation UI.
+  //const blocker = useBlocker() use const blocker to render confirmation UI.
   useBlocker(() => {
     if (formRef.current && !isCalled) {
       const elements = formRef.current.elements;

diff --git a/frontend/app/component/form/differences/DifferencesForm.tsx b/frontend/app/component/form/differences/DifferencesForm.tsx
@@ -61,12 +61,9 @@ export function DifferencesForm() {
     [deformat],
   );
 
-  function handleSubmit(event: React.FormEvent<DifferencesFormElement>) {
-    event.preventDefault();
-    const elements = event.currentTarget.elements;
-    setSectionValues(getValues(elements));
-  }
-  //const blocker =  useBlocker() use const blocker to render confirmation UI.
+  const errorsAndWarnings = useErrorsAndWarnings(errors, warnings, inputMaskWarnings);
+
+  //const blocker = useBlocker() use const blocker to render confirmation UI.
   useBlocker(() => {
     if (formRef.current && !isCalled) {
       const elements = formRef.current.elements as DifferencesFormElement["elements"];
@@ -79,7 +76,11 @@ export function DifferencesForm() {
     return false;
   });
 
-  const errorsAndWarnings = useErrorsAndWarnings(errors, warnings, inputMaskWarnings);
+  function handleSubmit(event: React.FormEvent<DifferencesFormElement>) {
+    event.preventDefault();
+    const elements = event.currentTarget.elements;
+    setSectionValues(getValues(elements));
+  }
 
   React.useEffect(() => {
     if (isCalled) {

diff --git a/frontend/app/component/form/recounted/RecountedForm.tsx b/frontend/app/component/form/recounted/RecountedForm.tsx
@@ -34,18 +34,6 @@ export function RecountedForm() {
     return { yes: elements.yes.checked, no: elements.no.checked };
   }, []);
 
-  function handleSubmit(event: React.FormEvent<RecountedFormElement>) {
-    event.preventDefault();
-    const elements = event.currentTarget.elements;
-    setSectionValues(getValues(elements));
-
-    if (!elements.yes.checked && !elements.no.checked) {
-      setHasValidationError(true);
-    } else {
-      setHasValidationError(false);
-    }
-  }
-
   useBlocker(() => {
     if (formRef.current && !isCalled) {
       const elements = formRef.current.elements as RecountedFormElement["elements"];
@@ -58,6 +46,18 @@ export function RecountedForm() {
     return false;
   });
 
+  function handleSubmit(event: React.FormEvent<RecountedFormElement>) {
+    event.preventDefault();
+    const elements = event.currentTarget.elements;
+    setSectionValues(getValues(elements));
+
+    if (!elements.yes.checked && !elements.no.checked) {
+      setHasValidationError(true);
+    } else {
+      setHasValidationError(false);
+    }
+  }
+
   React.useEffect(() => {
     if (isCalled) {
       window.scrollTo(0, 0);

diff --git a/frontend/app/component/form/voters_and_votes/VotersAndVotesForm.tsx b/frontend/app/component/form/voters_and_votes/VotersAndVotesForm.tsx
@@ -81,12 +81,9 @@ export function VotersAndVotesForm() {
     [deformat, recounted],
   );
 
-  function handleSubmit(event: React.FormEvent<VotersAndVotesFormElement>) {
-    event.preventDefault();
-    const elements = event.currentTarget.elements;
-    setSectionValues(getValues(elements));
-  }
-  //const blocker =  useBlocker() use const blocker to render confirmation UI.
+  const errorsAndWarnings = useErrorsAndWarnings(errors, warnings, inputMaskWarnings);
+
+  //const blocker = useBlocker() use const blocker to render confirmation UI.
   useBlocker(() => {
     if (formRef.current && !isCalled) {
       const elements = formRef.current.elements as VotersAndVotesFormElement["elements"];
@@ -99,7 +96,11 @@ export function VotersAndVotesForm() {
     return false;
   });
 
-  const errorsAndWarnings = useErrorsAndWarnings(errors, warnings, inputMaskWarnings);
+  function handleSubmit(event: React.FormEvent<VotersAndVotesFormElement>) {
+    event.preventDefault();
+    const elements = event.currentTarget.elements;
+    setSectionValues(getValues(elements));
+  }
 
   React.useEffect(() => {
     if (isCalled) {

diff --git a/frontend/lib/api-mocks/index.ts b/frontend/lib/api-mocks/index.ts
@@ -8,6 +8,7 @@ import {
   POLLING_STATION_DATA_ENTRY_REQUEST_BODY,
   POLLING_STATION_DATA_ENTRY_REQUEST_PARAMS,
   VotersCounts,
+  VotersRecounts,
   VotesCounts,
 } from "@kiesraad/api";
 
@@ -58,21 +59,22 @@ export const pollingStationDataEntryHandler = http.post<
     };
 
     const {
+      // recounted,
       voters_counts,
       votes_counts,
       voters_recounts,
       // differences_counts,
       political_group_votes,
     } = json.data;
 
-    const votesFields: (keyof VotesCounts)[] = [
+    const votesCountsFields: (keyof VotesCounts)[] = [
       "blank_votes_count",
       "invalid_votes_count",
       "total_votes_cast_count",
       "votes_candidates_counts",
     ];
 
-    votesFields.forEach((field) => {
+    votesCountsFields.forEach((field) => {
       if (field in votes_counts) {
         if (valueOutOfRange(votes_counts[field])) {
           response.validation_results.errors.push({
@@ -83,14 +85,14 @@ export const pollingStationDataEntryHandler = http.post<
       }
     });
 
-    const votersFields: (keyof VotersCounts)[] = [
+    const votersCountsFields: (keyof VotersCounts)[] = [
       "poll_card_count",
       "proxy_certificate_count",
       "total_admitted_voters_count",
       "voter_card_count",
     ];
 
-    votersFields.forEach((field) => {
+    votersCountsFields.forEach((field) => {
       if (valueOutOfRange(voters_counts[field])) {
         response.validation_results.errors.push({
           code: "OutOfRange",
@@ -135,7 +137,34 @@ export const pollingStationDataEntryHandler = http.post<
       });
     }
 
+    const votersRecountsFields: (keyof VotersRecounts)[] = [
+      "poll_card_recount",
+      "proxy_certificate_recount",
+      "total_admitted_voters_recount",
+      "voter_card_recount",
+    ];
+
+    // TODO: This needs to be implemented differently, because once you submit empty fields this
+    //  error does not trigger, while it does trigger when you arrive at the empty Voters and Votes page
+    // if (recounted && voters_recounts === undefined) {
+    //   votersRecountsFields.forEach((field) => {
+    //     response.validation_results.errors.push({
+    //       code: "MissingRecounts",
+    //       fields: [`data.voters_recounts.${field}`],
+    //     });
+    //   });
+    // }
+
     if (voters_recounts) {
+      votersRecountsFields.forEach((field) => {
+        if (valueOutOfRange(voters_recounts[field])) {
+          response.validation_results.errors.push({
+            code: "OutOfRange",
+            fields: [`data.voters_recounts.${field}`],
+          });
+        }
+      });
+
       // A2 + B2 + C2 = D2
       if (
         voters_recounts.poll_card_recount +

diff --git a/frontend/lib/api/form/pollingstation/useVotersAndVotes.ts b/frontend/lib/api/form/pollingstation/useVotersAndVotes.ts
@@ -29,6 +29,10 @@ export function useVotersAndVotes() {
     };
   }, [values, setTemporaryCache, cache]);
 
+  const isCalled = React.useMemo(() => {
+    return sectionValues.votes_counts.total_votes_cast_count > 0;
+  }, [sectionValues]);
+
   const errors = React.useMemo(() => {
     if (data) {
       return data.validation_results.errors.filter((err) =>
@@ -72,10 +76,6 @@ export function useVotersAndVotes() {
     }));
   };
 
-  const isCalled = React.useMemo(() => {
-    return sectionValues.votes_counts.total_votes_cast_count > 0;
-  }, [sectionValues]);
-
   return {
     loading,
     sectionValues,