Added data to user profile page

Author: Jamie-

tracker/static/style.css

@@ -12,6 +12,18 @@ div.container > h1 {
     margin-bottom: 2rem;
 }
 
+.super-large {
+    font-size: 6em;
+}
+
+.pretty-large {
+    font-size: 4em;
+}
+
+.center {
+    text-align: center;
+}
+
 /*
     PAGE SPECIFICS
 ########################################################################################################################
@@ -49,10 +61,12 @@ div.container > h1 {
     text-align: left;
 }
 
-.flag-large {
-    font-size: 6em;
-}
-
 #flag input {
     font-size: 2em;
 }
+
+/* PROFILE*/
+
+#profile h3 {
+    text-align: center;
+}

tracker/templates/flag_success.html

@@ -4,7 +4,7 @@
     <div class="container" id="flag">
         <h1>Yay! Flag Added</h1>
         <h4>That flag had a value of:</h4>
-        <h1 class="flag-large">{{ flag.value }}</h1>
+        <h1 class="super-large">{{ flag.value }}</h1>
 
         <h5>Your new session score:</h5>
         <h3>n/a</h3>

tracker/templates/profile.html

@@ -2,7 +2,33 @@
 
 {% block content %}
     <div class="container" id="profile">
-        <h1>{{ user }}</h1>
-        <p>{{ text }}</p>
+        <h1>{{ user.name }}</h1>
+        <div class="row">
+            <div class="col-sm">
+                <h3>Total Score</h3>
+                <h1 class="center pretty-large">{{ user.get_global_score() }}</h1>
+                <br />
+
+                <h3>Flags Submitted</h3>
+                <h1 class="center pretty-large">{{ user.get_no_flags() }}</h1>
+            </div>
+            <div class="col-sm">
+                <h3>Events Attended</h3>
+                {% if events is not none %}
+                <h1 class="center pretty-large">{{ events|length }}</h1>
+                <ul class="list-group{% if events|length > 7 %} pre-scrollable{% endif %}">
+                    {% for e in events %}
+                    <li class="list-group-item list-group-item-dark"><a href="/event/{{ e.id }}">{{ e.name }}</a></li>
+                    {% endfor %}
+                </ul>
+                {% else %}
+                    <h1 class="center pretty-large">0</h1>
+                {% endif %}
+            </div>
+            <div class="col-sm">
+                <h3>Achievements</h3>
+                <h5 class="center">Coming Soon...</h5>
+            </div>
+        </div>
     </div>
 {% endblock %}

tracker/user.py

@@ -1,4 +1,5 @@
 import tracker.db as db
+import tracker.event as event
 
 class User():
 
@@ -26,6 +27,21 @@ def get_name(self):
     def get_global_score(self):
         return db.query_db('SELECT SUM(f.value) FROM flagsfound ff LEFT JOIN flags f ON f.flag = ff.flag_id LEFT JOIN users u ON u.id = ff.user_id WHERE ff.user_id = ?', [self.id], one=True)[0]
 
+    # Get list of events attended by user (by looking at flags found)
+    def get_events_attended(self):
+        events = db.query_db('SELECT e.id AS id, e.name AS name FROM events e LEFT JOIN flags f ON f.event_id = e.id LEFT JOIN flagsfound ff ON ff.flag_id = f.flag LEFT JOIN users u ON u.id = ff.user_id WHERE u.id IS NOT NULL AND u.id = ?', [self.id])
+        if events is None:
+            return None
+        else:
+            elist = []
+            for e in events:
+                elist.append(event.Event(e['id'], e['name']))
+            return elist
+
+    # Get number of flags found by user
+    def get_no_flags(self):
+        return db.query_db('SELECT COUNT(*) FROM flagsfound WHERE user_id = ?', [self.id], one=True)[0]
+
     def __repr__(self):
         return '<User %r>' % self.id
 
@@ -37,3 +53,11 @@ def exists(id):
         return True
     else:
         return False
+
+# Get a user from ID
+def get_user(id):
+    u = db.query_db('SELECT * FROM users WHERE id = ?', [id], one=True)
+    if u is None:
+        return None
+    else:
+        return User(u['id'], u['name'])

tracker/views.py

@@ -87,11 +87,8 @@ def profile():
 def profile_user(user_id):
     if not user.exists(user_id):
         flask.abort(404)
-
-    if flask_login.current_user.is_authenticated and flask_login.current_user.get_id() == user_id:
-        return flask.render_template('profile.html', title=user_id, user='This is your profile', text=flask_login.current_user.get_name())
-    else:
-        return flask.render_template('profile.html', title=user_id, user=user_id, text='I am a user!')
+    u = user.get_user(user_id)
+    return flask.render_template('profile.html', title=u.name, user=u, events=u.get_events_attended())
 
 
 ## Error Handlers