save the number of collabs and prefill

memo330179 · memo330179 · commit c3d27cd44dac · 2017-01-31T15:47:43.000Z
diff --git a/api/API/collaborators.py b/api/API/collaborators.py
@@ -95,7 +95,19 @@ def get_collaborator(project_id, username):
   else:
     return None
   
-    
+def delete_all_collaborators(project_id):
+  """ deletes all of the currect collaborators 
+      
+      Args:
+        project_id (int): the id of the project that the collaborators belong to
+        
+      Returns:
+        int: the number of rows affected
+  """
+  return(Collaborators.delete()
+                    .where(Collaborators.pID == project_id)).execute()
+                    
+        
 def delete_non_collaborators(project_id, *collaborators):
   """ deletes the current collaborators that are not in the list provided
       
diff --git a/api/pages/people.py b/api/pages/people.py
@@ -1,5 +1,6 @@
 from api.everything import *
 from ..API.projects import getProject
+from ..API.collaborators import delete_all_collaborators, getCollaborators
 
 @app.route("/people", methods = ["GET"])
 def people_GET ():
@@ -8,12 +9,16 @@ def people_GET ():
   
   if proj.status == cfg["projectStatus"]["Pending"]:
     return redirect(url_for('main'))
+    
+  collabs = getCollaborators(g.user.username)
+  
   
   return render_template (  "pages/people.html",
                             proj = proj,
                             username = g.user.username,
                             cfg = cfg,
                             ldap = g.user,
+                            collabs = collabs
                           )
 
 
@@ -40,10 +45,13 @@ def people_POST ():
   proj.numberStudents = numStu
   proj.save()
   if numCollab > 0:
+    collabs = getCollaborators(g.user.username)
     return render_template (  "pages/bnumbers.html",
                             username = g.user.username,
                             cfg = cfg,
-                            numCollab = numCollab
+                            numCollab = numCollab,
+                            collabs = collabs
                           )
   else:
+    delete_all_collaborators(proj.pID)
     return redirect(url_for('history_GET'))
diff --git a/api/templates/pages/bnumbers.html b/api/templates/pages/bnumbers.html
@@ -32,6 +32,8 @@ <h4>Collaborator #{{id + 1}}</h4>
                     type  = 'text' 
                     class = 'form-control'
                     placeholder = 'B012345678'
+                    value = 
+                    "{% if collabs is not none and id < collabs|length %}{{collabs[id].username.bnumber}}{% endif %}"
                     required
                     />
             
