Merge pull request protobi#19 from pdo-bulsu/ranking

Ranking

Author: nmreyes

src/sections/projectSection/components/EvaluatedList.js

@@ -95,17 +95,20 @@ function EvaluatedList({ projects }) {
 
   const filteredProjects = newProjects.filter((project) => {
     if (filter === 0) {
-      return project.status === 1 && project.project_evaluation !== 0;
+      // return project.status === 1 && project.project_evaluation !== 0;
+      return projects && project.project_evaluation !== 0;
     } else if (filter === 1) {
       return (
         project.categorization.infrastructure === true &&
-        project.status === 1 &&
+        // project.status === 1 &&
+        projects &&
         project.project_evaluation !== 0
       );
     } else if (filter === 2) {
       return (
         project.categorization.infrastructure === false &&
-        project.status === 1 &&
+        // project.status === 1 &&
+        projects &&
         project.project_evaluation !== 0
       );
     }
@@ -116,6 +119,22 @@ function EvaluatedList({ projects }) {
     (a, b) => b.project_evaluation - a.project_evaluation
   );
 
+  const rankedProjects = sortedProjects.map((project, index) => {
+    if (index === 0) {
+      project.rank = 1;
+    } else if (
+      project.project_evaluation ===
+      sortedProjects[index - 1].project_evaluation
+    ) {
+      // same score = same rank
+      project.rank = sortedProjects[index - 1].rank;
+    } else {
+      // new score = +1 rank
+      project.rank = sortedProjects[index - 1].rank + 1;
+    }
+    return project;
+  });
+
   return (
     <motion.div
       initial={{ y: "200vh" }}
@@ -143,11 +162,14 @@ function EvaluatedList({ projects }) {
           <Table id="header-fixed">
             <TableHead className={classes.tableHead}>
               <TableRow>
+                <TableCell className={classes.tableFont} align="center">
+                  Rank
+                </TableCell>
                 <TableCell className={classes.tableFont} align="center">
                   Implementing Office
                 </TableCell>
                 <TableCell className={classes.tableFont}>
-                  Project Title ({sortedProjects.length} Projects)
+                  Project Title ({rankedProjects.length} Projects)
                 </TableCell>
                 <TableCell className={classes.tableFont} align="center">
                   Evaluator
@@ -167,7 +189,7 @@ function EvaluatedList({ projects }) {
               </TableRow>
             </TableHead>
             <TableBody>
-              {sortedProjects.map((project) => {
+              {rankedProjects.map((project) => {
                 const projectCost = project.investment_req
                   .map((item) => parseFloat(item.value))
                   .reduce((a, b) => a + b, 0);
@@ -204,6 +226,9 @@ function EvaluatedList({ projects }) {
                       )
                     }
                   >
+                    <TableCell className={classes.tableFont} align="center">
+                      {project.rank}
+                    </TableCell>
                     <TableCell className={classes.tableFont} align="center">
                       <Avatar src={institute.logo} /> {institute.title}
                     </TableCell>