studentSemesters type array

ANovaBerkeley · May 2, 2021 · d18703c · d18703c
1 parent 83477b9
commit d18703c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 32 deletions.
diff --git a/client/src/components/Roster.js b/client/src/components/Roster.js
@@ -3,7 +3,7 @@ import '../stylesheets/Roster.css';
 import * as decode from 'jwt-decode';
 import RosterCard from './RosterCard';
 import 'antd/dist/antd.css';
-import { Button } from 'antd';
+import { Button, Radio } from 'antd';
 import { UserRefreshClient } from 'google-auth-library';
 
 const Roster = props => {

diff --git a/client/src/components/RosterCard.js b/client/src/components/RosterCard.js
@@ -15,9 +15,6 @@ const RosterCard = props => {
   const [displayNotes, setDisplayNotes] = useState(notes);
   const [studentSemesters, setStudentSemesters] = useState(person.studentSemesters);
   const [editedStudentSemesters, setEditedStudentSemesters] = useState(studentSemesters);
-  // const [displayStudentSemesters, setDisplayStudentSemesters] = useState(
-  //   studentSemesters,
-  // );
 
   const getCurrentSemester = () => {
     const currDate = new Date();
@@ -43,28 +40,14 @@ const RosterCard = props => {
   const onChangeStudentSemesters = checked => {
     console.log('checked: ', checked);
     console.log('is Toggle Active: ', isToggleActive());
-    let edited = editedStudentSemesters ? editedStudentSemesters : [];
+    let edited = [...editedStudentSemesters] ? [...editedStudentSemesters] : [];
 
     console.log('edited prev: ', edited);
 
     if (checked && !isToggleActive()) {
-      // const newKey = '' + edited.keys.length() + 1;
-
-      // edited = [...edited, { newKey: currSemester }];
       edited.push(currSemester);
-      // if (edited) {
-      //   edited = edited.push(currSemester);
-      // } else {
-      //   edited = edited + currSemester;
-      // }
     } else {
-      // edited.delete(edited.keys.length());
       edited.pop();
-      // if (edited.includes(',')) {
-      //   edited = edited.replace(', ' + currSemester, '');
-      // } else {
-      //   edited = edited.replace(currSemester, ' ');
-      // }
     }
     console.log('edited: ', edited);
     setEditedStudentSemesters(edited);
@@ -98,7 +81,6 @@ const RosterCard = props => {
         setShowEditModal(false);
         setDisplayNotes(editedNotes);
         setEditedStudentSemesters(editedStudentSemesters);
-        // setDisplayStudentSemesters(editedStudentSemesters);
         setStudentSemesters(editedStudentSemesters);
       })
       .catch(error => {
@@ -161,23 +143,20 @@ const RosterCard = props => {
                   checkedChildren="Active Student"
                   unCheckedChildren="Inactive Student"
                   defaultChecked={
-                    // studentSemesters && studentSemesters.includes(currSemester)
                     editedStudentSemesters &&
                     editedStudentSemesters.includes(currSemester)
                   }
                   checked={
                     editedStudentSemesters &&
                     editedStudentSemesters.includes(currSemester)
-                    //   // : studentSemesters && studentSemesters.includes(currSemester)
                   }
                   onChange={onChangeStudentSemesters}
                 />
               </Col>
               <Col>
-                {
-                  editedStudentSemesters
-                  // : displayStudentSemesters
-                }
+                {editedStudentSemesters
+                  ? editedStudentSemesters.join(', ')
+                  : editedStudentSemesters}
               </Col>
             </Row>
           </Modal>
@@ -193,7 +172,6 @@ const RosterCard = props => {
       fetch(`/api/v1/roster/getUserSemester?uid=${id}`)
         .then(res => res.json())
         .then(userSemester => {
-          // setDisplayStudentSemesters([userSemester[0].semester]);
           setEditedStudentSemesters([userSemester[0].semester]);
           setStudentSemesters([userSemester[0].semester]);
         });
@@ -261,8 +239,7 @@ const RosterCard = props => {
             <span className="rosterCardItem" id="semestersAttendedBubble">
               SEMESTERS
             </span>{' '}
-            {/* {displayStudentSemesters} */}
-            {studentSemesters}
+            {studentSemesters ? studentSemesters.join(', ') : null}
           </p>
           <p>
             <span className="rosterCardItem" id="notesBubble">
@@ -309,8 +286,7 @@ const RosterCard = props => {
             <span className="rosterCardItem" id="semestersAttendedBubble">
               SEMESTERS
             </span>{' '}
-            {/* {displayStudentSemesters} */}
-            {studentSemesters}
+            {studentSemesters ? studentSemesters.join(', ') : null}
           </p>
         </div>
       );

diff --git a/client/src/stylesheets/Roster.css b/client/src/stylesheets/Roster.css
@@ -204,3 +204,12 @@ input[type='submit']:hover {
 /* .editFields .ant-row {
   padding: 20 0px;
 } */
+
+.studentFilterButtons {
+  border-radius: 15px;
+  margin-right: 10px;
+  margin-bottom: 20px;
+  font-family: Poppins;
+  font-size: 13px;
+  font-weight: 600;
+}
diff --git a/controllers/rosters_controller.js b/controllers/rosters_controller.js
@@ -52,7 +52,7 @@ const update = async (req, res) => {
       .where({ id: req.body.id })
       .update({
         notes: req.body.editedNotes,
-        studentSemesters: req.body.editedStudentSemesters,
+        studentSemesters: knex.raw(req.body.editedStudentSemesters),
       });
     return res.status(200).send({ data });
   } catch (error) {

diff --git a/db/migrations/20190221001732_user.js b/db/migrations/20190221001732_user.js
@@ -11,6 +11,7 @@ exports.up = knex =>
     table.string('notes');
     table.string('candy');
     table.string('hobby');
+    table.string('fact');
   });
 
 exports.down = knex => knex.raw(`DROP TABLE IF EXISTS "user" CASCADE`);