Merge pull request #56 from narain280493/iter4

bug fix while returning unassigned students.
narain280493 · Dec 8, 2016 · 8ac34e2 · 8ac34e2
2 parents bc2fc9d + b40676f
commit 8ac34e2
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/app.py b/app.py
@@ -365,6 +365,7 @@ def filterApplications():
     overridenStudList = []
     overridenProjList = []
     overridenprojPrefList = []
+    rejectStudents = []
 
 
     ## get re-assigned projects and students here
@@ -391,12 +392,16 @@ def filterApplications():
         name = firstName + lastName
 
         if gpa < u'3':
+            rejectStudents.append(sJson)
             continue
         elif isWorkedBefore == True:
+            rejectStudents.append(sJson)
             continue
         elif isAvailability == 'Not sure' or isAvailability == 'No':
+            rejectStudents.append(sJson)
             continue
         elif isMSBSStudent == 'Yes':
+            rejectStudents.append(sJson)
             continue
         else:
             sJson['Race'] = json.loads(sJson['Race'])
@@ -450,6 +455,9 @@ def filterApplications():
     assignedProjects = assignedProjects + overridenProjList
     assignedStudentProjPreferenceList = assignedStudentProjPreferenceList + overridenprojPrefList
 
+    unassignedStudents = unassignedStudents + rejectStudents
+   # print unassignedStudents
+
     for id in overridenProjList:
         projList.append(getProject(id))