diff --git a/DjangoFiles/Administration/admin_tenant.py b/DjangoFiles/Administration/admin_tenant.py index 08157bf..2c2e8ae 100644 --- a/DjangoFiles/Administration/admin_tenant.py +++ b/DjangoFiles/Administration/admin_tenant.py @@ -29,6 +29,9 @@ class EventAdmin(admin.ModelAdmin): 'reservations', 'datetime', ) + readonly_fields = ( + 'reservations', + ) staff_admin_site.register(Event, EventAdmin) diff --git a/DjangoFiles/ApiBillet/models.py b/DjangoFiles/ApiBillet/models.py index 71a8362..71f7116 100644 --- a/DjangoFiles/ApiBillet/models.py +++ b/DjangoFiles/ApiBillet/models.py @@ -1,3 +1,12 @@ from django.db import models # Create your models here. +# from django.contrib.auth.models import AbstractUser + + + +# class TibilletUser(AbstractUser): +# pass + + + diff --git a/DjangoFiles/BaseBillet/models.py b/DjangoFiles/BaseBillet/models.py index 1150f03..c16427a 100644 --- a/DjangoFiles/BaseBillet/models.py +++ b/DjangoFiles/BaseBillet/models.py @@ -21,6 +21,7 @@ class OptionGenerale(models.Model): verbose_name = _('Options Generales') verbose_name_plural = _('Options Generales') + @receiver(post_save, sender=OptionGenerale) def poids_option_generaler(sender, instance: OptionGenerale, created, **kwargs): if created: @@ -31,7 +32,6 @@ def poids_option_generaler(sender, instance: OptionGenerale, created, **kwargs): instance.save() - class Configuration(SingletonModel): organisation = models.CharField(max_length=50) short_description = models.CharField(max_length=250) @@ -46,27 +46,30 @@ class Configuration(SingletonModel): img = StdImageField(upload_to='images/', null=True, blank=True, - validators=[MaxSizeValidator(1920, 1920)], + # validators=[MaxSizeValidator(1920, 1920)], variations={ - 'thumbnail': (1200, 1200), - }, delete_orphans=True) + 'fhd': (1920, 1920), + 'hdr': (720, 720), + 'med': (480, 480), + 'thumbnail': (150, 90), + }, + delete_orphans=True + ) mollie_api_key = models.CharField(max_length=50, blank=True, null=True) reservation_par_user_max = models.PositiveSmallIntegerField(default=6) - jauge_max = models.PositiveSmallIntegerField() + jauge_max = models.PositiveSmallIntegerField(default=50) option_generale_radio = models.ManyToManyField(OptionGenerale, - blank=True, - related_name="radiobutton") + blank=True, + related_name="radiobutton") option_generale_checkbox = models.ManyToManyField(OptionGenerale, - blank=True, - related_name="checkbox") - - + blank=True, + related_name="checkbox") class Event(models.Model): @@ -79,8 +82,12 @@ class Event(models.Model): null=True, blank=True, validators=[MaxSizeValidator(1920, 1920)], variations={ - 'thumbnail': (500, 500), - }, delete_orphans=True) + 'fhd': (1920, 1920), + 'hdr': (1280, 1280), + 'crop': (510, 310, True), + }, + delete_orphans=True + ) reservations = models.PositiveSmallIntegerField(default=0) @@ -97,7 +104,6 @@ class Event(models.Model): verbose_name_plural = _('Evenements') - class reservation(models.Model): event = models.ForeignKey(Event, on_delete=models.CASCADE, @@ -111,6 +117,6 @@ class reservation(models.Model): (PAYEE, _('Payée')), ] status = models.CharField(max_length=3, choices=TYPE_CHOICES, default=NON_VALIDEE, - verbose_name=_("Status de la réservation")) + verbose_name=_("Status de la réservation")) - qty = models.IntegerField() \ No newline at end of file + qty = models.IntegerField() diff --git a/DjangoFiles/BaseBillet/templates/html5up-massively/event.html b/DjangoFiles/BaseBillet/templates/html5up-massively/event.html index 4f722a3..af330d8 100644 --- a/DjangoFiles/BaseBillet/templates/html5up-massively/event.html +++ b/DjangoFiles/BaseBillet/templates/html5up-massively/event.html @@ -39,12 +39,12 @@
- {{ event.datetime.date }}
{{ event.datetime.time }}
+ {{ event.datetime | date:"d F Y"}}
{{ event.datetime | time }}

{{ event.name }}

{{ event.short_description }}

-
-

{{ event.long_description }}

+
+

{{ event.long_description | linebreaks}}

diff --git a/DjangoFiles/BaseBillet/templates/html5up-massively/index.html b/DjangoFiles/BaseBillet/templates/html5up-massively/index.html index 2732c7b..9707109 100644 --- a/DjangoFiles/BaseBillet/templates/html5up-massively/index.html +++ b/DjangoFiles/BaseBillet/templates/html5up-massively/index.html @@ -50,11 +50,11 @@
- {{ first_event.datetime.date }}
{{ first_event.datetime.time }}
+ {{ first_event.datetime | date:"d F Y"}}
{{ first_event.datetime | time }}

{{ first_event.name }}

{{ first_event.short_description }}

- + @@ -79,10 +79,10 @@ {% for event in events %}
- {{ event.datetime.date }} + {{ event.datetime | date:"d F Y"}}

{{ event.name }}

- +

{{ event.short_description }}