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) 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 ac746ee..51fd80d 100644 --- a/lastUpdatedToken.txt +++ b/lastUpdatedToken.txt @@ -1 +1 @@ -2023-11-01 15:40:13.966762 \ No newline at end of file +2023-11-01 14:47:38.394597 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]