Ajout de Quill et avancé du dev
This commit is contained in:
@@ -3,7 +3,7 @@ from django.db import models
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.models import Group
|
||||
from django.utils import timezone
|
||||
from tinymce.models import HTMLField
|
||||
from django_quill.fields import QuillField
|
||||
|
||||
from django.dispatch import receiver
|
||||
from django.db.models.signals import pre_save
|
||||
@@ -26,10 +26,11 @@ class cr_Category(models.Model):
|
||||
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")
|
||||
sNotReadUsers = models.TextField()
|
||||
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 = HTMLField("Corps de texte")
|
||||
sText = QuillField ("Corps de texte")
|
||||
dtValidityFrom = models.DateField("Validité depuis",default=timezone.now)
|
||||
dtValidityTo = models.DateField("Validité jusqu'à", blank=True, null=True)
|
||||
bEnabled = models.BooleanField("Actif", default=True)
|
||||
@@ -41,6 +42,9 @@ class cr_Message(models.Model):
|
||||
dtUpdated = models.DateTimeField('date updated', auto_now=True)
|
||||
dtCreated = models.DateTimeField('date published', auto_now_add=True)
|
||||
|
||||
def get_dtCreated(self):
|
||||
return self.dtCreated.strftime("%d.%b.%Y %H:%M:%S")
|
||||
|
||||
def calc_read_quotas(self):
|
||||
obj = self
|
||||
n_dest = obj.sDestUsers.count('[')
|
||||
@@ -49,10 +53,9 @@ class cr_Message(models.Model):
|
||||
if n_dest == 0:
|
||||
return "No dest"
|
||||
|
||||
|
||||
print(f"{n_dest}/{n_readed}")
|
||||
return f"{(n_readed/n_dest)*100}%"
|
||||
|
||||
def __str__(self):
|
||||
return self.sTitle
|
||||
|
||||
class Meta:
|
||||
verbose_name = "message"
|
||||
|
Reference in New Issue
Block a user