diff --git a/servicePoints/templates/manageOrg.html b/servicePoints/templates/manageOrg.html
index ecbcf5dc857daa821ab9ff1a82dd9b7287cbce1b..ba47d52c0abbcd78958c81c7b4c837c2d7d73847 100644
--- a/servicePoints/templates/manageOrg.html
+++ b/servicePoints/templates/manageOrg.html
@@ -1,5 +1,8 @@
<!DOCTYPE html>
<html>
+ <head>
+ <a href="/">Home</a>
+ </head>
<head>
<link rel="stylesheet" type="text/css" href="/css/style.css">
<title>ServicePoints</title>
@@ -7,7 +10,24 @@
<body>
<p>
- {{org}}
+ <form action="/accounts/manageOrg/" method="post" enctype="multipart/form-data">
+ {{org}}
+ <input type="hidden" name="org" value="{{org}}"/>
+ <input type="submit" name="delete" value="delete your student org"/>
+ </form>
</p>
+ {% for member in members %}
+ {% if username == member.username %}
+ {{member.fullname}} ({{member.username}})
+ {% else %}
+ <p>
+ <form action="/accounts/manageOrg/" method="post" enctype="multipart/form-data">
+ {{member.fullname}} ({{member.username}})
+ <input type="hidden" name="user" value="{{member.username}}"/>
+ <input type="submit" name="remove" value="remove from org"/>
+ </form>
+ </p>
+ {% endif %}
+ {% endfor %}
</body>
</html>
diff --git a/servicePoints/templates/viewMemberPoints.html b/servicePoints/templates/viewMemberPoints.html
index 87cea0efb57fd28533d8e1f989feecd9f67e91ed..e0fd4263c9037a825f0240a79983e9e9f1e889e5 100644
--- a/servicePoints/templates/viewMemberPoints.html
+++ b/servicePoints/templates/viewMemberPoints.html
@@ -1,5 +1,8 @@
<!DOCTYPE html>
<html>
+ <head>
+ <a href="/">Home</a>
+ </head>
<body>
<title>ServicePoints</title>
<p>
diff --git a/servicePoints/views/__pycache__/accounts.cpython-36.pyc b/servicePoints/views/__pycache__/accounts.cpython-36.pyc
index cb131b8bf79f711104bf893a45155d5bdf30fd1c..28ab0735e78e2808b8f069d2edec5a2b1e3805c8 100644
Binary files a/servicePoints/views/__pycache__/accounts.cpython-36.pyc and b/servicePoints/views/__pycache__/accounts.cpython-36.pyc differ
diff --git a/servicePoints/views/accounts.py b/servicePoints/views/accounts.py
index 3e0dba8f95b44e2eb5589e6d511993ff52bcefcf..e17833941499096cc9aef23ff18905dda90ac6f1 100644
--- a/servicePoints/views/accounts.py
+++ b/servicePoints/views/accounts.py
@@ -494,7 +494,10 @@ def manageOrg():
'username =:who',
{"who": username})
results = leaderCur.fetchone()
- context = {'org': results["orgName"]}
+ orgName = results["orgName"]
+ membersCur = cursor.execute('SELECT username, fullname FROM users WHERE orgname =:who', {"who": orgName})
+ members = membersCur.fetchall()
+ context = {'org': orgName, 'members': members, 'username': username}
return render_template('manageOrg.html', **context)
return flask.redirect(flask.url_for('login'))
diff --git a/sql/schema.sql b/sql/schema.sql
index 1e08c1eb640d5e6496aa0642b290e6199f958f70..c0d7d6f2b7cf457728391761dc4becc3a07bdcc0 100644
--- a/sql/schema.sql
+++ b/sql/schema.sql
@@ -22,6 +22,7 @@ CREATE TABLE tutors(
time VARCHAR(80) NOT NULL,
PRIMARY KEY(username)
);
+
CREATE TABLE requests(
postid INTEGER NOT NULL,
member VARCHAR(20) NOT NULL,