personalized index page and service points tracking

6d9a54a6 · aebopp · 168329a1 · 6d9a54a6 · 6d9a54a6 · 6d9a54a6
Commit 6d9a54a6 authored 4 years ago by aebopp
--- a/servicePoints/__pycache__/__init__.cpython-36.pyc
+++ b/servicePoints/__pycache__/__init__.cpython-36.pyc
--- a/servicePoints/__pycache__/config.cpython-36.pyc
+++ b/servicePoints/__pycache__/config.cpython-36.pyc
--- a/servicePoints/__pycache__/model.cpython-36.pyc
+++ b/servicePoints/__pycache__/model.cpython-36.pyc
--- a/servicePoints/templates/index.html
+++ b/servicePoints/templates/index.html
@@ -2,9 +2,15 @@
 <html>
 <head>
    <link rel="stylesheet" type="text/css" href="/css/style.css">
-    <title>ServicePoints</title>
+    <h1 style="text-align:center">Welcome to ServicePoints!</h1>
+    <p>{{username}}</p>
+    <p>{{org}}</p>
+    <p>Hours: {{hours}}</p>
    <a href="/accounts/logout/">logout</a>
    <a href="/accounts/delete/">delete</a>
    <a href="/accounts/mask/">mask</a>
+    {% if leader == 1 %}
+        <p>leader!</p>
+    {% endif %}
 </head>
 </html>
--- a/servicePoints/views/__pycache__/__init__.cpython-36.pyc
+++ b/servicePoints/views/__pycache__/__init__.cpython-36.pyc
--- a/servicePoints/views/__pycache__/accounts.cpython-36.pyc
+++ b/servicePoints/views/__pycache__/accounts.cpython-36.pyc
--- a/servicePoints/views/accounts.py
+++ b/servicePoints/views/accounts.py
@@ -82,10 +82,10 @@ def create():
        pw = hash_pass(flask.session['password'])
        data = (flask.session['username'], flask.session['fullname'],
                flask.session['email'], flask.session['orgName'],
-                pw)
+                pw, 0)
        cur = servicePoints.model.get_db()
        cur.execute("INSERT INTO users(username, fullname, email, orgName, "
-                    "password) VALUES (?, ?, ?, ?, ?)", data)
+                    "password, hours) VALUES (?, ?, ?, ?, ?, ?)", data)

        return flask.redirect(flask.url_for('index'))

@@ -136,12 +136,12 @@ def createOrg():
        pw = hash_pass(flask.session['password'])
        data = (flask.session['username'], flask.session['fullname'],
                flask.session['email'], flask.session['orgName'],
-                pw)
+                pw, 0)
        orgData = (flask.session['username'], flask.session['orgName'])
        cur = servicePoints.model.get_db()
        cur.execute("INSERT INTO orgs(username, orgName) VALUES (?, ?)", orgData)
        cur.execute("INSERT INTO users(username, fullname, email, orgName, "
-                    "password) VALUES (?, ?, ?, ?, ?)", data)
+                    "password, hours) VALUES (?, ?, ?, ?, ?, ?)", data)

        return flask.redirect(flask.url_for('index'))

@@ -152,7 +152,20 @@ def createOrg():
 def index():
    """Render index page."""
    if 'username' in flask.session:
-        context = {}
+        username = flask.session["username"]
+        cursor = servicePoints.model.get_db()
+        studentOrgCur = cursor.execute('SELECT orgName, hours FROM users WHERE '
+                            'username =:who',
+                            {"who": username})
+        results = studentOrgCur.fetchone()
+        leaderCur = cursor.execute('SELECT orgName FROM orgs WHERE '
+                    'username =:who',
+                    {"who": username})
+        if leaderCur.fetchone() is None:
+            leader = 0
+        else:
+            leader = 1
+        context = {'username': username, 'org': results["orgName"], 'hours': results["hours"], 'leader': leader}
        return render_template('index.html', **context)
    return flask.redirect(flask.url_for('login'))


--- a/sql/schema.sql
+++ b/sql/schema.sql
@@ -6,6 +6,7 @@ CREATE TABLE users(
 		email VARCHAR(40) NOT NULL,
 		orgName VARCHAR(40) NOT NULL,
 		password VARCHAR(256) NOT NULL,
+		hours VARCHAR(40) NOT NULL,
 	  PRIMARY KEY(username)
 );


--- a/var/servicePoints.sqlite3
+++ b/var/servicePoints.sqlite3