forked from DGNum/gestioCOF
Déplace les champs paid
et paymenttype
This commit is contained in:
parent
7f1adf7c4e
commit
9776a18e4c
1 changed files with 19 additions and 19 deletions
|
@ -151,6 +151,25 @@ PAYMENT_TYPES = (
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class Attribution(models.Model):
|
||||||
|
participant = models.ForeignKey("Participant", on_delete=models.CASCADE)
|
||||||
|
spectacle = models.ForeignKey(
|
||||||
|
Spectacle, on_delete=models.CASCADE, related_name="attribues"
|
||||||
|
)
|
||||||
|
given = models.BooleanField("Donnée", default=False)
|
||||||
|
paid = models.BooleanField("Payée", default=False)
|
||||||
|
paymenttype = models.CharField(
|
||||||
|
"Moyen de paiement", max_length=6, choices=PAYMENT_TYPES, blank=True
|
||||||
|
)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return "%s -- %s, %s" % (
|
||||||
|
self.participant.user,
|
||||||
|
self.spectacle.title,
|
||||||
|
self.spectacle.date,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class Participant(models.Model):
|
class Participant(models.Model):
|
||||||
user = models.ForeignKey(User, on_delete=models.CASCADE)
|
user = models.ForeignKey(User, on_delete=models.CASCADE)
|
||||||
choices = models.ManyToManyField(
|
choices = models.ManyToManyField(
|
||||||
|
@ -159,10 +178,6 @@ class Participant(models.Model):
|
||||||
attributions = models.ManyToManyField(
|
attributions = models.ManyToManyField(
|
||||||
Spectacle, through="Attribution", related_name="attributed_to"
|
Spectacle, through="Attribution", related_name="attributed_to"
|
||||||
)
|
)
|
||||||
paid = models.BooleanField("A payé", default=False)
|
|
||||||
paymenttype = models.CharField(
|
|
||||||
"Moyen de paiement", max_length=6, choices=PAYMENT_TYPES, blank=True
|
|
||||||
)
|
|
||||||
tirage = models.ForeignKey(Tirage, on_delete=models.CASCADE)
|
tirage = models.ForeignKey(Tirage, on_delete=models.CASCADE)
|
||||||
choicesrevente = models.ManyToManyField(
|
choicesrevente = models.ManyToManyField(
|
||||||
Spectacle, related_name="subscribed", blank=True
|
Spectacle, related_name="subscribed", blank=True
|
||||||
|
@ -212,21 +227,6 @@ class ChoixSpectacle(models.Model):
|
||||||
verbose_name_plural = "voeux"
|
verbose_name_plural = "voeux"
|
||||||
|
|
||||||
|
|
||||||
class Attribution(models.Model):
|
|
||||||
participant = models.ForeignKey(Participant, on_delete=models.CASCADE)
|
|
||||||
spectacle = models.ForeignKey(
|
|
||||||
Spectacle, on_delete=models.CASCADE, related_name="attribues"
|
|
||||||
)
|
|
||||||
given = models.BooleanField("Donnée", default=False)
|
|
||||||
|
|
||||||
def __str__(self):
|
|
||||||
return "%s -- %s, %s" % (
|
|
||||||
self.participant.user,
|
|
||||||
self.spectacle.title,
|
|
||||||
self.spectacle.date,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class SpectacleRevente(models.Model):
|
class SpectacleRevente(models.Model):
|
||||||
attribution = models.OneToOneField(
|
attribution = models.OneToOneField(
|
||||||
Attribution, on_delete=models.CASCADE, related_name="revente"
|
Attribution, on_delete=models.CASCADE, related_name="revente"
|
||||||
|
|
Loading…
Reference in a new issue