Assignments

portal/__init__.py

@@ -50,6 +50,9 @@ def create_app(test_config=None):
     from . import auth
     app.register_blueprint(auth.bp)
 
+    from . import sessions
+    app.register_blueprint(sessions.bp)
+
     from . import courses
     app.register_blueprint(courses.bp)
 

portal/courses.py

@@ -1,17 +1,17 @@
 from flask import (
-    Blueprint, g, render_template, redirect, url_for, session, request
+    Blueprint, g, render_template, redirect, url_for, session, request, flash
 )
 
 from portal.db import get_db
 
 bp = Blueprint('courses', __name__)
 
-#------- Course Page -----------------------------------------------------------------
+# ------- Course Page -----------------------------------------------------------------
 @bp.route('/courses')
 def courses():
     """View for the courses"""
-    if session['user'][4] == 'teacher': # only if they are a teacher
-    # get the id of the teacher
+    if session['user'][4] == 'teacher':  # only if they are a teacher
+        # get the id of the teacher
         teacher = session['user'][0]
     # display the courses they own with a query
         cur = get_db().cursor()
@@ -20,23 +20,27 @@ def courses():
         teacher_courses = cur.fetchall()
 
         return render_template('portal/courses.html', teacher_courses=teacher_courses)
-    else: # if not a teacher, return to home page
+    else:  # if not a teacher, return to home page
         return render_template('portal/home.html')
 
 
-#------- Create Courses -----------------------------------------------------------------
+# ------- Create Courses -----------------------------------------------------------------
 @bp.route('/createcourse', methods=("GET", "POST"))
 def courses_create():
     """View for creating a course"""
-    if session['user'][4] == 'teacher': # only if they are a teacher
+    if session['user'][4] == 'teacher':  # only if they are a teacher
         if request.method == "POST":
             teacher = session['user'][0]
             cour_name = request.form['cour_name']
             cour_num = request.form['cour_num']
             cour_maj = request.form['cour_maj']
             cour_cred = request.form['cour_cred']
             cour_desc = request.form['cour_desc']
-
+            # checks major name length
+            if len(cour_maj) > 4:
+                error = 'course major name can only be 4 letters'
+                flash(error)
+                return render_template('portal/createcourse.html')
             # make a query that inserts into courses table with this info and teacher id
             cur = get_db().cursor()
 
@@ -48,61 +52,84 @@ def courses_create():
             return redirect(url_for('courses.courses'))
 
         return render_template('portal/createcourse.html')
-    else: #if they aren't a teacher return them to home page
+    else:  # if they aren't a teacher return them to home page
         return render_template('portal/home.html')
 
+
 @bp.route('/<int:cour_id>/viewcourse')
 def courses_view(cour_id):
     """Shows details of a course to teacher"""
-    if session['user'][4] == 'teacher': # if they are a teacher
+    if session['user'][4] == 'teacher':  # if they are a teacher
         teacher = session['user'][0]
         cur = get_db().cursor()
 
-        cur.execute("SELECT * FROM courses WHERE teacher_id = %s AND id = %s;", (teacher, cour_id))
+        cur.execute(
+            "SELECT * FROM courses WHERE teacher_id = %s AND id = %s;", (teacher, cour_id))
 
         course = cur.fetchone()
         return render_template('portal/viewcourse.html', course=course)
-    else: # if not a teacher, send to home
+    else:  # if not a teacher, send to home
         return render_template('portal/home.html')
 
+
 @bp.route('/deletecourse', methods=("POST",))
 def courses_delete():
     """View for deleting courses"""
-    if session['user'][4] == 'teacher': # if the are a teacher
+    if session['user'][4] == 'teacher':  # if the are a teacher
         if request.method == 'POST':
             course_to_delete = request.form['course_to_delete']
             teacher = session['user'][0]
             cur = get_db().cursor()
-
-            cur.execute("DELETE FROM courses WHERE teacher_id = %s AND id = %s;", (teacher, course_to_delete))
+            cur.execute("DELETE FROM student_sessions WHERE course_id = %s;",
+                        (course_to_delete,))
+            get_db().commit()
+            cur.execute("DELETE FROM sessions WHERE course_id = %s;",
+                        (course_to_delete,))
+            get_db().commit()
+            cur.execute("DELETE FROM courses WHERE teacher_id = %s AND id = %s;",
+                        (teacher, course_to_delete))
             get_db().commit()
             cur.close()
             return redirect(url_for('courses.courses'))
+    else:  # if not a teacher, send to home
+        return render_template('portal/home.html')
 
 
-#------- Edit Courses -----------------------------------------------------------------
+# ------- Edit Courses -----------------------------------------------------------------
 @bp.route('/<int:cour_id>/editcourse', methods=("GET", "POST"))
 def courses_edit(cour_id):
     """Edits the course name/info"""
-    if session['user'][4] == 'teacher': # if they are a teacher
-        cur = get_db().cursor()
+    cur = get_db().cursor()
+    teacher = session['user'][0]
+    cur.execute("SELECT * FROM courses WHERE teacher_id = %s AND id = %s;",
+                (teacher, cour_id))
+    course = cur.fetchone()
+
+    if session['user'][4] == 'teacher':
+
         if request.method == "POST":
+            error = None
             cour_name = request.form['cour_name']
             cour_num = request.form['cour_num']
             cour_maj = request.form['cour_maj']
             cour_cred = request.form['cour_cred']
             cour_desc = request.form['cour_desc']
 
-                # Update the course
+            if len(cour_maj) > 4:
+                error = 'course major name can only be 4 letters'
+                flash(error)
+                return render_template("portal/editcourse.html")
+
+            # Update the course
             cur.execute(
-                    """UPDATE courses SET (major, name, num, credits, description) = (%s, %s, %s, %s, %s)
-                    WHERE id = %s;""", (cour_maj, cour_name, cour_num, cour_cred, cour_desc , cour_id)
-                )
+                """UPDATE courses SET (major, name, num, credits, description) = (%s, %s, %s, %s, %s)
+                    WHERE id = %s AND teacher_id = %s ;""", (cour_maj, cour_name, cour_num, cour_cred, cour_desc, cour_id, teacher)
+            )
             get_db().commit()
             cur.close()
 
             return redirect(url_for('courses.courses'))
 
-        return render_template("portal/editcourse.html")
-    else: # if not a teacher, send them to home page
+        return render_template("portal/editcourse.html", course=course)
+    else:  # if not a teacher, send them to home page
         return render_template('portal/home.html')

portal/schema.sql

@@ -12,48 +12,57 @@ DROP TABLE IF EXISTS courses;
 DROP TABLE IF EXISTS users;
 
 
+
+
 -- Users
 CREATE TABLE users (
     id bigint PRIMARY KEY,
     email text UNIQUE NOT NULL,
     password text NOT NULL,
-    name text,
+    name varchar(100),
     role varchar(7) NOT NULL CHECK (role IN ('teacher', 'student')),
-    major text
+    major varchar(4)
 );
 
 -- Courses
 CREATE TABLE courses (
   id bigserial PRIMARY KEY,
-  major text NOT NULL,
-  name text UNIQUE NOT NULL,
+  major varchar(4) NOT NULL,
+  name varchar(100) UNIQUE NOT NULL,
   num integer NOT NULL,
-  description text,
+  description varchar(1000),
   credits integer NOT NULL,
   teacher_id bigint REFERENCES users (id) -- One teacher owns many courses
+
 );
 
--- Sessions
+
+
+-- Session
 CREATE TABLE sessions (
-  id bigserial PRIMARY KEY,
-  course_id bigint REFERENCES courses (id), -- One course owns many sessions
-  teacher_id bigint REFERENCES users (id), -- One teacher owns many sessions
+  course_id bigint REFERENCES courses (id) NOT NULL, -- One course owns many sessions
+  teacher_id bigint REFERENCES users (id) NOT NULL, -- One teacher owns many sessions
   section varchar(1) NOT NULL,
-  meeting_time timestamptz NOT NULL,
-  location varchar(200)
+  meeting_time time NOT NULL,
+  location varchar(200) NOT NULL,
+  PRIMARY KEY (course_id, section)
 );
 
 -- Students sessions
 CREATE TABLE student_sessions (
   id bigserial PRIMARY KEY,
-  session_id bigint REFERENCES sessions (id), -- One session owns many student sessions
+  course_id bigint NOT NULL,
+  section varchar(1) NOT NULL,
+  FOREIGN KEY  (course_id, section) REFERENCES sessions (course_id, section), -- One session owns many student sessions
   student_id bigint REFERENCES users (id) -- One User has many student sessions
 );
 
 -- Assignments
 CREATE TABLE assignments (
   id bigserial PRIMARY KEY,
-  session_id bigint REFERENCES sessions (id), -- One session owns many assignments
+  course_id bigint NOT NULL,
+  section varchar(1) NOT NULL,
+  FOREIGN KEY  (course_id, section) REFERENCES sessions (course_id, section), -- One session owns many assignments
   name varchar(50) NOT NULL,
   type varchar(50) NOT NULL,
   points integer NOT NULL,

portal/sessions.py

@@ -0,0 +1,150 @@
+import os
+from portal.db import get_db
+
+from flask import (
+    Flask, Blueprint, flash, g, redirect, render_template, request, url_for, session
+)
+from werkzeug.security import check_password_hash, generate_password_hash
+
+bp = Blueprint('sessions', __name__)
+
+
+@bp.route('/sessions', methods=('GET', 'POST'))
+def sessions():
+    cur = get_db().cursor()
+
+    # grabs course id from the one clicked on
+    course_id = request.args.get('course_id')
+
+    # shows student sessions
+    if session['user'][4] == 'student':
+        cur.execute('SELECT * FROM sessions AS s JOIN student_sessions AS ss ON (s.course_id = ss.course_id and s.section = ss.section) WHERE ss.student_id = %s;',
+                    (session['user'][0],))
+
+    # shows teachers session according to which course they are looking at
+    if session['user'][4] == 'teacher':
+        if(course_id == None):
+            return redirect(url_for('courses.courses'))
+        cur.execute('SELECT * FROM sessions WHERE teacher_id = %s AND course_id = %s;',
+                    (session['user'][0], course_id))
+
+    sessions = cur.fetchall()
+    classes = []
+    sections = []
+    if session['user'][4] == 'student':
+        course_id = []
+    cur.close()
+
+    for sess in sessions:
+
+        cur = get_db().cursor()
+
+        # grabbing name of the course by session's fk
+        cur.execute('SELECT name FROM courses WHERE id = %s;',
+                    (sess[0],))
+        classname = cur.fetchall()
+        if session['user'][4] == 'student':
+            course_id.append(sess[0])
+        # pulling string out of nested list
+        classes.append(classname[0][0])
+        sections.append(sess[2])
+    if session['user'][4] == 'teacher':
+        return render_template('portal/sessions.html', sessions=classes, sections=sections, course_id=course_id)
+
+    if session['user'][4] == 'student':
+        return render_template('portal/sessions.html', sessions=classes, sections=sections, course_id=course_id)
+
+
+
+@bp.route('/createsession', methods=("GET", "POST"))
+def session_create():
+    """View for creating a session"""
+    cur = get_db().cursor()
+    course_id = request.args.get('course_id')
+    # grabbing name of the course by session's fk
+
+    # ---join for grabbing enrolled_students---
+    # cur.execute('SELECT * FROM student_sessions JOIN users ON student_id =users.id  WHERE session_id = %s;',
+    #             (1,))
+    # enrolled_students = cur.fetchall()
+    cur.execute('SELECT * FROM users WHERE role = %s;', ('student',))
+    all_students = cur.fetchall()
+
+    if request.method == "POST":
+
+        section = request.form['section']
+        meeting_time = request.form['meeting']
+        location = request.form['location']
+        teacher_id = session['user'][0]
+        students = request.form.getlist('students')
+
+        cur = get_db().cursor()
+        cur.execute("""INSERT INTO sessions (course_id,section, meeting_time, location, teacher_id)
+                        VALUES (%s, %s, %s, %s, %s);""", (course_id, section, meeting_time, location, teacher_id))
+        get_db().commit()
+
+        for student in students:
+            # find student in user db then grab it by name
+            cur = get_db().cursor()
+            cur.execute('SELECT * FROM users WHERE name = %s;', (student,))
+            student_info = cur.fetchone()
+            student_id = student_info[0]
+            # create a new session for each student
+            cur.execute("""INSERT INTO student_sessions (course_id, section, student_id)
+                                    VALUES (%s, %s, %s);""", (course_id, section, student_id))
+            get_db().commit()
+            cur.close()
+
+        return redirect(url_for('courses.courses'))
+
+    return render_template('portal/createsession.html', all_students=all_students)
+
+
+@bp.route('/<int:session_id>/editsession', methods=("GET", "POST"))
+def session_edit(session_id):
+    """Edits the course name/info"""
+    cur = get_db().cursor()
+    teacher = session['user'][0]
+    cur.execute("SELECT * FROM sessions WHERE teacher_id = %s AND id = %s;",
+                (teacher, session_id))
+    selected_session = cur.fetchone()
+
+    if session['user'][4] == 'teacher':
+
+        if request.method == "POST":
+            section = request.form['section']
+            meeting_time = request.form['meeting']
+            location = request.form['location']
+            teacher_id = session['user'][0]
+            students = request.form.getlist('students')
+
+            cur.execute("DELETE FROM student_sessions WHERE session_id = %s;",
+                        (session_id,))
+            # Update the course
+
+            cur.execute(
+                """UPDATE courses SET (major, name, num, credits, description) = (%s, %s, %s, %s, %s)
+                    WHERE id = %s AND teacher_id = %s ;""", (cour_maj, cour_name, cour_num, cour_cred, cour_desc, cour_id, teacher)
+            )
+            get_db().commit()
+            cur.close()
+
+            return redirect(url_for('courses.courses'))
+
+        return render_template("portal/editcourse.html", course=course)
+    else:  # if not a teacher, send them to home page
+        return render_template('portal/home.html')
+
+@bp.route('/viewsession', methods=('GET', 'POST'))
+def session_view():
+    """View for seeing more session details."""
+    cur = get_db().cursor()
+    course_id = request.args.get("course_id")
+    section = request.args.get("section")
+    classname = request.args.get("class")
+
+    cur.execute("SELECT * FROM sessions WHERE course_id = %s AND section = %s;", (course_id, section))
+    session_info = cur.fetchone()
+    print(session_info)
+
+    return render_template('portal/viewsession.html', course_id=course_id, section=section,  classname=classname, session_info=session_info)