From 7a915bdf1c3c784ffa8bbd0743b222d0d84ae60a Mon Sep 17 00:00:00 2001 From: Johncox2211 Date: Thu, 22 Jan 2026 21:49:19 +0000 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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)