Erratic loads

app/static/js/allPendingForms.js

@@ -358,16 +358,17 @@ function loadOverloadModal(formHistoryID, laborStatusFormID) {
   This method sends an AJAX call to recieve data used to populate
   the overload modal.
   */
+
+  $("#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");
+  $("#modalRelease").find('.modal-content').html('<div class="modal-body">Loading...</div>');
   $("#modalRelease").find('.modal-content').load('/admin/releaseModal/' + formHistoryID);
-
-
+  $("#modalRelease").modal("show");
 }
 
 
@@ -604,7 +605,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){

app/templates/admin/allPendingForms.html

@@ -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}}, {{allForms.formID.laborStatusFormID}});">
                         {% if currentUser.isFinancialAidAdmin or currentUser.isSaasAdmin %}
                             {% set formurl = "financialAidOverloadApproval" %}
                             {% if currentUser.isSaasAdmin %}
@@ -220,13 +220,23 @@ <h1>{{title}}</h1>
                         {% 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}}', '{{allForms.formID.laborStatusFormID}}');">
+                          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}}', '{{allForms.formID.laborStatusFormID}}');">
+                          Manage
+                          </a></li>
                     {% else %}
                         <li role="presentation"><a role="menuitem" href="#">
                           <span onclick="insertDenial({{allForms.formHistoryID}})"

app/templates/snips/pendingOverloadModal.html

@@ -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>

app/templates/snips/pendingReleaseModal.html

@@ -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">

db_test.py

@@ -7,6 +7,10 @@
     "db": "UTE"
 }
 
+from app.config.loadConfig import load_config
+cfg = load_config('app/config/secret_config.yaml')
+details["password"] = cfg["tracy"]["mssql_password"]
+
 ###########################
 # Test pyodbc connection
 ###########################
@@ -42,7 +46,8 @@
 ###########################
 
 from flask_sqlalchemy import SQLAlchemy
-from app import load_config, app
+from app import app
+from app.config.loadConfig import load_config
 from app.logic.tracy import Tracy
 
 cfg = load_config('app/config/secret_config.yaml')
@@ -59,11 +64,11 @@
 # Test Banner connection
 ###########################
 
-from app.logic.banner import Banner
-from app.models.formHistory import FormHistory
-b = Banner()
-cursor = b.conn.cursor()
-print(cursor)
+# from app.logic.banner import Banner
+# from app.models.formHistory import FormHistory
+# b = Banner()
+# cursor = b.conn.cursor()
+# print(cursor)
 
 # NOT FOR PROD
 # b.insert(FormHistory.get_by_id(39061))