got the collabs to work and submit to next page

HaileyB0311 · HaileyB0311 · commit e1fdd154fef8 · 2019-06-13T11:57:08.000-04:00
diff --git a/api/API/collaborators.py b/api/API/collaborators.py
@@ -133,15 +133,17 @@ def delete_non_collaborators(project_id, *collaborators):
         
         
 def add_collaborators(project_id, *collaborator_usernames):
-  """ add the collaborators from collaborator bnumbers
+  """ add the collaborators from collaborator usernames
   
       Args:
         project_id (int): the id of the project that the collabors belong to
         collaborator_bnumbers (splat): the collaborators that will be the current collaborators
   """
+  # print(collaborator_usernames)
+  # print(type(collaborator_usernames))
+  # print(list(collaborator_usernames))
   
-  faculty = getLDAPFaculty(collaborator_usernames)
-  
-  for professor in faculty:
-    if get_collaborator(project_id, professor.username) is None:
-      Collaborators(pID = project_id, username = professor.username).save()
+  for collab in list(collaborator_usernames)[0]:
+    print(str(collab))
+    Collaborators(pID = project_id, username = getLDAPFaculty(str(collab))).save()
+    
diff --git a/api/pages/collaborations.py b/api/pages/collaborations.py
@@ -4,6 +4,24 @@
 from ..API.faculty import getLDAPFaculty
 
 
+@app.route("/insertcollaborators", methods = ["POST"])
+@login_required
+def insert_collaborators ():
+  # endpoint for inserting collaborators from collaborations.html
+  
+  proj = getProject(g.user.username)
+  newCollab = request.form.getlist("getCollabUsernames") #get all users but list includes 
+  #(request.form["getCollabUsernames"]) # only gets one collab #1?
+  print(newCollab)
+  # request.data.getlist("getCollabUsernames") # gets the data from the form
+  # TODO: Insert the collaborators to the DB for this PID
+  add_collaborators(proj.pID, newCollab)
+  return redirect(url_for('irbyn_GET'))
+  
+  
+  
+  
+
 @app.route("/collaborations", methods = ["POST"])
 @login_required
 def people_POST ():    
@@ -34,12 +52,10 @@ def people_POST ():
   
   if numCollab > 0:
     delete_all_collaborators(proj.pID)
-    collabs = getCollaborators(g.user.username)
     return render_template ("pages/collaborations.html",
                             username = g.user.username,
                             cfg = cfg,
                             numCollab = numCollab,
-                            collabs = collabs,
                             allFaculty = allFaculty
                           )
   else:
diff --git a/api/pages/people.py b/api/pages/people.py
@@ -2,20 +2,14 @@
 from ..API.projects import getProject
 from ..API.collaborators import delete_all_collaborators, getCollaborators
 
-@app.route("/deleteCollabs", methods = ["POST", "GET"])
-@login_required
-def deleteCollabs():
-  #Function made solely to delete collaborators
-
-  delete_all_collaborators(proj.pID)
-  return redirect(url_for("collaborations_GET"))
-
 
 @app.route("/people", methods = ["GET"])
+@login_required
 def people_GET ():
   # All of our queries
   proj = getProject(g.user.username)
-  
+  print(proj.pID)
+  delete_all_collaborators(proj.pID)
   if proj.status == cfg["projectStatus"]["Pending"]:
     flash("Application has already been submited.")
     return redirect(url_for("main_with_username", username = g.user.username))
diff --git a/api/static/js/pages/collaborations.js b/api/static/js/pages/collaborations.js
@@ -61,4 +61,12 @@ function checkValidUsername (id) {
     .on ('success', setUsernameStatus(id) )
     .go();
   
+};
+
+
+function submitData() {  
+  console.log($("#collabForm"));
+  /* Ajax the data to /budget */
+  $("#collabForm")[0].submit();  
+  //console.log("Submitted");
 };
diff --git a/api/templates/pages/collaborations.html b/api/templates/pages/collaborations.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block title %} Collaborations {% endblock %}
-{% set currentPage = "Collaborations" %}
+{% set currentPage = "collaborations" %}
 
 {% block body %}
 
@@ -18,7 +18,8 @@ <h1>Faculty Collaborator(s) </h1>
     </div>
     
   <form class = "form-horizontal"
-      action = "/collaborations" 
+      id = "collabForm"
+      action = "/insertcollaborators" 
       method = "POST"
       >
       
@@ -37,7 +38,7 @@ <h4> <b> Collaborator #{{id + 1}} </b> </h4>
              {% for faculty in allFaculty %}
                {% if faculty.lastname != "" %} <!-- needed to remove test users -->
                  {% if faculty.username != g.user.username %}
-                 <option title={{faculty.username}} value="{{faculty.fID}}">{{faculty.username}}; {{faculty.firstname}} {{faculty.lastname}}</option>
+                 <option title={{faculty.username}} value="{{faculty.username}}">{{faculty.username}}; {{faculty.firstname}} {{faculty.lastname}}</option>
                  {% endif %}
                {% endif %}
              {% endfor %}
@@ -54,11 +55,11 @@ <h4> <b> Collaborator #{{id + 1}} </b> </h4>
     </div>
     
     
-    <div class = "col-sm-offset-9 col-sm-2" id = "submitButton">
-      <button id = "submit" 
-        type = "submit" 
-        class="btn btn-block btn-success form-control"
-        type="submit"
+    <div class = "col-sm-offset-9 col-sm-2" id = "submit_Button">
+      <button id = "submitbutton" 
+        type = "button" 
+        class="btn btn-block btn-success"
+        onclick= "submitData()"
         />
           Submit
       </button>
