Fix date format

clubs
Laurent 2 years ago
parent b8f9f4edf7
commit cd4e41a05b
  1. 12
      tournaments/models/match.py
  2. 2
      tournaments/models/tournament.py

@ -1,8 +1,7 @@
from django.db import models from django.db import models
from . import Round, GroupStage, FederalMatchCategory from . import Round, GroupStage, FederalMatchCategory
from django.utils import timezone from django.utils import timezone, formats
import uuid import uuid
from django.utils import formats
class Match(models.Model): class Match(models.Model):
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=True) id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=True)
@ -55,7 +54,9 @@ class Match(models.Model):
def formatted_start_date(self): def formatted_start_date(self):
if self.start_date: if self.start_date:
return self.start_date.strftime("%H:%M") timezoned_datetime = timezone.localtime(self.start_date)
return formats.date_format(timezoned_datetime, format='H:i')
# return formats.date_format(self.start_date, format='H:i')
else: else:
return '' return ''
# return str(self.start_date) #.strftime("%H:%M") # return str(self.start_date) #.strftime("%H:%M")
@ -67,9 +68,8 @@ class Match(models.Model):
if self.started(): if self.started():
return self.formatted_duration() return self.formatted_duration()
else: else:
return formats.date_format(self.start_date, format='SHORT_DATETIME_FORMAT') timezoned_datetime = timezone.localtime(self.start_date)
# return self.start_date.strftime("%A %d %B à %H:%M") return formats.date_format(timezoned_datetime, format='l H:i')
# return f"Prévu à {start}"
else: else:
return 'À venir...' return 'À venir...'

@ -10,7 +10,7 @@ class Tournament(models.Model):
start_date = models.DateTimeField() start_date = models.DateTimeField()
end_date = models.DateTimeField(null=True, blank=True) end_date = models.DateTimeField(null=True, blank=True)
creation_date = models.DateTimeField() creation_date = models.DateTimeField()
is_private = models.BooleanField() is_private = models.BooleanField(default=False)
# format = models.IntegerField(default=FederalMatchCategory.NINE_GAMES, choices=FederalMatchCategory.choices, null=True, blank=True) # format = models.IntegerField(default=FederalMatchCategory.NINE_GAMES, choices=FederalMatchCategory.choices, null=True, blank=True)
round_format = models.IntegerField(default=FederalMatchCategory.NINE_GAMES, choices=FederalMatchCategory.choices, null=True, blank=True) round_format = models.IntegerField(default=FederalMatchCategory.NINE_GAMES, choices=FederalMatchCategory.choices, null=True, blank=True)
group_stage_format = models.IntegerField(default=FederalMatchCategory.NINE_GAMES, choices=FederalMatchCategory.choices, null=True, blank=True) group_stage_format = models.IntegerField(default=FederalMatchCategory.NINE_GAMES, choices=FederalMatchCategory.choices, null=True, blank=True)

Loading…
Cancel
Save