Display number of notes in archive view

diff --git a/notes/models.py b/notes/models.py
index 2957cb8470891280a3bb4e0053433740f1022a2c..a3fe24ec5087a5970abbdf26fd7158413d906df5 100644 (file)
--- a/notes/models.py
+++ b/notes/models.py
@@ -1,4 +1,5 @@
 from django.db import models
 from django.db import models

+from django.db.models import Count

 from django.db.models.functions import ExtractYear, ExtractMonth
 from django.contrib.auth.models import User
 from django.urls import reverse
 from django.db.models.functions import ExtractYear, ExtractMonth
 from django.contrib.auth.models import User
 from django.urls import reverse


@@ -21,9 +22,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(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(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)
 class Note(models.Model):
     title = models.CharField(max_length=250)
     slug = models.SlugField(max_length=250, unique=True)

diff --git a/notes/templates/archive_main.html b/notes/templates/archive_main.html
index 268e950d42fa3b1f9710590459e637b9ec6f7035..2b1771176163b40c8f60b6670a7e3d2d20cdc848 100644 (file)
--- a/notes/templates/archive_main.html
+++ b/notes/templates/archive_main.html
@@ -8,7 +8,7 @@
 {% if years %}
 <ul>
   {% for year in years %}
 {% if years %}
 <ul>
   {% for year in years %}

-    <li><a href="{{ year }}/">{{ year }}</a></li>
+    <li><a href="{{ year.created_year }}/">{{ year.created_year }}</a> ({{ year.total }})</li>

   {% endfor %}
 </ul>
 {% else %}
   {% endfor %}
 </ul>
 {% else %}

diff --git a/notes/templates/archive_year.html b/notes/templates/archive_year.html
index 4d3d9059c0a188ed5ad7b2ba598e07f91088dfd1..d72b31fd72b414ab8c3855a18bbd6bbee6c95bb7 100644 (file)
--- a/notes/templates/archive_year.html
+++ b/notes/templates/archive_year.html
@@ -9,7 +9,7 @@
 {% if months %}
 <ul>
   {% for month in months %}
 {% if months %}
 <ul>
   {% for month in months %}

-    <li><a href="{{ month }}/">{{ month|month_name }}</a></li>
+    <li><a href="{{ month.created_month }}/">{{ month.created_month|month_name }}</a> ({{ month.total }})</li>

   {% endfor %}
 </ul>
 {% else %}
   {% endfor %}
 </ul>
 {% else %}

diff --git a/notes/views.py b/notes/views.py
index c6f2e26966407bb3f51b6d97367b3a19e174a42e..62a51e88fe7b45d4093d46062909eaeacaad2339 100644 (file)
--- a/notes/views.py
+++ b/notes/views.py
@@ -34,11 +34,11 @@ def note_detail(request, note_slug):
     return render(request, 'note_detail.html', {'note': note})
 
 def archive_main(request):
     return render(request, 'note_detail.html', {'note': note})
 
 def archive_main(request):

-    notes_years = Note.objects.years()
+    notes_years = Note.objects.years_with_total()

     return render(request, 'archive_main.html', {'years': notes_years})
 
 def archive_year(request, archive_year):
     return render(request, 'archive_main.html', {'years': notes_years})
 
 def archive_year(request, archive_year):

-    notes_months = Note.objects.months(archive_year)
+    notes_months = Note.objects.months_with_total(archive_year)

     return render(request, 'archive_year.html', {'year': archive_year, 'months': notes_months})
 
 def archive_month(request, archive_year, archive_month):
     return render(request, 'archive_year.html', {'year': archive_year, 'months': notes_months})
 
 def archive_month(request, archive_year, archive_month):