From a042924fd3c02542492e0e0b3ad3a6f8bdd5a8bc Mon Sep 17 00:00:00 2001 From: Tyler Parton Date: Thu, 16 Mar 2023 15:54:23 -0400 Subject: [PATCH 1/3] working on getting the redirect to work. keeps freezing on a 200. --- app/controllers/main_routes/laborHistory.py | 4 +++- app/controllers/main_routes/studentOverloadApp.py | 10 +++++----- app/static/js/studentOverloadApp.js | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/controllers/main_routes/laborHistory.py b/app/controllers/main_routes/laborHistory.py index 97f58505..66270d8d 100755 --- a/app/controllers/main_routes/laborHistory.py +++ b/app/controllers/main_routes/laborHistory.py @@ -30,7 +30,8 @@ def laborhistory(id, departmentName = None): try: currentUser = require_login() - if not currentUser: # Not logged in + if not currentUser: + print("Not currentuser") # Not logged in return render_template('errors/403.html'), 403 student = getOrCreateStudentRecord(bnumber=id) studentForms = FormHistory.select().join_from(FormHistory, LaborStatusForm).join_from(FormHistory, HistoryType).where(FormHistory.formID.studentSupervisee == student, @@ -55,6 +56,7 @@ def laborhistory(id, departmentName = None): if len(authorizedForms) == 0: + print("len wrong?") return render_template('errors/403.html'), 403 authorizedForms = sorted(authorizedForms,key=lambda f:f.reviewedDate if f.reviewedDate else f.createdDate, reverse=True) laborStatusFormList = ','.join([str(form.formID.laborStatusFormID) for form in studentForms]) diff --git a/app/controllers/main_routes/studentOverloadApp.py b/app/controllers/main_routes/studentOverloadApp.py index 98e7d56f..06aea7f9 100755 --- a/app/controllers/main_routes/studentOverloadApp.py +++ b/app/controllers/main_routes/studentOverloadApp.py @@ -23,7 +23,7 @@ def studentOverloadApp(formHistoryId): return render_template('errors/403.html'), 403 if currentUser.student.ID != overloadForm.formID.studentSupervisee.ID: return render_template('errors/403.html'), 403 - + lsfForm = (LaborStatusForm.select(LaborStatusForm, Student, Term, Department) .join(Student, attr="studentSupervisee").switch() .join(Term).switch() @@ -111,7 +111,7 @@ def withdrawRequest(formHistoryId): # send a withdrawal notification to student and supervisor email = emailHandler(formHistory.formHistoryID) email.LaborOverloadFormWithdrawn() - + # TODO should we email financial aid? formHistory.overloadForm.delete_instance() @@ -142,7 +142,6 @@ def updateDatabase(overloadFormHistoryID): overloadFormHistory.save() originalFormHistory.status = newStatus originalFormHistory.save() - overloadForm = overloadFormHistory.overloadForm overloadForm.studentOverloadReason = overloadReason overloadForm.save() @@ -150,8 +149,9 @@ def updateDatabase(overloadFormHistoryID): email = emailHandler(overloadFormHistory.formHistoryID) link = makeThirdPartyLink("Financial Aid", request.host, overloadFormHistory.formHistoryID) email.overloadVerification("Financial Aid", link) - - return "" + currentUser = require_login() + print('attempting redirect...') + return redirect('/laborHistory/' + currentUser.student.ID) except Exception as e: print("ERROR: " + str(e)) diff --git a/app/static/js/studentOverloadApp.js b/app/static/js/studentOverloadApp.js index 26238542..cb27c6ee 100755 --- a/app/static/js/studentOverloadApp.js +++ b/app/static/js/studentOverloadApp.js @@ -51,7 +51,8 @@ function updateDatabase(overloadFormHistoryID){ method: "POST", data: {"overloadReason": $("#notes").val()}, success: function() { - window.location.href = '/'; + $("#flash_container").html(''); + $("#flasher").delay(5000).fadeOut(); }, error: function(e) { console.log(e) From c2fd999a32c3051595efbc94129746c377e4941e Mon Sep 17 00:00:00 2001 From: Tyler Parton Date: Mon, 20 Mar 2023 16:45:56 -0400 Subject: [PATCH 2/3] got the page to redirect to the home page for a student after submission. --- app/controllers/main_routes/studentOverloadApp.py | 3 +-- app/static/js/studentOverloadApp.js | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/controllers/main_routes/studentOverloadApp.py b/app/controllers/main_routes/studentOverloadApp.py index 06aea7f9..bf1e4137 100755 --- a/app/controllers/main_routes/studentOverloadApp.py +++ b/app/controllers/main_routes/studentOverloadApp.py @@ -150,8 +150,7 @@ def updateDatabase(overloadFormHistoryID): link = makeThirdPartyLink("Financial Aid", request.host, overloadFormHistory.formHistoryID) email.overloadVerification("Financial Aid", link) currentUser = require_login() - print('attempting redirect...') - return redirect('/laborHistory/' + currentUser.student.ID) + return (currentUser.student.ID) except Exception as e: print("ERROR: " + str(e)) diff --git a/app/static/js/studentOverloadApp.js b/app/static/js/studentOverloadApp.js index cb27c6ee..55559b04 100755 --- a/app/static/js/studentOverloadApp.js +++ b/app/static/js/studentOverloadApp.js @@ -50,9 +50,8 @@ function updateDatabase(overloadFormHistoryID){ url: "/studentOverloadApp/update/" + overloadFormHistoryID, method: "POST", data: {"overloadReason": $("#notes").val()}, - success: function() { - $("#flash_container").html(''); - $("#flasher").delay(5000).fadeOut(); + success: function(bnumber) { + window.location.replace("/laborHistory/" + bnumber); }, error: function(e) { console.log(e) From 2327e065fd862e00f4c42769d5d63a0b658ef5e7 Mon Sep 17 00:00:00 2001 From: hoerstl Date: Wed, 30 Aug 2023 11:39:44 -0400 Subject: [PATCH 3/3] Removed a duplicate requirement from the requirements.txt file. This was assumed to be the result of branching off prod and merging in development. --- requirements.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 12ffd7f7..d7ea1b98 100755 --- a/requirements.txt +++ b/requirements.txt @@ -33,8 +33,6 @@ importlib-metadata==1.7.0 iniconfig==1.1.1 itsdangerous==2.1.2 Jinja2~=3.0.3 -itsdangerous==1.1.0 -Jinja2==2.10.1 ldap3==2.9.1 Mako==1.0.13 MarkupSafe==2.1.1