From b8d203cda0b3f4eb4b144f1c849d4dab6f63e3b7 Mon Sep 17 00:00:00 2001 From: Allie Bopp <aebopp@umich.edu> Date: Tue, 14 Jul 2020 14:37:23 -0400 Subject: [PATCH] simple view member points --- servicePoints/templates/index.html | 2 +- servicePoints/templates/viewMemberPoints.html | 14 ++++++++++++++ .../views/__pycache__/accounts.cpython-36.pyc | Bin 10395 -> 12005 bytes servicePoints/views/accounts.py | 18 ++++++++++++++++++ var/servicePoints.sqlite3 | Bin 32768 -> 32768 bytes 5 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 servicePoints/templates/viewMemberPoints.html diff --git a/servicePoints/templates/index.html b/servicePoints/templates/index.html index 50f2bab..52cf883 100644 --- a/servicePoints/templates/index.html +++ b/servicePoints/templates/index.html @@ -77,7 +77,7 @@ </a> {% if leader == 1 %} - <a href="/accounts/mask/"> + <a href="/accounts/viewMemberPoints/"> <img src=/images/view.png alt="mask"> </a> <a href="/accounts/mask/"> diff --git a/servicePoints/templates/viewMemberPoints.html b/servicePoints/templates/viewMemberPoints.html new file mode 100644 index 0000000..87cea0e --- /dev/null +++ b/servicePoints/templates/viewMemberPoints.html @@ -0,0 +1,14 @@ +<!DOCTYPE html> +<html> +<body> + <title>ServicePoints</title> + <p> + {{org}} members' hours: + </p> + {% for result in hours %} + <p> + {{result.fullname}} ({{result.username}}): {{result.hours}} + </p> + {% endfor %} +</body> +</html> diff --git a/servicePoints/views/__pycache__/accounts.cpython-36.pyc b/servicePoints/views/__pycache__/accounts.cpython-36.pyc index 87feb1c89c1e6ef633f85ad2d24f87b1e9244dab..a936282d588a76d6f91fe8266db2ec3c2b01c054 100644 GIT binary patch delta 3739 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 EA18GuPXGV_ delta 2459 zcmai0O>7%Q6y9-cum9pWKaTBmlQ_-q#%_}4uL0ULq$RY_qzz3QYG{JvT~eoZwwhf_ z6cwt{UW-azZwSNzi9<P1A`lY2a6m#WP%gc!s8ChG0ffW>gc>B^y>XHz#Svc3x3llf zym{}<n{WK%$+st)`^w9GpFj9{28Jc+zO>=z#Qq32bMUR^Tm71Q-l55t9a@bRz9d~_ zsVc2ji(HaY)w;akUntk2nrnSbOsk_Y5N97BzsR&Mty@glwmP(D!_b{tuh1#0y1os% zer-VL>Q{Ax4|NcAv<0=@+8*>EuCb$%I=p<t@qvS-Ky%$@?a=SO!c_RuJ%`vKH%+%= zB>W+C;HT}*8S_TLN>Y#%tyJb?Jb~|5E4$N~j8Ry$%<c@=)0W<yAwB(k*xcCmVKc|z zLZFik!H0n^cp!fPm&=3jm8S<j@<bf`4Y=>Q3Eu`~Z}mCvo8)87@?Gx$t6cFHjdq=~ z@;R09ei#Yu0?Xf7?Lecdk4N!kI~UV=ohRW_zuM4-f=9gPT`23rW*z`XAi?UOGf?kz zGTya38TiD(k`VB9M)(dg<t?svn9t*C-6(+*zE;RrDE^)J!Fvh%;A+J+HiE7UogW}U zjG&HSkYE?V5Wxl~`C}xY1oFobQeMlLO=}u1#GfGHZW77{pWmOh(tHnzN`-=@C+XPC zXAmSO{24mvCfN#umntL6uU7}z2rXi}P8kJms!mQjV3(m`K1w}zPETt(U-4xZHT@Nl zSFWN0!+nZgK3)O;v_##-aNu@TBgo-kpDlCUEaWUR<t-Z6SKxd<PAKW6jEZ+)ID9Lt z(2#n927*R{I5gD8!cElOPS8xyLeL6_YNK77YfohII%>@jg5+>AA3h!y5{(bRQmq}P z2v+=>p3^OTtyae2LPTYqa4k}o5Xq;!Z<$%!U7URbev52l6A*~LpCqd(KiB88rloV* zDv|0CCUe5D#<1$OwZ#s@-?2oj)Q<I_k(&^YMOY6E#jXlhQ{}}nd$M?Rco*D@DeTCW zHs~bXfzi4vaVp7`TCH#<m(Ac|J7(&fihs?GNw}`G^g2Z4mfRUC@*l979t6n|5NYH) z;J~(gqX;g%ZX4sB*kJlOG~Jdc72#gA^wVaWc)0dLtFjPJxvYX^@RjOyvs3iF=I>E5 zI#|M}9o#(O*Z<g`g7W%8y~sy(b}?h*&(P+N89cvc{Mi2`gHH4Bn+<yy?}b0=#|Mw2 z9M6O}!K_p&ZD&4hp8kub3r57k<kK+Pw1hNzr)gZ>T*bCKn@`W{ro`5B?_*9@!}tt5 zyFDIsqa7DE!Ih!qv)f%Pl$Bm{SwSs$&Lt?Z0={qF7oEaEc9Do|S>)C%5LH26%UF2D zCnReLn8UGZ1>B2<p{zAFEx76-O;w_nR}qLH-GWPtG$l?7G18XDg{M&~Q!pK{)T$Dj zrkB5Iy~5b@Fw;JaoO&VA2j8{ds2atAYMG!RPSNpEc()_QUWU&)PJ~aA;1EHW;01yg zp-pXLgD|cpSO(6jQwPRK{4{}}wvcHRG=0&+0zD+iY)c}t17=|^pS6w{S-hayAl!M7 zS<ADXO-wkbxdnsmgkKU3tblY8hQ?%bLXfz~iMQxBT{3*L6Wk=(e#j^5N}hV+=t+1l znP576om@IkJZQVkQ|aD;K_15sObG>V%Nb+Q!eCOqqH@-lTX^*TI*kJtDA!aak|T)x z$4RC(alx+#vCne^6$A#sJOKqEG7EQiM9x!oZJ((l_gJ&1^|Q8%<DISx`WKhExF`k3 zahYa{J8Xh_L}Hv+NZgW~PCTbdEMADy)SDros^As@B|td29?bF8ds+OU@a)bTS|O(o uV_1?&3we;w*Pa0Od}SVo(oiESy~>bM<MAs&#jp4jx%kw$@ZG2+l-R#WNekQn diff --git a/servicePoints/views/accounts.py b/servicePoints/views/accounts.py index 73daee0..5da6780 100644 --- a/servicePoints/views/accounts.py +++ b/servicePoints/views/accounts.py @@ -155,6 +155,24 @@ def createOrg(): context = {} return render_template('createOrg.html', **context) +@servicePoints.app.route('/accounts/viewMemberPoints/', methods=['GET']) +def viewMemberPoints(): + if 'username' in flask.session: + username = flask.session["username"] + cursor = servicePoints.model.get_db() + leaderCur = cursor.execute('SELECT orgName FROM orgs WHERE ' + 'username =:who', + {"who": username}) + results = leaderCur.fetchone() + usersCur = cursor.execute('SELECT username, fullname, hours FROM users WHERE ' + 'orgName =:who', + {"who": results["orgName"]}) + hoursResults = usersCur.fetchall() + context = {'org': results["orgName"], 'hours': hoursResults} + return render_template('viewMemberPoints.html', **context) + return flask.redirect(flask.url_for('login')) + + @servicePoints.app.route('/', methods=['GET', 'POST']) def index(): if 'username' in flask.session: diff --git a/var/servicePoints.sqlite3 b/var/servicePoints.sqlite3 index f7fe9136955d88bdcd90acc2e2e3a6b3b18cf56d..b6ad11000aa06460c22e48c1bdf775fe143a0fe5 100644 GIT binary patch delta 1462 zcmZ8hO^cgV6wW(unIw}LZzW?xnwBUA#KqwK{y?Ehq1}ki9}s%a{YWOsd@!9EC<vK| zo9-;*x`K!xf>5U5%8k;MU^j}ma3e@{ClnX%JeirMrHkD6p8MWB=RD_m&U<*caCo@z zNvBx7bLncadhf;;<YJ@hD&*}KK3w^F`IqJMjq6K$^*gm6YYSC(Z`!F&rq>#^cDvpD z=mWBuHX-dkyKe9HZw|a-yca-th?*xYm`qMO6`6(*jp5X3pL*8&oRUjA0?$(DtXYh~ zg`h;rENBTrC=n%CZ<8?icdrc>6Yw!h#XOgROUs;6NxJM3P@kw#G&(9dzRa9zWo$Ou zWrSrqDaNv8R^WM-mec9Ar6)|r$;Y(&?D~|6NnYiQMMg|)CJLO3ic3Q+NRRdUUUp_y zq?1fY!IM#t7|e(<<08Wo=OuWom(viU<(66tNlD5wP{uREt6Ev=Sj5&)kGM+8U~P;> zX6mgsAqXw4@L@tT(sxl{Ke#niGOU13uhwg=R%<4TACEWEJG13v*B=be6p55dE0y(} zT8ZU35r8S>sqzBZn4SU&A!!AIdxk0`>i{X3=$sYNfzyGeiRR42jOrx~3~_wMUkoBf zkFgS**-Vv5f<p|6gSC=78JMSBQ`FQ@WW=pwJ_?S`2rly=bMzkQ^hT}Lef{zp(m3c3 zU^p6Y@5CJX2ZJGOjmDdAzLqB#%wF8wO>r;Z>hBLWhTEf^@fk_Sfkho97w7@>f<wC? zx(||Jd$a6;r&42Jjgx>quwJ`llcJi_Y%Lxt%?#z)SV<|0EV2rWYo8smgE-MifRreV zQi94XoYj#lK+p5!Q$n%4K#B-wWTZ-%95mRV0~$eRL+NzATI+T$caUU0=)+)txG};F zvf9GOtyvs*^B(TbIEh3#77bt(l@m+?Aa&wsX@P1ous!T7_sA@`D2?JmDHd>uK*vN; zEi)Se^gk#xpuzTptQ=Y~>4Z$Rp#VGupLGyS88kKEm^$uom@@V#CW}-uut1%^Aacr4 z<2YJplF2So69hfJ-udp_#Rj=uArHu}<TLUu`HB2NJ|(xwf8-zX)$uDYkH}j~WxF{2 zTr_6e(|KE}m#yN&tM!$#Tg-*8&7ygSsz(prxN@ORa)ta${vtn<@5y~kGbMW@Blx@I zz2$n@Zk|Ho@HT2?tNCOCE>+9!+8p?K>ogb3ZfBn8toKLvudHLbyA|>q`GI^%9-i>H zOa3I^V7iY9tCr0I^VDZg9J1PKxmG-nTy2z{;tX){=;8Znu^^8s<k9hq>%Ws%TgAEV oOYM2$;dnII9uD?LTT7Knr67+h<S}0So2)FC-TM66=R4>B2W{D`vH$=8 delta 148 zcmZo@U}|V!njp={H&Mo!k#A$d5`F<TZg&QL2fiBK)jU^u1i0NdHX3tpc9-7EBEZIf zl!5;!|8@Rz{Ezs5@_*PY7_gCl@=<+zK34uM4E$gDU+`byKg7QUD87h)@)r95p!j(P q{+s;gL8|$m0>$_8Pd@K&%ETbBSuo)d|HKIrY+MXL0Ou|$5C8y>$S`gI -- GitLab