Began to write a manager for the Note class to get some logic out of the views

[pcdenotes.git] / notes / views.py

diff --git a/notes/views.py b/notes/views.py
index 2c79254277e73f9596434f94388a515948b8647a..c89d09619079f5f6926c16735b38b4a57e1a62a5 100644 (file)
--- a/notes/views.py
+++ b/notes/views.py
@@ -38,9 +38,9 @@ def archive_main(request):
     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.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.per_year(archive_year).annotate(created_month=ExtractMonth('created_at')).values_list('created_month', flat=True).distinct().order_by('created_month')

     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):

-    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
     return render(request, 'archive_month.html', {'year': archive_year, 'month': archive_month, 'notes': notes})
\ No newline at end of file