Add CSV export to eval (#185)

* Add CSV export to eval * Nvm
nwplus · Feb 26, 2022 · d773be0 · d773be0
1 parent ed66d65
commit d773be0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/components/Assessment/Modal.js b/components/Assessment/Modal.js
@@ -6,6 +6,7 @@ const GreyDiv = styled.div`
   width: 100vw;
   background: rgba(0, 0, 0, 0.4);
   position: absolute;
+  z-index: 99;
 `;
 
 const ModalDiv = styled.div`
@@ -17,6 +18,10 @@ const ModalDiv = styled.div`
   background-color: white;
   transform: translate(-50%, -25%);
   opacity: 100%;
+  padding: 20px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
 `;
 
 export default function Modal({ children, setShowing }) {

diff --git a/components/Evaluator/HackerList.js b/components/Evaluator/HackerList.js
@@ -5,6 +5,7 @@ import Icon from '../Icon';
 import Input from '../input';
 import { COLOR, ASSESSMENT_COLOR } from '../../constants';
 import { Title5 } from '../Typography';
+import ExportModal from '../Assessment/ExportModal';
 
 const Container = styled.div`
   height: 60%;
@@ -78,6 +79,7 @@ export default function HackerList({
   // State for search and filter icons
   const [searchActive, setSearchActive] = useState(false);
   const [filterActive, setFilterActive] = useState(false);
+  const [showExportModal, setShowExportModal] = useState(false);
 
   // debounce search
   useEffect(() => {
@@ -143,6 +145,10 @@ export default function HackerList({
                 color={!filterActive && COLOR.GREY_500}
                 onClick={() => setFilterActive(!filterActive)}
               />
+              <StyledIcon
+                icon="file-arrow-down"
+                onClick={() => setShowExportModal(true)}
+              />
             </ButtonContainer>
           </>
         )}
@@ -168,6 +174,8 @@ export default function HackerList({
           />
         ))}
       </ListContainer>
+
+      {showExportModal && <ExportModal setShowing={setShowExportModal} />}
     </Container>
   );
 }
diff --git a/utility/firebase.js b/utility/firebase.js
@@ -624,7 +624,7 @@ export const getApplicantsToAccept = async (score) => {
   return applicants.docs
     .filter((app) => {
       const appStatus = app.data().status.applicationStatus;
-      const newHacker = app.data().basicInfo.hackathonsAttended === 0;
+      const newHacker = app.data().skills.hackathonsAttended === 0;
       if (appStatus !== APPLICATION_STATUS.scored.text) return false;
       if (newHacker) return true;
       return app.data().score.totalScore >= score;
@@ -650,12 +650,11 @@ export const getCSVData = async () => {
         school,
         location,
         major,
-        hackathonsAttended,
       },
       status: { applicationStatus },
+      skills: { hackathonsAttended },
     } = doc.data();
     const totalScore = doc.data().score?.totalScore ?? '?';
-    const firstTimeHacker = hackathonsAttended === 0;
     return [
       firstName,
       lastName,
@@ -668,7 +667,6 @@ export const getCSVData = async () => {
       applicationStatus,
       major,
       hackathonsAttended,
-      firstTimeHacker,
     ];
   });
   CSV.unshift([
@@ -682,7 +680,6 @@ export const getCSVData = async () => {
     'Total Score',
     'Application Status',
     'Major',
-    '# of hackathons attended',
     'First time hacker?',
   ]);
   return CSV;