From 382af2a45cb855be83e010fa59278f116746dba3 Mon Sep 17 00:00:00 2001
From: Allie Bopp <aebopp@umich.edu>
Date: Tue, 14 Jul 2020 17:55:56 -0400
Subject: [PATCH] added org management buttons that don't do anything yet
---
servicePoints/templates/manageOrg.html | 22 +++++++++++++++++-
servicePoints/templates/viewMemberPoints.html | 3 +++
.../views/__pycache__/accounts.cpython-36.pyc | Bin 14425 -> 14564 bytes
servicePoints/views/accounts.py | 5 +++-
sql/schema.sql | 1 +
5 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/servicePoints/templates/manageOrg.html b/servicePoints/templates/manageOrg.html
index ecbcf5d..ba47d52 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 87cea0e..e0fd426 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
GIT binary patch
delta 300
zcmcav@T8E-n3tDpy#`<W(uj>*b4{c<7#J8>fY=#`i)R3d6vh&UEXHiMqK?UjOgtv*
z7;)M&W^tylr?A$rWHL50)w0&GW^p$&)UwsE)Ueesq;Sk(u4OObN#Uwt?_&&R0P1D|
zV%8MqX2xb9Uz2;Xk*TYUF3{*Ii(pqDSLYCg(&E&jyu{p89fh>goSeML>-9vf^NZ3!
zLJGE4<r(>!%tdZM4Y$~HQ*)D2i;9cbfV^LPxrup+>8buj>3SI@xjCAQMN@#nn!J-|
znp$v61DQokAU?<BcnMJ<kcClPQ2oxOMMaY*Z{!i5{NGf7QD(A$nJ5njqW~iZBM&1N
aW6{*f+Gdv-e@^~y_Jncj<R|7OjKTn(olx2U
delta 212
zcmaD-c(Z`Zn3tF9r3zpCk?@UNb4{dK85kH?fY=#`iz|Rc3S$XF7GpMBQO4v$CLS6o
zY&Fa&?2-(bjI}H!+$o$jEPaf@3_v9;K+KxL+|1Yv<ZE(G4l;GsbOY)y(ghN~_;M5T
z64O)ti_-NnN^)~F8H*+Zg*ADK_(4hpCdVmCOg7cwpZr>#YjS}U3zH`6<ai0q$*pGm
wGGag#3`|^%T#P)70zi@t$mRgDxfqM4Ox|X8nep4?F7qdhQzqwIlrRba0P`_1>Hq)$
diff --git a/servicePoints/views/accounts.py b/servicePoints/views/accounts.py
index 3e0dba8..e178339 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 1e08c1e..c0d7d6f 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,
--
GitLab