fixed filter bugs

djunicode · Oct 16, 2020 · 2f5bfaa · 2f5bfaa
1 parent 0c98d31
commit 2f5bfaa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/frontend/src/components/Search.js b/frontend/src/components/Search.js
@@ -117,13 +117,12 @@ function Search(props) {
     else if(house=="Out-House"){
       houseParam="False";
     }
-    fetch(`${SERVER_URL}/browse_projects?domain=${domain}&approved=True&year_created=
-    ${year}&teacher__user__id=${faculty}&is_inhouse=${houseParam}&is_BE_project=${finalYearProj}&contributor_year=${projectClass}`, requestOptions)
+    fetch(`${SERVER_URL}/browse_projects?domain=${domain}&approved=True&year_created=${year}&teacher__user__id=${faculty}&is_inhouse=${houseParam}&is_BE_project=${finalYearProj=="False"?"":finalYearProj}&contributor_year=${projectClass}`, requestOptions)
       .then(response => response.json())
       .then(result => {
         let projectsRecv = result;
         if(awarded) {
-          projectsRecv = projectsRecv.filter(proj => proj.awards!="None")
+          projectsRecv = projectsRecv.filter(proj => proj.awards!="None" && proj.awards!="")
         }
         console.log(projectsRecv);
         setProjects(projectsRecv);

diff --git a/requirements.txt b/requirements.txt
@@ -28,9 +28,11 @@ MarkupSafe==1.1.1
 mccabe==0.6.1
 numpy==1.19.1
 openapi-codec==1.3.2
+pandas==1.1.3
 Pygments==2.3.1
 PyJWT==1.7.1
 pylint==2.5.3
+python-dateutil==2.8.1
 pytz==2018.7
 requests==2.21.0
 scikit-learn==0.23.2
@@ -43,4 +45,4 @@ toml==0.10.0
 typed-ast==1.4.1
 uritemplate==3.0.1
 urllib3==1.24.1
-wrapt==1.12.1
+wrapt==1.12.1