diff --git a/.gitignore b/.gitignore index 1bd6c59..bd0a7c6 100644 --- a/.gitignore +++ b/.gitignore @@ -377,5 +377,7 @@ db.sqlite3 /Reskreen/my.cnf db.sqlite3 -/config/my.cnf -/config/my_dev.cnf +config/my.cnf +config/my_dev.cnf +config/my_dev.cnf +config/my.cnf diff --git a/mycaldav/migrations/0001_initial.py b/mycaldav/migrations/0001_initial.py new file mode 100644 index 0000000..d5dcbdd --- /dev/null +++ b/mycaldav/migrations/0001_initial.py @@ -0,0 +1,24 @@ +# Generated by Django 5.0.7 on 2025-01-24 00:55 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='caldav_sync_manager', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('dtDate', models.DateField(unique=True, verbose_name='Date_synchronized')), + ('bDone', models.BooleanField(default=False, verbose_name='Effectuée')), + ('dtUpdated', models.DateTimeField(auto_now=True, verbose_name='date updated')), + ('dtCreated', models.DateTimeField(auto_now_add=True, verbose_name='date published')), + ], + ), + ] diff --git a/studenteval/migrations/0001_initial.py b/studenteval/migrations/0001_initial.py new file mode 100644 index 0000000..ed571cc --- /dev/null +++ b/studenteval/migrations/0001_initial.py @@ -0,0 +1,52 @@ +# Generated by Django 5.0.7 on 2025-01-24 00:55 + +import django.db.models.deletion +import django.utils.timezone +import studenteval.models +import uuid +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='cl_Student_eval', + fields=[ + ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), + ('ID', models.IntegerField(default=studenteval.models.increment_ID, editable=False, unique=True, verbose_name='ID du Suivi')), + ('sAuthor', models.CharField(max_length=120, verbose_name='Auteur')), + ('sAuthor_2e', models.CharField(blank=True, max_length=120, verbose_name='Co-auteur')), + ('sStudent', models.CharField(max_length=120, verbose_name="Nom de l'étudiant/stagiaire")), + ('nEval_Type', models.CharField(choices=[('1', 'Intervention'), ('2', 'Journée'), ('3', 'Exercice')], default=0, max_length=1, verbose_name='Type de suivi')), + ('dtDate', models.DateField(default=django.utils.timezone.now, verbose_name='Date concernée')), + ('sRef', models.CharField(blank=True, max_length=120, verbose_name='N° de référence / FIP')), + ('nEval_Mode', models.CharField(choices=[('1', 'Auto-évaluation'), ('2', 'Encadrant')], default=0, max_length=1, verbose_name='Mode de suivi ')), + ('sDesc_neg', models.TextField(verbose_name='Points à améliorer')), + ('sDesc_pos', models.TextField(verbose_name='Points positifs')), + ('sDesc_global', models.TextField(verbose_name="Avis global sur l'intervention/journée/exercice")), + ('nInter_Nature', models.CharField(blank=True, choices=[('1', 'Trauma'), ('2', 'non-Trauma')], default=0, max_length=1, verbose_name='Nature')), + ('nInter_Priority', models.CharField(blank=True, choices=[('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'S1'), ('5', 'S2'), ('6', 'S3'), ('7', 'Exercice')], default=0, max_length=1, verbose_name='Priorité')), + ('nInter_Complexity', models.CharField(blank=True, choices=[('1', 'Stable / Simple'), ('2', 'Stable / Complexe'), ('3', 'Instable / Simple'), ('4', 'Instable / Complexe')], default=0, max_length=1, verbose_name='Nature de complexité')), + ('sInter_Desc', models.TextField(blank=True, verbose_name='Description courte')), + ('nStudent_Role', models.CharField(blank=True, choices=[('1', 'Leader'), ('2', 'Équipier'), ('3', '3e position (observateur)')], default=0, max_length=1, verbose_name="Rôle de l'étudiant/stagiaire")), + ('dtUpdated', models.DateTimeField(auto_now=True, verbose_name='date updated')), + ('dtCreated', models.DateTimeField(auto_now_add=True, verbose_name='date published')), + ('Author', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='eval_author', to=settings.AUTH_USER_MODEL, verbose_name='Auteur')), + ('Author_2e', models.ForeignKey(blank=True, limit_choices_to={'groups__name': 'Intervenants-Monthey'}, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='eval_second_author', to=settings.AUTH_USER_MODEL, verbose_name='Co-auteur')), + ('Student', models.ForeignKey(limit_choices_to={'groups__name': 'FI-Étudiants'}, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='Nom du stagiaire/étudaint')), + ], + options={ + 'verbose_name': 'Suivi étudiants', + 'verbose_name_plural': 'Suivis étudiants', + 'ordering': ['-ID'], + }, + ), + ] diff --git a/vehicles/admin.py b/vehicles/admin.py index eb805ad..5c68981 100644 --- a/vehicles/admin.py +++ b/vehicles/admin.py @@ -6,7 +6,7 @@ from vehicles.models import * class _vhc_admin(admin.ModelAdmin): - list_display = ('sName', 'nBases', 'nStatus', "bLucas") + list_display = ('sName', 'nBases', 'nStatus', "bLucas","bDrap") ordering = ["nOrder"] @@ -24,7 +24,7 @@ class _vhc_admin(admin.ModelAdmin): 'fields': ('sName', "nBases") }), ('Statut et équipement', { - 'fields': ('nStatus', 'bLucas') + 'fields': ('nStatus', 'bLucas',"bDrap") }), ('Informations diverses', { 'fields': ("nOrder", "nType") diff --git a/vehicles/migrations_dev/0001_initial.py b/vehicles/migrations_dev/0001_initial.py new file mode 100644 index 0000000..9054c64 --- /dev/null +++ b/vehicles/migrations_dev/0001_initial.py @@ -0,0 +1,40 @@ +# Generated by Django 4.0 on 2021-12-18 17:54 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ] + + operations = [ + migrations.CreateModel( + name='Vehicles', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('sName', models.CharField(max_length=250)), + ('bEnabled', models.BooleanField(default=0)), + ], + ), + migrations.CreateModel( + name='Vhc_problems', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('sTitle', models.CharField(max_length=250)), + ('sDesc', models.TextField()), + ('bEnabled', models.BooleanField(default=1)), + ('dtStart', models.DateTimeField()), + ('dtEnd', models.DateTimeField()), + ('sAuthor', models.CharField(max_length=120)), + ('dtUpdated', models.DateTimeField(verbose_name='date updated')), + ('dtCreated', models.DateTimeField(verbose_name='date published')), + ('Author', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user')), + ('Vehicle', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='vehicles.vehicles')), + ], + ), + ] diff --git a/vehicles/migrations_dev/0002_vehicles_nbases_vehicles_nstatus_vhc_problems_ntype.py b/vehicles/migrations_dev/0002_vehicles_nbases_vehicles_nstatus_vhc_problems_ntype.py new file mode 100644 index 0000000..587be0a --- /dev/null +++ b/vehicles/migrations_dev/0002_vehicles_nbases_vehicles_nstatus_vhc_problems_ntype.py @@ -0,0 +1,28 @@ +# Generated by Django 4.0 on 2022-07-04 10:37 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('vehicles', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='vehicles', + name='nBases', + field=models.CharField(choices=[('1', 'Monthey'), ('2', 'Uvrier')], default=1, max_length=1, verbose_name='Basé à '), + ), + migrations.AddField( + model_name='vehicles', + name='nStatus', + field=models.CharField(choices=[('1', 'Opérationnel'), ('2', 'Hors Service'), ('3', 'Réserve'), ('4', 'Utilisation altérée')], default=1, max_length=1, verbose_name='Statut'), + ), + migrations.AddField( + model_name='vhc_problems', + name='nType', + field=models.CharField(choices=[('1', 'Technique'), ('2', 'Matériel'), ('3', 'Opérationnel')], default=1, max_length=1, verbose_name='Type'), + ), + ] diff --git a/vehicles/migrations_dev/0003_remove_vehicles_benabled_alter_vehicles_sname.py b/vehicles/migrations_dev/0003_remove_vehicles_benabled_alter_vehicles_sname.py new file mode 100644 index 0000000..c2d7558 --- /dev/null +++ b/vehicles/migrations_dev/0003_remove_vehicles_benabled_alter_vehicles_sname.py @@ -0,0 +1,22 @@ +# Generated by Django 4.0 on 2022-07-04 10:51 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('vehicles', '0002_vehicles_nbases_vehicles_nstatus_vhc_problems_ntype'), + ] + + operations = [ + migrations.RemoveField( + model_name='vehicles', + name='bEnabled', + ), + migrations.AlterField( + model_name='vehicles', + name='sName', + field=models.CharField(max_length=250, verbose_name='Indicatif'), + ), + ] diff --git a/vehicles/migrations_dev/0004_alter_vehicles_options.py b/vehicles/migrations_dev/0004_alter_vehicles_options.py new file mode 100644 index 0000000..4fb1225 --- /dev/null +++ b/vehicles/migrations_dev/0004_alter_vehicles_options.py @@ -0,0 +1,17 @@ +# Generated by Django 4.0 on 2022-07-04 10:58 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('vehicles', '0003_remove_vehicles_benabled_alter_vehicles_sname'), + ] + + operations = [ + migrations.AlterModelOptions( + name='vehicles', + options={'verbose_name': 'véhicule', 'verbose_name_plural': 'véhicules'}, + ), + ] diff --git a/vehicles/migrations_dev/0005_rename_vhc_problems_vhc_infos.py b/vehicles/migrations_dev/0005_rename_vhc_problems_vhc_infos.py new file mode 100644 index 0000000..a8a0361 --- /dev/null +++ b/vehicles/migrations_dev/0005_rename_vhc_problems_vhc_infos.py @@ -0,0 +1,18 @@ +# Generated by Django 4.0 on 2022-07-04 13:11 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ('vehicles', '0004_alter_vehicles_options'), + ] + + operations = [ + migrations.RenameModel( + old_name='Vhc_problems', + new_name='Vhc_infos', + ), + ] diff --git a/vehicles/migrations_dev/0006_rename_vhc_infos_vehicles_infos.py b/vehicles/migrations_dev/0006_rename_vhc_infos_vehicles_infos.py new file mode 100644 index 0000000..2960e24 --- /dev/null +++ b/vehicles/migrations_dev/0006_rename_vhc_infos_vehicles_infos.py @@ -0,0 +1,18 @@ +# Generated by Django 4.0 on 2022-07-04 16:13 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ('vehicles', '0005_rename_vhc_problems_vhc_infos'), + ] + + operations = [ + migrations.RenameModel( + old_name='Vhc_infos', + new_name='Vehicles_infos', + ), + ] diff --git a/vehicles/migrations_dev/0007_alter_vehicles_infos_options.py b/vehicles/migrations_dev/0007_alter_vehicles_infos_options.py new file mode 100644 index 0000000..c6d445a --- /dev/null +++ b/vehicles/migrations_dev/0007_alter_vehicles_infos_options.py @@ -0,0 +1,17 @@ +# Generated by Django 4.0 on 2022-07-04 18:19 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('vehicles', '0006_rename_vhc_infos_vehicles_infos'), + ] + + operations = [ + migrations.AlterModelOptions( + name='vehicles_infos', + options={'verbose_name': 'véhicule info', 'verbose_name_plural': 'véhicule infos'}, + ), + ] diff --git a/vehicles/migrations_dev/0008_alter_vehicles_infos_author_and_more.py b/vehicles/migrations_dev/0008_alter_vehicles_infos_author_and_more.py new file mode 100644 index 0000000..116aacc --- /dev/null +++ b/vehicles/migrations_dev/0008_alter_vehicles_infos_author_and_more.py @@ -0,0 +1,65 @@ +# Generated by Django 4.0 on 2022-07-04 18:59 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ('vehicles', '0007_alter_vehicles_infos_options'), + ] + + operations = [ + migrations.AlterField( + model_name='vehicles_infos', + name='Author', + field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user', verbose_name='Auteur'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='Vehicle', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='vehicles.vehicles', verbose_name='Véhicule'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='bEnabled', + field=models.BooleanField(default=1, verbose_name='Actif'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='dtCreated', + field=models.DateTimeField(auto_now_add=True, verbose_name='date published'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='dtEnd', + field=models.DateField(blank=True, verbose_name='Date de fin'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='dtStart', + field=models.DateField(verbose_name='Date de début'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='dtUpdated', + field=models.DateTimeField(auto_now=True, verbose_name='date updated'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='sAuthor', + field=models.CharField(max_length=120, verbose_name='auteur string'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='sDesc', + field=models.TextField(verbose_name='Description'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='sTitle', + field=models.CharField(max_length=250, verbose_name='Titre'), + ), + ] diff --git a/vehicles/migrations_dev/0009_alter_vehicles_infos_dtend.py b/vehicles/migrations_dev/0009_alter_vehicles_infos_dtend.py new file mode 100644 index 0000000..03f7c0b --- /dev/null +++ b/vehicles/migrations_dev/0009_alter_vehicles_infos_dtend.py @@ -0,0 +1,18 @@ +# Generated by Django 4.0 on 2022-07-04 19:02 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('vehicles', '0008_alter_vehicles_infos_author_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='vehicles_infos', + name='dtEnd', + field=models.DateField(blank=True, null=True, verbose_name='Date de fin'), + ), + ] diff --git a/vehicles/migrations_dev/0010_alter_vehicles_infos_ntype.py b/vehicles/migrations_dev/0010_alter_vehicles_infos_ntype.py new file mode 100644 index 0000000..54bc24a --- /dev/null +++ b/vehicles/migrations_dev/0010_alter_vehicles_infos_ntype.py @@ -0,0 +1,18 @@ +# Generated by Django 4.0 on 2022-11-10 11:29 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('vehicles', '0009_alter_vehicles_infos_dtend'), + ] + + operations = [ + migrations.AlterField( + model_name='vehicles_infos', + name='nType', + field=models.CharField(choices=[('1', 'Technique'), ('2', 'Matériel'), ('3', 'Péremption')], default=1, max_length=1, verbose_name='Type'), + ), + ] diff --git a/vehicles/migrations_dev/0011_remove_vehicles_infos_stitle_vehicles_blucas_and_more.py b/vehicles/migrations_dev/0011_remove_vehicles_infos_stitle_vehicles_blucas_and_more.py new file mode 100644 index 0000000..753af23 --- /dev/null +++ b/vehicles/migrations_dev/0011_remove_vehicles_infos_stitle_vehicles_blucas_and_more.py @@ -0,0 +1,32 @@ +# Generated by Django 4.0 on 2022-11-10 17:32 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('vehicles', '0010_alter_vehicles_infos_ntype'), + ] + + operations = [ + migrations.RemoveField( + model_name='vehicles_infos', + name='sTitle', + ), + migrations.AddField( + model_name='vehicles', + name='bLucas', + field=models.BooleanField(default=0, verbose_name='Lucas'), + ), + migrations.AddField( + model_name='vehicles', + name='nOrder', + field=models.IntegerField(default=0, verbose_name='Ordre'), + ), + migrations.AlterField( + model_name='vehicles', + name='nStatus', + field=models.CharField(choices=[('1', 'Opérationnel'), ('2', 'Réserve'), ('3', 'Utilisation altérée'), ('4', 'Hors Service')], default=1, max_length=1, verbose_name='Statut'), + ), + ] diff --git a/vehicles/migrations_dev/0012_merge_20230531_1527.py b/vehicles/migrations_dev/0012_merge_20230531_1527.py new file mode 100644 index 0000000..6b58f91 --- /dev/null +++ b/vehicles/migrations_dev/0012_merge_20230531_1527.py @@ -0,0 +1,14 @@ +# Generated by Django 4.0 on 2023-05-31 15:27 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('vehicles', '0010_alter_vehicles_infos_ntype'), + ('vehicles', '0011_remove_vehicles_infos_stitle_vehicles_blucas_and_more'), + ] + + operations = [ + ] diff --git a/vehicles/migrations_dev/0013_vehicles_nteam_vehicles_ntype_and_more.py b/vehicles/migrations_dev/0013_vehicles_nteam_vehicles_ntype_and_more.py new file mode 100644 index 0000000..2276359 --- /dev/null +++ b/vehicles/migrations_dev/0013_vehicles_nteam_vehicles_ntype_and_more.py @@ -0,0 +1,29 @@ +# Generated by Django 5.0.7 on 2025-01-24 02:46 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('vehicles', '0012_merge_20230531_1527'), + ] + + operations = [ + migrations.AddField( + model_name='vehicles', + name='nTeam', + field=models.CharField(choices=[('1', 'Équipe 1'), ('2', 'Equipe 2'), ('3', 'Equipe 3'), ('4', 'Equipe 4')], default=1, max_length=1, verbose_name='Équipe'), + ), + migrations.AddField( + model_name='vehicles', + name='nType', + field=models.CharField(choices=[('1', 'Ambulance Urgence'), ('2', 'Ambulance Transfert'), ('3', 'Véhicule service')], default=1, max_length=1, verbose_name='Type'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='Vehicle', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='vehicles_infos', to='vehicles.vehicles', verbose_name='Véhicule'), + ), + ] diff --git a/vehicles/migrations_dev/0014_vehicles_bdrap.py b/vehicles/migrations_dev/0014_vehicles_bdrap.py new file mode 100644 index 0000000..65d3d02 --- /dev/null +++ b/vehicles/migrations_dev/0014_vehicles_bdrap.py @@ -0,0 +1,18 @@ +# Generated by Django 5.0.7 on 2025-01-24 02:49 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('vehicles', '0013_vehicles_nteam_vehicles_ntype_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='vehicles', + name='bDrap', + field=models.BooleanField(default=0, verbose_name='Drap HRC'), + ), + ] diff --git a/vehicles/migrations_dev/__init__.py b/vehicles/migrations_dev/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/vehicles/models.py b/vehicles/models.py index d37d1e3..e1544d7 100644 --- a/vehicles/models.py +++ b/vehicles/models.py @@ -38,7 +38,7 @@ class Vehicles(models.Model): nStatus = models.CharField('Statut', max_length=1, choices=STATUS_CHOICES, default=1) nType = models.CharField('Type', max_length=1, choices=VHC_CHOICES, default=1) bLucas = models.BooleanField("Lucas", default=0) - #bDrap = models.BooleanField("Drap HRC", default=0) + bDrap = models.BooleanField("Drap HRC", default=0) nOrder = models.IntegerField("Ordre", default=0) nTeam = models.CharField('Équipe', max_length=1, choices=TEAM_NUMBER, default=1)