Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 0 additions & 80 deletions App/controllers/courses.py

This file was deleted.

31 changes: 22 additions & 9 deletions App/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
from .user import *
from .courses import *
from .program import *
from .course_self_bridge import *
from .course import *
from .coursePlan import *
from .coursePlanCourse import *
from .history import *
from .historyCourse import *
from .plan_course_bridge import *
from .programme_course_bridge import *
from .programme import *
from .programmeCourse import *
from .staff import *
from .student import *
from .coursesOfferedPerSem import *
from .programCourses import *
from .prerequisites import *
from .studentCourseHistory import *
from .coursePlanCourses import *
from .coursePlan import *
from .user import *
# from .user import *
# from .courses import *
# from .program import *
# from .staff import *
# from .student import *
# from .coursesOfferedPerSem import *
# from .programCourses import *
# from .prerequisites import *
# from .studentCourseHistory import *
# from .coursePlanCourses import *
# from .coursePlan import *
32 changes: 20 additions & 12 deletions App/models/coursePlan.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
from App.database import db

from .plan_course_bridge import plan_course_bridge
class CoursePlan(db.Model):
planId=db.Column(db.Integer, primary_key=True)
studentId=db.Column(db.Integer, db.ForeignKey('student.id'), nullable=False)

student = db.relationship('Student', backref=db.backref('course_plans', uselist=True))

# courses = db.relationship('CoursePlanCourses', backref = 'coursePlan', lazy=True)
__tablename__ ='CoursePlan'
id = db.Column(db.Integer, primary_key=True)
# studentId=db.Column(db.Integer, db.ForeignKey('student.id'), nullable=False)
student = db.Column(db.Integer, db.ForeignKey("student.id"),nullable=False)
courses = db.relationship('course_plan_course',secondary=plan_course_bridge,backref='in_course_plans')
semester = db.Column(db.Integer, nullable=False)
year = db.Column(db.Integer, nullable=False)

def __init__(self, studentid, ):
self.studentId = studentid
def __init__(self, student, year,sem):
self.student = student
self.year = year
self.sem = sem

def get_plan_courses(self):
return [course.to_json() for course in self.courses]

def get_json(self):
def to_json(self):
return{
'planId': self.planId,
'studentId': self.studentId,
'id': self.id,
'student_id': self.student,
'semester' : self.semester,
'year':self.year,
'plan_courses' : get_plan_courses()
}
23 changes: 23 additions & 0 deletions App/models/coursePlanCourse.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
from App.database import db
from .programmeCourse import ProgrammeCourse

class CoursePlanCourse(db.Model):
__tablename__ = 'course_plan_course'
id = db.Column(db.Integer, primary_key = True)
programme_course_id = db.Column(db.Integer,db.ForeignKey("programme_course.id"))
difficulty = db.Column(db.Integer, nullable=False)#1 to 5, low to high


def __init__(self, programme_source,difficulty):
self.programme_course_id = programme_source
self.difficulty = difficulty
def get_course_info(self):
return ProgrammeCourse.query.get(programme_course_id).to_json()

def to_json(self):
return{
'Course Plan Course ID': self.id,
'difficulty': self.difficulty,
'course_info' : self.get_course_info()
}

22 changes: 0 additions & 22 deletions App/models/coursePlanCourses.py

This file was deleted.

31 changes: 0 additions & 31 deletions App/models/courses.py

This file was deleted.

16 changes: 0 additions & 16 deletions App/models/coursesOfferedPerSem.py

This file was deleted.

27 changes: 27 additions & 0 deletions App/models/history.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
from App.database import db

class History(db.Model):
__tablename__ = 'history'
id = db.Column(db.Integer, primary_key=True)
student_id = db.Column(db.Integer, db.ForeignKey("student.id"))
year = db.Column(db.Integer, nullable=False)
semester = db.Column(db.Integer, nullable=False)
# semesterCourses = db.relationship('Course',secondary=HistoryCourseBridge,backref='previousStudents')
semesterCourses = db.relationship('HistoryCourse', backref=db.backref('history'), lazy = 'joined')

def __init__(self,student,year,semester):
self.student_id = student
self.year = year
self.semester = semester

def add_course_to_history(self,course):
self.semesterCourses.append(course)

def to_json(self):
courselist = [course.to_json() for course in self.semesterCourses]
return{
'student' : self.student_id,
'year' : self.year,
'semester' :self.semester,
'courses done': courselist
}
20 changes: 20 additions & 0 deletions App/models/historyCourse.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
from App.database import db
from .course import Course
class HistoryCourse(db.Model):
id = db.Column(db.Integer, primary_key=True)
base_course_id = db.Column(db.Integer,db.ForeignKey("course.course_id"))
passed = db.Column(db.Boolean, nullable=False)

def __init__(self,base,passed):
self.base_course_id = base
self.passed = passed
def get_course_info(self,base_id):
return Course.query.get(base_id).to_json()
def course_passed(self):
return self.passed
def to_json(self):
return{
'history_course_id' : self.id,
'course_info' : self.get_course_info(),
'passed' : self.course_passed()
}
5 changes: 5 additions & 0 deletions App/models/plan_course_bridge.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from App.database import db
plan_course_bridge = db.Table('plan_course_bridge',
db.Column ('plan_id',db.Integer, db.ForeignKey('course_plan.id')),
db.Column('course_id',db.ForeignKey('course_plan_course.id'))
)
21 changes: 0 additions & 21 deletions App/models/prerequisites.py

This file was deleted.

27 changes: 0 additions & 27 deletions App/models/program.py

This file was deleted.

23 changes: 0 additions & 23 deletions App/models/programCourses.py

This file was deleted.

Loading