From a8b55d97c295e3b62b4cf01ec11e4620ebb35b0c Mon Sep 17 00:00:00 2001 From: murraydr Date: Wed, 1 Nov 2023 15:50:36 -0400 Subject: [PATCH 1/3] fixed attribute error when closing via red X --- bugsAndFeatureRequests.txt | 4 +++- lastUpdatedToken.txt | 2 +- substitutionApprovalWindow.py | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bugsAndFeatureRequests.txt b/bugsAndFeatureRequests.txt index 9505bf8..b683bf9 100644 --- a/bugsAndFeatureRequests.txt +++ b/bugsAndFeatureRequests.txt @@ -1,3 +1,5 @@ Put any discovered bugs or requests for new features here in this document so they aren't forgotten and I can fix/implement them when I'm in the office on Wednesdays. -futureproofing calling float on single element helperfunctions.py 142 \ No newline at end of file +Warning thrown when accepting requests on Tyler's machine (I cannot reproduce this on my machine!) +helperFunctions.py:142: FutureWarning: Calling float on a single element Series is deprecated and will raise a TypeError in the future. Use float(ser.iloc[0]) instead + stfD.loc[stfD['NetID']==netID,columnName]=str(float(stfD.loc[stfD['NetID']==netID,columnName])+amount) \ No newline at end of file diff --git a/lastUpdatedToken.txt b/lastUpdatedToken.txt index 810e282..cadc985 100644 --- a/lastUpdatedToken.txt +++ b/lastUpdatedToken.txt @@ -1 +1 @@ -2023-11-01 14:47:38.394597 \ No newline at end of file +2023-11-01 15:49:17.939423 \ No newline at end of file diff --git a/substitutionApprovalWindow.py b/substitutionApprovalWindow.py index 9d1037d..a5c0738 100644 --- a/substitutionApprovalWindow.py +++ b/substitutionApprovalWindow.py @@ -122,6 +122,10 @@ def subAppWin(staffDatabaseFilename,secDFilename,subRequestsFilename,subRequests while event != sg.WIN_CLOSED and completed==False: event, values = window.read() + #This happens when multiple windows are closed via the red X. Just abort the program at that point, to avoid running into attribute errors + if values==None: + break + #values.values() is an array of the input from all window elements, we use strides to get a "column" of checkboxes instead of a "row" of checkboxes approveValues=list(values.values())[:-1:5] acceptValues=list(values.values())[1:-1:5] From 73c718211f52c23efcdb40cddd900e6cb36ca539 Mon Sep 17 00:00:00 2001 From: murraydr Date: Wed, 1 Nov 2023 15:51:01 -0400 Subject: [PATCH 2/3] ditto --- lastUpdatedToken.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lastUpdatedToken.txt b/lastUpdatedToken.txt index cadc985..aceabea 100644 --- a/lastUpdatedToken.txt +++ b/lastUpdatedToken.txt @@ -1 +1 @@ -2023-11-01 15:49:17.939423 \ No newline at end of file +2023-11-01 15:50:44.703233 \ No newline at end of file From 51130c860db30c1815c319f0eaa9b6186998fb9a Mon Sep 17 00:00:00 2001 From: murraydr Date: Wed, 1 Nov 2023 15:56:44 -0400 Subject: [PATCH 3/3] Added force pull commands to readme --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index d3f5288..1e44848 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,14 @@ Open the Repo in GitGui (this might happen automatically after cloning). Click Put “Pull” in the name box and “git pull origin master” (no quotes) in the command box and click “Add” +Click “Tools” and “Add” + +Put “Force Pull 1” in the name box and “git fetch --all” (no quotes) in the command box and click “Add” + +Click “Tools” and “Add” + +Put “Force Pull 2” in the name box and “git reset --hard origin/master” (no quotes) in the command box and click “Add” + ### Authenticate your machine with Google Run the code for the first time (or since 7 days have elapsed since this step was last performed on this computer)