From 0684f982b70ea519a45d4f17c36cf9e309a14042 Mon Sep 17 00:00:00 2001
From: Jacob Levine <jacoblevine18@gmail.com>
Date: Thu, 7 Mar 2019 19:55:30 -0600
Subject: [PATCH] fix structure

---
 website/public/team/scripts.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/website/public/team/scripts.js b/website/public/team/scripts.js
index 4d1922ff..102db036 100644
--- a/website/public/team/scripts.js
+++ b/website/public/team/scripts.js
@@ -106,17 +106,20 @@ function reqjt(tn,tc){
          push[tn]='scout';
          firebase.firestore().collection("UserAssociations").doc(user.uid).set(push, {
            merge: true
-         }).then(function(doc) {
-           if (doc.exists) {
-             list = doc.data()
-             teamNums = Object.keys(list)
-             document.getElementById('teammem').innerHTML = ""
-             for (var i = 0; i < teamNums.length; i++) {
-               document.getElementById('teammem').innerHTML += "<tr><td>" + teamNums[i] + "</td><td>" + list[teamNums[i]] + "</td></tr>"
+         }).then(function() {
+           teamAssoc = firebase.firestore().collection('UserAssociations').doc(user.uid)
+           teamAssoc.get().then(function(doc) {
+             if (doc.exists) {
+               list = doc.data()
+               teamNums = Object.keys(list)
+               document.getElementById('teammem').innerHTML = ""
+               for (var i = 0; i < teamNums.length; i++) {
+                 document.getElementById('teammem').innerHTML += "<tr><td>" + teamNums[i] + "</td><td>" + list[teamNums[i]] + "</td></tr>"
+               }
+             } else {
+               document.getElementById('teammem').innerHTML = "<tr><td>You are not part of any teams</td></tr>"
              }
-           } else {
-             document.getElementById('teammem').innerHTML = "<tr><td>You are not part of any teams</td></tr>"
-           }
+           })
          })
        }else{
          alert("You don't have a correct join key. Please check it and try again.")