Skip to content

Commit

Permalink
Release v3.1.57-20240708132300
Browse files Browse the repository at this point in the history
  • Loading branch information
esitarski committed Jul 8, 2024
2 parents be7103a + e606bb5 commit f454849
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion SeriesMgr/FieldMap.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def summary( self ):
"Gender",
),
('team',
('Team','Team Name','TeamName','Rider Team','Club','Club Name','ClubName','Rider Club','Rider Club/Team','Équipe',),
('Team','Team Name','TeamName','Rider Team','Club','Club Name','ClubName','Rider Club','Rider Club/Team','Équipe','Affiliates',),
"Team",
),
('discipline',
Expand Down
2 changes: 1 addition & 1 deletion SeriesMgr/Points.py
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ def commit( self ):
self.grid.GetCellValue(row, self.ParticipationCol),
self.grid.GetCellValue(row, self.DNFCol),
) )

model = SeriesModel.model
model.setPoints( pointsList )

Expand Down
11 changes: 6 additions & 5 deletions SeriesMgr/SeriesModel.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ def __ne__( self, other ):
return self.__dict__ != other.__dict__

def __repr__( self ):
return f'Category(name="{self.name}", iSequence={self.iSequence}, publish={self.publish}, teamN={self.teamN}, useNthScore={self.useNthScore}, teamPublish={self.teamPublish})'
return f'Category(name="{self.name}", iSequence={self.iSequence}, pointStructure={self.pointStructure.name if self.pointStructure else None}, publish={self.publish}, teamN={self.teamN}, useNthScore={self.useNthScore}, teamPublish={self.teamPublish})'

def getName( self ):
return self.longName or self.name
Expand Down Expand Up @@ -337,7 +337,7 @@ def setPoints( self, pointsList ):
for p in self.pointStructures]
if oldPointsList == pointsList:
return

# Create new points structures, and create a mapping from the old names to the new names.
newPointStructures = []
oldToNewName = {}
Expand All @@ -364,9 +364,10 @@ def setPoints( self, pointsList ):
if r.teamPointStructure:
r.teamPointStructure = newPS.get( oldToNewName.get(r.teamPointStructure.name, ''), None )

for c in self.categoryList:
if c.pointsStructure:
c.pointsStructure = newPS.get( oldToNewName.get(c.pointStructure.name, ''), None )
# Correct any category-specific points structures.
for c in self.categories.values():
if c.pointStructure:
c.pointStructure = newPS.get( oldToNewName.get(c.pointStructure.name, ''), None )

self.pointStructures = newPointStructures
self.setChanged()
Expand Down
2 changes: 1 addition & 1 deletion SeriesMgr/Version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
AppVerName="SeriesMgr 3.0.35-private"
AppVerName="SeriesMgr 3.0.37-private"

0 comments on commit f454849

Please sign in to comment.