Skip to content

Erratic loads #564

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
RueHaile wants to merge 8 commits into
base: development
Choose a base branch
from
+31 −21
Open

Erratic loads #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
10eb6f5
tracy fix
RueHaile Jan 17, 2026
49752b7
fixed the late loading
RueHaile Jan 29, 2026
9aa4384
expanded the pressable space of the manage button.
RueHaile Feb 2, 2026
7ffa2dd
Merge branch 'development' into erraticLoads
Meatchema Feb 5, 2026
3a209ae
removed the spand and made the loading more interactive by announcein…
RueHaile Feb 10, 2026
c5d6acd
fixed the "view notes" to a more generic wording.
RueHaile Feb 16, 2026
4bc9de9
reset the db_test.py file
RueHaile Feb 17, 2026
ad7ec82
fixed the java rendering delay and the comments fixes
RueHaile Feb 17, 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: 9 additions & 9 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,21 @@ function clearTextArea() { //makes sure that it empties text areas and p tags wh



function loadOverloadModal(formHistoryID, laborStatusFormID) {
function loadOverloadModal(formHistoryID) {
/*
This method sends an AJAX call to recieve data used to populate
the overload modal.
This method shows the modal and renders is loading when it is loading
*/

$("#overloadModal").find(".modal-content").html('<div class="modal-body">Loading...</div>');
$("#overloadModal").find('.modal-content').load('/admin/overloadModal/' + formHistoryID) ;
$("#overloadModal").modal("show");
$("#overloadModal").find('.modal-content').load('/admin/overloadModal/' + formHistoryID);
}


function loadReleaseModal(formHistoryID, laborStatusFormID) {
$("#modalRelease").modal("show");
function loadReleaseModal(formHistoryID) {
$("#modalRelease").find('.modal-content').html('<div class="modal-body">Loading...</div>');
$("#modalRelease").find('.modal-content').load('/admin/releaseModal/' + formHistoryID);


$("#modalRelease").modal("show");
}


Expand Down Expand Up @@ -604,7 +604,7 @@ function notesCounter(laborStatusFormID, formHistoryID){
success: function(response) {
var viewNotesID = '#notes_' + String(formHistoryID)
var modalViewNotesID = '#modalNote_' + String(formHistoryID)
$(viewNotesID).html('View Notes (' + response['noteTotal'] + ')')
$(viewNotesID).html('Notes (' + response['noteTotal'] + ')')
$(modalViewNotesID).html('View Notes (' + response['noteTotal'] + ')')
},
error: function(request,status,error){
Expand Down
30 changes: 20 additions & 10 deletions app/templates/admin/allPendingForms.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ <h1>{{title}}</h1>
{% endwith %}
<a role="menuitem" href="#"
<span id="{{pendingOverloadFormPairs[allForms.formHistoryID]}}"
onclick="loadOverloadModal({{pendingOverloadFormPairs[allForms.formHistoryID]}}, {{allForms.formID.laborStatusFormID}});"
onclick="loadOverloadModal({{pendingOverloadFormPairs[allForms.formHistoryID]}});"
aria-label="Pending Overload Form" title="Manage Overload Form" class="glyphicon glyphicon-exclamation-sign fa-lg"
style="color:red; top: 10px"></span></a>
</td>
Expand Down Expand Up @@ -206,7 +206,7 @@ <h1>{{title}}</h1>
<span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="menu1" style="min-width: 100%;">
{% if allForms.historyType.historyTypeName == 'Labor Overload Form' %}
<li role="presentation">
<li role="presentation" id ="{{allForms.formHistoryID}}" onclick="loadOverloadModal({{allForms.formHistoryID}});">
{% if currentUser.isFinancialAidAdmin or currentUser.isSaasAdmin %}
{% set formurl = "financialAidOverloadApproval" %}
{% if currentUser.isSaasAdmin %}
Expand All @@ -215,18 +215,28 @@ <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}}" onclick="loadOverloadModal({{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 id="{{allForms.formHistoryID}}"
role="menuitem"
href="#"
class="btn btn-secondary"
onclick="event.preventDefault(); loadReleaseModal('{{allForms.formHistoryID}}');">
Manage
</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 id="{{allForms.formHistoryID}}"
role="menuitem"
href="#"
class="btn btn-secondary"
onclick="event.preventDefault(); loadOverloadModal('{{allForms.formHistoryID}}');">
Manage
</a></li>
{% else %}
<li role="presentation"><a role="menuitem" href="#">
<span onclick="insertDenial({{allForms.formHistoryID}})"
Expand All @@ -241,7 +251,7 @@ <h1>{{title}}</h1>
<span id="notes_{{allForms.formHistoryID}}"
onclick="getNotes({{allForms.formID.laborStatusFormID}})"
data-toggle="modal"
data-target="#NotesModal">View Notes</span></a></li>
data-target="#NotesModal">Notes</span></a></li>
{% if formType == 'preStudentApproval' %}
<li role="presentation"><a role="menuitem" href="#">
<span onclick="skipApproval({{allForms.formID.laborStatusFormID}})"
Expand Down
2 changes: 1 addition & 1 deletion app/templates/snips/pendingOverloadModal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ <h3 class="modal-title" id="overloadModalLabel" align="center"><b>Labor Overload
########################################}
<div id="notes" style="position:absolute; right:0">
<div id="viewNotesButton">
<button id="modalNote_{{formHistoryID}}" onclick="toggleNotesLog({{laborStatusFormID}}, {{formHistoryID}})" class='btn btn-sm btn-primary'>View Notes ({{noteTotal}})</button>
<button id="modalNote_{{formHistoryID}}" onclick="toggleNotesLog({{laborStatusFormID}}, {{formHistoryID}})" class='btn btn-sm btn-primary'> Notes({{noteTotal}}) </button>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/snips/pendingReleaseModal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ <h3 class="modal-title" align="center"><strong>Labor Release Form</strong></h3>
</table>

<div id='radioDivRelease'>
<button id="modalNote_{{formHistoryID}}" onclick="toggleNotesLog({{laborStatusFormID}}, {{formHistoryID}})" style='float: left; margin-top: -10px;' class='btn btn-sm btn-primary'>View Notes ({{noteTotal}})</button>
<button id="modalNote_{{formHistoryID}}" onclick="toggleNotesLog({{laborStatusFormID}}, {{formHistoryID}})" style='float: left; margin-top: -10px;' class='btn btn-sm btn-primary'>Notes({{noteTotal}})</button>
<p class="status-warning" style="color:red;" hidden><span class="glyphicon glyphicon-exclamation-sign">
</span><strong>A Status is required in order to submit</strong></p><span>Status:<span aria-hidden="true" style="color:red"><strong>*</strong></span></span>
<label for="approveRelease" class="radio-inline">
Expand Down