models and necessar changes

App/models/__init__.py

@@ -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 *

App/models/coursePlan.py

@@ -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()
         }

App/models/plan_course_bridge.py

@@ -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'))
+) 

App/models/programmeCourse.py

@@ -0,0 +1,37 @@
+from App.database import db
+from .course import Course
+class ProgrammeCourse(db.Model):
+    __tablename__ ='programme_course'
+    id = db.Column(db.Integer, primary_key=True)
+    base_course_id = db.Column(db.Integer,db.ForeignKey("course.course_id"))
+    # program_id = db.Column(db.ForeignKey('program.id'))
+    # code = db.Column(db.ForeignKey('course.courseCode'))
+    courseType = db.Column(db.String(120), nullable=False)
+    semesterAvailable= db.Column(db.String(120), nullable=False)
+    # associated_program = db.relationship('Program', back_populates='courses', overlaps="program")
+    # associated_course = db.relationship('Course', back_populates='programs', overlaps="courses")
+
+    def __init__(self, base_id, course_type,semester_available):
+        self.base_course_id = base_id
+        self.set_course_type(course_type)
+        self.set_semester_available(semester_available)
+
+    def set_course_type(self,typing):
+        self.courseType = typing
+
+    def set_semester_available(self,sem):
+        self.semesterAvailable = sem
+
+    def course_available(self,current_sem):
+        return current_sem == self.semesterAvailable
+
+    def get_course_info(self,base_id):
+        return Course.query.get(base_id).to_json()
+
+    def to_json(self):
+        return{
+            'programme_course_id' : self.id,
+            'course_info' : self.get_course_info(),
+            'course_type': self.courseType,
+            'semester_available' : self.semesterAvailable
+        }

App/models/programme_course_bridge.py

@@ -0,0 +1,5 @@
+from App.database import db
+programme_course_bridge = db.Table('programme_course_bridge',
+  db.Column ('programme_id',db.Integer, db.ForeignKey('programme.programmId')),
+  db.Column('course_id',db.ForeignKey('course.course_id'))
+)

wsgi.py

@@ -173,7 +173,7 @@ def create_staff_command(id, password, name):
 @click.argument("foun", type=int)
 def create_program_command(name,core,elective,foun):
   newprogram=create_program(name,core,elective,foun)
-  print(f'{newprogram.get_json()}')
+  print(f'{newprogram.to_json()}')
 
 @staff_cli.command("addprogramcourse",help='testing add program feature')
 @click.argument("name", type=str)
@@ -372,7 +372,7 @@ def create_course_command(code):
 @click.argument('code', type=str)
 def get_course(code):  
     course = get_course_by_courseCode(code)
-    course_json = course.get_json()
+    course_json = course.to_json()
     print(f'{course_json}') if course else print(f'error')
 
 @course.command('getprereqs', help='Get all prerequistes for a course')