Merge pull request #5 from WoopyOnOff/development

Development to master merge

Author: clmntpllr

.gitignore

@@ -0,0 +1,64 @@
+# Django #
+*.log
+*.pot
+*.pyc
+__pycache__
+db.sqlite3
+media
+static
+settings.py
+
+# Backup files # 
+*.bak 
+
+# Python # 
+*.py[cod] 
+*$py.class 
+
+# Distribution / packaging 
+.Python build/ 
+develop-eggs/ 
+dist/ 
+downloads/ 
+eggs/ 
+.eggs/ 
+lib/ 
+lib64/ 
+parts/ 
+sdist/ 
+var/ 
+wheels/ 
+*.egg-info/ 
+.installed.cfg 
+*.egg 
+*.manifest 
+*.spec 
+
+# Installer logs 
+pip-log.txt 
+pip-delete-this-directory.txt 
+
+# Unit test / coverage reports 
+htmlcov/ 
+.tox/ 
+.coverage 
+.coverage.* 
+.cache 
+.pytest_cache/ 
+nosetests.xml 
+coverage.xml 
+*.cover 
+.hypothesis/ 
+
+# pyenv 
+.python-version 
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+

bourse/__init__.py

@@ -0,0 +1,34 @@
+from django.contrib import admin
+
+# Register your models here.
+from .models import Event, UserList, Order, Item, OrderItem, Page
+
+@admin.register(Event)
+class EventAdmin(admin.ModelAdmin):
+    list_display = ('event_name','event_date','status')
+    list_filter = ('event_date','status')
+
+@admin.register(Item)
+class ItemAdmin(admin.ModelAdmin):
+    list_display = ('name','price','is_sold','sold_date')
+    fields = [('name','price')]
+
+class ItemInline(admin.TabularInline):
+    model = Item
+
+@admin.register(UserList)
+class UserListAdmin(admin.ModelAdmin):
+    inlines = [ItemInline]
+
+class OrderItemInline(admin.TabularInline):
+    model = OrderItem
+    #fields = [('code')]
+
+@admin.register(Order)
+class OrderAdmin(admin.ModelAdmin):
+    list_display = ('id','event','created_date','is_validated')
+    inlines = [OrderItemInline]
+
+@admin.register(Page)
+class PageAdmin(admin.ModelAdmin):
+    read_only_fields = ['created', 'timestamp']

bourse/admin.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class BourseConfig(AppConfig):
+    name = 'bourse'

bourse/apps.py

@@ -0,0 +1,9 @@
+from django.conf import settings
+from .models import Event
+
+def site_params(request):
+    return {'SITE_TITLE_SETTING': settings.SITE_TITLE, 'SITE_SIGNATURE_SETTING': settings.SITE_SIGNATURE}
+
+def active_event(request):
+    active_event = Event.objects.filter(status__in=[1,2,3])
+    return {'active_event':active_event}

bourse/context_processors.py

@@ -0,0 +1,6 @@
+---
+- model: bourse.page
+  pk: 1
+  fields:
+    title: "Accueil"
+    content: "<h1>Modifier le contenu dans l'admin</h1>"

bourse/fixtures/pages.yml

@@ -0,0 +1,76 @@
+from django import forms
+from django.forms.models import inlineformset_factory, BaseInlineFormSet, modelformset_factory
+from django.core.exceptions import ValidationError
+from django.utils.translation import ugettext_lazy as _
+
+from django.contrib.auth.models import User
+from .models import Item, UserList, Event, Order, OrderItem
+
+class UserForm(forms.ModelForm):
+    class Meta:
+        model = User
+        fields = ['first_name','last_name','email']
+
+class ItemForm(forms.ModelForm):
+    name = forms.CharField(label='Nom du jeu')
+    price = forms.IntegerField(label='Prix de vente',help_text=_('(Commission de 1€ incluse)'))
+    def clean_price(self):
+        data = self.cleaned_data['price']
+        if data < 1:
+            raise ValidationError(_('Valeur non valide - Entrez un prix supérieur à 1€'), code='invalid')
+        return data
+    class Meta:
+        model = Item
+        fields = ['name','price']
+
+#ItemFormSet = inlineformset_factory(UserList,Item,form=ItemForm,fields=('name','price',),extra=1,can_delete=True)
+
+class ListValidateForm(forms.Form):
+    description_text = _('Êtes-vous certain de vouloir valider votre formulaire ? Cette action est irréversible.')
+    class Meta:
+        model = UserList
+        fields = None
+############################
+# Adminitration
+############################
+class EventForm(forms.ModelForm):
+    class Meta:
+        model = Event
+        fields = ('status',)
+
+class OrderModelForm(forms.ModelForm):
+    class Meta:
+        model = Order
+        fields = ('is_validated',)
+
+OrderItemFormset = modelformset_factory(OrderItem,fields=('item',),extra=1)
+
+class ItemTextForm(forms.Form):
+    item_pk = forms.IntegerField(label='Code du jeu',help_text=_('Entrer le code du jeu à ajouter.'))
+    def __init__(self, *args, **kwargs):
+        event_id = kwargs.pop('event_id', None)
+        super(ItemTextForm, self).__init__(*args, **kwargs)
+    def clean_item_pk(self):
+        data = self.cleaned_data['item_pk']
+        if not Item.objects.filter(pk=data,is_sold=False,list__list_status=3).exists() or OrderItem.objects.filter(item=data):
+            raise ValidationError(_('Jeu non trouvé, ou déjà vendu.'), code='invalid')
+        return data
+# Orders
+#OrderItemFormset = inlineformset_factory(Order, OrderItem, fields=('item',),extra=1,widgets={'item:':forms.TextInput(attrs={'class': 'form-control','placeholder':'Entrer le code du jeu'})})
+
+class ListManageForm(forms.ModelForm):
+    class Meta:
+        model = UserList
+        fields = ('list_status',)
+
+class InvoiceClientForm(forms.Form):
+    client_name = forms.CharField(label='Nom ou raison sociale')
+    addr_1 = forms.CharField(label='Adresse')
+    addr_2 = forms.CharField(label='Adresse (suite)',initial=' ',show_hidden_initial=False, required=False)
+    cp_city = forms.CharField(label='CP Ville')
+    def __init__(self, *args, **kwargs):
+        event_id = kwargs.pop('event_id', None)
+        super(InvoiceClientForm, self).__init__(*args, **kwargs)
+    def clean_form(self):
+        data = self.cleaned_data['client_name','addr_1','addr_2','cp_city']
+        return data

bourse/forms.py

@@ -0,0 +1,72 @@
+# Generated by Django 3.0.4 on 2020-03-10 18:44
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Event',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('event_name', models.CharField(max_length=200)),
+                ('event_location', models.CharField(max_length=200)),
+                ('event_date', models.DateTimeField(verbose_name='Event Date')),
+                ('status', models.IntegerField(default=2, verbose_name='Event Status')),
+                ('comments', models.TextField(max_length=2000)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Item',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+                ('price', models.IntegerField(verbose_name='Sold Price')),
+                ('created_date', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
+                ('is_sold', models.BooleanField(default=False, verbose_name='Item Sold')),
+                ('sold_date', models.DateTimeField(verbose_name='Date Sold')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Order',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_date', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
+                ('is_validated', models.BooleanField(default=False, verbose_name='Order Validated')),
+                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bourse.Event')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='UserList',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('list_status', models.IntegerField(default=1, verbose_name='List Status')),
+                ('created_date', models.DateTimeField(auto_now_add=True, verbose_name='Date Created')),
+                ('validated_date', models.DateTimeField(verbose_name='Date Validated')),
+                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bourse.Event')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='OrderItem',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bourse.Item')),
+                ('order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bourse.Order')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='item',
+            name='list',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bourse.UserList'),
+        ),
+    ]

bourse/migrations/0001_initial.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.4 on 2020-03-27 18:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bourse', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='event',
+            name='status',
+            field=models.IntegerField(choices=[(1, 'Saisie Ouverte'), (2, 'Saisie Fermée'), (3, 'Bourse Ouverte'), (4, 'Bourse Fermée')], default=2, verbose_name='Event Status'),
+        ),
+    ]

bourse/migrations/0002_auto_20200327_1912.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.0.4 on 2020-03-29 14:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bourse', '0002_auto_20200327_1912'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='item',
+            name='sold_date',
+            field=models.DateTimeField(blank=True, verbose_name='Date Sold'),
+        ),
+        migrations.AlterField(
+            model_name='userlist',
+            name='list_status',
+            field=models.IntegerField(choices=[(1, 'Editable'), (2, 'Validated'), (3, 'Archived')], default=1, verbose_name='List Status'),
+        ),
+        migrations.AlterField(
+            model_name='userlist',
+            name='validated_date',
+            field=models.DateTimeField(blank=True, verbose_name='Date Validated'),
+        ),
+    ]