Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/clean_code

This commit is contained in:
Ludovic Stephan 2016-11-14 12:52:35 -02:00
commit fa3ddd099f
12 changed files with 86 additions and 39 deletions

View file

@ -257,7 +257,8 @@ class SpectacleReventeAdmin(admin.ModelAdmin):
Réinitialise les reventes.
"""
count = queryset.count()
for revente in queryset.all():
for revente in queryset.filter(
attribution__spectacle__date__gte=timezone.now()):
revente.date = timezone.now() - timedelta(hours=1)
revente.soldTo = None
revente.notif_sent = False

View file

@ -86,9 +86,6 @@ class Spectacle(models.Model):
verbose_name = "Spectacle"
ordering = ("date", "title",)
def __repr__(self):
return "[%s]" % self
def timestamp(self):
return "%d" % calendar.timegm(self.date.utctimetuple())

View file

@ -332,13 +332,14 @@ def revente(request, tirage_id):
id=revente_id)
if rev.exists():
revente = rev.get()
revente.date = timezone.now() - timedelta(hours=1)
revente.soldTo = None
revente.notif_sent = False
revente.tirage_done = False
if revente.answered_mail:
revente.answered_mail.clear()
revente.save()
if revente.attribution.spectacle.date > timezone.now():
revente.date = timezone.now() - timedelta(hours=1)
revente.soldTo = None
revente.notif_sent = False
revente.tirage_done = False
if revente.answered_mail:
revente.answered_mail.clear()
revente.save()
else:
resellform = ResellForm(participant, prefix='resell')