Merge branch 'dev' into Dashboard-Bugs

server/blueprints/subjects.py

@@ -5,8 +5,7 @@
 
 import flask_login
 import flask_wtf.csrf
-
-from flask import Blueprint, request, redirect, url_for, render_template, make_response
+from flask import Blueprint, request, redirect, url_for, render_template, make_response, flash
 from server.extensions import get_and_clear_cookies, supabase_sec, supabase_anon, set_cookies
 from server.models import User, Subject, Assignment, Storage
 
@@ -57,6 +56,8 @@ def assignment_page(sub_id, ass_id):
     sub = Subject.get_subject(sub_id)
 
     current_ass = Assignment.get_assignment(sub_id, ass_id)
+    if not current_ass:
+        return redirect(url_for('common.dashboard'))
     cookies = get_and_clear_cookies()
 
     template_data = {
@@ -82,18 +83,25 @@ def create_assignment(sub_id):
 
     if not user.user_type == "teacher":
         print('User is not a teacher')
-        return redirect("/dashboard")
+        return redirect(url_for('common.dashboard'))
 
     flask_wtf.csrf.validate_csrf(request.form.get('csrf_token'))
 
-    data = {
-        'subject_id': sub_id,
-        'name': request.form.get('name'),
-        'due_datetime': strftime('%Y-%m-%d %H:%M:%S', strptime(request.form.get('duedate'), '%d/%m/%Y')),
-        'description': request.form.get('desc'),
-    }
-    print("Attempting to Create Assignment", data)
-    Assignment.create_assignment(data)
+    # check that these elements of the form are not null
+    if not request.form.get('id') and not request.form.get('name'):
+        return redirect(f"/subjects/{sub_id}")
+    try: 
+        data = {
+            'subject_id': sub_id,
+            'name': request.form.get('name'),
+            'due_datetime': strftime('%Y-%m-%d %H:%M:%S', strptime(request.form.get('duedate'), '%d/%m/%Y')),
+            'description': request.form.get('desc'),
+        }
+        print("Attempting to Create Assignment", data)
+        Assignment.create_assignment(data)
+    except:
+        print("Did not create data correctly")
+        pass
 
     return redirect(f"/subjects/{sub_id}")
 
@@ -108,6 +116,10 @@ def create_subject():
         print('User is not a teacher')
         return redirect(url_for('common.dashboard'))
 
+    # check that these elements of the form are not null
+    if not request.form.get('id') and not request.form.get('name'):
+        return redirect(url_for('common.dashboard'))
+
     sub = Subject(request.form.get('id'), request.form.get(
         'desc'), user.email, request.form.get('name'))
 
@@ -123,15 +135,20 @@ def add_student_subject(sub_id):
 
     if not user.user_type == "teacher":
         print('User is not a teacher')
-        return redirect("/dashboard")
+        return redirect(url_for('common.dashboard'))
 
     flask_wtf.csrf.validate_csrf(request.form.get('csrf_token'))
     subject = Subject.get_subject(sub_id)
-    stud = User.get_user_with_email(request.form.get('email'))
-
-    if not subject.valid_student(stud.id):
+    student_email = request.form.get('email')
+    if not student_email or not subject:
+        print(f'this is the url that we are trying: {request.url}')
+        flash('Student did not exist')
+        return redirect(f'/subjects/{sub_id}')
+    stud = User.get_user_with_email(student_email)
+
+    if not stud or not subject.valid_student(stud.id):
         print('Student is not valid')
     else:
         subject.add_student(stud)
 
-    return redirect(f"/subjects/{sub_id}")
+    return redirect(f'/subjects/{sub_id}')

server/models/__init__.py

@@ -424,15 +424,18 @@ def __repr__(self):
     # Returns a specific assignment using a given subject_id and assignment_id
     @staticmethod
     def get_assignment(subject_id, assignment_id):
-        res = supabase_sec.table('Assignment').select(
-            '*').eq('id', assignment_id).eq('subject_id', subject_id).execute().data
-        if not res:
+        try:
             res = supabase_sec.table('Assignment').select(
                 '*').eq('id', assignment_id).eq('subject_id', subject_id).execute().data
-        if res:
-            res = res[0]
-            return Assignment(res['id'], res['subject_id'], res['name'], res['description'], res['submission_locked'],
-                              res['due_datetime'])
+            if not res:
+                res = supabase_sec.table('Assignment').select(
+                    '*').eq('id', assignment_id).eq('subject_id', subject_id).execute().data
+            if res:
+                res = res[0]
+                return Assignment(res['id'], res['subject_id'], res['name'], res['description'], res['submission_locked'],
+                                  res['due_datetime'])
+        except:
+            pass
         return None
 
     @staticmethod