Merge pull request #131 from Code-Institute-Org/add_sort_by_feature_to_bookmarks

Add sort by bookmark date feature

Author: nazarja

lms/djangoapps/ci_program/urls.py

@@ -1,8 +1,9 @@
 from django.conf.urls import url
 
-from .views import show_programs, show_program_bookmarks
+from .views import show_programs, show_program_bookmarks, set_bookmark_preference
 
 urlpatterns = [
     url(r'^(?P<program_name>[\w\-]+)$', show_programs, name='show_programs'),
     url(r'^(?P<program_name>[\w\-]+)/bookmarks', show_program_bookmarks, name='show_program_bookmarks'),
+    url(r'^(?P<program_name>[\w\-]+)/bookmark_preference', set_bookmark_preference, name='set_bookmark_preference'),
 ]

lms/djangoapps/ci_program/views.py

@@ -8,6 +8,7 @@
 from ci_program.models import Program
 from openedx.core.djangoapps.bookmarks.models import Bookmark
 from django.http import Http404
+from django.http import HttpResponseRedirect
 
 
 @login_required
@@ -46,9 +47,13 @@ def show_program_bookmarks(request, program_name):
     page_size = int(request.GET.get('page_size', 10))
 
     program = Program.objects.get(marketing_slug=program_name)
-    bookmarks = Bookmark.objects.filter(
-#        course_key__in=program.get_course_locators(),
-        user=request.user)
+    bookmark_sort_by_desc = request.COOKIES.get('bookmark_sort_by_desc', 'false')
+
+    if bookmark_sort_by_desc == 'true':
+        bookmarks = Bookmark.objects.filter(user=request.user).order_by('-created')
+    else:
+        bookmarks = Bookmark.objects.filter(user=request.user)
+    
     page_data = bookmarks[(page - 1) * page_size: page * page_size]
 
     return render_to_response('programs/program_bookmarks.html', {
@@ -57,4 +62,22 @@ def show_program_bookmarks(request, program_name):
         "page_size": page_size,
         "total_pages": math.ceil(len(bookmarks) / page_size),
         "program_name": program_name,
+        "bookmark_sort_by_desc": bookmark_sort_by_desc,
     })
+
+
+@login_required
+def set_bookmark_preference(request, program_name):
+    """
+    Set the bookmark preference for sort by date desc
+    """
+    sort_by_desc = request.POST.get('bookmark_preference', 'false')
+
+    response = HttpResponseRedirect(reverse('show_program_bookmarks', args=[program_name]))
+    
+    if sort_by_desc == 'true':
+        response.set_cookie('bookmark_sort_by_desc', 'true', max_age=30 * 24 * 60 * 60)  # Expires in 30 days
+    else:
+        response.set_cookie('bookmark_sort_by_desc', 'false', max_age=30 * 24 * 60 * 60)
+
+    return response