From 03e5dbc49e80452904c71b9322b31442592b6e31 Mon Sep 17 00:00:00 2001
From: Michael Zhang <failed.down@gmail.com>
Date: Thu, 3 Mar 2016 18:39:09 -0600
Subject: [PATCH] Added observer tags.

---
 server/api/models.py |  8 +++++---
 server/api/team.py   |  1 +
 web/pages/team.html  | 18 +++++++++++++++---
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/server/api/models.py b/server/api/models.py
index 87f7a5c..686e795 100644
--- a/server/api/models.py
+++ b/server/api/models.py
@@ -62,7 +62,9 @@ class Teams(db.Model):
 				"username": member.username,
 				"name": member.name,
 				"captain": member.uid == self.owner,
-				"type": member.utype
+				"type": member.utype,
+				"admin": member.admin == True,
+				"observer": member.utype == 3
 			})
 		return members
 
@@ -124,9 +126,9 @@ class Teams(db.Model):
 		return result
 
 	def is_observer(self):
-		members = get_members()
+		members = self.get_members()
 		for member in members:
-			if member["observer"] == True:
+			if member["observer"] == True or member["admin"] == True:
 				return True
 		return False
 
diff --git a/server/api/team.py b/server/api/team.py
index d0d48f1..c756b41 100644
--- a/server/api/team.py
+++ b/server/api/team.py
@@ -300,6 +300,7 @@ def get_team_info(tid=None, teamname=None, teamname_lower=None, owner=None):
 		"points": team.points(),
 		"members": team.get_members(),
 		"captain": team.owner,
+		"observer": team.is_observer()
 	}
 	return result
 
diff --git a/web/pages/team.html b/web/pages/team.html
index 9dcbe4f..d20f656 100644
--- a/web/pages/team.html
+++ b/web/pages/team.html
@@ -22,14 +22,26 @@
 			<div ng-show="team['in_team']==true">
 				<h1><span data-toggle="tooltip" data-placement="top" title="Click to edit team name." id="teamname_edit" class="padded editable" contenteditable>{{ team['teamname'] }}</span></h1>
 				<h4><i class="fa fa-fw fa-university"></i> <span data-toggle="tooltip" data-placement="top" title="Click to edit school." id="school_edit" class="padded editable" contenteditable>{{ team['school'] || 'Add School' }}</span></h4>
-				<div class="badge">
-					<i class="fa fa-fw fa-flag"></i>
-					I'm in the team!
+				<div class="row">
+					<div class="label label-success">
+						<i class="fa fa-fw fa-flag"></i>
+						I'm in the team!
+					</div>
+					<div class="label label-warning">
+						<i class="fa fa-fw fa-globe"></i>
+						OBSERVER
+					</div>
 				</div>
 			</div>
 			<div ng-show="team['in_team']!=true">
 				<h1><span class="padded">{{ team['teamname'] }}</span></h1>
 				<h4><i class="fa fa-fw fa-university"></i> <span class="padded">{{ team['school'] || 'Unknown Affiliation' }}</span></h4>
+				<div class="row">
+					<div class="label label-warning">
+						<i class="fa fa-fw fa-globe"></i>
+						OBSERVER
+					</div>
+				</div>
 			</div>
 		</center>
 	</div>