diff --git a/DjangoFiles/BaseBillet/migrations/0022_auto_20211221_1723.py b/DjangoFiles/BaseBillet/migrations/0022_auto_20211221_1723.py new file mode 100644 index 0000000..4a7988d --- /dev/null +++ b/DjangoFiles/BaseBillet/migrations/0022_auto_20211221_1723.py @@ -0,0 +1,30 @@ +# Generated by Django 2.2 on 2021-12-21 13:23 + +from django.db import migrations, models +import stdimage.models +import stdimage.validators + + +class Migration(migrations.Migration): + + dependencies = [ + ('BaseBillet', '0021_auto_20211206_1810'), + ] + + operations = [ + migrations.AlterField( + model_name='configuration', + name='template_billetterie', + field=models.CharField(blank=True, choices=[('html5up-massively', 'html5up-massively'), ('arnaud_mvc', 'arnaud_mvc'), ('original_arnaud', 'original_arnaud')], max_length=250, null=True, verbose_name='Template Billetterie'), + ), + migrations.AlterField( + model_name='configuration', + name='template_meta', + field=models.CharField(blank=True, choices=[('html5up-story', 'html5up-story'), ('blk-mit', 'blk-mit')], max_length=250, null=True, verbose_name='Template Meta'), + ), + migrations.AlterField( + model_name='product', + name='img', + field=stdimage.models.StdImageField(blank=True, null=True, upload_to='images/', validators=[stdimage.validators.MaxSizeValidator(1920, 1920)], verbose_name='Image du produit'), + ), + ] diff --git a/DjangoFiles/BaseBillet/models.py b/DjangoFiles/BaseBillet/models.py index 4912813..336cd29 100644 --- a/DjangoFiles/BaseBillet/models.py +++ b/DjangoFiles/BaseBillet/models.py @@ -158,8 +158,18 @@ class Configuration(SingletonModel): verbose_name=_("Clé d'API du serveur cashless") ) + ARNAUD, MASSIVELY, BLK_MVC, BLK_VUE = 'arnaud_mvc', 'html5up-masseively', 'blk_mvc', 'blk_vue' + CHOICE_TEMPLATE = [ + (ARNAUD, _('arnaud_mvc')), + (MASSIVELY, _("html5up-masseively")), + (BLK_MVC, _("blk_mvc")), + (BLK_VUE, _("blk_vue")), + ] + # choices=[(folder, folder) for folder in os.listdir(f"{settings.BASE_DIR}/BaseBillet/templates")], + template_billetterie = models.CharField( - choices=[(folder, folder) for folder in os.listdir(f"{settings.BASE_DIR}/BaseBillet/templates")], + choices=CHOICE_TEMPLATE, + default=ARNAUD, max_length=250, blank=True, null=True, @@ -167,7 +177,8 @@ class Configuration(SingletonModel): ) template_meta = models.CharField( - choices=[(folder, folder) for folder in os.listdir(f"{settings.BASE_DIR}/MetaBillet/templates")], + choices=CHOICE_TEMPLATE, + default=MASSIVELY, max_length=250, blank=True, null=True, diff --git a/DjangoFiles/BaseBillet/views.py b/DjangoFiles/BaseBillet/views.py index 6f549a4..4cba032 100644 --- a/DjangoFiles/BaseBillet/views.py +++ b/DjangoFiles/BaseBillet/views.py @@ -24,14 +24,10 @@ class index(APIView): if not configuration.activer_billetterie: return HttpResponseRedirect('https://www.tibillet.re') - first_event = None - events = Event.objects.filter(datetime__gt=datetime.now()) - if len(events) > 0: - first_event = events[0] context = { 'configuration': configuration, - 'events': events, + 'events': Event.objects.filter(datetime__gt=datetime.now()), 'categorie_billet': Product.BILLET, }