fix: only send total amount of voting participants (#200)

* fix: only send total amount of voting participants * test: update frontend test
NTNUI · Sep 25, 2023 · ef377e4 · ef377e4
1 parent 3c9cd08
commit ef377e4
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 13 deletions.
diff --git a/backend/controllers/votation.ts b/backend/controllers/votation.ts
@@ -75,7 +75,7 @@ export async function getAllVotations(req: RequestWithNtnuiNo, res: Response) {
           title: vote.title,
           caseNumber: vote.caseNumber,
           voteText: vote.voteText,
-          voted: vote.voted,
+          voted: vote.voted.length,
           options: optionList,
           isActive: isActive,
           maximumOptions: vote.maximumOptions,

diff --git a/backend/types/vote.ts b/backend/types/vote.ts
@@ -21,7 +21,7 @@ export type VoteResponseType = {
   title: string;
   caseNumber: number;
   voteText: string;
-  voted: number[];
+  voted: number;
   options: OptionType[];
   maximumOptions: number;
   isActive: boolean;

diff --git a/frontend/src/components/EditAssembly.tsx b/frontend/src/components/EditAssembly.tsx
@@ -121,7 +121,7 @@ export function EditAssembly(state: { group: UserDataGroupType }) {
           title: votationTemplate ? votationTemplate.title : "Placeholder",
           caseNumber: 0.1,
           voteText: votationTemplate ? votationTemplate.voteText : "",
-          voted: [],
+          voted: 0,
           options: votationTemplate ? votationTemplate.options : [],
           maximumOptions: 1,
           isFinished: false,

diff --git a/frontend/src/components/Results.tsx b/frontend/src/components/Results.tsx
@@ -79,7 +79,7 @@ export function Results({
                     {option.title}
                   </Text>
                   <Progress
-                    value={100 * (option.voteCount / votation.voted.length)}
+                    value={100 * (option.voteCount / votation.voted)}
                     my="xs"
                     size="xl"
                     radius="md"
@@ -95,10 +95,10 @@ export function Results({
                     label={
                       option.voteCount +
                       "/" +
-                      votation.voted.length +
+                      votation.voted +
                       " (" +
                       Number(
-                        100 * (option.voteCount / votation.voted.length || 0)
+                        100 * (option.voteCount / votation.voted || 0)
                       ).toFixed(2) +
                       "%)"
                     }
@@ -108,9 +108,8 @@ export function Results({
             })}
             <Text color={"white"}>
               {" "}
-              {(votation.numberParticipants || 0) -
-                votation.voted.length} of {votation.numberParticipants || 0}{" "}
-              participants did not vote
+              {(votation.numberParticipants || 0) - votation.voted} of{" "}
+              {votation.numberParticipants || 0} participants did not vote
             </Text>
             <Button mt={15} onClick={() => addCase(votation)}>
               Duplicate votation

diff --git a/frontend/src/tests/Results.test.tsx b/frontend/src/tests/Results.test.tsx
@@ -35,7 +35,7 @@ describe("Result component test", () => {
     _id: "5",
     title: "Testvotering",
     voteText: "Dette er en testvotering",
-    voted: [1, 2, 4, 7, 9],
+    voted: 5,
     options: [testOption1, testOption2],
     maximumOptions: 1,
     isFinished: true,

diff --git a/frontend/src/types/votes.ts b/frontend/src/types/votes.ts
@@ -3,7 +3,7 @@ export interface VoteType {
   _id: string;
   title: string;
   voteText: string;
-  voted: number[];
+  voted: number;
   options: OptionType[];
   maximumOptions: number;
   isFinished: boolean;

diff --git a/frontend/test/setup/setup.ts b/frontend/test/setup/setup.ts
@@ -44,7 +44,7 @@ const vote2: VoteType = {
   _id: "1",
   title: "Test",
   voteText: "Testing",
-  voted: [1, 2],
+  voted: 2,
   options: [{ _id: "1", title: "Case1", voteCount: 0 }],
   maximumOptions: 1,
   isFinished: false,
@@ -57,7 +57,7 @@ const vote1: VoteType = {
   _id: "2",
   title: "Test2",
   voteText: "Testing2",
-  voted: [1, 2],
+  voted: 2,
   options: [{ _id: "2", title: "Case2", voteCount: 0 }],
   maximumOptions: 1,
   isFinished: false,