diff --git a/equipment/migrations/0001_initial.py b/equipment/migrations/0001_initial.py index 5e042ff..c3b8601 100644 --- a/equipment/migrations/0001_initial.py +++ b/equipment/migrations/0001_initial.py @@ -1,9 +1,12 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.4 on 2017-08-12 12:47 +# Generated by Django 1.11.15 on 2018-08-06 07:51 from __future__ import unicode_literals +import datetime from django.db import migrations, models import django.db.models.deletion +import equipment.fields +import taggit.managers class Migration(migrations.Migration): @@ -11,6 +14,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('taggit', '0002_auto_20150616_2121'), ('event', '0001_initial'), ] @@ -32,7 +36,7 @@ class Migration(migrations.Migration): name='EquipmentAttribution', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('amount', models.PositiveSmallIntegerField(verbose_name='quantité attribuée')), + ('amount', models.BigIntegerField(verbose_name='quantité attribuée')), ('remarks', models.TextField(verbose_name="remarques concernant l'attribution")), ('activity', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='event.Activity')), ('equipment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='equipment.Equipment')), @@ -47,7 +51,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('remark', models.TextField(verbose_name='remarque sur le matériel')), - ('amount', models.PositiveSmallIntegerField(verbose_name='quantité concernée')), + ('ids', equipment.fields.IdField()), ('is_broken', models.BooleanField()), ('is_lost', models.BooleanField()), ('equipment', models.ForeignKey(help_text='Matériel concerné par la remarque', on_delete=django.db.models.deletion.CASCADE, related_name='remarks', to='equipment.Equipment')), @@ -57,6 +61,20 @@ class Migration(migrations.Migration): 'verbose_name_plural': 'remarques sur le matériel', }, ), + migrations.CreateModel( + name='EquipmentRevision', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('date', models.DateField(default=datetime.date.today, verbose_name='date')), + ('remark', models.TextField(verbose_name='remarque sur la révision')), + ('ids', equipment.fields.IdField()), + ('equipment', models.ForeignKey(help_text='Matériel concerné par les révisions', on_delete=django.db.models.deletion.CASCADE, related_name='revisions', to='equipment.Equipment')), + ], + options={ + 'verbose_name': 'révision de matériel', + 'verbose_name_plural': 'révisions de matériel', + }, + ), migrations.AddField( model_name='equipment', name='activities', @@ -67,4 +85,9 @@ class Migration(migrations.Migration): name='event', field=models.ForeignKey(blank=True, help_text="Si spécifié, l'instance du modèle est spécifique à l'évènement en question.", null=True, on_delete=django.db.models.deletion.CASCADE, to='event.Event', verbose_name='évènement'), ), + migrations.AddField( + model_name='equipment', + name='tags', + field=taggit.managers.TaggableManager(help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags'), + ), ] diff --git a/equipment/migrations/0002_auto_20180713_1321.py b/equipment/migrations/0002_auto_20180713_1321.py deleted file mode 100644 index 47d614a..0000000 --- a/equipment/migrations/0002_auto_20180713_1321.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.14 on 2018-07-13 13:21 -from __future__ import unicode_literals - -from django.db import migrations, models -import taggit.managers - - -class Migration(migrations.Migration): - - dependencies = [ - ('taggit', '0002_auto_20150616_2121'), - ('equipment', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='equipmentremark', - name='amount', - ), - migrations.AddField( - model_name='equipment', - name='tags', - field=taggit.managers.TaggableManager(help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags'), - ), - migrations.AddField( - model_name='equipmentremark', - name='ids', - field=models.PositiveIntegerField(default=0, verbose_name='Identifiants'), - preserve_default=False, - ), - ] diff --git a/equipment/migrations/0003_auto_20180713_1358.py b/equipment/migrations/0003_auto_20180713_1358.py deleted file mode 100644 index ff94d29..0000000 --- a/equipment/migrations/0003_auto_20180713_1358.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.14 on 2018-07-13 13:58 -from __future__ import unicode_literals - -from django.db import migrations -import equipment.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('equipment', '0002_auto_20180713_1321'), - ] - - operations = [ - migrations.AlterField( - model_name='equipmentremark', - name='ids', - field=equipment.models.IdField(), - ), - ] diff --git a/equipment/migrations/0004_auto_20180802_1554.py b/equipment/migrations/0004_auto_20180802_1554.py deleted file mode 100644 index 0036343..0000000 --- a/equipment/migrations/0004_auto_20180802_1554.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.14 on 2018-08-02 15:54 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('equipment', '0003_auto_20180713_1358'), - ] - - operations = [ - migrations.AlterField( - model_name='equipmentattribution', - name='amount', - field=models.BigIntegerField(verbose_name='quantité attribuée'), - ), - ] diff --git a/equipment/migrations/0005_equipmentrevision.py b/equipment/migrations/0005_equipmentrevision.py deleted file mode 100644 index 785589c..0000000 --- a/equipment/migrations/0005_equipmentrevision.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.14 on 2018-08-03 17:15 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models -import django.db.models.deletion -import equipment.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('equipment', '0004_auto_20180802_1554'), - ] - - operations = [ - migrations.CreateModel( - name='EquipmentRevision', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date', models.DateField(default=datetime.date.today, verbose_name='date')), - ('ids', equipment.fields.IdField()), - ('equipment', models.ForeignKey(help_text='Matériel concerné par les révisions', on_delete=django.db.models.deletion.CASCADE, related_name='revisions', to='equipment.Equipment')), - ], - options={ - 'verbose_name': 'révision de matériel', - 'verbose_name_plural': 'révisions de matériel', - }, - ), - ] diff --git a/equipment/migrations/0006_equipmentrevision_remark.py b/equipment/migrations/0006_equipmentrevision_remark.py deleted file mode 100644 index 7f56f1b..0000000 --- a/equipment/migrations/0006_equipmentrevision_remark.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.14 on 2018-08-03 17:22 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('equipment', '0005_equipmentrevision'), - ] - - operations = [ - migrations.AddField( - model_name='equipmentrevision', - name='remark', - field=models.TextField(default='', verbose_name='remarque sur la révision'), - preserve_default=False, - ), - ] diff --git a/event/migrations/0001_initial.py b/event/migrations/0001_initial.py index 2c8ea07..b4231c1 100644 --- a/event/migrations/0001_initial.py +++ b/event/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.4 on 2017-08-12 12:47 +# Generated by Django 1.11.15 on 2018-08-06 07:51 from __future__ import unicode_literals from django.conf import settings @@ -74,8 +74,8 @@ class Migration(migrations.Migration): ('slug', models.SlugField(help_text="Seulement des lettres, des chiffres ou les caractères '_' ou '-'.", unique=True, verbose_name='identificateur')), ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='date de création')), ('description', models.TextField(verbose_name='description')), - ('beginning_date', models.DateTimeField(verbose_name='date de début')), - ('ending_date', models.DateTimeField(verbose_name='date de fin')), + ('beginning_date', models.DateTimeField(help_text="date publique de l'évènement", verbose_name='date de début')), + ('ending_date', models.DateTimeField(help_text="date publique de l'évènement", verbose_name='date de fin')), ('created_by', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='created_events', to=settings.AUTH_USER_MODEL, verbose_name='créé par')), ], options={ diff --git a/event/migrations/0002_auto_20180713_1321.py b/event/migrations/0002_auto_20180713_1321.py deleted file mode 100644 index 02ff589..0000000 --- a/event/migrations/0002_auto_20180713_1321.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.14 on 2018-07-13 13:21 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('event', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='event', - name='beginning_date', - field=models.DateTimeField(help_text="date publique de l'évènement", verbose_name='date de début'), - ), - migrations.AlterField( - model_name='event', - name='ending_date', - field=models.DateTimeField(help_text="date publique de l'évènement", verbose_name='date de fin'), - ), - ]