From 3d3efeeac72ff5fafac3f3354e6e8ed98f0fb33f Mon Sep 17 00:00:00 2001 From: Ambulance Clerc Date: Wed, 31 May 2023 16:21:30 +0200 Subject: [PATCH] =?UTF-8?q?Changement=20module=20heures=20suppl=C3=A9menta?= =?UTF-8?q?ire=20Les=20heures=20supple=20sont=20maintenant=20supprimable?= =?UTF-8?q?=20en=20cascade=20avec=20user,=20utilisation=20d'un=20string=20?= =?UTF-8?q?m=C3=A9moire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- collabs/migrations/0001_initial.py | 28 ------------ .../migrations_save/0002_collabs_hour_user.py | 20 --------- .../0003_remove_collabs_hour_collab.py | 17 -------- ..._rename_user_collabs_hour_collaborateur.py | 18 -------- ...bs_hour_collaborateur_collabs_hour_user.py | 24 ----------- .../0006_alter_collabs_hour_username.py | 18 -------- ...ser_collabs_hour_collaborateur_and_more.py | 23 ---------- ..._rename_collaborateur_collabs_hour_user.py | 18 -------- ...9_alter_collabs_hour_dtcreated_and_more.py | 36 ---------------- .../0010_alter_collabs_hour_bnoticed.py | 18 -------- ...s_hour_options_alter_collabs_hour_nhour.py | 23 ---------- ...hour_dtdate_alter_collabs_hour_bnoticed.py | 23 ---------- .../0013_alter_collabs_hour_dtdate.py | 18 -------- .../0014_alter_collabs_hour_dtdate.py | 18 -------- ...0015_alter_collabs_hour_dtdate_and_more.py | 23 ---------- .../0016_collabs_hour_sbases.py | 18 -------- .../0017_alter_collabs_hour_options.py | 17 -------- ...pes_alter_collabs_hour_options_and_more.py | 43 ------------------- collabs/migrations_save/__init__.py | 0 19 files changed, 403 deletions(-) delete mode 100644 collabs/migrations/0001_initial.py delete mode 100644 collabs/migrations_save/0002_collabs_hour_user.py delete mode 100644 collabs/migrations_save/0003_remove_collabs_hour_collab.py delete mode 100644 collabs/migrations_save/0004_rename_user_collabs_hour_collaborateur.py delete mode 100644 collabs/migrations_save/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py delete mode 100644 collabs/migrations_save/0006_alter_collabs_hour_username.py delete mode 100644 collabs/migrations_save/0007_rename_user_collabs_hour_collaborateur_and_more.py delete mode 100644 collabs/migrations_save/0008_rename_collaborateur_collabs_hour_user.py delete mode 100644 collabs/migrations_save/0009_alter_collabs_hour_dtcreated_and_more.py delete mode 100644 collabs/migrations_save/0010_alter_collabs_hour_bnoticed.py delete mode 100644 collabs/migrations_save/0011_alter_collabs_hour_options_alter_collabs_hour_nhour.py delete mode 100644 collabs/migrations_save/0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed.py delete mode 100644 collabs/migrations_save/0013_alter_collabs_hour_dtdate.py delete mode 100644 collabs/migrations_save/0014_alter_collabs_hour_dtdate.py delete mode 100644 collabs/migrations_save/0015_alter_collabs_hour_dtdate_and_more.py delete mode 100644 collabs/migrations_save/0016_collabs_hour_sbases.py delete mode 100644 collabs/migrations_save/0017_alter_collabs_hour_options.py delete mode 100644 collabs/migrations_save/0018_collabs_hour_types_alter_collabs_hour_options_and_more.py delete mode 100644 collabs/migrations_save/__init__.py diff --git a/collabs/migrations/0001_initial.py b/collabs/migrations/0001_initial.py deleted file mode 100644 index 716e957..0000000 --- a/collabs/migrations/0001_initial.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 4.0 on 2022-01-31 15:05 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Collabs_hour', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('userName', models.CharField(max_length=100, verbose_name="Nom d'utilisateur")), - ('collab', models.CharField(max_length=10, verbose_name='Collaborateur')), - ('nHour', models.IntegerField(default=0, verbose_name='Heure')), - ('nMinutes', models.IntegerField(default=0, verbose_name='Minutes')), - ('sRemarques', models.TextField(verbose_name='Remarques')), - ('bNoticed', models.BooleanField(default=0, verbose_name='Pris en compte')), - ('dtUpdate', models.DateTimeField(auto_now=True, verbose_name='Date de modification')), - ('dtCreated', models.DateTimeField(auto_now_add=True)), - ], - ), - ] diff --git a/collabs/migrations_save/0002_collabs_hour_user.py b/collabs/migrations_save/0002_collabs_hour_user.py deleted file mode 100644 index 19cf3ba..0000000 --- a/collabs/migrations_save/0002_collabs_hour_user.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 4.0 on 2022-01-31 15:13 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('auth', '0012_alter_user_first_name_max_length'), - ('collabs', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='collabs_hour', - name='user', - field=models.ForeignKey( on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user'), - ), - ] diff --git a/collabs/migrations_save/0003_remove_collabs_hour_collab.py b/collabs/migrations_save/0003_remove_collabs_hour_collab.py deleted file mode 100644 index d83b12e..0000000 --- a/collabs/migrations_save/0003_remove_collabs_hour_collab.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 4.0 on 2022-01-31 17:11 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('collabs', '0002_collabs_hour_user'), - ] - - operations = [ - migrations.RemoveField( - model_name='collabs_hour', - name='collab', - ), - ] diff --git a/collabs/migrations_save/0004_rename_user_collabs_hour_collaborateur.py b/collabs/migrations_save/0004_rename_user_collabs_hour_collaborateur.py deleted file mode 100644 index 9034279..0000000 --- a/collabs/migrations_save/0004_rename_user_collabs_hour_collaborateur.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-01-31 17:13 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('collabs', '0003_remove_collabs_hour_collab'), - ] - - operations = [ - migrations.RenameField( - model_name='collabs_hour', - old_name='user', - new_name='Collaborateur', - ), - ] diff --git a/collabs/migrations_save/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py b/collabs/migrations_save/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py deleted file mode 100644 index 691422d..0000000 --- a/collabs/migrations_save/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 4.0 on 2022-01-31 17:14 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('auth', '0012_alter_user_first_name_max_length'), - ('collabs', '0004_rename_user_collabs_hour_collaborateur'), - ] - - operations = [ - migrations.RemoveField( - model_name='collabs_hour', - name='Collaborateur', - ), - migrations.AddField( - model_name='collabs_hour', - name='user', - field=models.ForeignKey( on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user', verbose_name='test'), - ), - ] diff --git a/collabs/migrations_save/0006_alter_collabs_hour_username.py b/collabs/migrations_save/0006_alter_collabs_hour_username.py deleted file mode 100644 index 8346bf3..0000000 --- a/collabs/migrations_save/0006_alter_collabs_hour_username.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-01-31 17:15 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('collabs', '0005_remove_collabs_hour_collaborateur_collabs_hour_user'), - ] - - operations = [ - migrations.AlterField( - model_name='collabs_hour', - name='userName', - field=models.CharField(max_length=100, verbose_name='auteur'), - ), - ] diff --git a/collabs/migrations_save/0007_rename_user_collabs_hour_collaborateur_and_more.py b/collabs/migrations_save/0007_rename_user_collabs_hour_collaborateur_and_more.py deleted file mode 100644 index 6e536f1..0000000 --- a/collabs/migrations_save/0007_rename_user_collabs_hour_collaborateur_and_more.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 4.0 on 2022-01-31 17:16 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('collabs', '0006_alter_collabs_hour_username'), - ] - - operations = [ - migrations.RenameField( - model_name='collabs_hour', - old_name='user', - new_name='Collaborateur', - ), - migrations.AlterField( - model_name='collabs_hour', - name='userName', - field=models.CharField(max_length=100, verbose_name='Auteur'), - ), - ] diff --git a/collabs/migrations_save/0008_rename_collaborateur_collabs_hour_user.py b/collabs/migrations_save/0008_rename_collaborateur_collabs_hour_user.py deleted file mode 100644 index 4076328..0000000 --- a/collabs/migrations_save/0008_rename_collaborateur_collabs_hour_user.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-01-31 17:19 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('collabs', '0007_rename_user_collabs_hour_collaborateur_and_more'), - ] - - operations = [ - migrations.RenameField( - model_name='collabs_hour', - old_name='Collaborateur', - new_name='user', - ), - ] diff --git a/collabs/migrations_save/0009_alter_collabs_hour_dtcreated_and_more.py b/collabs/migrations_save/0009_alter_collabs_hour_dtcreated_and_more.py deleted file mode 100644 index 04abe7f..0000000 --- a/collabs/migrations_save/0009_alter_collabs_hour_dtcreated_and_more.py +++ /dev/null @@ -1,36 +0,0 @@ -# Generated by Django 4.0 on 2022-01-31 17:28 - -import django.core.validators -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('auth', '0012_alter_user_first_name_max_length'), - ('collabs', '0008_rename_collaborateur_collabs_hour_user'), - ] - - operations = [ - migrations.AlterField( - model_name='collabs_hour', - name='dtCreated', - field=models.DateTimeField(auto_now_add=True, verbose_name='Date de création'), - ), - migrations.AlterField( - model_name='collabs_hour', - name='nHour', - field=models.PositiveIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(23)], verbose_name='Heure'), - ), - migrations.AlterField( - model_name='collabs_hour', - name='nMinutes', - field=models.PositiveIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(60)], verbose_name='Minutes'), - ), - migrations.AlterField( - model_name='collabs_hour', - name='user', - field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user', verbose_name='Collaborateur'), - ), - ] diff --git a/collabs/migrations_save/0010_alter_collabs_hour_bnoticed.py b/collabs/migrations_save/0010_alter_collabs_hour_bnoticed.py deleted file mode 100644 index a0ff7b9..0000000 --- a/collabs/migrations_save/0010_alter_collabs_hour_bnoticed.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-01-31 17:44 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('collabs', '0009_alter_collabs_hour_dtcreated_and_more'), - ] - - operations = [ - migrations.AlterField( - model_name='collabs_hour', - name='bNoticed', - field=models.BooleanField(blank=True, verbose_name='Pris en compte'), - ), - ] diff --git a/collabs/migrations_save/0011_alter_collabs_hour_options_alter_collabs_hour_nhour.py b/collabs/migrations_save/0011_alter_collabs_hour_options_alter_collabs_hour_nhour.py deleted file mode 100644 index b767f68..0000000 --- a/collabs/migrations_save/0011_alter_collabs_hour_options_alter_collabs_hour_nhour.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 4.0 on 2022-01-31 17:47 - -import django.core.validators -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('collabs', '0010_alter_collabs_hour_bnoticed'), - ] - - operations = [ - migrations.AlterModelOptions( - name='collabs_hour', - options={'permissions': (('can_notice', 'Peut noter comme traitée'),)}, - ), - migrations.AlterField( - model_name='collabs_hour', - name='nHour', - field=models.PositiveIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(23)], verbose_name='Heures'), - ), - ] diff --git a/collabs/migrations_save/0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed.py b/collabs/migrations_save/0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed.py deleted file mode 100644 index 580ac14..0000000 --- a/collabs/migrations_save/0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 4.0 on 2022-02-16 12:27 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('collabs', '0011_alter_collabs_hour_options_alter_collabs_hour_nhour'), - ] - - operations = [ - migrations.AddField( - model_name='collabs_hour', - name='dtDate', - field=models.DateTimeField(auto_now=True, verbose_name='Date'), - ), - migrations.AlterField( - model_name='collabs_hour', - name='bNoticed', - field=models.BooleanField(blank=True, default=False, verbose_name='Vérifiée'), - ), - ] diff --git a/collabs/migrations_save/0013_alter_collabs_hour_dtdate.py b/collabs/migrations_save/0013_alter_collabs_hour_dtdate.py deleted file mode 100644 index f6eca18..0000000 --- a/collabs/migrations_save/0013_alter_collabs_hour_dtdate.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-02-16 12:31 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('collabs', '0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed'), - ] - - operations = [ - migrations.AlterField( - model_name='collabs_hour', - name='dtDate', - field=models.DateTimeField(auto_now_add=True, verbose_name='Date'), - ), - ] diff --git a/collabs/migrations_save/0014_alter_collabs_hour_dtdate.py b/collabs/migrations_save/0014_alter_collabs_hour_dtdate.py deleted file mode 100644 index 15cc907..0000000 --- a/collabs/migrations_save/0014_alter_collabs_hour_dtdate.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-02-16 12:39 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('collabs', '0013_alter_collabs_hour_dtdate'), - ] - - operations = [ - migrations.AlterField( - model_name='collabs_hour', - name='dtDate', - field=models.DateTimeField(verbose_name='Date'), - ), - ] diff --git a/collabs/migrations_save/0015_alter_collabs_hour_dtdate_and_more.py b/collabs/migrations_save/0015_alter_collabs_hour_dtdate_and_more.py deleted file mode 100644 index 499be99..0000000 --- a/collabs/migrations_save/0015_alter_collabs_hour_dtdate_and_more.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 4.0 on 2022-02-16 12:41 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('collabs', '0014_alter_collabs_hour_dtdate'), - ] - - operations = [ - migrations.AlterField( - model_name='collabs_hour', - name='dtDate', - field=models.DateField(verbose_name='Date'), - ), - migrations.AlterField( - model_name='collabs_hour', - name='sRemarques', - field=models.TextField(blank=True, verbose_name='Remarques'), - ), - ] diff --git a/collabs/migrations_save/0016_collabs_hour_sbases.py b/collabs/migrations_save/0016_collabs_hour_sbases.py deleted file mode 100644 index bba5804..0000000 --- a/collabs/migrations_save/0016_collabs_hour_sbases.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-02-16 12:54 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('collabs', '0015_alter_collabs_hour_dtdate_and_more'), - ] - - operations = [ - migrations.AddField( - model_name='collabs_hour', - name='sBases', - field=models.CharField(choices=[('1', 'Monthey'), ('2', 'Uvrier')], default=1, max_length=1, verbose_name='Employé de la base de'), - ), - ] diff --git a/collabs/migrations_save/0017_alter_collabs_hour_options.py b/collabs/migrations_save/0017_alter_collabs_hour_options.py deleted file mode 100644 index df4c2db..0000000 --- a/collabs/migrations_save/0017_alter_collabs_hour_options.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 4.0 on 2022-03-06 19:48 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('collabs', '0016_collabs_hour_sbases'), - ] - - operations = [ - migrations.AlterModelOptions( - name='collabs_hour', - options={'permissions': (('can_notice', 'Peut noter comme traitée'),), 'verbose_name': 'heure suplémentaire', 'verbose_name_plural': 'heures suplémentaires'}, - ), - ] diff --git a/collabs/migrations_save/0018_collabs_hour_types_alter_collabs_hour_options_and_more.py b/collabs/migrations_save/0018_collabs_hour_types_alter_collabs_hour_options_and_more.py deleted file mode 100644 index 3112274..0000000 --- a/collabs/migrations_save/0018_collabs_hour_types_alter_collabs_hour_options_and_more.py +++ /dev/null @@ -1,43 +0,0 @@ -# Generated by Django 4.0 on 2022-05-01 17:03 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('auth', '0012_alter_user_first_name_max_length'), - ('collabs', '0017_alter_collabs_hour_options'), - ] - - operations = [ - migrations.CreateModel( - name='Collabs_hour_types', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100, verbose_name='Dénomination')), - ('dtUpdate', models.DateTimeField(auto_now=True, verbose_name='Date de modification')), - ('dtCreated', models.DateTimeField(auto_now_add=True, verbose_name='Date de création')), - ], - options={ - 'verbose_name': 'type', - 'verbose_name_plural': 'types', - }, - ), - migrations.AlterModelOptions( - name='collabs_hour', - options={'permissions': (('can_notice', 'Peut noter comme traitée'),), 'verbose_name': 'heure supplémentaire', 'verbose_name_plural': 'heures supplémentaires'}, - ), - migrations.AlterField( - model_name='collabs_hour', - name='user', - field=models.ForeignKey(limit_choices_to={'groups__name': 'Intervenants'}, on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user', verbose_name='Collaborateur'), - ), - migrations.AddField( - model_name='collabs_hour', - name='type', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.DO_NOTHING, to='collabs.collabs_hour_types', verbose_name='Types'), - preserve_default=False, - ), - ] diff --git a/collabs/migrations_save/__init__.py b/collabs/migrations_save/__init__.py deleted file mode 100644 index e69de29..0000000