Added some space between the bottom nav links on mobile devices

[pcdenotes.git] / notes / models.py

diff --git a/notes/models.py b/notes/models.py
index 2957cb8470891280a3bb4e0053433740f1022a2c..f5ab091af915b954d113b7e0fdebd3f58b9642d0 100644 (file)
--- a/notes/models.py
+++ b/notes/models.py
@@ -1,8 +1,14 @@
 from django.db import models
+from django.db.models import Count
 from django.db.models.functions import ExtractYear, ExtractMonth
+from django.db.models.signals import pre_save
+
+from django.dispatch import receiver
 from django.contrib.auth.models import User
 from django.urls import reverse
 
+from datetime import datetime
+
 # Create your models here.
 
 NOTE_STATUS = ((0, "Draft"),
@@ -21,9 +27,15 @@ class NoteManager(models.Manager):
     def years(self):
         return super().get_queryset().filter(status=1).annotate(created_year=ExtractYear('created_at')).values_list('created_year', flat=True).distinct().order_by('created_year')
 
+    def years_with_total(self):
+        return super().get_queryset().filter(status=1).annotate(created_year=ExtractYear('created_at')).values('created_year').annotate(total=Count('id')).order_by('created_year').values('created_year', 'total').distinct()
+
     def months(self, year):
         return self.per_year(year).annotate(created_month=ExtractMonth('created_at')).values_list('created_month', flat=True).distinct().order_by('created_month')
 
+    def months_with_total(self, year):
+        return self.per_year(year).annotate(created_month=ExtractMonth('created_at')).values('created_month').annotate(total=Count('id')).order_by('created_month').values('created_month', 'total').distinct()
+
 class Note(models.Model):
     title = models.CharField(max_length=250)
     slug = models.SlugField(max_length=250, unique=True)
@@ -33,6 +45,7 @@ class Note(models.Model):
     
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
+    published_at = models.DateTimeField(null=True, editable=False)
 
     objects = NoteManager()
 
@@ -49,4 +62,21 @@ class Note(models.Model):
         return self.status == 0
 
     def is_published(self):
-        return self.status == 1
\ No newline at end of file
+        return self.status == 1
+
+    def publication_date(self):
+        if self.published_at is None:
+            return self.created_at
+        else:
+            return self.published_at
+
+@receiver(pre_save, sender=Note)
+def note_pre_save(sender, instance, **kwargs):
+    if instance.pk is None:
+        if instance.status == 1:
+            instance.published_at = datetime.now()
+    else:
+        old_instance = Note.objects.get(pk=instance.pk)
+        
+        if old_instance.status == 0 and instance.status == 1:
+            instance.published_at = datetime.now()
\ No newline at end of file