débug op view

vehicles/admin.py

@@ -1,3 +1,41 @@
 from django.contrib import admin
 
-# Register your models here.
+from vehicles.models import *
+
+class _vhc_admin(admin.ModelAdmin):
+
+    list_display = ('sName', 'nBases', 'nStatus')
+
+
+
+    search_fields = ['sName']
+
+
+    #fields = ["sBases", "dtDate",'type', "user","nHour", "nMinutes", "sRemarques"]
+
+class _vhc_infos_admin(admin.ModelAdmin):
+
+    #list_display = ('Vehicle', 'nType', 'sTitle','sDesc')
+
+
+
+    search_fields = ['sName']
+
+
+    #fields = ["Vehicle", "nType",'sTitle', "sDesc","dtStart", "dtEnd", "Author"]
+    fieldsets = (
+        ('Informations liées au véhicule', {
+            'fields': ('Vehicle',)
+        }),
+        ('Information sur le message', {
+            'fields': ('nType','sTitle','sDesc')
+        }),
+        ('Information supplémentaires et validité', {
+            'fields': ("dtStart","dtEnd", 'Author')
+        }),
+    )
+
+
+
+admin.site.register(vehicles_infos, _vhc_infos_admin)
+admin.site.register(vehicles, _vhc_admin)

vehicles/apps.py

@@ -4,3 +4,4 @@ from django.apps import AppConfig
 class VehiclesConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'vehicles'
+    verbose_name = "Clerc véhicule"

vehicles/migrations/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'),
+        ),
+    ]

vehicles/migrations/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'),
+        ),
+    ]

vehicles/migrations/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'},
+        ),
+    ]

vehicles/migrations/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',
+        ),
+    ]

vehicles/migrations/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',
+        ),
+    ]

vehicles/migrations/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'},
+        ),
+    ]

vehicles/migrations/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'),
+        ),
+    ]

vehicles/migrations/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'),
+        ),
+    ]

vehicles/models.py

@@ -4,20 +4,53 @@ from django.db import models
 from django.conf import settings
 from django.utils import timezone
 
+BASES_CHOICES = [
+    ('1', 'Monthey'),
+    ('2', 'Uvrier'),
+]
+STATUS_CHOICES = [
+    ('1', 'Opérationnel'),
+    ('2', 'Hors Service'),
+    ('3', 'Réserve'),
+    ('4', 'Utilisation altérée'),
+]
+TYPES_CHOICES = [
+    ('1', 'Technique'),
+    ('2', 'Matériel'),
+    ('3', 'Opérationnel'),
+]
 
-class Vehicles(models.Model):
-    sName = models.CharField (max_length=250)
-    bEnabled = models.BooleanField( default=0 )
 
-class Vhc_problems(models.Model):
-    Vehicle = models.ForeignKey( Vehicles, on_delete=models.CASCADE)
-    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)
-    Author = models.ForeignKey( settings.AUTH_USER_MODEL, on_delete=models.DO_NOTHING )
-    dtUpdated = models.DateTimeField('date updated')
-    dtCreated = models.DateTimeField('date published')
+class vehicles(models.Model):
+    sName = models.CharField("Indicatif", max_length=250)
+    nBases = models.CharField('Basé à ', max_length=1, choices=BASES_CHOICES, default=1)
+    nStatus = models.CharField('Statut', max_length=1, choices=STATUS_CHOICES, default=1)
 
+    def __str__(self):
+        return self.sName
+
+    class Meta:
+        verbose_name = "véhicule"
+        verbose_name_plural = "véhicules"
+
+
+class vehicles_infos(models.Model):
+    Vehicle = models.ForeignKey(vehicles, on_delete=models.CASCADE, verbose_name="Véhicule")
+    nType = models.CharField('Type', max_length=1, choices=TYPES_CHOICES, default=1)
+    sTitle = models.CharField("Titre",max_length=250)
+    sDesc = models.TextField("Description")
+    bEnabled = models.BooleanField("Actif",default=1)
+
+    dtStart = models.DateField("Date de début")
+    dtEnd = models.DateField("Date de fin", blank=True, null=True)
+    sAuthor = models.CharField("auteur string",max_length=120)
+    Author = models.ForeignKey(settings.AUTH_USER_MODEL,verbose_name="Auteur", on_delete=models.DO_NOTHING)
+    dtUpdated = models.DateTimeField('date updated', auto_now=True)
+    dtCreated = models.DateTimeField('date published', auto_now_add=True)
+
+    def __str__(self):
+        return self.sTitle
+
+    class Meta:
+        verbose_name = "véhicule info"
+        verbose_name_plural = "véhicule infos"