From 7a915bdf1c3c784ffa8bbd0743b222d0d84ae60a Mon Sep 17 00:00:00 2001 From: Johncox2211 Date: Thu, 22 Jan 2026 21:49:19 +0000 Subject: [PATCH 01/10] implementing overload info in student history modal --- app/templates/snips/studentHistoryModal.html | 54 ++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/app/templates/snips/studentHistoryModal.html b/app/templates/snips/studentHistoryModal.html index 462f11c0..1083c3c2 100755 --- a/app/templates/snips/studentHistoryModal.html +++ b/app/templates/snips/studentHistoryModal.html @@ -81,6 +81,60 @@ {% endif %} + + {% elif form.overloadForm != None %} + {% if form.reviewedDate == None %} +
+
{{form.createdDate.strftime('%m-%d-%Y')}}
+
{{form.historyType}}
+
Submitted
+
+ {% elif form.reviewedDate != None %} +
+
{{form.reviewedDate.strftime('%m-%d-%Y')}}
+
{{form.historyType}}
+
{{form.status}}
+
+ {% if "Denied" in form.status.statusName %} +
+
+

Overload Reason:

+
+ +
+
+
+ {% endif %} +
+
{{form.createdDate.strftime('%m-%d-%Y')}}
+
{{form.historyType}}
+
Submitted
+
+ {% endif %} +
+
+

Labor Office Contact:

+
+

+ {% if form.overloadForm.laborApprover_id %} + {{form.overloadForm.laborApprover.supervisor.FIRST_NAME}} {{form.overloadForm.laborApprover.supervisor.LAST_NAME}} + {% else %} + None + {% endif %} +

+
+
+
+

Reason for release:

+
+ +
+
+
+ + + + {% elif form.releaseForm != None %} {% if form.reviewedDate == None %}
From d7d534b221b5188e50d6f720b36d4f33f79bbff4 Mon Sep 17 00:00:00 2001 From: Johncox2211 Date: Thu, 22 Jan 2026 21:49:43 +0000 Subject: [PATCH 02/10] implementing overload info in student history modal --- app/controllers/main_routes/studentResponse.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/main_routes/studentResponse.py b/app/controllers/main_routes/studentResponse.py index dc436c28..a4c74318 100644 --- a/app/controllers/main_routes/studentResponse.py +++ b/app/controllers/main_routes/studentResponse.py @@ -20,6 +20,7 @@ def confirm(): try: form = forms.get() except DoesNotExist as e: + print("Error occured: ", e) flash("This contract is invalid or has expired.", "danger") abort(404) @@ -62,7 +63,7 @@ def confirmSubmit(): abort(404) form.studentConfirmation = (response == "Accepted") - form.studentResponseDate = datetime.date.today() + form.studentResponseDate = datetime.today() form.save() formHistory = FormHistory.get_or_none(FormHistory.formID == form.laborStatusFormID) From 811e320041f9c7b58b71134c31f4245fd1ccf587 Mon Sep 17 00:00:00 2001 From: Johncox2211 Date: Wed, 28 Jan 2026 21:50:31 +0000 Subject: [PATCH 03/10] added HTML to show overload approval date, fixed some wording need to figure out how to show overload approver name --- app/templates/snips/studentHistoryModal.html | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/templates/snips/studentHistoryModal.html b/app/templates/snips/studentHistoryModal.html index 1083c3c2..cdde5dc3 100755 --- a/app/templates/snips/studentHistoryModal.html +++ b/app/templates/snips/studentHistoryModal.html @@ -98,7 +98,7 @@ {% if "Denied" in form.status.statusName %}
-

Overload Reason:

+

Reject Reason:

@@ -118,6 +118,7 @@

{% if form.overloadForm.laborApprover_id %} {{form.overloadForm.laborApprover.supervisor.FIRST_NAME}} {{form.overloadForm.laborApprover.supervisor.LAST_NAME}} + Something for testing purposes {% else %} None {% endif %} @@ -125,7 +126,13 @@

-

Reason for release:

+

Labor Review Date:

+
+

{{form.overloadForm.laborReviewDate.strftime('%m-%d-%Y')}}

+
+
+
+

Reason for overload:

From 2514bd830bea1cb77e0972678d6b7fb2ae228d2f Mon Sep 17 00:00:00 2001 From: Johncox2211 Date: Thu, 29 Jan 2026 20:13:47 +0000 Subject: [PATCH 04/10] fixed query for forms in laborHistory to be able to access overload info in the template --- app/controllers/main_routes/laborHistory.py | 9 +++++++-- app/templates/snips/studentHistoryModal.html | 7 +------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/main_routes/laborHistory.py b/app/controllers/main_routes/laborHistory.py index bc916665..6699f59e 100755 --- a/app/controllers/main_routes/laborHistory.py +++ b/app/controllers/main_routes/laborHistory.py @@ -131,8 +131,13 @@ def populateModal(statusKey): currentUser = require_login() if not currentUser: # Not logged in return render_template('errors/403.html'), 403 - forms = (FormHistory.select().join(LaborReleaseForm, join_type=JOIN.LEFT_OUTER) - .where(FormHistory.formID == statusKey).order_by(FormHistory.createdDate.desc(), FormHistory.formHistoryID.desc())) + forms = (FormHistory.select() + .join(LaborReleaseForm, join_type=JOIN.LEFT_OUTER) + .switch(FormHistory).join(OverloadForm, JOIN.LEFT_OUTER, on=(FormHistory.overloadForm == OverloadForm.overloadFormID)) + .switch(OverloadForm).join(User, JOIN.LEFT_OUTER, on=(OverloadForm.laborApprover == User.userID)) + .switch(User).join(Supervisor, JOIN.LEFT_OUTER, on=(User.supervisor == Supervisor.ID)) + .where(FormHistory.formID == statusKey) + .order_by(FormHistory.createdDate.desc(), FormHistory.formHistoryID.desc())) statusForm = LaborStatusForm.get(LaborStatusForm.laborStatusFormID == statusKey) currentDate = datetime.today() pendingformType = None diff --git a/app/templates/snips/studentHistoryModal.html b/app/templates/snips/studentHistoryModal.html index cdde5dc3..6a56b4cc 100755 --- a/app/templates/snips/studentHistoryModal.html +++ b/app/templates/snips/studentHistoryModal.html @@ -81,7 +81,6 @@
{% endif %} - {% elif form.overloadForm != None %} {% if form.reviewedDate == None %}
@@ -116,9 +115,8 @@

Labor Office Contact:

- {% if form.overloadForm.laborApprover_id %} + {% if form.overloadForm.laborApprover_id and (form.overloadForm.laborApprover.supervisor.FIRST_NAME or form.overloadForm.laborApprover.supervisor.LAST_NAME) %} {{form.overloadForm.laborApprover.supervisor.FIRST_NAME}} {{form.overloadForm.laborApprover.supervisor.LAST_NAME}} - Something for testing purposes {% else %} None {% endif %} @@ -139,9 +137,6 @@

- - - {% elif form.releaseForm != None %} {% if form.reviewedDate == None %}
From 4bd171e5ea77750b07faf8ccb50af73d1d866242 Mon Sep 17 00:00:00 2001 From: Johncox2211 Date: Thu, 29 Jan 2026 20:31:13 +0000 Subject: [PATCH 05/10] reverted change accidentallly made in this branch --- app/controllers/main_routes/studentResponse.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/main_routes/studentResponse.py b/app/controllers/main_routes/studentResponse.py index a4c74318..dc436c28 100644 --- a/app/controllers/main_routes/studentResponse.py +++ b/app/controllers/main_routes/studentResponse.py @@ -20,7 +20,6 @@ def confirm(): try: form = forms.get() except DoesNotExist as e: - print("Error occured: ", e) flash("This contract is invalid or has expired.", "danger") abort(404) @@ -63,7 +62,7 @@ def confirmSubmit(): abort(404) form.studentConfirmation = (response == "Accepted") - form.studentResponseDate = datetime.today() + form.studentResponseDate = datetime.date.today() form.save() formHistory = FormHistory.get_or_none(FormHistory.formID == form.laborStatusFormID) From 46d45ff62593930e7d1ec9aec4e6cdd2460006b7 Mon Sep 17 00:00:00 2001 From: Johncox2211 Date: Tue, 10 Feb 2026 22:01:54 +0000 Subject: [PATCH 06/10] adjustment form no longer breaking the modal added back accidental feature deletions still need to fix adjustment pending page on pending forms page --- app/controllers/main_routes/laborHistory.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/main_routes/laborHistory.py b/app/controllers/main_routes/laborHistory.py index 6699f59e..6e34b656 100755 --- a/app/controllers/main_routes/laborHistory.py +++ b/app/controllers/main_routes/laborHistory.py @@ -171,10 +171,11 @@ def populateModal(statusKey): form.adjustedForm.oldValue = oldPosition.POSN_TITLE + " (" + oldPosition.WLS+")" if form.adjustedForm.fieldAdjusted == "department": - newDepartment = Department.get(Department.ORG == newValue) - oldDepartment = Department.get(Department.ORG == oldValue) - form.adjustedForm.newValue = newDepartment.DEPT_NAME - form.adjustedForm.oldValue = oldDepartment.DEPT_NAME + newDepartment = Department.get_or_none(Department.ORG == newValue) + oldDepartment = Department.get_or_none(Department.ORG == oldValue) + form.adjustedForm.newValue = newDepartment.DEPT_NAME if newDepartment else "Unknown ", newValue + form.adjustedForm.oldValue = oldDepartment.DEPT_NAME if oldDepartment else "Unknown ", oldValue + # Convert the field adjusted value out of camelcase into a more readable format form.adjustedForm.fieldAdjusted = re.sub(r"(\w)([A-Z])", r"\1 \2", form.adjustedForm.fieldAdjusted).title() From 3cdb63bd25d68aaef35d2183ea5b33cc33c4e6c4 Mon Sep 17 00:00:00 2001 From: Johncox2211 Date: Tue, 10 Feb 2026 22:06:30 +0000 Subject: [PATCH 07/10] updated adjustment form tabbing in html for readability modified overload info display html --- app/templates/snips/studentHistoryModal.html | 139 ++++++++----------- 1 file changed, 55 insertions(+), 84 deletions(-) diff --git a/app/templates/snips/studentHistoryModal.html b/app/templates/snips/studentHistoryModal.html index 6a56b4cc..cd92bc67 100755 --- a/app/templates/snips/studentHistoryModal.html +++ b/app/templates/snips/studentHistoryModal.html @@ -81,62 +81,6 @@
{% endif %} - {% elif form.overloadForm != None %} - {% if form.reviewedDate == None %} -
-
{{form.createdDate.strftime('%m-%d-%Y')}}
-
{{form.historyType}}
-
Submitted
-
- {% elif form.reviewedDate != None %} -
-
{{form.reviewedDate.strftime('%m-%d-%Y')}}
-
{{form.historyType}}
-
{{form.status}}
-
- {% if "Denied" in form.status.statusName %} -
-
-

Reject Reason:

-
- -
-
-
- {% endif %} -
-
{{form.createdDate.strftime('%m-%d-%Y')}}
-
{{form.historyType}}
-
Submitted
-
- {% endif %} -
-
-

Labor Office Contact:

-
-

- {% if form.overloadForm.laborApprover_id and (form.overloadForm.laborApprover.supervisor.FIRST_NAME or form.overloadForm.laborApprover.supervisor.LAST_NAME) %} - {{form.overloadForm.laborApprover.supervisor.FIRST_NAME}} {{form.overloadForm.laborApprover.supervisor.LAST_NAME}} - {% else %} - None - {% endif %} -

-
-
-
-

Labor Review Date:

-
-

{{form.overloadForm.laborReviewDate.strftime('%m-%d-%Y')}}

-
-
-
-

Reason for overload:

-
- -
-
-
- {% elif form.releaseForm != None %} {% if form.reviewedDate == None %}
@@ -199,34 +143,34 @@
{% elif form.adjustedForm != None %} - {% if form.reviewedDate == None %} -
-
{{form.createdDate.strftime('%m-%d-%Y')}}
-
{{form.historyType}}
-
Submitted
-
- {% elif form.reviewedDate != None %} -
-
{{form.reviewedDate.strftime('%m-%d-%Y')}}
-
{{form.historyType}}
-
{{form.status}}
-
- {% if "Denied" in form.status.statusName %} -
-
-

Reject Reason:

-
- -
-
-
- {% endif %} -
-
{{form.createdDate.strftime('%m-%d-%Y')}}
-
{{form.historyType}}
-
Submitted
-
- {% endif %} + {% if form.reviewedDate == None %} +
+
{{form.createdDate.strftime('%m-%d-%Y')}}
+
{{form.historyType}}
+
Submitted
+
+ {% else %} +
+
{{form.reviewedDate.strftime('%m-%d-%Y')}}
+
{{form.historyType}}
+
{{form.status}}
+
+ {% if "Denied" in form.status.statusName %} +
+
+

Reject Reason:

+
+ +
+
+
+ {% endif %} +
+
{{form.createdDate.strftime('%m-%d-%Y')}}
+
{{form.historyType}}
+
Submitted
+
+ {% endif %}

{{form.adjustedForm.fieldAdjusted}} changed from {{form.adjustedForm.oldValue}} to {{form.adjustedForm.newValue}}

@@ -267,6 +211,33 @@ {% endif %} +
+
+

Labor Office Contact:

+
+

+ {% if form.overloadForm.laborApprover_id and (form.overloadForm.laborApprover.supervisor.FIRST_NAME or form.overloadForm.laborApprover.supervisor.LAST_NAME) %} + {{form.overloadForm.laborApprover.supervisor.FIRST_NAME}} {{form.overloadForm.laborApprover.supervisor.LAST_NAME}} + {% else %} + None + {% endif %} +

+
+
+
+

Labor Review Date:

+
+

{{form.overloadForm.laborReviewDate.strftime('%m-%d-%Y')}}

+
+
+
+

Reason for overload:

+
+ +
+
+
+ {% endif %} {% endfor %} From 34bf86693025a0c79cc94f567cc7e208d30c6159 Mon Sep 17 00:00:00 2001 From: Johncox2211 Date: Wed, 11 Feb 2026 20:15:45 +0000 Subject: [PATCH 08/10] added fix for pre-student approval overload form modal giving error w/ no review date --- app/templates/snips/studentHistoryModal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/snips/studentHistoryModal.html b/app/templates/snips/studentHistoryModal.html index cd92bc67..da0c6c67 100755 --- a/app/templates/snips/studentHistoryModal.html +++ b/app/templates/snips/studentHistoryModal.html @@ -227,7 +227,7 @@

Labor Review Date:

-

{{form.overloadForm.laborReviewDate.strftime('%m-%d-%Y')}}

+

{{form.overloadForm.laborReviewDate.strftime('%m-%d-%Y') if form.overloadForm.laborReviewDate else "Not yet reviewed"}}

From 18e52e2d0ca5b9c7bb7a0422d05b5d39ebe85422 Mon Sep 17 00:00:00 2001 From: Johncox2211 Date: Wed, 11 Feb 2026 21:24:19 +0000 Subject: [PATCH 09/10] Fixed issue with adjustment forms causing the pending adjustment forms page to not load properly. Seems like some departments are just showing up as None for some reason, should probably fix that --- app/logic/allPendingForms.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/logic/allPendingForms.py b/app/logic/allPendingForms.py index 60110d5e..80cba908 100644 --- a/app/logic/allPendingForms.py +++ b/app/logic/allPendingForms.py @@ -283,6 +283,10 @@ def checkAdjustment(allForms): allForms.adjustedForm.oldValue = newPosition.POSN_TITLE if allForms.adjustedForm.fieldAdjusted == "department": - newDepartment = Department.get(Department.ORG==allForms.adjustedForm.newValue) - allForms.adjustedForm.newValue = newDepartment.DEPT_NAME - allForms.adjustedForm.oldValue = newDepartment.ORG + "-" + newDepartment.ACCOUNT + newDepartment = Department.get_or_none(Department.ORG==allForms.adjustedForm.newValue) + if newDepartment: + allForms.adjustedForm.newValue = newDepartment.DEPT_NAME + allForms.adjustedForm.oldValue = newDepartment.ORG + "-" + newDepartment.ACCOUNT + else: + allForms.adjustedForm.newValue = "Department not found" + " - " + allForms.adjustedForm.newValue + allForms.adjustedForm.oldValue = "Department not found" \ No newline at end of file From c1d0b5ecf4920da3e19fa77ea928cbd60c46c279 Mon Sep 17 00:00:00 2001 From: Johncox2211 Date: Mon, 16 Feb 2026 21:38:07 +0000 Subject: [PATCH 10/10] changed all pending forms adjustment forms verbage got rid of prints changed html logic for labor history modal --- app/controllers/main_routes/laborHistory.py | 4 ++-- app/logic/allPendingForms.py | 4 ++-- app/templates/snips/studentHistoryModal.html | 13 ++++++++----- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/controllers/main_routes/laborHistory.py b/app/controllers/main_routes/laborHistory.py index 6e34b656..65278612 100755 --- a/app/controllers/main_routes/laborHistory.py +++ b/app/controllers/main_routes/laborHistory.py @@ -173,8 +173,8 @@ def populateModal(statusKey): if form.adjustedForm.fieldAdjusted == "department": newDepartment = Department.get_or_none(Department.ORG == newValue) oldDepartment = Department.get_or_none(Department.ORG == oldValue) - form.adjustedForm.newValue = newDepartment.DEPT_NAME if newDepartment else "Unknown ", newValue - form.adjustedForm.oldValue = oldDepartment.DEPT_NAME if oldDepartment else "Unknown ", oldValue + form.adjustedForm.newValue = newDepartment.DEPT_NAME if newDepartment else "Unknown " + newValue + form.adjustedForm.oldValue = oldDepartment.DEPT_NAME if oldDepartment else "Unknown " + oldValue # Convert the field adjusted value out of camelcase into a more readable format diff --git a/app/logic/allPendingForms.py b/app/logic/allPendingForms.py index 80cba908..e2310b77 100644 --- a/app/logic/allPendingForms.py +++ b/app/logic/allPendingForms.py @@ -288,5 +288,5 @@ def checkAdjustment(allForms): allForms.adjustedForm.newValue = newDepartment.DEPT_NAME allForms.adjustedForm.oldValue = newDepartment.ORG + "-" + newDepartment.ACCOUNT else: - allForms.adjustedForm.newValue = "Department not found" + " - " + allForms.adjustedForm.newValue - allForms.adjustedForm.oldValue = "Department not found" \ No newline at end of file + allForms.adjustedForm.newValue = "Unknown" + " - " + allForms.adjustedForm.newValue + allForms.adjustedForm.oldValue = "Unknown" + " - " + allForms.adjustedForm.oldValue \ No newline at end of file diff --git a/app/templates/snips/studentHistoryModal.html b/app/templates/snips/studentHistoryModal.html index da0c6c67..324d5b95 100755 --- a/app/templates/snips/studentHistoryModal.html +++ b/app/templates/snips/studentHistoryModal.html @@ -80,8 +80,9 @@
Submitted
{% endif %} + {% endif %} - {% elif form.releaseForm != None %} + {% if form.releaseForm != None %} {% if form.reviewedDate == None %}
{{form.createdDate.strftime('%m-%d-%Y')}}
@@ -142,7 +143,9 @@
- {% elif form.adjustedForm != None %} + {% endif %} + + {% if form.adjustedForm != None %} {% if form.reviewedDate == None %}
{{form.createdDate.strftime('%m-%d-%Y')}}
@@ -174,8 +177,9 @@

{{form.adjustedForm.fieldAdjusted}} changed from {{form.adjustedForm.oldValue}} to {{form.adjustedForm.newValue}}

- - {% elif form.overloadForm != None %} + {% endif %} + + {% if form.overloadForm != None %} {% if form.reviewedDate == None %}
{{form.createdDate.strftime('%m-%d-%Y')}}
@@ -237,7 +241,6 @@
- {% endif %} {% endfor %}