Integrate courses with frontend (#126)

* Course and sections appear in create-ticket page

* Remove useless text in base.html

* Trying to check if section is in course

* Sections and courses checked on backend, and view_tickets integration

* Ignoring C901 linting warning

* Fix course and section name not showing up in view tickets

Author: Mr-Oregano

portal/.flake8

@@ -2,5 +2,7 @@
 exclude = __pycache__,templates,static
 max-complexity = 10
 max-line-length = 160
-ignore = H903, E266, D203, H306, E302, F401, E201, E202, E711
+
+# TODO: Ignoring C901 temporarily until Flask-WTF is integrated
+ignore = H903, E266, D203, H306, E302, F401, E201, E202, E711, C901
 indent-size=4

portal/app/__init__.py

@@ -7,7 +7,9 @@
 from sqlalchemy.exc import IntegrityError
 
 from .model import Mode
+from .model import Course
 from .model import Status
+from .model import Section
 from .model import Permission
 from .model import ProblemType
 
@@ -125,10 +127,12 @@ def _read_in_config_data():
 def _setup_jinja_globals(app: Flask):
     app.jinja_env.globals['current_user'] = current_user
     app.jinja_env.globals['Mode'] = Mode
+    app.jinja_env.globals['Course'] = Course
     app.jinja_env.globals['Status'] = Status
+    app.jinja_env.globals['Section'] = Section
     app.jinja_env.globals['Permission'] = Permission
-    app.jinja_env.globals['ConfigData'] = _read_in_config_data()
     app.jinja_env.globals['ProblemType'] = ProblemType
+    app.jinja_env.globals['ConfigData'] = _read_in_config_data()
 
     from .blueprints.auth import build_auth_url
     app.jinja_env.globals['build_auth_url'] = build_auth_url

portal/app/blueprints/admin.py

@@ -601,11 +601,11 @@ def add_professor():
     elif str_empty(lastName):
         flash('Could not add professor, last name must not be empty!', category='error')
     else:
-        # check if professor already exists in DB, store all lower so checks against caps doesn't happen
-        tmpProfessor = Professor.query.filter_by(first_name=firstName.lower(), last_name=lastName.lower()).first()
+        # check if professor already exists in DB, store all capitalized so checks against caps doesn't happen
+        tmpProfessor = Professor.query.filter_by(first_name=firstName.capitalize(), last_name=lastName.capitalize()).first()
         if tmpProfessor is None:
-            # create professor and add it to DB, store as lower
-            newProfessor = Professor(firstName.lower(), lastName.lower())
+            # create professor and add it to DB, store as capitalized
+            newProfessor = Professor(firstName.capitalize(), lastName.capitalize())
             db.session.add(newProfessor)
             db.session.commit()
             flash('Professor added successfully!', category='success')
@@ -645,8 +645,8 @@ def remove_professor():
 @permission_required(Permission.Admin)
 def edit_professor():
     professor_id = strip_or_none(request.form.get("professorID"))
-    newFName = strip_or_none(request.form.get("fnameUpdate")).lower()
-    newLName = strip_or_none(request.form.get("lnameUpdate")).lower()
+    newFName = strip_or_none(request.form.get("fnameUpdate")).capitalize()
+    newLName = strip_or_none(request.form.get("lnameUpdate")).capitalize()
 
     try:
         professor: Professor = Professor.query.get(professor_id)
@@ -664,12 +664,12 @@ def edit_professor():
             flash('Could not update professor, last name cannot be empty!', category='error')
 
         else:
-            tmpProfessor = Professor.query.filter_by(first_name=newFName.lower(), last_name=newLName.lower()).first()
+            tmpProfessor = Professor.query.filter_by(first_name=newFName.capitalize(), last_name=newLName.capitalize()).first()
             if tmpProfessor is None:
                 if newFName != professor.first_name:
-                    professor.first_name = newFName.lower()
+                    professor.first_name = newFName.capitalize()
                 if newLName != professor.last_name:
-                    professor.last_name = newLName.lower()
+                    professor.last_name = newLName.capitalize()
                 db.session.commit()
                 flash("Professor updated successfully!", category='success')
             else:
@@ -747,7 +747,7 @@ def add_section():
             db.session.commit()
             flash('Section added successfully!', category='success')
         else:
-            flash("Section " + sectionNum + " for the course '" + course.course_name + "' already exists in DB!", category='error')
+            flash(f'The section already exists in this course!', category='error')
 
     return redirect(url_for('admin.view_sections'))
 

portal/app/blueprints/views.py

@@ -18,6 +18,7 @@
 from app.model import Message
 from app.model import ProblemType
 from app.model import Course
+from app.model import Section
 from app.model import User
 
 from datetime import datetime
@@ -139,11 +140,23 @@ def edit_ticket():
     ticketID = request.form.get("ticketIDModal")
     ticket = Ticket.query.get(ticketID)
 
-    if ticket is not None:
-        _attempt_edit_ticket(ticket)
+    try:
+        if ticket is not None:
+            _attempt_edit_ticket(ticket)
+
+        else:
+            flash('Could not edit ticket. Ticket not found in database.', category='error')
+
+    except IntegrityError:
+        db.session.rollback()
+        flash('Could not updated ticket, invalid data', category='error')
+
+    except Exception as e:
+        flash('Could not updated ticket, unknown reason', category='error')
+        print(f'Failed to updated ticket: {e}', file=sys.stderr)
 
     else:
-        flash('Could not edit ticket. Ticket not found in database.', category='error')
+        flash('Ticket updated successfully!', category='success')
 
     return redirect(url_for('views.view_tickets'))
 
@@ -222,12 +235,15 @@ def _attempt_create_ticket(form: ImmutableMultiDict):
         email = strip_or_none(form.get("email"))
         name = strip_or_none(form.get("fullname"))
 
-    course = strip_or_none(form.get("course"))
-    section = strip_or_none(form.get("section"))
+    course_id = strip_or_none(form.get("course"))
+    section_id = strip_or_none(form.get("section"))
     assignment = strip_or_none(form.get("assignment"))
     question = strip_or_none(form.get("question"))
     problem_id = strip_or_none(form.get("problem"))
+
     problem: ProblemType = ProblemType.query.get(problem_id)
+    course: Course = Course.query.get(course_id)
+    section: Section = Section.query.get(section_id)
 
     if str_empty(email):
         flash('Could not submit ticket, email must not be empty!', category='error')
@@ -244,8 +260,11 @@ def _attempt_create_ticket(form: ImmutableMultiDict):
     elif problem_id is not None and not problem:
         flash('Could not submit ticket, problem type is not valid!', category='error')
 
-    # TODO: Check if course is a valid from a list of options
-    # TODO: Check if section is valid from a list of options
+    elif course_id is not None and not course:
+        flash('Could not submit ticket, course is not valid!', category='error')
+
+    elif (section_id is not None and not section) or (course and section not in course.sections):
+        flash('Could not submit ticket, section is not valid!', category='error')
 
     else:
         mode_val = strip_or_none(form.get("mode"))
@@ -259,34 +278,43 @@ def _attempt_create_ticket(form: ImmutableMultiDict):
             flash('Could not submit ticket, must select a valid mode!', category='error')
 
         else:
-            return Ticket(email, name, course, section, assignment, question, problem_id, mode)
+            return Ticket(email, name, course_id, section_id, assignment, question, problem_id, mode)
 
 def _attempt_edit_ticket(ticket: Ticket):
-    # get info back from popup modal form
-    course = strip_or_none(request.form.get("courseField"))
-    section = strip_or_none(request.form.get("sectionField"))
+    # TODO: Need to produce error messages!!
+
+    course_id = strip_or_none(request.form.get("courseField"))
+    section_id = strip_or_none(request.form.get("sectionField"))
     assignment = strip_or_none(request.form.get("assignmentNameField"))
     question = strip_or_none(request.form.get("specificQuestionField"))
     primaryTutor = strip_or_none(request.form.get("primaryTutorInput"))
     tutorNotes = strip_or_none(request.form.get("tutorNotes"))
     wasSuccessful = strip_or_none(request.form.get("successfulSession"))
     problem_id = strip_or_none(request.form.get("problemTypeField"))
+
     problem: ProblemType = ProblemType.query.get(problem_id)
+    new_course: Course = Course.query.get(course_id)
+    section: Section = Section.query.get(section_id)
+
+    # Get the course of the current section
+    current_course: Course = Course.query.get(ticket.course)
 
     # check for change in values from edit
-    if course:
+    if course_id and new_course:
         # new info for course came back, update it for current ticket
-        ticket.course = course
+        ticket.course = new_course.id
+        ticket.section = new_course.sections[0].id if len(new_course.sections) > 0 else None
+        current_course = new_course
 
-    if section:
+    if section_id and section and section in current_course.sections:
         # new info for section came back, update it for current ticket
-        ticket.section = section
+        ticket.section = section.id
 
-    if assignment != ticket.assignment_name:
+    if assignment and assignment != ticket.assignment_name:
         # new info for assignment came back, update it for current ticket
         ticket.assignment_name = assignment
 
-    if question != ticket.specific_question:
+    if question and question != ticket.specific_question:
         # new info for question came back, update it for current ticket
         ticket.specific_question = question
 

portal/app/model.py

@@ -158,21 +158,17 @@ class Ticket(db.Model):
 
     id = Column(Integer, primary_key=True, doc='Autonumber primary key for the ticket table.')
     student_email = Column(String(120), nullable=False, doc='Email of the student making the ticket.')
-    student_name = Column(String(120), doc='The name of student making the ticket.')
-
-    # TODO: Need to update these columns to be foreign keys the respective tabels
-    course = Column(String(120), doc='The specific course this ticket issue is related to.')
-    section = Column(String(120), doc='Course section ticket issue is relating to.')
-    #
-
-    assignment_name = Column(String(120), doc='Assignment the student needs help with.')
-    specific_question = Column(Text, doc='Student question about the assignment.')
+    student_name = Column(String(120), nullable=False, doc='The name of student making the ticket.')
+    course = Column(String(120), nullable=False, doc='The specific course this ticket issue is related to.')
+    section = Column(String(120), nullable=False, doc='Course section ticket issue is relating to.')
+    assignment_name = Column(String(120), nullable=False, doc='Assignment the student needs help with.')
+    specific_question = Column(Text, nullable=False, doc='Student question about the assignment.')
     problem_type = Column(Integer, db.ForeignKey('ProblemTypes.id'), doc='Type of problem the student is having.')
     time_created = Column(DateTime(True), nullable=False, doc='Time the ticket was created.', default=func.now())
     time_claimed = Column(DateTime(True), doc='Time the ticket was claimed by tutor.')
     time_closed = Column(DateTime(True), doc='Time the tutor marked the ticket as closed.')
-    status = Column(Enum(Status), doc='Status of the ticket. 1=open, 2=claimed, 3=closed.', default=Status.Open)
-    mode = Column(Enum(Mode), doc='Specifies whether the ticket was made for online or in-person help.')
+    status = Column(Enum(Status), nullable=False, doc='Status of the ticket. 1=open, 2=claimed, 3=closed.', default=Status.Open)
+    mode = Column(Enum(Mode), nullable=False, doc='Specifies whether the ticket was made for online or in-person help.')
     tutor_notes = Column(Text, doc='Space for tutors to write notes about student/ticket session.', default="")
     tutor_id = Column(Integer, db.ForeignKey('Users.id'), doc='Foreign key to the tutor who claimed this ticket.')
     successful_session = Column(Boolean, doc='T/F if the tutor was able to help the student with issue on ticket')
@@ -216,7 +212,13 @@ def calc_duration_claimed(self):
         return self.time_closed - self.time_claimed
 
     def get_problem(self):
-        return ProblemType.query.filter_by(id=self.problem_type).one_or_none()
+        return ProblemType.query.get(self.problem_type)
+
+    def get_course(self):
+        return Course.query.get(self.course)
+
+    def get_section(self):
+        return Section.query.get(self.section)
 
     def __repr__(self):
         return f'Ticket: {self.specific_question} ({self.student_name})'

portal/app/static/js/course_selector.js

@@ -0,0 +1,18 @@
+let course_select = document.getElementById('course_select');
+let section_select = document.getElementById('section_select');
+
+function update_sections()
+{
+    let course_id = course_select.value;
+    for (section of section_select.options)
+        section.hidden = section.id !== course_id;
+}
+
+update_sections();
+
+course_select.addEventListener('change', () =>
+{
+    section_select.selectedIndex = 0;
+    section_select.hidden = false;
+    update_sections();
+});

portal/app/templates/admin-professor.html

@@ -105,7 +105,6 @@ <h5 class="modal-title fs-5" id="title-label">Update Professor</h5>
         <tr>
             <th scope="col">First Name</th>
             <th scope="col">Last Name</th>
-            <th scope="col">Sections</th>
             <th scope="col"></th>
         </tr>
     </thead>
@@ -114,7 +113,6 @@ <h5 class="modal-title fs-5" id="title-label">Update Professor</h5>
         <tr scope="row">
             <td>{{ professor.first_name.capitalize() }}</td>
             <td>{{ professor.last_name.capitalize() }}</td>
-            <td>{{ professor.sections }}</td>
             <td>{{ remove_professor_button(professor) }} {{ edit_professor_button(professor) }}</td>
 
             {{ edit_professor_modal(professor) }}

portal/app/templates/admin-sections.html

@@ -251,12 +251,12 @@ <h5 class="modal-title fs-5" id="title-label">Update Section</h5>
         <tr scope="row">
             <td>{{ section.section_number }}</td>
             <td>{{ section.course }}</td>
-            <td>{{ section.professor }}</td>
+            <td>{{ section.professor.first_name }} {{ section.professor.last_name }}</td>
             <td>
                 {% if section.section_mode == SectionMode.TotallyOnline %}
-                N / A
+                Online
                 {% else %}
-                {{ section.days_of_week }}<br>{{ section.start_time }} {{ section.end_time }}
+                {{ section.days_of_week }}<br>{{ section.start_time }}-{{ section.end_time }}
                 {% endif %}
             </td>
             <td>{{ section.semester_id }}</td>

portal/app/templates/admin-semester.html

@@ -137,7 +137,6 @@ <h5 class="modal-title fs-5" id="title-label">Update Semester</h5>
             <th scope="col">Season</th>
             <th scope="col">Start Date</th>
             <th scope="col">End Date</th>
-            <th scope="col">Sections</th>
             <th scope="col"></th>
         </tr>
     </thead>
@@ -148,7 +147,6 @@ <h5 class="modal-title fs-5" id="title-label">Update Semester</h5>
             <td>{{ semester.season }}</td>
             <td>{{ semester.start_date }}</td>
             <td>{{ semester.end_date }}</td>
-            <td>{{ semester.sections }}</td>
             <td>{{ remove_semester_button(semester) }} {{ edit_semester_button(semester) }}</td>
 
             {{ edit_semester_modal(semester) }}

portal/app/templates/base.html

@@ -98,9 +98,12 @@
     </div>
 
     <!-- Footer -->
-    <footer class="mt-auto">Blah...</footer>
+    <footer class="mt-auto"></footer>
 
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ENjdO4Dr2bkBIFxQpeoTz1HIcje39Wm4jDKdf19U8gI4ddQ3GYNS7NTKfAdVQSZe" crossorigin="anonymous"></script>
+
+    {% block scripts %}
+    {% endblock %}
 </body>
 
 </html>