Stop tracking migrations and release 4.8.9

This commit is contained in:
2024-08-04 18:56:11 +00:00
parent d851e7e4ad
commit 3d195973fc
47 changed files with 313 additions and 1935 deletions

View File

@ -305,16 +305,16 @@ def get_default_category():
class Team(models.Model):
zekken_number = models.CharField(max_length=255, unique=True)
# zekken_number = models.CharField(max_length=255, unique=True)
team_name = models.CharField(max_length=255)
owner = models.ForeignKey(CustomUser, on_delete=models.CASCADE, related_name='owned_teams', blank=True, null=True)
category = models.ForeignKey('NewCategory', on_delete=models.SET_DEFAULT, default=get_default_category)
class Meta:
unique_together = ('zekken_number', 'category')
# class Meta:
# unique_together = ('zekken_number', 'category')
def __str__(self):
return f"{self.zekken_number} - {self.team_name}, owner:{self.owner.lastname} {self.owner.firstname}"
return f"{self.team_name}, owner:{self.owner.lastname} {self.owner.firstname}"
class Member(models.Model):
@ -378,12 +378,15 @@ class Entry(models.Model):
category = models.ForeignKey(NewCategory, on_delete=models.CASCADE)
date = models.DateTimeField()
owner = models.ForeignKey(CustomUser, on_delete=models.CASCADE,blank=True, null=True) # Akira 2024-7-24
zekken_number = models.IntegerField(default=0)
is_active = models.BooleanField(default=True) # 新しく追加
class Meta:
unique_together = ('team', 'event', 'date','owner')
unique_together = ('zekken_number', 'event', 'date')
def __str__(self):
return f"{self.team.zekken_number} - {self.event.event_name} - {self.date}"
return f"{self.team.zekken_number} - {self.team_name} - {self.event.event_name} - {self.date}"
def clean(self):
super().clean()