Skip to content

Overload Information in Labor History Enhancement #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JohnCox2211 wants to merge 18 commits into
base: development
Choose a base branch
from
Open

Overload Information in Labor History Enhancement #563

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7a915bd
implementing overload info in student history modal
JohnCox2211 Jan 22, 2026
d7d534b
implementing overload info in student history modal
JohnCox2211 Jan 22, 2026
811e320
added HTML to show overload approval date, fixed
JohnCox2211 Jan 28, 2026
2514bd8
fixed query for forms in laborHistory to be able
JohnCox2211 Jan 29, 2026
4bd171e
reverted change accidentallly made in this branch
JohnCox2211 Jan 29, 2026
46d45ff
adjustment form no longer breaking the modal
JohnCox2211 Feb 10, 2026
3cdb63b
updated adjustment form tabbing in html
JohnCox2211 Feb 10, 2026
34bf866
added fix for pre-student approval overload
JohnCox2211 Feb 11, 2026
18e52e2
Fixed issue with adjustment forms causing the
JohnCox2211 Feb 11, 2026
c1d0b5e
changed all pending forms adjustment forms verbage
JohnCox2211 Feb 16, 2026
e77b5c5
addressed Kafui's comments:
JohnCox2211 Feb 25, 2026
4c94d7f
removed the other .switch
JohnCox2211 Feb 25, 2026
3e8a99d
added disabled to the textareas for release and
JohnCox2211 Mar 10, 2026
a2e2e22
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
JohnCox2211 Mar 31, 2026
8fc5b18
got rid of inforows css class
JohnCox2211 Mar 31, 2026
ec2c161
removed extra unnecessary joins
JohnCox2211 Mar 31, 2026
463b53b
implemented Rue's suggested change
JohnCox2211 Apr 1, 2026
d9b191d
Merge branch 'development' of https://github.com/BCStudentSoftwareDev…
JohnCox2211 Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions app/controllers/main_routes/laborHistory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Comment thread
JohnCox2211 marked this conversation as resolved.
.join(LaborReleaseForm, join_type=JOIN.LEFT_OUTER)
.join(OverloadForm, JOIN.LEFT_OUTER, on=(FormHistory.overloadForm == OverloadForm.overloadFormID))
.join(User, JOIN.LEFT_OUTER, on=(OverloadForm.laborApprover == User.userID))
.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
Expand Down Expand Up @@ -166,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
Comment thread
JohnCox2211 marked this conversation as resolved.


# 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()
Expand Down
10 changes: 7 additions & 3 deletions app/logic/allPendingForms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "Unknown" + " - " + allForms.adjustedForm.newValue
Copy link
Copy Markdown
Contributor

@RueHaile RueHaile Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Each value should be validated against the Department model independently so that one failure doesn't "poison" the label of the other.

allForms.adjustedForm.oldValue = "Unknown" + " - " + allForms.adjustedForm.oldValue
4 changes: 4 additions & 0 deletions app/static/css/studentHistoryModal.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,7 @@
.mailtoIcon{
font-size: smaller;
}

.extraInfoRows {
Comment thread
JohnCox2211 marked this conversation as resolved.
Outdated
font-weight: bold;
}
115 changes: 73 additions & 42 deletions app/templates/snips/studentHistoryModal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@
{% if "Denied" in form.status.statusName %}
<div class="leftMargin">
Copy link
Copy Markdown
Contributor

@MImran2002 MImran2002 Mar 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Image

The UI boxes are not even

Copy link
Copy Markdown
Contributor Author

@JohnCox2211 JohnCox2211 Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

made spacing consistent

Copy link
Copy Markdown
Contributor

@MImran2002 MImran2002 Apr 14, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

This still exist can we meet and go over so that it is not an inconsistency from my environment.

<div class="row">
<p class="control-label col-sm-5 pTag" align="right">Reject Reason: </p>
<p class="control-label col-sm-5 pTag extraInfoRows" align="right">Reject Reason: </p>
Comment thread
JohnCox2211 marked this conversation as resolved.
Outdated
<div class="col-sm-5">
<textarea class="rejectReasonTextArea" rows="3" cols="25" readonly>{{form.rejectReason}}</textarea>
<textarea class="rejectReasonTextArea" rows="3" cols="25" disabled readonly>{{form.rejectReason}}</textarea>
</div>
</div>
</div>
Expand All @@ -80,8 +80,9 @@
<div class="col-sm-4" align="left">Submitted</div>
</div>
{% endif %}
{% endif %}

{% elif form.releaseForm != None %}
{% if form.releaseForm != None %}
{% if form.reviewedDate == None %}
<div class="h4 nopadding">
<div class="col-sm-3">{{form.createdDate.strftime('%m-%d-%Y')}}</div>
Expand All @@ -97,9 +98,9 @@
{% if "Denied" in form.status.statusName %}
<div class="leftMargin">
<div class="row">
<p class="col-sm-4 pTag">Reject Reason:</p>
<p class="col-sm-4 pTag extraInfoRows">Reject Reason:</p>
Comment thread
JohnCox2211 marked this conversation as resolved.
Outdated
<div class="col-sm-7">
<textarea class="rejectReasonTextArea" rows="2" cols="45" readonly>{{form.rejectReason}}</textarea>
<textarea class="rejectReasonTextArea" rows="2" cols="45" disabled readonly>{{form.rejectReason}}</textarea>
</div>
</div>
</div>
Expand All @@ -112,13 +113,13 @@
{% endif %}
<div class="smallDataMargin">
<div class="row" style="padding-top:5px">
<p class="col-sm-4 releaseTopRows pTag">Condition at Release:</p>
<p class="col-sm-4 releaseTopRows pTag extraInfoRows">Condition at Release:</p>
<div class="col-sm-7" align="left">
<p>{{form.releaseForm.conditionAtRelease}}</p>
</div>
</div>
<div class="row" style="padding-top:5px">
<p class="col-sm-4 releaseTopRows pTag">Labor Office Contact:</p>
<p class="col-sm-4 releaseTopRows pTag extraInfoRows">Labor Office Contact:</p>
<div class="col-sm-7" align="left">
<p>
{% if form.releaseForm.contactPerson_id %}
Expand All @@ -130,52 +131,55 @@
</div>
</div>
<div class="row">
<p class="col-sm-4 releaseTopRows pTag" align="left">Release Date:</p>
<p class="col-sm-4 releaseTopRows pTag extraInfoRows" align="left">Release Date:</p>
<div class="col-sm-7" align="left">
<p>{{form.releaseForm.releaseDate.strftime('%m-%d-%Y')}}</p>
</div>
</div>
<div class="row">
<p class="col-sm-4 bottomRows pTag">Reason for release:</p>
<p class="col-sm-4 bottomRows pTag extraInfoRows">Reason for release:</p>
<div class="col-sm-7" align="left">
<textarea class="releaseReasonTextArea" rows="2" cols="45" readonly>{{form.releaseForm.reasonForRelease}}</textarea>
<textarea class="releaseReasonTextArea" rows="2" cols="45" disabled readonly>{{form.releaseForm.reasonForRelease}}</textarea>
</div>
</div>
</div>
{% elif form.adjustedForm != None %}
{% if form.reviewedDate == None %}
<div class="h4 nopadding">
<div class="col-sm-3">{{form.createdDate.strftime('%m-%d-%Y')}}</div>
<div class="col-sm-5 ">{{form.historyType}}</div>
<div class="col-sm-4" align="left">Submitted</div>
</div>
{% elif form.reviewedDate != None %}
<div class="h4 nopadding">
<div class="col-sm-3">{{form.reviewedDate.strftime('%m-%d-%Y')}}</div>
<div class="col-sm-5 ">{{form.historyType}}</div>
<div class="col-sm-4" align="left">{{form.status}}</div>
</div>
{% if "Denied" in form.status.statusName %}
<div class="leftMargin">
<div class="row">
<p class="col-sm-4 pTag">Reject Reason:</p>
<div class="col-sm-7">
<textarea class="rejectReasonTextArea" rows="2" cols="45" readonly>{{form.rejectReason}}</textarea>
</div>
</div>
</div>
{% endif %}
<div class="h4 nopadding">
<div class="col-sm-3">{{form.createdDate.strftime('%m-%d-%Y')}}</div>
<div class="col-sm-5 ">{{form.historyType}}</div>
<div class="col-sm-4" align="left">Submitted</div>
</div>
{% endif %}

{% if form.adjustedForm != None %}
{% if form.reviewedDate == None %}
<div class="h4 nopadding">
<div class="col-sm-3">{{form.createdDate.strftime('%m-%d-%Y')}}</div>
<div class="col-sm-5 ">{{form.historyType}}</div>
<div class="col-sm-4" align="left">Submitted</div>
</div>
{% else %}
<div class="h4 nopadding">
<div class="col-sm-3">{{form.reviewedDate.strftime('%m-%d-%Y')}}</div>
<div class="col-sm-5 ">{{form.historyType}}</div>
<div class="col-sm-4" align="left">{{form.status}}</div>
</div>
{% if "Denied" in form.status.statusName %}
<div class="leftMargin">
<div class="row">
<p class="col-sm-4 pTag extraInfoRows">Reject Reason:</p>
<div class="col-sm-7">
<textarea class="rejectReasonTextArea" rows="2" cols="45" disabled readonly>{{form.rejectReason}}</textarea>
</div>
</div>
</div>
{% endif %}
<div class="h4 nopadding">
<div class="col-sm-3">{{form.createdDate.strftime('%m-%d-%Y')}}</div>
<div class="col-sm-5 ">{{form.historyType}}</div>
<div class="col-sm-4" align="left">Submitted</div>
</div>
{% endif %}
<div class="row">
<p class="col-sm-11 smallDataMargin pTag">{{form.adjustedForm.fieldAdjusted}} changed from {{form.adjustedForm.oldValue}} to {{form.adjustedForm.newValue}}</p>
</div>

{% elif form.overloadForm != None %}
{% endif %}

{% if form.overloadForm != None %}
{% if form.reviewedDate == None %}
<div class="h4 overloadBottom">
<div class="col-sm-3">{{form.createdDate.strftime('%m-%d-%Y')}}</div>
Expand All @@ -197,9 +201,9 @@
{% if "Denied" in form.status.statusName %}
<div class="leftMargin">
<div class="row">
<p class="col-sm-4 nopadding pTag">Reject Reason:</p>
<p class="col-sm-4 nopadding pTag extraInfoRows">Reject Reason:</p>
<div class="col-sm-7">
<textarea class="rejectReasonTextArea" rows="2" cols="45" readonly>{{form.rejectReason}}</textarea>
<textarea class="rejectReasonTextArea" rows="2" cols="45" disabled readonly>{{form.rejectReason}}</textarea>
</div>
</div>
</div>
Expand All @@ -211,6 +215,33 @@
</div>
{% endif %}

<div class="smallDataMargin">
<div class="row" style="padding-top:5px">
<p class="col-sm-4 extraInfoRows pTag">Labor Office Contact:</p>
<div class="col-sm-7" align="left">
<p>
{% set laborApprover = form.overloadForm.laborApprover.supervisor %}
{% if form.overloadForm.laborApprover_id and (laborApprover.FIRST_NAME or laborApprover.LAST_NAME) %}
{{laborApprover.FIRST_NAME}} {{laborApprover.LAST_NAME}}
{% else %}
None
{% endif %}
</p>
</div>
</div>
<div class="row">
<p class="col-sm-4 extraInfoRows pTag" align="left">Labor Review Date:</p>
<div class="col-sm-7" align="left">
<p>{{form.overloadForm.laborReviewDate.strftime('%m-%d-%Y') if form.overloadForm.laborReviewDate else "Not yet reviewed"}}</p>
</div>
</div>
<div class="row">
<p class="col-sm-4 extraInfoRows pTag">Reason for overload:</p>
<div class="col-sm-7" align="left">
<textarea class="overloadReasonTextArea" rows="2" cols="45" disabled readonly>{{form.overloadForm.studentOverloadReason}}</textarea>
</div>
</div>
</div>
{% endif %}

{% endfor %}
Expand Down