Updated forms to only accept appropriate values

portal/assignments.py

@@ -125,13 +125,13 @@ def create_assignment(session_id):
 
                 cur.execute("""SELECT session.courses_id FROM courses
                            JOIN session ON session.courses_id = courses_id
-                           Where session.id = %s;""", 
+                           Where session.id = %s;""",
                            (session_id,))
                 courses = cur.fetchone()
                 course_id = courses[0]
                 print('course id HI IM RIGHT HERE GOD DAMN IT', course_id)
-            
-            
+
+
                 cur.execute("""
                 SELECT id FROM assignments
                 WHERE name = %s and session_id = %s;
@@ -141,7 +141,7 @@ def create_assignment(session_id):
                 assignment_id = assignments[0]
 
                 cur.close()
-            
+
                 return redirect(url_for('assignments.view_assignment', course_id=course_id, session_id=session_id, assignment_id=assignment_id))
         else:
             return redirect(url_for('assignments.create_assignment', session_id=session_id))

portal/courses.py

@@ -90,18 +90,18 @@ def create_course():
              """,
              (course_number, g.users['major'], name, description, credits, g.users['id']))
             db.get_db().commit()
-
 
 
-            #routing 
+
+            #routing
             cur.execute("""
             SELECT id FROM courses WHERE name = %s AND course_number = %s;
             """,
             (name, course_number))
             courses_tuple = cur.fetchone()
             course_id = courses_tuple[0]
 
-           
+
 
 
 
@@ -152,10 +152,10 @@ def update_course(course_id):
              """,
              (course_number, g.users['major'], name, description, credits, g.users['id'], course_id))
             db.get_db().commit()
-
 
-            #START OF NEW CODE 
-
+
+            #START OF NEW CODE
+
             cur.execute("""
             SELECT id FROM courses WHERE name = %s AND course_number = %s;
             """,

portal/gradebook.py

@@ -0,0 +1,93 @@
+from flask import (
+    Blueprint, flash, g, redirect, render_template, request, session, url_for
+)
+from portal.auth import (login_required, teacher_required)
+from . import db
+
+bp = Blueprint('gradebook', __name__, url_prefix='/gradebook')
+
+@bp.route('/')
+@login_required
+def gradebook():
+    if g.users['role'] == 'teacher':
+        cur = db.get_db().cursor()
+        cur.execute("""SELECT * FROM courses""")
+        courses = cur.fetchall()
+        cur.execute("""SELECT courses.id AS c_id, session.* FROM session
+                       JOIN courses ON courses.id = session.courses_id""")
+        sessions = cur.fetchall()
+        cur.execute("""SELECT session.id AS s_id, users.id AS u_id, SUM(submissions.points) AS s_points, SUM(assignments.points) AS a_points, '' as grade FROM users
+                    JOIN roster ON roster.users_id = users.id
+                    JOIN session ON roster.session_id = session.id
+                    JOIN assignments ON assignments.session_id=session.id
+                    JOIN submissions ON submissions.assignments_id = assignments.id and users.id = submissions.users_id
+                    GROUP BY session.id, users.id
+                    ORDER BY session.id""")
+        grades = cur.fetchall()
+    else:
+        cur = db.get_db().cursor()
+        cur.execute("""
+            SELECT DISTINCT ON (courses.id) roster.*, users.*, session.*, courses.* FROM roster
+            JOIN users ON users.id = roster.users_id
+            JOIN session ON session.id = roster.session_id
+            JOIN courses ON courses.id = session.courses_id
+            WHERE users.id = %s;""",
+            (g.users['id'],))
+        courses = cur.fetchall()
+        cur.execute("""
+            SELECT DISTINCT ON (session.id) session.*, roster.id AS r_id, users.id AS u_id, courses.id AS c_id FROM roster
+            JOIN users ON users.id = roster.users_id
+            JOIN session ON session.id = roster.session_id
+            JOIN courses ON courses.id = session.courses_id
+            WHERE users.id = %s;""",
+            (g.users['id'],))
+        sessions = cur.fetchall()
+        cur.execute("""SELECT session.id AS s_id, users.id AS u_id, SUM(submissions.points) AS s_points, SUM(assignments.points) AS a_points, '' as grade FROM users
+                    JOIN roster ON roster.users_id = users.id
+                    JOIN session ON roster.session_id = session.id
+                    JOIN assignments ON assignments.session_id=session.id
+                    JOIN submissions ON submissions.assignments_id = assignments.id and users.id = submissions.users_id
+                    WHERE users.id = %s
+                    GROUP BY session.id, users.id
+                    ORDER BY session.id""",
+                    (g.users['id'],))
+        grades = cur.fetchall()
+
+    for grade in grades:
+        grade[4] = grade[2]/grade[3]
+
+        if grade[4] >= 0.98:
+            grade[4] = 'A+'
+        elif grade[4] >= 0.93:
+            grade[4] = 'A'
+        elif grade[4] >= 0.90:
+            grade[4] = 'A-'
+        elif grade[4] >= 0.87:
+            grade[4] = 'B+'
+        elif grade[4] >= 0.83:
+            grade[4] = 'B'
+        elif grade[4] >= 0.80:
+            grade[4] = 'B-'
+        elif grade[4] >= 0.77:
+            grade[4] = 'C+'
+        elif grade[4] >= 0.73:
+            grade[4] = 'C'
+        elif grade[4] >= 0.70:
+            grade[4] = 'C-'
+        elif grade[4] >= 0.67:
+            grade[4] = 'D+'
+        elif grade[4] >= 0.63:
+            grade[4]= 'D'
+        elif grade[4] >= 0.60:
+            grade[4] = 'D-'
+        else:
+            grade[4] = 'F'
+
+    cur.close()
+    return render_template('portal/gradebook/view-gradebook.html', courses=courses, sessions=sessions, grades=grades)
+
+@bp.route('/<path:subpath>/')
+@login_required
+def gradebook_error(subpath=None):
+    error = "404 Not found"
+    return render_template('error.html', error=error)

portal/templates/portal/courses/create-course.html

@@ -6,7 +6,7 @@
 <h2>Create a Course</h2>
 <form method="post">
   <label for="course_number">Course Number
-    <input name="course_number" required/>
+    <input name="course_number" type="number" required/>
   </label>
   <label for="name">Name
     <input name="name" required/>
@@ -15,7 +15,7 @@ <h2>Create a Course</h2>
     <textarea name="description"></textarea>
   </label>
   <label for="credits">Credits
-    <input name="credits" required/>
+    <input name="credits" type="number" required/>
   </label>
   <input type="submit" value="Create Course" />
 </form>

portal/templates/portal/courses/sessions/assignments/create-assignments.html

@@ -9,13 +9,13 @@ <h2>Create an Assignment</h2>
     <input name="name" required/>
   </label>
   <label for="date">Due Date
-    <input name="date" />
+    <input name="date" type="date" required/>
   </label>
   <label for="description">Description
-    <textarea name="description"></textarea>
+    <textarea name="description" required></textarea>
   </label>
   <label for="points">Points
-    <input name="points"/>
+    <input name="points" type="number"required/>
   </label>
   <input type="submit" value="Create Assignment" />
 </form>

portal/templates/portal/courses/sessions/assignments/grade-assignments.html

@@ -14,7 +14,7 @@ <h2>Grade Assignment</h2>
   <li>
     <p>Student: {{ submission['users_id'] }} Answer: {{ submission['answer'] }}</p>
     <label for="points">Points
-      <input name="points" required />
+      <input name="points" type="number" required/>
     </label>
     <p>/{{ assignment['points'] }}</p>
   </li>

portal/templates/portal/courses/update-course.html

@@ -6,7 +6,7 @@
 <h2>Update a Course</h2>
 <form method="post">
   <label for="course_number">Course Number
-    <input name="course_number" required/>
+    <input name="course_number" type="number" required/>
   </label>
   <label for="name">Name
     <input name="name" required/>
@@ -15,7 +15,7 @@ <h2>Update a Course</h2>
     <textarea name="description"></textarea>
   </label>
   <label for="credits">Credits
-    <input name="credits" required/>
+    <input name="credits" type="number" required/>
   </label>
   <input type="submit" value="Update Course" />
 </form>

portal/templates/portal/gradebook/view-gradebook.html

@@ -0,0 +1,34 @@
+{% extends "layouts/base.html" %}
+
+{% block title %}TSCT Portal{% endblock %}
+
+{% block content %}
+{% for course in courses %}
+<h2>Course</h2>
+<ul>
+  <li>
+    <p>{{course['major'] }} {{ course['course_number'] }}-{{ course['name'] }}</p>
+  </li>
+</ul>
+{% for session in sessions %}
+{% if session['courses_id'] == course['id'] %}
+<h3>Session</h3>
+<ul>
+  <li>
+    <p>Name: {{ session['name'] }}, Times: {{ session['times'] }}</p>
+  </li>
+</ul>
+<h4>Student Grades</h4>
+{% for grade in grades %}
+{% if grade['s_id'] == session['id'] %}
+<ul>
+  <li>
+    <p>{{ grade['u_id'] }} {{ grade['grade'] }}</p>
+  </li>
+</ul>
+{% endif %}
+{% endfor %}
+{% endif %}
+{% endfor %}
+{% endfor %}
+{% endblock %}

tests/test_gradebook.py

@@ -0,0 +1,18 @@
+from portal import create_app
+
+def test_gradebook(client):
+    response = client.post(
+        '/auth/login', data={'email': '[email protected]', 'password':'qwerty'}
+    )
+    response = client.get('/gradebook/')
+    assert b'CSET 101-Web Design' in response.data
+    assert b'43784 F' in response.data
+
+def test_gradebook_student(client):
+    response = client.post(
+        '/auth/login', data={'email': '[email protected]', 'password':'asdfgh'}
+    )
+    response = client.get('/gradebook/')
+    assert b'CSET 101-Web Design' in response.data
+    assert b'43784 F' in response.data
+    assert b'GENEDS 301-Public Speaking' not in response.data