Merge pull request EGCETSII#64 from Full-Tortuga/feature/EGCETSII#20-voting-form

Feature/EGCETSII#20 voting form

Author: JSnow11

decide/administration/frontend/src/api/baseApiUtils.ts

@@ -1,6 +1,5 @@
 import { axios } from "api/axios";
 
-
 const baseApi = {
   //        KEYS OPERATIONS
   //Bulk operation
@@ -11,8 +10,7 @@ const baseApi = {
   getKey: (id: string) => axios.get(`/base/key/${id}`),
   createKey: (key: any) => axios.post("/base/key/", key),
   updateKey: (key: any) => axios.put(`/base/key/${key.id}`, key),
-  deleteKey: (id: string) => axios.delete(`/base/key/${id}`),  
-
+  deleteKey: (id: string) => axios.delete(`/base/key/${id}`),
 
   //        AUTH OPERATIONS
   //Bulk operation
@@ -23,8 +21,7 @@ const baseApi = {
   //Individual operations
   getAuth: (id: string) => axios.get(`/base/auth/${id}`),
   updateAuth: (auth: any) => axios.put(`/base/auth/${auth.id}`, auth),
-  deleteAuth: (id: string) => axios.delete(`/base/auth/${id}`)
+  deleteAuth: (id: string) => axios.delete(`/base/auth/${id}`),
 };
 
-
-export default baseApi;
+export default baseApi;

decide/administration/frontend/src/api/censusApiUtils.ts

@@ -1,19 +1,16 @@
 import { axios } from "api/axios";
 import { Census } from "types/census";
 
-
 const censusApi = {
   //Bulk operation
   getCensuss: () => axios.get("/census"),
-  deleteCensuss: () => axios.delete(`/census`), 
-  
+  deleteCensuss: () => axios.delete(`/census`),
 
   //Individual operations
   getCensus: (id: string) => axios.get(`/census/${id}`),
   createCensus: (census: Census) => axios.post("/census/", census),
   updateCensus: (census: Census) => axios.put(`/census/${census.id}`, census),
-  deleteCensus: (id: string) => axios.delete(`/census/${id}`),  
-  };
-
+  deleteCensus: (id: string) => axios.delete(`/census/${id}`),
+};
 
-export default censusApi;
+export default censusApi;

decide/administration/frontend/src/api/index.ts

@@ -1,4 +1,5 @@
 import userApi from "./userApiUtils";
 import authApi from "./authApiUtils";
+import votingApi from "./votingApiUtils";
 
-export { authApi, userApi };
+export { authApi, userApi, votingApi };

decide/administration/frontend/src/api/votingApiUtils.ts

@@ -1,58 +1,60 @@
 import { axios } from "api/axios";
-import { Question, Voting } from "types/voting";
-
+import { votingType } from "types";
 
 const votingApi = {
+  //QUESTION API
+  //Bulk Operations
+  getQuestions: () => axios.get("/voting/question"),
+  deleteQuestions: (idList: number[]) =>
+    axios.delete("/voting/questions", {
+      data: { idList: idList },
+    }),
+  deleteAllQuestions: () => axios.delete(`/voting/question`),
+
+  //Individual Operations
+  getQuestion: (questionId: number) =>
+    axios.get(`/voting/question/${questionId}/`),
+  createQuestion: (question: votingType.Question) =>
+    axios.post("/voting/question/", question),
+  updateQuestion: (question: votingType.Question, questionId: number) =>
+    axios.put(`/voting/question/${questionId}/`, question),
+  deleteQuestion: (questionId: number) =>
+    axios.delete(`/voting/question/${questionId}/`),
+
+  //VOTING API
+  //Bulk Operations
+  getVotings: () => axios.get(`/votings`),
+  deleteVotings: (idList: number[]) =>
+    axios.delete("/votings", {
+      data: { idList: idList },
+    }),
+  deleteAllVotings: () => axios.delete(`/votings`),
 
-    //QUESTION API
-    //Bulk Operations
-    getQuestions: () => axios.get("/voting/question"),
-    deleteQuestions: (idList: any) => axios.delete("/voting/questions", idList),
-    deleteAllQuestions: () => axios.delete(`/voting/question`), 
-    
-    //Individual Operations
-    getQuestion: (question_id: number) => axios.get(`/voting/question/${question_id}`),
-    createQuestion: (question: Question) => axios.post("/voting/question/", question),
-    updateQuestion: (question: Question, question_id: number) => axios.put(`/voting/question/${question_id}`, question),
-    deleteQuestion: (question_id: number) => axios.delete(`/voting/question/${question_id}`),  
-
-
-    //VOTING API
-    //Bulk Operations   
-    getVotings:() => axios.get(`/votings`),
-    deleteVotings: (idList: any) => axios.delete("/votings", idList),
-    deleteAllVotings: () => axios.delete(`/votings`), 
-    
-    startVotings:(
-        idList:any[]       
-    ) => 
+  startVotings: (idList: number[]) =>
     axios.put("/votings", {
-        idList: idList,
-        action: "start",        
+      idList: idList,
+      action: "start",
     }),
 
-    stopVotings:(
-        idList:any[]       
-    ) => 
+  stopVotings: (idList: number[]) =>
     axios.put("/votings", {
-        idList: idList,
-        action: "stop",        
+      idList: idList,
+      action: "stop",
     }),
 
-    tallyVotings:(
-        idList:any[]       
-    ) => 
+  tallyVotings: (idList: number[]) =>
     axios.put("/votings", {
-        idList: idList,
-        action: "tally",        
+      idList: idList,
+      action: "tally",
     }),
-    
-    //Individual Operations
-    getVoting: (voting_id: number) => axios.get(`/votings/${voting_id}`),
-    createVoting: (voting: Voting) => axios.post("/votings", voting),
-    updateVoting: (voting: Voting, voting_id: number) => axios.put(`/votings/${voting_id}`, voting),
-    deleteVoting: (voting_id: number) => axios.delete(`/votings/${voting_id}`),  
+
+  //Individual Operations
+  getVoting: (votingId: number) => axios.get(`/votings/${votingId}/`),
+  createVoting: (voting: votingType.VotingFormFields) =>
+    axios.post("/votings", voting),
+  updateVoting: (voting: votingType.VotingFormFields, votingId: number) =>
+    axios.put(`/votings/${votingId}/`, voting),
+  deleteVoting: (votingId: number) => axios.delete(`/votings/${votingId}/`),
 };
 
 export default votingApi;
-

decide/administration/frontend/src/components/02-molecules/Table/table.tsx

@@ -6,17 +6,17 @@ const Component = (props: {
   rows: any[];
   columns: GridColDef[];
   setSelected: any;
+  initialSelection?: number[];
 }) => {
   const filterRows = React.useCallback(
     (ids: any[]) => {
-      console.log(ids);
       return props.rows.filter((row: any) => ids.includes(row.id));
     },
     [props.rows]
   );
 
   const [selectionModel, setSelectionModel] =
-    React.useState<GridSelectionModel>([]);
+    React.useState<GridSelectionModel>(props.initialSelection || []);
 
   const updateSelectionModel = React.useCallback(
     (newSelection: GridSelectionModel) => {
@@ -26,6 +26,11 @@ const Component = (props: {
     [props, filterRows]
   );
 
+  React.useEffect(() => {
+    updateSelectionModel(selectionModel);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [props.rows]);
+
   return (
     <div className="w-full">
       <DataGrid
@@ -34,7 +39,7 @@ const Component = (props: {
         columns={props.columns}
         pageSize={10}
         checkboxSelection
-        selectionModel={selectionModel}
+        selectionModel={props.initialSelection || selectionModel}
         onSelectionModelChange={(e) => updateSelectionModel(e)}
       />
     </div>