From 7f46a327b85a1832a3abb7b91c56863821ec811c Mon Sep 17 00:00:00 2001 From: Patrick Canterino Date: Mon, 11 Apr 2022 18:42:54 +0200 Subject: [PATCH] Created manager methods for getting a list of years or months --- notes/models.py | 7 +++++++ notes/views.py | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/notes/models.py b/notes/models.py index 70961fd..2957cb8 100644 --- a/notes/models.py +++ b/notes/models.py @@ -1,4 +1,5 @@ from django.db import models +from django.db.models.functions import ExtractYear, ExtractMonth from django.contrib.auth.models import User from django.urls import reverse @@ -17,6 +18,12 @@ class NoteManager(models.Manager): def per_month(self, year, month): return super().get_queryset().filter(status=1, created_at__year=year, created_at__month=month) + 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 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') + class Note(models.Model): title = models.CharField(max_length=250) slug = models.SlugField(max_length=250, unique=True) diff --git a/notes/views.py b/notes/views.py index c89d096..c6f2e26 100644 --- 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): - notes_years = Note.objects.filter(status=1).annotate(created_year=ExtractYear('created_at')).values_list('created_year', flat=True).distinct().order_by('created_year') + notes_years = Note.objects.years() return render(request, 'archive_main.html', {'years': notes_years}) def archive_year(request, archive_year): - notes_months = Note.objects.per_year(archive_year).annotate(created_month=ExtractMonth('created_at')).values_list('created_month', flat=True).distinct().order_by('created_month') + notes_months = Note.objects.months(archive_year) return render(request, 'archive_year.html', {'year': archive_year, 'months': notes_months}) def archive_month(request, archive_year, archive_month): -- 2.34.1