added transaction support from mongoose

jamiebones · Mar 17, 2021 · 2a755a1 · 2a755a1
1 parent be3e111
commit 2a755a1
Show file tree

Hide file tree

Showing 27 changed files with 274 additions and 153 deletions.
diff --git a/client/src/components/createNewSession.js b/client/src/components/createNewSession.js
@@ -15,7 +15,7 @@ import NumberFormat from "react-number-format";
 import styled from "styled-components";
 
 const SessionStyles = styled.div`
-   /* input[type="range"]::-webkik-slider-runnable-track{
+  /* input[type="range"]::-webkik-slider-runnable-track{
     width: 100%;
     height: 8.4px;
     cursor: pointer;
@@ -98,6 +98,7 @@ export default (props) => {
   const [loadingState, setLoadingState] = useState(false);
   const [bedspaceStats, setBedSpaceStats] = useState(null);
   const [sessionText, setSessionText] = useState("");
+  const [sessionShouldUpdate, setSessionShouldUpdate] = useState(false);
 
   const subtractTwoNumbers = (a, b) => {
     const answer = +a - +b;
@@ -351,7 +352,7 @@ export default (props) => {
       levelArray.push(obj);
     });
     let confirmDetails = window.confirm(
-      `session: ${session} \n ${facultyConfirmation} \n ${levelConfirmation}`
+      `session: ${session} \n ${facultyConfirmation} \n ${levelConfirmation} \n should update level: ${sessionShouldUpdate}`
     );
 
     if (!confirmDetails) {
@@ -365,6 +366,7 @@ export default (props) => {
         facultyAllocation: facultyArray,
         levelAllocation: levelArray,
         active: false,
+        shouldUpdateLevel: sessionShouldUpdate,
       };
       await sessionMutation({
         variables: {
@@ -482,6 +484,21 @@ export default (props) => {
                       </select>
                     </div>
 
+                    <div className="form-group form-check">
+                      <input
+                        type="checkbox"
+                        className="form-check-input"
+                        value={sessionShouldUpdate}
+                        checked={sessionShouldUpdate}
+                        onChange={() =>
+                          setSessionShouldUpdate((prevValue) => !prevValue)
+                        }
+                      />
+                      <label className="form-check-label">
+                        Update Student Level
+                      </label>
+                    </div>
+
                     <div>
                       {facComponents.length > 0 &&
                         facComponents.map(({ faculty, facultyId }) => {

diff --git a/client/src/components/login.js b/client/src/components/login.js
@@ -63,7 +63,7 @@ const Login = (props) => {
         setSubmitted(!submitted);
         if (accessLevel === "super-admin") {
           history.push("/admin/dashboard");
-        } else if (accessLevel === "student") {
+        } else if (accessLevel === "normal") {
           history.push("/dashboard");
         }
       }

diff --git a/client/src/components/studentAccountCreation.js b/client/src/components/studentAccountCreation.js
@@ -33,7 +33,7 @@ const StudentAccountCreation = (props) => {
 
   const [password, setPassword] = useState("");
   const [confirmPassword, setconfirmPassword] = useState("");
-  const [errors, setErrors] = useState([]);
+  const [errors, setErrors] = useState(null);
   const [submitted, setSubmitted] = useState(false);
   const [loading, setLoading] = useState(false);
   //const [file, setFile] = useState("");
@@ -50,10 +50,8 @@ const StudentAccountCreation = (props) => {
 
   useEffect(() => {
     if (createNewAccountResult.error) {
-      let errorArray = [];
       setSubmitted(!submitted);
-      errorArray = ExtractError(createNewAccountResult.error);
-      setErrors(errorArray);
+      setErrors(createNewAccountResult.error);
       setLoading(!loading);
     }
 
@@ -92,11 +90,9 @@ const StudentAccountCreation = (props) => {
         window.alert("password does not match");
         return;
       }
-
       const studentObject = { ...student };
       studentObject.password = password;
       setSubmitted(!submitted);
-      student.password = password;
       setLoading(!loading);
       await createNewAccount({
         variables: {
@@ -110,7 +106,10 @@ const StudentAccountCreation = (props) => {
 
   return (
     <CreateAccountStyles>
-      <ErrorDisplay errors={errors} />
+      <div className="text-center">
+        {errors && <p className="text-danger lead">{errors.message}</p>}
+      </div>
+
       <form
         onSubmit={submitStudentDataToDatabase}
         // action="/upload_studentData"
@@ -130,7 +129,9 @@ const StudentAccountCreation = (props) => {
             <div className="float-md-right">
               <div className="preview-images">
                 <img
-                  src={`http://uniuyo.edu.ng/eportals/passports/${student && student.profileImage}`}
+                  src={`http://uniuyo.edu.ng/eportals/passports/${
+                    student && student.profileImage
+                  }`}
                   className="passport"
                   id="passportImage"
                   style={{ width: 200 + "px", height: 200 + "px" }}
@@ -217,7 +218,9 @@ const StudentAccountCreation = (props) => {
                 readOnly
                 type="text"
                 className="form-control"
-                value={student.currentLevel && student.currentLevel.toUpperCase()}
+                value={
+                  student.currentLevel && student.currentLevel.toUpperCase()
+                }
               />
             </div>
 

diff --git a/client/src/components/updateSessionNew.js b/client/src/components/updateSessionNew.js
@@ -42,6 +42,7 @@ export default ({ history, match }) => {
   const [levelComponents, setLevelComponents] = useState([]);
   const [submitted, setSubmitted] = useState(false);
   const [sessionId, setSessionId] = useState("");
+  const [sessionShouldUpdate, setSessionShouldUpdate] = useState(false);
 
   const [sessionMutation, sessionResult] = useMutation(UpdateSessionMutation);
 
@@ -61,7 +62,7 @@ export default ({ history, match }) => {
       const sessionData = getSessionResult.data.getSessionById;
       const {
         id,
-
+        shouldUpdateLevel,
         facultyAllocation,
         levelAllocation,
       } = sessionData;
@@ -85,6 +86,7 @@ export default ({ history, match }) => {
       setFacComponents(facultyAllocationComponentsArray);
       setLevelComponents(levelAllocationComponentsArray);
       setSessionId(id);
+      setSessionShouldUpdate(shouldUpdateLevel);
       setFacValue(() =>
         filterArrayForTotal(facultyAllocationComponentsArray, null, "faculty")
       );
@@ -245,7 +247,7 @@ export default ({ history, match }) => {
       levelArray.push(obj);
     });
     let confirmDetails = window.confirm(
-      ` ${facultyConfirmation} \n ${levelConfirmation}`
+      ` ${facultyConfirmation} \n ${levelConfirmation} \n should update level: ${sessionShouldUpdate}`
     );
 
     if (!confirmDetails) {
@@ -254,13 +256,14 @@ export default ({ history, match }) => {
     }
 
     try {
-      let varableToSend = {
+      let variableToSend = {
         facultyAllocation: facultyArray,
         levelAllocation: levelArray,
+        shouldUpdateLevel: sessionShouldUpdate,
       };
       await sessionMutation({
         variables: {
-          input: varableToSend,
+          input: variableToSend,
           sessionId: sessionId,
         },
       });
@@ -299,9 +302,7 @@ export default ({ history, match }) => {
         <form onSubmit={handleSessionSubmit}>
           <div className="row">
             <div className="col-md-6 offset-md-3">
-              <p className="lead text-center">
-                updating academic session
-              </p>
+              <p className="lead text-center">updating academic session</p>
               <div className="form-group">
                 <label htmlFor="facultySelect">Faculties</label>
                 <select
@@ -339,6 +340,19 @@ export default ({ history, match }) => {
                   <option value="other years">other years student</option>
                 </select>
               </div>
+
+              <div className="form-group form-check">
+                <input
+                  type="checkbox"
+                  className="form-check-input"
+                  value={sessionShouldUpdate}
+                  checked={sessionShouldUpdate}
+                  onChange={() =>
+                    setSessionShouldUpdate((prevValue) => !prevValue)
+                  }
+                />
+                <label className="form-check-label">Update Student Level</label>
+              </div>
             </div>
           </div>
 

diff --git a/client/src/graphql/mutation.js b/client/src/graphql/mutation.js
@@ -317,7 +317,7 @@ const DashStudentFreeRoom = gql`
 
 //SendSMSToStudents
 const SendSMSToStudents = gql`
-  mutation SendSMSToStudents($roomIds: RoomIDS!, $sms: String!) {
+  mutation SendSMSToStudents($roomIds: RoomIDInput!, $sms: String!) {
     sendMessage(roomIds: $roomIds, sms: $sms) {
       status
       totalMessage

diff --git a/client/src/graphql/queries.js b/client/src/graphql/queries.js
@@ -219,6 +219,7 @@ const AllSessions = gql`
       }
       session
       active
+      shouldUpdateLevel
     }
   }
 `;
@@ -284,6 +285,7 @@ const GetSessionById = gql`
         percentAllocation
       }
       active
+      shouldUpdateLevel
     }
   }
 `;