From 10eb6f588d063832ca7af581ba19bf09adb91235 Mon Sep 17 00:00:00 2001 From: Rue Haile Date: Sat, 17 Jan 2026 02:57:58 +0000 Subject: [PATCH 01/14] tracy fix --- db_test.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/db_test.py b/db_test.py index 2afe0f525..00bb3590f 100644 --- a/db_test.py +++ b/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)) From 49752b7b32f0ee7a6585440c039528a83648f4b8 Mon Sep 17 00:00:00 2001 From: Rue Haile Date: Thu, 29 Jan 2026 20:26:10 +0000 Subject: [PATCH 02/14] fixed the late loading --- app/static/js/allPendingForms.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/static/js/allPendingForms.js b/app/static/js/allPendingForms.js index fda836f08..3edcabae9 100644 --- a/app/static/js/allPendingForms.js +++ b/app/static/js/allPendingForms.js @@ -358,8 +358,10 @@ function loadOverloadModal(formHistoryID, laborStatusFormID) { This method sends an AJAX call to recieve data used to populate the overload modal. */ + + $("#overloadModal").find(".modal-content").html('
Loading...
'); + $("#overloadModal").find('.modal-content').load('/admin/overloadModal/' + formHistoryID) ; $("#overloadModal").modal("show"); - $("#overloadModal").find('.modal-content').load('/admin/overloadModal/' + formHistoryID); } From 9aa43849f64666aa855723a1c8edad0a642590a5 Mon Sep 17 00:00:00 2001 From: Rue Haile Date: Mon, 2 Feb 2026 21:39:30 +0000 Subject: [PATCH 03/14] expanded the pressable space of the manage button. --- app/templates/admin/allPendingForms.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/admin/allPendingForms.html b/app/templates/admin/allPendingForms.html index 5041dadab..0cf443450 100644 --- a/app/templates/admin/allPendingForms.html +++ b/app/templates/admin/allPendingForms.html @@ -206,7 +206,7 @@

{{title}}