Skip to content

Commit

Permalink
Release v3.1.33-20231023093043
Browse files Browse the repository at this point in the history
  • Loading branch information
esitarski committed Oct 23, 2023
2 parents b0d62cc + d424cc8 commit 9347d51
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 8 deletions.
22 changes: 16 additions & 6 deletions Actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -352,17 +352,27 @@ def onPress( self, event ):
if not externalInfo:
Utils.MessageOK(
self,
'\n\n'.join( [_('Cannot Start. Excel Sheet read failure.'), _('The Excel file is either unconfigured or unreadable.')] ),
_('Excel Sheet Read '),
'\n\n'.join( [
_('Cannot Start.'),
_('This race uses RFID.'),
_('An Excel file containing the Bibs and RFID tags is required, and it is either unconfigured or unreadable.'),
_('You must have a valid Excel file, or turn off the RFID option in "Properties|RFID" to enter bibs manually.'),
_('See CrosMgr Help "RFID" for more details.'),
] ),
_('Excel Sheet Read Error'),
wx.ICON_ERROR
)
return
try:
next((i for i, field in enumerate(externalFields) if field.startswith('Tag')))
except StopIteration:
if not any( field.startswith('Tag') for field in externalFields) or not any( field.startswith('Bib') for field in externalFields ):
Utils.MessageOK(
self,
'\n\n'.join( [_('Cannot Start. Excel Sheet missing Tag column.'), _('The Excel file must contain a Tag column to use RFID.')] ),
'\n\n'.join( [
_('Cannot Start.'),
_('This race uses RFID.'),
_('The linked Excel file must have a Bib and Tag column.'),
_('You must fix your Excel file, or turn off the RFID option in "Properties|RFID".'),
_('See CrosMgr Help "RFID" for more details.'),
] ),
_('Excel Sheet missing Tag column'),
wx.ICON_ERROR
)
Expand Down
2 changes: 2 additions & 0 deletions CrossMgrImpinj/Utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ def getDocumentsDir():
dirName = os.path.dirname(dirName)
if 'CrossMgrImpinj?' in os.path.basename(dirName):
dirName = os.path.dirname(dirName)
if not os.path.isdir( os.path.join(dirName, 'CrossMgrImpinjImages') ):
dirName = os.path.dirname(dirName)

if os.path.isdir( os.path.join(dirName, 'CrossMgrImpinjImages') ):
pass
Expand Down
2 changes: 1 addition & 1 deletion CrossMgrImpinj/Version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
AppVerName="CrossMgrImpinj 3.0.19-private"
AppVerName="CrossMgrImpinj 3.0.20-private"
1 change: 1 addition & 0 deletions MainWin.py
Original file line number Diff line number Diff line change
Expand Up @@ -2704,6 +2704,7 @@ def menuNew( self, event ):

dlg = PropertiesDialog(self, title=_('Configure Race'), style=wx.DEFAULT_DIALOG_STYLE )
ApplyDefaultTemplate( race )
race.minutes = 60 # Ensure we start with a reasonable race minutes.
dlg.properties.refresh()
ret = dlg.ShowModal()
fileName = dlg.GetPath()
Expand Down
2 changes: 1 addition & 1 deletion Version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
AppVerName="CrossMgr 3.1.32-private"
AppVerName="CrossMgr 3.1.33-private"

0 comments on commit 9347d51

Please sign in to comment.