diff --git a/carnet_rouge/admin.py b/carnet_rouge/admin.py index 8c38f3f..623dbd7 100644 --- a/carnet_rouge/admin.py +++ b/carnet_rouge/admin.py @@ -1,3 +1,22 @@ from django.contrib import admin +from carnet_rouge.models import cr_Category, cr_Message + +class cr_Message_Admin(admin.ModelAdmin): + always_show_username = True + list_display = ('id', 'Author', 'sTitle', 'dtCreated') + list_filter = [('Author', admin.RelatedOnlyFieldListFilter)] +""" + + + list_filter = [('dtDate', DateRangeFilter), ('user', admin.RelatedOnlyFieldListFilter),'sBases','type', 'bNoticed'] + + search_fields = ['userName'] + readonly_fields = ["userName"] + + fields = ["sBases", "dtDate",'type', "user","nHour", "nMinutes", "sRemarques"] +""" + # Register your models here. +admin.site.register(cr_Category) +admin.site.register(cr_Message, cr_Message_Admin) \ No newline at end of file diff --git a/carnet_rouge/models.py b/carnet_rouge/models.py index 71a8362..ac7acfc 100644 --- a/carnet_rouge/models.py +++ b/carnet_rouge/models.py @@ -1,3 +1,42 @@ +import datetime from django.db import models +from django.conf import settings +from django.contrib.auth.models import Group +from django.utils import timezone + # Create your models here. +class cr_Category(models.Model): + sName = models.CharField("Désignation", max_length=250) + dtUpdated = models.DateTimeField('date updated', auto_now=True) + dtCreated = models.DateTimeField('date published', auto_now_add=True) + + def __str__(self): + return self.sName + + class Meta: + verbose_name = "catégorie" + verbose_name_plural = "catégories" + + +class cr_Message(models.Model): + Caterogy = models.ForeignKey(cr_Category, on_delete=models.DO_NOTHING, verbose_name="Catégorie") + sDestUsers = models.TextField("Liste des utilisateurs cibles") + sReadedUsers = models.TextField("Liste des utilisateurs ayant lu", blank=True) + DestGroup = models.ForeignKey(Group, on_delete=models.DO_NOTHING) + sTitle = models.CharField("Titre", max_length=120) + sText = models.TextField("Corps de texte") + dtValidityFrom = models.DateField("Validité depuis",default=timezone.now) + dtValidityTo = models.DateField("Validité jusqu'à", blank=True) + bEnabled = models.BooleanField("Actif", default=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) + + class Meta: + verbose_name = "message" + verbose_name_plural = "messages" \ No newline at end of file diff --git a/vehicles/static/vehicles/images/Thumbs.db b/vehicles/static/vehicles/images/Thumbs.db new file mode 100644 index 0000000..627865a Binary files /dev/null and b/vehicles/static/vehicles/images/Thumbs.db differ