From 4a7be6c221f2357d194bb3eb59648d609b61c1e6 Mon Sep 17 00:00:00 2001 From: georgievh Date: Tue, 30 Jun 2026 18:45:26 +0000 Subject: [PATCH 001/163] edited supervisorDepartment --- app/models/supervisorDepartment.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/supervisorDepartment.py b/app/models/supervisorDepartment.py index 3585e1eb2..059712cc0 100644 --- a/app/models/supervisorDepartment.py +++ b/app/models/supervisorDepartment.py @@ -5,3 +5,4 @@ class SupervisorDepartment(baseModel): supervisor = ForeignKeyField(Supervisor, null=True) department = ForeignKeyField(Department) + banStatus = From 12d8d41764fd03ddc59c8421d63a770ac17f235f Mon Sep 17 00:00:00 2001 From: georgievh Date: Tue, 30 Jun 2026 18:45:55 +0000 Subject: [PATCH 002/163] edited supervisorDepartment --- app/models/supervisorDepartment.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/supervisorDepartment.py b/app/models/supervisorDepartment.py index 059712cc0..72a80ea6d 100644 --- a/app/models/supervisorDepartment.py +++ b/app/models/supervisorDepartment.py @@ -5,4 +5,12 @@ class SupervisorDepartment(baseModel): supervisor = ForeignKeyField(Supervisor, null=True) department = ForeignKeyField(Department) - banStatus = + banStatus = BooleanField(default=False) + isActive = BooleanField(default=False) + isCoordinator = BooleanField(default=False) + + @property + def isBanned(self): + return self.banStatus + + From a8684550b6260b90bf55507dda69b96868847796 Mon Sep 17 00:00:00 2001 From: feitsopb Date: Tue, 30 Jun 2026 19:15:25 +0000 Subject: [PATCH 003/163] added the position history file --- app/models/positionHistory.py | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 app/models/positionHistory.py diff --git a/app/models/positionHistory.py b/app/models/positionHistory.py new file mode 100644 index 000000000..f255dfbcb --- /dev/null +++ b/app/models/positionHistory.py @@ -0,0 +1,10 @@ +from app.models import * +from app.models.department import Department + +class PositionHistory(baseModel): + positioncode = PrimaryKeyField() + status = CharField() + WLS = IntegerField() + revisiondate = DateField() + Description = TextField() + Department = ForeignKeyField(Department) From 83c8c92e2fa28e5be183c8f09da4f8cdca317170 Mon Sep 17 00:00:00 2001 From: lolongaj Date: Tue, 30 Jun 2026 19:33:08 +0000 Subject: [PATCH 004/163] added the allocation model --- app/models/allocation.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 app/models/allocation.py diff --git a/app/models/allocation.py b/app/models/allocation.py new file mode 100644 index 000000000..ddd2084d7 --- /dev/null +++ b/app/models/allocation.py @@ -0,0 +1,19 @@ +from app.models import * +from app.models.department import Department +from app.models.supervisor import Supervisor +from app.models.term import Term + +class Allocation(baseModel): + termCode = ForeignKeyField(Term) + department = ForeignKeyField(Department) + isApproved = BooleanField(default=False) + approvedOn = DateField() + approvedBy = ForeignKeyField(Supervisor) + justification = TextField() + primary_10 = IntegerField() + primary_12 = IntegerField() + primary_15 = IntegerField() + primary_20 = IntegerField() + secondary_5 = IntegerField() + secondary_10 = IntegerField() + breakHours = IntegerField() From caad7d3733365f898f5031131bbdb07a8867e073 Mon Sep 17 00:00:00 2001 From: nahom70 Date: Tue, 30 Jun 2026 21:03:46 +0000 Subject: [PATCH 005/163] Added dummy data: weren't able to check if they work though --- database/demo_data.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/database/demo_data.py b/database/demo_data.py index 0557c9361..2d3ad1bdc 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -17,6 +17,8 @@ from app.models.laborStatusForm import LaborStatusForm from app.models.formHistory import FormHistory from app.models.notes import Notes +from app.models.positionHistory import PositionHistory # type: ignore + print("Inserting data for demo and testing purposes") @@ -609,3 +611,29 @@ ] Notes.insert_many(notes).on_conflict_replace().execute() print(" * laborOfficeNotes added") + + + +############################# +# Position History +############################# + +positionHistory = [ + { + "positioncode": 1, + "status": "Active", + "WLS":3, + "revisiondate" : "2020-01-01", + "Description": "This is a test data for position history code 1", + "Department" : "ACCT" + }, + { + "positioncode": 2, + "status": "Inactive", + "WLS":2, + "revisiondate" : "2023-01-01", + "Description": "This is a test data for position history code 2", + "Department" : "Computer Science" + }, +] +PositionHistory.insert_many(positionHistory).on_conflict_replace().execute() \ No newline at end of file From bea1a8c637863aa3720463af7f7180eaec488f34 Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Tue, 30 Jun 2026 21:29:41 +0000 Subject: [PATCH 006/163] changed migrate_db.sh data to add PositionHistory, and added dummy data to demo_data.py --- database/demo_data.py | 13 +++++++++++++ database/migrate_db.sh | 1 + 2 files changed, 14 insertions(+) diff --git a/database/demo_data.py b/database/demo_data.py index 0557c9361..e55edb130 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -17,6 +17,9 @@ from app.models.laborStatusForm import LaborStatusForm from app.models.formHistory import FormHistory from app.models.notes import Notes +from app.models.allocation import Allocation +from app.models.positionHistory import PositionHistory +from app.models.supervisorDepartment import SupervisorDepartment print("Inserting data for demo and testing purposes") @@ -609,3 +612,13 @@ ] Notes.insert_many(notes).on_conflict_replace().execute() print(" * laborOfficeNotes added") +print(PositionHistory()) + +PositionHistory.insert([{ + "positioncode": "S61407", + "status": "Active", + "WLS": 1, + "revisiondate": f"{current_year}-04-01", + "Description": "Student Programmer", + "Department_id": 1 +}]).on_conflict_replace().execute() diff --git a/database/migrate_db.sh b/database/migrate_db.sh index f88c91f26..83f68a048 100755 --- a/database/migrate_db.sh +++ b/database/migrate_db.sh @@ -30,6 +30,7 @@ pem add app.models.supervisor.Supervisor pem add app.models.supervisorDepartment.SupervisorDepartment pem add app.models.studentLaborEvaluation.StudentLaborEvaluation pem add app.models.formSearchResult.FormSearchResult +pem add app.models.positionHistory.PositionHistory pem watch pem migrate From 2978b55ea3d277fc3a75e1a2ea12d7d58968a95f Mon Sep 17 00:00:00 2001 From: lolongaj Date: Tue, 30 Jun 2026 21:29:46 +0000 Subject: [PATCH 007/163] allocation table added --- database/demo_data.py | 22 ++++++++++++++++++++++ database/migrate_db.sh | 1 + 2 files changed, 23 insertions(+) diff --git a/database/demo_data.py b/database/demo_data.py index 0557c9361..34c80a3f5 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -17,6 +17,8 @@ from app.models.laborStatusForm import LaborStatusForm from app.models.formHistory import FormHistory from app.models.notes import Notes +from app.models.allocation import Allocation + print("Inserting data for demo and testing purposes") @@ -609,3 +611,23 @@ ] Notes.insert_many(notes).on_conflict_replace().execute() print(" * laborOfficeNotes added") + +allocation =[ + { + "termCode":f"{current_year}00", + "department": 3, + "isApproved": True, + "approvedOn": f"{current_year}-06-30", + "approvedBy": "B12365892", + "justification": "We just want it for fun", + "primary_10": 2, + "primary_12": 3, + "primary_15": 1, + "primary_20": 6, + "secondary_5": 2, + "secondary_10": 0, + "breakHours": 500 + } + ] +Allocation.insert_many(allocation).on_conflict_replace().execute() +print(" * allocation added") \ No newline at end of file diff --git a/database/migrate_db.sh b/database/migrate_db.sh index f88c91f26..5788fbead 100755 --- a/database/migrate_db.sh +++ b/database/migrate_db.sh @@ -30,6 +30,7 @@ pem add app.models.supervisor.Supervisor pem add app.models.supervisorDepartment.SupervisorDepartment pem add app.models.studentLaborEvaluation.StudentLaborEvaluation pem add app.models.formSearchResult.FormSearchResult +pem add app.models.allocation.Allocation pem watch pem migrate From 912f50f9fff9bdeea403b32c7a6abb34863f1122 Mon Sep 17 00:00:00 2001 From: georgievh Date: Tue, 30 Jun 2026 21:30:09 +0000 Subject: [PATCH 008/163] dummy allocations added --- database/demo_data.py | 123 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/database/demo_data.py b/database/demo_data.py index 0557c9361..d5eef179a 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -17,6 +17,10 @@ from app.models.laborStatusForm import LaborStatusForm from app.models.formHistory import FormHistory from app.models.notes import Notes +from app.models.allocation import Allocation +from app.models.positionHistory import PositionHistory +from app.models.supervisorDepartment import SupervisorDepartment + print("Inserting data for demo and testing purposes") @@ -515,6 +519,42 @@ "primaryCutOff": f"{current_year}-09-01", "adjustmentCutOff": f"{current_year}-09-01", }, + { + "termCode": f"{current_year-1}00", + "termName": f"AY {current_year-1}-{current_year}", + "termStart": f"{current_year-1}-08-01", + "termEnd": f"{current_year}-05-01", + "termState": 1, + "primaryCutOff": f"{current_year-1}-09-01", + "adjustmentCutOff": f"{current_year-1}-09-01", + }, + { + "termCode": f"{current_year-2}00", + "termName": f"AY {current_year-2}-{current_year-1}", + "termStart": f"{current_year-2}-08-01", + "termEnd": f"{current_year-1}-05-01", + "termState": 1, + "primaryCutOff": f"{current_year-2}-09-01", + "adjustmentCutOff": f"{current_year-2}-09-01", + }, + { + "termCode": f"{current_year-3}00", + "termName": f"AY {current_year-3}-{current_year-2}", + "termStart": f"{current_year-3}-08-01", + "termEnd": f"{current_year-2}-05-01", + "termState": 1, + "primaryCutOff": f"{current_year-3}-09-01", + "adjustmentCutOff": f"{current_year-3}-09-01", + }, + { + "termCode": f"{current_year-4}00", + "termName": f"AY {current_year-4}-{current_year-3}", + "termStart": f"{current_year-4}-08-01", + "termEnd": f"{current_year-3}-05-01", + "termState": 1, + "primaryCutOff": f"{current_year-4}-09-01", + "adjustmentCutOff": f"{current_year-4}-09-01", + }, { "termCode": f"{current_year}01", "termName": f"Thanksgiving Break {current_year}", @@ -609,3 +649,86 @@ ] Notes.insert_many(notes).on_conflict_replace().execute() print(" * laborOfficeNotes added") + +############################ +# Allocation Dummy Data: +########################### +allocations = [ + { + "termCode": 202200, + "department": "Computer Science", + "isApproved": True, + "approvedOn": None, + "approvedBy": None, + "justification": "Downscaling due to decrease in student enrollment caused by current economic conditions", + "primary_10": 2, + "primary_12": 2, + "primary_15": 1, + "primary_20": 0, + "secondary_5": 1, + "secondary_10": 0, + "breakHours": 260, + }, + { + "termCode": 202300, + "department": "ETAD", + "isApproved": True, + "approvedOn": None, + "approvedBy": None, + "justification": "Increase in student enrollment due to exodous from CS department", + "primary_10": 4, + "primary_15": 7, + "primary_20": 4, + "secondary_5": 2, + "secondary_10": 0, + "breakHours": 750, + }, + { + "termCode": 202400, + "department": "Mathematics", + "isApproved": True, + "approvedOn": None, + "approvedBy": None, + "justification": "We are hiring more students to help with the increased workload in the department", + "primary_10": 5, + "primary_12": 6, + "primary_15": 4, + "primary_20": 1, + "secondary_5": 7, + "secondary_10": 0, + "breakHours": 550, + }, + { + "termCode": 202500, + "department": "Physics", + "isApproved": True, + "approvedOn": None, + "approvedBy": None, + "justification": "Downscaling the number of students in the department due to budget cuts", + "primary_10": 4, + "primary_12": 5, + "primary_15": 0, + "primary_20": 0, + "secondary_5": 1, + "secondary_10": 0, + "breakHours": 300, + }, + { + "termCode": 202600, + "department": "Engineering Physics", + "isApproved": False, + "approvedOn": None, + "approvedBy": None, + "justification": "Due to rapid department growth, we need to hire more students to help with the increased workload", + "primary_10": 8, + "primary_12": 10, + "primary_15": 7, + "primary_20": 4, + "secondary_5": 5, + "secondary_10": 1, + "breakHours": 900, + }, + + ] + +print("Data insertion complete. Check phpmyadmin to see if your changes are reflected") \ No newline at end of file From a61ff1d4cd6a8462dcf36b7743d3ceddeee0d46b Mon Sep 17 00:00:00 2001 From: ArtemKurasov Date: Tue, 30 Jun 2026 21:34:25 +0000 Subject: [PATCH 009/163] Successfully added dummy data for the SupervisorDepartment class --- database/demo_data.py | 52 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/database/demo_data.py b/database/demo_data.py index 0557c9361..ed5c07c82 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -17,6 +17,7 @@ from app.models.laborStatusForm import LaborStatusForm from app.models.formHistory import FormHistory from app.models.notes import Notes +from app.models.supervisorDepartment import SupervisorDepartment print("Inserting data for demo and testing purposes") @@ -609,3 +610,54 @@ ] Notes.insert_many(notes).on_conflict_replace().execute() print(" * laborOfficeNotes added") + + + +############################## +# Departement Members +############################## + +department_members = [ + { + "supervisor": "B12361006", + "department": 1, + "banStatus": False, + "isActive": True, + "isCoordinator": True + }, + + { + "supervisor": "B12365892", + "department": 1, + "banStatus": True, + "isActive": True, + "isCoordinator": False + }, + + { + "supervisor": "B12365893", + "department": 1, + "banStatus": False, + "isActive": False, + "isCoordinator": False + }, + + { + "supervisor": "B00763721", + "department": 1, + "banStatus": False, + "isActive": True, + "isCoordinator": False + }, + + { + "supervisor": "B00841417", + "department": 1, + "banStatus": False, + "isActive": True, + "isCoordinator": True + } +] + +SupervisorDepartment.insert_many(department_members).on_conflict_replace().execute() +print(" * Department members added") \ No newline at end of file From cebf62e554b0563ec48d64b3ec824a8e4b0d49e8 Mon Sep 17 00:00:00 2001 From: BhushanSah Date: Wed, 1 Jul 2026 13:24:38 +0000 Subject: [PATCH 010/163] Inserted the demo data --- database/demo_data.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/database/demo_data.py b/database/demo_data.py index d5eef179a..a4296412e 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -658,8 +658,8 @@ "termCode": 202200, "department": "Computer Science", "isApproved": True, - "approvedOn": None, - "approvedBy": None, + "approvedOn": 2021-10-19, + "approvedBy": "Dr heggen", "justification": "Downscaling due to decrease in student enrollment caused by current economic conditions", "primary_10": 2, "primary_12": 2, @@ -673,8 +673,8 @@ "termCode": 202300, "department": "ETAD", "isApproved": True, - "approvedOn": None, - "approvedBy": None, + "approvedOn": 2022-11-12, + "approvedBy": "Dr Jan", "justification": "Increase in student enrollment due to exodous from CS department", "primary_10": 4, "primary_15": 7, @@ -687,8 +687,8 @@ "termCode": 202400, "department": "Mathematics", "isApproved": True, - "approvedOn": None, - "approvedBy": None, + "approvedOn": 2023-12-19, + "approvedBy": "Dr Barnard", "justification": "We are hiring more students to help with the increased workload in the department", "primary_10": 5, "primary_12": 6, @@ -702,8 +702,8 @@ "termCode": 202500, "department": "Physics", "isApproved": True, - "approvedOn": None, - "approvedBy": None, + "approvedOn": 2025-1-10, + "approvedBy": "Dr Hodge", "justification": "Downscaling the number of students in the department due to budget cuts", "primary_10": 4, "primary_12": 5, @@ -717,8 +717,8 @@ "termCode": 202600, "department": "Engineering Physics", "isApproved": False, - "approvedOn": None, - "approvedBy": None, + "approvedOn": 2025-10-19, + "approvedBy": "Dr wu", "justification": "Due to rapid department growth, we need to hire more students to help with the increased workload", "primary_10": 8, "primary_12": 10, @@ -730,5 +730,6 @@ }, ] +Allocation.insert_many(allocations).on_conflict_replace().execute() -print("Data insertion complete. Check phpmyadmin to see if your changes are reflected") \ No newline at end of file +print("Data insertion complete :)") \ No newline at end of file From 539efdee27ba153c9e1ab5d09a62fbe60a1b9af0 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Wed, 1 Jul 2026 13:54:36 +0000 Subject: [PATCH 011/163] added a second round of demo data to the allocation --- database/demo_data.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/database/demo_data.py b/database/demo_data.py index 34c80a3f5..e3efef141 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -627,6 +627,21 @@ "secondary_5": 2, "secondary_10": 0, "breakHours": 500 + }, + { + "termCode":f"{current_year}00", + "department": 2, + "isApproved": False, + "approvedOn": f"{current_year}-06-20", + "approvedBy": "B00763721", + "justification": "We need it to lower the amount of allocations we have", + "primary_10": 1, + "primary_12": 2, + "primary_15": 5, + "primary_20": 2, + "secondary_5": 10, + "secondary_10": 0, + "breakHours": 1500 } ] Allocation.insert_many(allocation).on_conflict_replace().execute() From 6d58afdb3e687d532338231d09c4fc3b576c3fff Mon Sep 17 00:00:00 2001 From: Automation Date: Wed, 1 Jul 2026 13:56:19 +0000 Subject: [PATCH 012/163] We added more data for position history --- database/demo_data.py | 14 +++++++------- database/migrate_db.sh | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/database/demo_data.py b/database/demo_data.py index 2d3ad1bdc..90eb44817 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -17,8 +17,7 @@ from app.models.laborStatusForm import LaborStatusForm from app.models.formHistory import FormHistory from app.models.notes import Notes -from app.models.positionHistory import PositionHistory # type: ignore - +from app.models.positionHistory import PositionHistory print("Inserting data for demo and testing purposes") @@ -623,17 +622,18 @@ "positioncode": 1, "status": "Active", "WLS":3, - "revisiondate" : "2020-01-01", + "revisiondate" : f"{current_year}-01-01", "Description": "This is a test data for position history code 1", - "Department" : "ACCT" + "Department_id" : 2 + }, { "positioncode": 2, "status": "Inactive", "WLS":2, - "revisiondate" : "2023-01-01", + "revisiondate" : f"{current_year}-01-01", "Description": "This is a test data for position history code 2", - "Department" : "Computer Science" + "Department_id" : 1 }, ] -PositionHistory.insert_many(positionHistory).on_conflict_replace().execute() \ No newline at end of file +PositionHistory.insert_many(positionHistory).on_conflict_replace().execute() diff --git a/database/migrate_db.sh b/database/migrate_db.sh index f88c91f26..83f68a048 100755 --- a/database/migrate_db.sh +++ b/database/migrate_db.sh @@ -30,6 +30,7 @@ pem add app.models.supervisor.Supervisor pem add app.models.supervisorDepartment.SupervisorDepartment pem add app.models.studentLaborEvaluation.StudentLaborEvaluation pem add app.models.formSearchResult.FormSearchResult +pem add app.models.positionHistory.PositionHistory pem watch pem migrate From e670c2f37ecad6d092fa6dccde44fb2b928cefcb Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Wed, 1 Jul 2026 14:22:52 +0000 Subject: [PATCH 013/163] fixed the demo_data to make it easier to merge, and fixed the positionhistory info to change the primary key field so position code shows --- app/models/positionHistory.py | 5 +++-- database/demo_data.py | 36 +++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/app/models/positionHistory.py b/app/models/positionHistory.py index f255dfbcb..222441787 100644 --- a/app/models/positionHistory.py +++ b/app/models/positionHistory.py @@ -2,9 +2,10 @@ from app.models.department import Department class PositionHistory(baseModel): - positioncode = PrimaryKeyField() + positionID = PrimaryKeyField() + positioncode = CharField() status = CharField() WLS = IntegerField() revisiondate = DateField() - Description = TextField() + Description = TextField(default=None) Department = ForeignKeyField(Department) diff --git a/database/demo_data.py b/database/demo_data.py index e55edb130..4b27ff3e3 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -614,11 +614,31 @@ print(" * laborOfficeNotes added") print(PositionHistory()) -PositionHistory.insert([{ - "positioncode": "S61407", - "status": "Active", - "WLS": 1, - "revisiondate": f"{current_year}-04-01", - "Description": "Student Programmer", - "Department_id": 1 -}]).on_conflict_replace().execute() +PositionHistory.insert = [ + { + "positioncode": "S61407", + "status": "Active", + "WLS": 1, + "revisiondate": f"{current_year}-07-01", + "Description": "", + "Department_id": 1 + }, + { + + "positioncode": "S61408", + "status": "Active", + "WLS": 2, + "revisiondate": f"{current_year}-07-01", + "Description": "", + "Department_id": 1 + }, + { + "positioncode": "S61409", + "status": "Active", + "WLS": 3, + "revisiondate": f"{current_year}-07-01", + "Description": "", + "Department_id": 1 + } +] +positionHistory = PositionHistory.insert_many(PositionHistory.insert).on_conflict_replace().execute() \ No newline at end of file From 4c3f8758df9e36e2ebbeba0dbd9a8cae7095d4ca Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Wed, 1 Jul 2026 14:40:50 +0000 Subject: [PATCH 014/163] fixed demo data to fit pre existing format --- database/demo_data.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/database/demo_data.py b/database/demo_data.py index 4b27ff3e3..236f6444d 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -614,7 +614,7 @@ print(" * laborOfficeNotes added") print(PositionHistory()) -PositionHistory.insert = [ +positionhistory = [ { "positioncode": "S61407", "status": "Active", @@ -641,4 +641,4 @@ "Department_id": 1 } ] -positionHistory = PositionHistory.insert_many(PositionHistory.insert).on_conflict_replace().execute() \ No newline at end of file +PositionHistory.insert_many(positionhistory).on_conflict_replace().execute() \ No newline at end of file From 6666512ca20c6a7ea222faed977671ffcc9240a7 Mon Sep 17 00:00:00 2001 From: Automation Date: Wed, 1 Jul 2026 14:44:59 +0000 Subject: [PATCH 015/163] fixed formating --- app/models/positionHistory.py | 5 +++-- database/demo_data.py | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/models/positionHistory.py b/app/models/positionHistory.py index f255dfbcb..3fc1bd318 100644 --- a/app/models/positionHistory.py +++ b/app/models/positionHistory.py @@ -2,9 +2,10 @@ from app.models.department import Department class PositionHistory(baseModel): - positioncode = PrimaryKeyField() + positionID = PrimaryKeyField() + positioncode = CharField() status = CharField() WLS = IntegerField() revisiondate = DateField() - Description = TextField() + Description = TextField(default="None") Department = ForeignKeyField(Department) diff --git a/database/demo_data.py b/database/demo_data.py index 90eb44817..a6a316ae2 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -610,16 +610,16 @@ ] Notes.insert_many(notes).on_conflict_replace().execute() print(" * laborOfficeNotes added") - +print(PositionHistory()) ############################# # Position History ############################# -positionHistory = [ +positionhistory= [ { - "positioncode": 1, + "positioncode": "s6gjshs", "status": "Active", "WLS":3, "revisiondate" : f"{current_year}-01-01", @@ -636,4 +636,4 @@ "Department_id" : 1 }, ] -PositionHistory.insert_many(positionHistory).on_conflict_replace().execute() +PositionHistory.insert_many(positionhistory).on_conflict_replace().execute() From 0d517a961af1965f9cbd73f454c9cfad9236d93a Mon Sep 17 00:00:00 2001 From: Automation Date: Wed, 1 Jul 2026 14:47:13 +0000 Subject: [PATCH 016/163] fixed formating again --- app/models/positionHistory.py | 2 +- database/demo_data.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/models/positionHistory.py b/app/models/positionHistory.py index 3fc1bd318..222441787 100644 --- a/app/models/positionHistory.py +++ b/app/models/positionHistory.py @@ -7,5 +7,5 @@ class PositionHistory(baseModel): status = CharField() WLS = IntegerField() revisiondate = DateField() - Description = TextField(default="None") + Description = TextField(default=None) Department = ForeignKeyField(Department) diff --git a/database/demo_data.py b/database/demo_data.py index a6a316ae2..5269c53de 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -17,7 +17,10 @@ from app.models.laborStatusForm import LaborStatusForm from app.models.formHistory import FormHistory from app.models.notes import Notes -from app.models.positionHistory import PositionHistory +from app.models.positionHistory import PositionHistory +from app.models.allocation import Allocation +from app.models.positionHistory import PositionHistory +from app.models.supervisorDepartment import SupervisorDepartment print("Inserting data for demo and testing purposes") From e5869bbdfa0285fc26844afef2f69d3d4e84d72f Mon Sep 17 00:00:00 2001 From: Automation Date: Wed, 1 Jul 2026 14:49:48 +0000 Subject: [PATCH 017/163] fixed merge conflict --- database/demo_data.py | 61 ++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 18 deletions(-) diff --git a/database/demo_data.py b/database/demo_data.py index 5269c53de..1643d2447 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -620,23 +620,48 @@ # Position History ############################# -positionhistory= [ - { - "positioncode": "s6gjshs", - "status": "Active", - "WLS":3, - "revisiondate" : f"{current_year}-01-01", - "Description": "This is a test data for position history code 1", - "Department_id" : 2 +positionhistory = [ + { + "positioncode": "S61407", + "status": "Active", + "WLS": 1, + "revisiondate": f"{current_year}-07-01", + "Description": "", + "Department_id": 1 + }, + { + + "positioncode": "S61408", + "status": "Active", + "WLS": 2, + "revisiondate": f"{current_year}-07-01", + "Description": "", + "Department_id": 1 + }, + { + "positioncode": "S61409", + "status": "Active", + "WLS": 3, + "revisiondate": f"{current_year}-07-01", + "Description": "", + "Department_id": 1 + }, + { + "positioncode": "S61411", + "status": "Active", + "WLS":3, + "revisiondate" : f"{current_year}-01-01", + "Description": "This is a test data for position history code 1", + "Department_id" : 2 - }, - { - "positioncode": 2, - "status": "Inactive", - "WLS":2, - "revisiondate" : f"{current_year}-01-01", - "Description": "This is a test data for position history code 2", - "Department_id" : 1 - }, + }, + { + "positioncode": "S61410", + "status": "Inactive", + "WLS":2, + "revisiondate" : f"{current_year}-01-01", + "Description": "This is a test data for position history code 2", + "Department_id" : 1 + }, ] -PositionHistory.insert_many(positionhistory).on_conflict_replace().execute() +PositionHistory.insert_many(positionhistory).on_conflict_replace().execute() \ No newline at end of file From 49b5eac7080607a956abab4e65419da045cbc964 Mon Sep 17 00:00:00 2001 From: BhushanSah Date: Wed, 1 Jul 2026 14:55:29 +0000 Subject: [PATCH 018/163] Modified allocation --- app/models/allocation.py | 4 ++-- database/demo_data.py | 45 ++++++++++++++++++++-------------------- database/migrate_db.sh | 1 + 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/app/models/allocation.py b/app/models/allocation.py index ddd2084d7..75f9c828f 100644 --- a/app/models/allocation.py +++ b/app/models/allocation.py @@ -7,8 +7,8 @@ class Allocation(baseModel): termCode = ForeignKeyField(Term) department = ForeignKeyField(Department) isApproved = BooleanField(default=False) - approvedOn = DateField() - approvedBy = ForeignKeyField(Supervisor) + approvedOn = DateField(null =True) + approvedBy = ForeignKeyField(Supervisor, null =True) justification = TextField() primary_10 = IntegerField() primary_12 = IntegerField() diff --git a/database/demo_data.py b/database/demo_data.py index a4296412e..92d18557f 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -656,10 +656,10 @@ allocations = [ { "termCode": 202200, - "department": "Computer Science", - "isApproved": True, - "approvedOn": 2021-10-19, - "approvedBy": "Dr heggen", + "department": 3, + "isApproved": False, + "approvedOn": None, + "approvedBy": None, "justification": "Downscaling due to decrease in student enrollment caused by current economic conditions", "primary_10": 2, "primary_12": 2, @@ -670,13 +670,14 @@ "breakHours": 260, }, { - "termCode": 202300, - "department": "ETAD", - "isApproved": True, - "approvedOn": 2022-11-12, - "approvedBy": "Dr Jan", + "termCode": 202300, + "department": 2, + "isApproved": False, + "approvedOn": None, + "approvedBy": None, "justification": "Increase in student enrollment due to exodous from CS department", "primary_10": 4, + "primary_12": 2, "primary_15": 7, "primary_20": 4, "secondary_5": 2, @@ -685,10 +686,10 @@ }, { "termCode": 202400, - "department": "Mathematics", - "isApproved": True, - "approvedOn": 2023-12-19, - "approvedBy": "Dr Barnard", + "department": 1, + "isApproved": False, + "approvedOn": None, + "approvedBy": None, "justification": "We are hiring more students to help with the increased workload in the department", "primary_10": 5, "primary_12": 6, @@ -700,10 +701,10 @@ }, { "termCode": 202500, - "department": "Physics", - "isApproved": True, - "approvedOn": 2025-1-10, - "approvedBy": "Dr Hodge", + "department": 4, + "isApproved": False, + "approvedOn": None, + "approvedBy": None, "justification": "Downscaling the number of students in the department due to budget cuts", "primary_10": 4, "primary_12": 5, @@ -714,11 +715,11 @@ "breakHours": 300, }, { - "termCode": 202600, - "department": "Engineering Physics", - "isApproved": False, - "approvedOn": 2025-10-19, - "approvedBy": "Dr wu", + "termCode": 202500, + "department": 5, + "isApproved": False, + "approvedOn": None, + "approvedBy": None, "justification": "Due to rapid department growth, we need to hire more students to help with the increased workload", "primary_10": 8, "primary_12": 10, diff --git a/database/migrate_db.sh b/database/migrate_db.sh index f88c91f26..5788fbead 100755 --- a/database/migrate_db.sh +++ b/database/migrate_db.sh @@ -30,6 +30,7 @@ pem add app.models.supervisor.Supervisor pem add app.models.supervisorDepartment.SupervisorDepartment pem add app.models.studentLaborEvaluation.StudentLaborEvaluation pem add app.models.formSearchResult.FormSearchResult +pem add app.models.allocation.Allocation pem watch pem migrate From 30c5fe9d15d293e4a2b2bd912ff7d6b5e25c9d1b Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Wed, 1 Jul 2026 15:04:58 +0000 Subject: [PATCH 019/163] fixed the format issue on demo data and made the composite key on positionhistory --- app/models/positionHistory.py | 4 ++-- database/demo_data.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/positionHistory.py b/app/models/positionHistory.py index 222441787..b8b834cc4 100644 --- a/app/models/positionHistory.py +++ b/app/models/positionHistory.py @@ -2,10 +2,10 @@ from app.models.department import Department class PositionHistory(baseModel): - positionID = PrimaryKeyField() positioncode = CharField() status = CharField() WLS = IntegerField() revisiondate = DateField() Description = TextField(default=None) - Department = ForeignKeyField(Department) + Department = ForeignKeyField(Department) +PositionHistory._meta.set_primary_key('positioncode_revisiondate_status', CompositeKey('positioncode', 'revisiondate', 'status')) diff --git a/database/demo_data.py b/database/demo_data.py index 7550d3e0d..65beebd14 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -662,6 +662,6 @@ "Description": "This is a test data for position history code 2", "Department_id" : 1 }, - } + ] PositionHistory.insert_many(positionhistory).on_conflict_replace().execute() \ No newline at end of file From 9b7e7786a71c90a1a3d89033d5bc7659492449ef Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Wed, 1 Jul 2026 15:58:11 +0000 Subject: [PATCH 020/163] changed meta class in position history adn fixed identifiers in demo data --- app/models/positionHistory.py | 4 +++- database/demo_data.py | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/models/positionHistory.py b/app/models/positionHistory.py index b8b834cc4..399608a78 100644 --- a/app/models/positionHistory.py +++ b/app/models/positionHistory.py @@ -8,4 +8,6 @@ class PositionHistory(baseModel): revisiondate = DateField() Description = TextField(default=None) Department = ForeignKeyField(Department) -PositionHistory._meta.set_primary_key('positioncode_revisiondate_status', CompositeKey('positioncode', 'revisiondate', 'status')) + +class Meta: + primary_key = CompositeKey('positioncode', 'revisiondate', 'status') \ No newline at end of file diff --git a/database/demo_data.py b/database/demo_data.py index 65beebd14..1bc7e23f3 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -633,7 +633,7 @@ "positioncode": "S61408", "status": "Active", "WLS": 2, - "revisiondate": f"{current_year}-07-01", + "revisiondate": f"{current_year}-09-01", "Description": "", "Department_id": 1 }, @@ -650,8 +650,8 @@ "status": "Active", "WLS":3, "revisiondate" : f"{current_year}-01-01", - "Description": "This is a test data for position history code 1", - "Department_id" : 2 + "Description": "", + "Department_id" : 1 }, { @@ -659,7 +659,7 @@ "status": "Inactive", "WLS":2, "revisiondate" : f"{current_year}-01-01", - "Description": "This is a test data for position history code 2", + "Description": "", "Department_id" : 1 }, From a52eeca52cd0be83ba5faddc7629f77b3717bab5 Mon Sep 17 00:00:00 2001 From: Brian Ramsay Date: Thu, 2 Jul 2026 11:56:23 -0400 Subject: [PATCH 021/163] Add base for department portal --- app/controllers/main_routes/main_routes.py | 24 ++++++- app/static/css/base.css | 73 ++++++++++++++++++++++ app/static/js/departmentPortal.js | 6 ++ app/templates/main/departmentPortal.html | 27 ++++++++ app/templates/sidebar.html | 15 +++-- 5 files changed, 139 insertions(+), 6 deletions(-) create mode 100644 app/static/js/departmentPortal.js create mode 100644 app/templates/main/departmentPortal.html diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index b3af06c9e..0a2f21e4b 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -1,5 +1,5 @@ from flask import render_template, request, json, redirect, url_for, send_file, g, flash, jsonify -from peewee import JOIN +from peewee import JOIN, DoesNotExist from functools import reduce import operator from app.models.department import Department @@ -47,6 +47,26 @@ def supervisorPortal(): currentUser = currentUser ) +@main_bp.route('/department', methods=['GET']) +@main_bp.route('/department/', methods=['GET']) +@main_bp.route('/department//', methods=['GET']) +def departmentPortal(org=None,account=None): + try: + dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) + except (NameError, DoesNotExist): + dept = None + + + + if g.currentUser.isLaborAdmin: + departments = list(Department.select().order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) + else: + departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) + + return render_template('main/departmentPortal.html', + departments = departments, + department = dept) + @main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) def addUserToDept(): userDeptData = request.form @@ -113,4 +133,4 @@ def submitToBanner(formHistoryId): if save_form_status: return "Form successfully submitted to Banner.", 200 else: - return "Submitting to Banner failed.", 500 \ No newline at end of file + return "Submitting to Banner failed.", 500 diff --git a/app/static/css/base.css b/app/static/css/base.css index 916fb4db9..940f8d6e5 100755 --- a/app/static/css/base.css +++ b/app/static/css/base.css @@ -191,3 +191,76 @@ a { font-size:1.2em; z-index:999; } + +.card { + position: relative; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + min-width: 0; + word-wrap: break-word; + background-color: #fff; + background-clip: border-box; + border: 1px solid rgba(0, 0, 0, 0.125); + border-radius: 0.25rem; +} + +.card-body { + -webkit-box-flex: 1; + -ms-flex: 1 1 auto; + flex: 1 1 auto; + padding: 1rem 1rem; +} + +.card-title { + margin-bottom: 0.5rem; + font-size: 1.25rem; + font-weight: 500; +} + +.card-subtitle { + margin-top: -0.25rem; + margin-bottom: 0; +} + +.card-text:last-child { + margin-bottom: 0; +} + +.card-link + .card-link { + margin-left: 1rem; +} + +.card-header { + padding: 0.5rem 1rem; + margin-bottom: 0; + background-color: rgba(0, 0, 0, 0.03); + border-bottom: 1px solid rgba(0, 0, 0, 0.125); +} + +.card-header:first-child { + border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0; +} + +.card-footer { + padding: 0.5rem 1rem; + background-color: rgba(0, 0, 0, 0.03); + border-top: 1px solid rgba(0, 0, 0, 0.125); +} + +.card-footer:last-child { + border-radius: 0 0 calc(0.25rem - 1px) calc(0.25rem - 1px); +} + +.card-img, .card-img-top { + width: 100%; +} + +.card-img-top { + border-top-left-radius: calc(0.25rem - 1px); + border-top-right-radius: calc(0.25rem - 1px); +} diff --git a/app/static/js/departmentPortal.js b/app/static/js/departmentPortal.js new file mode 100644 index 000000000..cb2023a3a --- /dev/null +++ b/app/static/js/departmentPortal.js @@ -0,0 +1,6 @@ +$(document).ready(function() { + $("#selectedDepartment").on("change",function() { + deptData = $(this).find('option:selected').data(); + window.location = `/department/${deptData.org}/${deptData.account}`; + }); +}); diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html new file mode 100644 index 000000000..8ee01838b --- /dev/null +++ b/app/templates/main/departmentPortal.html @@ -0,0 +1,27 @@ +{% extends "base.html" %} + +{% block scripts %} +{{super()}} + +{% endblock %} + +{% block app_content %} +

{% if department %} {{department.DEPT_NAME}} Portal {% else %} Choose a Department: {% endif %}

+ + +
+ + +
+{% endblock %} diff --git a/app/templates/sidebar.html b/app/templates/sidebar.html index 323b6b03b..1486f7de2 100644 --- a/app/templates/sidebar.html +++ b/app/templates/sidebar.html @@ -49,17 +49,24 @@

Labor History

{% if currentUser.supervisor %}
- +

Supervisor Portal
+
+ +
+

Department Portal

+
+ +
{% endif %} {% if currentUser.supervisor or (currentUser.student and currentUser.isLaborAdmin) %}
- -
+ +

New Labor Status Form

 @@ -67,7 +74,7 @@

New Labor Status Form

{% endif %} {% if currentUser.supervisor or (currentUser.student and currentUser.isLaborAdmin) %}
- +

Student Search

From 0ebcfd7a81bb1564eaafc363672ca0fa166e381d Mon Sep 17 00:00:00 2001 From: Brian Ramsay Date: Thu, 2 Jul 2026 13:25:12 -0400 Subject: [PATCH 022/163] Fix menu item highlighting for dept portal --- app/templates/sidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/sidebar.html b/app/templates/sidebar.html index 1486f7de2..cbaa36b02 100644 --- a/app/templates/sidebar.html +++ b/app/templates/sidebar.html @@ -57,7 +57,7 @@

Supervisor Portal

-
+

Department Portal

 From ba5a40b6175ba98a71bf487ab54b06dd349d620f Mon Sep 17 00:00:00 2001 From: Brian Ramsay Date: Thu, 2 Jul 2026 16:01:35 -0400 Subject: [PATCH 023/163] Add empty file for common routes --- app/controllers/main_routes/departmentPortal.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 app/controllers/main_routes/departmentPortal.py diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py new file mode 100644 index 000000000..351757701 --- /dev/null +++ b/app/controllers/main_routes/departmentPortal.py @@ -0,0 +1 @@ +from flask import render_template From 65c6b0338b29ec8f8267d7a2068672121b6957c0 Mon Sep 17 00:00:00 2001 From: feitsopb Date: Thu, 2 Jul 2026 20:27:51 +0000 Subject: [PATCH 024/163] added an HTML file for manage people added the main routes to the page --- .../main_routes/departmentPortal.py | 40 ++++++++++++++++++- app/templates/main/manageStaff.html | 12 ++++++ 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 app/templates/main/manageStaff.html diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index 351757701..930347ae9 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -1 +1,39 @@ -from flask import render_template +from flask import render_template, request, json, redirect, url_for, send_file, g, flash, jsonify +from peewee import JOIN, DoesNotExist +from functools import reduce +import operator +from app.models.department import Department +from app.models.supervisor import Supervisor +from app.models.supervisorDepartment import SupervisorDepartment +from app.models.student import Student +from app.models.laborStatusForm import LaborStatusForm +from app.models.formHistory import FormHistory +from app.models.term import Term +from app.controllers.admin_routes.allPendingForms import checkAdjustment +from app.controllers.main_routes import main_bp +from app.logic.download import CSVMaker, saveFormSearchResult, retrieveFormSearchResult +from app.logic.search import getDepartmentsForSupervisor, searchPerson, searchSupervisorPortal +from app.login_manager import require_login, logout +from app.logic.getTableData import getDatatableData +from app.logic.banner import Banner + +@main_bp.route('/department/manage_staff', methods=['GET']) +@main_bp.route('/department/manage_staff/', methods=['GET']) +@main_bp.route('/department/manage_staff//', methods=['GET']) +def departmentPortal(org=None,account=None): + try: + dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) + except (NameError, DoesNotExist): + dept = None + + + + if g.currentUser.isLaborAdmin: + departments = list(Department.select().order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) + else: + departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) + + return render_template('main/departmentPortal.html', + departments = departments, + department = dept) + diff --git a/app/templates/main/manageStaff.html b/app/templates/main/manageStaff.html new file mode 100644 index 000000000..306282688 --- /dev/null +++ b/app/templates/main/manageStaff.html @@ -0,0 +1,12 @@ +{% extends "base.html" %} + +{% block scripts %} +{{super()}} + +{% endblock %} + +{% block app_content %} +

{% if department %} {{department.DEPT_NAME}} Portal {% else %} Choose a Department: {% endif %}

+ + +{% endblock %} From 7c1adec948ec65c3f8251214bdff90de9877b59b Mon Sep 17 00:00:00 2001 From: BhushanSah Date: Thu, 2 Jul 2026 21:04:00 +0000 Subject: [PATCH 025/163] Added member card --- app/static/css/base.css | 32 ++++++++++ app/templates/main/departmentPortal.html | 80 ++++++++++++++++++++++++ 2 files changed, 112 insertions(+) diff --git a/app/static/css/base.css b/app/static/css/base.css index 940f8d6e5..9c5d8e2fb 100755 --- a/app/static/css/base.css +++ b/app/static/css/base.css @@ -264,3 +264,35 @@ a { border-top-left-radius: calc(0.25rem - 1px); border-top-right-radius: calc(0.25rem - 1px); } + + +.members-card .media { + margin-bottom: 18px; +} + +.members-card h4 { + margin-top: 18px; + margin-bottom: 4px; +} + +.members-card-icon { + display: inline-block; + width: 42px; + height: 42px; + line-height: 42px; + text-align: center; + border-radius: 50%; + background-color: #e8edf3; + color: #7c8ea1; + font-size: 18px; +} + +.members-card-cta { + position: relative; + display: inline-block; +} + +.members-card-btn { + border-radius: 20px; + padding: 8px 20px; +} diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 8ee01838b..6238bfe07 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -3,6 +3,8 @@ {% block scripts %} {{super()}} + {% endblock %} {% block app_content %} @@ -24,4 +26,82 @@

{% if department %} {{department.DEPT_NAME}} Portal {% e

+ + +
+
+
+ +
+
+ +
+ +
+

+ Members +

+
+
+ +

Labor Coordinator

+

Dr. Jones

+ +

Supervisors

+

+ Dr. Heggen
+ Dr. Nakazawa +

+ +

+ + + View Details + + + +

+ +
+
+
{% endblock %} + + From cc07c972721e3107e01a9a81896e97f0ac71675b Mon Sep 17 00:00:00 2001 From: nahom70 Date: Thu, 2 Jul 2026 21:05:35 +0000 Subject: [PATCH 026/163] tried to add it --- app/templates/main/managepositions.html | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 app/templates/main/managepositions.html diff --git a/app/templates/main/managepositions.html b/app/templates/main/managepositions.html new file mode 100644 index 000000000..b78750533 --- /dev/null +++ b/app/templates/main/managepositions.html @@ -0,0 +1,18 @@ +{% extends "base.html" %} + +{% block styles %} +{{super()}} + +{% endblock %} + +{% block scripts %} +{{super()}} + +{% endblock %} + +{% block app_content %} +

{{ department_name }}

+

Manage Positions

+ + +{% endblock %} \ No newline at end of file From 6bb3e689b95c263fd766bdf43b2a4c74228afb32 Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Thu, 2 Jul 2026 21:06:38 +0000 Subject: [PATCH 027/163] some change --- app/templates/main/departmentPortal.html | 14 ++++++++++++++ app/templates/main/supervisorPortal.html | 2 +- database/reset_database.sh | 14 +++++++------- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 8ee01838b..18a6b9f64 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -8,6 +8,20 @@ {% block app_content %}

{% if department %} {{department.DEPT_NAME}} Portal {% else %} Choose a Department: {% endif %}

+
+
+
+ + + + + Current Allocation +
+


AY 26/27 15/20 POSITIONS

Break Hours 0 of 200 hrs

+ Go somewhere +
+
+
diff --git a/database/reset_database.sh b/database/reset_database.sh index 82f6cff53..ad6dbd91f 100755 --- a/database/reset_database.sh +++ b/database/reset_database.sh @@ -8,7 +8,7 @@ if [ "$1" != "test" ] && [ "$1" != "from-backup" ]; then fi cd database; - + PRODUCTION=0 if [ "`hostname`" == 'lsf.berea.edu' ]; then echo "DO NOT RUN THIS SCRIPT ON PRODUCTION UNLESS YOU REALLY REALLY KNOW WHAT YOU ARE DOING" @@ -22,12 +22,12 @@ if [ "$1" == "from-backup" ]; then fi echo "Dropping databases" -mysql -u root -proot --execute="DROP DATABASE \`lsf\`; DROP USER 'lsf_user';" -mysql -u root -proot --execute="DROP DATABASE \`UTE\`; DROP USER 'tracy_user';" +mysql -u root -proot --skip-ssl --execute="DROP DATABASE \`lsf\`; DROP USER 'lsf_user';" +mysql -u root -proot --skip-ssl --execute="DROP DATABASE \`UTE\`; DROP USER 'tracy_user';" echo "Recreating databases and users" -mysql -u root -proot --execute="CREATE DATABASE IF NOT EXISTS \`lsf\`; CREATE USER IF NOT EXISTS 'lsf_user'@'%' IDENTIFIED BY 'password'; GRANT ALL PRIVILEGES ON *.* TO 'lsf_user'@'%';" -mysql -u root -proot --execute="CREATE DATABASE IF NOT EXISTS \`UTE\`; CREATE USER IF NOT EXISTS 'tracy_user'@'%' IDENTIFIED BY 'password'; GRANT ALL PRIVILEGES ON *.* TO 'tracy_user'@'%';" +mysql -u root -proot --skip-ssl --execute="CREATE DATABASE IF NOT EXISTS \`lsf\`; CREATE USER IF NOT EXISTS 'lsf_user'@'%' IDENTIFIED BY 'password'; GRANT ALL PRIVILEGES ON *.* TO 'lsf_user'@'%';" +mysql -u root -proot --skip-ssl --execute="CREATE DATABASE IF NOT EXISTS \`UTE\`; CREATE USER IF NOT EXISTS 'tracy_user'@'%' IDENTIFIED BY 'password'; GRANT ALL PRIVILEGES ON *.* TO 'tracy_user'@'%';" cd database @@ -38,14 +38,14 @@ rm -rf migrations.json echo "Creating database objects" if [ $BACKUP -eq 1 ]; then echo " from backup" - mysql -u root -proot lsf < prod-backup.sql + mysql -u root -proot --skip-ssl lsf < prod-backup.sql else echo " empty" ./migrate_db.sh fi if [ $PRODUCTION -ne 1 ]; then - ./migrate_db_tracy.sh + ./migrate_db_tracy.sh fi rm -rf lsf_migrations From c29f01f461b8eb2a149605830f3506ea2caebde7 Mon Sep 17 00:00:00 2001 From: lolongaj Date: Thu, 2 Jul 2026 21:10:05 +0000 Subject: [PATCH 028/163] added 3 sample buttons to learn HTML --- app/templates/main/departmentPortal.html | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 8ee01838b..73f0c783c 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -4,7 +4,6 @@ {{super()}} {% endblock %} - {% block app_content %}

{% if department %} {{department.DEPT_NAME}} Portal {% else %} Choose a Department: {% endif %}

@@ -24,4 +23,23 @@

{% if department %} {{department.DEPT_NAME}} Portal {% e

-{% endblock %} +
+
+
+

Positions

+

Student Programmer

+ View Details +
+
+
+

burrh

+
+
+
+

Positions

+

Student Programmer

+ View Details +
+
+
+{% endblock %}\ \ No newline at end of file From f706242d4eefb4f062aa62e4f85b996972cc9688 Mon Sep 17 00:00:00 2001 From: ArtemKurasov Date: Thu, 2 Jul 2026 21:37:05 +0000 Subject: [PATCH 029/163] Added the Manage Staff page --- app/controllers/main_routes/__init__.py | 1 + .../main_routes/departmentPortal.py | 8 +++--- app/templates/main/manageStaff.html | 25 +++++++++++++++++++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/app/controllers/main_routes/__init__.py b/app/controllers/main_routes/__init__.py index 54b32d3c5..da3323908 100755 --- a/app/controllers/main_routes/__init__.py +++ b/app/controllers/main_routes/__init__.py @@ -14,6 +14,7 @@ def injectGlobalData(): 'lastStaticUpdate': lastStaticUpdate} from app.controllers.main_routes import main_routes +from app.controllers.main_routes import departmentPortal from app.controllers.main_routes import laborStatusForm from app.controllers.main_routes import laborHistory from app.controllers.main_routes import alterLSF diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index 930347ae9..df8dbbefc 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -20,7 +20,7 @@ @main_bp.route('/department/manage_staff', methods=['GET']) @main_bp.route('/department/manage_staff/', methods=['GET']) @main_bp.route('/department/manage_staff//', methods=['GET']) -def departmentPortal(org=None,account=None): +def manageStaff(org=None,account=None): try: dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) except (NameError, DoesNotExist): @@ -33,7 +33,9 @@ def departmentPortal(org=None,account=None): else: departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) - return render_template('main/departmentPortal.html', - departments = departments, + labor = [["Scott Heggen", 7, 11, 0], ["Brian Ramsey", 9, 10, 0], ["Bright Feitsop", 10, 20, 1], ["Artem Kurasov", 6, 7, 0]] + + return render_template('main/manageStaff.html', + staff = labor, department = dept) diff --git a/app/templates/main/manageStaff.html b/app/templates/main/manageStaff.html index 306282688..c5cfbdae5 100644 --- a/app/templates/main/manageStaff.html +++ b/app/templates/main/manageStaff.html @@ -7,6 +7,31 @@ {% block app_content %}

{% if department %} {{department.DEPT_NAME}} Portal {% else %} Choose a Department: {% endif %}

+

Manage Staff

+ +
+
+ + + +
+ + + + + + + + + {% for i in staff %} + + + + + + {% endfor %} +
NameSuperviseesAssign as Coordinator
{{ i[0] }} Primary: {{ i[1] }}
Secondary {{ i[2] }} 		{{ i[3] }}
+
{% endblock %} From aa3a837d23f7543684ae0275dd86681ee63a0d0b Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Fri, 3 Jul 2026 13:17:42 +0000 Subject: [PATCH 030/163] uniform sizing for cards that scale with the screen and no cards when no department is selected --- app/templates/main/departmentPortal.html | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 73f0c783c..e31f476bf 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -23,15 +23,17 @@

{% if department %} {{department.DEPT_NAME}} Portal {% e

-
-
+ +{% if department %} +
+

Positions

-

Student Programmer

+

{{department.ACCOUNT}}

View Details
-
+

burrh

@@ -42,4 +44,9 @@

Positions

+
+

aaaaaa

+
+{% endif %} + {% endblock %}\ \ No newline at end of file From d60b8e40977ee8df6bf0c7a70c0ca051b89c4b27 Mon Sep 17 00:00:00 2001 From: feitsopb Date: Fri, 3 Jul 2026 15:05:53 +0000 Subject: [PATCH 031/163] added an email symbol that opens in outlook --- app/templates/main/manageStaff.html | 32 +++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/app/templates/main/manageStaff.html b/app/templates/main/manageStaff.html index c5cfbdae5..ff39fd2d8 100644 --- a/app/templates/main/manageStaff.html +++ b/app/templates/main/manageStaff.html @@ -23,15 +23,29 @@

Manage Staff

Assign as Coordinator - {% for i in staff %} - - {{ i[0] }} - Primary: {{ i[1] }}
Secondary {{ i[2] }} - {{ i[3] }} - - {% endfor %} + + + {% for i in staff %} + + + {{ i[0] }} + ✉ + + {% if i[5] %} + Banned + {% endif %} + + + + Primary: {{ i[1] }}
+ Secondary: {{ i[2] }} + + + {{ i[3] }} + + {% endfor %} +
- -{% endblock %} +{% endblock %} \ No newline at end of file From 645e85ae93f8b743030a98a3160389194530c790 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Fri, 3 Jul 2026 15:38:25 +0000 Subject: [PATCH 032/163] added a 10 position cap to the amount of visible positons --- app/controllers/main_routes/main_routes.py | 11 +++++++++-- app/templates/main/departmentPortal.html | 22 ++++++++++++++-------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 0a2f21e4b..18c0f3963 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -16,6 +16,7 @@ from app.login_manager import require_login, logout from app.logic.getTableData import getDatatableData from app.logic.banner import Banner +from app.logic.tracy import Tracy @main_bp.route('/logout', methods=['GET']) def triggerLogout(): @@ -62,10 +63,16 @@ def departmentPortal(org=None,account=None): departments = list(Department.select().order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) else: departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) - + + pos = Tracy().getPositionsFromDepartment(org, account) + positions = [] + for i in pos: + positions.append(i.POSN_TITLE + "" + "(" + i.WLS + ")") + print(positions) return render_template('main/departmentPortal.html', departments = departments, - department = dept) + department = dept, + positions = positions) @main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) def addUserToDept(): diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index e31f476bf..1f3e9e422 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -23,30 +23,36 @@

{% if department %} {{department.DEPT_NAME}} Portal {% e

- + {% if department %}
-

Positions

+

that one thing

{{department.ACCOUNT}}

View Details
-
-

burrh

+
+
+

burrh

+

crazy interesting stuff here

+ View Details +

Positions

-

Student Programmer

+ {% for p in positions %} + {% if 10 > loop.index0 %} +

{{ p }}

+ {% endif %} + {% endfor %} View Details
-
-

aaaaaa

-
+ {% endif %} {% endblock %}\ \ No newline at end of file From d3c0b0401958ff6a147be8142468e92c68938acc Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Fri, 3 Jul 2026 15:40:44 +0000 Subject: [PATCH 033/163] removed an unecessary print statement from the main_routes.py --- app/controllers/main_routes/main_routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 18c0f3963..36bd7cb05 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -68,7 +68,7 @@ def departmentPortal(org=None,account=None): positions = [] for i in pos: positions.append(i.POSN_TITLE + "" + "(" + i.WLS + ")") - print(positions) + return render_template('main/departmentPortal.html', departments = departments, department = dept, From 09022bd1dee0d30dd432a1c3e962623195c45488 Mon Sep 17 00:00:00 2001 From: ArtemKurasov Date: Fri, 3 Jul 2026 17:10:05 +0000 Subject: [PATCH 034/163] Updated the Manage Staff table --- .../main_routes/departmentPortal.py | 4 +- app/templates/main/manageStaff.html | 44 ++++++++++++++----- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index df8dbbefc..631a7eac3 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -33,9 +33,9 @@ def manageStaff(org=None,account=None): else: departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) - labor = [["Scott Heggen", 7, 11, 0], ["Brian Ramsey", 9, 10, 0], ["Bright Feitsop", 10, 20, 1], ["Artem Kurasov", 6, 7, 0]] + labor = [["Scott Heggen", 7, 11, 0, 1], ["Brian Ramsey", 9, 12, 0, 1], ["Bright Feitsop", 10, 20, 1, 0], ["Artem Kurasov", 6, 7, 0, 0]] return render_template('main/manageStaff.html', staff = labor, - department = dept) + department = "Computer Science") diff --git a/app/templates/main/manageStaff.html b/app/templates/main/manageStaff.html index ff39fd2d8..890f620fb 100644 --- a/app/templates/main/manageStaff.html +++ b/app/templates/main/manageStaff.html @@ -2,25 +2,31 @@ {% block scripts %} {{super()}} + + {% endblock %} {% block app_content %} -

{% if department %} {{department.DEPT_NAME}} Portal {% else %} Choose a Department: {% endif %}

-

Manage Staff

- -
-
+

{% if department %} Manage {{department.DEPT_NAME}} Staff {% else %} Manage Staff {% endif %}

+

-
+

+ +
+ + {% if currentUser.isLaborAdmin or currentUser.isLaborDepartmentStudent %} + + + {% endif %} @@ -29,10 +35,12 @@

Manage Staff

@@ -41,7 +49,23 @@

Manage Staff

Secondary: {{ i[2] }} - + + + {% if currentUser.isLaborAdmin or currentUser.isLaborDepartmentStudent %} + + + {% endif %} + {% endfor %} From 426e2e7153a77388ee03284c5fedb0fbc402137e Mon Sep 17 00:00:00 2001 From: ArtemKurasov Date: Fri, 3 Jul 2026 18:00:19 +0000 Subject: [PATCH 035/163] Added a hover indicator for names on the Manage Staff table --- app/controllers/main_routes/departmentPortal.py | 2 +- app/templates/main/manageStaff.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index 631a7eac3..be78113f7 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -33,7 +33,7 @@ def manageStaff(org=None,account=None): else: departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) - labor = [["Scott Heggen", 7, 11, 0, 1], ["Brian Ramsey", 9, 12, 0, 1], ["Bright Feitsop", 10, 20, 1, 0], ["Artem Kurasov", 6, 7, 0, 0]] + labor = [["Scott Heggen", 7, 11, 0, 1, "B0010201"], ["Brian Ramsay", 9, 12, 0, 1, "B0011251"], ["Bright Feitsop", 10, 20, 1, 0, "B023241"], ["Artem Kurasov", 6, 7, 0, 0, "B1110201"]] return render_template('main/manageStaff.html', staff = labor, diff --git a/app/templates/main/manageStaff.html b/app/templates/main/manageStaff.html index 890f620fb..1df4b5853 100644 --- a/app/templates/main/manageStaff.html +++ b/app/templates/main/manageStaff.html @@ -34,7 +34,7 @@

{% if department %} Manage {{department.DEPT_NAME}} Staf {% for i in staff %}

Name Supervisees Assign as CoordinatorStatusRemove Staff
{{ i[0] }} - ✉ + ✉ + +
- {% if i[5] %} - Banned + {% if i[4] %} + Banned {% endif %} 		{{ i[3] }} + + + {% if not i[4] %} + + {% else %} + + {% endif %} + + +
- {{ i[0] }} + {{ i[0] }} ✉
From dfa597131f5dc3ca3529c442cf3c6ab83696ce35 Mon Sep 17 00:00:00 2001 From: nyabutoa Date: Fri, 3 Jul 2026 19:11:32 +0000 Subject: [PATCH 036/163] we added some things and the table we hard coded some information in there but we will be connecting it soon to tracy and get actaul information --- app/controllers/main_routes/main_routes.py | 25 ++++- app/templates/main/departmentPortal.html | 2 +- app/templates/main/managepositions.html | 117 +++++++++++++++++++-- 3 files changed, 132 insertions(+), 12 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 36bd7cb05..527244cb6 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -52,9 +52,12 @@ def supervisorPortal(): @main_bp.route('/department/', methods=['GET']) @main_bp.route('/department//', methods=['GET']) def departmentPortal(org=None,account=None): - try: - dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) - except (NameError, DoesNotExist): + if org and account: + try: + dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) + except (NameError, DoesNotExist): + dept = None + else: dept = None @@ -69,11 +72,25 @@ def departmentPortal(org=None,account=None): for i in pos: positions.append(i.POSN_TITLE + "" + "(" + i.WLS + ")") - return render_template('main/departmentPortal.html', + return render_template('main/departmentPortal.html', departments = departments, department = dept, positions = positions) +@main_bp.route('/department///managepositions', methods=['GET']) +def managePositions(org, account): + try: + dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) + except DoesNotExist: + return render_template('errors/404.html'), 404 + + positions = Tracy().getPositionsFromDepartment(org, account) + + return render_template('main/managepositions.html', + department = dept, + department_name = dept.DEPT_NAME, + positions = positions) + @main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) def addUserToDept(): userDeptData = request.form diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 1f3e9e422..a00a298b2 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -48,7 +48,7 @@

Positions

{{ p }}

{% endif %} {% endfor %} - View Details + View Details diff --git a/app/templates/main/managepositions.html b/app/templates/main/managepositions.html index b78750533..9c38e7f52 100644 --- a/app/templates/main/managepositions.html +++ b/app/templates/main/managepositions.html @@ -2,17 +2,120 @@ {% block styles %} {{super()}} - + {% endblock %} {% block scripts %} {{super()}} - + {% endblock %} {% block app_content %} -

{{ department_name }}

-

Manage Positions

- - -{% endblock %} \ No newline at end of file +
+

{{ department_name }}

+
+ +
+ +
+
+
+ + +
+
+
+

Manage Positions

+
+
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Position (WSL)Position CodeStatusLast Revision DateView Position DescriptionEdit Position Description
TA (3)S85405 + + Active + + 01/01/2024 + + + +
Co-Lead TA (4)S89123 + + Requested + + 01/01/2024 + + + +
Lead TA (4)S89123 + + Inactive + + 01/01/2024 + + + +
+
+

+ Total Positions: + 3 +

+
+{% endblock %} From 693191bfd9161858047801e2b8555bd58f8dc1ae Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Fri, 3 Jul 2026 20:31:48 +0000 Subject: [PATCH 037/163] got the first card added from Dayton's branch --- app/templates/main/departmentPortal.html | 32 ++++++++++-------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 86a15e6ce..fa226dca7 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -7,19 +7,6 @@ {% block app_content %}

{% if department %} {{department.DEPT_NAME}} Portal {% else %} Choose a Department: {% endif %}

-
-
-
- - - - - Current Allocation -
-


AY 26/27 15/20 POSITIONS

Break Hours 0 of 200 hrs

- Go somewhere -
-
@@ -40,13 +27,20 @@
{% if department %}
-
-
-

that one thing

-

{{department.ACCOUNT}}

- View Details -
+ +
+
+
+ + + + + Current Allocation +
+


AY 26/27 15/20 POSITIONS

Break Hours 0 of 200 hrs

+ Go somewhere
+

burrh

From 1bb8c18f69e2779e29ba9a654b49c61d50073547 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Fri, 3 Jul 2026 21:23:04 +0000 Subject: [PATCH 038/163] added real people into the members card, its wrong and gives us everyone --- app/controllers/main_routes/main_routes.py | 10 +++++++++- app/templates/main/departmentPortal.html | 17 +++++++++-------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 36bd7cb05..17fa6f2a2 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -69,10 +69,18 @@ def departmentPortal(org=None,account=None): for i in pos: positions.append(i.POSN_TITLE + "" + "(" + i.WLS + ")") + staff = Tracy().getSupervisors() + supervisors = [] + + for i in staff: + if i.DEPT_NAME == Department.DEPT_NAME: + supervisors.append(i.FIRST_NAME + " " + i.LAST_NAME + " (" + i.EMAIL + ")") + return render_template('main/departmentPortal.html', departments = departments, department = dept, - positions = positions) + positions = positions, + supervisors = supervisors) @main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) def addUserToDept(): diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index a221f7160..bc3710bd7 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -45,7 +45,6 @@
-
@@ -53,22 +52,23 @@
-

Members

- -

Labor Coordinator

+

Labor Coordinator(s)

Dr. Jones

Supervisors

-

- Dr. Heggen
- Dr. Nakazawa -

+ {% for s in supervisors %} + {% if 3 > loop.index0 %} +

{{ s }}

+ {% elif 4 > loop.index0 %} +

and {{ supervisors | length}} more...

+ {% endif %} + {% endfor %}
@@ -77,6 +77,7 @@

Supervisors

+

Positions

From 570293cd85765f94156eb5df14910194de151804 Mon Sep 17 00:00:00 2001 From: BhushanSah Date: Mon, 6 Jul 2026 13:00:41 +0000 Subject: [PATCH 039/163] Updated the members card --- database/reset_database.sh.bak | 67 ++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 database/reset_database.sh.bak diff --git a/database/reset_database.sh.bak b/database/reset_database.sh.bak new file mode 100644 index 000000000..82f6cff53 --- /dev/null +++ b/database/reset_database.sh.bak @@ -0,0 +1,67 @@ +#!/bin/bash + +## Check if argument was passed in +if [ "$1" != "test" ] && [ "$1" != "from-backup" ]; then + echo "You must specify which data set you want to restore" + echo "Usage: ./reset_database.sh [test|from-backup]" + exit 1; +fi + +cd database; + +PRODUCTION=0 +if [ "`hostname`" == 'lsf.berea.edu' ]; then + echo "DO NOT RUN THIS SCRIPT ON PRODUCTION UNLESS YOU REALLY REALLY KNOW WHAT YOU ARE DOING" + PRODUCTION=1 + exit 1 +fi + +BACKUP=0 +if [ "$1" == "from-backup" ]; then + BACKUP=1 +fi + +echo "Dropping databases" +mysql -u root -proot --execute="DROP DATABASE \`lsf\`; DROP USER 'lsf_user';" +mysql -u root -proot --execute="DROP DATABASE \`UTE\`; DROP USER 'tracy_user';" + +echo "Recreating databases and users" +mysql -u root -proot --execute="CREATE DATABASE IF NOT EXISTS \`lsf\`; CREATE USER IF NOT EXISTS 'lsf_user'@'%' IDENTIFIED BY 'password'; GRANT ALL PRIVILEGES ON *.* TO 'lsf_user'@'%';" +mysql -u root -proot --execute="CREATE DATABASE IF NOT EXISTS \`UTE\`; CREATE USER IF NOT EXISTS 'tracy_user'@'%' IDENTIFIED BY 'password'; GRANT ALL PRIVILEGES ON *.* TO 'tracy_user'@'%';" + +cd database + +rm -rf lsf_migrations +rm -rf tracy_migrations +rm -rf migrations.json + +echo "Creating database objects" +if [ $BACKUP -eq 1 ]; then + echo " from backup" + mysql -u root -proot lsf < prod-backup.sql +else + echo " empty" + ./migrate_db.sh +fi + +if [ $PRODUCTION -ne 1 ]; then + ./migrate_db_tracy.sh +fi + +rm -rf lsf_migrations +rm -rf tracy_migrations +rm -rf migrations.json + +# Adding data we need in all environments, unless we are restoring from backup +if [ $BACKUP -ne 1 ]; then + python3 base_data.py +else + echo "You have imported the production DB backup. You probably want to enable real Tracy access as well. Set FLASK_ENV to staging or production." +fi + +# Adding fake data for non-prod, set up admins for prod +if [ $PRODUCTION -eq 1 ]; then + FLASK_ENV=production python3 add_admins.py +elif [ $BACKUP -ne 1 ]; then + python3 demo_data.py +fi From 3f6aa594d26c04ff25ded1fb935925cfa7b99e46 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Mon, 6 Jul 2026 13:17:24 +0000 Subject: [PATCH 040/163] changed the button from members to blue --- app/templates/main/departmentPortal.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index bc3710bd7..fd29a2ec3 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -53,15 +53,15 @@
-

+

Members -

+

Labor Coordinator(s)

Dr. Jones

-

Supervisors

+

Supervisors

{% for s in supervisors %} {% if 3 > loop.index0 %}

{{ s }}

@@ -72,8 +72,8 @@

Supervisors

- - View Details + View Details +
From 77e9714189a8ed1a1c0105470fcbc7944edd4af8 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Mon, 6 Jul 2026 13:25:46 +0000 Subject: [PATCH 041/163] added the bottom border and centered the button --- app/templates/main/departmentPortal.html | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index fd29a2ec3..33f82f747 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -78,17 +78,19 @@

Supervisors

-
-
-

Positions

- {% for p in positions %} - {% if 10 > loop.index0 %} -

{{ p }}

- {% endif %} - {% endfor %} - View Details -
+
+
+

Positions

+ {% for p in positions %} + {% if 10 > loop.index0 %} +

{{ p }}

+ {% endif %} + {% endfor %}
+
+ View Details +
+
{% endif %} From abcd951f493146b284bae8c55717d8c598dc0862 Mon Sep 17 00:00:00 2001 From: rukwashai Date: Mon, 6 Jul 2026 09:57:32 -0400 Subject: [PATCH 042/163] Add real data to the Current Allocation card - New Allocation model (department, term, totalPositions, totalBreakHours) - Register Allocation in migrate_db.sh - Seed demo allocation rows per department in demo_data.py - departmentPortal route now queries Allocation for the selected dept and open term, and computes positions/break-hours used from LaborStatusForm - Template renders real allocation data instead of hardcoded placeholder text --- app/controllers/main_routes/main_routes.py | 23 +++++++++++++++++++--- app/models/allocation.py | 9 +++++++++ app/templates/main/departmentPortal.html | 9 +++++++-- database/demo_data.py | 15 ++++++++++++++ database/migrate_db.sh | 1 + 5 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 app/models/allocation.py diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 17fa6f2a2..3dd3fa40b 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -1,8 +1,9 @@ from flask import render_template, request, json, redirect, url_for, send_file, g, flash, jsonify -from peewee import JOIN, DoesNotExist +from peewee import JOIN, DoesNotExist, fn from functools import reduce import operator from app.models.department import Department +from app.models.allocation import Allocation from app.models.supervisor import Supervisor from app.models.supervisorDepartment import SupervisorDepartment from app.models.student import Student @@ -76,11 +77,27 @@ def departmentPortal(org=None,account=None): if i.DEPT_NAME == Department.DEPT_NAME: supervisors.append(i.FIRST_NAME + " " + i.LAST_NAME + " (" + i.EMAIL + ")") - return render_template('main/departmentPortal.html', + allocation = None + positionsUsed = 0 + breakHoursUsed = 0 + if dept and g.openTerm: + allocation = Allocation.get_or_none(Allocation.department == dept, Allocation.term == g.openTerm) + usage = (LaborStatusForm + .select(fn.COUNT(LaborStatusForm.laborStatusFormID).alias('positionCount'), + fn.SUM(LaborStatusForm.contractHours).alias('hoursSum')) + .where(LaborStatusForm.department == dept, LaborStatusForm.termCode == g.openTerm) + .get()) + positionsUsed = usage.positionCount or 0 + breakHoursUsed = usage.hoursSum or 0 + + return render_template('main/departmentPortal.html', departments = departments, department = dept, positions = positions, - supervisors = supervisors) + supervisors = supervisors, + allocation = allocation, + positionsUsed = positionsUsed, + breakHoursUsed = breakHoursUsed) @main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) def addUserToDept(): diff --git a/app/models/allocation.py b/app/models/allocation.py new file mode 100644 index 000000000..f67b61e3e --- /dev/null +++ b/app/models/allocation.py @@ -0,0 +1,9 @@ +from app.models import * +from app.models.department import Department +from app.models.term import Term + +class Allocation(baseModel): + department = ForeignKeyField(Department, on_delete="cascade") + term = ForeignKeyField(Term, on_delete="cascade") + totalPositions = IntegerField() + totalBreakHours = IntegerField() diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index fd29a2ec3..d77f22f8e 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -39,8 +39,13 @@
Current Allocation
-


AY 26/27 15/20 POSITIONS

Break Hours 0 of 200 hrs

- Go somewhere + {% if allocation %} +


{{allocation.term.termName}} {{positionsUsed}}/{{allocation.totalPositions}} POSITIONS +

Break Hours {{breakHoursUsed}} of {{allocation.totalBreakHours}} hrs

+ {% else %} +


No allocation set for this term.

+ {% endif %} + View Details diff --git a/database/demo_data.py b/database/demo_data.py index 0557c9361..1bb4c3b6a 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -530,6 +530,21 @@ Term.insert_many(terms).on_conflict_replace().execute() print(f" * terms for {current_year}-{current_year+1} added") +############################# +# Allocation +############################# +from app.models.allocation import Allocation + +allocations = [ + {"department": 1, "term": f"{current_year}00", "totalPositions": 20, "totalBreakHours": 200}, + {"department": 2, "term": f"{current_year}00", "totalPositions": 12, "totalBreakHours": 150}, + {"department": 3, "term": f"{current_year}00", "totalPositions": 15, "totalBreakHours": 180}, + {"department": 4, "term": f"{current_year}00", "totalPositions": 10, "totalBreakHours": 100}, + {"department": 5, "term": f"{current_year}00", "totalPositions": 20, "totalBreakHours": 200}, +] +Allocation.insert_many(allocations).on_conflict_replace().execute() +print(" * allocations added") + ############################# # Create a Pending Labor Status Form ############################# diff --git a/database/migrate_db.sh b/database/migrate_db.sh index f88c91f26..472aab283 100755 --- a/database/migrate_db.sh +++ b/database/migrate_db.sh @@ -16,6 +16,7 @@ pem add app.models.laborStatusForm.LaborStatusForm pem add app.models.laborReleaseForm.LaborReleaseForm pem add app.models.term.Term pem add app.models.department.Department +pem add app.models.allocation.Allocation pem add app.models.emailTemplate.EmailTemplate pem add app.models.formHistory.FormHistory pem add app.models.adjustedForm.AdjustedForm From 6c52ca9eb6d46a7acd83413a7716254c9b8b7df0 Mon Sep 17 00:00:00 2001 From: BhushanSah Date: Mon, 6 Jul 2026 14:08:08 +0000 Subject: [PATCH 043/163] fixedgit add app/controllers/main_routes/main_routes.py Now current dept show the supervisor of current department only --- app/controllers/main_routes/main_routes.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 17fa6f2a2..a10c46cc8 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -56,9 +56,7 @@ def departmentPortal(org=None,account=None): dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) except (NameError, DoesNotExist): dept = None - - - + if g.currentUser.isLaborAdmin: departments = list(Department.select().order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) else: @@ -73,7 +71,8 @@ def departmentPortal(org=None,account=None): supervisors = [] for i in staff: - if i.DEPT_NAME == Department.DEPT_NAME: + print(f"org= {org},----- account= {account}") + if i.ORG == org: supervisors.append(i.FIRST_NAME + " " + i.LAST_NAME + " (" + i.EMAIL + ")") return render_template('main/departmentPortal.html', From cdabc2a68f6047bbc892c313cc7d4bcd004c9054 Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Mon, 6 Jul 2026 14:14:20 +0000 Subject: [PATCH 044/163] added changes to format with all 3 cards --- app/templates/main/departmentPortal.html | 37 +++++++++++++++++------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index bc3710bd7..78fda0498 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -30,19 +30,34 @@

{% if department %} {{department.DEPT_NAME}} Portal {% e {% if department %}
-
+
-
- - - - - Current Allocation -
-


AY 26/27 15/20 POSITIONS

Break Hours 0 of 200 hrs

- Go somewhere +
+
+ + + +
+
+

+ Current Allocation +

+
+
+

AY 26/27      15 / 20 Positions

+

Break Hours      0 of 200 Hrs.

-
+ + +
+ + View Details + + + Request Allocation + +
+
From ea79ff6ebb275ccbf8c1f02350653583a80a428a Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Mon, 6 Jul 2026 14:28:55 +0000 Subject: [PATCH 045/163] unordered list now bullets elements, icon is in the top right, and round corners --- app/templates/main/departmentPortal.html | 29 ++++++++++++++++++------ 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 33f82f747..0487d8138 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -28,9 +28,9 @@

{% if department %} {{department.DEPT_NAME}} Portal {% e

{% if department %} -
+
-
+
@@ -44,7 +44,7 @@
-
+
@@ -78,14 +78,29 @@

Supervisors

-
+
-

Positions

+
+
+

Positions

+
+
+ +
+ +
+
    {% for p in positions %} - {% if 10 > loop.index0 %} -

    {{ p }}

    + {% if 7 > loop.index0 %} +
  • {{ p }}
    • + {% elif 8 == loop.index0 %} +

and {{ positions | length}} more...

{% endif %} {% endfor %} + +
View Details From b75e82216bae6efda6770d2796518489633aac68 Mon Sep 17 00:00:00 2001 From: rukwashai Date: Mon, 6 Jul 2026 10:37:14 -0400 Subject: [PATCH 046/163] Revert "Add real data to the Current Allocation card" This reverts commit abcd951f493146b284bae8c55717d8c598dc0862. --- app/controllers/main_routes/main_routes.py | 23 +++------------------- app/models/allocation.py | 9 --------- app/templates/main/departmentPortal.html | 9 ++------- database/demo_data.py | 15 -------------- database/migrate_db.sh | 1 - 5 files changed, 5 insertions(+), 52 deletions(-) delete mode 100644 app/models/allocation.py diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 3dd3fa40b..17fa6f2a2 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -1,9 +1,8 @@ from flask import render_template, request, json, redirect, url_for, send_file, g, flash, jsonify -from peewee import JOIN, DoesNotExist, fn +from peewee import JOIN, DoesNotExist from functools import reduce import operator from app.models.department import Department -from app.models.allocation import Allocation from app.models.supervisor import Supervisor from app.models.supervisorDepartment import SupervisorDepartment from app.models.student import Student @@ -77,27 +76,11 @@ def departmentPortal(org=None,account=None): if i.DEPT_NAME == Department.DEPT_NAME: supervisors.append(i.FIRST_NAME + " " + i.LAST_NAME + " (" + i.EMAIL + ")") - allocation = None - positionsUsed = 0 - breakHoursUsed = 0 - if dept and g.openTerm: - allocation = Allocation.get_or_none(Allocation.department == dept, Allocation.term == g.openTerm) - usage = (LaborStatusForm - .select(fn.COUNT(LaborStatusForm.laborStatusFormID).alias('positionCount'), - fn.SUM(LaborStatusForm.contractHours).alias('hoursSum')) - .where(LaborStatusForm.department == dept, LaborStatusForm.termCode == g.openTerm) - .get()) - positionsUsed = usage.positionCount or 0 - breakHoursUsed = usage.hoursSum or 0 - - return render_template('main/departmentPortal.html', + return render_template('main/departmentPortal.html', departments = departments, department = dept, positions = positions, - supervisors = supervisors, - allocation = allocation, - positionsUsed = positionsUsed, - breakHoursUsed = breakHoursUsed) + supervisors = supervisors) @main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) def addUserToDept(): diff --git a/app/models/allocation.py b/app/models/allocation.py deleted file mode 100644 index f67b61e3e..000000000 --- a/app/models/allocation.py +++ /dev/null @@ -1,9 +0,0 @@ -from app.models import * -from app.models.department import Department -from app.models.term import Term - -class Allocation(baseModel): - department = ForeignKeyField(Department, on_delete="cascade") - term = ForeignKeyField(Term, on_delete="cascade") - totalPositions = IntegerField() - totalBreakHours = IntegerField() diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index d77f22f8e..fd29a2ec3 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -39,13 +39,8 @@
Current Allocation
- {% if allocation %} -


{{allocation.term.termName}} {{positionsUsed}}/{{allocation.totalPositions}} POSITIONS -

Break Hours {{breakHoursUsed}} of {{allocation.totalBreakHours}} hrs

- {% else %} -


No allocation set for this term.

- {% endif %} - View Details +


AY 26/27 15/20 POSITIONS

Break Hours 0 of 200 hrs

+ Go somewhere
diff --git a/database/demo_data.py b/database/demo_data.py index 1bb4c3b6a..0557c9361 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -530,21 +530,6 @@ Term.insert_many(terms).on_conflict_replace().execute() print(f" * terms for {current_year}-{current_year+1} added") -############################# -# Allocation -############################# -from app.models.allocation import Allocation - -allocations = [ - {"department": 1, "term": f"{current_year}00", "totalPositions": 20, "totalBreakHours": 200}, - {"department": 2, "term": f"{current_year}00", "totalPositions": 12, "totalBreakHours": 150}, - {"department": 3, "term": f"{current_year}00", "totalPositions": 15, "totalBreakHours": 180}, - {"department": 4, "term": f"{current_year}00", "totalPositions": 10, "totalBreakHours": 100}, - {"department": 5, "term": f"{current_year}00", "totalPositions": 20, "totalBreakHours": 200}, -] -Allocation.insert_many(allocations).on_conflict_replace().execute() -print(" * allocations added") - ############################# # Create a Pending Labor Status Form ############################# diff --git a/database/migrate_db.sh b/database/migrate_db.sh index 472aab283..f88c91f26 100755 --- a/database/migrate_db.sh +++ b/database/migrate_db.sh @@ -16,7 +16,6 @@ pem add app.models.laborStatusForm.LaborStatusForm pem add app.models.laborReleaseForm.LaborReleaseForm pem add app.models.term.Term pem add app.models.department.Department -pem add app.models.allocation.Allocation pem add app.models.emailTemplate.EmailTemplate pem add app.models.formHistory.FormHistory pem add app.models.adjustedForm.AdjustedForm From c1ffd5738b7dbf7b0ef2a829b91bc942acced7c9 Mon Sep 17 00:00:00 2001 From: BhushanSah Date: Mon, 6 Jul 2026 14:59:05 +0000 Subject: [PATCH 047/163] fixed supervisor for members card --- app/controllers/main_routes/main_routes.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index a10c46cc8..62ad00b7f 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -71,7 +71,6 @@ def departmentPortal(org=None,account=None): supervisors = [] for i in staff: - print(f"org= {org},----- account= {account}") if i.ORG == org: supervisors.append(i.FIRST_NAME + " " + i.LAST_NAME + " (" + i.EMAIL + ")") From 725ce6aa4a89db39417930ca714bdadf88eb8aa2 Mon Sep 17 00:00:00 2001 From: nahom70 Date: Mon, 6 Jul 2026 15:15:30 +0000 Subject: [PATCH 048/163] polished the UI --- app/static/css/managepositions.css | 15 +++++++ app/templates/main/managepositions.html | 52 ++++++++++++------------- 2 files changed, 40 insertions(+), 27 deletions(-) create mode 100644 app/static/css/managepositions.css diff --git a/app/static/css/managepositions.css b/app/static/css/managepositions.css new file mode 100644 index 000000000..9c40bbe38 --- /dev/null +++ b/app/static/css/managepositions.css @@ -0,0 +1,15 @@ +.width-12{ + width:12%; +} + +*{ + /* outline:solid 1px lime; */ + margin:0; + padding:0; + box-sizing:border-box; +} + +.department-header{ + padding:1%; + margin-top:-20px; +} \ No newline at end of file diff --git a/app/templates/main/managepositions.html b/app/templates/main/managepositions.html index 9c38e7f52..8cea7d3ef 100644 --- a/app/templates/main/managepositions.html +++ b/app/templates/main/managepositions.html @@ -2,7 +2,7 @@ {% block styles %} {{super()}} - + {% endblock %} {% block scripts %} @@ -11,39 +11,37 @@ {% endblock %} {% block app_content %} -
-

{{ department_name }}

+
+

{{ department_name }}

-
+
-
-

Manage Positions

-
-
-
- +
- - - - - - + + + + + + @@ -52,18 +50,18 @@

Manage Positions

@@ -73,18 +71,18 @@

Manage Positions

@@ -93,19 +91,19 @@

Manage Positions

From be66a39a310898e4aaa7a0ece0ab0cd8d2bb4453 Mon Sep 17 00:00:00 2001 From: ArtemKurasov Date: Mon, 6 Jul 2026 15:25:56 +0000 Subject: [PATCH 049/163] Turned the Manage Staff Table into a Data Table --- .../main_routes/departmentPortal.py | 2 +- app/controllers/main_routes/main_routes.py | 4 ++- app/static/js/manageStaff.js | 18 +++++++++++ app/templates/main/departmentPortal.html | 2 +- app/templates/main/manageStaff.html | 30 +++++++++++++++---- 5 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 app/static/js/manageStaff.js diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index be78113f7..0a1ffd4f5 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -37,5 +37,5 @@ def manageStaff(org=None,account=None): return render_template('main/manageStaff.html', staff = labor, - department = "Computer Science") + department = dept) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 0a2f21e4b..19234cda6 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -65,7 +65,9 @@ def departmentPortal(org=None,account=None): return render_template('main/departmentPortal.html', departments = departments, - department = dept) + department = dept, + organization = org, + account = account) @main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) def addUserToDept(): diff --git a/app/static/js/manageStaff.js b/app/static/js/manageStaff.js new file mode 100644 index 000000000..19dcc2911 --- /dev/null +++ b/app/static/js/manageStaff.js @@ -0,0 +1,18 @@ +$(document).ready(function() { + $('#manageStaff').DataTable({ + 'columnDefs': [{ + 'targets': [1, 2], + 'orderable': false + }], // hide sort icon on header of first column + 'aaSorting': [ + [0, 'asc'] + ], // start to sort data in second column + searching: false, + pageLength: 10, + language: { + lengthMenu: " _MENU_ entries per page" + }, + //dom: '<"top"l>rt<"bottom"p><"clear">' + }); +}) + diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 6238bfe07..7db1d87ae 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -92,7 +92,7 @@

Supervisors

- + View Details diff --git a/app/templates/main/manageStaff.html b/app/templates/main/manageStaff.html index 1df4b5853..8e37ed6f1 100644 --- a/app/templates/main/manageStaff.html +++ b/app/templates/main/manageStaff.html @@ -1,22 +1,42 @@ {% extends "base.html" %} -{% block scripts %} +{% block styles %} {{super()}} - +{% endblock %} + +{% block scripts %} +{{super()}} + + {% endblock %} {% block app_content %}

{% if department %} Manage {{department.DEPT_NAME}} Staff {% else %} Manage Staff {% endif %}



- -

+
+ + + + Click to Skip +
+
+ +
+ +
-
Position (WSL)Position CodeStatusLast Revision DateView Position DescriptionEdit Position DescriptionPosition (WSL)Position CodeStatusLast Revision DateView Position DescriptionEdit Position Description
TA (3) S85405 - +

Active - +

01/01/2024 - - S89123 - +

Requested

01/01/2024 - - Lead TA (4) S89123 - +

Inactive - +

01/01/2024 - -
+
From f5b49768da8cacefa7dd2d72d6dc7ecf742cca62 Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Mon, 6 Jul 2026 15:48:02 +0000 Subject: [PATCH 050/163] began formatting allocation card for pull request draft --- app/templates/main/departmentPortal.html | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index e4dc9804e..94f1c46b2 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -35,17 +35,26 @@

{% if department %} {{department.DEPT_NAME}} Portal {% e
- +

+ Current Allocation +

-
-

- Current Allocation -

+
+
+
+

AY 26/27

15/20 Positions

+
    +
  • 10 HR : 2
    • +
  • 12 HR : 3
    • +
  • 15 HR : 5
    • +
  • 20 HR : 5
    • +
+
+
+

Break Hours

0 of 200 Hrs.

-

AY 26/27      15 / 20 Positions

-

Break Hours      0 of 200 Hrs.

From aa70adeef902903eb43ceb4dc4258494c9b51b97 Mon Sep 17 00:00:00 2001 From: feitsopb Date: Mon, 6 Jul 2026 15:48:11 +0000 Subject: [PATCH 051/163] fixed the ban button length --- app/templates/main/manageStaff.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/main/manageStaff.html b/app/templates/main/manageStaff.html index 8e37ed6f1..31a95689d 100644 --- a/app/templates/main/manageStaff.html +++ b/app/templates/main/manageStaff.html @@ -76,9 +76,9 @@

{% if department %} Manage {{department.DEPT_NAME}} Staf {% if currentUser.isLaborAdmin or currentUser.isLaborDepartmentStudent %}

{% if currentUser.isLaborAdmin or currentUser.isLaborDepartmentStudent %} diff --git a/database/demo_data.py b/database/demo_data.py index ade1c6379..e62e5260a 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -17,16 +17,11 @@ from app.models.laborStatusForm import LaborStatusForm from app.models.formHistory import FormHistory from app.models.notes import Notes -<<<<<<< HEAD -from app.models.supervisorDepartment import SupervisorDepartment -======= from app.models.allocation import Allocation from app.models.positionHistory import PositionHistory from app.models.supervisorDepartment import SupervisorDepartment from app.models.allocation import Allocation ->>>>>>> PeeWeeAttribute - print("Inserting data for demo and testing purposes") ############################# From 62d5a13d124d8f5dbc7d87107296754bfb4ffe80 Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Tue, 7 Jul 2026 15:19:03 +0000 Subject: [PATCH 060/163] added changes from demo --- app/templates/main/departmentPortal.html | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 3c01318df..06d1e837c 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -35,7 +35,7 @@

{% if department %} {{department.DEPT_NAME}} Portal {% e
@@ -43,22 +43,28 @@

Current Allocation

AY 26/27

15/20 Positions

+
    -
  • 10 HR : 2
    • -
  • 12 HR : 3
    • -
  • 15 HR : 5
    • -
  • 20 HR : 5
    • +
  • 10 Hour - 2/2
    • +
  • 12 Hour - 3/3
    • +
  • 15 Hour - 5/5
    • +
  • 20 Hour - 5/5
+
    +
  • 5 Hour - 2/2
    • +
  • 10 Hour - 3/3
    • +
+
-

Break Hours

0 of 200 Hrs.

+

Break Hours

0/200 Hours

- - View Details + + Manage Allocations - + Request Allocation
From ae3f15e20e496cf72730cf6272826d259ffc460e Mon Sep 17 00:00:00 2001 From: ArtemKurasov Date: Tue, 7 Jul 2026 15:54:08 +0000 Subject: [PATCH 061/163] Renamed Manage Staff to Manage Members + Changed Routes to the Manage Members page --- .../main_routes/departmentPortal.py | 20 +++++++------------ .../js/{manageStaff.js => manageMembers.js} | 2 +- app/templates/main/departmentPortal.html | 2 +- .../{manageStaff.html => manageMembers.html} | 20 +++++++++---------- 4 files changed, 19 insertions(+), 25 deletions(-) rename app/static/js/{manageStaff.js => manageMembers.js} (92%) rename app/templates/main/{manageStaff.html => manageMembers.html} (82%) diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index f1cc262a5..3e0feb3bb 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -16,26 +16,20 @@ from app.login_manager import require_login, logout from app.logic.getTableData import getDatatableData from app.logic.banner import Banner +from flask import abort -@main_bp.route('/department/manage_staff', methods=['GET']) -@main_bp.route('/department/manage_staff/', methods=['GET']) -@main_bp.route('/department/manage_staff//', methods=['GET']) + +@main_bp.route('/department///members', methods=['GET']) def manageStaff(org=None,account=None): try: dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) except (NameError, DoesNotExist): dept = None + abort(404) - staff = list(SupervisorDepartment.select(SupervisorDepartment, Supervisor).join(Supervisor).order_by(SupervisorDepartment.isActive.desc(), SupervisorDepartment.banStatus.desc()).dicts()) - - #if g.currentUser.isLaborAdmin: - # departments = list(Department.select().order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) - #else: - # departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) - - labor = [["Scott Heggen", 7, 11, 0, 1, "B0010201"], ["Brian Ramsay", 9, 12, 0, 1, "B0011251"], ["Bright Feitsop", 10, 20, 1, 0, "B023241"], ["Artem Kurasov", 6, 7, 0, 0, "B1110201"]] + members = list(SupervisorDepartment.select(SupervisorDepartment, Supervisor).where(SupervisorDepartment.department == dept).join(Supervisor).order_by(SupervisorDepartment.isActive.desc(), SupervisorDepartment.banStatus.desc()).dicts()) - return render_template('main/manageStaff.html', - staff = staff, + return render_template('main/manageMembers.html', + members = members, department = dept) diff --git a/app/static/js/manageStaff.js b/app/static/js/manageMembers.js similarity index 92% rename from app/static/js/manageStaff.js rename to app/static/js/manageMembers.js index 19dcc2911..0935cff23 100644 --- a/app/static/js/manageStaff.js +++ b/app/static/js/manageMembers.js @@ -1,5 +1,5 @@ $(document).ready(function() { - $('#manageStaff').DataTable({ + $('#manageMembers').DataTable({ 'columnDefs': [{ 'targets': [1, 2], 'orderable': false diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 7db1d87ae..9804f4d21 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -92,7 +92,7 @@

Supervisors

- + View Details diff --git a/app/templates/main/manageStaff.html b/app/templates/main/manageMembers.html similarity index 82% rename from app/templates/main/manageStaff.html rename to app/templates/main/manageMembers.html index 2a52ad47e..be28b13ce 100644 --- a/app/templates/main/manageStaff.html +++ b/app/templates/main/manageMembers.html @@ -8,12 +8,12 @@ {% block scripts %} {{super()}} - + {% endblock %} {% block app_content %} -

{% if department %} Manage {{department.DEPT_NAME}} Staff {% else %} Manage Staff {% endif %}

+

{% if department %} Manage {{department.DEPT_NAME}} Members {% else %} Manage Members {% endif %}



@@ -36,22 +36,22 @@

{% if department %} Manage {{department.DEPT_NAME}} Staf
-

Name {% if not i[4] %} - + {% else %} - + {% endif %} From eacbf2791e75da9083e296954ba08c29b9d9a7c6 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Mon, 6 Jul 2026 16:00:20 +0000 Subject: [PATCH 052/163] removed some hardcoded css, fixed the icon --- app/static/css/base.css | 4 ++++ app/templates/main/departmentPortal.html | 21 ++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/static/css/base.css b/app/static/css/base.css index 940f8d6e5..c1be451d9 100755 --- a/app/static/css/base.css +++ b/app/static/css/base.css @@ -207,6 +207,7 @@ a { background-clip: border-box; border: 1px solid rgba(0, 0, 0, 0.125); border-radius: 0.25rem; + overflow: hidden; } .card-body { @@ -250,6 +251,9 @@ a { padding: 0.5rem 1rem; background-color: rgba(0, 0, 0, 0.03); border-top: 1px solid rgba(0, 0, 0, 0.125); + border-bottom-left-radius: 1rem; + border-bottom-right-radius: 1rem; + } .card-footer:last-child { diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 11cc821e7..6caf34514 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -4,7 +4,6 @@ {{super()}} {% endblock %} {% block app_content %}

{% if department %} {{department.DEPT_NAME}} Portal {% else %} Choose a Department: {% endif %}

@@ -28,9 +27,9 @@

{% if department %} {{department.DEPT_NAME}} Portal {% e {% if department %} -
+
-
+
@@ -44,7 +43,7 @@
-
+
@@ -78,17 +77,17 @@

Supervisors

-
+
+
+ +

Positions

-
- -
    @@ -102,7 +101,7 @@

    Positions

-
+
View Details
From dbb1bd1caf2a38e4eeabcbc6825482b03ae4bbfa Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Mon, 6 Jul 2026 17:21:16 +0000 Subject: [PATCH 053/163] Revert "merge commit with the allocation branch" This reverts commit c3b577a467cef46e79bff11f20466b7b0ec1bbdc, reversing changes made to eacbf2791e75da9083e296954ba08c29b9d9a7c6. --- app/controllers/main_routes/main_routes.py | 23 ++--------- app/models/allocation.py | 9 ----- app/templates/main/departmentPortal.html | 46 ++++++---------------- database/demo_data.py | 15 ------- database/migrate_db.sh | 1 - 5 files changed, 14 insertions(+), 80 deletions(-) delete mode 100644 app/models/allocation.py diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index cb658b4ef..be45f18d5 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -1,9 +1,8 @@ from flask import render_template, request, json, redirect, url_for, send_file, g, flash, jsonify -from peewee import JOIN, DoesNotExist, fn +from peewee import JOIN, DoesNotExist from functools import reduce import operator from app.models.department import Department -from app.models.allocation import Allocation from app.models.supervisor import Supervisor from app.models.supervisorDepartment import SupervisorDepartment from app.models.student import Student @@ -78,27 +77,11 @@ def departmentPortal(org=None,account=None): if i.ORG == org: supervisors.append(i.FIRST_NAME + " " + i.LAST_NAME + " (" + i.EMAIL + ")") - allocation = None - positionsUsed = 0 - breakHoursUsed = 0 - if dept and g.openTerm: - allocation = Allocation.get_or_none(Allocation.department == dept, Allocation.term == g.openTerm) - usage = (LaborStatusForm - .select(fn.COUNT(LaborStatusForm.laborStatusFormID).alias('positionCount'), - fn.SUM(LaborStatusForm.contractHours).alias('hoursSum')) - .where(LaborStatusForm.department == dept, LaborStatusForm.termCode == g.openTerm) - .get()) - positionsUsed = usage.positionCount or 0 - breakHoursUsed = usage.hoursSum or 0 - - return render_template('main/departmentPortal.html', + return render_template('main/departmentPortal.html', departments = departments, department = dept, positions = positions, - supervisors = supervisors, - allocation = allocation, - positionsUsed = positionsUsed, - breakHoursUsed = breakHoursUsed) + supervisors = supervisors) @main_bp.route('/department///managepositions', methods=['GET']) def managePositions(org, account): diff --git a/app/models/allocation.py b/app/models/allocation.py deleted file mode 100644 index f67b61e3e..000000000 --- a/app/models/allocation.py +++ /dev/null @@ -1,9 +0,0 @@ -from app.models import * -from app.models.department import Department -from app.models.term import Term - -class Allocation(baseModel): - department = ForeignKeyField(Department, on_delete="cascade") - term = ForeignKeyField(Term, on_delete="cascade") - totalPositions = IntegerField() - totalBreakHours = IntegerField() diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index d6082cae8..6caf34514 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -29,43 +29,19 @@

{% if department %} {{department.DEPT_NAME}} Portal {% e {% if department %}
-
+
-
-
- -

- Current Allocation -

- -
-
-
-
-

AY 26/27

15/20 Positions

-
-
    -
  • 10 HR : 2
    • -
  • 12 HR : 3
    • -
  • 15 HR : 5
    • -
  • 20 HR : 5
    • -
-
-
-

Break Hours

0 of 200 Hrs.

-
-
- - -
- - View Details - - - Request Allocation - +
+ + + + + Current Allocation +
+


AY 26/27 15/20 POSITIONS

Break Hours 0 of 200 hrs

+ Go somewhere
-
+
diff --git a/database/demo_data.py b/database/demo_data.py index 1bb4c3b6a..0557c9361 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -530,21 +530,6 @@ Term.insert_many(terms).on_conflict_replace().execute() print(f" * terms for {current_year}-{current_year+1} added") -############################# -# Allocation -############################# -from app.models.allocation import Allocation - -allocations = [ - {"department": 1, "term": f"{current_year}00", "totalPositions": 20, "totalBreakHours": 200}, - {"department": 2, "term": f"{current_year}00", "totalPositions": 12, "totalBreakHours": 150}, - {"department": 3, "term": f"{current_year}00", "totalPositions": 15, "totalBreakHours": 180}, - {"department": 4, "term": f"{current_year}00", "totalPositions": 10, "totalBreakHours": 100}, - {"department": 5, "term": f"{current_year}00", "totalPositions": 20, "totalBreakHours": 200}, -] -Allocation.insert_many(allocations).on_conflict_replace().execute() -print(" * allocations added") - ############################# # Create a Pending Labor Status Form ############################# diff --git a/database/migrate_db.sh b/database/migrate_db.sh index 472aab283..f88c91f26 100755 --- a/database/migrate_db.sh +++ b/database/migrate_db.sh @@ -16,7 +16,6 @@ pem add app.models.laborStatusForm.LaborStatusForm pem add app.models.laborReleaseForm.LaborReleaseForm pem add app.models.term.Term pem add app.models.department.Department -pem add app.models.allocation.Allocation pem add app.models.emailTemplate.EmailTemplate pem add app.models.formHistory.FormHistory pem add app.models.adjustedForm.AdjustedForm From 3bcc16463b9e3690288064c37daa66e0a045b4b9 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Mon, 6 Jul 2026 19:20:50 +0000 Subject: [PATCH 054/163] refixed the icon, added an if statement for the No positions edge case --- app/controllers/main_routes/main_routes.py | 7 ++- app/templates/main/departmentPortal.html | 50 ++++++++++++++++------ 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index be45f18d5..7fc414b75 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -67,8 +67,11 @@ def departmentPortal(org=None,account=None): pos = Tracy().getPositionsFromDepartment(org, account) positions = [] - for i in pos: - positions.append(i.POSN_TITLE + "" + "(" + i.WLS + ")") + if pos == []: + positions = ["No Positions for this Department"] + else: + for i in pos: + positions.append(i.POSN_TITLE + "" + "(" + i.WLS + ")") staff = Tracy().getSupervisors() supervisors = [] diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 6caf34514..dd1b89470 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -29,19 +29,41 @@

{% if department %} {{department.DEPT_NAME}} Portal {% e {% if department %}
-
+
-
- - - - - Current Allocation -
-


AY 26/27 15/20 POSITIONS

Break Hours 0 of 200 hrs

- Go somewhere +
+
+ +

+ Current Allocation +

+ +
+
+
+
+

AY 26/27

15/20 Positions

+
+
    +
  • 10 HR : 2
    • +
  • 12 HR : 3
    • +
  • 15 HR : 5
    • +
  • 20 HR : 5
    • +
+
+
+

Break Hours

0 of 200 Hrs.

+
-
+
+ + View Details + + + Request Allocation + +
+

@@ -81,8 +103,8 @@

Supervisors

-
@@ -104,7 +126,7 @@

Positions

View Details
-
+
{% endif %} From f759f54f0610d610dc526eb9cde5b44b9b0ee727 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Mon, 6 Jul 2026 19:33:51 +0000 Subject: [PATCH 055/163] began fixing the position of the current alloc icon. --- app/templates/main/departmentPortal.html | 53 +++--------------------- 1 file changed, 6 insertions(+), 47 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index dd1b89470..482bf1fe7 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -32,11 +32,9 @@

{% if department %} {{department.DEPT_NAME}} Portal {% e
-
- -

+
+

@@ -68,11 +66,12 @@

Break Hours

0 of 200 Hrs.

-
-
+ {% endblock %} diff --git a/database/demo_data.py b/database/demo_data.py index ade1c6379..ee91a4385 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -17,15 +17,11 @@ from app.models.laborStatusForm import LaborStatusForm from app.models.formHistory import FormHistory from app.models.notes import Notes -<<<<<<< HEAD -from app.models.supervisorDepartment import SupervisorDepartment -======= from app.models.allocation import Allocation from app.models.positionHistory import PositionHistory from app.models.supervisorDepartment import SupervisorDepartment from app.models.allocation import Allocation ->>>>>>> PeeWeeAttribute print("Inserting data for demo and testing purposes") From 2c720b0883f4fb49200f092a2def24bd3028114f Mon Sep 17 00:00:00 2001 From: ArtemKurasov Date: Tue, 7 Jul 2026 13:56:05 +0000 Subject: [PATCH 059/163] Make the Manage Staff Table Pull From the Demo Data --- app/controllers/main_routes/departmentPortal.py | 12 ++++++------ app/templates/main/manageStaff.html | 10 +++++----- database/demo_data.py | 5 ----- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index 0a1ffd4f5..f1cc262a5 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -26,16 +26,16 @@ def manageStaff(org=None,account=None): except (NameError, DoesNotExist): dept = None + staff = list(SupervisorDepartment.select(SupervisorDepartment, Supervisor).join(Supervisor).order_by(SupervisorDepartment.isActive.desc(), SupervisorDepartment.banStatus.desc()).dicts()) - - if g.currentUser.isLaborAdmin: - departments = list(Department.select().order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) - else: - departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) + #if g.currentUser.isLaborAdmin: + # departments = list(Department.select().order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) + #else: + # departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) labor = [["Scott Heggen", 7, 11, 0, 1, "B0010201"], ["Brian Ramsay", 9, 12, 0, 1, "B0011251"], ["Bright Feitsop", 10, 20, 1, 0, "B023241"], ["Artem Kurasov", 6, 7, 0, 0, "B1110201"]] return render_template('main/manageStaff.html', - staff = labor, + staff = staff, department = dept) diff --git a/app/templates/main/manageStaff.html b/app/templates/main/manageStaff.html index 2bb2becca..2a52ad47e 100644 --- a/app/templates/main/manageStaff.html +++ b/app/templates/main/manageStaff.html @@ -54,8 +54,8 @@

{% if department %} Manage {{department.DEPT_NAME}} Staf {% for i in staff %}

- {{ i[0] }} - ✉ + {{ i['legal_name'] + " " + i['LAST_NAME']}} + ✉
@@ -65,12 +65,12 @@

{% if department %} Manage {{department.DEPT_NAME}} Staf

- Primary: {{ i[1] }}
- Secondary: {{ i[2] }} + Primary: 12
+ Secondary: 13 		- +
+
- + {% if currentUser.isLaborAdmin or currentUser.isLaborDepartmentStudent %} - - + + {% endif %} - {% for i in staff %} + {% for i in members %} - {% if currentUser.isLaborAdmin or currentUser.isLaborDepartmentStudent %} - - {% endif %} From ffe248f412aa2ca006a631fcee86add02103e647 Mon Sep 17 00:00:00 2001 From: rukwashai Date: Tue, 7 Jul 2026 12:05:20 -0400 Subject: [PATCH 062/163] Fix duplicate style attribute and stray backslash in departmentPortal.html --- app/templates/main/departmentPortal.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 06d1e837c..b40f7a4aa 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -27,7 +27,7 @@

{% if department %} {{department.DEPT_NAME}} Portal {% e {% if department %} -
+
@@ -138,7 +138,7 @@

Positions

{% endif %} -{% endblock %}\ +{% endblock %} From fd01b329890438b066069987c7ec9134a59f527e Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Tue, 7 Jul 2026 18:39:24 +0000 Subject: [PATCH 063/163] attempting to get back end communication --- app/controllers/main_routes/main_routes.py | 25 ++++++++++++++++++++++ app/templates/main/departmentPortal.html | 4 ++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 7fc414b75..1face5726 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -2,6 +2,7 @@ from peewee import JOIN, DoesNotExist from functools import reduce import operator +from app.models.allocation import Allocation from app.models.department import Department from app.models.supervisor import Supervisor from app.models.supervisorDepartment import SupervisorDepartment @@ -167,3 +168,27 @@ def submitToBanner(formHistoryId): return "Form successfully submitted to Banner.", 200 else: return "Submitting to Banner failed.", 500 + +@main_bp.route('/department///viewallocations', methods=['GET']) +def ViewAllocations(org, account): + + try: + dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) + except DoesNotExist: + return render_template('errors/404.html'), 404 + + try: + term = Term.get(Term.termState == True) + except DoesNotExist: + return render_template('errors/404.html'), 404 + + allocation = (Allocation + .select(Allocation, Term) + .join(Term) + .where(Allocation.department == dept, Allocation.termCode == term)) + + return render_template('main/viewAllocations.html', + department = dept, + department_name = dept.DEPT_NAME, + allocations = allocation,) + diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 06d1e837c..787939829 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -27,7 +27,7 @@

{% if department %} {{department.DEPT_NAME}} Portal {% e

{% if department %} -
+
@@ -138,7 +138,7 @@

Positions

{% endif %} -{% endblock %}\ +{% endblock %} From 0f435f23a7cc7c18c2888df8a8ecaa3258280fc3 Mon Sep 17 00:00:00 2001 From: ArtemKurasov Date: Tue, 7 Jul 2026 19:39:02 +0000 Subject: [PATCH 064/163] Moved the isBanned attribute from SupervisorDepartment to Supervisor --- app/controllers/main_routes/departmentPortal.py | 2 +- app/models/supervisor.py | 8 +++++--- app/models/supervisorDepartment.py | 5 ----- database/demo_data.py | 5 ----- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index 3e0feb3bb..80f16a13e 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -27,7 +27,7 @@ def manageStaff(org=None,account=None): dept = None abort(404) - members = list(SupervisorDepartment.select(SupervisorDepartment, Supervisor).where(SupervisorDepartment.department == dept).join(Supervisor).order_by(SupervisorDepartment.isActive.desc(), SupervisorDepartment.banStatus.desc()).dicts()) + members = list(SupervisorDepartment.select(SupervisorDepartment, Supervisor).where(SupervisorDepartment.department == dept).join(Supervisor).order_by(SupervisorDepartment.isActive.desc()).dicts()) return render_template('main/manageMembers.html', members = members, diff --git a/app/models/supervisor.py b/app/models/supervisor.py index 7c08354d3..3f9d3608e 100644 --- a/app/models/supervisor.py +++ b/app/models/supervisor.py @@ -13,9 +13,11 @@ class Supervisor(baseModel): ORG = CharField(null=True) DEPT_NAME = CharField(null=True) - legal_name = CharField(null=True) - preferred_name = CharField(null=True) - isActive = BooleanField(default=False) + legal_name = CharField(null=True) + preferred_name = CharField(null=True) + isActive = BooleanField(default=False) + isBanned = BooleanField(default=False) + @property diff --git a/app/models/supervisorDepartment.py b/app/models/supervisorDepartment.py index 72a80ea6d..938c5f320 100644 --- a/app/models/supervisorDepartment.py +++ b/app/models/supervisorDepartment.py @@ -5,12 +5,7 @@ class SupervisorDepartment(baseModel): supervisor = ForeignKeyField(Supervisor, null=True) department = ForeignKeyField(Department) - banStatus = BooleanField(default=False) isActive = BooleanField(default=False) isCoordinator = BooleanField(default=False) - @property - def isBanned(self): - return self.banStatus - diff --git a/database/demo_data.py b/database/demo_data.py index e62e5260a..6e980070f 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -659,7 +659,6 @@ { "supervisor": "B12361006", "department": 1, - "banStatus": False, "isActive": True, "isCoordinator": True }, @@ -667,7 +666,6 @@ { "supervisor": "B12365892", "department": 1, - "banStatus": True, "isActive": True, "isCoordinator": False }, @@ -675,7 +673,6 @@ { "supervisor": "B12365893", "department": 1, - "banStatus": False, "isActive": False, "isCoordinator": False }, @@ -683,7 +680,6 @@ { "supervisor": "B00763721", "department": 1, - "banStatus": False, "isActive": True, "isCoordinator": False }, @@ -691,7 +687,6 @@ { "supervisor": "B00841417", "department": 1, - "banStatus": False, "isActive": True, "isCoordinator": True } From fb126409f03e12c48f108c2e9919f876a4ad3c02 Mon Sep 17 00:00:00 2001 From: feitsopb Date: Tue, 7 Jul 2026 20:20:49 +0000 Subject: [PATCH 065/163] created a toggle button and took out a button --- app/static/css/managemembers.css | 61 +++++++++++++++++++++++++++ app/templates/main/manageMembers.html | 17 +++++--- 2 files changed, 73 insertions(+), 5 deletions(-) create mode 100644 app/static/css/managemembers.css diff --git a/app/static/css/managemembers.css b/app/static/css/managemembers.css new file mode 100644 index 000000000..d6757c6fc --- /dev/null +++ b/app/static/css/managemembers.css @@ -0,0 +1,61 @@ +/* The switch container */ +.switch { + position: relative; + display: inline-block; + width: 25px; + height: 13px; + vertical-align: middle; +} + +/* Hide default HTML checkbox */ +.switch input { + opacity: 0; + width: 0; + height: 0; +} + +/* The slider track */ +.slider { + position: absolute; + cursor: pointer; + top: 0; left: 0; right: 0; bottom: 0; + background-color: #ccc !important; + transition: .4s; +} + +/* The slider knob */ +.slider:before { + position: absolute; + content: ""; + height: 9px; + width: 9px; + left: 2px; + bottom: 2px; + background-color: white !important; + transition: .4s; +} + +/* Checked state track color */ +input:checked + .slider { + background-color: #337ab7 !important; /* Bootstrap 3 Primary Color */ +} + +/* Checked state knob movement */ +input:checked + .slider:before { + transform: translateX(12px) !important; +} + +/* Rounded slider track and knob */ +.slider.round { + border-radius: 17px; +} +.slider.round:before { + border-radius: 50%; +} + +/* Optional label spacing */ +.switch-label { + margin-left: 5px; + vertical-align: middle; + font-weight: bold; +} \ No newline at end of file diff --git a/app/templates/main/manageMembers.html b/app/templates/main/manageMembers.html index be28b13ce..d1ae263dd 100644 --- a/app/templates/main/manageMembers.html +++ b/app/templates/main/manageMembers.html @@ -4,7 +4,8 @@ {{super()}} -{% endblock %} + + {% endblock %} {% block scripts %} {{super()}} @@ -17,8 +18,8 @@

{% if department %} Manage {{department.DEPT_NAME}} Memb

-
- +
Click to Skip @@ -70,8 +71,14 @@

{% if department %} Manage {{department.DEPT_NAME}} Memb

+
+ + +
+ {% if currentUser.isLaborAdmin or currentUser.isLaborDepartmentStudent %} @@ -71,14 +67,14 @@

{% if department %} Manage {{department.DEPT_NAME}} Memb

{% if currentUser.isLaborAdmin or currentUser.isLaborDepartmentStudent %} - - - + + {% if currentUser.isLaborAdmin or currentUser.isLaborDepartmentStudent %} - - + + {% endif %} @@ -51,17 +51,17 @@

{% if department %} Manage {{department.DEPT_NAME}} Memb {% for i in members %}

- - {% if currentUser.isLaborAdmin or currentUser.isLaborDepartmentStudent %} - - {% endif %} From 410cf4342fe038765caa38161949ba6687db22e3 Mon Sep 17 00:00:00 2001 From: Brian Ramsay Date: Wed, 8 Jul 2026 14:08:46 -0400 Subject: [PATCH 079/163] No passwords in files --- db_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db_test.py b/db_test.py index f1fcb6480..560c04634 100644 --- a/db_test.py +++ b/db_test.py @@ -14,8 +14,8 @@ pyodbc_uri = 'DRIVER=FreeTDS;SERVER={};PORT=1433;DATABASE={};UID={};PWD={};TDS_Version=7.4;'.format(details['server'],details['db'],details['user'],details['password']) pyconn = pyodbc.connect(pyodbc_uri) c = pyconn.cursor() -#for row in c.execute("select * from STUDATA where ID like '%B00815333%'"): -for row in c.execute("select * from STUPOSN"): +for row in c.execute("select * from STUDATA where ID like '%B00766883%'"): +#for row in c.execute("select * from STUPOSN"): print("PYODBC:",row) break From 3cd1205bf936fef6b860778c6ddd0862d8208b89 Mon Sep 17 00:00:00 2001 From: Brian Ramsay Date: Wed, 8 Jul 2026 14:46:31 -0400 Subject: [PATCH 080/163] Added new model requiremetns --- app/models/allocation.py | 23 +++++++++++++++++++++++ app/models/positionHistory.py | 14 ++++++++++++++ app/models/supervisor.py | 1 + app/models/supervisorDepartment.py | 3 ++- database/migrate_db.sh | 2 ++ 5 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 app/models/allocation.py create mode 100644 app/models/positionHistory.py diff --git a/app/models/allocation.py b/app/models/allocation.py new file mode 100644 index 000000000..eb83877a0 --- /dev/null +++ b/app/models/allocation.py @@ -0,0 +1,23 @@ +from app.models import * +from app.models.department import Department +from app.models.supervisor import Supervisor +from app.models.term import Term + +class Allocation(baseModel): + termCode = ForeignKeyField(Term) + department = ForeignKeyField(Department) + isFinal = BooleanField(default=False) + approvedOn = DateField(null=True) + approvedBy = ForeignKeyField(Supervisor, null=True) + justification = TextField() + primary_10 = IntegerField() + primary_12 = IntegerField() + primary_15 = IntegerField() + primary_20 = IntegerField() + secondary_5 = IntegerField() + secondary_10 = IntegerField() + breakHours = IntegerField() + + class Meta: + indexes = ( (('termCode', 'department', 'isFinal'), True), ) + diff --git a/app/models/positionHistory.py b/app/models/positionHistory.py new file mode 100644 index 000000000..514670759 --- /dev/null +++ b/app/models/positionHistory.py @@ -0,0 +1,14 @@ +from app.models import * +from app.models.department import Department + +class PositionHistory(baseModel): + positionCode = CharField() + department = ForeignKeyField(Department) + status = CharField() + wls = IntegerField() + revisionDate = DateField() + description = TextField(default=None) + + class Meta: + indexes = ( (('positionCode', 'revisionDate', 'status'), True), ) + diff --git a/app/models/supervisor.py b/app/models/supervisor.py index 7c08354d3..e16d43282 100644 --- a/app/models/supervisor.py +++ b/app/models/supervisor.py @@ -16,6 +16,7 @@ class Supervisor(baseModel): legal_name = CharField(null=True) preferred_name = CharField(null=True) isActive = BooleanField(default=False) + isBanned = BooleanField(default=False) @property diff --git a/app/models/supervisorDepartment.py b/app/models/supervisorDepartment.py index 3585e1eb2..dd5b15385 100644 --- a/app/models/supervisorDepartment.py +++ b/app/models/supervisorDepartment.py @@ -3,5 +3,6 @@ from app.models.department import Department class SupervisorDepartment(baseModel): - supervisor = ForeignKeyField(Supervisor, null=True) + supervisor = ForeignKeyField(Supervisor) department = ForeignKeyField(Department) + isCoordinator = BooleanField(default=False) diff --git a/database/migrate_db.sh b/database/migrate_db.sh index f88c91f26..dea226d8e 100755 --- a/database/migrate_db.sh +++ b/database/migrate_db.sh @@ -30,6 +30,8 @@ pem add app.models.supervisor.Supervisor pem add app.models.supervisorDepartment.SupervisorDepartment pem add app.models.studentLaborEvaluation.StudentLaborEvaluation pem add app.models.formSearchResult.FormSearchResult +pem add app.models.positionHistory.PositionHistory +pem add app.models.allocation.Allocation pem watch pem migrate From a57e0550848f3e15812f6b7ddf8ec7bc901e86e0 Mon Sep 17 00:00:00 2001 From: Brian Ramsay Date: Wed, 8 Jul 2026 14:55:07 -0400 Subject: [PATCH 081/163] Add new DDL to prod backup --- database/prod-backup.sql | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/database/prod-backup.sql b/database/prod-backup.sql index 6746950e6..54a36f8fc 100755 --- a/database/prod-backup.sql +++ b/database/prod-backup.sql @@ -1208,3 +1208,17 @@ ALTER TABLE `laborreleaseform` alter table student add isActive boolean; +alter table supervisor add isBanned boolean; +alter table supervisordepartment add `isCoordinator` BOOL NOT NULL default false; + +CREATE TABLE `positionhistory` (`id` INTEGER AUTO_INCREMENT NOT NULL PRIMARY KEY, `positionCode` VARCHAR(255) NOT NULL, `department_id` INTEGER NOT NULL, `status` VARCHAR(255) NOT NULL, `wls` INTEGER NOT NULL, `revisionDate` DATE NOT NULL, `description` TEXT NOT NULL, FOREIGN KEY (`department_id`) REFERENCES `department` (`departmentID`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE INDEX `positionhistory_department_id` ON `positionhistory` (`department_id`); +CREATE UNIQUE INDEX `positionhistory_positionCode_revisionDate_status` ON `positionhistory` (`positionCode`, `revisionDate`, `status`); + +CREATE TABLE `allocation` (`id` INTEGER AUTO_INCREMENT NOT NULL PRIMARY KEY, `termCode_id` INTEGER NOT NULL, `department_id` INTEGER NOT NULL, `isFinal` BOOL NOT NULL, `approvedOn` DATE, `approvedBy_id` VARCHAR(255), `justification` TEXT NOT NULL, `primary_10` INTEGER NOT NULL, `primary_12` INTEGER NOT NULL, `primary_15` INTEGER NOT NULL, `primary_20` INTEGER NOT NULL, `secondary_5` INTEGER NOT NULL, `secondary_10` INTEGER NOT NULL, `breakHours` INTEGER NOT NULL, FOREIGN KEY (`termCode_id`) REFERENCES `term` (`termCode`), FOREIGN KEY (`department_id`) REFERENCES `department` (`departmentID`), FOREIGN KEY (`approvedBy_id`) REFERENCES `supervisor` (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +CREATE UNIQUE INDEX `allocation_termCode_id_department_id_isFinal` ON `allocation` (`termCode_id`, `department_id`, `isFinal`); From a6e09db3a5d662fcda070fb34cd987732e8b0e0d Mon Sep 17 00:00:00 2001 From: Brian Ramsay Date: Wed, 8 Jul 2026 14:55:22 -0400 Subject: [PATCH 082/163] Fix failing admin management tests --- tests/code/test_adminManagement.py | 64 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/tests/code/test_adminManagement.py b/tests/code/test_adminManagement.py index d6d0ac639..56c605869 100644 --- a/tests/code/test_adminManagement.py +++ b/tests/code/test_adminManagement.py @@ -1,46 +1,44 @@ import pytest from app.controllers.admin_routes.adminManagement import addAdmin, removeAdmin from app.models.user import User +from app.models import mainDB from peewee import DoesNotExist @pytest.mark.integration def test_addAdmin(): - newAdmin = "pearcej" - user = User.get(User.username == newAdmin) + with mainDB.atomic() as transaction: + newAdmin = "pearcej" + user = User.get(User.username == newAdmin) - # Before adding user as admin - assert not user.isLaborAdmin - # Test adding labor admin - addAdmin(user, 'labor') - assert user.isLaborAdmin + # Before adding user as admin + assert not user.isLaborAdmin + addAdmin(user, 'Labor') + user = User.get(User.username == newAdmin) # check if the db is actually changed + assert user.isLaborAdmin - assert not user.isFinancialAidAdmin - # Test adding financial aid admin - addAdmin(user, 'finAid') - assert user.isFinancialAidAdmin + assert not user.isFinancialAidAdmin + addAdmin(user, 'FinancialAid') + assert user.isFinancialAidAdmin - assert not user.isSaasAdmin - # Test adding saas admin - addAdmin(user, 'saas') - assert user.isSaasAdmin + assert not user.isSaasAdmin + addAdmin(user, 'Saas') + assert user.isSaasAdmin @pytest.mark.integration def test_removeAdmin(): - oldAdmin = "pearcej" - user = User.get(User.username == oldAdmin) - - # Before removing user as admin - assert user.isLaborAdmin - # Test removing labor admin - removeAdmin(user, 'labor') - assert not user.isLaborAdmin - - assert user.isFinancialAidAdmin - # Test removing financial aid admin - removeAdmin(user, 'finAid') - assert not user.isFinancialAidAdmin - - assert user.isSaasAdmin - # Test removing saas admin - removeAdmin(user, 'saas') - assert not user.isSaasAdmin + with mainDB.atomic() as transaction: + oldAdmin = "pearcej" + user = User.get(User.username == oldAdmin) + + assert user.isLaborAdmin + removeAdmin(user, 'Labor') + user = User.get(User.username == oldAdmin) # check if the db is actually changed + assert not user.isLaborAdmin + + assert user.isFinancialAidAdmin + removeAdmin(user, 'FinancialAid') + assert not user.isFinancialAidAdmin + + assert user.isSaasAdmin + removeAdmin(user, 'Saas') + assert not user.isSaasAdmin From 2de8e2bb3d923295281eb05da48063727e25d314 Mon Sep 17 00:00:00 2001 From: Brian Ramsay Date: Wed, 8 Jul 2026 15:06:13 -0400 Subject: [PATCH 083/163] Fix failing tests - missing Term, and new tracy setup reqs --- database/demo_data.py | 9 + tests/code/test_tracy.py | 165 +++++++------- tests/code/test_userInsertFunctions.py | 289 +++++++++++++------------ 3 files changed, 246 insertions(+), 217 deletions(-) diff --git a/database/demo_data.py b/database/demo_data.py index 0557c9361..57c989c14 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -506,6 +506,15 @@ current_year = today.year - (today.month < 8) terms = [ + { + "termCode": f"202000", + "termName": f"AY 2020-2021", + "termStart": f"2020-08-01", + "termEnd": f"2021-05-01", + "termState": 0, + "primaryCutOff": f"2020-09-01", + "adjustmentCutOff": f"2020-10-01", + }, { "termCode": f"{current_year}00", "termName": f"AY {current_year}-{current_year+1}", diff --git a/tests/code/test_tracy.py b/tests/code/test_tracy.py index cd86359ec..5462b0c88 100644 --- a/tests/code/test_tracy.py +++ b/tests/code/test_tracy.py @@ -1,4 +1,5 @@ import pytest +from app import app from app.logic.tracy import Tracy from app.logic.tracy import InvalidQueryException @@ -15,132 +16,144 @@ def test_init(self, tracy): @pytest.mark.integration def test_getStudents(self, tracy): - students = tracy.getStudents() - assert ['Elaheh','Guillermo','Jeremiah','Kat', 'Oluwagbayi', 'Test', 'Tyler'] == [s.FIRST_NAME for s in students] - assert ['718','300','420','420', '883', '700', '420'] == [s.STU_CPO for s in students] + with app.app_context(): + students = tracy.getStudents() + assert ['Elaheh','Guillermo','Jeremiah','Kat', 'Oluwagbayi', 'Test', 'Tyler'] == [s.FIRST_NAME for s in students] + assert ['718','300','420','420', '883', '700', '420'] == [s.STU_CPO for s in students] @pytest.mark.integration def test_getStudentFromBNumber(self, tracy): - student = tracy.getStudentFromBNumber("B00734292") - assert 'Guillermo' == student.FIRST_NAME + with app.app_context(): + student = tracy.getStudentFromBNumber("B00734292") + assert 'Guillermo' == student.FIRST_NAME - student = tracy.getStudentFromBNumber(" B00734292") - assert 'Guillermo' == student.FIRST_NAME + student = tracy.getStudentFromBNumber(" B00734292") + assert 'Guillermo' == student.FIRST_NAME - student = tracy.getStudentFromBNumber("B00888329 ") - assert 'Jeremiah' == student.FIRST_NAME + student = tracy.getStudentFromBNumber("B00888329 ") + assert 'Jeremiah' == student.FIRST_NAME - with pytest.raises(InvalidQueryException): - student = tracy.getStudentFromBNumber("B0000000") + with pytest.raises(InvalidQueryException): + student = tracy.getStudentFromBNumber("B0000000") - with pytest.raises(InvalidQueryException): - student = tracy.getStudentFromBNumber(17) + with pytest.raises(InvalidQueryException): + student = tracy.getStudentFromBNumber(17) @pytest.mark.integration def test_getStudentFromEmail(self, tracy): - student = tracy.getStudentFromEmail("cruzg@berea.edu") - assert 'Guillermo' == student.FIRST_NAME + with app.app_context(): + student = tracy.getStudentFromEmail("cruzg@berea.edu") + assert 'Guillermo' == student.FIRST_NAME - with pytest.raises(InvalidQueryException): - student = tracy.getStudentFromEmail("jimmyjoe@place.biz") + with pytest.raises(InvalidQueryException): + student = tracy.getStudentFromEmail("jimmyjoe@place.biz") - with pytest.raises(InvalidQueryException): - student = tracy.getStudentFromEmail(17) + with pytest.raises(InvalidQueryException): + student = tracy.getStudentFromEmail(17) @pytest.mark.integration def test_getSupervisors(self, tracy): - supervisors = tracy.getSupervisors() + with app.app_context(): + supervisors = tracy.getSupervisors() - for s in supervisors: - assert s.FIRST_NAME in ['Alex','Brian','Jan','Jasmine','Mario','Megan','Scott','Madina'] - assert s.CPO in ['420','6305','6301','6301','6302','6303','6300'] + for s in supervisors: + assert s.FIRST_NAME in ['Alex','Brian','Jan','Jasmine','Mario','Megan','Scott','Madina'] + assert s.CPO in ['420','6305','6301','6301','6302','6303','6300'] @pytest.mark.integration def test_getSupervisorFromID(self, tracy): - supervisor = tracy.getSupervisorFromID("B1236237") - assert 'Megan' == supervisor.FIRST_NAME + with app.app_context(): + supervisor = tracy.getSupervisorFromID("B1236237") + assert 'Megan' == supervisor.FIRST_NAME - with pytest.raises(InvalidQueryException): - supervisor = tracy.getSupervisorFromID("eleven") + with pytest.raises(InvalidQueryException): + supervisor = tracy.getSupervisorFromID("eleven") - with pytest.raises(InvalidQueryException): - supervisor = tracy.getSupervisorFromID(17) + with pytest.raises(InvalidQueryException): + supervisor = tracy.getSupervisorFromID(17) @pytest.mark.integration def test_getSupervisorFromEmail(self, tracy): - supervisor = tracy.getSupervisorFromEmail("nakazawam@berea.edu") - assert 'Mario' == supervisor.FIRST_NAME + with app.app_context(): + supervisor = tracy.getSupervisorFromEmail("nakazawam@berea.edu") + assert 'Mario' == supervisor.FIRST_NAME - supervisor = tracy.getSupervisorFromEmail("heggens@berea.edu") - assert 'Scott' == supervisor.FIRST_NAME + supervisor = tracy.getSupervisorFromEmail("heggens@berea.edu") + assert 'Scott' == supervisor.FIRST_NAME - with pytest.raises(InvalidQueryException): - supervisor = tracy.getSupervisorFromEmail("nakazawamasdfd.com") + with pytest.raises(InvalidQueryException): + supervisor = tracy.getSupervisorFromEmail("nakazawamasdfd.com") - with pytest.raises(InvalidQueryException): - supervisor = tracy.getSupervisorFromEmail(17) + with pytest.raises(InvalidQueryException): + supervisor = tracy.getSupervisorFromEmail(17) @pytest.mark.integration def test_getPositionsFromDepartment(self, tracy): - positions = tracy.getPositionsFromDepartment("2114","6740") - assert ['S12345','S61408','S61407','S61421','S61419'] == [p.POSN_CODE for p in positions] - positions = tracy.getPositionsFromDepartment("2114","0000") - assert [] == [p.POSN_CODE for p in positions] + with app.app_context(): + positions = tracy.getPositionsFromDepartment("2114","6740") + assert ['S12345','S61408','S61407','S61421','S61419'] == [p.POSN_CODE for p in positions] + positions = tracy.getPositionsFromDepartment("2114","0000") + assert [] == [p.POSN_CODE for p in positions] @pytest.mark.integration def test_getDepartments(self, tracy): - departments = tracy.getDepartments() - assert ['Biology','Computer Science', 'Labor Department', 'Mathematics','Technology and Applied Design'] == [d.DEPT_NAME for d in departments] - assert '2107' == departments[0].ORG - assert '6740' == departments[0].ACCOUNT + with app.app_context(): + departments = tracy.getDepartments() + assert ['Biology','Computer Science', 'Labor Department', 'Mathematics','Technology and Applied Design'] == [d.DEPT_NAME for d in departments] + assert '2107' == departments[0].ORG + assert '6740' == departments[0].ACCOUNT @pytest.mark.integration def test_getPositionFromCode(self, tracy): - position = tracy.getPositionFromCode("S61427") - assert 'Teaching Associate' == position.POSN_TITLE - assert '2' == position.WLS + with app.app_context(): + position = tracy.getPositionFromCode("S61427") + assert 'Teaching Associate' == position.POSN_TITLE + assert '2' == position.WLS - with pytest.raises(InvalidQueryException): - position = tracy.getPositionFromCode("eleven") + with pytest.raises(InvalidQueryException): + position = tracy.getPositionFromCode("eleven") - with pytest.raises(InvalidQueryException): - position = tracy.getPositionFromCode(17) + with pytest.raises(InvalidQueryException): + position = tracy.getPositionFromCode(17) @pytest.mark.integration def test_getSupervisorsFromUserInput(self, tracy): - supervisor = tracy.getSupervisorsFromUserInput("Jan Pearce") - assert "Jan" == supervisor[0].FIRST_NAME - assert 1 == len(supervisor) + with app.app_context(): + supervisor = tracy.getSupervisorsFromUserInput("Jan Pearce") + assert "Jan" == supervisor[0].FIRST_NAME + assert 1 == len(supervisor) - supervisor = tracy.getSupervisorsFromUserInput("heggen") - assert "Scott" == supervisor[0].FIRST_NAME - assert 1 == len(supervisor) + supervisor = tracy.getSupervisorsFromUserInput("heggen") + assert "Scott" == supervisor[0].FIRST_NAME + assert 1 == len(supervisor) - supervisor = tracy.getSupervisorsFromUserInput("Peter Parker") - assert supervisor != True - assert 0 == len(supervisor) + supervisor = tracy.getSupervisorsFromUserInput("Peter Parker") + assert supervisor != True + assert 0 == len(supervisor) @pytest.mark.integration def test_getStudentsFromUserInput(self, tracy): - students = tracy.getStudentsFromUserInput("Guillermo") - assert "Guillermo" == students[0].FIRST_NAME - assert 1 == len(students) + with app.app_context(): + students = tracy.getStudentsFromUserInput("Guillermo") + assert "Guillermo" == students[0].FIRST_NAME + assert 1 == len(students) - students = tracy.getStudentsFromUserInput("Adams") - assert 2 == len(students) - assert "Adams" == students[1].LAST_NAME + students = tracy.getStudentsFromUserInput("Adams") + assert 2 == len(students) + assert "Adams" == students[1].LAST_NAME - students = tracy.getSupervisorsFromUserInput("John Smith") - assert students != True - assert 0 == len(students) + students = tracy.getSupervisorsFromUserInput("John Smith") + assert students != True + assert 0 == len(students) @pytest.mark.integration def test_checkStudentOrSupervisor(self, tracy): - user = tracy.checkStudentOrSupervisor("cruzg") - assert "Student" == user + with app.app_context(): + user = tracy.checkStudentOrSupervisor("cruzg") + assert "Student" == user - user = tracy.checkStudentOrSupervisor("heggens") - assert "Supervisor" == user + user = tracy.checkStudentOrSupervisor("heggens") + assert "Supervisor" == user - with pytest.raises(InvalidQueryException): - user = tracy.checkStudentOrSupervisor("smith") + with pytest.raises(InvalidQueryException): + user = tracy.checkStudentOrSupervisor("smith") diff --git a/tests/code/test_userInsertFunctions.py b/tests/code/test_userInsertFunctions.py index b5b428591..cc81e4d98 100644 --- a/tests/code/test_userInsertFunctions.py +++ b/tests/code/test_userInsertFunctions.py @@ -1,4 +1,5 @@ import pytest +from app import app from app.models.Tracy.studata import STUDATA from app.models.Tracy.stustaff import STUSTAFF from app.models import mainDB @@ -11,211 +12,217 @@ @pytest.mark.integration def test_createSupervisorFromTracy(): - # Test fail conditions - with pytest.raises(InvalidUserException): - supervisor = createSupervisorFromTracy() + with app.app_context(): + # Test fail conditions + with pytest.raises(InvalidUserException): + supervisor = createSupervisorFromTracy() - with pytest.raises(InvalidUserException): - supervisor = createSupervisorFromTracy("B12361006") + with pytest.raises(InvalidUserException): + supervisor = createSupervisorFromTracy("B12361006") - with pytest.raises(InvalidUserException): - supervisor = createSupervisorFromTracy(username="B12361006") + with pytest.raises(InvalidUserException): + supervisor = createSupervisorFromTracy(username="B12361006") - with pytest.raises(InvalidUserException): - supervisor = createSupervisorFromTracy(bnumber="heggens") + with pytest.raises(InvalidUserException): + supervisor = createSupervisorFromTracy(bnumber="heggens") - # Test success conditions - supervisor = createSupervisorFromTracy(username="heggens", bnumber="B12361006") - assert supervisor.FIRST_NAME == "Scott" + # Test success conditions + supervisor = createSupervisorFromTracy(username="heggens", bnumber="B12361006") + assert supervisor.FIRST_NAME == "Scott" - supervisor = createSupervisorFromTracy(username="", bnumber="B12361006") - assert supervisor.FIRST_NAME == "Scott" + supervisor = createSupervisorFromTracy(username="", bnumber="B12361006") + assert supervisor.FIRST_NAME == "Scott" - supervisor = createSupervisorFromTracy(bnumber="B12361006") - assert supervisor.FIRST_NAME == "Scott" + supervisor = createSupervisorFromTracy(bnumber="B12361006") + assert supervisor.FIRST_NAME == "Scott" - supervisor = createSupervisorFromTracy(username="heggens") - assert supervisor.FIRST_NAME == "Scott" + supervisor = createSupervisorFromTracy(username="heggens") + assert supervisor.FIRST_NAME == "Scott" - supervisor = createSupervisorFromTracy(username="heggens", bnumber="") - assert supervisor.FIRST_NAME == "Scott" + supervisor = createSupervisorFromTracy(username="heggens", bnumber="") + assert supervisor.FIRST_NAME == "Scott" - supervisor = createSupervisorFromTracy("heggens") - assert supervisor.FIRST_NAME == "Scott" + supervisor = createSupervisorFromTracy("heggens") + assert supervisor.FIRST_NAME == "Scott" - # Tests getting a supervisor from TRACY that does not exist in the supervisor table - supervisor = createSupervisorFromTracy(username="hoffmanm", bnumber="B1236237") - assert supervisor.FIRST_NAME == "Megan" - supervisor.delete_instance() + # Tests getting a supervisor from TRACY that does not exist in the supervisor table + supervisor = createSupervisorFromTracy(username="hoffmanm", bnumber="B1236237") + assert supervisor.FIRST_NAME == "Megan" + supervisor.delete_instance() - supervisor = createSupervisorFromTracy(username="", bnumber="B1236237") - assert supervisor.FIRST_NAME == "Megan" - supervisor.delete_instance() + supervisor = createSupervisorFromTracy(username="", bnumber="B1236237") + assert supervisor.FIRST_NAME == "Megan" + supervisor.delete_instance() - supervisor = createSupervisorFromTracy(username="hoffmanm") - assert supervisor.FIRST_NAME == "Megan" - supervisor.delete_instance() + supervisor = createSupervisorFromTracy(username="hoffmanm") + assert supervisor.FIRST_NAME == "Megan" + supervisor.delete_instance() @pytest.mark.integration def test_createStudentFromTracy(): - # Test fail conditions - with pytest.raises(ValueError): - student = createStudentFromTracy() + with app.app_context(): + # Test fail conditions + with pytest.raises(ValueError): + student = createStudentFromTracy() - with pytest.raises(InvalidUserException): - student = createStudentFromTracy("B00730361") + with pytest.raises(InvalidUserException): + student = createStudentFromTracy("B00730361") - with pytest.raises(InvalidUserException): - student = createStudentFromTracy(username="B00730361") + with pytest.raises(InvalidUserException): + student = createStudentFromTracy(username="B00730361") - with pytest.raises(InvalidUserException): - student = createStudentFromTracy(bnumber="jamalie") + with pytest.raises(InvalidUserException): + student = createStudentFromTracy(bnumber="jamalie") - # Test success conditions - student = createStudentFromTracy(username="jamalie", bnumber="B00730361") - assert student.FIRST_NAME == "Elaheh" + # Test success conditions + student = createStudentFromTracy(username="jamalie", bnumber="B00730361") + assert student.FIRST_NAME == "Elaheh" - student = createStudentFromTracy(username="", bnumber="B00730361") - assert student.FIRST_NAME == "Elaheh" + student = createStudentFromTracy(username="", bnumber="B00730361") + assert student.FIRST_NAME == "Elaheh" - student = createStudentFromTracy(bnumber="B00730361") - assert student.FIRST_NAME == "Elaheh" + student = createStudentFromTracy(bnumber="B00730361") + assert student.FIRST_NAME == "Elaheh" - student = createStudentFromTracy(username="jamalie") - assert student.FIRST_NAME == "Elaheh" + student = createStudentFromTracy(username="jamalie") + assert student.FIRST_NAME == "Elaheh" - student = createStudentFromTracy(username="jamalie", bnumber="") - assert student.FIRST_NAME == "Elaheh" + student = createStudentFromTracy(username="jamalie", bnumber="") + assert student.FIRST_NAME == "Elaheh" - student = createStudentFromTracy("jamalie") - assert student.FIRST_NAME == "Elaheh" + student = createStudentFromTracy("jamalie") + assert student.FIRST_NAME == "Elaheh" - # Tests getting a student from TRACY that does not exist in the student table - student = createStudentFromTracy(username="adamskg", bnumber="B00785329") - assert student.FIRST_NAME == "Kat" - student.delete_instance() + # Tests getting a student from TRACY that does not exist in the student table + student = createStudentFromTracy(username="adamskg", bnumber="B00785329") + assert student.FIRST_NAME == "Kat" + student.delete_instance() - student = createStudentFromTracy(username="", bnumber="B00785329") - assert student.FIRST_NAME == "Kat" - student.delete_instance() + student = createStudentFromTracy(username="", bnumber="B00785329") + assert student.FIRST_NAME == "Kat" + student.delete_instance() - student = createStudentFromTracy(username="adamskg") - assert student.FIRST_NAME == "Kat" - student.delete_instance() + student = createStudentFromTracy(username="adamskg") + assert student.FIRST_NAME == "Kat" + student.delete_instance() @pytest.mark.integration def test_getOrCreateStudentRecord(): - # Test fail conditions - with pytest.raises(ValueError): - student = getOrCreateStudentRecord() + with app.app_context(): + # Test fail conditions + with pytest.raises(ValueError): + student = getOrCreateStudentRecord() - with pytest.raises(InvalidUserException): - student = getOrCreateStudentRecord("B00730361") + with pytest.raises(InvalidUserException): + student = getOrCreateStudentRecord("B00730361") - with pytest.raises(InvalidUserException): - student = getOrCreateStudentRecord(username="B00730361") + with pytest.raises(InvalidUserException): + student = getOrCreateStudentRecord(username="B00730361") - with pytest.raises(InvalidUserException): - student = getOrCreateStudentRecord(bnumber="jamalie") + with pytest.raises(InvalidUserException): + student = getOrCreateStudentRecord(bnumber="jamalie") - # Test success conditions - student = getOrCreateStudentRecord(username="jamalie", bnumber="B00730361") - assert student.FIRST_NAME == "Elaheh" + # Test success conditions + student = getOrCreateStudentRecord(username="jamalie", bnumber="B00730361") + assert student.FIRST_NAME == "Elaheh" - student = getOrCreateStudentRecord(username="", bnumber="B00730361") - assert student.FIRST_NAME == "Elaheh" + student = getOrCreateStudentRecord(username="", bnumber="B00730361") + assert student.FIRST_NAME == "Elaheh" - student = getOrCreateStudentRecord(bnumber="B00730361") - assert student.FIRST_NAME == "Elaheh" + student = getOrCreateStudentRecord(bnumber="B00730361") + assert student.FIRST_NAME == "Elaheh" - student = getOrCreateStudentRecord(username="jamalie") - assert student.FIRST_NAME == "Elaheh" + student = getOrCreateStudentRecord(username="jamalie") + assert student.FIRST_NAME == "Elaheh" - student = getOrCreateStudentRecord(username="jamalie", bnumber="") - assert student.FIRST_NAME == "Elaheh" + student = getOrCreateStudentRecord(username="jamalie", bnumber="") + assert student.FIRST_NAME == "Elaheh" - student = getOrCreateStudentRecord("jamalie") - assert student.FIRST_NAME == "Elaheh" + student = getOrCreateStudentRecord("jamalie") + assert student.FIRST_NAME == "Elaheh" - # Test getting a student that does not exist in Tracy - student = getOrCreateStudentRecord(bnumber="B00841417") - assert student.FIRST_NAME == "Alex" + # Test getting a student that does not exist in Tracy + student = getOrCreateStudentRecord(bnumber="B00841417") + assert student.FIRST_NAME == "Alex" - student = getOrCreateStudentRecord(username="bryantal") - assert student.FIRST_NAME == "Alex" + student = getOrCreateStudentRecord(username="bryantal") + assert student.FIRST_NAME == "Alex" - # Tests getting a student from TRACY that does not exist in the student table - student = getOrCreateStudentRecord(username="adamskg", bnumber="B00785329") - assert student.FIRST_NAME == "Kat" - student.delete_instance() + # Tests getting a student from TRACY that does not exist in the student table + student = getOrCreateStudentRecord(username="adamskg", bnumber="B00785329") + assert student.FIRST_NAME == "Kat" + student.delete_instance() - student = getOrCreateStudentRecord(username="", bnumber="B00785329") - assert student.FIRST_NAME == "Kat" - student.delete_instance() + student = getOrCreateStudentRecord(username="", bnumber="B00785329") + assert student.FIRST_NAME == "Kat" + student.delete_instance() - student = getOrCreateStudentRecord(username="adamskg") - assert student.FIRST_NAME == "Kat" - student.delete_instance() + student = getOrCreateStudentRecord(username="adamskg") + assert student.FIRST_NAME == "Kat" + student.delete_instance() @pytest.mark.integration def test_updateSupervisorFromTracy(): - user = User.get(username="heggens") - assert user.fullName == "Scott Heggen" + with app.app_context(): + user = User.get(username="heggens") + assert user.fullName == "Scott Heggen" - tracyEntry = Tracy().getSupervisorFromID(user.supervisor_id) - tracyEntry.FIRST_NAME="NotScott" - tracyEntry.LAST_NAME="NotHeggen" - db.session.commit() + tracyEntry = Tracy().getSupervisorFromID(user.supervisor_id) + tracyEntry.FIRST_NAME="NotScott" + tracyEntry.LAST_NAME="NotHeggen" + db.session.commit() - user = updateUserFromTracy(user) - assert user.fullName == "NotScott NotHeggen" + user = updateUserFromTracy(user) + assert user.fullName == "NotScott NotHeggen" - dbuser = User.get(username="heggens") - assert dbuser.fullName == "NotScott NotHeggen", "The object changed but not the database" + dbuser = User.get(username="heggens") + assert dbuser.fullName == "NotScott NotHeggen", "The object changed but not the database" - tracyEntry.FIRST_NAME="Scott" - tracyEntry.LAST_NAME="Heggen" - db.session.commit() + tracyEntry.FIRST_NAME="Scott" + tracyEntry.LAST_NAME="Heggen" + db.session.commit() - dbuser.supervisor.legal_name="Scott" - dbuser.supervisor.LAST_NAME="Heggen" - dbuser.supervisor.save() + dbuser.supervisor.legal_name="Scott" + dbuser.supervisor.LAST_NAME="Heggen" + dbuser.supervisor.save() @pytest.mark.integration def test_updateStudentFromTracy(): - user = User.get(username="jamalie") - assert user.fullName == "Elaheh Jamali" + with app.app_context(): + user = User.get(username="jamalie") + assert user.fullName == "Elaheh Jamali" - tracyEntry = Tracy().getStudentFromBNumber(user.student_id) - tracyEntry.FIRST_NAME="NotElaheh" - tracyEntry.LAST_NAME="NotJamali" - db.session.commit() + tracyEntry = Tracy().getStudentFromBNumber(user.student_id) + tracyEntry.FIRST_NAME="NotElaheh" + tracyEntry.LAST_NAME="NotJamali" + db.session.commit() - user = updateUserFromTracy(user) - assert user.fullName == "NotElaheh NotJamali" + user = updateUserFromTracy(user) + assert user.fullName == "NotElaheh NotJamali" - dbuser = User.get(username="jamalie") - assert dbuser.fullName == "NotElaheh NotJamali", "The object changed but not the database" + dbuser = User.get(username="jamalie") + assert dbuser.fullName == "NotElaheh NotJamali", "The object changed but not the database" - tracyEntry.FIRST_NAME="Elaheh" - tracyEntry.LAST_NAME="Jamali" - db.session.commit() + tracyEntry.FIRST_NAME="Elaheh" + tracyEntry.LAST_NAME="Jamali" + db.session.commit() - dbuser.student.legal_name="Elaheh" - dbuser.student.LAST_NAME="Jamali" - dbuser.student.save() + dbuser.student.legal_name="Elaheh" + dbuser.student.LAST_NAME="Jamali" + dbuser.student.save() @pytest.mark.integration def test_updateStudentDBRecords(): with mainDB.atomic() as transaction: - incorrectStudent = Student.create(ID="B00751360", PIDM=2345, legal_name="NotTyler", LAST_NAME="Parton") - updateRecordIncorrectly = Supervisor.update(legal_name="NotMadina").where(Supervisor.ID == "B00769499").execute() - incorrectSupervisor = Supervisor.get(Supervisor.ID == "B00769499") - updateStudentRecord(incorrectStudent) - updateSupervisorRecord(incorrectSupervisor) + with app.app_context(): + incorrectStudent = Student.create(ID="B00751360", PIDM=2345, legal_name="NotTyler", LAST_NAME="Parton") + updateRecordIncorrectly = Supervisor.update(legal_name="NotMadina").where(Supervisor.ID == "B00769499").execute() + incorrectSupervisor = Supervisor.get(Supervisor.ID == "B00769499") + updateStudentRecord(incorrectStudent) + updateSupervisorRecord(incorrectSupervisor) - assert incorrectStudent.FIRST_NAME == "Tyler" - assert incorrectSupervisor.FIRST_NAME == "Madina" + assert incorrectStudent.FIRST_NAME == "Tyler" + assert incorrectSupervisor.FIRST_NAME == "Madina" - transaction.rollback() + transaction.rollback() From 4203dc5f88deafde129f20b1ed9c2df193962d8a Mon Sep 17 00:00:00 2001 From: Brian Ramsay Date: Wed, 8 Jul 2026 15:15:26 -0400 Subject: [PATCH 084/163] Fixed remaining failing tests --- database/demo_data.py | 6 +++--- tests/code/test_apiEndpoint.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/database/demo_data.py b/database/demo_data.py index 57c989c14..1a0a13932 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -546,7 +546,7 @@ current_year = today.year - (today.month < 8) LaborStatusForm.insert([{ "laborStatusFormID": 2, - "termCode_id": f"{current_year}00", + "termCode_id": f"202000", "studentName": "Alex Bryant", "studentSupervisee_id": "B00841417", "supervisor_id": "B12361006", @@ -556,8 +556,8 @@ "POSN_TITLE": "Student Programmer", "POSN_CODE": "S61407", "weeklyHours": 10, - "startDate": f"{current_year}-04-01", - "endDate": f"{current_year}-09-01" + "startDate": f"2020-04-01", + "endDate": f"2020-09-01" }]).on_conflict_replace().execute() FormHistory.insert([{ "formHistoryID": 2, diff --git a/tests/code/test_apiEndpoint.py b/tests/code/test_apiEndpoint.py index 4cc41aa6e..140bf767f 100644 --- a/tests/code/test_apiEndpoint.py +++ b/tests/code/test_apiEndpoint.py @@ -35,6 +35,7 @@ def test_getLaborInformation(): response = getLaborInformation(orgCode = 2114, bNumber="B00841417") responseData = response.get_json() + print(responseData['B00841417']) assert responseData['B00841417'][0]['jobType'] == "Primary" assert responseData['B00841417'][0]['termName'] == "AY 2020-2021" From 97f05f5d25f50952f6af5c40570f1a59355a7c70 Mon Sep 17 00:00:00 2001 From: Brian Ramsay Date: Wed, 8 Jul 2026 15:24:03 -0400 Subject: [PATCH 085/163] Add option to run just one file --- tests/run_tests.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/run_tests.sh b/tests/run_tests.sh index cd7794ce7..0b4ef93ea 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -57,4 +57,7 @@ case "$1" in no-ui) no_ui ;; + *) # assume it is a file or flag + python -m pytest $FLAGS -m "unit or integration" $1 + ;; esac From 31be945fffc037b541cc319bd909845347085e81 Mon Sep 17 00:00:00 2001 From: feitsopb Date: Wed, 8 Jul 2026 19:25:41 +0000 Subject: [PATCH 086/163] added a flash message on status --- app/static/js/manageMembers.js | 26 ++++++++++++++++++++++++++ app/templates/main/manageMembers.html | 12 ++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/app/static/js/manageMembers.js b/app/static/js/manageMembers.js index 57849722a..4f3a3cf49 100644 --- a/app/static/js/manageMembers.js +++ b/app/static/js/manageMembers.js @@ -14,5 +14,31 @@ $(document).ready(function() { }, //dom: '<"top"l>rt<"bottom"p><"clear">' }); + + $(document).on("click", ".member-status-btn", function() { + let memberName = $(this).data("member-name"); + let memberStatus = $(this).data("member-status"); + let category; + +if (memberStatus === "Banned") { + category = "danger"; +} else { + category = "success"; +} + let quote = String.fromCharCode(39); + + $("#flash_container").html("
The status for " + memberName + " has been set to " + quote + memberStatus + quote + ".
"); + $("#flasher").delay(3000).fadeOut(); + + if (memberStatus === "Banned") { + $(this).removeClass("btn-danger").addClass("btn-success"); + $(this).text("Unban"); + $(this).data("member-status", "Unbanned"); + } else { + $(this).removeClass("btn-success").addClass("btn-danger"); + $(this).html("  Ban  "); + $(this).data("member-status", "Banned"); + } + }); }) diff --git a/app/templates/main/manageMembers.html b/app/templates/main/manageMembers.html index 6854b06ee..c2f995354 100644 --- a/app/templates/main/manageMembers.html +++ b/app/templates/main/manageMembers.html @@ -83,9 +83,17 @@

{% if department %} Manage {{department.DEPT_NAME}} Memb {% if currentUser.isLaborAdmin or currentUser.isLaborDepartmentStudent %}

- {% endif %} From 2a56e4400f8932577772f7995be32eab889be6ba Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Thu, 9 Jul 2026 14:33:55 +0000 Subject: [PATCH 095/163] positions are pulled by status as well, demo data checks multiple departments --- app/controllers/main_routes/main_routes.py | 4 ++-- database/demo_data.py | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 26549b03f..9826f82f6 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -69,10 +69,10 @@ def departmentPortal(org=None,account=None): departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) - positions = list(PositionHistory.select().where(PositionHistory.department == dept).order_by(PositionHistory.positionTitle.asc())) if dept else [] + positions = list(PositionHistory.select().where(PositionHistory.department == dept, PositionHistory.status == "Active").order_by(PositionHistory.positionTitle.asc())) if dept else [] positionsList = [] posUrl = [] - if positions == []: + if not positions: positionsList = ["No Positions for this Department"] else: for i in positions: diff --git a/database/demo_data.py b/database/demo_data.py index e611d3599..e8de7d964 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -669,7 +669,16 @@ "wls":2, "revisionDate" : f"{current_year}-01-01", "description": "", - "department" : 1 + "department" : 3 + }, + { + "positionTitle": "Teaching Associate", + "positionCode": "S61410", + "status": "Active", + "wls":2, + "revisionDate" : f"{current_year}-03-29", + "description": "", + "department" : 3 }, { "positionTitle": "DUMMY POSITION", From 27777bc2d0de92e2d32e6f516b919f4b67668d61 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Thu, 9 Jul 2026 14:36:22 +0000 Subject: [PATCH 096/163] no more inline styling, created a css file for the styling changes --- app/static/css/departmentPortal.css | 34 ++++++++++++++++++++++++ app/templates/main/departmentPortal.html | 13 ++++----- 2 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 app/static/css/departmentPortal.css diff --git a/app/static/css/departmentPortal.css b/app/static/css/departmentPortal.css new file mode 100644 index 000000000..fb21b492d --- /dev/null +++ b/app/static/css/departmentPortal.css @@ -0,0 +1,34 @@ +.dp-card { + position: relative; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + min-width: 0; + word-wrap: break-word; + background-color: #fff; + background-clip: border-box; + border: 1px solid rgba(0, 0, 0, 0.125); + border-radius: 1rem; + overflow: hidden; + width: 90%; +} +.bi-suitcase-lg-fill { + border: 1px solid #c0c0c0; + border-radius: 8px; + padding: 3px 3.5px 1.5px 3.5px; + font-size: 3rem; + color:#6e6e6e; +} +.card-group { + display: inline-flex; + gap: 1rem; +} +.form-group{ + width:65rem; + margin-left: auto ; + margin-right:auto; +} \ No newline at end of file diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index df432b7ea..71d1082a3 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -3,13 +3,14 @@ {% block scripts %} {{super()}} + {% endblock %} {% block app_content %}

{% if department %} {{department.DEPT_NAME}} Portal {% else %} Choose a Department: {% endif %}

-
+
From 3712fa09ea223019eab885aeacf02199916cd964 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Thu, 9 Jul 2026 17:10:30 +0000 Subject: [PATCH 106/163] the no positions for this department no longer has a link --- app/templates/main/departmentPortal.html | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index ebb0e8ec3..fb3c3826a 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -53,8 +53,14 @@

Positions

    {% for p in positions %} {% if 7 > loop.index0 %} -
  • - {{ p }}
    • + {% if p == "No Positions for this Department" %} +
  • +

    {{ p }}

    +
    • + {% else %} +
  • {{ p }}
    • + {% endif %} + {% elif 8 == loop.index0 %}

and {{ positions | length}} more...

{% endif %} From a30bb1b104715f8a75d9ad89617c3f7676c1dabb Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Thu, 9 Jul 2026 18:42:25 +0000 Subject: [PATCH 107/163] made changes still broken --- app/controllers/main_routes/main_routes.py | 10 ++++++++-- database/demo_data.py | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 6577ee1a8..84dd1dd33 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -79,7 +79,7 @@ def departmentPortal(org=None,account=None): print(dept, '*********************************************************Denys') try: allocation = Allocation.select(Allocation, Term).join(Term).where(Allocation.department == dept, Allocation.termCode == 202500).get() - print(allocation, '*********************************************************Scott') + print(allocation,g.openTerm.termCode, '*********************************************************Scott') except DoesNotExist: allocation = None term = 202500 @@ -88,8 +88,14 @@ def departmentPortal(org=None,account=None): if i.ORG == org: supervisors.append(i.FIRST_NAME + " " + i.LAST_NAME + " (" + i.EMAIL + ")") totalPositions = Allocation.select(Allocation.primary_10 + Allocation.primary_12 + Allocation.primary_15 + Allocation.primary_20 + Allocation.secondary_5 + Allocation.secondary_10).where(Allocation.department == dept, Allocation.termCode == 202500).scalar() - usedAllocation = LaborStatusForm.select(LaborStatusForm).where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.studentConfirmation == True).scalar() + hours_list = [row.weeklyHours for row in LaborStatusForm.select(LaborStatusForm.weeklyHours).where( + LaborStatusForm.department == dept, + LaborStatusForm.termCode_id == 202500, + LaborStatusForm.studentConfirmation == True + )] + usedAllocation = sum(hours_list) or 0 print(totalPositions, usedAllocation,Allocation.primary_10, '*********************************************************brian') + print(list(LaborStatusForm.select().where(LaborStatusForm.department == dept))) return render_template('main/departmentPortal.html', departments = departments, department = dept, diff --git a/database/demo_data.py b/database/demo_data.py index 5485fce57..2df07e14a 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -585,7 +585,7 @@ current_year = today.year - (today.month < 8) LaborStatusForm.insert([{ "laborStatusFormID": 2, - "termCode_id": f"202000", + "termCode_id": f"202500", "studentName": "Alex Bryant", "studentSupervisee_id": "B00841417", "supervisor_id": "B12361006", @@ -609,11 +609,11 @@ LaborStatusForm.insert([{ "laborStatusFormID": 3, - "termCode_id": f"{current_year}00", + "termCode_id": f"202500", "studentName": "Test Taker", "studentSupervisee_id": "B12345773", "supervisor_id": "B12361006", - "department_id": 5, + "department_id": 1, "jobType": "Primary", "WLS": 1, "POSN_TITLE": "Labor Workers", From 3ad3cae6b37d9a3a77d29ff69146ac84062b8ee4 Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Thu, 9 Jul 2026 18:43:36 +0000 Subject: [PATCH 108/163] made changes still broken pt.2 --- app/templates/main/departmentPortal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 8c1f669b7..c26ccffb4 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -44,7 +44,7 @@

{{ term }}

15/{{total_allocation or 0}} Positions

    -
  • 10 Hour - {{used_allocation or 0}}/{{allocation.primary_10}}
    • +
  • 10 Hour - {{used_allocation}}/{{allocation.primary_10}}
  • 12 Hour - 3/{{allocation.primary_12}}
  • 15 Hour - 5/{{allocation.primary_15}}
  • 20 Hour - 5/{{allocation.primary_20}}
    • From 653ae75ba331510b3d3055d65f6795c41e0faf7a Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Thu, 9 Jul 2026 18:50:08 +0000 Subject: [PATCH 109/163] fixed merge issues --- database/demo_data.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/database/demo_data.py b/database/demo_data.py index 5c8345e70..3a48887c6 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -662,7 +662,6 @@ SupervisorDepartment.insert_many(supervisorDepartmentMembers).on_conflict_replace().execute() print(" * Department members added") print(f"termCode_id being used: {202500!r}") -print(list(Term.select(Term.termCode))) ############################ # Allocation Dummy Data: @@ -747,8 +746,7 @@ ] Allocation.insert_many(allocations).on_conflict_replace().execute() -print("Data insertion complete :)") -print(PositionHistory()) +print(" * allocation added") ############################# @@ -800,4 +798,5 @@ }, ] -PositionHistory.insert_many(positionHistory).on_conflict_replace().execute() \ No newline at end of file +PositionHistory.insert_many(positionHistory).on_conflict_replace().execute() +print(" * position history added") \ No newline at end of file From 452ae629d4ec5da6c2b1a03f65f93f5ecd1832e8 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Thu, 9 Jul 2026 19:08:52 +0000 Subject: [PATCH 110/163] added more positions to test 'and x more' positions --- database/demo_data.py | 49 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/database/demo_data.py b/database/demo_data.py index e8de7d964..36e6d8cbe 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -688,7 +688,54 @@ "revisionDate" : f"{current_year}-01-23", "description": "", "department" : 1 - } + }, + { + "positionTitle": "Claude Prompter", + "positionCode": "S39568", + "status": "Active", + "wls":4, + "revisionDate" : f"{current_year}-01-31", + "description": "", + "department" : 1 + }, + { + "positionTitle": "ChatGPT Prompter", + "positionCode": "S74933", + "status": "Active", + "wls":2, + "revisionDate" : f"{current_year}-04-01", + "description": "", + "department" : 1 + }, + { + "positionTitle": "Prompter Extraordinaire", + "positionCode": "S94932", + "status": "Active", + "wls":6, + "revisionDate" : f"{current_year}-05-03", + "description": "", + "department" : 1 + }, + { + "positionTitle": "Human code generator", + "positionCode": "S22222", + "status": "Active", + "wls":1, + "revisionDate" : f"{current_year}-05-03", + "description": "", + "department" : 1 + }, + { + "positionTitle": "Prompter Exemplare", + "positionCode": "S00000", + "status": "Active", + "wls":6, + "revisionDate" : f"{current_year}-05-03", + "description": "", + "department" : 1 + } + + ] PositionHistory.insert_many(positionhistory).on_conflict_replace().execute() \ No newline at end of file From c22d121c5dfb6e94dbbc5d86f0cd0afe31efb442 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Thu, 9 Jul 2026 19:33:16 +0000 Subject: [PATCH 111/163] made the cards stack on top of each other when the screen is too small --- app/controllers/main_routes/main_routes.py | 2 +- app/static/css/departmentPortal.css | 10 +-- app/templates/main/departmentPortal.html | 83 ++++++++++++---------- 3 files changed, 51 insertions(+), 44 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index e7b30e5c3..e3075be2e 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -73,7 +73,7 @@ def departmentPortal(org=None,account=None): else: for i in positions: positionsList.append(i.positionTitle + ": " + "(WLS " + str(i.wls) + ")") - posUrl.append(str(i.positionCode) + "/" + str(i.revisionDate)) + posUrl.append(str(i.positionCode)) return render_template('main/departmentPortal.html', diff --git a/app/static/css/departmentPortal.css b/app/static/css/departmentPortal.css index de62a598d..79daf6ca6 100644 --- a/app/static/css/departmentPortal.css +++ b/app/static/css/departmentPortal.css @@ -1,7 +1,7 @@ .card { border-radius: 1rem; overflow: hidden; - width: 90%; + width: 100%; } .bi-suitcase-lg-fill { /* Bootstrap Icon */ border: 1px solid #c0c0c0; @@ -11,11 +11,13 @@ color:#6e6e6e; } .card-group { - display: inline-flex; - gap: 1rem; + gap: 1rem; } .form-group { - width:65rem; + width: 50%; margin-left: auto ; margin-right:auto; +} +.card-body { + padding: 1rem 1rem; } \ No newline at end of file diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index fb3c3826a..bc656614c 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -28,50 +28,55 @@

    {% if department %} {{department.DEPT_NAME}} Portal {% e {% if department %}
    - -
    - -
    +
    +
    +
    Insert Allocations Card Here
    +
    +
    -
    - -
    +
    +
    +
    Insert Members Card Here
    +
    +
    + +
    +
    +
    +
    +
    + +
    +
    +

    Positions

    +
    -
    -
    -
    -
    - -
    -
    -

    Positions

    +
      + {% for p in positions %} + {% if 7 > loop.index0 %} + {% if p == "No Positions for this Department" %} +
    • +

      {{ p }}

      +
      • + {% else %} +
    • {{ p }}
      • + {% endif %} + {% elif 8 == loop.index0 %} +

    and {{ (positions | length) - 7}} more...

    + {% endif %} + {% endfor %} +

+
-
    - {% for p in positions %} - {% if 7 > loop.index0 %} - {% if p == "No Positions for this Department" %} -
  • -

    {{ p }}

    -
    • - {% else %} -
  • {{ p }}
    • - {% endif %} - - {% elif 8 == loop.index0 %} -

and {{ positions | length}} more...

- {% endif %} - {% endfor %} - - - -
- View All Positions -
- +
+ View All Positions +
+ + {% endif %} From 77723733abf71009834bdafda72732cff00ce193 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Thu, 9 Jul 2026 19:55:15 +0000 Subject: [PATCH 112/163] Changed the names of demo positions to be more realistic --- database/demo_data.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/database/demo_data.py b/database/demo_data.py index 36e6d8cbe..e2a0a9de5 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -690,7 +690,7 @@ "department" : 1 }, { - "positionTitle": "Claude Prompter", + "positionTitle": "Junior Data Analyst", "positionCode": "S39568", "status": "Active", "wls":4, @@ -699,16 +699,16 @@ "department" : 1 }, { - "positionTitle": "ChatGPT Prompter", + "positionTitle": "Student Manager", "positionCode": "S74933", "status": "Active", - "wls":2, + "wls":5, "revisionDate" : f"{current_year}-04-01", "description": "", "department" : 1 }, { - "positionTitle": "Prompter Extraordinaire", + "positionTitle": "IT Technician", "positionCode": "S94932", "status": "Active", "wls":6, @@ -726,7 +726,7 @@ "department" : 1 }, { - "positionTitle": "Prompter Exemplare", + "positionTitle": "Senior Software Engineer", "positionCode": "S00000", "status": "Active", "wls":6, From bc05360389e05e63c231e2c290bfd0395a92a891 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Thu, 9 Jul 2026 21:01:34 +0000 Subject: [PATCH 113/163] Began working on uniform sizing for the cards --- app/static/css/departmentPortal.css | 7 ++ app/templates/main/departmentPortal.html | 98 +++++++++++++----------- 2 files changed, 59 insertions(+), 46 deletions(-) diff --git a/app/static/css/departmentPortal.css b/app/static/css/departmentPortal.css index 79daf6ca6..2d4a6a211 100644 --- a/app/static/css/departmentPortal.css +++ b/app/static/css/departmentPortal.css @@ -2,6 +2,8 @@ border-radius: 1rem; overflow: hidden; width: 100%; + height: 100%; + min-width: 30%; } .bi-suitcase-lg-fill { /* Bootstrap Icon */ border: 1px solid #c0c0c0; @@ -20,4 +22,9 @@ } .card-body { padding: 1rem 1rem; + min-width: 30% +} +.row { + display: flex; + flex-wrap: wrap; } \ No newline at end of file diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index bc656614c..0c9e7ed19 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -27,58 +27,64 @@

{% if department %} {{department.DEPT_NAME}} Portal {% e {% if department %} -
-
-
-
Insert Allocations Card Here
-
-
+
+
+
+
Insert Allocations Card Here
+
+ View All Positions +
+
+
-
-
-
Insert Members Card Here
-
-
+
+
+
Insert Members Card Here
+
+ View All Positions +
+
+
-
-
-
-
-
- -
-
-

Positions

-
+
+
+
+
+
+ +
+
+

Positions

+
-
-
    - {% for p in positions %} - {% if 7 > loop.index0 %} - {% if p == "No Positions for this Department" %} -
  • -

    {{ p }}

    -
    • - {% else %} -
  • {{ p }}
    • - {% endif %} +
+
    + {% for p in positions %} + {% if 7 > loop.index0 %} + {% if p == "No Positions for this Department" %} +
  • +

    {{ p }}

    +
    • + {% else %} +
  • {{ p }}
    • + {% endif %} - {% elif 8 == loop.index0 %} -

and {{ (positions | length) - 7}} more...

- {% endif %} - {% endfor %} - - -
-
- View All Positions + {% elif 8 == loop.index0 %} +

and {{ (positions | length) - 7}} more...

+ {% endif %} + {% endfor %} + +
+
+ View All Positions +
+
- -
- +
+ {% endif %} {% endblock %} From 38cb2c7df24a60ec16009031f23843f9cf512c5a Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Thu, 9 Jul 2026 21:45:29 +0000 Subject: [PATCH 114/163] have real data on allocation card now, just need term code global variable as well as primary and secondary indications and academic year and break hours --- app/controllers/main_routes/main_routes.py | 53 +++++++++++-- app/templates/main/departmentPortal.html | 12 +-- database/demo_data.py | 90 +++++++++++++++++++++- 3 files changed, 139 insertions(+), 16 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 84dd1dd33..de43447c8 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -1,4 +1,5 @@ from flask import render_template, request, json, redirect, url_for, send_file, g, flash, jsonify +from flask_bootstrap import forms from peewee import JOIN, DoesNotExist from functools import reduce import operator @@ -88,14 +89,43 @@ def departmentPortal(org=None,account=None): if i.ORG == org: supervisors.append(i.FIRST_NAME + " " + i.LAST_NAME + " (" + i.EMAIL + ")") totalPositions = Allocation.select(Allocation.primary_10 + Allocation.primary_12 + Allocation.primary_15 + Allocation.primary_20 + Allocation.secondary_5 + Allocation.secondary_10).where(Allocation.department == dept, Allocation.termCode == 202500).scalar() - hours_list = [row.weeklyHours for row in LaborStatusForm.select(LaborStatusForm.weeklyHours).where( - LaborStatusForm.department == dept, - LaborStatusForm.termCode_id == 202500, - LaborStatusForm.studentConfirmation == True - )] - usedAllocation = sum(hours_list) or 0 + usedAllocation = [hours for hours in LaborStatusForm.select(LaborStatusForm.weeklyHours).where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.studentConfirmation.is_null(True))] + usedAllocation = len(usedAllocation) + student_hours = {} + for form in LaborStatusForm.select().where( + LaborStatusForm.department == dept, + LaborStatusForm.termCode_id == 202500 + ): + sid = form.studentSupervisee_id + student_hours.setdefault(sid, []).append({ + "jobType": form.jobType, + "weeklyHours": form.weeklyHours + }) + for sid, jobs in student_hours.items(): + primary = sum(j["weeklyHours"] for j in jobs if j["jobType"] == "Primary") + secondary = sum(j["weeklyHours"] for j in jobs if j["jobType"] == "Secondary") + print(sid, "Primary:", primary, "Secondary:", secondary) + def count_workers(job_type, hours_bucket): + return LaborStatusForm.select().where( + LaborStatusForm.department == dept, + LaborStatusForm.termCode == 202500, + LaborStatusForm.jobType == job_type, + LaborStatusForm.weeklyHours == hours_bucket, + LaborStatusForm.studentConfirmation.is_null(True) # pending counts as "used" for now + ).count() + + used_10 = count_workers("Primary", "10") + used_12 = count_workers("Primary", "12") + used_15 = count_workers("Primary", "15") + used_20 = count_workers("Primary", "20") + used_5_sec = count_workers("Secondary", "5") + used_10_sec = count_workers("Secondary", "10") + print(usedAllocation, '*********************************************************hours_list') print(totalPositions, usedAllocation,Allocation.primary_10, '*********************************************************brian') - print(list(LaborStatusForm.select().where(LaborStatusForm.department == dept))) + print(list(LaborStatusForm.select(LaborStatusForm.studentConfirmation).where( + LaborStatusForm.department == dept, + LaborStatusForm.termCode == 202500 +))) return render_template('main/departmentPortal.html', departments = departments, department = dept, @@ -104,7 +134,14 @@ def departmentPortal(org=None,account=None): allocation = allocation, total_allocation = totalPositions, used_allocation = usedAllocation, - term = term + term = term, + studentHours = student_hours, + used_10 = used_10, + used_12 = used_12, + used_15 = used_15, + used_20 = used_20, + used_5_sec = used_5_sec, + used_10_sec = used_10_sec ) @main_bp.route('/department///managepositions', methods=['GET']) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index c26ccffb4..fa8faca77 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -44,14 +44,14 @@

{{ term }}

15/{{total_allocation or 0}} Positions

    -
  • 10 Hour - {{used_allocation}}/{{allocation.primary_10}}
    • -
  • 12 Hour - 3/{{allocation.primary_12}}
    • -
  • 15 Hour - 5/{{allocation.primary_15}}
    • -
  • 20 Hour - 5/{{allocation.primary_20}}
    • +
  • 10 Hour - {{used_10}}/{{allocation.primary_10}}
    • +
  • 12 Hour - {{used_12}}/{{allocation.primary_12}}
    • +
  • 15 Hour - {{used_15}}/{{allocation.primary_15}}
    • +
  • 20 Hour - {{used_20}}/{{allocation.primary_20}}
    -
  • 5 Hour - 2/{{allocation.secondary_5}}
    • -
  • 10 Hour - 3/{{allocation.secondary_10}}
    • +
  • 5 Hour - {{used_5_sec}}/{{allocation.secondary_5}}
    • +
  • 10 Hour - {{used_10_sec}}/{{allocation.secondary_10}}
diff --git a/database/demo_data.py b/database/demo_data.py index 2df07e14a..887bbeb71 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -105,6 +105,11 @@ "LAST_POSN":"Student Manager", "LAST_SUP_PIDM":"7" }, + {"ID": "B00811617", "legal_name": "Chris Georgiev", "isActive": True, "PIDM": "8", "FIRST_NAME": "Chris", "LAST_NAME": "Georgiev"}, + {"ID": "B00815474", "legal_name": "Julius Fritz", "isActive": True, "PIDM": "9", "FIRST_NAME": "Julius", "LAST_NAME": "Fritz"}, + {"ID": "B12345223", "legal_name": "Subaru Natsuki", "isActive": True, "PIDM": "10", "FIRST_NAME": "Subaru", "LAST_NAME": "Natsuki"}, + {"ID": "B12345003", "legal_name": "Hatsune Miku", "isActive": True, "PIDM": "11", "FIRST_NAME": "Hatsune", "LAST_NAME": "Miku"}, + {"ID": "B12345772", "legal_name": "Michael Jackson", "isActive": True, "PIDM": "12", "FIRST_NAME": "Michael", "LAST_NAME": "Jackson"} ] tracyStudents = [ { @@ -619,7 +624,7 @@ "POSN_TITLE": "Labor Workers", "POSN_CODE": "S61409", "weeklyHours": 10, - "startDate": f"{current_year}-04-01", + "startDate": f"2025-04-01", "endDate": "2025-09-01" }]).on_conflict_replace().execute() @@ -878,4 +883,85 @@ }, ] -PositionHistory.insert_many(positionhistory).on_conflict_replace().execute() \ No newline at end of file +PositionHistory.insert_many(positionhistory).on_conflict_replace().execute() + +dummy_lsf = [ + { + "laborStatusFormID": 4, + "termCode_id": f"202500", + "studentName": "Chris Georgiev", + "studentSupervisee_id": "B00811617", + "supervisor_id": "B12361006", + "department_id": 1, + "jobType": "Primary", + "WLS": 4, + "POSN_TITLE": "guy who does stuff", + "POSN_CODE": "S61415", + "weeklyHours": 12, + "startDate": f"2025-04-01", + "endDate": "2025-09-01" + }, + { + + "laborStatusFormID": 5, + "termCode_id": f"202500", + "studentName": "Julius Fritz", + "studentSupervisee_id": "B00815474", + "supervisor_id": "B12361006", + "department_id": 1, + "jobType": "Primary", + "WLS": 2, + "POSN_TITLE": "guy who sits in chair", + "POSN_CODE": "S61416", + "weeklyHours": 15, + "startDate": f"2025-04-01", + "endDate": "2025-09-01" + }, + { + "laborStatusFormID": 6, + "termCode_id": f"202500", + "studentName": "Subaru Natsuki", + "studentSupervisee_id": "B12345223", + "supervisor_id": "B12361006", + "department_id": 1, + "jobType": "Primary", + "WLS": 1, + "POSN_TITLE": "Aura Monster", + "POSN_CODE": "S61417", + "weeklyHours": 20, + "startDate": f"2025-04-01", + "endDate": "2025-09-01" + }, + { + "laborStatusFormID": 7, + "termCode_id": f"202500", + "studentName": "Hatsune Miku", + "studentSupervisee_id": "B12345003", + "supervisor_id": "B12361006", + "department_id": 1, + "jobType": "Primary", + "WLS": 6, + "POSN_TITLE": "Singer", + "POSN_CODE": "S61409", + "weeklyHours": 20, + "startDate": f"2025-04-01", + "endDate": "2025-09-01" + + }, + { + "laborStatusFormID": 8, + "termCode_id": f"202500", + "studentName": "Michael Jackson", + "studentSupervisee_id": "B12345772", + "supervisor_id": "B12361006", + "department_id": 1, + "jobType": "Secondary", + "WLS": 6, + "POSN_TITLE": "Famous singer", + "POSN_CODE": "S61410", + "weeklyHours": 5, + "startDate": f"2025-04-01", + "endDate": "2025-09-01" + }, +] +LaborStatusForm.insert_many(dummy_lsf).on_conflict_replace().execute() From f890748914df026ea005e78b0faf538fbaeaac7d Mon Sep 17 00:00:00 2001 From: Julius Fritz Date: Fri, 10 Jul 2026 09:56:46 -0400 Subject: [PATCH 115/163] made the buttons autofill to the same height --- app/static/css/base.css | 1 + 1 file changed, 1 insertion(+) diff --git a/app/static/css/base.css b/app/static/css/base.css index 4b10f7e05..812d3c89b 100755 --- a/app/static/css/base.css +++ b/app/static/css/base.css @@ -250,6 +250,7 @@ a { padding: 0.5rem 1rem; background-color: rgba(0, 0, 0, 0.03); border-top: 1px solid rgba(0, 0, 0, 0.125); + margin-top: auto; } .card-footer:last-child { From 7fe347bd85f5686b7351e407cd3ac49d127a8356 Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Fri, 10 Jul 2026 13:57:27 +0000 Subject: [PATCH 116/163] need to fix g.openterm but data is good --- app/controllers/main_routes/main_routes.py | 19 +++---------------- database/demo_data.py | 16 ++++++++-------- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index de43447c8..debb36450 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -89,8 +89,7 @@ def departmentPortal(org=None,account=None): if i.ORG == org: supervisors.append(i.FIRST_NAME + " " + i.LAST_NAME + " (" + i.EMAIL + ")") totalPositions = Allocation.select(Allocation.primary_10 + Allocation.primary_12 + Allocation.primary_15 + Allocation.primary_20 + Allocation.secondary_5 + Allocation.secondary_10).where(Allocation.department == dept, Allocation.termCode == 202500).scalar() - usedAllocation = [hours for hours in LaborStatusForm.select(LaborStatusForm.weeklyHours).where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.studentConfirmation.is_null(True))] - usedAllocation = len(usedAllocation) + usedAllocation = len([hours for hours in LaborStatusForm.select(LaborStatusForm.weeklyHours).where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.studentConfirmation.is_null(True))]) student_hours = {} for form in LaborStatusForm.select().where( LaborStatusForm.department == dept, @@ -106,13 +105,7 @@ def departmentPortal(org=None,account=None): secondary = sum(j["weeklyHours"] for j in jobs if j["jobType"] == "Secondary") print(sid, "Primary:", primary, "Secondary:", secondary) def count_workers(job_type, hours_bucket): - return LaborStatusForm.select().where( - LaborStatusForm.department == dept, - LaborStatusForm.termCode == 202500, - LaborStatusForm.jobType == job_type, - LaborStatusForm.weeklyHours == hours_bucket, - LaborStatusForm.studentConfirmation.is_null(True) # pending counts as "used" for now - ).count() + return LaborStatusForm.select().where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.jobType == job_type, LaborStatusForm.weeklyHours == hours_bucket,LaborStatusForm.studentConfirmation.is_null(True)).count() used_10 = count_workers("Primary", "10") used_12 = count_workers("Primary", "12") @@ -120,12 +113,6 @@ def count_workers(job_type, hours_bucket): used_20 = count_workers("Primary", "20") used_5_sec = count_workers("Secondary", "5") used_10_sec = count_workers("Secondary", "10") - print(usedAllocation, '*********************************************************hours_list') - print(totalPositions, usedAllocation,Allocation.primary_10, '*********************************************************brian') - print(list(LaborStatusForm.select(LaborStatusForm.studentConfirmation).where( - LaborStatusForm.department == dept, - LaborStatusForm.termCode == 202500 -))) return render_template('main/departmentPortal.html', departments = departments, department = dept, @@ -134,7 +121,7 @@ def count_workers(job_type, hours_bucket): allocation = allocation, total_allocation = totalPositions, used_allocation = usedAllocation, - term = term, + term = g.openTerm.termName, studentHours = student_hours, used_10 = used_10, used_12 = used_12, diff --git a/database/demo_data.py b/database/demo_data.py index 887bbeb71..4f5835aac 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -515,13 +515,13 @@ terms = [ { - "termCode": f"202000", - "termName": f"AY 2020-2021", - "termStart": f"2020-08-01", - "termEnd": f"2021-05-01", + "termCode": f"202500", + "termName": f"AY 2025-2026", + "termStart": f"2025-08-01", + "termEnd": f"2026-05-01", "termState": 0, - "primaryCutOff": f"2020-09-01", - "adjustmentCutOff": f"2020-10-01", + "primaryCutOff": f"2025-09-01", + "adjustmentCutOff": f"2026-10-01", }, { "termCode": f"{current_year}00", @@ -594,7 +594,7 @@ "studentName": "Alex Bryant", "studentSupervisee_id": "B00841417", "supervisor_id": "B12361006", - "department_id": 1, + "department_id": 2, "jobType": "Primary", "WLS": 1, "POSN_TITLE": "Student Programmer", @@ -618,7 +618,7 @@ "studentName": "Test Taker", "studentSupervisee_id": "B12345773", "supervisor_id": "B12361006", - "department_id": 1, + "department_id": 5, "jobType": "Primary", "WLS": 1, "POSN_TITLE": "Labor Workers", From 8ad22e06074c17b1f4c783fa2076398597b513ba Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Fri, 10 Jul 2026 14:06:09 +0000 Subject: [PATCH 117/163] fixed merge issues --- database/demo_data.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/database/demo_data.py b/database/demo_data.py index 3a48887c6..de6047624 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -2,7 +2,6 @@ Chech phpmyadmin to see if your changes are reflected This file will need to be changed if the format of models changes (new fields, dropping fields, renaming...)''' -from datetime import * from app import app from app.models.Tracy import db @@ -505,8 +504,7 @@ ############################# # Term ############################# -today = datetime.now() -current_year = today.year - (today.month < 8) + terms = [ { @@ -545,8 +543,7 @@ ############################# # Create a Pending Labor Status Form ############################# -today = datetime.now() -current_year = today.year - (today.month < 8) + LaborStatusForm.insert([{ "laborStatusFormID": 2, "termCode_id": f"202000", From 36ccceb37820531e6eea12f0398bc95ccc6da3d4 Mon Sep 17 00:00:00 2001 From: Julius Fritz Date: Fri, 10 Jul 2026 10:15:40 -0400 Subject: [PATCH 118/163] fixed the formating of the html and css --- app/static/css/departmentPortal.css | 4 ++-- app/templates/main/departmentPortal.html | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/static/css/departmentPortal.css b/app/static/css/departmentPortal.css index 2d4a6a211..63124b6d2 100644 --- a/app/static/css/departmentPortal.css +++ b/app/static/css/departmentPortal.css @@ -3,7 +3,7 @@ overflow: hidden; width: 100%; height: 100%; - min-width: 30%; + min-width: 100%; } .bi-suitcase-lg-fill { /* Bootstrap Icon */ border: 1px solid #c0c0c0; @@ -22,7 +22,7 @@ } .card-body { padding: 1rem 1rem; - min-width: 30% + min-width: 100% } .row { display: flex; diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 0c9e7ed19..413a7608d 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -29,21 +29,25 @@

{% if department %} {{department.DEPT_NAME}} Portal {% e {% if department %}
+
-
Insert Allocations Card Here
-
- View All Positions -
-
-
+

Insert Allocations Card Here

+
+ View Alloations +
+ + +
-
Insert Members Card Here
+ +

Insert Members Card Here

- View All Positions + View All Members
+
From 43275266c6f64cf8f0192f8fa5850ace16735853 Mon Sep 17 00:00:00 2001 From: ArtemKurasov Date: Fri, 10 Jul 2026 14:16:47 +0000 Subject: [PATCH 119/163] Added new demo data, removed dublicates in the Add Members search bar, and separate supervisees into active and pending --- .../main_routes/departmentPortal.py | 67 ++++++--- app/templates/main/manageMembers.html | 7 +- database/demo_data.py | 128 +++++++++++++++++- 3 files changed, 175 insertions(+), 27 deletions(-) diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index 2e8dde8a9..03e0fe49e 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -1,6 +1,5 @@ -import re - -from flask import render_template, request, json, redirect, url_for, send_file, g, flash, jsonify +import re, datetime +from flask import render_template, request, json, redirect, session, url_for, send_file, g, flash, jsonify from peewee import JOIN, DoesNotExist, fn, Case from functools import reduce import operator @@ -11,6 +10,7 @@ from app.models.student import Student from app.models.laborStatusForm import LaborStatusForm from app.models.formHistory import FormHistory +from app.models.laborReleaseForm import LaborReleaseForm from app.models.term import Term from app.controllers.admin_routes.allPendingForms import checkAdjustment from app.controllers.main_routes import main_bp @@ -28,6 +28,7 @@ def manageStaff(org=None,account=None): try: dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) + session['current_department'] = dept.DEPT_NAME except (NameError, DoesNotExist): dept = None abort(404) @@ -44,11 +45,28 @@ def manageStaff(org=None,account=None): ).dicts() ) + # released_forms = ( + # LaborStatusForm + # .select(LaborStatusForm.studentSupervisee_id) + # .join(FormHistory) # join lsf -> its form histories + # .where(FormHistory.releaseForm.is_null(False)) + # ) + + # conditions for the student_count list + active_primaries = (LaborStatusForm.jobType == 'Primary') & (LaborStatusForm.studentConfirmation == True) & (LaborStatusForm.endDate < datetime.datetime.now()) #& (LaborStatusForm.studentSupervisee_id.not_in(released_forms)) + pending_primaries = (LaborStatusForm.jobType == 'Primary') & (LaborStatusForm.studentConfirmation == None) & (LaborStatusForm.endDate < datetime.datetime.now()) #& (LaborStatusForm.studentSupervisee_id.not_in(released_forms)) + + active_secondaries = (LaborStatusForm.jobType == 'Secondary') & (LaborStatusForm.studentConfirmation == True) & (LaborStatusForm.endDate < datetime.datetime.now()) + pending_secondaries = (LaborStatusForm.jobType == 'Secondary') & (LaborStatusForm.studentConfirmation == None) & (LaborStatusForm.endDate < datetime.datetime.now()) + + student_count = list( LaborStatusForm. select( - fn.SUM(Case(LaborStatusForm.jobType, (("Primary", 1),), 0)).alias("primary_positions"), - fn.SUM(Case(LaborStatusForm.jobType, (("Secondary", 1),), 0)).alias("secondary_positions"), + fn.SUM(Case(None, ((active_primaries, 1),), 0)).alias("active_primary_positions"), + fn.SUM(Case(None, ((pending_primaries, 1),), 0)).alias("pending_primary_positions"), + fn.SUM(Case(None, ((active_secondaries, 1),), 0)).alias("active_secondary_positions"), + fn.SUM(Case(None, ((pending_secondaries, 1),), 0)).alias("pending_secondary_positions"), LaborStatusForm.department, LaborStatusForm.supervisor ).group_by( @@ -56,7 +74,6 @@ def manageStaff(org=None,account=None): LaborStatusForm.supervisor ).dicts() ) - counts = {(row["department"], row["supervisor"]): row for row in student_count} @@ -65,12 +82,15 @@ def manageStaff(org=None,account=None): key = (member["department"], member["supervisor"]) row = counts.get(key, {}) - member["primary_positions"] = row.get("primary_positions", 0) - member["secondary_positions"] = row.get("secondary_positions", 0) + member["active_primary_positions"] = row.get("active_primary_positions", 0) + member["pending_primary_positions"] = row.get("pending_primary_positions", 0) + member["active_secondary_positions"] = row.get("active_secondary_positions", 0) + member["pending_secondary_positions"] = row.get("pending_secondary_positions", 0) return render_template('main/manageMembers.html', members = members, department = dept) + def supervisorsDbToDict(supervisor): """ Given a supervisor object it will return a mapped Dict with supervisor data. @@ -79,6 +99,7 @@ def supervisorsDbToDict(supervisor): 'firstName': supervisor.FIRST_NAME.strip(), 'lastName': supervisor.LAST_NAME.strip(), 'bnumber': supervisor.ID.strip(), + 'department': supervisor.DEPT_NAME.strip(), 'type': 'Supervisor'} return dbToDict @@ -90,31 +111,39 @@ def add_member(query=None): if not accessAllowed: return render_template('errors/403.html'), 403 - current_supervisors = [] - our_supervisors = [] + recorded_supervisors = [] # supervisors recorded in the database + current_supervisors = [] # supervisors from Tracy query = query.strip() + + current_department = session.get('current_department') # bnumber search - if re.match('[Bb]\d+', query): - our_supervisors = list(map(supervisorsDbToDict, Supervisor.select().where(Supervisor.ID % "{}%".format(query.upper())))) - current_supervisors = list(map(supervisorsDbToDict, Tracy().getSupervisorsFromBNumberSearch(query))) + if re.match(r'[Bb]\d+', query): + recorded_supervisors = list(map(supervisorsDbToDict, Supervisor.select().where(Supervisor.ID % "{}%".format(query.upper())).where(Supervisor.DEPT_NAME != current_department))) + current_supervisors = [ + s for s in map(supervisorsDbToDict, Tracy().getSupervisorsFromUserInput(query)) + if s.get('department') != current_department + ] # name search else: if " " not in query: search = query.upper() + "%" - results = Supervisor.select().where(Supervisor.preferred_name ** search | Supervisor.legal_name ** search | Supervisor.LAST_NAME ** search) + results = Supervisor.select().where(Supervisor.DEPT_NAME != current_department).where(Supervisor.preferred_name ** search | Supervisor.legal_name ** search | Supervisor.LAST_NAME ** search) else: search = query.upper().split() first_query = search[0] + "%" last_query = search[-1] + "%" - results = Supervisor.select().where((Supervisor.preferred_name ** first_query | Supervisor.legal_name ** first_query) & Supervisor.LAST_NAME ** last_query) + results = Supervisor.select().where(Supervisor.DEPT_NAME != current_department).where((Supervisor.preferred_name ** first_query | Supervisor.legal_name ** first_query) & Supervisor.LAST_NAME ** last_query) - our_supervisors = list(map(supervisorsDbToDict, results)) - current_supervisors = list(map(supervisorsDbToDict, Tracy().getSupervisorsFromUserInput(query))) + recorded_supervisors = list(map(supervisorsDbToDict, results)) + current_supervisors = [ + s for s in map(supervisorsDbToDict, Tracy().getSupervisorsFromUserInput(query)) + if s.get('department') != current_department + ] # combine lists, remove duplicates, and then sort - supervisors = list({v['bnumber']:v for v in (current_supervisors + our_supervisors)}.values()) - supervisors = sorted(supervisors, key=lambda f:f['firstName'] + f['lastName']) + supervisors = list({v['bnumber']:v for v in (current_supervisors + recorded_supervisors)}.values()) + supervisors = sorted(supervisors, key=lambda f: f['firstName'] + f['lastName']) return jsonify(supervisors) diff --git a/app/templates/main/manageMembers.html b/app/templates/main/manageMembers.html index 1d3198da3..28c50e17a 100644 --- a/app/templates/main/manageMembers.html +++ b/app/templates/main/manageMembers.html @@ -15,6 +15,7 @@ {% block app_content %}

{% if department %} Manage {{department.DEPT_NAME}} Members {% else %} Manage Members {% endif %}

+

Academic Year: 2026-2027



@@ -64,11 +65,11 @@

{% if department %} Manage {{department.DEPT_NAME}} Memb

diff --git a/database/demo_data.py b/database/demo_data.py index 5badc4b46..d1c9eae90 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -15,6 +15,7 @@ from app.models.user import User from app.models.term import Term from app.models.laborStatusForm import LaborStatusForm +from app.models.laborReleaseForm import LaborReleaseForm from app.models.formHistory import FormHistory from app.models.notes import Notes from app.models.supervisorDepartment import SupervisorDepartment @@ -41,8 +42,37 @@ "STU_CPO":"700", "LAST_POSN":"Media Technician", "LAST_SUP_PIDM":"7" + }, + { + "ID":"B00741361", + "PIDM":"99", + "FIRST_NAME":"Antonia", + "LAST_NAME":"Schmith", + "CLASS_LEVEL":"Freshman", + "ACADEMIC_FOCUS":"Computer Science", + "MAJOR":"Computer Science", + "PROBATION":"0", + "ADVISOR":"Scott Heggen", + "STU_EMAIL":"schmitha@berea.edu", + "STU_CPO":"777", + "LAST_POSN":"TA", + "LAST_SUP_PIDM":"7" + }, + { + "ID":"B00732363", + "PIDM":"58", + "FIRST_NAME":"Barbara", + "LAST_NAME":"Williams", + "CLASS_LEVEL":"Junior", + "ACADEMIC_FOCUS":"Computer Science", + "MAJOR":"Computer Science", + "PROBATION":"0", + "ADVISOR":"Jasmine Jones", + "STU_EMAIL":"williamsb@berea.edu", + "STU_CPO":"118", + "LAST_POSN":"TA", + "LAST_SUP_PIDM":"7" }, - { "ID":"B00730361", "PIDM":"1", @@ -412,6 +442,22 @@ "isSaasAdmin": None }, { + "student": "B00741361", + "supervisor": None, + "username": "schmitha", + "isLaborAdmin": None, + "isFinancialAidAdmin": None, + "isSaasAdmin": None + }, + { + "student": "B00732363", + "supervisor": None, + "username": "williamsb", + "isLaborAdmin": None, + "isFinancialAidAdmin": None, + "isSaasAdmin": None + }, + { "student": "B00730361", "supervisor": None, "username": "jamalie", @@ -583,6 +629,7 @@ ############################# today = datetime.now() current_year = today.year - (today.month < 8) + LaborStatusForm.insert([{ "laborStatusFormID": 2, "termCode_id": f"202000", @@ -596,17 +643,88 @@ "POSN_CODE": "S61407", "weeklyHours": 10, "startDate": f"2020-04-01", - "endDate": f"2020-09-01" + "endDate": f"2020-09-01", + "studentConfirmation": True }]).on_conflict_replace().execute() + FormHistory.insert([{ "formHistoryID": 2, "formID_id": "2", "historyType_id": "Labor Status Form", "createdBy_id": 1, "createdDate": f"{current_year}-04-14", - "status_id": "Pending" + "status_id": "Approved" }]).on_conflict_replace().execute() +LaborStatusForm.insert([{ + "laborStatusFormID": 11, + "termCode_id": f"{current_year}00", + "studentName": "Antonia Schmith", + "studentSupervisee_id": "B00741361", + "supervisor_id": "B12361006", + "department_id": 1, + "jobType": "Primary", + "WLS": 1, + "POSN_TITLE": "Student Programmer", + "POSN_CODE": "S61407", + "weeklyHours": 10, + "startDate": f"2026-04-01", + "endDate": f"2026-09-01", + "studentConfirmation": True + }]).on_conflict_replace().execute() + +FormHistory.insert([{ + "formHistoryID": 11, + "formID_id": "11", + "historyType_id": "Labor Status Form", + "createdBy_id": 1, + "createdDate": f"{current_year}-04-14", + "status_id": "Approved" + }]).on_conflict_replace().execute() + +LaborStatusForm.insert([{ + "laborStatusFormID": 12, + "termCode_id": f"{current_year}00", + "studentName": "Barbara Williams", + "studentSupervisee_id": "B00732363", + "supervisor_id": "B12361006", + "department_id": 1, + "jobType": "Primary", + "WLS": 1, + "POSN_TITLE": "Student Programmer", + "POSN_CODE": "S61407", + "weeklyHours": 10, + "startDate": f"2027-04-01", + "endDate": f"2029-09-01", + "studentConfirmation": True + }]).on_conflict_replace().execute() + +FormHistory.insert([{ + "formHistoryID": 12, + "formID_id": "12", + "historyType_id": "Labor Status Form", + "createdBy_id": 1, + "createdDate": f"{current_year}-04-14", + "status_id": "Approved" + }]).on_conflict_replace().execute() + +LaborReleaseForm.insert([{ + "laborReleaseFormID": 10, + "conditionAtRelease": "unsatisfactory", + "releaseDate": f"{current_year}-04-14", + "reasonForRelease": "Smoking Cigarettes in the Programmers' space." + }]).on_conflict_replace().execute() + +FormHistory.insert([{ + "formHistoryID": 13, + "formID_id": "12", + "historyType_id": "Labor Status Form", + "releaseForm": 10, + "createdBy_id": 1, + "createdDate": f"{current_year}-04-14", + "status_id": "Approved" + }]).on_conflict_replace().execute() + LaborStatusForm.insert([{ "laborStatusFormID": 4, "termCode_id": f"{current_year}00", @@ -619,8 +737,8 @@ "POSN_TITLE": "Labor Workers", "POSN_CODE": "S61419", "weeklyHours": 10, - "startDate": f"{current_year}-04-01", - "endDate": "2025-09-01" + "startDate": f"2027-04-01", + "endDate": "2027-09-01" }]).on_conflict_replace().execute() FormHistory.insert([{ From 4a606a351216adc8974250bea6bc9785b5a48b90 Mon Sep 17 00:00:00 2001 From: Julius Fritz Date: Fri, 10 Jul 2026 10:39:41 -0400 Subject: [PATCH 120/163] fixed formating of html for readability --- app/templates/main/departmentPortal.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 413a7608d..177d84070 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -72,7 +72,9 @@

Positions

{{ p }}

{% else %} -
  • {{ p }}
    • +
  • + {{ p }} +
    • {% endif %} {% elif 8 == loop.index0 %} @@ -88,7 +90,7 @@

    Positions

    - + {% endif %} {% endblock %} From 64e49b8c84764e656aacff99e8a8a4a19f40b2e6 Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Fri, 10 Jul 2026 14:42:47 +0000 Subject: [PATCH 121/163] fixed test error --- tests/code/test_search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/code/test_search.py b/tests/code/test_search.py index cbe6f5466..691be75da 100644 --- a/tests/code/test_search.py +++ b/tests/code/test_search.py @@ -228,7 +228,7 @@ def test_getSupervisorsForDepartment(): SupervisorDepartment.create(supervisor = 'B12361006', department = 1) supervisors = getSupervisorsForDepartment(1) - assert len(supervisors) == 2 + assert len(supervisors) == 7 testDept = Department.create(DEPT_NAME="supervisorDept", ACCOUNT="6740", ORG="2114", departmentCompliance = 1) supervisors = getSupervisorsForDepartment(testDept) From 0e9b14accfc7aeb1287c9a3a7364a26495fec728 Mon Sep 17 00:00:00 2001 From: feitsopb Date: Fri, 10 Jul 2026 15:08:38 +0000 Subject: [PATCH 122/163] filtered the tables not to show released students --- .../main_routes/departmentPortal.py | 54 ++++++++++++++----- database/demo_data.py | 4 +- 2 files changed, 43 insertions(+), 15 deletions(-) diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index 03e0fe49e..09b78f63a 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -1,4 +1,5 @@ -import re, datetime +import re +from datetime import date from flask import render_template, request, json, redirect, session, url_for, send_file, g, flash, jsonify from peewee import JOIN, DoesNotExist, fn, Case from functools import reduce @@ -45,19 +46,43 @@ def manageStaff(org=None,account=None): ).dicts() ) - # released_forms = ( - # LaborStatusForm - # .select(LaborStatusForm.studentSupervisee_id) - # .join(FormHistory) # join lsf -> its form histories - # .where(FormHistory.releaseForm.is_null(False)) - # ) - - # conditions for the student_count list - active_primaries = (LaborStatusForm.jobType == 'Primary') & (LaborStatusForm.studentConfirmation == True) & (LaborStatusForm.endDate < datetime.datetime.now()) #& (LaborStatusForm.studentSupervisee_id.not_in(released_forms)) - pending_primaries = (LaborStatusForm.jobType == 'Primary') & (LaborStatusForm.studentConfirmation == None) & (LaborStatusForm.endDate < datetime.datetime.now()) #& (LaborStatusForm.studentSupervisee_id.not_in(released_forms)) + today = date.today() + released_forms = ( + FormHistory + .select(FormHistory.formID) + .join( + LaborReleaseForm, + on=(FormHistory.releaseForm == LaborReleaseForm.laborReleaseFormID) + ) + .where( + (FormHistory.historyType == "Labor Release Form") & + (FormHistory.status == "Approved") & + (LaborReleaseForm.releaseDate <= today) + ) + ) - active_secondaries = (LaborStatusForm.jobType == 'Secondary') & (LaborStatusForm.studentConfirmation == True) & (LaborStatusForm.endDate < datetime.datetime.now()) - pending_secondaries = (LaborStatusForm.jobType == 'Secondary') & (LaborStatusForm.studentConfirmation == None) & (LaborStatusForm.endDate < datetime.datetime.now()) + # Conditions for the supervisee counts. Expired and released positions do + # not contribute to any of the four totals. + active_primaries = ( + (LaborStatusForm.jobType == 'Primary') & + (LaborStatusForm.studentConfirmation == True) & + (LaborStatusForm.endDate >= today) + ) + pending_primaries = ( + (LaborStatusForm.jobType == 'Primary') & + (LaborStatusForm.studentConfirmation.is_null(True)) & + (LaborStatusForm.endDate >= today) + ) + active_secondaries = ( + (LaborStatusForm.jobType == 'Secondary') & + (LaborStatusForm.studentConfirmation == True) & + (LaborStatusForm.endDate >= today) + ) + pending_secondaries = ( + (LaborStatusForm.jobType == 'Secondary') & + (LaborStatusForm.studentConfirmation.is_null(True)) & + (LaborStatusForm.endDate >= today) + ) student_count = list( @@ -69,6 +94,9 @@ def manageStaff(org=None,account=None): fn.SUM(Case(None, ((pending_secondaries, 1),), 0)).alias("pending_secondary_positions"), LaborStatusForm.department, LaborStatusForm.supervisor + ).where( + (LaborStatusForm.department == dept) & + (LaborStatusForm.laborStatusFormID.not_in(released_forms)) ).group_by( LaborStatusForm.department, LaborStatusForm.supervisor diff --git a/database/demo_data.py b/database/demo_data.py index d1c9eae90..6572ef305 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -718,7 +718,7 @@ FormHistory.insert([{ "formHistoryID": 13, "formID_id": "12", - "historyType_id": "Labor Status Form", + "historyType_id": "Labor Release Form", "releaseForm": 10, "createdBy_id": 1, "createdDate": f"{current_year}-04-14", @@ -763,7 +763,7 @@ "POSN_CODE": "S61429", "weeklyHours": 10, "startDate": f"{current_year}-04-01", - "endDate": "2025-09-01" + "endDate": "2029-09-01" }]).on_conflict_replace().execute() FormHistory.insert([{ From 10f171e362c75c0c497a4fe34374bc1667f8f513 Mon Sep 17 00:00:00 2001 From: Julius Fritz Date: Fri, 10 Jul 2026 11:10:15 -0400 Subject: [PATCH 123/163] changed the demo data to work better with the year changes --- database/demo_data.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/database/demo_data.py b/database/demo_data.py index e2a0a9de5..1f3045ddc 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -630,7 +630,7 @@ "positionCode": "S61407", "status": "Active", "wls": 1, - "revisionDate": f"{current_year}-07-01", + "revisionDate": f"2026-07-01", "description": "", "department": 1 }, @@ -639,7 +639,7 @@ "positionCode": "S61408", "status": "Active", "wls": 2, - "revisionDate": f"{current_year}-09-01", + "revisionDate": f"2026-09-01", "description": "", "department": 1 }, @@ -648,7 +648,7 @@ "positionCode": "S61409", "status": "Active", "wls": 3, - "revisionDate": f"{current_year}-07-01", + "revisionDate": f"2026-07-01", "description": "", "department": 1 }, @@ -657,7 +657,7 @@ "positionCode": "S61411", "status": "Active", "wls":3, - "revisionDate" : f"{current_year}-01-01", + "revisionDate" : f"2026-01-01", "description": "", "department" : 1 @@ -667,7 +667,7 @@ "positionCode": "S61410", "status": "Inactive", "wls":2, - "revisionDate" : f"{current_year}-01-01", + "revisionDate" : f"2026-01-01", "description": "", "department" : 3 }, @@ -676,7 +676,7 @@ "positionCode": "S61410", "status": "Active", "wls":2, - "revisionDate" : f"{current_year}-03-29", + "revisionDate" : f"2026-03-29", "description": "", "department" : 3 }, @@ -685,7 +685,7 @@ "positionCode": "S12345", "status": "Active", "wls":3, - "revisionDate" : f"{current_year}-01-23", + "revisionDate" : f"2026-01-23", "description": "", "department" : 1 }, @@ -694,7 +694,7 @@ "positionCode": "S39568", "status": "Active", "wls":4, - "revisionDate" : f"{current_year}-01-31", + "revisionDate" : f"2026-01-31", "description": "", "department" : 1 }, @@ -703,7 +703,7 @@ "positionCode": "S74933", "status": "Active", "wls":5, - "revisionDate" : f"{current_year}-04-01", + "revisionDate" : f"2026-04-01", "description": "", "department" : 1 }, @@ -712,7 +712,7 @@ "positionCode": "S94932", "status": "Active", "wls":6, - "revisionDate" : f"{current_year}-05-03", + "revisionDate" : f"2026-05-03", "description": "", "department" : 1 }, @@ -721,7 +721,7 @@ "positionCode": "S22222", "status": "Active", "wls":1, - "revisionDate" : f"{current_year}-05-03", + "revisionDate" : f"2026-05-03", "description": "", "department" : 1 }, @@ -730,7 +730,7 @@ "positionCode": "S00000", "status": "Active", "wls":6, - "revisionDate" : f"{current_year}-05-03", + "revisionDate" : f"2026-05-03", "description": "", "department" : 1 } From 9dc1d7a41d64d51dcd5d6517c3c7d632dde997c5 Mon Sep 17 00:00:00 2001 From: Julius Fritz Date: Fri, 10 Jul 2026 11:31:54 -0400 Subject: [PATCH 124/163] Added a small shadow to the cards --- app/static/css/departmentPortal.css | 1 + 1 file changed, 1 insertion(+) diff --git a/app/static/css/departmentPortal.css b/app/static/css/departmentPortal.css index 63124b6d2..b563c5054 100644 --- a/app/static/css/departmentPortal.css +++ b/app/static/css/departmentPortal.css @@ -4,6 +4,7 @@ width: 100%; height: 100%; min-width: 100%; + box-shadow: 2px 2px 4px rgba(100, 100, 100, 0.26); } .bi-suitcase-lg-fill { /* Bootstrap Icon */ border: 1px solid #c0c0c0; From d0847298132d71b178594bcc9d2cc22f40f0c170 Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Fri, 10 Jul 2026 18:48:04 +0000 Subject: [PATCH 125/163] made changes to card --- app/controllers/main_routes/main_routes.py | 13 --- app/templates/main/departmentPortal.html | 4 +- database/demo_data.py | 92 +++++++++++----------- 3 files changed, 48 insertions(+), 61 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index debb36450..6fc8b205d 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -221,16 +221,3 @@ def ViewAllocations(org, account): dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) except DoesNotExist: return render_template('errors/404.html'), 404 - - - allocation = Allocation.select(Allocation, Term).join(Term).where(Allocation.department == dept, Allocation.termCode == g.openTerm) - print(g.openTerm, '*********************************************************') - term = g.openTerm.termName - print(term, type(term), '*********************************************************') - return render_template('main/departmentPortal.html', - department = dept, - department_name = dept.DEPT_NAME, - allocation = allocation, - term = term - ) - diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index fa8faca77..0154e8d02 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -40,7 +40,7 @@

    Allocations

    -

    {{ term }}

    15/{{total_allocation or 0}} Positions

    +

    AY 2025-2026

    15/{{total_allocation or 0}} Positions

      @@ -56,7 +56,7 @@

      {{ term }}

      15/{{total_allocation or 0}} Positions

    -

    Break Hours

    0/{{allocation.breakHours or 0}} Hours

    +

    Break Hours

    220/{{allocation.breakHours or 0}} Hours

    diff --git a/database/demo_data.py b/database/demo_data.py index 4f5835aac..f63ee7453 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -515,67 +515,67 @@ terms = [ { - "termCode": f"202500", - "termName": f"AY 2025-2026", - "termStart": f"2025-08-01", - "termEnd": f"2026-05-01", + "termCode": f"{2025}00", + "termName": f"AY {2025}-{2025+1}", + "termStart": f"{2025}-08-01", + "termEnd": f"{2025+1}-05-01", "termState": 0, - "primaryCutOff": f"2025-09-01", - "adjustmentCutOff": f"2026-10-01", + "primaryCutOff": f"{2025}-09-01", + "adjustmentCutOff": f"{2026}-10-01", }, { - "termCode": f"{current_year}00", - "termName": f"AY {current_year}-{current_year+1}", - "termStart": f"{current_year}-08-01", - "termEnd": f"{current_year+1}-05-01", + "termCode": f"{2025}00", + "termName": f"AY {2025}-{2025+1}", + "termStart": f"{2025}-08-01", + "termEnd": f"{2025+1}-05-01", "termState": 1, - "primaryCutOff": f"{current_year}-09-01", - "adjustmentCutOff": f"{current_year}-09-01", + "primaryCutOff": f"{2025}-09-01", + "adjustmentCutOff": f"{2025}-09-01", }, { - "termCode": f"{current_year-1}00", - "termName": f"AY {current_year-1}-{current_year}", - "termStart": f"{current_year-1}-08-01", - "termEnd": f"{current_year}-05-01", + "termCode": f"{2025-1}00", + "termName": f"AY {2025-1}-{2025}", + "termStart": f"{2025-1}-08-01", + "termEnd": f"{2025}-05-01", "termState": 1, - "primaryCutOff": f"{current_year-1}-09-01", - "adjustmentCutOff": f"{current_year-1}-09-01", + "primaryCutOff": f"{2025-1}-09-01", + "adjustmentCutOff": f"{2025-1}-09-01", }, { - "termCode": f"{current_year-2}00", - "termName": f"AY {current_year-2}-{current_year-1}", - "termStart": f"{current_year-2}-08-01", - "termEnd": f"{current_year-1}-05-01", + "termCode": f"{2025-2}00", + "termName": f"AY {2025-2}-{2025-1}", + "termStart": f"{2025-2}-08-01", + "termEnd": f"{2025-1}-05-01", "termState": 1, - "primaryCutOff": f"{current_year-2}-09-01", - "adjustmentCutOff": f"{current_year-2}-09-01", + "primaryCutOff": f"{2025-2}-09-01", + "adjustmentCutOff": f"{2025-2}-09-01", }, { - "termCode": f"{current_year-3}00", - "termName": f"AY {current_year-3}-{current_year-2}", - "termStart": f"{current_year-3}-08-01", - "termEnd": f"{current_year-2}-05-01", + "termCode": f"{2025-3}00", + "termName": f"AY {2025-3}-{2025-2}", + "termStart": f"{2025-3}-08-01", + "termEnd": f"{2025-2}-05-01", "termState": 1, - "primaryCutOff": f"{current_year-3}-09-01", - "adjustmentCutOff": f"{current_year-3}-09-01", + "primaryCutOff": f"{2025-3}-09-01", + "adjustmentCutOff": f"{2025-3}-09-01", }, { - "termCode": f"{current_year-4}00", - "termName": f"AY {current_year-4}-{current_year-3}", - "termStart": f"{current_year-4}-08-01", - "termEnd": f"{current_year-3}-05-01", + "termCode": f"{2025-4}00", + "termName": f"AY {2025-4}-{2025-3}", + "termStart": f"{2025-4}-08-01", + "termEnd": f"{2025-3}-05-01", "termState": 1, - "primaryCutOff": f"{current_year-4}-09-01", - "adjustmentCutOff": f"{current_year-4}-09-01", + "primaryCutOff": f"{2025-4}-09-01", + "adjustmentCutOff": f"{2025-4}-09-01", }, { - "termCode": f"{current_year}01", - "termName": f"Thanksgiving Break {current_year}", - "termStart": f"{current_year}-08-01", - "termEnd": f"{current_year+1}-05-01", + "termCode": f"{2025}01", + "termName": f"Thanksgiving Break {2025}", + "termStart": f"{2025}-08-01", + "termEnd": f"{2025+1}-05-01", "termState": 0, - "primaryCutOff": f"{current_year}-09-01", - "adjustmentCutOff": f"{current_year}-09-01", + "primaryCutOff": f"{2025}-09-01", + "adjustmentCutOff": f"{2025}-09-01", "isBreak": 1, }, ] @@ -799,10 +799,10 @@ print("Data insertion complete :)") allocation =[ { - "termCode":f"{current_year}00", + "termCode":f"{2025}00", "department": 3, "isFinal": True, - "approvedOn": f"{current_year}-06-30", + "approvedOn": f"{2025}-06-30", "approvedBy": "B12365892", "justification": "We just want it for fun", "primary_10": 2, @@ -814,10 +814,10 @@ "breakHours": 500 }, { - "termCode":f"{current_year}00", + "termCode":f"{2025}00", "department": 2, "isFinal": False, - "approvedOn": f"{current_year}-06-20", + "approvedOn": f"{2025}-06-20", "approvedBy": "B00763721", "justification": "We need it to lower the amount of allocations we have", "primary_10": 1, From 7703be30db5985a1c6bd984a2025a2ef8c229253 Mon Sep 17 00:00:00 2001 From: Chris Georgiev Date: Fri, 10 Jul 2026 15:54:23 -0400 Subject: [PATCH 126/163] moved over only our changes from polluted branch --- app/controllers/main_routes/main_routes.py | 63 ++++++++++++++- app/static/css/base.css | 33 +++++++- app/templates/main/departmentPortal.html | 90 +++++++++++++++++++++- 3 files changed, 179 insertions(+), 7 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 0a2f21e4b..64884cea0 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -1,5 +1,5 @@ from flask import render_template, request, json, redirect, url_for, send_file, g, flash, jsonify -from peewee import JOIN, DoesNotExist +from peewee import JOIN, DoesNotExist, fn from functools import reduce import operator from app.models.department import Department @@ -56,16 +56,73 @@ def departmentPortal(org=None,account=None): except (NameError, DoesNotExist): dept = None - + currentUser = require_login() if g.currentUser.isLaborAdmin: departments = list(Department.select().order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) else: departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) + + supervisor_departments = ( + SupervisorDepartment + .select() + .join(Supervisor) + .where(SupervisorDepartment.department == dept) + .order_by( + fn.COALESCE( + Supervisor.preferred_name, + Supervisor.legal_name, + Supervisor.LAST_NAME + ).asc() + ) + ) + + labor_coordinators = [] + supervisors = [] + + for supervisor_department in supervisor_departments: + supervisor = supervisor_department.supervisor + + if supervisor is None: + continue + + first_name = supervisor.preferred_name or supervisor.legal_name or "" + last_name = supervisor.LAST_NAME or "" + + supervisor_name = f"{first_name} {last_name}".strip() + + supervisor_display = { + "name": supervisor_name, + "email": supervisor.EMAIL + } + + if supervisor_department.isCoordinator: + labor_coordinators.append(supervisor_display) + else: + supervisors.append(supervisor_display) return render_template('main/departmentPortal.html', departments = departments, - department = dept) + department = dept, + supervisors = supervisors, + labor_coordinators=labor_coordinators, + currentUser=currentUser + ) + +@main_bp.route('/department///managepositions', methods=['GET']) +def managePositions(org, account): + try: + dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) + except DoesNotExist: + return render_template('errors/404.html'), 404 + + positions = Tracy().getPositionsFromDepartment(org, account) + print(positions) + return render_template('main/managepositions.html', + department = dept, + department_name = dept.DEPT_NAME, + positions = positions + ) @main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) def addUserToDept(): diff --git a/app/static/css/base.css b/app/static/css/base.css index 940f8d6e5..48d4a9a7d 100755 --- a/app/static/css/base.css +++ b/app/static/css/base.css @@ -192,6 +192,33 @@ a { z-index:999; } +.site-footer { + position: fixed; + left: 280px; + right: 0; + bottom: 0; + + background-color: #e9ebec; + color: #1e2433; + + padding: 8px 15px; + line-height: 1.4; + box-sizing: border-box; + z-index: 101; + +} + +.sidebar-push { + padding-bottom: 85px; +} + +@media (max-width: 991px) { + .site-footer { + left: 0; + width: 100%; + } +} + .card { position: relative; display: -webkit-box; @@ -207,6 +234,7 @@ a { background-clip: border-box; border: 1px solid rgba(0, 0, 0, 0.125); border-radius: 0.25rem; + overflow: hidden; } .card-body { @@ -250,6 +278,9 @@ a { padding: 0.5rem 1rem; background-color: rgba(0, 0, 0, 0.03); border-top: 1px solid rgba(0, 0, 0, 0.125); + border-bottom-left-radius: 1rem; + border-bottom-right-radius: 1rem; + } .card-footer:last-child { @@ -263,4 +294,4 @@ a { .card-img-top { border-top-left-radius: calc(0.25rem - 1px); border-top-right-radius: calc(0.25rem - 1px); -} +} \ No newline at end of file diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 8ee01838b..2685d2513 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -3,13 +3,14 @@ {% block scripts %} {{super()}} + {% if department %} {{department.DEPT_NAME}} Portal {% else %} Choose a Department: {% endif %} + -
    +
    -{% endblock %} + +{% if department %} +
    + + +
    +
    +
    +
    + +
    + +
    +

    + Members +

    +
    +
    +

    {% if labor_coordinators|length <= 1 %} Labor Coordinator {% else %} Labor Coordinators{% endif %}

    + {% if labor_coordinators %} + {% for coordinator in labor_coordinators %} +

    + {{ coordinator.name }} + + {% if coordinator.email %} + + + + {% endif %} +

    + {% endfor %} + {% else %} +

    None assigned. Add one?

    + + + {% endif %} + + +

    {% if supervisors|length <= 1 %} Supervisor{% else %} Supervisors{% endif %}

    + + {% if supervisors %} + {% for s in supervisors %} + {% if loop.index0 < 3 %} +

    + {{ s.name }} + + {% if s.email %} + + + + + {% endif %} +

    + {% elif loop.index0 == 3 %} +

    and {{ supervisors|length - 3 }} more...

    + {% endif %} + {% endfor %} + {% elif not labor_coordinators and currentUser.isLaborAdmin %} +

    No active supervisors assigned. Add one?

    + {% else %} +

    No active supervisors assigned.

    + {% endif %} + +
    + +
    + View Members + + +
    +
    + + +{% endif %} + +{% endblock %}\ \ No newline at end of file From cd9985e2b1ec6a19138bf79fc81e70d913a7a5c0 Mon Sep 17 00:00:00 2001 From: Chris Georgiev Date: Fri, 10 Jul 2026 16:00:21 -0400 Subject: [PATCH 127/163] removed in-line CSS --- app/templates/main/departmentPortal.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 2685d2513..e92b03952 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -30,12 +30,12 @@

    {% if department %} {{department.DEPT_NAME}} Portal {% e
    -
    +
    -
    From 948d2677dd4a9cb80510e5bde88c34ba67d187fe Mon Sep 17 00:00:00 2001 From: Chris Georgiev Date: Fri, 10 Jul 2026 16:21:22 -0400 Subject: [PATCH 128/163] removing unneeded change that snuck through --- app/static/css/base.css | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/app/static/css/base.css b/app/static/css/base.css index 48d4a9a7d..7a7bbb80c 100755 --- a/app/static/css/base.css +++ b/app/static/css/base.css @@ -192,33 +192,6 @@ a { z-index:999; } -.site-footer { - position: fixed; - left: 280px; - right: 0; - bottom: 0; - - background-color: #e9ebec; - color: #1e2433; - - padding: 8px 15px; - line-height: 1.4; - box-sizing: border-box; - z-index: 101; - -} - -.sidebar-push { - padding-bottom: 85px; -} - -@media (max-width: 991px) { - .site-footer { - left: 0; - width: 100%; - } -} - .card { position: relative; display: -webkit-box; From b089957f0b2771fee8461f96b6fe22b6c1f6f61e Mon Sep 17 00:00:00 2001 From: John Lolonga Date: Mon, 13 Jul 2026 10:46:04 -0400 Subject: [PATCH 129/163] fixed the URL for parity --- app/templates/main/departmentPortal.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 177d84070..66f8f6bc8 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -73,7 +73,7 @@

    Positions

    {% else %}
  • - {{ p }} + {{ p }}
    • {% endif %} @@ -85,7 +85,7 @@

    Positions

    - View All Positions + View All Positions
    From 64d16304edf5761f7ecdc9a90741b1af587403aa Mon Sep 17 00:00:00 2001 From: Artem Kurasov Date: Mon, 13 Jul 2026 10:54:36 -0400 Subject: [PATCH 130/163] Made Switches save the data to the database on the Manage Members page --- .../main_routes/departmentPortal.py | 22 ++++++++++ app/static/js/manageMembers.js | 23 ++++++---- app/templates/main/manageMembers.html | 44 ++++++++++--------- 3 files changed, 59 insertions(+), 30 deletions(-) diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index 09b78f63a..7336dd605 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -175,3 +175,25 @@ def add_member(query=None): supervisors = sorted(supervisors, key=lambda f: f['firstName'] + f['lastName']) return jsonify(supervisors) + +@main_bp.route('/members/coordinator_switch', methods=['POST']) +def coordinator_switch(): + member_id = request.form.get("member-id") + is_coordinator = request.form.get("is_coordinator") + + member = SupervisorDepartment.get(SupervisorDepartment.supervisor == member_id) + member.isCoordinator = is_coordinator + member.save() + + return redirect(request.referrer) + +@main_bp.route('/members/ban_switch', methods=['POST']) +def ban_switch(): + member_id = request.form.get("member-id") + member = Supervisor.get(Supervisor.ID == member_id) + print("BEFORE:", member.ID, member.isBanned) + member.isBanned = not member.isBanned + member.save() + print("AFTER:", member.ID, member.isBanned) + + return redirect(request.referrer) \ No newline at end of file diff --git a/app/static/js/manageMembers.js b/app/static/js/manageMembers.js index b4f97e689..c98dadb86 100644 --- a/app/static/js/manageMembers.js +++ b/app/static/js/manageMembers.js @@ -10,7 +10,7 @@ $(document).ready(function() { }], // hide sort icon on header of first column 'aaSorting': [ [0, 'asc'] - ], // start to sort data in second column + ], // start to sort data in second column searching: false, pageLength: 10, language: { @@ -20,16 +20,20 @@ $(document).ready(function() { }); $(document).on("click", ".member-status-btn", function() { - let memberName = $(this).data("member-name"); - let memberStatus = $(this).data("member-status"); + let memberName = $(this).data("member-name"); + let memberStatus = $(this).val(); let category; + $(this).closest("form").submit(); + + //$(this).closest("form").submit(); + if (memberStatus === "Banned") { category = "danger"; } else { category = "success"; } - + let quote = String.fromCharCode(39); $("#flash_container").html("
    The status for " + memberName + " has been set to " + quote + memberStatus + quote + ".
    "); @@ -38,22 +42,23 @@ $(document).ready(function() { if (memberStatus === "Banned") { $(this).removeClass("btn-danger").addClass("btn-success"); $(this).text("Unban"); - $(this).data("member-status", "Unbanned"); + $(this).val("Unbanned"); } else { $(this).removeClass("btn-success").addClass("btn-danger"); $(this).html("  Ban  "); - $(this).data("member-status", "Banned"); + $(this).val("Banned"); } }); $(document).on("click", ".remove-member", function() { - let memberName = $(this).data("member-name"); + let memberName = $(this).data("member-name"); $("#flash_container").html("
    " + memberName + " has been removed from the department.
    "); $("#flasher").delay(3000).fadeOut(); }); $(document).on("click", ".assign-coordinator", function() { - let memberName = $(this).data("member-name"); + let memberName = $(this).data("member-name"); + $(this).closest("form").submit(); if ($(this).is(":checked")) { $("#flash_container").html("
    " + memberName + " has been assigned as a coordinator.
    "); @@ -136,7 +141,7 @@ function sendQuery(search_str) { highlighted_text = highlight(choice_text, search_str) + `${username}`; optionString += ``; } - } + } $("#search").append(createFragment(optionString)) $('#search').selectpicker("refresh"); } diff --git a/app/templates/main/manageMembers.html b/app/templates/main/manageMembers.html index 28c50e17a..ab509c52a 100644 --- a/app/templates/main/manageMembers.html +++ b/app/templates/main/manageMembers.html @@ -74,33 +74,35 @@

    Academic Year: 2026-2027

     {% if currentUser.isLaborAdmin or currentUser.isLaborDepartmentStudent %} {% endif %} From 5483e263c748c36128bc585e1d95f76b31387bb1 Mon Sep 17 00:00:00 2001 From: BhushanSah Date: Mon, 13 Jul 2026 15:15:45 +0000 Subject: [PATCH 131/163] Fixed the size of icon --- app/static/css/base.css | 4 ++++ app/templates/main/departmentPortal.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/static/css/base.css b/app/static/css/base.css index 7a7bbb80c..ebf6bc302 100755 --- a/app/static/css/base.css +++ b/app/static/css/base.css @@ -267,4 +267,8 @@ a { .card-img-top { border-top-left-radius: calc(0.25rem - 1px); border-top-right-radius: calc(0.25rem - 1px); +} + +.members-icon { + font-size: 36px; } \ No newline at end of file diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index e92b03952..5ea6ec145 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -34,7 +34,7 @@

    {% if department %} {{department.DEPT_NAME}} Portal {% e
    - +
    From 7180a275e70d2b7b57443637380eb4496bb8c08d Mon Sep 17 00:00:00 2001 From: BhushanSah Date: Mon, 13 Jul 2026 15:16:45 +0000 Subject: [PATCH 132/163] Removed currentuser.login --- app/controllers/main_routes/main_routes.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 64884cea0..4bb760d95 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -56,8 +56,6 @@ def departmentPortal(org=None,account=None): except (NameError, DoesNotExist): dept = None - currentUser = require_login() - if g.currentUser.isLaborAdmin: departments = list(Department.select().order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) else: @@ -106,7 +104,7 @@ def departmentPortal(org=None,account=None): department = dept, supervisors = supervisors, labor_coordinators=labor_coordinators, - currentUser=currentUser + currentUser=g.currentUser ) @main_bp.route('/department///managepositions', methods=['GET']) From 17544d4846ae378817c02c45399232214ee8832d Mon Sep 17 00:00:00 2001 From: Chris Georgiev Date: Mon, 13 Jul 2026 11:28:29 -0400 Subject: [PATCH 133/163] converted variables to camelCase --- app/controllers/main_routes/main_routes.py | 26 +++++++++++----------- app/templates/main/departmentPortal.html | 8 +++---- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 4bb760d95..2c768f811 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -61,7 +61,7 @@ def departmentPortal(org=None,account=None): else: departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) - supervisor_departments = ( + supervisorDepartments = ( SupervisorDepartment .select() .join(Supervisor) @@ -75,35 +75,35 @@ def departmentPortal(org=None,account=None): ) ) - labor_coordinators = [] + laborCoordinators = [] supervisors = [] - for supervisor_department in supervisor_departments: - supervisor = supervisor_department.supervisor + for supervisorDepartment in supervisorDepartments: + supervisor = supervisorDepartment.supervisor if supervisor is None: continue - first_name = supervisor.preferred_name or supervisor.legal_name or "" - last_name = supervisor.LAST_NAME or "" + firstName = supervisor.preferred_name or supervisor.legal_name or "" + lastName = supervisor.LAST_NAME or "" - supervisor_name = f"{first_name} {last_name}".strip() + supervisorName = f"{firstName} {lastName}".strip() - supervisor_display = { - "name": supervisor_name, + supervisorDisplay = { + "name": supervisorName, "email": supervisor.EMAIL } - if supervisor_department.isCoordinator: - labor_coordinators.append(supervisor_display) + if supervisorDepartment.isCoordinator: + laborCoordinators.append(supervisorDisplay) else: - supervisors.append(supervisor_display) + supervisors.append(supervisorDisplay) return render_template('main/departmentPortal.html', departments = departments, department = dept, supervisors = supervisors, - labor_coordinators=labor_coordinators, + laborCoordinators=laborCoordinators, currentUser=g.currentUser ) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 5ea6ec145..1e1997002 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -45,9 +45,9 @@

    -

    {% if labor_coordinators|length <= 1 %} Labor Coordinator {% else %} Labor Coordinators{% endif %}

    - {% if labor_coordinators %} - {% for coordinator in labor_coordinators %} +

    {% if laborCoordinators|length <= 1 %} Labor Coordinator {% else %} Labor Coordinators{% endif %}

    + {% if laborCoordinators %} + {% for coordinator in laborCoordinators %}

    {{ coordinator.name }} @@ -90,7 +90,7 @@

    {% if supervisors|length <= 1 %} Supervisor{% else %} Supervisors{% endi

    and {{ supervisors|length - 3 }} more...

    {% endif %} {% endfor %} - {% elif not labor_coordinators and currentUser.isLaborAdmin %} + {% elif not laborCoordinators and currentUser.isLaborAdmin %}

    No active supervisors assigned. Add one?

    {% else %}

    No active supervisors assigned.

    From f77415170fd305314f4bf835bbbb3f4958323121 Mon Sep 17 00:00:00 2001 From: Chris Georgiev Date: Mon, 13 Jul 2026 11:47:53 -0400 Subject: [PATCH 134/163] removed vestigial code fragment --- app/controllers/main_routes/main_routes.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 2c768f811..9a1a631b0 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -107,20 +107,6 @@ def departmentPortal(org=None,account=None): currentUser=g.currentUser ) -@main_bp.route('/department///managepositions', methods=['GET']) -def managePositions(org, account): - try: - dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) - except DoesNotExist: - return render_template('errors/404.html'), 404 - - positions = Tracy().getPositionsFromDepartment(org, account) - print(positions) - return render_template('main/managepositions.html', - department = dept, - department_name = dept.DEPT_NAME, - positions = positions - ) @main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) def addUserToDept(): From e8455660f403888510496b21d369efa5bc0c3362 Mon Sep 17 00:00:00 2001 From: Artem Kurasov Date: Mon, 13 Jul 2026 11:50:46 -0400 Subject: [PATCH 135/163] Made the switches work asynchronously --- .../main_routes/departmentPortal.py | 9 +++--- app/static/js/manageMembers.js | 29 ++++++++++++++----- app/templates/main/manageMembers.html | 5 ++-- 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index 7336dd605..36d123187 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -178,14 +178,15 @@ def add_member(query=None): @main_bp.route('/members/coordinator_switch', methods=['POST']) def coordinator_switch(): - member_id = request.form.get("member-id") - is_coordinator = request.form.get("is_coordinator") + data = request.get_json() + supervisor_id = data.get("supervisorID") + is_coordinator = data.get("isCoordinator") - member = SupervisorDepartment.get(SupervisorDepartment.supervisor == member_id) + member = SupervisorDepartment.get(SupervisorDepartment.supervisor == supervisor_id) member.isCoordinator = is_coordinator member.save() - return redirect(request.referrer) + return "", 200 @main_bp.route('/members/ban_switch', methods=['POST']) def ban_switch(): diff --git a/app/static/js/manageMembers.js b/app/static/js/manageMembers.js index c98dadb86..863c272d3 100644 --- a/app/static/js/manageMembers.js +++ b/app/static/js/manageMembers.js @@ -57,16 +57,29 @@ $(document).ready(function() { }); $(document).on("click", ".assign-coordinator", function() { + let memberName = $(this).data("member-name"); - $(this).closest("form").submit(); + let supervisorID = $(this).data("supervisor"); + let isChecked = $(this).is(":checked"); + + $.ajax({ + url: "/members/coordinator_switch", + data: JSON.stringify({supervisorID: supervisorID, isCoordinator: isChecked}), + type: "POST", + contentType: "application/json", + success: function() { + if (isChecked) { + $("#flash_container").html("
    " + memberName + " has been assigned as a coordinator.
    "); + $("#flasher").delay(3000).fadeOut(); + } else { + $("#flash_container").html("
    " + memberName + " is no longer a coordinator.
    "); + $("#flasher").delay(3000).fadeOut(); + } + + }, + error: function() {console.log("An error has occured.");} + }) - if ($(this).is(":checked")) { - $("#flash_container").html("
    " + memberName + " has been assigned as a coordinator.
    "); - $("#flasher").delay(3000).fadeOut(); - } else { - $("#flash_container").html("
    " + memberName + " is no longer a coordinator.
    "); - $("#flasher").delay(3000).fadeOut(); - } }); }) diff --git a/app/templates/main/manageMembers.html b/app/templates/main/manageMembers.html index ab509c52a..a54dcfa76 100644 --- a/app/templates/main/manageMembers.html +++ b/app/templates/main/manageMembers.html @@ -74,13 +74,12 @@

    Academic Year: 2026-2027

     - {% endif %} From 8252f0d854bd15b15fd59111462f6e7f8f5cafc7 Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Mon, 13 Jul 2026 20:08:50 +0000 Subject: [PATCH 141/163] removed redundant code --- app/controllers/main_routes/main_routes.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index d0295e756..528b1a056 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -73,7 +73,7 @@ def departmentPortal(org=None,account=None): except DoesNotExist: allocation = None - term = 202500 + ViewAllocations(org, account) totalPositions = Allocation.select(Allocation.primary_10 + Allocation.primary_12 + Allocation.primary_15 + Allocation.primary_20 + Allocation.secondary_5 + Allocation.secondary_10).where(Allocation.department == dept, Allocation.termCode == 202500).scalar() usedAllocation = len([hours for hours in LaborStatusForm.select(LaborStatusForm.weeklyHours).where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.studentConfirmation.is_null(True), LaborStatusForm.contractHours.is_null(True))]) @@ -85,9 +85,7 @@ def departmentPortal(org=None,account=None): "jobType": form.jobType, "weeklyHours": form.weeklyHours }) - for sid, jobs in student_hours.items(): - primary = sum(j["weeklyHours"] for j in jobs if j["jobType"] == "Primary") - secondary = sum(j["weeklyHours"] for j in jobs if j["jobType"] == "Secondary") + def count_workers(job_type, hours_bucket): return LaborStatusForm.select().where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.jobType == job_type, LaborStatusForm.weeklyHours == hours_bucket,LaborStatusForm.studentConfirmation.is_null(True), LaborStatusForm.contractHours.is_null(True)).count() From 2fbb3226ae7796f3623b197495ec4f87610dcf7a Mon Sep 17 00:00:00 2001 From: Chris Georgiev Date: Mon, 13 Jul 2026 16:13:19 -0400 Subject: [PATCH 142/163] collapsed supervisorDepartments definition --- app/controllers/main_routes/main_routes.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 7e02b01f9..930d513fe 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -63,19 +63,8 @@ def departmentPortal(org=None,account=None): else: departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) - supervisorDepartments = ( - SupervisorDepartment - .select() - .join(Supervisor) - .where(SupervisorDepartment.department == dept) - .order_by( - fn.COALESCE( - Supervisor.preferred_name, - Supervisor.legal_name, - Supervisor.LAST_NAME - ).asc() - ) - ) + supervisorDepartments = (SupervisorDepartment.select().join(Supervisor).where(SupervisorDepartment.department == dept) + .order_by(fn.COALESCE(Supervisor.preferred_name, Supervisor.legal_name, Supervisor.LAST_NAME).asc())) laborCoordinators = [] supervisors = [] From 71d5fd71a494fed491ee1364e6fea737eeec6f40 Mon Sep 17 00:00:00 2001 From: BhushanSah Date: Mon, 13 Jul 2026 20:17:39 +0000 Subject: [PATCH 143/163] fixed the for loop so it won't run more than 3 times --- app/templates/main/departmentPortal.html | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 88a4c4369..1d4e76ae7 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -82,8 +82,7 @@

    {% if laborCoordinators|length <= 1 %} Labor Coordinator {% else %} Labo

    {% if supervisors|length <= 1 %} Supervisor{% else %} Supervisors{% endif %}

    {% if supervisors %} - {% for s in supervisors %} - {% if loop.index0 < 3 %} + {% for s in supervisors[:3] %}

    {{ s.name }} @@ -97,10 +96,12 @@

    {% if supervisors|length <= 1 %} Supervisor{% else %} Supervisors{% endi {% endif %}

    - {% elif loop.index0 == 3 %} -

    and {{ supervisors|length - 3 }} more...

    - {% endif %} - {% endfor %} + {% endfor %} + + {% if supervisors|length > 3 %} +

    and {{ supervisors|length - 3 }} more...

    + {% endif %} + {% elif not laborCoordinators and currentUser.isLaborAdmin %}

    No active supervisors assigned. Add one?

    {% else %} From 1f6817421eb82595bbfd2dcd331181a13d2ce41a Mon Sep 17 00:00:00 2001 From: BhushanSah Date: Mon, 13 Jul 2026 20:25:56 +0000 Subject: [PATCH 144/163] Fixed the loop for postion card --- app/templates/main/departmentPortal.html | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 1d4e76ae7..5a1185cef 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -134,8 +134,7 @@

    Positions

      - {% for p in positions %} - {% if 7 > loop.index0 %} + {% for p in positions[:7] %} {% if p == "No active positions in this department" %}

    • {{ p }}

      @@ -145,12 +144,10 @@

      Positions

      {{ p }}
      • {% endif %} - - {% elif 7 == loop.index0 %} + {% endfor %} + {% if positions| length >7 %}

    and {{ (positions | length) - 7}} more...

    {% endif %} - {% endfor %} -
    From 4f3c76abdbfb3c38ccd04348eef0b334a0a42c97 Mon Sep 17 00:00:00 2001 From: feitsopb Date: Tue, 14 Jul 2026 13:11:43 +0000 Subject: [PATCH 145/163] fixed the merge conflict --- database/demo_data.py | 100 +++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/database/demo_data.py b/database/demo_data.py index 0f16cfd53..db5b14c70 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -618,7 +618,7 @@ LaborStatusForm.insert([{ "laborStatusFormID": 11, - "termCode_id": f"{current_year}00", + "termCode_id": f"202500", "studentName": "Antonia Schmith", "studentSupervisee_id": "B00741361", "supervisor_id": "B12361006", @@ -638,13 +638,13 @@ "formID_id": "11", "historyType_id": "Labor Status Form", "createdBy_id": 1, - "createdDate": f"{current_year}-04-14", + "createdDate": f"2025-04-14", "status": "Approved" }]).on_conflict_replace().execute() LaborStatusForm.insert([{ "laborStatusFormID": 12, - "termCode_id": f"{current_year}00", + "termCode_id": f"202500", "studentName": "Barbara Williams", "studentSupervisee_id": "B00732363", "supervisor_id": "B12361006", @@ -664,14 +664,14 @@ "formID_id": "12", "historyType_id": "Labor Status Form", "createdBy_id": 1, - "createdDate": f"{current_year}-04-14", + "createdDate": f"2025-04-14", "status": "Approved" }]).on_conflict_replace().execute() LaborReleaseForm.insert([{ "laborReleaseFormID": 10, "conditionAtRelease": "unsatisfactory", - "releaseDate": f"{current_year}-04-14", + "releaseDate": f"2025-04-14", "reasonForRelease": "Smoking Cigarettes in the Programmers' space." }]).on_conflict_replace().execute() @@ -681,13 +681,13 @@ "historyType_id": "Labor Release Form", "releaseForm": 10, "createdBy_id": 1, - "createdDate": f"{current_year}-04-14", + "createdDate": f"2025-04-14", "status": "Approved" }]).on_conflict_replace().execute() LaborStatusForm.insert([{ "laborStatusFormID": 4, - "termCode_id": f"{current_year}00", + "termCode_id": f"202500", "studentName": "Elaleh Jamali", "studentSupervisee_id": "B00730361", "supervisor_id": "B12361006", @@ -706,13 +706,13 @@ "formID_id": "4", "historyType_id": "Labor Status Form", "createdBy_id": 1, - "createdDate": f"{current_year}-04-14", + "createdDate": f"2025-04-14", "status": "Approved" }]).on_conflict_replace().execute() LaborStatusForm.insert([{ "laborStatusFormID": 5, - "termCode_id": f"{current_year}00", + "termCode_id": f"202500", "studentName": "Oluwagbayi Makinde", "studentSupervisee_id": "B00791326", "supervisor_id": "B12365892", @@ -722,7 +722,7 @@ "POSN_TITLE": "Labor Workers", "POSN_CODE": "S61429", "weeklyHours": 10, - "startDate": f"{current_year}-04-01", + "startDate": f"2025-04-01", "endDate": "2029-09-01" }]).on_conflict_replace().execute() @@ -731,7 +731,7 @@ "formID_id": "5", "historyType_id": "Labor Status Form", "createdBy_id": 1, - "createdDate": f"{current_year}-04-14", + "createdDate": f"2025-04-14", "status": "Approved" }]).on_conflict_replace().execute() @@ -763,7 +763,7 @@ LaborStatusForm.insert([{ "laborStatusFormID": 6, - "termCode_id": f"{current_year}00", + "termCode_id": f"202500", "studentName": "Guillermo Adams", "studentSupervisee_id": "B00734292", "supervisor_id": "B12365892", @@ -773,7 +773,7 @@ "POSN_TITLE": "Labor Workers", "POSN_CODE": "S61439", "weeklyHours": 10, - "startDate": f"{current_year}-04-01", + "startDate": f"2025-04-01", "endDate": "2025-09-01" }]).on_conflict_replace().execute() @@ -782,7 +782,7 @@ "formID_id": "6", "historyType_id": "Labor Status Form", "createdBy_id": 1, - "createdDate": f"{current_year}-04-14", + "createdDate": f"2025-04-14", "status": "Approved" }]).on_conflict_replace().execute() @@ -936,42 +936,42 @@ ] Allocation.insert_many(allocations).on_conflict_replace().execute() -# print("Data insertion complete :)") -# allocation =[ -# { -# "termCode":f"{current_year}00", -# "department": 3, -# "isFinal": True, -# "approvedOn": f"{current_year}-06-30", -# "approvedBy": "B12365892", -# "justification": "We just want it for fun", -# "primary_10": 2, -# "primary_12": 3, -# "primary_15": 1, -# "primary_20": 6, -# "secondary_5": 2, -# "secondary_10": 0, -# "breakHours": 500 -# }, -# { -# "termCode":f"{current_year}00", -# "department": 2, -# "isFinal": False, -# "approvedOn": f"{current_year}-06-20", -# "approvedBy": "B00763721", -# "justification": "We need it to lower the amount of allocations we have", -# "primary_10": 1, -# "primary_12": 2, -# "primary_15": 5, -# "primary_20": 2, -# "secondary_5": 10, -# "secondary_10": 0, -# "breakHours": 1500 -# } -# ] -# Allocation.insert_many(allocation).on_conflict_replace().execute() -# print(" * allocation added") -# print(PositionHistory()) +print("Data insertion complete :)") +allocation =[ + { + "termCode":f"{2025}00", + "department": 3, + "isFinal": True, + "approvedOn": f"{2025}-06-30", + "approvedBy": "B12365892", + "justification": "We just want it for fun", + "primary_10": 2, + "primary_12": 3, + "primary_15": 1, + "primary_20": 6, + "secondary_5": 2, + "secondary_10": 0, + "breakHours": 500 + }, + { + "termCode":f"{2025}00", + "department": 2, + "isFinal": False, + "approvedOn": f"{2025 }-06-20", + "approvedBy": "B00763721", + "justification": "We need it to lower the amount of allocations we have", + "primary_10": 1, + "primary_12": 2, + "primary_15": 5, + "primary_20": 2, + "secondary_5": 10, + "secondary_10": 0, + "breakHours": 1500 + } + ] +Allocation.insert_many(allocation).on_conflict_replace().execute() +print(" * allocation added") +print(PositionHistory()) print(" * allocation added") From d2d74f68d0ca4842cee1bacb35ea95cb6aa88e5b Mon Sep 17 00:00:00 2001 From: feitsopb Date: Tue, 14 Jul 2026 13:30:41 +0000 Subject: [PATCH 146/163] added a route to the manage supervisor button --- app/templates/main/departmentPortal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 5a1185cef..a030069cd 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -111,7 +111,7 @@

    {% if supervisors|length <= 1 %} Supervisor{% else %} Supervisors{% endi

    - View Members + View Members
    From d03906cc3fbd57efbdc9ed0afd62045a659c8d45 Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Tue, 14 Jul 2026 14:21:40 +0000 Subject: [PATCH 147/163] fixed some pr problems --- app/controllers/main_routes/main_routes.py | 49 +++++++++++----------- app/templates/main/departmentPortal.html | 12 +++--- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index a99de2903..2fccf5081 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -100,29 +100,33 @@ def departmentPortal(org=None,account=None): supervisors.append(supervisorDisplay) ViewAllocations(org, account) - totalPositions = Allocation.select(Allocation.primary_10 + Allocation.primary_12 + Allocation.primary_15 + Allocation.primary_20 + Allocation.secondary_5 + Allocation.secondary_10).where(Allocation.department == dept, Allocation.termCode == 202500).scalar() - usedAllocation = len([hours for hours in LaborStatusForm.select(LaborStatusForm.weeklyHours).where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.studentConfirmation.is_null(True), LaborStatusForm.contractHours.is_null(True))]) - student_hours = {} + totalPositions = Allocation.select(fn.SUM(Allocation.primary_10) + fn.SUM(Allocation.primary_12) + fn.SUM(Allocation.primary_15) + fn.SUM(Allocation.primary_20) + fn.sum(Allocation.secondary_5) + fn.SUM(Allocation.secondary_10)).where(Allocation.department == dept, Allocation.termCode == 202500).scalar() + usedAllocation = len([hours for hours in LaborStatusForm.select(LaborStatusForm.weeklyHours).where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.contractHours.is_null(True))]) + studentHours = {} for form in LaborStatusForm.select().where(LaborStatusForm.department == dept,LaborStatusForm.termCode_id == 202500,LaborStatusForm.contractHours.is_null(True) ): - sid = form.studentSupervisee_id - student_hours.setdefault(sid, []).append({ - "jobType": form.jobType, - "weeklyHours": form.weeklyHours - }) + studentSuperviseeId = form.studentSupervisee_id + if studentSuperviseeId not in studentHours: + studentHours[studentSuperviseeId] = [] + studentHours[studentSuperviseeId].append({ + "jobType": form.jobType, + "weeklyHours": form.weeklyHours + }) + def count_workers(job_type, hours_bucket): - return LaborStatusForm.select().where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.jobType == job_type, LaborStatusForm.weeklyHours == hours_bucket,LaborStatusForm.studentConfirmation.is_null(True), LaborStatusForm.contractHours.is_null(True)).count() + return LaborStatusForm.select().where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.jobType == job_type, LaborStatusForm.weeklyHours == hours_bucket, LaborStatusForm.contractHours.is_null(True)).count() - used_10 = count_workers("Primary", "10") - used_12 = count_workers("Primary", "12") - used_15 = count_workers("Primary", "15") - used_20 = count_workers("Primary", "20") - used_5_sec = count_workers("Secondary", "5") - used_10_sec = count_workers("Secondary", "10") - + usedPositions = { + "used_10": count_workers("Primary", "10"), + "used_12": count_workers("Primary", "12"), + "used_15": count_workers("Primary", "15"), + "used_20": count_workers("Primary", "20"), + "used_5_sec": count_workers("Secondary", "5"), + "used_10_sec": count_workers("Secondary", "10"), +} break_allocation = LaborStatusForm.select(LaborStatusForm.contractHours).where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.contractHours.is_null(False)) - sum_break = sum(form.contractHours or 0 for form in break_allocation) + sumBreak = sum(form.contractHours or 0 for form in break_allocation) positions = list(PositionHistory.select().where(PositionHistory.department == dept, PositionHistory.status == "Active").order_by(PositionHistory.positionTitle.asc())) if dept else [] positionsList = [] posUrl = [] @@ -140,14 +144,9 @@ def count_workers(job_type, hours_bucket): total_allocation = totalPositions, used_allocation = usedAllocation, term = g.openTerm.termName, - studentHours = student_hours, - used_10 = used_10, - used_12 = used_12, - used_15 = used_15, - used_20 = used_20, - used_5_sec = used_5_sec, - used_10_sec = used_10_sec, - break_hours = sum_break, + studentHours = studentHours, + usedPositions = usedPositions, + break_hours = sumBreak, positions = positionsList, posUrl = posUrl, supervisors = supervisors, diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 0b756a48e..5a29bea1e 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -44,14 +44,14 @@

    AY 2025-2026

    {{used_allocation}}/{{total_allocation or 0}} Position
      -
    • 10 Hour - {{used_10}}/{{allocation.primary_10}}
      • -
    • 12 Hour - {{used_12}}/{{allocation.primary_12}}
      • -
    • 15 Hour - {{used_15}}/{{allocation.primary_15}}
      • -
    • 20 Hour - {{used_20}}/{{allocation.primary_20}}
      • +
    • 10 Hour - {{usedPositions.used_10}}/{{allocation.primary_10}}
      • +
    • 12 Hour - {{usedPositions.used_12}}/{{allocation.primary_12}}
      • +
    • 15 Hour - {{usedPositions.used_15}}/{{allocation.primary_15}}
      • +
    • 20 Hour - {{usedPositions.used_20}}/{{allocation.primary_20}}
      -
    • 5 Hour - {{used_5_sec}}/{{allocation.secondary_5}}
      • -
    • 10 Hour - {{used_10_sec}}/{{allocation.secondary_10}}
      • +
    • 5 Hour - {{usedPositions.used_5_sec}}/{{allocation.secondary_5}}
      • +
    • 10 Hour - {{usedPositions.used_10_sec}}/{{allocation.secondary_10}}
    From a663d78345778d239201351b415aa200f1a06188 Mon Sep 17 00:00:00 2001 From: feitsopb Date: Tue, 14 Jul 2026 14:47:46 +0000 Subject: [PATCH 148/163] added an import statement to fix add members --- app/controllers/main_routes/departmentPortal.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index 570ea4a63..ec2490079 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -5,6 +5,7 @@ from functools import reduce import operator from app.logic.tracy import Tracy +from app.logic.userInsertFunctions import createSupervisorFromTracy from app.models.department import Department from app.models.supervisor import Supervisor from app.models.supervisorDepartment import SupervisorDepartment From 135d43a6c5cd6ee20a404c0c719aa6e23916f224 Mon Sep 17 00:00:00 2001 From: feitsopb Date: Tue, 14 Jul 2026 15:02:19 +0000 Subject: [PATCH 149/163] fixed a bug on add with b-number --- app/controllers/main_routes/departmentPortal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index ec2490079..353287e0f 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -153,7 +153,7 @@ def add_member(query=None): if re.match(r'[Bb]\d+', query): recorded_supervisors = list(map(supervisorsDbToDict, Supervisor.select().where(Supervisor.ID % "{}%".format(query.upper())).where(Supervisor.DEPT_NAME != current_department))) current_supervisors = [ - s for s in map(supervisorsDbToDict, Tracy(mkk).getSupervisorsFromUserInput(query)) + s for s in map(supervisorsDbToDict, Tracy().getSupervisorsFromUserInput(query)) if s.get('department') != current_department ] From b0ba70d750348bd870360f3c7cfa71d7bb5ce99d Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Tue, 14 Jul 2026 15:47:32 +0000 Subject: [PATCH 150/163] fixed format in managemembers --- app/controllers/main_routes/departmentPortal.py | 16 ++++------------ app/controllers/main_routes/main_routes.py | 15 --------------- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index 353287e0f..0aa0aefe4 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -67,24 +67,16 @@ def manageStaff(org=None,account=None): # not contribute to any of the four totals. active_primaries = ( (LaborStatusForm.jobType == 'Primary') & - (LaborStatusForm.studentConfirmation == True) & - (LaborStatusForm.endDate >= today) - ) + (LaborStatusForm.studentConfirmation == True)) pending_primaries = ( (LaborStatusForm.jobType == 'Primary') & - (LaborStatusForm.studentConfirmation.is_null(True)) & - (LaborStatusForm.endDate >= today) - ) + (LaborStatusForm.studentConfirmation.is_null(True))) active_secondaries = ( (LaborStatusForm.jobType == 'Secondary') & - (LaborStatusForm.studentConfirmation == True) & - (LaborStatusForm.endDate >= today) - ) + (LaborStatusForm.studentConfirmation == True)) pending_secondaries = ( (LaborStatusForm.jobType == 'Secondary') & - (LaborStatusForm.studentConfirmation.is_null(True)) & - (LaborStatusForm.endDate >= today) - ) + (LaborStatusForm.studentConfirmation.is_null(True))) student_count = list( diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index b9ad2c08e..4c4ea5448 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -157,21 +157,6 @@ def count_workers(job_type, hours_bucket): currentUser=g.currentUser ) -@main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) -def addUserToDept(): - userDeptData = request.form - supervisorDeptRecord = SupervisorDepartment.get_or_none(supervisor = userDeptData['supervisorID'], department = userDeptData['departmentID']) - try: - if supervisorDeptRecord: - return "False" - - else: - SupervisorDepartment.create(supervisor=userDeptData['supervisorID'], department=userDeptData['departmentID']) - return "True" - - except Exception as e: - print(f'Could not add user to department: {e}') - return "", 500 @main_bp.route('/department///managepositions', methods=['GET']) def managePositions(org, account): From 9afb2c6e026c656fd5075213e942d3a7977d07ed Mon Sep 17 00:00:00 2001 From: nahom70 Date: Wed, 15 Jul 2026 10:14:42 -0400 Subject: [PATCH 151/163] fixed issue for route and can merge successsfully --- app/controllers/main_routes/main_routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 4c4ea5448..e4b661e40 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -158,7 +158,7 @@ def count_workers(job_type, hours_bucket): ) -@main_bp.route('/department///managepositions', methods=['GET']) +@main_bp.route('/department///positions', methods=['GET']) def managePositions(org, account): try: dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) From 7328dbc7ce1a2f5147479765cef2f7397df98c63 Mon Sep 17 00:00:00 2001 From: zawn Date: Mon, 20 Jul 2026 14:03:38 -0400 Subject: [PATCH 152/163] Revert allocation card PR #647 --- .../main_routes/departmentPortal.py | 16 +- app/controllers/main_routes/main_routes.py | 63 +----- app/static/css/departmentPortal.css | 29 --- app/static/js/departmentPortal.js | 1 - app/templates/main/departmentPortal.html | 51 ++--- database/demo_data.py | 199 ++++-------------- 6 files changed, 75 insertions(+), 284 deletions(-) diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index 0aa0aefe4..353287e0f 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -67,16 +67,24 @@ def manageStaff(org=None,account=None): # not contribute to any of the four totals. active_primaries = ( (LaborStatusForm.jobType == 'Primary') & - (LaborStatusForm.studentConfirmation == True)) + (LaborStatusForm.studentConfirmation == True) & + (LaborStatusForm.endDate >= today) + ) pending_primaries = ( (LaborStatusForm.jobType == 'Primary') & - (LaborStatusForm.studentConfirmation.is_null(True))) + (LaborStatusForm.studentConfirmation.is_null(True)) & + (LaborStatusForm.endDate >= today) + ) active_secondaries = ( (LaborStatusForm.jobType == 'Secondary') & - (LaborStatusForm.studentConfirmation == True)) + (LaborStatusForm.studentConfirmation == True) & + (LaborStatusForm.endDate >= today) + ) pending_secondaries = ( (LaborStatusForm.jobType == 'Secondary') & - (LaborStatusForm.studentConfirmation.is_null(True))) + (LaborStatusForm.studentConfirmation.is_null(True)) & + (LaborStatusForm.endDate >= today) + ) student_count = list( diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index e4b661e40..8445cd24a 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -1,9 +1,7 @@ from flask import render_template, request, json, redirect, url_for, send_file, g, flash, jsonify -from flask_bootstrap import forms from peewee import JOIN, DoesNotExist, fn from functools import reduce import operator -from app.models.allocation import Allocation from app.models.department import Department from app.models.supervisor import Supervisor from app.models.supervisorDepartment import SupervisorDepartment @@ -64,16 +62,12 @@ def departmentPortal(org=None,account=None): dept = None else: dept = None + if g.currentUser.isLaborAdmin: departments = list(Department.select().order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) else: departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) - - try: - allocation = Allocation.select(Allocation, Term).join(Term).where(Allocation.department == dept, Allocation.termCode == 202500).get() - except DoesNotExist: - allocation = None supervisorDepartments = (SupervisorDepartment.select().join(Supervisor).where(SupervisorDepartment.department == dept) .order_by(fn.COALESCE(Supervisor.preferred_name, Supervisor.legal_name, Supervisor.LAST_NAME).asc())) @@ -101,35 +95,8 @@ def departmentPortal(org=None,account=None): laborCoordinators.append(supervisorDisplay) else: supervisors.append(supervisorDisplay) - - ViewAllocations(org, account) - totalPositions = Allocation.select(fn.SUM(Allocation.primary_10) + fn.SUM(Allocation.primary_12) + fn.SUM(Allocation.primary_15) + fn.SUM(Allocation.primary_20) + fn.sum(Allocation.secondary_5) + fn.SUM(Allocation.secondary_10)).where(Allocation.department == dept, Allocation.termCode == 202500).scalar() - usedAllocation = len([hours for hours in LaborStatusForm.select(LaborStatusForm.weeklyHours).where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.contractHours.is_null(True))]) - studentHours = {} - for form in LaborStatusForm.select().where(LaborStatusForm.department == dept,LaborStatusForm.termCode_id == 202500,LaborStatusForm.contractHours.is_null(True) - ): - studentSuperviseeId = form.studentSupervisee_id - if studentSuperviseeId not in studentHours: - studentHours[studentSuperviseeId] = [] - studentHours[studentSuperviseeId].append({ - "jobType": form.jobType, - "weeklyHours": form.weeklyHours - }) - - def count_workers(job_type, hours_bucket): - return LaborStatusForm.select().where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.jobType == job_type, LaborStatusForm.weeklyHours == hours_bucket, LaborStatusForm.contractHours.is_null(True)).count() - - usedPositions = { - "used_10": count_workers("Primary", "10"), - "used_12": count_workers("Primary", "12"), - "used_15": count_workers("Primary", "15"), - "used_20": count_workers("Primary", "20"), - "used_5_sec": count_workers("Secondary", "5"), - "used_10_sec": count_workers("Secondary", "10"), -} - break_allocation = LaborStatusForm.select(LaborStatusForm.contractHours).where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.contractHours.is_null(False)) - sumBreak = sum(form.contractHours or 0 for form in break_allocation) + positions = list(PositionHistory.select().where(PositionHistory.department == dept, PositionHistory.status == "Active").order_by(PositionHistory.positionTitle.asc())) if dept else [] positionsList = [] posUrl = [] @@ -139,24 +106,16 @@ def count_workers(job_type, hours_bucket): for i in positions: positionsList.append(i.positionTitle + ": " + "(WLS " + str(i.wls) + ")") posUrl.append(str(i.positionCode)) - + + return render_template('main/departmentPortal.html', departments = departments, department = dept, - allocation = allocation, - total_allocation = totalPositions, - used_allocation = usedAllocation, - term = g.openTerm.termName, - studentHours = studentHours, - usedPositions = usedPositions, - break_hours = sumBreak, - positions = positionsList, - posUrl = posUrl, supervisors = supervisors, laborCoordinators=laborCoordinators, - currentUser=g.currentUser - ) - + currentUser=g.currentUser, + positions = positionsList, + posUrl = posUrl) @main_bp.route('/department///positions', methods=['GET']) def managePositions(org, account): @@ -224,11 +183,3 @@ def submitToBanner(formHistoryId): return "Form successfully submitted to Banner.", 200 else: return "Submitting to Banner failed.", 500 - -@main_bp.route('/department//', methods=['GET']) -def ViewAllocations(org, account): - - try: - dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) - except DoesNotExist: - return render_template('errors/404.html'), 404 diff --git a/app/static/css/departmentPortal.css b/app/static/css/departmentPortal.css index dc5f07378..49bf4b339 100644 --- a/app/static/css/departmentPortal.css +++ b/app/static/css/departmentPortal.css @@ -13,35 +13,6 @@ font-size: 3rem; color:#6e6e6e; } -.bi-clock { - border: 1px solid #c0c0c0; - border-radius: 8px; - padding: 3px 3.5px 1.5px 3.5px; - font-size: 3rem; - color:#6e6e6e; -} -.header-container { - display: flex; - justify-content: space-between; - align-items: center; - padding-left: 10px; - padding-right: 10px; -} -.allocation-list { - display: flex; - justify-content: space-between; - align-items: center; - padding-left: 10px; - padding-right: 10px; -} -.primary-chart { - font-size: 1.2em; - padding-left: 75px; -} -.secondary-chart { - font-size: 1.2em; - padding-right: 75px; -} .bi-people-fill { /* Bootstrap Icon for Members Card */ border: 1px solid #c0c0c0; diff --git a/app/static/js/departmentPortal.js b/app/static/js/departmentPortal.js index d8dbbc84e..cb2023a3a 100644 --- a/app/static/js/departmentPortal.js +++ b/app/static/js/departmentPortal.js @@ -2,6 +2,5 @@ $(document).ready(function() { $("#selectedDepartment").on("change",function() { deptData = $(this).find('option:selected').data(); window.location = `/department/${deptData.org}/${deptData.account}`; - }); }); diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index e27491911..a030069cd 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -23,47 +23,22 @@

    {% if department %} {{department.DEPT_NAME}} Portal {% e "{{d.DEPT_NAME}} ({{d.ORG}}-{{d.ACCOUNT}}) ">{{d.DEPT_NAME}} {% endfor %} +

    -{% if department %} -
    + + {% if department %} +
    -
    -
    -
    -
    - -
    -
    -

    Allocations

    -
    -
    -

    AY 2025-2026

    {{used_allocation}}/{{total_allocation or 0}} Positions

    -
    -
    -
      -
    • 10 Hour - {{usedPositions.used_10}}/{{allocation.primary_10}}
      • -
    • 12 Hour - {{usedPositions.used_12}}/{{allocation.primary_12}}
      • -
    • 15 Hour - {{usedPositions.used_15}}/{{allocation.primary_15}}
      • -
    • 20 Hour - {{usedPositions.used_20}}/{{allocation.primary_20}}
      • -
    -
      -
    • 5 Hour - {{usedPositions.used_5_sec}}/{{allocation.secondary_5}}
      • -
    • 10 Hour - {{usedPositions.used_10_sec}}/{{allocation.secondary_10}}
      • -
    -
    -
    -

    Break Hours

    {{break_hours}}/{{allocation.breakHours or 0}} Hours

    + +
    +

    Insert Allocations Card Here

    +
    + View Alloations
    -
    -
    -
    - View Alloations -
    -
    + +
    @@ -156,6 +131,7 @@

    {% if supervisors|length <= 1 %} Supervisor{% else %} Supervisors{% endi

    Positions

    +

      {% for p in positions[:7] %} @@ -179,9 +155,8 @@

      Positions

    - - + {% endif %} {% endblock %} diff --git a/database/demo_data.py b/database/demo_data.py index e372ea856..db5b14c70 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -134,13 +134,7 @@ "LAST_POSN":"Student Manager", "LAST_SUP_PIDM":"7" }, - {"ID": "B00811617", "legal_name": "Chris Georgiev", "isActive": True, "PIDM": "8", "FIRST_NAME": "Chris", "LAST_NAME": "Georgiev"}, - {"ID": "B00815474", "legal_name": "Julius Fritz", "isActive": True, "PIDM": "9", "FIRST_NAME": "Julius", "LAST_NAME": "Fritz"}, - {"ID": "B12345223", "legal_name": "Subaru Natsuki", "isActive": True, "PIDM": "10", "FIRST_NAME": "Subaru", "LAST_NAME": "Natsuki"}, - {"ID": "B12345003", "legal_name": "Hatsune Miku", "isActive": True, "PIDM": "11", "FIRST_NAME": "Hatsune", "LAST_NAME": "Miku"}, - {"ID": "B12345772", "legal_name": "Michael Jackson", "isActive": True, "PIDM": "12", "FIRST_NAME": "Michael", "LAST_NAME": "Jackson"}, - {"ID": "B12345756", "legal_name": "Genji Overwatch", "isActive": True, "PIDM": "13", "FIRST_NAME": "Genji", "LAST_NAME": "Overwatch"} - ] + ] tracyStudents = [ { "ID":"B00785329", @@ -560,58 +554,22 @@ terms = [ { - "termCode": f"{2025}00", - "termName": f"AY {2025}-{2025+1}", - "termStart": f"{2025}-08-01", - "termEnd": f"{2025+1}-05-01", + "termCode": f"202000", + "termName": f"AY 2020-2021", + "termStart": f"2020-08-01", + "termEnd": f"2021-05-01", "termState": 0, - "primaryCutOff": f"{2025}-09-01", - "adjustmentCutOff": f"{2026}-10-01", - }, - { - "termCode": f"{2025}00", - "termName": f"AY {2025}-{2025+1}", - "termStart": f"{2025}-08-01", - "termEnd": f"{2025+1}-05-01", - "termState": 1, - "primaryCutOff": f"{2025}-09-01", - "adjustmentCutOff": f"{2025}-09-01", - }, - { - "termCode": f"{2025-1}00", - "termName": f"AY {2025-1}-{2025}", - "termStart": f"{2025-1}-08-01", - "termEnd": f"{2025}-05-01", - "termState": 1, - "primaryCutOff": f"{2025-1}-09-01", - "adjustmentCutOff": f"{2025-1}-09-01", - }, - { - "termCode": f"{2025-2}00", - "termName": f"AY {2025-2}-{2025-1}", - "termStart": f"{2025-2}-08-01", - "termEnd": f"{2025-1}-05-01", - "termState": 1, - "primaryCutOff": f"{2025-2}-09-01", - "adjustmentCutOff": f"{2025-2}-09-01", + "primaryCutOff": f"2020-09-01", + "adjustmentCutOff": f"2020-10-01", }, { - "termCode": f"{2025-3}00", - "termName": f"AY {2025-3}-{2025-2}", - "termStart": f"{2025-3}-08-01", - "termEnd": f"{2025-2}-05-01", - "termState": 1, - "primaryCutOff": f"{2025-3}-09-01", - "adjustmentCutOff": f"{2025-3}-09-01", - }, - { - "termCode": f"{2025-4}00", - "termName": f"AY {2025-4}-{2025-3}", - "termStart": f"{2025-4}-08-01", - "termEnd": f"{2025-3}-05-01", + "termCode": f"202500", + "termName": f"AY 2025-2026", + "termStart": f"2025-08-01", + "termEnd": f"2026-05-01", "termState": 1, - "primaryCutOff": f"{2025-4}-09-01", - "adjustmentCutOff": f"{2025-4}-09-01", + "primaryCutOff": f"2025-09-01", + "adjustmentCutOff": f"2025-09-01", }, { "termCode": f"202501", @@ -619,8 +577,8 @@ "termStart": f"2025-08-01", "termEnd": f"2026-05-01", "termState": 0, - "primaryCutOff": f"{2025}-09-01", - "adjustmentCutOff": f"{2025}-09-01", + "primaryCutOff": f"2025-09-01", + "adjustmentCutOff": f"2025-09-01", "isBreak": 1, }, ] @@ -634,11 +592,11 @@ LaborStatusForm.insert([{ "laborStatusFormID": 2, - "termCode_id": f"202500", + "termCode_id": f"202000", "studentName": "Alex Bryant", "studentSupervisee_id": "B00841417", "supervisor_id": "B12361006", - "department_id": 2, + "department_id": 1, "jobType": "Primary", "WLS": 1, "POSN_TITLE": "Student Programmer", @@ -799,26 +757,34 @@ "historyType_id": "Labor Status Form", "createdBy_id": 1, "createdDate": f"2025-04-14", - "status_id": "Approved" - }]).on_conflict_replace().execute() + "status": "Approved" + }]).on_conflict_replace().execute() + LaborStatusForm.insert([{ - - "laborStatusFormID": 9, + "laborStatusFormID": 6, "termCode_id": f"202500", - "studentName": "Genji Overwatch", - "studentSupervisee_id": "B12345756", - "supervisor_id": "B12361006", + "studentName": "Guillermo Adams", + "studentSupervisee_id": "B00734292", + "supervisor_id": "B12365892", "department_id": 1, "jobType": "Primary", "WLS": 1, - "POSN_TITLE": "overwtahc guy", - "POSN_CODE": "S61410", - "contractHours": 15, + "POSN_TITLE": "Labor Workers", + "POSN_CODE": "S61439", + "weeklyHours": 10, "startDate": f"2025-04-01", "endDate": "2025-09-01" - - }]).on_conflict_replace().execute() + }]).on_conflict_replace().execute() + +FormHistory.insert([{ + "formHistoryID": 6, + "formID_id": "6", + "historyType_id": "Labor Status Form", + "createdBy_id": 1, + "createdDate": f"2025-04-14", + "status": "Approved" + }]).on_conflict_replace().execute() @@ -907,7 +873,7 @@ "breakHours": 260, }, { - "termCode": 202500, + "termCode": 202500, "department": 2, "isFinal": False, "approvedOn": None, @@ -991,7 +957,7 @@ "termCode":f"{2025}00", "department": 2, "isFinal": False, - "approvedOn": f"{2025}-06-20", + "approvedOn": f"{2025 }-06-20", "approvedBy": "B00763721", "justification": "We need it to lower the amount of allocations we have", "primary_10": 1, @@ -1005,13 +971,15 @@ ] Allocation.insert_many(allocation).on_conflict_replace().execute() print(" * allocation added") +print(PositionHistory()) +print(" * allocation added") ############################# # Position History ############################# -positionHistory = [ +positionhistory = [ { "positionTitle": "Student Programmer", "positionCode": "S61407", @@ -1125,86 +1093,5 @@ ] -PositionHistory.insert_many(positionHistory).on_conflict_replace().execute() - -dummy_lsf = [ - { - "laborStatusFormID": 4, - "termCode_id": f"202500", - "studentName": "Chris Georgiev", - "studentSupervisee_id": "B00811617", - "supervisor_id": "B12361006", - "department_id": 1, - "jobType": "Primary", - "WLS": 4, - "POSN_TITLE": "guy who does stuff", - "POSN_CODE": "S61415", - "weeklyHours": 12, - "startDate": f"2025-04-01", - "endDate": "2025-09-01" - }, - { - - "laborStatusFormID": 5, - "termCode_id": f"202500", - "studentName": "Julius Fritz", - "studentSupervisee_id": "B00815474", - "supervisor_id": "B12361006", - "department_id": 1, - "jobType": "Primary", - "WLS": 2, - "POSN_TITLE": "guy who sits in chair", - "POSN_CODE": "S61416", - "weeklyHours": 15, - "startDate": f"2025-04-01", - "endDate": "2025-09-01" - }, - { - "laborStatusFormID": 6, - "termCode_id": f"202500", - "studentName": "Subaru Natsuki", - "studentSupervisee_id": "B12345223", - "supervisor_id": "B12361006", - "department_id": 1, - "jobType": "Primary", - "WLS": 1, - "POSN_TITLE": "Aura Monster", - "POSN_CODE": "S61417", - "weeklyHours": 20, - "startDate": f"2025-04-01", - "endDate": "2025-09-01" - }, - { - "laborStatusFormID": 7, - "termCode_id": f"202500", - "studentName": "Hatsune Miku", - "studentSupervisee_id": "B12345003", - "supervisor_id": "B12361006", - "department_id": 1, - "jobType": "Primary", - "WLS": 6, - "POSN_TITLE": "Singer", - "POSN_CODE": "S61409", - "weeklyHours": 20, - "startDate": f"2025-04-01", - "endDate": "2025-09-01" - - }, - { - "laborStatusFormID": 8, - "termCode_id": f"202500", - "studentName": "Michael Jackson", - "studentSupervisee_id": "B12345772", - "supervisor_id": "B12361006", - "department_id": 1, - "jobType": "Secondary", - "WLS": 6, - "POSN_TITLE": "Famous singer", - "POSN_CODE": "S61410", - "weeklyHours": 5, - "startDate": f"2025-04-01", - "endDate": "2025-09-01" - } -] -LaborStatusForm.insert_many(dummy_lsf).on_conflict_replace().execute() +PositionHistory.insert_many(positionhistory).on_conflict_replace().execute() print(" * position history added") From 9c716f5025fcdf25a3e2bde2c0a0eaf3141c8e57 Mon Sep 17 00:00:00 2001 From: zawn Date: Mon, 20 Jul 2026 14:06:46 -0400 Subject: [PATCH 153/163] Revert "Merge pull request #642 from BCStudentSoftwareDevTeam/Bright_Artem_manage_people" This reverts commit 6b98e028e560309b212d81504d261d32734a73af, reversing changes made to 60ada1ecec53be4b8241ba3c3213984376bc73b6. --- app/controllers/main_routes/__init__.py | 1 - .../main_routes/departmentPortal.py | 245 +----------------- app/controllers/main_routes/main_routes.py | 41 ++- app/logic/tracy.py | 8 - app/models/supervisor.py | 9 +- app/static/css/managemembers.css | 154 ----------- app/static/css/managepositions.css | 15 -- app/static/js/addSupervisorsToDepartment.js | 31 +++ app/static/js/manageMembers.js | 223 ---------------- app/templates/main/departmentPortal.html | 2 +- app/templates/main/manageMembers.html | 128 --------- app/templates/main/managepositions.html | 90 ------- app/templates/main/supervisorPortal.html | 2 +- database/demo_data.py | 243 +---------------- database/reset_database.sh | 14 +- database/reset_database.sh.bak | 67 ----- db_test.py | 4 +- 17 files changed, 72 insertions(+), 1205 deletions(-) delete mode 100644 app/static/css/managemembers.css delete mode 100644 app/static/css/managepositions.css delete mode 100644 app/static/js/manageMembers.js delete mode 100644 app/templates/main/manageMembers.html delete mode 100644 app/templates/main/managepositions.html delete mode 100644 database/reset_database.sh.bak diff --git a/app/controllers/main_routes/__init__.py b/app/controllers/main_routes/__init__.py index da3323908..54b32d3c5 100755 --- a/app/controllers/main_routes/__init__.py +++ b/app/controllers/main_routes/__init__.py @@ -14,7 +14,6 @@ def injectGlobalData(): 'lastStaticUpdate': lastStaticUpdate} from app.controllers.main_routes import main_routes -from app.controllers.main_routes import departmentPortal from app.controllers.main_routes import laborStatusForm from app.controllers.main_routes import laborHistory from app.controllers.main_routes import alterLSF diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index 353287e0f..351757701 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -1,244 +1 @@ -import re -from datetime import date -from flask import render_template, request, json, redirect, session, url_for, send_file, g, flash, jsonify -from peewee import JOIN, DoesNotExist, fn, Case -from functools import reduce -import operator -from app.logic.tracy import Tracy -from app.logic.userInsertFunctions import createSupervisorFromTracy -from app.models.department import Department -from app.models.supervisor import Supervisor -from app.models.supervisorDepartment import SupervisorDepartment -from app.models.student import Student -from app.models.laborStatusForm import LaborStatusForm -from app.models.formHistory import FormHistory -from app.models.laborReleaseForm import LaborReleaseForm -from app.models.term import Term -from app.controllers.admin_routes.allPendingForms import checkAdjustment -from app.controllers.main_routes import main_bp -from app.logic.download import CSVMaker, saveFormSearchResult, retrieveFormSearchResult -from app.logic.search import getDepartmentsForSupervisor, searchPerson, searchSupervisorPortal -from app.login_manager import require_login, logout -from app.logic.getTableData import getDatatableData -from app.logic.banner import Banner -from flask import abort -from app.logic.search import limitSearchByUserDepartment, studentDbToDict, usernameFromEmail - - - -@main_bp.route('/department///members', methods=['GET']) -def manageStaff(org=None,account=None): - try: - dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) - session['current_department_id'] = dept.departmentID - session['current_department'] = dept.DEPT_NAME - except (NameError, DoesNotExist): - dept = None - abort(404) - - members = list( - SupervisorDepartment. - select( - SupervisorDepartment, - Supervisor - ).where( - SupervisorDepartment.department == dept - ).join( - Supervisor - ).dicts() - ) - - today = date.today() - released_forms = ( - FormHistory - .select(FormHistory.formID) - .join( - LaborReleaseForm, - on=(FormHistory.releaseForm == LaborReleaseForm.laborReleaseFormID) - ) - .where( - (FormHistory.historyType == "Labor Release Form") & - (FormHistory.status == "Approved") & - (LaborReleaseForm.releaseDate <= today) - ) - ) - - # Conditions for the supervisee counts. Expired and released positions do - # not contribute to any of the four totals. - active_primaries = ( - (LaborStatusForm.jobType == 'Primary') & - (LaborStatusForm.studentConfirmation == True) & - (LaborStatusForm.endDate >= today) - ) - pending_primaries = ( - (LaborStatusForm.jobType == 'Primary') & - (LaborStatusForm.studentConfirmation.is_null(True)) & - (LaborStatusForm.endDate >= today) - ) - active_secondaries = ( - (LaborStatusForm.jobType == 'Secondary') & - (LaborStatusForm.studentConfirmation == True) & - (LaborStatusForm.endDate >= today) - ) - pending_secondaries = ( - (LaborStatusForm.jobType == 'Secondary') & - (LaborStatusForm.studentConfirmation.is_null(True)) & - (LaborStatusForm.endDate >= today) - ) - - - student_count = list( - LaborStatusForm. - select( - fn.SUM(Case(None, ((active_primaries, 1),), 0)).alias("active_primary_positions"), - fn.SUM(Case(None, ((pending_primaries, 1),), 0)).alias("pending_primary_positions"), - fn.SUM(Case(None, ((active_secondaries, 1),), 0)).alias("active_secondary_positions"), - fn.SUM(Case(None, ((pending_secondaries, 1),), 0)).alias("pending_secondary_positions"), - LaborStatusForm.department, - LaborStatusForm.supervisor - ).where( - (LaborStatusForm.department == dept) & - (LaborStatusForm.laborStatusFormID.not_in(released_forms)) - ).group_by( - LaborStatusForm.department, - LaborStatusForm.supervisor - ).dicts() - ) - - counts = {(row["department"], row["supervisor"]): row for row in student_count} - - for member in members: - - key = (member["department"], member["supervisor"]) - row = counts.get(key, {}) - - member["active_primary_positions"] = row.get("active_primary_positions", 0) - member["pending_primary_positions"] = row.get("pending_primary_positions", 0) - member["active_secondary_positions"] = row.get("active_secondary_positions", 0) - member["pending_secondary_positions"] = row.get("pending_secondary_positions", 0) - - return render_template('main/manageMembers.html', - members = members, - department = dept) - - -def supervisorsDbToDict(supervisor): - """ - Given a supervisor object it will return a mapped Dict with supervisor data. - """ - dbToDict = {'username': usernameFromEmail(supervisor.EMAIL.strip()), - 'firstName': supervisor.FIRST_NAME.strip(), - 'lastName': supervisor.LAST_NAME.strip(), - 'bnumber': supervisor.ID.strip(), - 'department': supervisor.DEPT_NAME.strip(), - 'type': 'Supervisor'} - return dbToDict - - -# search student table and STUDATA for student results -@main_bp.route('/members/search/', methods=['GET']) -def add_member(query=None): - currentUser = require_login() - accessAllowed = currentUser and (currentUser.supervisor or currentUser.isLaborAdmin) - if not accessAllowed: - return render_template('errors/403.html'), 403 - - recorded_supervisors = [] # supervisors recorded in the database - current_supervisors = [] # supervisors from Tracy - query = query.strip() - - current_department = session.get('current_department') - - # bnumber search - if re.match(r'[Bb]\d+', query): - recorded_supervisors = list(map(supervisorsDbToDict, Supervisor.select().where(Supervisor.ID % "{}%".format(query.upper())).where(Supervisor.DEPT_NAME != current_department))) - current_supervisors = [ - s for s in map(supervisorsDbToDict, Tracy().getSupervisorsFromUserInput(query)) - if s.get('department') != current_department - ] - - - # name search - else: - if " " not in query: - search = query.upper() + "%" - results = Supervisor.select().where(Supervisor.DEPT_NAME != current_department).where(Supervisor.preferred_name ** search | Supervisor.legal_name ** search | Supervisor.LAST_NAME ** search) - else: - search = query.upper().split() - first_query = search[0] + "%" - last_query = search[-1] + "%" - results = Supervisor.select().where(Supervisor.DEPT_NAME != current_department).where((Supervisor.preferred_name ** first_query | Supervisor.legal_name ** first_query) & Supervisor.LAST_NAME ** last_query) - - recorded_supervisors = list(map(supervisorsDbToDict, results)) - current_supervisors = [ - s for s in map(supervisorsDbToDict, Tracy().getSupervisorsFromUserInput(query)) - if s.get('department') != current_department - ] - - # combine lists, remove duplicates, and then sort - supervisors = list({v['bnumber']:v for v in (current_supervisors + recorded_supervisors)}.values()) - supervisors = sorted(supervisors, key=lambda f: f['firstName'] + f['lastName']) - - return jsonify(supervisors) - - -@main_bp.route('/members/coordinator_switch', methods=['POST']) -def coordinator_switch(): - data = request.get_json() - supervisor_id = data.get("supervisorID") - is_coordinator = data.get("isCoordinator") - - member = SupervisorDepartment.get(SupervisorDepartment.supervisor == supervisor_id) - member.isCoordinator = is_coordinator - member.save() - - return "", 200 - - -@main_bp.route('/members/ban_switch', methods=['POST']) -def ban_switch(): - data = request.get_json() - supervisor_id = data.get("supervisorID") - - member = Supervisor.get(Supervisor.ID == supervisor_id) - - member.isBanned = not member.isBanned - member.save() - - return "", 200 - - -@main_bp.route('/members/remove', methods=['DELETE']) -def remove_member(): - data = request.get_json() - supervisor_id = data.get("supervisorID") - - member = SupervisorDepartment.get( - (SupervisorDepartment.supervisor == supervisor_id) & - (SupervisorDepartment.department == session['current_department_id']) - ) - member.delete_instance() - - return "", 200 - - - -@main_bp.route('/members/add', methods=['GET', 'POST']) -def addUserToDept(): - userDeptData = request.form - supervisorDeptRecord = SupervisorDepartment.get_or_none(supervisor = userDeptData['supervisorID'], department = userDeptData['departmentID']) - try: - if supervisorDeptRecord: - return "False" - - else: - supervisorID = userDeptData['supervisorID'] - if not Supervisor.get_or_none(Supervisor.ID == supervisorID): - createSupervisorFromTracy(bnumber=supervisorID) - - SupervisorDepartment.create(supervisor=supervisorID, department=userDeptData['departmentID']) - return "True" - - except Exception as e: - print(f'Could not add user to department: {e}') - return "", 500 \ No newline at end of file +from flask import render_template diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 8445cd24a..930d513fe 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -16,8 +16,6 @@ from app.login_manager import require_login, logout from app.logic.getTableData import getDatatableData from app.logic.banner import Banner -from app.logic.tracy import Tracy -from app.logic.userInsertFunctions import createSupervisorFromTracy from app.models.positionHistory import PositionHistory @@ -55,14 +53,10 @@ def supervisorPortal(): @main_bp.route('/department/', methods=['GET']) @main_bp.route('/department//', methods=['GET']) def departmentPortal(org=None,account=None): - if org and account: - try: - dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) - except (NameError, DoesNotExist): - dept = None - else: + try: + dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) + except (NameError, DoesNotExist): dept = None - if g.currentUser.isLaborAdmin: departments = list(Department.select().order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) @@ -115,22 +109,23 @@ def departmentPortal(org=None,account=None): laborCoordinators=laborCoordinators, currentUser=g.currentUser, positions = positionsList, - posUrl = posUrl) - -@main_bp.route('/department///positions', methods=['GET']) -def managePositions(org, account): + posUrl = posUrl + ) +@main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) +def addUserToDept(): + userDeptData = request.form + supervisorDeptRecord = SupervisorDepartment.get_or_none(supervisor = userDeptData['supervisorID'], department = userDeptData['departmentID']) try: - dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) - except DoesNotExist: - return render_template('errors/404.html'), 404 + if supervisorDeptRecord: + return "False" - positions = Tracy().getPositionsFromDepartment(org, account) - print(positions) - return render_template('main/managepositions.html', - department = dept, - department_name = dept.DEPT_NAME, - positions = positions - ) + else: + SupervisorDepartment.create(supervisor=userDeptData['supervisorID'], department=userDeptData['departmentID']) + return "True" + + except Exception as e: + print(f'Could not add user to department: {e}') + return "", 500 @main_bp.route('/supervisorPortal/download', methods=['POST']) def downloadSupervisorPortalResults(): diff --git a/app/logic/tracy.py b/app/logic/tracy.py index 027cd9fd5..cd0ecf50a 100644 --- a/app/logic/tracy.py +++ b/app/logic/tracy.py @@ -142,14 +142,6 @@ def getStudentsFromBNumberSearch(self, bnum_part: str): students = STUDATA.query.filter(STUDATA.ID.like(bnum_search)).all() return students - def getSupervisorsFromBNumberSearch(self, bnum_part: str): - """ - Return a list of supervisors searching by bnumber - """ - bnum_search = bnum_part.strip().upper() + "%" - supervisors = STUSTAFF.query.filter(STUSTAFF.ID.like(bnum_search)).all() - return supervisors - def checkStudentOrSupervisor(self, username: str): """ Checks if the username belongs to a student or supervisor diff --git a/app/models/supervisor.py b/app/models/supervisor.py index 3f9d3608e..e16d43282 100644 --- a/app/models/supervisor.py +++ b/app/models/supervisor.py @@ -13,11 +13,10 @@ class Supervisor(baseModel): ORG = CharField(null=True) DEPT_NAME = CharField(null=True) - legal_name = CharField(null=True) - preferred_name = CharField(null=True) - isActive = BooleanField(default=False) - isBanned = BooleanField(default=False) - + legal_name = CharField(null=True) + preferred_name = CharField(null=True) + isActive = BooleanField(default=False) + isBanned = BooleanField(default=False) @property diff --git a/app/static/css/managemembers.css b/app/static/css/managemembers.css deleted file mode 100644 index 3384fddc6..000000000 --- a/app/static/css/managemembers.css +++ /dev/null @@ -1,154 +0,0 @@ -/*styles for column alignment in the data table*/ -.centered-header { - text-align: center !important; -} - -.centered-cell { - vertical-align: middle !important; -} - -/* The add-member search bar*/ -#add-member { - display: flex; - justify-content: center; - gap: 0px; - height: 20px; - margin-bottom: 30px; -} - - -@media (min-width: 767px) { - #add-member{ - display: flex; - justify-content: flex-end; - gap: 0px; - /*margin-bottom: -20px;*/ - } -} - - -/* The switch container */ -.switch { - position: relative; - display: inline-block; - width: 31.25px; - height: 16.25px; - vertical-align: middle; -} - -/* Hide default HTML checkbox */ -.switch input { - opacity: 0; - width: 0; - height: 0; -} - -/* The slider track */ -.slider { - position: absolute; - cursor: pointer; - top: 0; left: 0; right: 0; bottom: 0; - background-color: #ccc !important; - transition: .4s; -} - -/* The slider knob */ -.slider:before { - position: absolute; - content: ""; - height: 11.25px; - width: 11.25px; - left: 2.5px; - bottom: 2.5px; - background-color: white !important; - transition: .4s; -} - -/* Checked state track color */ -input:checked + .slider { - background-color: #337ab7 !important; /* Bootstrap 3 Primary Color */ -} - -/* Checked state knob movement */ -input:checked + .slider:before { - transform: translateX(15px) !important; -} - -/* Rounded slider track and knob */ -.slider.round { - border-radius: 21.25px; -} -.slider.round:before { - border-radius: 50%; -} - -/* Optional label spacing */ -.switch-label { - margin-left: 6.25px; - vertical-align: middle; - font-weight: bold; -} - -/* hover indicator */ -a.hover-indicator { - text-decoration: none !important; - position: relative; - border-bottom: 1px dotted #000; - color: #000000; -} - -a.hover-indicator:visited, -a.hover-indicator:link, -a.hover-indicator:hover, -a.hover-indicator:active { - color: #000000; -} - -[class*="hover-indicator"]:after { - content: attr(aria-label); - display: none; - position: absolute; - top: 110%; - left: 10px; - z-index: 5000; - pointer-events: none; - padding: 8px 10px; - line-height: 15px; - white-space: nowrap; - text-decoration: none !important; - text-indent: 0; - overflow: visible; - font-size: .9em; - font-weight: normal; - -webkit-border-radius: 2px; - border-radius: 2px; - -webkit-box-shadow: 1px 2px 6px rgba(0,0,0,0.3); - box-shadow: 1px 2px 6px rgba(0,0,0,0.3); - background-color: #FFFFFF; - color: #000000; -} - -[class*="hover-indicator"]:hover:after, [class*="hover_indicator"]:focus:after { - display: block; - color: #000000; -} - -/*a "banned" badge displayed under the name of a banned department member*/ -.isbanned-badge { - position: relative; - display: inline-block; - margin-top: 3px; - padding: 2px 6px; - background: red; - color: white !important; - border-radius: 10px; - font-size: 10px; - font-weight: 700; - letter-spacing: 0.3px; - line-height: 1.2; -} - -/* switches inside the data table */ -.table-switch { - top: 10px; -} \ No newline at end of file diff --git a/app/static/css/managepositions.css b/app/static/css/managepositions.css deleted file mode 100644 index 9c40bbe38..000000000 --- a/app/static/css/managepositions.css +++ /dev/null @@ -1,15 +0,0 @@ -.width-12{ - width:12%; -} - -*{ - /* outline:solid 1px lime; */ - margin:0; - padding:0; - box-sizing:border-box; -} - -.department-header{ - padding:1%; - margin-top:-20px; -} \ No newline at end of file diff --git a/app/static/js/addSupervisorsToDepartment.js b/app/static/js/addSupervisorsToDepartment.js index e69de29bb..16c3f1d85 100644 --- a/app/static/js/addSupervisorsToDepartment.js +++ b/app/static/js/addSupervisorsToDepartment.js @@ -0,0 +1,31 @@ +function addSupervisorToDepartment(supervisorID, departmentID, callback=() => {}) { + return $.ajax({ + method: "POST", + url: `/supervisorPortal/addUserToDept`, + data: {"supervisorID": supervisorID, "departmentID": departmentID}, + success: function(response) { + if (response == "True") { + msgFlash("Supervisor has been added to department.", "success") + clearDropdowns() + } else { + msgFlash("Supervisor is already a member of this department.", "warning") + clearDropdowns() + } + if (callback){ + callback() + } + }, + error: function() { + msgFlash("Failed to add supervisor, please try again.", "fail") + clearDropdowns() + }, + }) + +} + +function clearDropdowns(){ + $('select.selectpicker').each(function() { + $(`#${this.id} option:eq(0)`).prop("selected", true); + $(`#${this.id}`).selectpicker("refresh"); + }); +}; \ No newline at end of file diff --git a/app/static/js/manageMembers.js b/app/static/js/manageMembers.js deleted file mode 100644 index 18055e1a1..000000000 --- a/app/static/js/manageMembers.js +++ /dev/null @@ -1,223 +0,0 @@ -$(document).ready(function() { - - $('#searchBoxContainer').children('.dropdown, .bootstrap-select, .form-control').addClass('open') - $('[type="search"], .form-control').focus(); - - $('#manageMembers').DataTable({ - 'columnDefs': [{ - 'targets': '.no-sorting', - 'orderable': false - }], // hide sort icon on header of first column - 'aaSorting': [ - [0, 'asc'] - ], // start to sort data in second column - searching: false, - pageLength: 10, - language: { - lengthMenu: " _MENU_ entries per page" - }, - //dom: '<"top"l>rt<"bottom"p><"clear">' - }); - - $(document).on("click", ".assign-coordinator", function() { - - let memberName = $(this).data("member-name"); - let supervisorID = $(this).data("supervisor"); - let isChecked = $(this).is(":checked"); - - $.ajax({ - url: "/members/coordinator_switch", - data: JSON.stringify({supervisorID: supervisorID, isCoordinator: isChecked}), - type: "POST", - contentType: "application/json", - success: function() { - if (isChecked) { - $("#flash_container").html("
    " + memberName + " has been assigned as a coordinator.
    "); - $("#flasher").delay(3000).fadeOut(); - } else { - $("#flash_container").html("
    " + memberName + " is no longer a coordinator.
    "); - $("#flasher").delay(3000).fadeOut(); - } - - }, - error: function() {console.log("An error has occured.");} - }) - - - }); - - $(document).on("click", ".member-status-btn", function() { - - let button = $(this); - let ban_badge = $(this).closest("tr").find(".isbanned-badge"); - - let memberName = button.data("member-name"); - let supervisorID = button.data("supervisor"); - - let banStatus = button.val(); - let isBanned = banStatus === "Banned" ? true : false; - - let quote = String.fromCharCode(39); - - let category; - - $.ajax({ - url: "/members/ban_switch", - data: JSON.stringify({supervisorID: supervisorID, isBanned: isBanned}), - type: "POST", - contentType: "application/json", - success: function() { - if (!isBanned) { - category = "danger"; - button.removeClass("btn-danger").addClass("btn-success"); - button.text("Unban"); - button.val("Banned"); - ban_badge.css("visibility", "visible"); - } else { - category = "success"; - button.removeClass("btn-success").addClass("btn-danger"); - button.html("  Ban  "); - button.val("Unbanned"); - ban_badge.css("visibility", "hidden"); - } - - $("#flash_container").html("
    The status for " + memberName + " has been set to " + quote + banStatus + quote + ".
    "); - $("#flasher").delay(3000).fadeOut(); - - }, - error: function() {console.log("An error has occured.");} - }) - }); - - $(document).on("click", ".remove-member", function() { - - let redButton = $(this); - let row = $(this).closest("tr"); - - let memberName = redButton.data("member-name"); - let supervisorID = redButton.data("supervisor"); - - $.ajax({ - url: "/members/remove", - data: JSON.stringify({supervisorID: supervisorID}), - type: "DELETE", - contentType: "application/json", - success: function() { - $("#flash_container").html("
    " + memberName + " has been removed from the department.
    "); - $("#flasher").delay(3000).fadeOut(); - row.remove(); - }, - error: function() {console.log("An error has occured.");} - }) - }); -}) - -// Creates a dom fragment from html, rather than having to add dom elements -// https://love2dev.com/blog/inserting-html-using-createdocumentfragment-instead-of-using-jquery/ -function createFragment(htmlStr) { - let frag = document.createDocumentFragment(), temp = document.createElement('div'); - temp.innerHTML = htmlStr; - while(temp.firstChild) { frag.appendChild(temp.firstChild); } - return frag; -} - -// highlight search string. doesn't actually check for last name and first name, just highlights what we find -$.fn.selectpicker.Constructor.DEFAULTS.whiteList.mark = []; -function highlight(htmlStr, query) { - query = query.trim().split(" "); - for(i = 0; i < query.length; i++) { - htmlStr = htmlStr.replace(new RegExp(query[i], "gi"), function(match) { return `${match}`; }); - } - return htmlStr; -} - -let typeTimer; - -$('#search').selectpicker('refresh'); -$('.dropdown-menu .bs-searchbox input').on('keyup', function (e) { - // ignore arrow keys - if (e.keyCode == '40' || e.keyCode == '38') return; - - // wait a little longer for bnumber typing - keyInterval = 200 - if (e.keyCode >= 48 && e.keyCode <= 57) { - keyInterval = 500 - } - - // don't search for every key (especially relevant for bnumber) - clearTimeout(typeTimer) - typeTimer = setTimeout(function() { sendQuery(e.target.value); }, keyInterval) -}); - -$('#search').on('changed.bs.select', function () { - let supervisorID = $(this).val(); - let departmentID = $(this).data('department-id'); - - if (!supervisorID || !departmentID) return; - - addSupervisorToDepartment(supervisorID, departmentID, function() { - window.location.reload(); - }); -}); - -// We load the options returned into an html string and then add them to the selectpicker at the end, to save A LOT of time. -function sendQuery(search_str) { - $("#search").empty(); - $('#search').selectpicker("refresh"); - if (search_str.length >= 3) { - $.ajax({ - type: "GET", - url: "/members/search/" + encodeURIComponent(search_str), - contentType: 'application/json', - success: function(response) { - let optionString = "" - for (let key = 0; key < response.length; key++) { - let username = response[key]['username']; - let bnumber = response[key]['bnumber']; - let firstName = response[key]['firstName']; - let lastName = response[key]['lastName']; - let type = response[key]['type']; - if (type == "Supervisor") { - choice_text = bnumber + ': ' + firstName + ' ' + lastName; - highlighted_text = highlight(choice_text, search_str) + `${username}`; - optionString += ``; - } - } - $("#search").append(createFragment(optionString)) - $('#search').selectpicker("refresh"); - } - }); - } -} - -function addSupervisorToDepartment(supervisorID, departmentID, callback=() => {}) { - return $.ajax({ - method: "POST", - url: `/members/add`, - data: {"supervisorID": supervisorID, "departmentID": departmentID}, - success: function(response) { - if (response == "True") { - msgFlash("Supervisor has been added to department.", "success") - clearDropdowns(); - } else { - msgFlash("Supervisor is already a member of this department.", "warning") - clearDropdowns(); - } - if (callback){ - callback(); - } - }, - error: function() { - msgFlash("Failed to add supervisor, please try again.", "fail") - clearDropdowns(); - }, - }) - -} - -function clearDropdowns(){ - $('select.selectpicker').each(function() { - $(`#${this.id} option:eq(0)`).prop("selected", true); - $(`#${this.id}`).selectpicker("refresh"); - }); -}; \ No newline at end of file diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index a030069cd..5a1185cef 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -111,7 +111,7 @@

    {% if supervisors|length <= 1 %} Supervisor{% else %} Supervisors{% endi
    - View Members + View Members
    diff --git a/app/templates/main/manageMembers.html b/app/templates/main/manageMembers.html deleted file mode 100644 index 8d9758fee..000000000 --- a/app/templates/main/manageMembers.html +++ /dev/null @@ -1,128 +0,0 @@ -{% extends "base.html" %} - -{% block styles %} -{{super()}} - - - {% endblock %} - -{% block scripts %} -{{super()}} - - - -{% endblock %} - -{% block app_content %} -

    {% if department %} Manage {{department.DEPT_NAME}} Members {% else %} Manage Members {% endif %}

    -

    Academic Year: 2026-2027

    - -

    - -
    - Click to Skip -
    -
    - -
    - -
    - -
    -

    Name SuperviseesAssign as CoordinatorAssign CoordinatorStatusRemove StaffChange StatusRemove Member
    {{ i['legal_name'] + " " + i['LAST_NAME']}} @@ -69,19 +69,19 @@

    {% if department %} Manage {{department.DEPT_NAME}} Staf Secondary: 13

    		+ + {% if not i[4] %} {% else %} {% endif %} + - - From 63524f1b5ac18c995c310ce124c6a8d2aa0b11de Mon Sep 17 00:00:00 2001 From: ArtemKurasov Date: Tue, 7 Jul 2026 21:29:24 +0000 Subject: [PATCH 066/163] Fixed the switches + Moved all the styles to the managemembers.css file --- app/static/css/managemembers.css | 93 ++++++++++++++++++++++++--- app/templates/main/manageMembers.html | 24 +++---- 2 files changed, 94 insertions(+), 23 deletions(-) diff --git a/app/static/css/managemembers.css b/app/static/css/managemembers.css index d6757c6fc..36b1fccbf 100644 --- a/app/static/css/managemembers.css +++ b/app/static/css/managemembers.css @@ -1,9 +1,27 @@ +#add_member{ + display: flex; + justify-content: center; + gap: 0px; + margin-bottom: 30px; +} + + +@media (min-width: 767px) { + #add_member{ + display: flex; + justify-content: flex-end; + gap: 0px; + /*margin-bottom: -20px;*/ + } +} + + /* The switch container */ .switch { position: relative; display: inline-block; - width: 25px; - height: 13px; + width: 31.25px; + height: 16.25px; vertical-align: middle; } @@ -27,10 +45,10 @@ .slider:before { position: absolute; content: ""; - height: 9px; - width: 9px; - left: 2px; - bottom: 2px; + height: 11.25px; + width: 11.25px; + left: 2.5px; + bottom: 2.5px; background-color: white !important; transition: .4s; } @@ -42,12 +60,12 @@ input:checked + .slider { /* Checked state knob movement */ input:checked + .slider:before { - transform: translateX(12px) !important; + transform: translateX(15px) !important; } /* Rounded slider track and knob */ .slider.round { - border-radius: 17px; + border-radius: 21.25px; } .slider.round:before { border-radius: 50%; @@ -55,7 +73,64 @@ input:checked + .slider:before { /* Optional label spacing */ .switch-label { - margin-left: 5px; + margin-left: 6.25px; vertical-align: middle; font-weight: bold; +} + +a.hover_indicator { + text-decoration: none !important; + position: relative; + border-bottom: 1px dotted #000; + color: #000000; +} + +a.hover_indicator:visited, +a.hover_indicator:link, +a.hover_indicator:hover, +a.hover_indicator:active { + color: #000000; +} + +[class*="hover_indicator"]:after { + content: attr(aria-label); + display: none; + position: absolute; + top: 110%; + left: 10px; + z-index: 5000; + pointer-events: none; + padding: 8px 10px; + line-height: 15px; + white-space: nowrap; + text-decoration: none !important; + text-indent: 0; + overflow: visible; + font-size: .9em; + font-weight: normal; + -webkit-border-radius: 2px; + border-radius: 2px; + -webkit-box-shadow: 1px 2px 6px rgba(0,0,0,0.3); + box-shadow: 1px 2px 6px rgba(0,0,0,0.3); + background-color: #FFFFFF; + color: #000000; +} + +[class*="hover_indicator"]:hover:after, [class*="hover_indicator"]:focus:after { + display: block; + color: #000000; +} + +.isbanned_badge { + position: relative; + display: inline-block; + margin-top: 3px; + padding: 2px 6px; + background: red; + color: white !important; + border-radius: 10px; + font-size: 10px; + font-weight: 700; + letter-spacing: 0.3px; + line-height: 1.2; } \ No newline at end of file diff --git a/app/templates/main/manageMembers.html b/app/templates/main/manageMembers.html index d1ae263dd..39137dc2a 100644 --- a/app/templates/main/manageMembers.html +++ b/app/templates/main/manageMembers.html @@ -3,7 +3,6 @@ {% block styles %} {{super()}} - {% endblock %} @@ -18,10 +17,7 @@

    {% if department %} Manage {{department.DEPT_NAME}} Memb

    -
    - - +
    Click to Skip
    @@ -61,7 +57,7 @@

    {% if department %} Manage {{department.DEPT_NAME}} Memb
    {% if i[4] %} - Banned + Banned {% endif %}

    		-
    - - -
    - +
    + + +
    +     		From e3572c5e8942355b615ff2290df6cee651252b76 Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Tue, 7 Jul 2026 21:30:49 +0000 Subject: [PATCH 067/163] made real data show up on card and changed demo data to work --- app/controllers/main_routes/main_routes.py | 36 ++++++++++++---------- app/models/allocation.py | 2 +- app/static/js/departmentPortal.js | 1 + app/templates/main/departmentPortal.html | 15 +++++---- database/demo_data.py | 2 +- 5 files changed, 30 insertions(+), 26 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index f95ac60cd..a3aa58999 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -76,16 +76,23 @@ def departmentPortal(org=None,account=None): staff = Tracy().getSupervisors() supervisors = [] - + try: + allocation = Allocation.select(Allocation, Term).join(Term).where(Allocation.department == dept, Allocation.termCode == g.openTerm).get() + except DoesNotExist: + allocation = None + term = g.openTerm.termName + ViewAllocations(org, account) for i in staff: if i.ORG == org: supervisors.append(i.FIRST_NAME + " " + i.LAST_NAME + " (" + i.EMAIL + ")") - return render_template('main/departmentPortal.html', departments = departments, department = dept, positions = positions, - supervisors = supervisors + supervisors = supervisors, + # department_name = dept.DEPT_NAME, + allocation = allocation, + term = term ) @main_bp.route('/department///managepositions', methods=['GET']) @@ -171,26 +178,23 @@ def submitToBanner(formHistoryId): else: return "Submitting to Banner failed.", 500 -@main_bp.route('/department///viewallocations', methods=['GET']) +@main_bp.route('/department//', methods=['GET']) def ViewAllocations(org, account): - + try: dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) except DoesNotExist: return render_template('errors/404.html'), 404 - try: - term = Term.get(Term.termState == True) - except DoesNotExist: - return render_template('errors/404.html'), 404 - allocation = (Allocation - .select(Allocation, Term) - .join(Term) - .where(Allocation.department == dept, Allocation.termCode == term)) - - return render_template('main/viewAllocations.html', + allocation = Allocation.select(Allocation, Term).join(Term).where(Allocation.department == dept, Allocation.termCode == g.openTerm) + print(g.openTerm, '*********************************************************') + term = g.openTerm.termName + print(term, type(term), '*********************************************************') + return render_template('main/departmentPortal.html', department = dept, department_name = dept.DEPT_NAME, - allocations = allocation,) + allocation = allocation, + term = term + ) diff --git a/app/models/allocation.py b/app/models/allocation.py index ddd2084d7..9f333e0da 100644 --- a/app/models/allocation.py +++ b/app/models/allocation.py @@ -8,7 +8,7 @@ class Allocation(baseModel): department = ForeignKeyField(Department) isApproved = BooleanField(default=False) approvedOn = DateField() - approvedBy = ForeignKeyField(Supervisor) + approvedBy = CharField() justification = TextField() primary_10 = IntegerField() primary_12 = IntegerField() diff --git a/app/static/js/departmentPortal.js b/app/static/js/departmentPortal.js index cb2023a3a..d8dbbc84e 100644 --- a/app/static/js/departmentPortal.js +++ b/app/static/js/departmentPortal.js @@ -2,5 +2,6 @@ $(document).ready(function() { $("#selectedDepartment").on("change",function() { deptData = $(this).find('option:selected').data(); window.location = `/department/${deptData.org}/${deptData.account}`; + }); }); diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 787939829..6cf810250 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -23,7 +23,6 @@

    {% if department %} {{department.DEPT_NAME}} Portal {% e "{{d.DEPT_NAME}} ({{d.ORG}}-{{d.ACCOUNT}}) ">{{d.DEPT_NAME}} {% endfor %} - {% if department %} @@ -41,18 +40,18 @@

    Allocations

    -

    AY 26/27

    15/20 Positions

    +

    {{ term }}

    15/ {{allocation.primary_10 + allocation.primary_12 + allocation.primary_15 + allocation.primary_20 + allocation.secondary_5 + allocation.secondary_10}} Positions

      -
    • 10 Hour - 2/2
      • -
    • 12 Hour - 3/3
      • -
    • 15 Hour - 5/5
      • -
    • 20 Hour - 5/5
      • +
    • 10 Hour - 2/{{allocation.primary_10}}
      • +
    • 12 Hour - 3/{{allocation.primary_12}}
      • +
    • 15 Hour - 5/{{allocation.primary_15}}
      • +
    • 20 Hour - 5/{{allocation.primary_20}}
      -
    • 5 Hour - 2/2
      • -
    • 10 Hour - 3/3
      • +
    • 5 Hour - 2/{{allocation.secondary_5}}
      • +
    • 10 Hour - 3/{{allocation.secondary_10}}
    diff --git a/database/demo_data.py b/database/demo_data.py index 4f3a5e72c..a9355946f 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -734,7 +734,7 @@ "breakHours": 750, }, { - "termCode": 202400, + "termCode": 202500, "department": 1, "isApproved": False, "approvedOn": None, From b1e9d1e496f4f0449f65bde604817e5f07f0ceb6 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Wed, 8 Jul 2026 14:13:28 +0000 Subject: [PATCH 068/163] added changes from previous branch, card and main routes --- app/controllers/main_routes/main_routes.py | 32 +++++++++++--- app/models/positionHistory.py | 13 ++++++ app/templates/main/departmentPortal.html | 49 +++++++++++++++++++++- 3 files changed, 88 insertions(+), 6 deletions(-) create mode 100644 app/models/positionHistory.py diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 0a2f21e4b..c255184f4 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -16,6 +16,9 @@ from app.login_manager import require_login, logout from app.logic.getTableData import getDatatableData from app.logic.banner import Banner +from app.logic.tracy import Tracy +from app.models.positionHistory import PositionHistory + @main_bp.route('/logout', methods=['GET']) def triggerLogout(): @@ -51,21 +54,40 @@ def supervisorPortal(): @main_bp.route('/department/', methods=['GET']) @main_bp.route('/department//', methods=['GET']) def departmentPortal(org=None,account=None): - try: - dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) - except (NameError, DoesNotExist): + if org and account: + try: + dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) + except (NameError, DoesNotExist): + dept = None + else: dept = None - if g.currentUser.isLaborAdmin: departments = list(Department.select().order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) else: departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) + + pos = Tracy().getPositionsFromDepartment(org, account) + positions = [] + pos_his = [] + if pos == []: + positions = ["No Positions for this Department"] + else: + for i in pos: + positions.append(i.POSN_TITLE + ": " + "(WLS " + i.WLS + ")") + try: + pos_his_obj = PositionHistory.get(PositionHistory.positioncode == i.POSN_CODE) + pos_his.append(str(pos_his_obj.positioncode) + str(pos_his_obj.revisiondate)) + except: + pos_his.append("#") + return render_template('main/departmentPortal.html', departments = departments, - department = dept) + department = dept, + positions = positions, + pos_his = pos_his) @main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) def addUserToDept(): diff --git a/app/models/positionHistory.py b/app/models/positionHistory.py new file mode 100644 index 000000000..95fb3d287 --- /dev/null +++ b/app/models/positionHistory.py @@ -0,0 +1,13 @@ +from app.models import * +from app.models.department import Department + +class PositionHistory(baseModel): + positioncode = CharField() + status = CharField() + WLS = IntegerField() + revisiondate = DateField() + Description = TextField(default=None) + Department = ForeignKeyField(Department) + + class Meta: + primary_key = CompositeKey('positioncode', 'revisiondate', 'status') \ No newline at end of file diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 8ee01838b..f366811f4 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -9,7 +9,7 @@

    {% if department %} {{department.DEPT_NAME}} Portal {% else %} Choose a Department: {% endif %}

    -
    +
    + + {% if department %} +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    +

    Positions

    +
    + +
    +
      + {% for p in positions %} + {% if 7 > loop.index0 %} + {% if not pos_his[loop.index0] == "#" %} +
    • + {{ p }}
      • + {% else %} +
    • {{ p }}
      • + {% endif %} + {% elif 8 == loop.index0 %} +

    and {{ positions | length}} more...

    + {% endif %} + {% endfor %} + + +
    +
    + View Details +
    +
    +
    + +{% endif %} + {% endblock %} From 7fda0cf1c8ab49b7d3ce89908d9ccd272357b33f Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Wed, 8 Jul 2026 14:22:26 +0000 Subject: [PATCH 069/163] added space for the other cards, gave a db table for the positionHistory --- app/templates/main/departmentPortal.html | 2 ++ database/migrate_db.sh | 1 + 2 files changed, 3 insertions(+) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index f366811f4..f177323cf 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -29,9 +29,11 @@

    {% if department %} {{department.DEPT_NAME}} Portal {% e
    +
    +
    diff --git a/database/migrate_db.sh b/database/migrate_db.sh index f88c91f26..83f68a048 100755 --- a/database/migrate_db.sh +++ b/database/migrate_db.sh @@ -30,6 +30,7 @@ pem add app.models.supervisor.Supervisor pem add app.models.supervisorDepartment.SupervisorDepartment pem add app.models.studentLaborEvaluation.StudentLaborEvaluation pem add app.models.formSearchResult.FormSearchResult +pem add app.models.positionHistory.PositionHistory pem watch pem migrate From d86c8eaa7bdd83ce9bffe370631399c122d04f5a Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Wed, 8 Jul 2026 14:29:57 +0000 Subject: [PATCH 070/163] Fixed the url for the specific positions in the card --- app/templates/main/departmentPortal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index f177323cf..7c4df73aa 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -54,7 +54,7 @@

    Positions

    {% if 7 > loop.index0 %} {% if not pos_his[loop.index0] == "#" %}
  • - {{ p }}
    • + {{ p }} {% else %}
  • {{ p }}
    • {% endif %} From f6dabdf1da2bb62bf420dbf74e2829dfc0155ca9 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Wed, 8 Jul 2026 14:51:42 +0000 Subject: [PATCH 071/163] rounded the corner of the card using base.css --- app/static/css/base.css | 1 + 1 file changed, 1 insertion(+) diff --git a/app/static/css/base.css b/app/static/css/base.css index 940f8d6e5..6b87b2286 100755 --- a/app/static/css/base.css +++ b/app/static/css/base.css @@ -207,6 +207,7 @@ a { background-clip: border-box; border: 1px solid rgba(0, 0, 0, 0.125); border-radius: 0.25rem; + overflow: hidden; } .card-body { From 45c156f4987914c5049855524818c91ac37553ae Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Wed, 8 Jul 2026 15:02:02 +0000 Subject: [PATCH 072/163] fixed allocation card to have all total data --- app/controllers/main_routes/main_routes.py | 3 ++- app/templates/main/departmentPortal.html | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index a3aa58999..1df8cc67e 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -85,13 +85,14 @@ def departmentPortal(org=None,account=None): for i in staff: if i.ORG == org: supervisors.append(i.FIRST_NAME + " " + i.LAST_NAME + " (" + i.EMAIL + ")") + total_hours = Allocation.select(Allocation.primary_10 + Allocation.primary_12 + Allocation.primary_15 + Allocation.primary_20 + Allocation.secondary_5 + Allocation.secondary_10).where(Allocation.department == dept, Allocation.termCode == g.openTerm).scalar() return render_template('main/departmentPortal.html', departments = departments, department = dept, positions = positions, supervisors = supervisors, - # department_name = dept.DEPT_NAME, allocation = allocation, + total_allocation = total_hours, term = term ) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 95548cfaa..103a6ee90 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -40,7 +40,7 @@

    Allocations

    -

    {{ term }}

    15/ {{allocation.primary_10 + allocation.primary_12 + allocation.primary_15 + allocation.primary_20 + allocation.secondary_5 + allocation.secondary_10}} Positions

    +

    {{ term }}

    15/{{total_allocation or 0}} Positions

      @@ -56,7 +56,7 @@

      {{ term }}

      15/ {{allocation.primary_10 + allocation.primary_12 + al

    -

    Break Hours

    0/200 Hours

    +

    Break Hours

    0/{{allocation.breakHours or 0}} Hours

    From a9515153f7ab09bede688227c3b747f5c39ac98b Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Wed, 8 Jul 2026 15:08:43 +0000 Subject: [PATCH 073/163] view details -> view all positions --- app/templates/main/departmentPortal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 7c4df73aa..26350296a 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -66,7 +66,7 @@

    Positions

    - View Details + View All Positions

    From 082569ec80a9ba49f7af92596056a5bf5e959b56 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Wed, 8 Jul 2026 15:22:11 +0000 Subject: [PATCH 074/163] added the position history to the demo data to test the links --- database/demo_data.py | 61 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/database/demo_data.py b/database/demo_data.py index 0557c9361..4b40313e3 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -17,6 +17,7 @@ from app.models.laborStatusForm import LaborStatusForm from app.models.formHistory import FormHistory from app.models.notes import Notes +from app.models.positionHistory import PositionHistory print("Inserting data for demo and testing purposes") @@ -609,3 +610,63 @@ ] Notes.insert_many(notes).on_conflict_replace().execute() print(" * laborOfficeNotes added") + +############################# +# Position History +############################# + +positionhistory = [ + { + "positioncode": "S61407", + "status": "Active", + "WLS": 1, + "revisiondate": f"{current_year}-07-01", + "Description": "", + "Department_id": 1 + }, + { + + "positioncode": "S61408", + "status": "Active", + "WLS": 2, + "revisiondate": f"{current_year}-09-01", + "Description": "", + "Department_id": 1 + }, + { + "positioncode": "S61409", + "status": "Active", + "WLS": 3, + "revisiondate": f"{current_year}-07-01", + "Description": "", + "Department_id": 1 + }, + { + "positioncode": "S61411", + "status": "Active", + "WLS":3, + "revisiondate" : f"{current_year}-01-01", + "Description": "", + "Department_id" : 1 + + }, + { + "positioncode": "S61410", + "status": "Inactive", + "WLS":2, + "revisiondate" : f"{current_year}-01-01", + "Description": "", + "Department_id" : 1 + }, + + { + "positioncode": "S12345", + "status": "Active", + "WLS":3, + "revisiondate" : f"{current_year}-01-23", + "Description": "", + "Department_id" : 1 + } + +] +PositionHistory.insert_many(positionhistory).on_conflict_replace().execute() \ No newline at end of file From 489c9c823379f90b69dbd914a51303eea1f487e2 Mon Sep 17 00:00:00 2001 From: ArtemKurasov Date: Wed, 8 Jul 2026 16:01:58 +0000 Subject: [PATCH 075/163] Made the Supervisees column on the Manage Members page reflect data from the demo_data.py file --- .../main_routes/departmentPortal.py | 36 ++++++++- app/templates/main/manageMembers.html | 10 ++- database/demo_data.py | 78 ++++++++++++++++++- 3 files changed, 118 insertions(+), 6 deletions(-) diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index 80f16a13e..34073be15 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -1,5 +1,5 @@ from flask import render_template, request, json, redirect, url_for, send_file, g, flash, jsonify -from peewee import JOIN, DoesNotExist +from peewee import JOIN, DoesNotExist, fn, Case from functools import reduce import operator from app.models.department import Department @@ -27,7 +27,39 @@ def manageStaff(org=None,account=None): dept = None abort(404) - members = list(SupervisorDepartment.select(SupervisorDepartment, Supervisor).where(SupervisorDepartment.department == dept).join(Supervisor).order_by(SupervisorDepartment.isActive.desc()).dicts()) + members = list( + SupervisorDepartment. + select( + SupervisorDepartment, + Supervisor + ).where( + SupervisorDepartment.department == dept + ).join(Supervisor).order_by( + SupervisorDepartment.isActive.desc() + ).dicts() + ) + + student_count = list( + LaborStatusForm. + select( + fn.SUM(Case(LaborStatusForm.jobType, (("Primary", 1),), 0)).alias("primary_positions"), + fn.SUM(Case(LaborStatusForm.jobType, (("Secondary", 1),), 0)).alias("secondary_positions"), + LaborStatusForm.department, + LaborStatusForm.supervisor + ).group_by( + LaborStatusForm.department, + LaborStatusForm.supervisor + ).dicts() + ) + + counts = {row['supervisor']: row for row in student_count} + + for member in members: + row = counts.get(member["supervisor"], {}) + member["primary_positions"] = row.get("primary_positions", 0) + member["secondary_positions"] = row.get("secondary_positions", 0) + + print(members) return render_template('main/manageMembers.html', members = members, diff --git a/app/templates/main/manageMembers.html b/app/templates/main/manageMembers.html index 39137dc2a..0ec44226b 100644 --- a/app/templates/main/manageMembers.html +++ b/app/templates/main/manageMembers.html @@ -61,9 +61,13 @@

    {% if department %} Manage {{department.DEPT_NAME}} Memb {% endif %}

    		- Primary: 12
    - Secondary: 13 +     		+ {% if i['primary_positions'] == 0 and i['secondary_positions'] == 0 %} + None + {% else %} + Primary: {{i['primary_positions']}}
    + Secondary: {{i['secondary_positions']}} + {% endif %}     		diff --git a/database/demo_data.py b/database/demo_data.py index 6e980070f..fdc3d6ae7 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -599,6 +599,56 @@ "status_id": "Pending" }]).on_conflict_replace().execute() +LaborStatusForm.insert([{ + "laborStatusFormID": 4, + "termCode_id": f"{current_year}00", + "studentName": "Elaleh Jamali", + "studentSupervisee_id": "B00730361", + "supervisor_id": "B12361006", + "department_id": 1, + "jobType": "Secondary", + "WLS": 1, + "POSN_TITLE": "Labor Workers", + "POSN_CODE": "S61419", + "weeklyHours": 10, + "startDate": f"{current_year}-04-01", + "endDate": "2025-09-01" + }]).on_conflict_replace().execute() + +FormHistory.insert([{ + "formHistoryID": 4, + "formID_id": "4", + "historyType_id": "Labor Status Form", + "createdBy_id": 1, + "createdDate": f"{current_year}-04-14", + "status_id": "Approved" + }]).on_conflict_replace().execute() + +LaborStatusForm.insert([{ + "laborStatusFormID": 5, + "termCode_id": f"{current_year}00", + "studentName": "Oluwagbayi Makinde", + "studentSupervisee_id": "B00791326", + "supervisor_id": "B12365892", + "department_id": 1, + "jobType": "Primary", + "WLS": 1, + "POSN_TITLE": "Labor Workers", + "POSN_CODE": "S61429", + "weeklyHours": 10, + "startDate": f"{current_year}-04-01", + "endDate": "2025-09-01" + }]).on_conflict_replace().execute() + +FormHistory.insert([{ + "formHistoryID": 5, + "formID_id": "5", + "historyType_id": "Labor Status Form", + "createdBy_id": 1, + "createdDate": f"{current_year}-04-14", + "status_id": "Approved" + }]).on_conflict_replace().execute() + LaborStatusForm.insert([{ "laborStatusFormID": 3, "termCode_id": f"{current_year}00", @@ -622,7 +672,33 @@ "createdBy_id": 1, "createdDate": f"{current_year}-04-14", "status_id": "Approved" - }]).on_conflict_replace().execute() + }]).on_conflict_replace().execute() + + +LaborStatusForm.insert([{ + "laborStatusFormID": 6, + "termCode_id": f"{current_year}00", + "studentName": "Guillermo Adams", + "studentSupervisee_id": "B00734292", + "supervisor_id": "B12365892", + "department_id": 1, + "jobType": "Primary", + "WLS": 1, + "POSN_TITLE": "Labor Workers", + "POSN_CODE": "S61439", + "weeklyHours": 10, + "startDate": f"{current_year}-04-01", + "endDate": "2025-09-01" + }]).on_conflict_replace().execute() + +FormHistory.insert([{ + "formHistoryID": 6, + "formID_id": "6", + "historyType_id": "Labor Status Form", + "createdBy_id": 1, + "createdDate": f"{current_year}-04-14", + "status_id": "Approved" + }]).on_conflict_replace().execute() From b35b4074b714b1004255ac42e0a2bec77f9173e0 Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Wed, 8 Jul 2026 17:14:19 +0000 Subject: [PATCH 076/163] saving changes for review --- app/controllers/main_routes/main_routes.py | 2 ++ app/templates/main/departmentPortal.html | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 1df8cc67e..6353e51ea 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -86,6 +86,7 @@ def departmentPortal(org=None,account=None): if i.ORG == org: supervisors.append(i.FIRST_NAME + " " + i.LAST_NAME + " (" + i.EMAIL + ")") total_hours = Allocation.select(Allocation.primary_10 + Allocation.primary_12 + Allocation.primary_15 + Allocation.primary_20 + Allocation.secondary_5 + Allocation.secondary_10).where(Allocation.department == dept, Allocation.termCode == g.openTerm).scalar() + used_allocation = LaborStatusForm.select(LaborStatusForm.weeklyHours).where(LaborStatusForm.department == dept, LaborStatusForm.termCode == g.openTerm, LaborStatusForm.studentConfirmation == True, LaborStatusForm.weeklyHours.is_null(False)).scalar() return render_template('main/departmentPortal.html', departments = departments, department = dept, @@ -93,6 +94,7 @@ def departmentPortal(org=None,account=None): supervisors = supervisors, allocation = allocation, total_allocation = total_hours, + used_allocation = used_allocation, term = term ) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 103a6ee90..8c1f669b7 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -44,7 +44,7 @@

    {{ term }}

    15/{{total_allocation or 0}} Positions

      -
    • 10 Hour - 2/{{allocation.primary_10}}
      • +
    • 10 Hour - {{used_allocation or 0}}/{{allocation.primary_10}}
    • 12 Hour - 3/{{allocation.primary_12}}
    • 15 Hour - 5/{{allocation.primary_15}}
    • 20 Hour - 5/{{allocation.primary_20}}
      • From a10673882a06ae6ae66afdb05a8b73137a050630 Mon Sep 17 00:00:00 2001 From: ArtemKurasov Date: Wed, 8 Jul 2026 17:32:07 +0000 Subject: [PATCH 077/163] Fixed how Secondaries Are Displayed --- app/controllers/main_routes/departmentPortal.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index 34073be15..cfa0cbf97 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -51,15 +51,17 @@ def manageStaff(org=None,account=None): LaborStatusForm.supervisor ).dicts() ) + - counts = {row['supervisor']: row for row in student_count} + counts = {(row["department"], row["supervisor"]): row for row in student_count} for member in members: - row = counts.get(member["supervisor"], {}) + + key = (member["department"], member["supervisor"]) + row = counts.get(key, {}) + member["primary_positions"] = row.get("primary_positions", 0) member["secondary_positions"] = row.get("secondary_positions", 0) - - print(members) return render_template('main/manageMembers.html', members = members, From e6a6e7706ef9f39824ad24fbe2c6ee43c232cfb8 Mon Sep 17 00:00:00 2001 From: ArtemKurasov Date: Wed, 8 Jul 2026 17:58:29 +0000 Subject: [PATCH 078/163] Moved all the styles to managemembers.css + Removed sorting from the Change Status & Remove Member columns --- app/static/css/managemembers.css | 38 ++++++++++++++++++++------- app/static/js/manageMembers.js | 2 +- app/templates/main/manageMembers.html | 30 ++++++++++----------- 3 files changed, 44 insertions(+), 26 deletions(-) diff --git a/app/static/css/managemembers.css b/app/static/css/managemembers.css index 36b1fccbf..3384fddc6 100644 --- a/app/static/css/managemembers.css +++ b/app/static/css/managemembers.css @@ -1,13 +1,24 @@ -#add_member{ +/*styles for column alignment in the data table*/ +.centered-header { + text-align: center !important; +} + +.centered-cell { + vertical-align: middle !important; +} + +/* The add-member search bar*/ +#add-member { display: flex; justify-content: center; gap: 0px; + height: 20px; margin-bottom: 30px; } @media (min-width: 767px) { - #add_member{ + #add-member{ display: flex; justify-content: flex-end; gap: 0px; @@ -78,21 +89,22 @@ input:checked + .slider:before { font-weight: bold; } -a.hover_indicator { +/* hover indicator */ +a.hover-indicator { text-decoration: none !important; position: relative; border-bottom: 1px dotted #000; color: #000000; } -a.hover_indicator:visited, -a.hover_indicator:link, -a.hover_indicator:hover, -a.hover_indicator:active { +a.hover-indicator:visited, +a.hover-indicator:link, +a.hover-indicator:hover, +a.hover-indicator:active { color: #000000; } -[class*="hover_indicator"]:after { +[class*="hover-indicator"]:after { content: attr(aria-label); display: none; position: absolute; @@ -116,12 +128,13 @@ a.hover_indicator:active { color: #000000; } -[class*="hover_indicator"]:hover:after, [class*="hover_indicator"]:focus:after { +[class*="hover-indicator"]:hover:after, [class*="hover_indicator"]:focus:after { display: block; color: #000000; } -.isbanned_badge { +/*a "banned" badge displayed under the name of a banned department member*/ +.isbanned-badge { position: relative; display: inline-block; margin-top: 3px; @@ -133,4 +146,9 @@ a.hover_indicator:active { font-weight: 700; letter-spacing: 0.3px; line-height: 1.2; +} + +/* switches inside the data table */ +.table-switch { + top: 10px; } \ No newline at end of file diff --git a/app/static/js/manageMembers.js b/app/static/js/manageMembers.js index 0935cff23..57849722a 100644 --- a/app/static/js/manageMembers.js +++ b/app/static/js/manageMembers.js @@ -1,7 +1,7 @@ $(document).ready(function() { $('#manageMembers').DataTable({ 'columnDefs': [{ - 'targets': [1, 2], + 'targets': '.no-sorting', 'orderable': false }], // hide sort icon on header of first column 'aaSorting': [ diff --git a/app/templates/main/manageMembers.html b/app/templates/main/manageMembers.html index 0ec44226b..6854b06ee 100644 --- a/app/templates/main/manageMembers.html +++ b/app/templates/main/manageMembers.html @@ -17,14 +17,14 @@

      {% if department %} Manage {{department.DEPT_NAME}} Memb

      -
      +
      Click to Skip - +
      @@ -37,12 +37,12 @@

      {% if department %} Manage {{department.DEPT_NAME}} Memb

    NameSuperviseesAssign CoordinatorSuperviseesAssign CoordinatorChange StatusRemove MemberChange StatusRemove Member
    - {{ i['legal_name'] + " " + i['LAST_NAME']}} + {{ i['legal_name'] + " " + i['LAST_NAME']}} ✉
    {% if i[4] %} - Banned + Banned {% endif %}     		+ {% if i['primary_positions'] == 0 and i['secondary_positions'] == 0 %} None {% else %} @@ -70,9 +70,9 @@

    {% if department %} Manage {{department.DEPT_NAME}} Memb {% endif %}

    		+
    -
    		+ {% if not i[4] %} {% else %} {% endif %} + {% if not i[4] %} - + {% else %} - + {% endif %} From ce989275eae5f574afa25e4dd61c27bcdabf2a77 Mon Sep 17 00:00:00 2001 From: ArtemKurasov Date: Wed, 8 Jul 2026 19:37:09 +0000 Subject: [PATCH 087/163] Deleted the isActive attribute from SupervisorDepartment --- app/controllers/main_routes/departmentPortal.py | 4 ++-- app/models/supervisorDepartment.py | 1 - database/demo_data.py | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index cfa0cbf97..4df0f59fb 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -34,8 +34,8 @@ def manageStaff(org=None,account=None): Supervisor ).where( SupervisorDepartment.department == dept - ).join(Supervisor).order_by( - SupervisorDepartment.isActive.desc() + ).join( + Supervisor ).dicts() ) diff --git a/app/models/supervisorDepartment.py b/app/models/supervisorDepartment.py index 938c5f320..bb6da9944 100644 --- a/app/models/supervisorDepartment.py +++ b/app/models/supervisorDepartment.py @@ -5,7 +5,6 @@ class SupervisorDepartment(baseModel): supervisor = ForeignKeyField(Supervisor, null=True) department = ForeignKeyField(Department) - isActive = BooleanField(default=False) isCoordinator = BooleanField(default=False) diff --git a/database/demo_data.py b/database/demo_data.py index fdc3d6ae7..f7139d4cd 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -735,35 +735,30 @@ { "supervisor": "B12361006", "department": 1, - "isActive": True, "isCoordinator": True }, { "supervisor": "B12365892", "department": 1, - "isActive": True, "isCoordinator": False }, { "supervisor": "B12365893", "department": 1, - "isActive": False, "isCoordinator": False }, { "supervisor": "B00763721", "department": 1, - "isActive": True, "isCoordinator": False }, { "supervisor": "B00841417", "department": 1, - "isActive": True, "isCoordinator": True } ] From 306d26c5bf2b080411de5ff6ebc2aae2eef7c08c Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Wed, 8 Jul 2026 20:19:06 +0000 Subject: [PATCH 088/163] fixed the positionHistory in the demo_data.py --- database/demo_data.py | 48 +++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/database/demo_data.py b/database/demo_data.py index dc819465c..b8c506449 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -626,55 +626,55 @@ positionhistory = [ { - "positioncode": "S61407", + "positionCode": "S61407", "status": "Active", - "WLS": 1, + "wls": 1, "revisiondate": f"{current_year}-07-01", - "Description": "", - "Department_id": 1 + "description": "", + "department": 1 }, { - "positioncode": "S61408", + "positionCode": "S61408", "status": "Active", - "WLS": 2, + "wls": 2, "revisiondate": f"{current_year}-09-01", - "Description": "", - "Department_id": 1 + "description": "", + "department": 1 }, { - "positioncode": "S61409", + "positionCode": "S61409", "status": "Active", - "WLS": 3, + "wls": 3, "revisiondate": f"{current_year}-07-01", - "Description": "", - "Department_id": 1 + "description": "", + "department": 1 }, { - "positioncode": "S61411", + "positionCode": "S61411", "status": "Active", - "WLS":3, + "wls":3, "revisiondate" : f"{current_year}-01-01", - "Description": "", - "Department_id" : 1 + "description": "", + "department" : 1 }, { - "positioncode": "S61410", + "positionCode": "S61410", "status": "Inactive", - "WLS":2, + "wls":2, "revisiondate" : f"{current_year}-01-01", - "Description": "", - "Department_id" : 1 + "description": "", + "department" : 1 }, { - "positioncode": "S12345", + "positionCode": "S12345", "status": "Active", - "WLS":3, + "wls":3, "revisiondate" : f"{current_year}-01-23", - "Description": "", - "Department_id" : 1 + "description": "", + "department" : 1 } ] From 4849854c8dd765732ae511b09300e4b27b7624f6 Mon Sep 17 00:00:00 2001 From: feitsopb Date: Wed, 8 Jul 2026 20:20:15 +0000 Subject: [PATCH 089/163] merged peeweeattribute into Bright_Artem_manage_people --- app/templates/main/departmentPortal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index edc6e3c0c..e1abe22ff 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -72,7 +72,7 @@

    Supervisors

    - View Details + View Details
    From 6f7791af49aed2c1111bdb6da46a1552071fe780 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Wed, 8 Jul 2026 20:27:08 +0000 Subject: [PATCH 090/163] fixed demo data to work, card again has links --- app/controllers/main_routes/main_routes.py | 4 ++-- database/demo_data.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index c255184f4..8bfb8cede 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -78,8 +78,8 @@ def departmentPortal(org=None,account=None): for i in pos: positions.append(i.POSN_TITLE + ": " + "(WLS " + i.WLS + ")") try: - pos_his_obj = PositionHistory.get(PositionHistory.positioncode == i.POSN_CODE) - pos_his.append(str(pos_his_obj.positioncode) + str(pos_his_obj.revisiondate)) + pos_his_obj = PositionHistory.get(PositionHistory.positionCode == i.POSN_CODE) + pos_his.append(str(pos_his_obj.positionCode) + str(pos_his_obj.revisionDate)) except: pos_his.append("#") diff --git a/database/demo_data.py b/database/demo_data.py index b8c506449..f9d95c97f 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -629,7 +629,7 @@ "positionCode": "S61407", "status": "Active", "wls": 1, - "revisiondate": f"{current_year}-07-01", + "revisionDate": f"{current_year}-07-01", "description": "", "department": 1 }, @@ -638,7 +638,7 @@ "positionCode": "S61408", "status": "Active", "wls": 2, - "revisiondate": f"{current_year}-09-01", + "revisionDate": f"{current_year}-09-01", "description": "", "department": 1 }, @@ -646,7 +646,7 @@ "positionCode": "S61409", "status": "Active", "wls": 3, - "revisiondate": f"{current_year}-07-01", + "revisionDate": f"{current_year}-07-01", "description": "", "department": 1 }, @@ -654,7 +654,7 @@ "positionCode": "S61411", "status": "Active", "wls":3, - "revisiondate" : f"{current_year}-01-01", + "revisionDate" : f"{current_year}-01-01", "description": "", "department" : 1 @@ -663,7 +663,7 @@ "positionCode": "S61410", "status": "Inactive", "wls":2, - "revisiondate" : f"{current_year}-01-01", + "revisionDate" : f"{current_year}-01-01", "description": "", "department" : 1 }, @@ -672,7 +672,7 @@ "positionCode": "S12345", "status": "Active", "wls":3, - "revisiondate" : f"{current_year}-01-23", + "revisionDate" : f"{current_year}-01-23", "description": "", "department" : 1 } From 046f98a5bd089b902a32695f1f046713f79a9103 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Wed, 8 Jul 2026 20:56:56 +0000 Subject: [PATCH 091/163] reworded pos, pos_his, and pos_his_obj to be more clear/formatted correctly --- app/controllers/main_routes/main_routes.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 8bfb8cede..f6f5a66de 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -69,25 +69,25 @@ def departmentPortal(org=None,account=None): departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) - pos = Tracy().getPositionsFromDepartment(org, account) - positions = [] - pos_his = [] - if pos == []: - positions = ["No Positions for this Department"] + positions = Tracy().getPositionsFromDepartment(org, account) + positionsList = [] + posHis = [] + if positions == []: + positionsList = ["No Positions for this Department"] else: - for i in pos: - positions.append(i.POSN_TITLE + ": " + "(WLS " + i.WLS + ")") + for i in positions: + positionsList.append(i.POSN_TITLE + ": " + "(WLS " + i.WLS + ")") try: pos_his_obj = PositionHistory.get(PositionHistory.positionCode == i.POSN_CODE) - pos_his.append(str(pos_his_obj.positionCode) + str(pos_his_obj.revisionDate)) + posHis.append(str(pos_his_obj.positionCode) + str(pos_his_obj.revisionDate)) except: - pos_his.append("#") + posHis.append("#") return render_template('main/departmentPortal.html', departments = departments, department = dept, - positions = positions, - pos_his = pos_his) + positions = positionsList, + posHis = posHis) @main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) def addUserToDept(): From 77c80d6e780c0a95b7fb91c0a9d9b9ec888b234d Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Wed, 8 Jul 2026 21:11:15 +0000 Subject: [PATCH 092/163] figured out issue creaking card data, g.getopenterm is not holding the right data so i have ot find new variable for the current term --- app/controllers/main_routes/main_routes.py | 8 +-- database/demo_data.py | 64 +++++++++++----------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 0b6c5037e..6577ee1a8 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -78,17 +78,17 @@ def departmentPortal(org=None,account=None): supervisors = [] print(dept, '*********************************************************Denys') try: - allocation = Allocation.select(Allocation, Term).join(Term).where(Allocation.department == dept, Allocation.termCode == g.openTerm).get() + allocation = Allocation.select(Allocation, Term).join(Term).where(Allocation.department == dept, Allocation.termCode == 202500).get() print(allocation, '*********************************************************Scott') except DoesNotExist: allocation = None - term = g.openTerm.termName + term = 202500 ViewAllocations(org, account) for i in staff: if i.ORG == org: supervisors.append(i.FIRST_NAME + " " + i.LAST_NAME + " (" + i.EMAIL + ")") - totalPositions = Allocation.select(Allocation.primary_10 + Allocation.primary_12 + Allocation.primary_15 + Allocation.primary_20 + Allocation.secondary_5 + Allocation.secondary_10).where(Allocation.department == dept, Allocation.termCode == g.openTerm).scalar() - usedAllocation = LaborStatusForm.select(LaborStatusForm).where(LaborStatusForm.department == dept, LaborStatusForm.termCode == g.openTerm, LaborStatusForm.studentConfirmation == True).scalar() + totalPositions = Allocation.select(Allocation.primary_10 + Allocation.primary_12 + Allocation.primary_15 + Allocation.primary_20 + Allocation.secondary_5 + Allocation.secondary_10).where(Allocation.department == dept, Allocation.termCode == 202500).scalar() + usedAllocation = LaborStatusForm.select(LaborStatusForm).where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.studentConfirmation == True).scalar() print(totalPositions, usedAllocation,Allocation.primary_10, '*********************************************************brian') return render_template('main/departmentPortal.html', departments = departments, diff --git a/database/demo_data.py b/database/demo_data.py index 715778b1f..5485fce57 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -715,7 +715,7 @@ { "termCode": 202500, "department": 3, - "isApproved": False, + "isFinal": False, "approvedOn": None, "approvedBy": None, "justification": "Downscaling due to decrease in student enrollment caused by current economic conditions", @@ -730,7 +730,7 @@ { "termCode": 202300, "department": 2, - "isApproved": False, + "isFinal": False, "approvedOn": None, "approvedBy": None, "justification": "Increase in student enrollment due to exodous from CS department", @@ -745,7 +745,7 @@ { "termCode": 202500, "department": 1, - "isApproved": False, + "isFinal": False, "approvedOn": None, "approvedBy": None, "justification": "We are hiring more students to help with the increased workload in the department", @@ -760,7 +760,7 @@ { "termCode": 202500, "department": 4, - "isApproved": False, + "isFinal": False, "approvedOn": None, "approvedBy": None, "justification": "Downscaling the number of students in the department due to budget cuts", @@ -775,7 +775,7 @@ { "termCode": 202500, "department": 5, - "isApproved": False, + "isFinal": False, "approvedOn": None, "approvedBy": None, "justification": "Due to rapid department growth, we need to hire more students to help with the increased workload", @@ -796,7 +796,7 @@ { "termCode":f"{current_year}00", "department": 3, - "isApproved": True, + "isFinal": True, "approvedOn": f"{current_year}-06-30", "approvedBy": "B12365892", "justification": "We just want it for fun", @@ -811,7 +811,7 @@ { "termCode":f"{current_year}00", "department": 2, - "isApproved": False, + "isFinal": False, "approvedOn": f"{current_year}-06-20", "approvedBy": "B00763721", "justification": "We need it to lower the amount of allocations we have", @@ -835,46 +835,46 @@ positionhistory = [ { - "positioncode": "S61407", + "positionCode": "S61407", "status": "Active", - "WLS": 1, - "revisiondate": f"{current_year}-07-01", - "Description": "", - "Department_id": 1 + "wls": 1, + "revisionDate": f"{current_year}-07-01", + "description": "", + "department": 1 }, { - "positioncode": "S61408", + "positionCode": "S61408", "status": "Active", - "WLS": 2, - "revisiondate": f"{current_year}-09-01", - "Description": "", - "Department_id": 1 + "wls": 2, + "revisionDate": f"{current_year}-09-01", + "description": "", + "department": 1 }, { - "positioncode": "S61409", + "positionCode": "S61409", "status": "Active", - "WLS": 3, - "revisiondate": f"{current_year}-07-01", - "Description": "", - "Department_id": 1 + "wls": 3, + "revisionDate": f"{current_year}-07-01", + "description": "", + "department": 1 }, { - "positioncode": "S61411", + "positionCode": "S61411", "status": "Active", - "WLS":3, - "revisiondate" : f"{current_year}-01-01", - "Description": "", - "Department_id" : 1 + "wls":3, + "revisionDate" : f"{current_year}-01-01", + "description": "", + "department" : 1 }, { - "positioncode": "S61410", + "positionCode": "S61410", "status": "Inactive", - "WLS":2, - "revisiondate" : f"{current_year}-01-01", - "Description": "", - "Department_id" : 1 + "wls":2, + "revisionDate" : f"{current_year}-01-01", + "description": "", + "department" : 1 }, ] From c701ac6a9e3df4e5d16e40d0d558043c0c959dad Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Wed, 8 Jul 2026 21:25:52 +0000 Subject: [PATCH 093/163] Removed the Tracy dependency from the position card, positionHistory was updated to contain a title --- app/controllers/main_routes/main_routes.py | 15 ++++++--------- app/models/positionHistory.py | 1 + app/templates/main/departmentPortal.html | 6 +----- database/demo_data.py | 16 ++++++++++------ 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index f6f5a66de..26549b03f 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -69,25 +69,22 @@ def departmentPortal(org=None,account=None): departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) - positions = Tracy().getPositionsFromDepartment(org, account) + positions = list(PositionHistory.select().where(PositionHistory.department == dept).order_by(PositionHistory.positionTitle.asc())) if dept else [] positionsList = [] - posHis = [] + posUrl = [] if positions == []: positionsList = ["No Positions for this Department"] else: for i in positions: - positionsList.append(i.POSN_TITLE + ": " + "(WLS " + i.WLS + ")") - try: - pos_his_obj = PositionHistory.get(PositionHistory.positionCode == i.POSN_CODE) - posHis.append(str(pos_his_obj.positionCode) + str(pos_his_obj.revisionDate)) - except: - posHis.append("#") + positionsList.append(i.positionTitle + ": " + "(WLS " + str(i.wls) + ")") + posUrl.append(str(i.positionCode) + "/" + str(i.revisionDate)) + return render_template('main/departmentPortal.html', departments = departments, department = dept, positions = positionsList, - posHis = posHis) + posUrl = posUrl) @main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) def addUserToDept(): diff --git a/app/models/positionHistory.py b/app/models/positionHistory.py index 514670759..9a248aacb 100644 --- a/app/models/positionHistory.py +++ b/app/models/positionHistory.py @@ -2,6 +2,7 @@ from app.models.department import Department class PositionHistory(baseModel): + positionTitle = CharField() positionCode = CharField() department = ForeignKeyField(Department) status = CharField() diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 26350296a..df432b7ea 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -52,12 +52,8 @@

    Positions

      {% for p in positions %} {% if 7 > loop.index0 %} - {% if not pos_his[loop.index0] == "#" %}
    • - {{ p }}
      • - {% else %} -
    • {{ p }}
      • - {% endif %} + {{ p }} {% elif 8 == loop.index0 %}

    and {{ positions | length}} more...

    {% endif %} diff --git a/database/demo_data.py b/database/demo_data.py index f9d95c97f..e611d3599 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -626,6 +626,7 @@ positionhistory = [ { + "positionTitle": "Student Programmer", "positionCode": "S61407", "status": "Active", "wls": 1, @@ -634,7 +635,7 @@ "department": 1 }, { - + "positionTitle": "Research Associate", "positionCode": "S61408", "status": "Active", "wls": 2, @@ -643,6 +644,7 @@ "department": 1 }, { + "positionTitle": "Labor Workers", "positionCode": "S61409", "status": "Active", "wls": 3, @@ -651,6 +653,7 @@ "department": 1 }, { + "positionTitle": "Teaching Associate", "positionCode": "S61411", "status": "Active", "wls":3, @@ -658,17 +661,18 @@ "description": "", "department" : 1 - }, - { + }, + { + "positionTitle": "Teaching Associate", "positionCode": "S61410", "status": "Inactive", "wls":2, "revisionDate" : f"{current_year}-01-01", "description": "", "department" : 1 - }, - - { + }, + { + "positionTitle": "DUMMY POSITION", "positionCode": "S12345", "status": "Active", "wls":3, From 2dfbeaf0de75b3e7236e1bdfd0523c83d286d5e4 Mon Sep 17 00:00:00 2001 From: ArtemKurasov Date: Thu, 9 Jul 2026 14:00:58 +0000 Subject: [PATCH 094/163] Added flash messages for the Assign Coordinator switch and the Remove Member button --- app/static/js/manageMembers.js | 30 ++++++++++++++++++++++----- app/templates/main/manageMembers.html | 4 ++-- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/app/static/js/manageMembers.js b/app/static/js/manageMembers.js index 4f3a3cf49..4966d42fa 100644 --- a/app/static/js/manageMembers.js +++ b/app/static/js/manageMembers.js @@ -20,11 +20,12 @@ $(document).ready(function() { let memberStatus = $(this).data("member-status"); let category; -if (memberStatus === "Banned") { - category = "danger"; -} else { - category = "success"; -} + if (memberStatus === "Banned") { + category = "danger"; + } else { + category = "success"; + } + let quote = String.fromCharCode(39); $("#flash_container").html("
    The status for " + memberName + " has been set to " + quote + memberStatus + quote + ".
    "); @@ -40,5 +41,24 @@ if (memberStatus === "Banned") { $(this).data("member-status", "Banned"); } }); + + $(document).on("click", ".remove-member", function() { + let memberName = $(this).data("member-name"); + $("#flash_container").html("
    " + memberName + " has been removed from the department.
    "); + $("#flasher").delay(3000).fadeOut(); + }); + + $(document).on("click", ".assign-coordinator", function() { + let memberName = $(this).data("member-name"); + + if ($(this).is(":checked")) { + $("#flash_container").html("
    " + memberName + " has been assigned as a coordinator.
    "); + $("#flasher").delay(3000).fadeOut(); + } else { + $("#flash_container").html("
    " + memberName + " is no longer a coordinator.
    "); + $("#flasher").delay(3000).fadeOut(); + } + + }); }) diff --git a/app/templates/main/manageMembers.html b/app/templates/main/manageMembers.html index c2f995354..a7ab4757a 100644 --- a/app/templates/main/manageMembers.html +++ b/app/templates/main/manageMembers.html @@ -73,7 +73,7 @@

    {% if department %} Manage {{department.DEPT_NAME}} Memb

    @@ -96,7 +96,7 @@

    {% if department %} Manage {{department.DEPT_NAME}} Memb data-member-status="Unbanned">Unban {% endif %}

    		+ - {% if i['primary_positions'] == 0 and i['secondary_positions'] == 0 %} + {% if (i['active_primary_positions'] == 0 and i['active_secondary_positions'] == 0) and (i['pending_primary_positions'] == 0 and i['pending_secondary_positions'] == 0) %} None {% else %} - Primary: {{i['primary_positions']}}
    - Secondary: {{i['secondary_positions']}} + Primary: {{i['active_primary_positions']}} active, {{i['pending_primary_positions']}} pending
    + Secondary: {{i['active_secondary_positions']}} active, {{i['pending_secondary_positions']}} pending {% endif %}     		-
    - - -
    +
    +
    + + + +
    +
    		- {% if not i[4] %} - - {% else %} - - {% endif %} +
    + + +
    		- +
    + +
    		-
    +
    -
    From 7d4e1d5ec509f72db515d4cfe5a022dd9887c527 Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Mon, 13 Jul 2026 16:01:21 +0000 Subject: [PATCH 136/163] fixed all formatting ready for pr --- app/controllers/main_routes/main_routes.py | 11 +- app/static/css/departmentPortal.css | 60 ++++++++ app/templates/main/departmentPortal.html | 165 ++++++++------------- 3 files changed, 128 insertions(+), 108 deletions(-) create mode 100644 app/static/css/departmentPortal.css diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index f4a18c09f..87c49a83b 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -77,10 +77,10 @@ def departmentPortal(org=None,account=None): staff = Tracy().getSupervisors() supervisors = [] - print(dept, '*********************************************************Denys') + try: allocation = Allocation.select(Allocation, Term).join(Term).where(Allocation.department == dept, Allocation.termCode == 202500).get() - print(allocation,g.openTerm.termCode, '*********************************************************Scott') + except DoesNotExist: allocation = None term = 202500 @@ -89,12 +89,9 @@ def departmentPortal(org=None,account=None): if i.ORG == org: supervisors.append(i.FIRST_NAME + " " + i.LAST_NAME + " (" + i.EMAIL + ")") totalPositions = Allocation.select(Allocation.primary_10 + Allocation.primary_12 + Allocation.primary_15 + Allocation.primary_20 + Allocation.secondary_5 + Allocation.secondary_10).where(Allocation.department == dept, Allocation.termCode == 202500).scalar() - usedAllocation = len([hours for hours in LaborStatusForm.select(LaborStatusForm.weeklyHours).where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.studentConfirmation.is_null(True))]) + usedAllocation = len([hours for hours in LaborStatusForm.select(LaborStatusForm.weeklyHours).where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.studentConfirmation.is_null(True), LaborStatusForm.contractHours.is_null(True))]) student_hours = {} - for form in LaborStatusForm.select().where( - LaborStatusForm.department == dept, - LaborStatusForm.termCode_id == 202500, - LaborStatusForm.contractHours.is_null(True) + for form in LaborStatusForm.select().where(LaborStatusForm.department == dept,LaborStatusForm.termCode_id == 202500,LaborStatusForm.contractHours.is_null(True) ): sid = form.studentSupervisee_id student_hours.setdefault(sid, []).append({ diff --git a/app/static/css/departmentPortal.css b/app/static/css/departmentPortal.css new file mode 100644 index 000000000..7c0c5ae00 --- /dev/null +++ b/app/static/css/departmentPortal.css @@ -0,0 +1,60 @@ +.card { + border-radius: 1rem; + overflow: hidden; + width: 100%; + height: 100%; + min-width: 100%; + box-shadow: 2px 2px 4px rgba(100, 100, 100, 0.26); +} +.bi-suitcase-lg-fill { /* Bootstrap Icon */ + border: 1px solid #c0c0c0; + border-radius: 8px; + padding: 3px 3.5px 1.5px 3.5px; + font-size: 3rem; + color:#6e6e6e; +} +.bi-clock { + border: 1px solid #c0c0c0; + border-radius: 8px; + padding: 3px 3.5px 1.5px 3.5px; + font-size: 3rem; + color:#6e6e6e; +} +.header-container { + display: flex; + justify-content: space-between; + align-items: center; + padding-left: 10px; + padding-right: 10px; +} +.allocation-list { + display: flex; + justify-content: space-between; + align-items: center; + padding-left: 10px; + padding-right: 10px; +} +.primary-chart { + font-size: 1.2em; + padding-left: 75px; +} +.secondary-chart { + font-size: 1.2em; + padding-right: 75px; +} +.card-group { + gap: 1rem; +} +.form-group { + width: 50%; + margin-left: auto ; + margin-right:auto; +} +.card-body { + padding: 1rem 1rem; + min-width: 100% +} +.row { + display: flex; + flex-wrap: wrap; +} \ No newline at end of file diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index c1e7cb003..1500621d3 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -3,8 +3,9 @@ {% block scripts %} {{super()}} - {% endblock %} + {% block app_content %}

    {% if department %} {{department.DEPT_NAME}} Portal {% else %} Choose a Department: {% endif %}

    @@ -26,112 +27,74 @@

    {% if department %} {{department.DEPT_NAME}} Portal {% e {% if department %} -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -

    AY 2025-2026

    15/{{total_allocation or 0}} Positions

    -
    -
    -
      -
    • 10 Hour - {{used_10}}/{{allocation.primary_10}}
      • -
    • 12 Hour - {{used_12}}/{{allocation.primary_12}}
      • -
    • 15 Hour - {{used_15}}/{{allocation.primary_15}}
      • -
    • 20 Hour - {{used_20}}/{{allocation.primary_20}}
      • -
    -
      -
    • 5 Hour - {{used_5_sec}}/{{allocation.secondary_5}}
      • -
    • 10 Hour - {{used_10_sec}}/{{allocation.secondary_10}}
      • -
    -
    -
    -
    -

    Break Hours

    {{break_hours}}/{{allocation.breakHours or 0}} Hours

    +
    +
    +
    +
    +
    +
    + +
    +
    +

    Allocations

    +
    +
    +

    AY 2025-2026

    {{used_allocation}}/{{total_allocation or 0}} Positions

    +
    +
    +
      +
    • 10 Hour - {{used_10}}/{{allocation.primary_10}}
      • +
    • 12 Hour - {{used_12}}/{{allocation.primary_12}}
      • +
    • 15 Hour - {{used_15}}/{{allocation.primary_15}}
      • +
    • 20 Hour - {{used_20}}/{{allocation.primary_20}}
      • +
    +
      +
    • 5 Hour - {{used_5_sec}}/{{allocation.secondary_5}}
      • +
    • 10 Hour - {{used_10_sec}}/{{allocation.secondary_10}}
      • +
    +
    +
    +

    Break Hours

    {{break_hours}}/{{allocation.breakHours or 0}} Hours

    +
    +
    +
    +
    + View Alloations +
    +
    -
    -
    - - Manage Allocations - - - Request Allocation - -
    -
    +
    +
    -
    -
    -
    -
    - -
    +

    Members

    +
    + View All Members +
    +
    -
    -

    - Members -

    -
    -

    Labor Coordinator(s)

    -

    Dr. Jones

    - -

    Supervisors

    - {% for s in supervisors %} - {% if 3 > loop.index0 %} -

    {{ s }}

    - {% elif 4 > loop.index0 %} -

    and {{ supervisors | length}} more...

    - {% endif %} - {% endfor %} -
    - -
    - View Details - - -
    - - -
    -
    -
    -
    - -
    -
    -

    Positions

    -
    - +
    +
    +
    +
    +
    + +
    +
    +

    Positions

    +
    +
    +
    +
    + View All Positions +
    +
    -
      - {% for p in positions %} - {% if 7 > loop.index0 %} -
    • {{ p }}
      • - {% elif 8 == loop.index0 %} -

    and {{ positions | length}} more...

    - {% endif %} - {% endfor %} - -
    -
    - View Details -
    -
    {% endif %} From ef1d4b077fa9b09156e2ab383d936b692cc327c4 Mon Sep 17 00:00:00 2001 From: John Lolonga Date: Mon, 13 Jul 2026 13:28:18 -0400 Subject: [PATCH 137/163] fixed conditional indexing --- app/templates/main/departmentPortal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 66f8f6bc8..ef5b2d09e 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -77,7 +77,7 @@

    Positions

    {% endif %} - {% elif 8 == loop.index0 %} + {% elif 7 == loop.index0 %}

    and {{ (positions | length) - 7}} more...

    {% endif %} {% endfor %} From 9133d1c7d5fa35a899b92200aa2d0c2cdbbbdae2 Mon Sep 17 00:00:00 2001 From: Julius Fritz Date: Mon, 13 Jul 2026 13:41:08 -0400 Subject: [PATCH 138/163] fixed the phrasing of no active positions for dept. conditional for link changed along side it --- app/controllers/main_routes/main_routes.py | 2 +- app/templates/main/departmentPortal.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index e3075be2e..ec32d4fc7 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -69,7 +69,7 @@ def departmentPortal(org=None,account=None): positionsList = [] posUrl = [] if not positions: - positionsList = ["No Positions for this Department"] + positionsList = ["No active positions in this department"] else: for i in positions: positionsList.append(i.positionTitle + ": " + "(WLS " + str(i.wls) + ")") diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index ef5b2d09e..173adb3d2 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -67,7 +67,7 @@

    Positions

      {% for p in positions %} {% if 7 > loop.index0 %} - {% if p == "No Positions for this Department" %} + {% if p == "No active positions in this department" %}

    • {{ p }}

      • From 452eebf017cdb1081c6a7b920c67f5868597c5c1 Mon Sep 17 00:00:00 2001 From: Dayton Conwell Date: Mon, 13 Jul 2026 18:52:02 +0000 Subject: [PATCH 139/163] remvoed print statement --- app/controllers/main_routes/main_routes.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 8f4de2288..d0295e756 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -88,7 +88,6 @@ def departmentPortal(org=None,account=None): for sid, jobs in student_hours.items(): primary = sum(j["weeklyHours"] for j in jobs if j["jobType"] == "Primary") secondary = sum(j["weeklyHours"] for j in jobs if j["jobType"] == "Secondary") - print(sid, "Primary:", primary, "Secondary:", secondary) def count_workers(job_type, hours_bucket): return LaborStatusForm.select().where(LaborStatusForm.department == dept, LaborStatusForm.termCode == 202500, LaborStatusForm.jobType == job_type, LaborStatusForm.weeklyHours == hours_bucket,LaborStatusForm.studentConfirmation.is_null(True), LaborStatusForm.contractHours.is_null(True)).count() From c1f2c76eca31db1e20e170b07fe971ba3b40315d Mon Sep 17 00:00:00 2001 From: Artem Kurasov Date: Mon, 13 Jul 2026 15:40:01 -0400 Subject: [PATCH 140/163] Fixed the Remove Button (partially) and the Ban button, but Broke the Add Search Bar. --- .../main_routes/departmentPortal.py | 57 +++++++- app/controllers/main_routes/main_routes.py | 20 --- app/static/js/addSupervisorsToDepartment.js | 31 ---- app/static/js/manageMembers.js | 136 +++++++++++++----- app/templates/main/manageMembers.html | 44 ++++-- 5 files changed, 177 insertions(+), 111 deletions(-) diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index 36d123187..570ea4a63 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -29,6 +29,7 @@ def manageStaff(org=None,account=None): try: dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) + session['current_department_id'] = dept.departmentID session['current_department'] = dept.DEPT_NAME except (NameError, DoesNotExist): dept = None @@ -118,7 +119,8 @@ def manageStaff(org=None,account=None): return render_template('main/manageMembers.html', members = members, department = dept) - + + def supervisorsDbToDict(supervisor): """ Given a supervisor object it will return a mapped Dict with supervisor data. @@ -131,6 +133,7 @@ def supervisorsDbToDict(supervisor): 'type': 'Supervisor'} return dbToDict + # search student table and STUDATA for student results @main_bp.route('/members/search/', methods=['GET']) def add_member(query=None): @@ -149,10 +152,11 @@ def add_member(query=None): if re.match(r'[Bb]\d+', query): recorded_supervisors = list(map(supervisorsDbToDict, Supervisor.select().where(Supervisor.ID % "{}%".format(query.upper())).where(Supervisor.DEPT_NAME != current_department))) current_supervisors = [ - s for s in map(supervisorsDbToDict, Tracy().getSupervisorsFromUserInput(query)) + s for s in map(supervisorsDbToDict, Tracy(mkk).getSupervisorsFromUserInput(query)) if s.get('department') != current_department ] + # name search else: if " " not in query: @@ -176,6 +180,7 @@ def add_member(query=None): return jsonify(supervisors) + @main_bp.route('/members/coordinator_switch', methods=['POST']) def coordinator_switch(): data = request.get_json() @@ -188,13 +193,51 @@ def coordinator_switch(): return "", 200 + @main_bp.route('/members/ban_switch', methods=['POST']) def ban_switch(): - member_id = request.form.get("member-id") - member = Supervisor.get(Supervisor.ID == member_id) - print("BEFORE:", member.ID, member.isBanned) + data = request.get_json() + supervisor_id = data.get("supervisorID") + + member = Supervisor.get(Supervisor.ID == supervisor_id) + member.isBanned = not member.isBanned member.save() - print("AFTER:", member.ID, member.isBanned) - return redirect(request.referrer) \ No newline at end of file + return "", 200 + + +@main_bp.route('/members/remove', methods=['DELETE']) +def remove_member(): + data = request.get_json() + supervisor_id = data.get("supervisorID") + + member = SupervisorDepartment.get( + (SupervisorDepartment.supervisor == supervisor_id) & + (SupervisorDepartment.department == session['current_department_id']) + ) + member.delete_instance() + + return "", 200 + + + +@main_bp.route('/members/add', methods=['GET', 'POST']) +def addUserToDept(): + userDeptData = request.form + supervisorDeptRecord = SupervisorDepartment.get_or_none(supervisor = userDeptData['supervisorID'], department = userDeptData['departmentID']) + try: + if supervisorDeptRecord: + return "False" + + else: + supervisorID = userDeptData['supervisorID'] + if not Supervisor.get_or_none(Supervisor.ID == supervisorID): + createSupervisorFromTracy(bnumber=supervisorID) + + SupervisorDepartment.create(supervisor=supervisorID, department=userDeptData['departmentID']) + return "True" + + except Exception as e: + print(f'Could not add user to department: {e}') + return "", 500 \ No newline at end of file diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 1cddc7477..3f9b7a314 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -100,26 +100,6 @@ def managePositions(org, account): positions = positions ) -@main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) -def addUserToDept(): - userDeptData = request.form - supervisorDeptRecord = SupervisorDepartment.get_or_none(supervisor = userDeptData['supervisorID'], department = userDeptData['departmentID']) - try: - if supervisorDeptRecord: - return "False" - - else: - supervisorID = userDeptData['supervisorID'] - if not Supervisor.get_or_none(Supervisor.ID == supervisorID): - createSupervisorFromTracy(bnumber=supervisorID) - - SupervisorDepartment.create(supervisor=supervisorID, department=userDeptData['departmentID']) - return "True" - - except Exception as e: - print(f'Could not add user to department: {e}') - return "", 500 - @main_bp.route('/supervisorPortal/download', methods=['POST']) def downloadSupervisorPortalResults(): ''' diff --git a/app/static/js/addSupervisorsToDepartment.js b/app/static/js/addSupervisorsToDepartment.js index 16c3f1d85..e69de29bb 100644 --- a/app/static/js/addSupervisorsToDepartment.js +++ b/app/static/js/addSupervisorsToDepartment.js @@ -1,31 +0,0 @@ -function addSupervisorToDepartment(supervisorID, departmentID, callback=() => {}) { - return $.ajax({ - method: "POST", - url: `/supervisorPortal/addUserToDept`, - data: {"supervisorID": supervisorID, "departmentID": departmentID}, - success: function(response) { - if (response == "True") { - msgFlash("Supervisor has been added to department.", "success") - clearDropdowns() - } else { - msgFlash("Supervisor is already a member of this department.", "warning") - clearDropdowns() - } - if (callback){ - callback() - } - }, - error: function() { - msgFlash("Failed to add supervisor, please try again.", "fail") - clearDropdowns() - }, - }) - -} - -function clearDropdowns(){ - $('select.selectpicker').each(function() { - $(`#${this.id} option:eq(0)`).prop("selected", true); - $(`#${this.id}`).selectpicker("refresh"); - }); -}; \ No newline at end of file diff --git a/app/static/js/manageMembers.js b/app/static/js/manageMembers.js index 863c272d3..18055e1a1 100644 --- a/app/static/js/manageMembers.js +++ b/app/static/js/manageMembers.js @@ -19,43 +19,6 @@ $(document).ready(function() { //dom: '<"top"l>rt<"bottom"p><"clear">' }); - $(document).on("click", ".member-status-btn", function() { - let memberName = $(this).data("member-name"); - let memberStatus = $(this).val(); - let category; - - $(this).closest("form").submit(); - - //$(this).closest("form").submit(); - - if (memberStatus === "Banned") { - category = "danger"; - } else { - category = "success"; - } - - let quote = String.fromCharCode(39); - - $("#flash_container").html("
      The status for " + memberName + " has been set to " + quote + memberStatus + quote + ".
      "); - $("#flasher").delay(3000).fadeOut(); - - if (memberStatus === "Banned") { - $(this).removeClass("btn-danger").addClass("btn-success"); - $(this).text("Unban"); - $(this).val("Unbanned"); - } else { - $(this).removeClass("btn-success").addClass("btn-danger"); - $(this).html("  Ban  "); - $(this).val("Banned"); - } - }); - - $(document).on("click", ".remove-member", function() { - let memberName = $(this).data("member-name"); - $("#flash_container").html("
      " + memberName + " has been removed from the department.
      "); - $("#flasher").delay(3000).fadeOut(); - }); - $(document).on("click", ".assign-coordinator", function() { let memberName = $(this).data("member-name"); @@ -82,6 +45,71 @@ $(document).ready(function() { }); + + $(document).on("click", ".member-status-btn", function() { + + let button = $(this); + let ban_badge = $(this).closest("tr").find(".isbanned-badge"); + + let memberName = button.data("member-name"); + let supervisorID = button.data("supervisor"); + + let banStatus = button.val(); + let isBanned = banStatus === "Banned" ? true : false; + + let quote = String.fromCharCode(39); + + let category; + + $.ajax({ + url: "/members/ban_switch", + data: JSON.stringify({supervisorID: supervisorID, isBanned: isBanned}), + type: "POST", + contentType: "application/json", + success: function() { + if (!isBanned) { + category = "danger"; + button.removeClass("btn-danger").addClass("btn-success"); + button.text("Unban"); + button.val("Banned"); + ban_badge.css("visibility", "visible"); + } else { + category = "success"; + button.removeClass("btn-success").addClass("btn-danger"); + button.html("  Ban  "); + button.val("Unbanned"); + ban_badge.css("visibility", "hidden"); + } + + $("#flash_container").html("
      The status for " + memberName + " has been set to " + quote + banStatus + quote + ".
      "); + $("#flasher").delay(3000).fadeOut(); + + }, + error: function() {console.log("An error has occured.");} + }) + }); + + $(document).on("click", ".remove-member", function() { + + let redButton = $(this); + let row = $(this).closest("tr"); + + let memberName = redButton.data("member-name"); + let supervisorID = redButton.data("supervisor"); + + $.ajax({ + url: "/members/remove", + data: JSON.stringify({supervisorID: supervisorID}), + type: "DELETE", + contentType: "application/json", + success: function() { + $("#flash_container").html("
      " + memberName + " has been removed from the department.
      "); + $("#flasher").delay(3000).fadeOut(); + row.remove(); + }, + error: function() {console.log("An error has occured.");} + }) + }); }) // Creates a dom fragment from html, rather than having to add dom elements @@ -160,4 +188,36 @@ function sendQuery(search_str) { } }); } -} \ No newline at end of file +} + +function addSupervisorToDepartment(supervisorID, departmentID, callback=() => {}) { + return $.ajax({ + method: "POST", + url: `/members/add`, + data: {"supervisorID": supervisorID, "departmentID": departmentID}, + success: function(response) { + if (response == "True") { + msgFlash("Supervisor has been added to department.", "success") + clearDropdowns(); + } else { + msgFlash("Supervisor is already a member of this department.", "warning") + clearDropdowns(); + } + if (callback){ + callback(); + } + }, + error: function() { + msgFlash("Failed to add supervisor, please try again.", "fail") + clearDropdowns(); + }, + }) + +} + +function clearDropdowns(){ + $('select.selectpicker').each(function() { + $(`#${this.id} option:eq(0)`).prop("selected", true); + $(`#${this.id}`).selectpicker("refresh"); + }); +}; \ No newline at end of file diff --git a/app/templates/main/manageMembers.html b/app/templates/main/manageMembers.html index a54dcfa76..8d9758fee 100644 --- a/app/templates/main/manageMembers.html +++ b/app/templates/main/manageMembers.html @@ -58,10 +58,7 @@

      Academic Year: 2026-2027

      ✉
      - - {% if i[4] %} - Banned - {% endif %} +

    		@@ -87,20 +84,37 @@

    Academic Year: 2026-2027

    {% if currentUser.isLaborAdmin or currentUser.isLaborDepartmentStudent %}     		-
    - - + + {% if not i['isBanned'] %} + + {% else %} + + {% endif %}
    		+
    - +
    - - - - - - - {% if currentUser.isLaborAdmin or currentUser.isLaborDepartmentStudent %} - - - {% endif %} - - - - - {% for i in members %} - - - - - - - - {% if currentUser.isLaborAdmin or currentUser.isLaborDepartmentStudent %} - - - {% endif %} - - - {% endfor %} - -
    NameSuperviseesAssign CoordinatorChange StatusRemove Member
    - {{ i['legal_name'] + " " + i['LAST_NAME']}} - ✉ - -
    - -     		- {% if (i['active_primary_positions'] == 0 and i['active_secondary_positions'] == 0) and (i['pending_primary_positions'] == 0 and i['pending_secondary_positions'] == 0) %} - None - {% else %} - Primary: {{i['active_primary_positions']}} active, {{i['pending_primary_positions']}} pending
    - Secondary: {{i['active_secondary_positions']}} active, {{i['pending_secondary_positions']}} pending - {% endif %} -     		-
    -
    - - -
    -
    -     		-
    - {% if not i['isBanned'] %} - - {% else %} - - {% endif %} -
    -     		-
    - -
    -
    -
    - -{% endblock %} \ No newline at end of file diff --git a/app/templates/main/managepositions.html b/app/templates/main/managepositions.html deleted file mode 100644 index f61558a37..000000000 --- a/app/templates/main/managepositions.html +++ /dev/null @@ -1,90 +0,0 @@ -{% extends "base.html" %} - -{% block styles %} -{{super()}} - -{% endblock %} - -{% block scripts %} -{{super()}} - -{% endblock %} - -{% block app_content %} -
    -

    {{ department_name }}

    -
    - -
    - -
    -
    - - -
    -

    Manage Positions

    -
    - -
    -
    - -
    - - - - - - - - - - - - - - - {% for position in positions %} - - - - - - - - - {% endfor %} - -
    Position (WSL)Position CodeStatusLast Revision DateView Position DescriptionEdit Position Description
    {{position.POSN_TITLE}} ({{position.WLS}}){{position.POSN_CODE}} -

    - Active -

    -     		01/01/2024 - - - -
    -
    -

    - Total Positions: - {{ positions|length }} -

    -
    - -{% endblock %} diff --git a/app/templates/main/supervisorPortal.html b/app/templates/main/supervisorPortal.html index 3ab521a54..78383566c 100644 --- a/app/templates/main/supervisorPortal.html +++ b/app/templates/main/supervisorPortal.html @@ -227,7 +227,7 @@

    Form Search


    -
    +
    {% if department %} {{department.DEPT_NAME}} Portal {% e
    - {% if department %}
    @@ -41,81 +40,13 @@

    {% if department %} {{department.DEPT_NAME}} Portal {% e

    -
    -
    -
    -
    - - - -
    - -
    -

    - Members -

    -
    -
    -

    {% if laborCoordinators|length <= 1 %} Labor Coordinator {% else %} Labor Coordinators{% endif %}

    - {% if laborCoordinators %} - {% for coordinator in laborCoordinators %} -

    - {{ coordinator.name }} - - {% if coordinator.email %} - - - - {% endif %} -

    - {% endfor %} - {% else %} -

    None assigned. Add one?

    - - - {% endif %} - - -

    {% if supervisors|length <= 1 %} Supervisor{% else %} Supervisors{% endif %}

    - - {% if supervisors %} - {% for s in supervisors[:3] %} -

    - {{ s.name }} +

    - {% if s.email %} - - - - - {% endif %} -

    - {% endfor %} - - {% if supervisors|length > 3 %} -

    and {{ supervisors|length - 3 }} more...

    - {% endif %} - - {% elif not laborCoordinators and currentUser.isLaborAdmin %} -

    No active supervisors assigned. Add one?

    - {% else %} -

    No active supervisors assigned.

    - {% endif %} - -
    - -
    - View Members - - -
    -
    +

    Insert Members Card Here

    +
    + View All Members +
    +
    @@ -134,7 +65,8 @@

    Positions

      - {% for p in positions[:7] %} + {% for p in positions %} + {% if 7 > loop.index0 %} {% if p == "No active positions in this department" %}

    • {{ p }}

      @@ -144,10 +76,12 @@

      Positions

      {{ p }}
      • {% endif %} - {% endfor %} - {% if positions| length >7 %} + + {% elif 7 == loop.index0 %}

    and {{ (positions | length) - 7}} more...

    {% endif %} + {% endfor %} +
    From 3e5a529c031e6141fa95b3fa614f4763a92f76d5 Mon Sep 17 00:00:00 2001 From: zawn Date: Mon, 20 Jul 2026 14:12:35 -0400 Subject: [PATCH 155/163] Revert position card PR #639 --- app/config/contributors.yaml | 3 - app/controllers/main_routes/main_routes.py | 19 +---- app/models/positionHistory.py | 1 - app/static/css/base.css | 27 ------- app/static/css/contributors.css | 1 + app/static/css/departmentPortal.css | 31 -------- app/templates/base.html | 20 ++--- app/templates/main/contributors.html | 6 +- app/templates/main/departmentPortal.html | 69 ---------------- database/demo_data.py | 91 +++------------------- setup.sh | 10 --- 11 files changed, 22 insertions(+), 256 deletions(-) delete mode 100644 app/static/css/departmentPortal.css diff --git a/app/config/contributors.yaml b/app/config/contributors.yaml index 2a47673ca..d26cdd366 100755 --- a/app/config/contributors.yaml +++ b/app/config/contributors.yaml @@ -59,7 +59,4 @@ contributors: - name: "Oluwagbayi Makinde" username: "makindeo" year: 2024 - - name: "Bhushan Sah " - username: "sahb" - year: 2029 \ No newline at end of file diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index ec32d4fc7..0a2f21e4b 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -16,8 +16,6 @@ from app.login_manager import require_login, logout from app.logic.getTableData import getDatatableData from app.logic.banner import Banner -from app.models.positionHistory import PositionHistory - @main_bp.route('/logout', methods=['GET']) def triggerLogout(): @@ -59,28 +57,15 @@ def departmentPortal(org=None,account=None): dept = None + if g.currentUser.isLaborAdmin: departments = list(Department.select().order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) else: departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) - - positions = list(PositionHistory.select().where(PositionHistory.department == dept, PositionHistory.status == "Active").order_by(PositionHistory.positionTitle.asc())) if dept else [] - positionsList = [] - posUrl = [] - if not positions: - positionsList = ["No active positions in this department"] - else: - for i in positions: - positionsList.append(i.positionTitle + ": " + "(WLS " + str(i.wls) + ")") - posUrl.append(str(i.positionCode)) - - return render_template('main/departmentPortal.html', departments = departments, - department = dept, - positions = positionsList, - posUrl = posUrl) + department = dept) @main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) def addUserToDept(): diff --git a/app/models/positionHistory.py b/app/models/positionHistory.py index 9a248aacb..514670759 100644 --- a/app/models/positionHistory.py +++ b/app/models/positionHistory.py @@ -2,7 +2,6 @@ from app.models.department import Department class PositionHistory(baseModel): - positionTitle = CharField() positionCode = CharField() department = ForeignKeyField(Department) status = CharField() diff --git a/app/static/css/base.css b/app/static/css/base.css index 812d3c89b..940f8d6e5 100755 --- a/app/static/css/base.css +++ b/app/static/css/base.css @@ -250,7 +250,6 @@ a { padding: 0.5rem 1rem; background-color: rgba(0, 0, 0, 0.03); border-top: 1px solid rgba(0, 0, 0, 0.125); - margin-top: auto; } .card-footer:last-child { @@ -265,29 +264,3 @@ a { border-top-left-radius: calc(0.25rem - 1px); border-top-right-radius: calc(0.25rem - 1px); } -.site-footer { - position: fixed; - left: 280px; - right: 0; - bottom: 0; - - background-color: #e9ebec; - color: #1e2433; - - padding: 8px 15px; - line-height: 1.4; - box-sizing: border-box; - z-index: 101; - -} - -.sidebar-push { - padding-bottom: 85px; -} - -@media (max-width: 991px) { - .site-footer { - left: 0; - width: 100%; - } -} diff --git a/app/static/css/contributors.css b/app/static/css/contributors.css index 2f54c122e..0fe0601b0 100755 --- a/app/static/css/contributors.css +++ b/app/static/css/contributors.css @@ -3,6 +3,7 @@ color: #ffffff; padding: 7px 30px; margin-top: 100px; + margin-right: 250px; } .container { top: -75px; diff --git a/app/static/css/departmentPortal.css b/app/static/css/departmentPortal.css deleted file mode 100644 index b563c5054..000000000 --- a/app/static/css/departmentPortal.css +++ /dev/null @@ -1,31 +0,0 @@ -.card { - border-radius: 1rem; - overflow: hidden; - width: 100%; - height: 100%; - min-width: 100%; - box-shadow: 2px 2px 4px rgba(100, 100, 100, 0.26); -} -.bi-suitcase-lg-fill { /* Bootstrap Icon */ - border: 1px solid #c0c0c0; - border-radius: 8px; - padding: 3px 3.5px 1.5px 3.5px; - font-size: 3rem; - color:#6e6e6e; -} -.card-group { - gap: 1rem; -} -.form-group { - width: 50%; - margin-left: auto ; - margin-right:auto; -} -.card-body { - padding: 1rem 1rem; - min-width: 100% -} -.row { - display: flex; - flex-wrap: wrap; -} \ No newline at end of file diff --git a/app/templates/base.html b/app/templates/base.html index 4b9825368..4d6c2a79f 100755 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -66,20 +66,10 @@
    {% block footer %} - +
    + Issues? Contact: Systems Support + Created & Designed by the Student Software Development Team +
    {% endblock %} + {% endblock %} diff --git a/app/templates/main/contributors.html b/app/templates/main/contributors.html index af33209dc..ffdfe4391 100755 --- a/app/templates/main/contributors.html +++ b/app/templates/main/contributors.html @@ -23,9 +23,9 @@

    Contributors

    {% endfor %}

    -
    -
    -
    +
    + +
    diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 173adb3d2..8ee01838b 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -3,7 +3,6 @@ {% block scripts %} {{super()}} - {% endblock %} {% block app_content %} @@ -25,72 +24,4 @@

    {% if department %} {{department.DEPT_NAME}} Portal {% e

    - - {% if department %} -
    -
    - -
    -

    Insert Allocations Card Here

    -
    - View Alloations -
    -
    - -
    - -
    -
    - -

    Insert Members Card Here

    -
    - View All Members -
    -
    - -
    - -
    -
    -
    -
    -
    - -
    -
    -

    Positions

    -
    - -
    -
      - {% for p in positions %} - {% if 7 > loop.index0 %} - {% if p == "No active positions in this department" %} -
    • -

      {{ p }}

      -
      • - {% else %} -
    • - {{ p }} -
      • - {% endif %} - - {% elif 7 == loop.index0 %} -

    and {{ (positions | length) - 7}} more...

    - {% endif %} - {% endfor %} - - -
    -
    - View All Positions -
    -
    -
    -
    - -{% endif %} - {% endblock %} diff --git a/database/demo_data.py b/database/demo_data.py index 1311a7487..de6047624 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -750,119 +750,50 @@ # Position History ############################# -positionhistory = [ +positionHistory = [ { - "positionTitle": "Student Programmer", "positionCode": "S61407", "status": "Active", "wls": 1, - "revisionDate": f"2026-07-01", + "revisionDate": f"2025-07-01", "description": "", "department": 1 }, { - "positionTitle": "Research Associate", + "positionCode": "S61408", "status": "Active", "wls": 2, - "revisionDate": f"2026-09-01", + "revisionDate": f"2025-09-01", "description": "", "department": 1 }, { - "positionTitle": "Labor Workers", "positionCode": "S61409", "status": "Active", "wls": 3, - "revisionDate": f"2026-07-01", + "revisionDate": f"2025-07-01", "description": "", "department": 1 }, { - "positionTitle": "Teaching Associate", "positionCode": "S61411", "status": "Active", "wls":3, - "revisionDate" : f"2026-01-01", + "revisionDate" : f"2025-01-01", "description": "", "department" : 1 - }, - { - "positionTitle": "Teaching Associate", + }, + { "positionCode": "S61410", "status": "Inactive", "wls":2, - "revisionDate" : f"2026-01-01", - "description": "", - "department" : 3 - }, - { - "positionTitle": "Teaching Associate", - "positionCode": "S61410", - "status": "Active", - "wls":2, - "revisionDate" : f"2026-03-29", - "description": "", - "department" : 3 - }, - { - "positionTitle": "DUMMY POSITION", - "positionCode": "S12345", - "status": "Active", - "wls":3, - "revisionDate" : f"2026-01-23", - "description": "", - "department" : 1 - }, - { - "positionTitle": "Junior Data Analyst", - "positionCode": "S39568", - "status": "Active", - "wls":4, - "revisionDate" : f"2026-01-31", - "description": "", - "department" : 1 - }, - { - "positionTitle": "Student Manager", - "positionCode": "S74933", - "status": "Active", - "wls":5, - "revisionDate" : f"2026-04-01", - "description": "", - "department" : 1 - }, - { - "positionTitle": "IT Technician", - "positionCode": "S94932", - "status": "Active", - "wls":6, - "revisionDate" : f"2026-05-03", - "description": "", - "department" : 1 - }, - { - "positionTitle": "Human code generator", - "positionCode": "S22222", - "status": "Active", - "wls":1, - "revisionDate" : f"2026-05-03", + "revisionDate" : f"2025-01-01", "description": "", "department" : 1 - }, - { - "positionTitle": "Senior Software Engineer", - "positionCode": "S00000", - "status": "Active", - "wls":6, - "revisionDate" : f"2026-05-03", - "description": "", - "department" : 1 - } - + }, - ] -PositionHistory.insert_many(positionhistory).on_conflict_replace().execute() +PositionHistory.insert_many(positionHistory).on_conflict_replace().execute() print(" * position history added") \ No newline at end of file diff --git a/setup.sh b/setup.sh index c4e43d652..895e43b98 100755 --- a/setup.sh +++ b/setup.sh @@ -39,13 +39,3 @@ export FLASK_APP=app.py # app entry point export APP_ENV=development # default export FLASK_RUN_PORT=8080 # For consistency (python app.py vs flask run) export FLASK_RUN_HOST=0.0.0.0 # To allow external routing to the application - -# Fix symbolic link inside database directory -if ! [ -L "database/app" ]; then - echo "Fixing symlink to app in database directory" - cd database - rm app - ln -s ../app - cd .. -fi - From dad0a4903db54e8e2ccb9c2878145da83d0785e2 Mon Sep 17 00:00:00 2001 From: kurasova Date: Mon, 20 Jul 2026 14:49:24 -0400 Subject: [PATCH 156/163] Reverted the merges --- app/controllers/main_routes/__init__.py | 1 + .../main_routes/departmentPortal.py | 245 +++++++++++++++++- app/controllers/main_routes/main_routes.py | 50 ++-- app/logic/tracy.py | 8 + app/models/supervisor.py | 9 +- app/static/css/managemembers.css | 154 +++++++++++ app/static/css/managepositions.css | 15 ++ app/static/js/addSupervisorsToDepartment.js | 31 --- app/static/js/manageMembers.js | 223 ++++++++++++++++ app/templates/main/departmentPortal.html | 134 ++++++++++ app/templates/main/manageMembers.html | 128 +++++++++ app/templates/main/managepositions.html | 90 +++++++ app/templates/main/supervisorPortal.html | 2 +- database/demo_data.py | 243 ++++++++++++++++- database/reset_database.sh | 4 +- database/reset_database.sh.bak | 67 +++++ db_test.py | 4 +- 17 files changed, 1341 insertions(+), 67 deletions(-) create mode 100644 app/static/css/managemembers.css create mode 100644 app/static/css/managepositions.css create mode 100644 app/static/js/manageMembers.js create mode 100644 app/templates/main/manageMembers.html create mode 100644 app/templates/main/managepositions.html create mode 100644 database/reset_database.sh.bak diff --git a/app/controllers/main_routes/__init__.py b/app/controllers/main_routes/__init__.py index 54b32d3c5..da3323908 100755 --- a/app/controllers/main_routes/__init__.py +++ b/app/controllers/main_routes/__init__.py @@ -14,6 +14,7 @@ def injectGlobalData(): 'lastStaticUpdate': lastStaticUpdate} from app.controllers.main_routes import main_routes +from app.controllers.main_routes import departmentPortal from app.controllers.main_routes import laborStatusForm from app.controllers.main_routes import laborHistory from app.controllers.main_routes import alterLSF diff --git a/app/controllers/main_routes/departmentPortal.py b/app/controllers/main_routes/departmentPortal.py index 351757701..353287e0f 100644 --- a/app/controllers/main_routes/departmentPortal.py +++ b/app/controllers/main_routes/departmentPortal.py @@ -1 +1,244 @@ -from flask import render_template +import re +from datetime import date +from flask import render_template, request, json, redirect, session, url_for, send_file, g, flash, jsonify +from peewee import JOIN, DoesNotExist, fn, Case +from functools import reduce +import operator +from app.logic.tracy import Tracy +from app.logic.userInsertFunctions import createSupervisorFromTracy +from app.models.department import Department +from app.models.supervisor import Supervisor +from app.models.supervisorDepartment import SupervisorDepartment +from app.models.student import Student +from app.models.laborStatusForm import LaborStatusForm +from app.models.formHistory import FormHistory +from app.models.laborReleaseForm import LaborReleaseForm +from app.models.term import Term +from app.controllers.admin_routes.allPendingForms import checkAdjustment +from app.controllers.main_routes import main_bp +from app.logic.download import CSVMaker, saveFormSearchResult, retrieveFormSearchResult +from app.logic.search import getDepartmentsForSupervisor, searchPerson, searchSupervisorPortal +from app.login_manager import require_login, logout +from app.logic.getTableData import getDatatableData +from app.logic.banner import Banner +from flask import abort +from app.logic.search import limitSearchByUserDepartment, studentDbToDict, usernameFromEmail + + + +@main_bp.route('/department///members', methods=['GET']) +def manageStaff(org=None,account=None): + try: + dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) + session['current_department_id'] = dept.departmentID + session['current_department'] = dept.DEPT_NAME + except (NameError, DoesNotExist): + dept = None + abort(404) + + members = list( + SupervisorDepartment. + select( + SupervisorDepartment, + Supervisor + ).where( + SupervisorDepartment.department == dept + ).join( + Supervisor + ).dicts() + ) + + today = date.today() + released_forms = ( + FormHistory + .select(FormHistory.formID) + .join( + LaborReleaseForm, + on=(FormHistory.releaseForm == LaborReleaseForm.laborReleaseFormID) + ) + .where( + (FormHistory.historyType == "Labor Release Form") & + (FormHistory.status == "Approved") & + (LaborReleaseForm.releaseDate <= today) + ) + ) + + # Conditions for the supervisee counts. Expired and released positions do + # not contribute to any of the four totals. + active_primaries = ( + (LaborStatusForm.jobType == 'Primary') & + (LaborStatusForm.studentConfirmation == True) & + (LaborStatusForm.endDate >= today) + ) + pending_primaries = ( + (LaborStatusForm.jobType == 'Primary') & + (LaborStatusForm.studentConfirmation.is_null(True)) & + (LaborStatusForm.endDate >= today) + ) + active_secondaries = ( + (LaborStatusForm.jobType == 'Secondary') & + (LaborStatusForm.studentConfirmation == True) & + (LaborStatusForm.endDate >= today) + ) + pending_secondaries = ( + (LaborStatusForm.jobType == 'Secondary') & + (LaborStatusForm.studentConfirmation.is_null(True)) & + (LaborStatusForm.endDate >= today) + ) + + + student_count = list( + LaborStatusForm. + select( + fn.SUM(Case(None, ((active_primaries, 1),), 0)).alias("active_primary_positions"), + fn.SUM(Case(None, ((pending_primaries, 1),), 0)).alias("pending_primary_positions"), + fn.SUM(Case(None, ((active_secondaries, 1),), 0)).alias("active_secondary_positions"), + fn.SUM(Case(None, ((pending_secondaries, 1),), 0)).alias("pending_secondary_positions"), + LaborStatusForm.department, + LaborStatusForm.supervisor + ).where( + (LaborStatusForm.department == dept) & + (LaborStatusForm.laborStatusFormID.not_in(released_forms)) + ).group_by( + LaborStatusForm.department, + LaborStatusForm.supervisor + ).dicts() + ) + + counts = {(row["department"], row["supervisor"]): row for row in student_count} + + for member in members: + + key = (member["department"], member["supervisor"]) + row = counts.get(key, {}) + + member["active_primary_positions"] = row.get("active_primary_positions", 0) + member["pending_primary_positions"] = row.get("pending_primary_positions", 0) + member["active_secondary_positions"] = row.get("active_secondary_positions", 0) + member["pending_secondary_positions"] = row.get("pending_secondary_positions", 0) + + return render_template('main/manageMembers.html', + members = members, + department = dept) + + +def supervisorsDbToDict(supervisor): + """ + Given a supervisor object it will return a mapped Dict with supervisor data. + """ + dbToDict = {'username': usernameFromEmail(supervisor.EMAIL.strip()), + 'firstName': supervisor.FIRST_NAME.strip(), + 'lastName': supervisor.LAST_NAME.strip(), + 'bnumber': supervisor.ID.strip(), + 'department': supervisor.DEPT_NAME.strip(), + 'type': 'Supervisor'} + return dbToDict + + +# search student table and STUDATA for student results +@main_bp.route('/members/search/', methods=['GET']) +def add_member(query=None): + currentUser = require_login() + accessAllowed = currentUser and (currentUser.supervisor or currentUser.isLaborAdmin) + if not accessAllowed: + return render_template('errors/403.html'), 403 + + recorded_supervisors = [] # supervisors recorded in the database + current_supervisors = [] # supervisors from Tracy + query = query.strip() + + current_department = session.get('current_department') + + # bnumber search + if re.match(r'[Bb]\d+', query): + recorded_supervisors = list(map(supervisorsDbToDict, Supervisor.select().where(Supervisor.ID % "{}%".format(query.upper())).where(Supervisor.DEPT_NAME != current_department))) + current_supervisors = [ + s for s in map(supervisorsDbToDict, Tracy().getSupervisorsFromUserInput(query)) + if s.get('department') != current_department + ] + + + # name search + else: + if " " not in query: + search = query.upper() + "%" + results = Supervisor.select().where(Supervisor.DEPT_NAME != current_department).where(Supervisor.preferred_name ** search | Supervisor.legal_name ** search | Supervisor.LAST_NAME ** search) + else: + search = query.upper().split() + first_query = search[0] + "%" + last_query = search[-1] + "%" + results = Supervisor.select().where(Supervisor.DEPT_NAME != current_department).where((Supervisor.preferred_name ** first_query | Supervisor.legal_name ** first_query) & Supervisor.LAST_NAME ** last_query) + + recorded_supervisors = list(map(supervisorsDbToDict, results)) + current_supervisors = [ + s for s in map(supervisorsDbToDict, Tracy().getSupervisorsFromUserInput(query)) + if s.get('department') != current_department + ] + + # combine lists, remove duplicates, and then sort + supervisors = list({v['bnumber']:v for v in (current_supervisors + recorded_supervisors)}.values()) + supervisors = sorted(supervisors, key=lambda f: f['firstName'] + f['lastName']) + + return jsonify(supervisors) + + +@main_bp.route('/members/coordinator_switch', methods=['POST']) +def coordinator_switch(): + data = request.get_json() + supervisor_id = data.get("supervisorID") + is_coordinator = data.get("isCoordinator") + + member = SupervisorDepartment.get(SupervisorDepartment.supervisor == supervisor_id) + member.isCoordinator = is_coordinator + member.save() + + return "", 200 + + +@main_bp.route('/members/ban_switch', methods=['POST']) +def ban_switch(): + data = request.get_json() + supervisor_id = data.get("supervisorID") + + member = Supervisor.get(Supervisor.ID == supervisor_id) + + member.isBanned = not member.isBanned + member.save() + + return "", 200 + + +@main_bp.route('/members/remove', methods=['DELETE']) +def remove_member(): + data = request.get_json() + supervisor_id = data.get("supervisorID") + + member = SupervisorDepartment.get( + (SupervisorDepartment.supervisor == supervisor_id) & + (SupervisorDepartment.department == session['current_department_id']) + ) + member.delete_instance() + + return "", 200 + + + +@main_bp.route('/members/add', methods=['GET', 'POST']) +def addUserToDept(): + userDeptData = request.form + supervisorDeptRecord = SupervisorDepartment.get_or_none(supervisor = userDeptData['supervisorID'], department = userDeptData['departmentID']) + try: + if supervisorDeptRecord: + return "False" + + else: + supervisorID = userDeptData['supervisorID'] + if not Supervisor.get_or_none(Supervisor.ID == supervisorID): + createSupervisorFromTracy(bnumber=supervisorID) + + SupervisorDepartment.create(supervisor=supervisorID, department=userDeptData['departmentID']) + return "True" + + except Exception as e: + print(f'Could not add user to department: {e}') + return "", 500 \ No newline at end of file diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 0a2f21e4b..d43df38c1 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -16,6 +16,10 @@ from app.login_manager import require_login, logout from app.logic.getTableData import getDatatableData from app.logic.banner import Banner +from app.logic.tracy import Tracy +from app.logic.userInsertFunctions import createSupervisorFromTracy +from app.models.positionHistory import PositionHistory + @main_bp.route('/logout', methods=['GET']) def triggerLogout(): @@ -51,10 +55,14 @@ def supervisorPortal(): @main_bp.route('/department/', methods=['GET']) @main_bp.route('/department//', methods=['GET']) def departmentPortal(org=None,account=None): - try: - dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) - except (NameError, DoesNotExist): + if org and account: + try: + dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) + except (NameError, DoesNotExist): + dept = None + else: dept = None + @@ -65,23 +73,27 @@ def departmentPortal(org=None,account=None): return render_template('main/departmentPortal.html', departments = departments, - department = dept) - -@main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) -def addUserToDept(): - userDeptData = request.form - supervisorDeptRecord = SupervisorDepartment.get_or_none(supervisor = userDeptData['supervisorID'], department = userDeptData['departmentID']) + department = dept, + supervisors = supervisors, + laborCoordinators=laborCoordinators, + currentUser=g.currentUser, + positions = positionsList, + posUrl = posUrl) + +@main_bp.route('/department///positions', methods=['GET']) +def managePositions(org, account): try: - if supervisorDeptRecord: - return "False" - - else: - SupervisorDepartment.create(supervisor=userDeptData['supervisorID'], department=userDeptData['departmentID']) - return "True" - - except Exception as e: - print(f'Could not add user to department: {e}') - return "", 500 + dept = Department.get(Department.ORG == org, Department.ACCOUNT == account) + except DoesNotExist: + return render_template('errors/404.html'), 404 + + positions = Tracy().getPositionsFromDepartment(org, account) + print(positions) + return render_template('main/managepositions.html', + department = dept, + department_name = dept.DEPT_NAME, + positions = positions + ) @main_bp.route('/supervisorPortal/download', methods=['POST']) def downloadSupervisorPortalResults(): diff --git a/app/logic/tracy.py b/app/logic/tracy.py index cd0ecf50a..027cd9fd5 100644 --- a/app/logic/tracy.py +++ b/app/logic/tracy.py @@ -142,6 +142,14 @@ def getStudentsFromBNumberSearch(self, bnum_part: str): students = STUDATA.query.filter(STUDATA.ID.like(bnum_search)).all() return students + def getSupervisorsFromBNumberSearch(self, bnum_part: str): + """ + Return a list of supervisors searching by bnumber + """ + bnum_search = bnum_part.strip().upper() + "%" + supervisors = STUSTAFF.query.filter(STUSTAFF.ID.like(bnum_search)).all() + return supervisors + def checkStudentOrSupervisor(self, username: str): """ Checks if the username belongs to a student or supervisor diff --git a/app/models/supervisor.py b/app/models/supervisor.py index e16d43282..3f9d3608e 100644 --- a/app/models/supervisor.py +++ b/app/models/supervisor.py @@ -13,10 +13,11 @@ class Supervisor(baseModel): ORG = CharField(null=True) DEPT_NAME = CharField(null=True) - legal_name = CharField(null=True) - preferred_name = CharField(null=True) - isActive = BooleanField(default=False) - isBanned = BooleanField(default=False) + legal_name = CharField(null=True) + preferred_name = CharField(null=True) + isActive = BooleanField(default=False) + isBanned = BooleanField(default=False) + @property diff --git a/app/static/css/managemembers.css b/app/static/css/managemembers.css new file mode 100644 index 000000000..3384fddc6 --- /dev/null +++ b/app/static/css/managemembers.css @@ -0,0 +1,154 @@ +/*styles for column alignment in the data table*/ +.centered-header { + text-align: center !important; +} + +.centered-cell { + vertical-align: middle !important; +} + +/* The add-member search bar*/ +#add-member { + display: flex; + justify-content: center; + gap: 0px; + height: 20px; + margin-bottom: 30px; +} + + +@media (min-width: 767px) { + #add-member{ + display: flex; + justify-content: flex-end; + gap: 0px; + /*margin-bottom: -20px;*/ + } +} + + +/* The switch container */ +.switch { + position: relative; + display: inline-block; + width: 31.25px; + height: 16.25px; + vertical-align: middle; +} + +/* Hide default HTML checkbox */ +.switch input { + opacity: 0; + width: 0; + height: 0; +} + +/* The slider track */ +.slider { + position: absolute; + cursor: pointer; + top: 0; left: 0; right: 0; bottom: 0; + background-color: #ccc !important; + transition: .4s; +} + +/* The slider knob */ +.slider:before { + position: absolute; + content: ""; + height: 11.25px; + width: 11.25px; + left: 2.5px; + bottom: 2.5px; + background-color: white !important; + transition: .4s; +} + +/* Checked state track color */ +input:checked + .slider { + background-color: #337ab7 !important; /* Bootstrap 3 Primary Color */ +} + +/* Checked state knob movement */ +input:checked + .slider:before { + transform: translateX(15px) !important; +} + +/* Rounded slider track and knob */ +.slider.round { + border-radius: 21.25px; +} +.slider.round:before { + border-radius: 50%; +} + +/* Optional label spacing */ +.switch-label { + margin-left: 6.25px; + vertical-align: middle; + font-weight: bold; +} + +/* hover indicator */ +a.hover-indicator { + text-decoration: none !important; + position: relative; + border-bottom: 1px dotted #000; + color: #000000; +} + +a.hover-indicator:visited, +a.hover-indicator:link, +a.hover-indicator:hover, +a.hover-indicator:active { + color: #000000; +} + +[class*="hover-indicator"]:after { + content: attr(aria-label); + display: none; + position: absolute; + top: 110%; + left: 10px; + z-index: 5000; + pointer-events: none; + padding: 8px 10px; + line-height: 15px; + white-space: nowrap; + text-decoration: none !important; + text-indent: 0; + overflow: visible; + font-size: .9em; + font-weight: normal; + -webkit-border-radius: 2px; + border-radius: 2px; + -webkit-box-shadow: 1px 2px 6px rgba(0,0,0,0.3); + box-shadow: 1px 2px 6px rgba(0,0,0,0.3); + background-color: #FFFFFF; + color: #000000; +} + +[class*="hover-indicator"]:hover:after, [class*="hover_indicator"]:focus:after { + display: block; + color: #000000; +} + +/*a "banned" badge displayed under the name of a banned department member*/ +.isbanned-badge { + position: relative; + display: inline-block; + margin-top: 3px; + padding: 2px 6px; + background: red; + color: white !important; + border-radius: 10px; + font-size: 10px; + font-weight: 700; + letter-spacing: 0.3px; + line-height: 1.2; +} + +/* switches inside the data table */ +.table-switch { + top: 10px; +} \ No newline at end of file diff --git a/app/static/css/managepositions.css b/app/static/css/managepositions.css new file mode 100644 index 000000000..9c40bbe38 --- /dev/null +++ b/app/static/css/managepositions.css @@ -0,0 +1,15 @@ +.width-12{ + width:12%; +} + +*{ + /* outline:solid 1px lime; */ + margin:0; + padding:0; + box-sizing:border-box; +} + +.department-header{ + padding:1%; + margin-top:-20px; +} \ No newline at end of file diff --git a/app/static/js/addSupervisorsToDepartment.js b/app/static/js/addSupervisorsToDepartment.js index 16c3f1d85..e69de29bb 100644 --- a/app/static/js/addSupervisorsToDepartment.js +++ b/app/static/js/addSupervisorsToDepartment.js @@ -1,31 +0,0 @@ -function addSupervisorToDepartment(supervisorID, departmentID, callback=() => {}) { - return $.ajax({ - method: "POST", - url: `/supervisorPortal/addUserToDept`, - data: {"supervisorID": supervisorID, "departmentID": departmentID}, - success: function(response) { - if (response == "True") { - msgFlash("Supervisor has been added to department.", "success") - clearDropdowns() - } else { - msgFlash("Supervisor is already a member of this department.", "warning") - clearDropdowns() - } - if (callback){ - callback() - } - }, - error: function() { - msgFlash("Failed to add supervisor, please try again.", "fail") - clearDropdowns() - }, - }) - -} - -function clearDropdowns(){ - $('select.selectpicker').each(function() { - $(`#${this.id} option:eq(0)`).prop("selected", true); - $(`#${this.id}`).selectpicker("refresh"); - }); -}; \ No newline at end of file diff --git a/app/static/js/manageMembers.js b/app/static/js/manageMembers.js new file mode 100644 index 000000000..18055e1a1 --- /dev/null +++ b/app/static/js/manageMembers.js @@ -0,0 +1,223 @@ +$(document).ready(function() { + + $('#searchBoxContainer').children('.dropdown, .bootstrap-select, .form-control').addClass('open') + $('[type="search"], .form-control').focus(); + + $('#manageMembers').DataTable({ + 'columnDefs': [{ + 'targets': '.no-sorting', + 'orderable': false + }], // hide sort icon on header of first column + 'aaSorting': [ + [0, 'asc'] + ], // start to sort data in second column + searching: false, + pageLength: 10, + language: { + lengthMenu: " _MENU_ entries per page" + }, + //dom: '<"top"l>rt<"bottom"p><"clear">' + }); + + $(document).on("click", ".assign-coordinator", function() { + + let memberName = $(this).data("member-name"); + let supervisorID = $(this).data("supervisor"); + let isChecked = $(this).is(":checked"); + + $.ajax({ + url: "/members/coordinator_switch", + data: JSON.stringify({supervisorID: supervisorID, isCoordinator: isChecked}), + type: "POST", + contentType: "application/json", + success: function() { + if (isChecked) { + $("#flash_container").html("
    " + memberName + " has been assigned as a coordinator.
    "); + $("#flasher").delay(3000).fadeOut(); + } else { + $("#flash_container").html("
    " + memberName + " is no longer a coordinator.
    "); + $("#flasher").delay(3000).fadeOut(); + } + + }, + error: function() {console.log("An error has occured.");} + }) + + + }); + + $(document).on("click", ".member-status-btn", function() { + + let button = $(this); + let ban_badge = $(this).closest("tr").find(".isbanned-badge"); + + let memberName = button.data("member-name"); + let supervisorID = button.data("supervisor"); + + let banStatus = button.val(); + let isBanned = banStatus === "Banned" ? true : false; + + let quote = String.fromCharCode(39); + + let category; + + $.ajax({ + url: "/members/ban_switch", + data: JSON.stringify({supervisorID: supervisorID, isBanned: isBanned}), + type: "POST", + contentType: "application/json", + success: function() { + if (!isBanned) { + category = "danger"; + button.removeClass("btn-danger").addClass("btn-success"); + button.text("Unban"); + button.val("Banned"); + ban_badge.css("visibility", "visible"); + } else { + category = "success"; + button.removeClass("btn-success").addClass("btn-danger"); + button.html("  Ban  "); + button.val("Unbanned"); + ban_badge.css("visibility", "hidden"); + } + + $("#flash_container").html("
    The status for " + memberName + " has been set to " + quote + banStatus + quote + ".
    "); + $("#flasher").delay(3000).fadeOut(); + + }, + error: function() {console.log("An error has occured.");} + }) + }); + + $(document).on("click", ".remove-member", function() { + + let redButton = $(this); + let row = $(this).closest("tr"); + + let memberName = redButton.data("member-name"); + let supervisorID = redButton.data("supervisor"); + + $.ajax({ + url: "/members/remove", + data: JSON.stringify({supervisorID: supervisorID}), + type: "DELETE", + contentType: "application/json", + success: function() { + $("#flash_container").html("
    " + memberName + " has been removed from the department.
    "); + $("#flasher").delay(3000).fadeOut(); + row.remove(); + }, + error: function() {console.log("An error has occured.");} + }) + }); +}) + +// Creates a dom fragment from html, rather than having to add dom elements +// https://love2dev.com/blog/inserting-html-using-createdocumentfragment-instead-of-using-jquery/ +function createFragment(htmlStr) { + let frag = document.createDocumentFragment(), temp = document.createElement('div'); + temp.innerHTML = htmlStr; + while(temp.firstChild) { frag.appendChild(temp.firstChild); } + return frag; +} + +// highlight search string. doesn't actually check for last name and first name, just highlights what we find +$.fn.selectpicker.Constructor.DEFAULTS.whiteList.mark = []; +function highlight(htmlStr, query) { + query = query.trim().split(" "); + for(i = 0; i < query.length; i++) { + htmlStr = htmlStr.replace(new RegExp(query[i], "gi"), function(match) { return `${match}`; }); + } + return htmlStr; +} + +let typeTimer; + +$('#search').selectpicker('refresh'); +$('.dropdown-menu .bs-searchbox input').on('keyup', function (e) { + // ignore arrow keys + if (e.keyCode == '40' || e.keyCode == '38') return; + + // wait a little longer for bnumber typing + keyInterval = 200 + if (e.keyCode >= 48 && e.keyCode <= 57) { + keyInterval = 500 + } + + // don't search for every key (especially relevant for bnumber) + clearTimeout(typeTimer) + typeTimer = setTimeout(function() { sendQuery(e.target.value); }, keyInterval) +}); + +$('#search').on('changed.bs.select', function () { + let supervisorID = $(this).val(); + let departmentID = $(this).data('department-id'); + + if (!supervisorID || !departmentID) return; + + addSupervisorToDepartment(supervisorID, departmentID, function() { + window.location.reload(); + }); +}); + +// We load the options returned into an html string and then add them to the selectpicker at the end, to save A LOT of time. +function sendQuery(search_str) { + $("#search").empty(); + $('#search').selectpicker("refresh"); + if (search_str.length >= 3) { + $.ajax({ + type: "GET", + url: "/members/search/" + encodeURIComponent(search_str), + contentType: 'application/json', + success: function(response) { + let optionString = "" + for (let key = 0; key < response.length; key++) { + let username = response[key]['username']; + let bnumber = response[key]['bnumber']; + let firstName = response[key]['firstName']; + let lastName = response[key]['lastName']; + let type = response[key]['type']; + if (type == "Supervisor") { + choice_text = bnumber + ': ' + firstName + ' ' + lastName; + highlighted_text = highlight(choice_text, search_str) + `${username}`; + optionString += ``; + } + } + $("#search").append(createFragment(optionString)) + $('#search').selectpicker("refresh"); + } + }); + } +} + +function addSupervisorToDepartment(supervisorID, departmentID, callback=() => {}) { + return $.ajax({ + method: "POST", + url: `/members/add`, + data: {"supervisorID": supervisorID, "departmentID": departmentID}, + success: function(response) { + if (response == "True") { + msgFlash("Supervisor has been added to department.", "success") + clearDropdowns(); + } else { + msgFlash("Supervisor is already a member of this department.", "warning") + clearDropdowns(); + } + if (callback){ + callback(); + } + }, + error: function() { + msgFlash("Failed to add supervisor, please try again.", "fail") + clearDropdowns(); + }, + }) + +} + +function clearDropdowns(){ + $('select.selectpicker').each(function() { + $(`#${this.id} option:eq(0)`).prop("selected", true); + $(`#${this.id}`).selectpicker("refresh"); + }); +}; \ No newline at end of file diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 8ee01838b..0b9a6134d 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -24,4 +24,138 @@

    {% if department %} {{department.DEPT_NAME}} Portal {% e

    + + + {% if department %} +
    +
    + +
    +

    Insert Allocations Card Here

    +
    + View Alloations +
    +
    + +
    + +
    +
    +
    +
    +
    + + + +
    + +
    +

    + Members +

    +
    +
    +

    {% if laborCoordinators|length <= 1 %} Labor Coordinator {% else %} Labor Coordinators{% endif %}

    + {% if laborCoordinators %} + {% for coordinator in laborCoordinators %} +

    + {{ coordinator.name }} + + {% if coordinator.email %} + + + + {% endif %} +

    + {% endfor %} + {% else %} +

    None assigned. Add one?

    + + + {% endif %} + + +

    {% if supervisors|length <= 1 %} Supervisor{% else %} Supervisors{% endif %}

    + + {% if supervisors %} + {% for s in supervisors[:3] %} +

    + {{ s.name }} + + {% if s.email %} + + + + + {% endif %} +

    + {% endfor %} + + {% if supervisors|length > 3 %} +

    and {{ supervisors|length - 3 }} more...

    + {% endif %} + + {% elif not laborCoordinators and currentUser.isLaborAdmin %} +

    No active supervisors assigned. Add one?

    + {% else %} +

    No active supervisors assigned.

    + {% endif %} + +
    + +
    + View Members + + +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    +
    +

    Positions

    +
    + +
    +
      + {% for p in positions[:7] %} + {% if p == "No active positions in this department" %} +
    • +

      {{ p }}

      +
      • + {% else %} +
    • + {{ p }} +
      • + {% endif %} + {% endfor %} + {% if positions| length >7 %} +

    and {{ (positions | length) - 7}} more...

    + {% endif %} + +
    +
    + View All Positions +
    +
    +
    +
    + +{% endif %} + {% endblock %} diff --git a/app/templates/main/manageMembers.html b/app/templates/main/manageMembers.html new file mode 100644 index 000000000..8d9758fee --- /dev/null +++ b/app/templates/main/manageMembers.html @@ -0,0 +1,128 @@ +{% extends "base.html" %} + +{% block styles %} +{{super()}} + + + {% endblock %} + +{% block scripts %} +{{super()}} + + + +{% endblock %} + +{% block app_content %} +

    {% if department %} Manage {{department.DEPT_NAME}} Members {% else %} Manage Members {% endif %}

    +

    Academic Year: 2026-2027

    + +

    + +
    + Click to Skip +
    +
    + +
    +
    +
    + +
    + + + + + + + + {% if currentUser.isLaborAdmin or currentUser.isLaborDepartmentStudent %} + + + {% endif %} + + + + + {% for i in members %} + + + + + + + + {% if currentUser.isLaborAdmin or currentUser.isLaborDepartmentStudent %} + + + {% endif %} + + + {% endfor %} + +
    NameSuperviseesAssign CoordinatorChange StatusRemove Member
    + {{ i['legal_name'] + " " + i['LAST_NAME']}} + ✉ + +
    + +     		+ {% if (i['active_primary_positions'] == 0 and i['active_secondary_positions'] == 0) and (i['pending_primary_positions'] == 0 and i['pending_secondary_positions'] == 0) %} + None + {% else %} + Primary: {{i['active_primary_positions']}} active, {{i['pending_primary_positions']}} pending
    + Secondary: {{i['active_secondary_positions']}} active, {{i['pending_secondary_positions']}} pending + {% endif %} +     		+
    +
    + + +
    +
    +     		+
    + {% if not i['isBanned'] %} + + {% else %} + + {% endif %} +
    +     		+
    + +
    +
    +
    + +{% endblock %} \ No newline at end of file diff --git a/app/templates/main/managepositions.html b/app/templates/main/managepositions.html new file mode 100644 index 000000000..f61558a37 --- /dev/null +++ b/app/templates/main/managepositions.html @@ -0,0 +1,90 @@ +{% extends "base.html" %} + +{% block styles %} +{{super()}} + +{% endblock %} + +{% block scripts %} +{{super()}} + +{% endblock %} + +{% block app_content %} +
    +

    {{ department_name }}

    +
    + +
    + +
    +
    + + +
    +

    Manage Positions

    +
    + +
    +
    + +
    + + + + + + + + + + + + + + + {% for position in positions %} + + + + + + + + + {% endfor %} + +
    Position (WSL)Position CodeStatusLast Revision DateView Position DescriptionEdit Position Description
    {{position.POSN_TITLE}} ({{position.WLS}}){{position.POSN_CODE}} +

    + Active +

    +     		01/01/2024 + + + +
    +
    +

    + Total Positions: + {{ positions|length }} +

    +
    + +{% endblock %} diff --git a/app/templates/main/supervisorPortal.html b/app/templates/main/supervisorPortal.html index 78383566c..3ab521a54 100644 --- a/app/templates/main/supervisorPortal.html +++ b/app/templates/main/supervisorPortal.html @@ -227,7 +227,7 @@

    Form Search


    -
    +