nouffer/rogaining_srv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

イベントにpublicや対応クラスなどを追加

Browse Source
This commit is contained in:
hayano
2024-10-21 12:48:42 +00:00
parent 6f0d8d15fd
commit b8d7029965
4 changed files with 59 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rog/models.py
View File

@ -289,13 +289,21 @@ class NewEvent2(models.Model):
end_datetime = models.DateTimeField()
deadlineDateTime = models.DateTimeField(null=True, blank=True)
#// Added @2024-10-21
public = models.BooleanField(default=False)
hour_3 = models.BooleanField(default=False)
hour_5 = models.BooleanField(default=True)
class_general = models.BooleanField(default=True)
class_family = models.BooleanField(default=True)
class_solo_male = models.BooleanField(default=True)
class_solo_female = models.BooleanField(default=True)
def __str__(self):
return f"{self.event_name} - From:{self.start_datetime} To:{self.end_datetime}"
def save(self, *args, **kwargs):
if not self.deadlineDateTime:
self.deadlineDateTime = self.end_datetime - timedelta(days=7)
self.deadlineDateTime = self.end_datetime #- timedelta(days=7)
super().save(*args, **kwargs)
class NewEvent(models.Model):
@ -386,22 +394,24 @@ class Entry(models.Model):
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) # 新しく追加
hasParticipated = models.BooleanField(default=False) # 新しく追加
hasGoaled = models.BooleanField(default=False) # 新しく追加
class Meta:
unique_together = ('zekken_number', 'event', 'date')
def __str__(self):
return f"{self.team.zekken_number} - {self.team_name} - {self.event.event_name} - {self.date}"
return f"{self.zekken_number} - {self.team.team_name} - {self.event.event_name} - {self.date}"
def clean(self):
super().clean()
if self.event and self.category and self.date:
start = self.event.start_datetime
end = self.event.end_datetime - self.category.duration
if not (start <= self.date <= end):
end = self.event.end_datetime #- self.category.duration
if not (start.date() <= self.date.date() <= end.date()):
raise ValidationError({
'date': f'日時は{start}から{end}の間である必要があります。'
'date': f'日時{self.date}は{start.date()}から{end.date()}の間である必要があります。'
})
# メンバーの年齢と性別をチェック