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 5 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 all commits
Commits
Show all changes
5 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
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
9 changes: 7 additions & 2 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()
.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
Expand Down
56 changes: 56 additions & 0 deletions app/templates/snips/studentHistoryModal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,62 @@
</div>
{% endif %}

{% elif form.overloadForm != 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="overloadReasonTextArea" rows="2" cols="45" readonly>{{form.studentOverloadReason}}</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="smallDataMargin">
<div class="row" style="padding-top:5px">
<p class="col-sm-4 releaseTopRows pTag">Labor Office Contact:</p>
<div class="col-sm-7" align="left">
<p>
{% 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 %}
</p>
</div>
</div>
<div class="row">
<p class="col-sm-4 releaseTopRows pTag" align="left">Labor Review Date:</p>
<div class="col-sm-7" align="left">
<p>{{form.overloadForm.laborReviewDate.strftime('%m-%d-%Y')}}</p>
</div>
</div>
<div class="row">
<p class="col-sm-4 bottomRows pTag">Reason for overload:</p>
<div class="col-sm-7" align="left">
<textarea class="overloadReasonTextArea" rows="2" cols="45" readonly>{{form.overloadForm.studentOverloadReason}}</textarea>
</div>
</div>
</div>

{% elif form.releaseForm != None %}
{% if form.reviewedDate == None %}
<div class="h4 nopadding">
Expand Down