Skip to content

Overload modal fix #556

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
BesherKitaz wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Overload modal fix #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7ed14b
Changed the AJAX request and the method to show the modal order to ha…
BesherKitaz Nov 27, 2025
a18775e
Issue Fixed and I also fixed the view Notes one
BesherKitaz Nov 28, 2025
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
15 changes: 9 additions & 6 deletions app/static/js/allPendingForms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,21 +353,24 @@ function clearTextArea() { //makes sure that it empties text areas and p tags wh



function loadOverloadModal(formHistoryID, laborStatusFormID) {
function loadOverloadModal(formHistoryID, laborStatusFormID) {
/*
This method sends an AJAX call to recieve data used to populate
the overload modal.
*/
$("#overloadModal").modal("show");
$("#overloadModal").find('.modal-content').load('/admin/overloadModal/' + formHistoryID);
actionsButton = $("#menu" + formHistoryID);
actionsButton.prop('disabled', true);
actionsButton.html("Loading...");
$("#overloadModal").find('.modal-content').load('/admin/overloadModal/' + formHistoryID, function() {
$("#overloadModal").modal("show");
actionsButton.prop('disabled', false);
actionsButton.html("Actions <span class='caret'></span>");
});
}


function loadReleaseModal(formHistoryID, laborStatusFormID) {
$("#modalRelease").modal("show");
$("#modalRelease").find('.modal-content').load('/admin/releaseModal/' + formHistoryID);


}


Expand Down
96 changes: 67 additions & 29 deletions app/templates/admin/allPendingForms.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,17 @@ <h1>{{title}}</h1>
<div class="dropdown">
{% include "snips/FormsDeny.html" %}
{% include "snips/pendingNotesModal.html" %}
<button class="btn btn-primary dropdown-toggle" type="button" id="menu1" data-toggle="dropdown" onclick="notesCounter({{allForms.formID.laborStatusFormID}}, {{allForms.formHistoryID}})">Actions
<span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="menu1" style="min-width: 100%;">
<button class="btn btn-primary dropdown-toggle"
type="button"
id="menu{{allForms.formHistoryID}}"
data-toggle="dropdown"
onclick="notesCounter({{allForms.formID.laborStatusFormID}}, {{allForms.formHistoryID}})">
Actions
<span class="caret"></span>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="menu{{allForms.formHistoryID}}" style="min-width: 100%;">
{% if allForms.historyType.historyTypeName == 'Labor Overload Form' %}
<li role="presentation">
<li role="presentation" id="{{allForms.formHistoryID}}" onclick="loadOverloadModal({{allForms.formHistoryID}}, {{allForms.formID.laborStatusFormID}});">
{% if currentUser.isFinancialAidAdmin or currentUser.isSaasAdmin %}
{% set formurl = "financialAidOverloadApproval" %}
{% if currentUser.isSaasAdmin %}
Expand All @@ -215,41 +221,73 @@ <h1>{{title}}</h1>
<a role="menuitem" href="/admin/{{formurl}}/{{allForms.formHistoryID}}">Manage</a>
{% else %}
<a role="menuitem" href="#" >
<span id="{{allForms.formHistoryID}}" onclick="loadOverloadModal({{allForms.formHistoryID}}, {{allForms.formID.laborStatusFormID}});">Manage</span>
<span id="{{allForms.formHistoryID}}">Manage</span>
</a>
{% endif %}
</li>
{% elif allForms.historyType.historyTypeName == 'Labor Release Form' %}
<li role="presentation"><a role="menuitem" href="#">
<span id="{{allForms.formHistoryID}}"
onclick="loadReleaseModal({{allForms.formHistoryID}}, {{allForms.formID.laborStatusFormID}});">Manage</span></a></li>
<li role="presentation">
<a role="menuitem" href="#">
<span id="{{allForms.formHistoryID}}"
onclick="loadReleaseModal({{allForms.formHistoryID}}, {{allForms.formID.laborStatusFormID}});">
Manage
</span>
</a>
</li>
{% elif allForms.formHistoryID in pendingOverloadFormPairs %}
<li role="presentation"><a role="menuitem" href="#">
<span id="{{allForms.formHistoryID}}"
onclick="loadOverloadModal({{pendingOverloadFormPairs[allForms.formHistoryID]}}, {{allForms.formID.laborStatusFormID}});">Manage</span></a></li>
<li role="presentation">
<a role="menuitem" href="#">
<span id="{{allForms.formHistoryID}}"
onclick="loadOverloadModal({{pendingOverloadFormPairs[allForms.formHistoryID]}}, {{allForms.formID.laborStatusFormID}});">
Manage
</span>
</a>
</li>
{% else %}
<li role="presentation"><a role="menuitem" href="#">
<span onclick="insertDenial({{allForms.formHistoryID}})"
data-toggle="modal"
data-target="#denyModal">Deny</span></a></li>
<li role="presentation">
<a role="menuitem" href="#">
<span onclick="insertDenial({{allForms.formHistoryID}})"
data-toggle="modal"
data-target="#denyModal">
Deny
</span>
</a>
</li>
{% endif %}
{% if allForms.historyType.historyTypeName == 'Labor Status Form' %}
<li role="presentation"><a role="menuitem" href="/alterLSF/{{allForms.formID.laborStatusFormID}}">
<span >Modify</span></a></li>
<li role="presentation">
<a role="menuitem" href="/alterLSF/{{allForms.formID.laborStatusFormID}}">
<span >Modify</span>
</a>
</li>
{% endif %}
<li role="presentation"><a role="menuitem" href="#">
<span id="notes_{{allForms.formHistoryID}}"
onclick="getNotes({{allForms.formID.laborStatusFormID}})"
data-toggle="modal"
data-target="#NotesModal">View Notes</span></a></li>
<li role="presentation"
onclick="getNotes({{allForms.formID.laborStatusFormID}})"
data-toggle="modal"
data-target="#NotesModal">
<a role="menuitem" href="#">
<span id="notes_{{allForms.formHistoryID}}">
View Notes
</span>
</a>
</li>
{% if formType == 'preStudentApproval' %}
<li role="presentation"><a role="menuitem" href="#">
<span onclick="skipApproval({{allForms.formID.laborStatusFormID}})"
data-toggle="modal"
data-target="#skipApprovalModal">Skip Student Approval</span></a></li>
<li role="presentation"><a role="menuitem" href="#">
<span onclick="resendApprovalLink({{allForms.formID.laborStatusFormID}})">
Re-send Approval Email</span></a></li>
<li role="presentation">
<a role="menuitem" href="#">
<span onclick="skipApproval({{allForms.formID.laborStatusFormID}})"
data-toggle="modal"
data-target="#skipApprovalModal">
Skip Student Approval
</span>
</a>
</li>
<li role="presentation">
<a role="menuitem" href="#">
<span onclick="resendApprovalLink({{allForms.formID.laborStatusFormID}})">
Re-send Approval Email
</span>
</a>
</li>
{% endif %}
</ul>
</div>
Expand Down