X-Git-Url: https://git.p6c8.net/pcdenotes.git/blobdiff_plain/dc851e83d526d37eda6568818ab8b2363a510bd5..5757e47b2c03f4384b95ae6facc603a278d14ef9:/notes/views.py

diff --git a/notes/views.py b/notes/views.py
index d2c8bb0..19ace13 100644
--- a/notes/views.py
+++ b/notes/views.py
@@ -8,9 +8,9 @@ from .models import Note
 # Create your views here.
 
 def note_list(request):
-    notes = Note.objects.all() if request.user.is_staff else Note.objects.filter(status=1)
+    notes = Note.objects.all() if request.user.is_staff else Note.objects.all_published()
 
-    notes_count = Note.objects.filter(status=1).count()
+    notes_count = notes.count()
     paginator = Paginator(notes, NOTES_PER_PAGE)
 
     page_number = 1
@@ -34,13 +34,13 @@ 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_with_total()
     return render(request, 'archive_main.html', {'years': notes_years})
 
 def archive_year(request, archive_year):
-    notes_months = Note.objects.filter(status=1, created_at__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_with_total(archive_year)
     return render(request, 'archive_year.html', {'year': archive_year, 'months': notes_months})
 
 def archive_month(request, archive_year, archive_month):
-    notes = Note.objects.filter(status=1, created_at__year=archive_year, created_at__month=archive_month)
+    notes = Note.objects.per_month(archive_year, archive_month)
     return render(request, 'archive_month.html', {'year': archive_year, 'month': archive_month, 'notes': notes})
\ No newline at end of file