From ae78048a1f978a6a570faeb10ecb77229460eae1 Mon Sep 17 00:00:00 2001
From: Akshen
Date: Tue, 31 Oct 2017 11:15:41 +0530
Subject: Fix Course Ordering in Courses Page

Latest Course will be shown on Top in Courses Page
---
 yaksh/views.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/yaksh/views.py b/yaksh/views.py
index b4cb844..47d8c9f 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -792,8 +792,10 @@ def courses(request):
     ci = RequestContext(request)
     if not is_moderator(user):
         raise Http404('You are not allowed to view this page')
-    courses = Course.objects.filter(creator=user, is_trial=False)
-    allotted_courses = Course.objects.filter(teachers=user, is_trial=False)
+    courses = Course.objects.filter(
+        creator=user, is_trial=False).order_by('-id')
+    allotted_courses = Course.objects.filter(
+        teachers=user, is_trial=False).order_by('-id')
     context = {'courses': courses, "allotted_courses": allotted_courses}
     return my_render_to_response('yaksh/courses.html', context,
                                  context_instance=ci)
-- 
cgit 


From 8aa26daa4707bb6884f1132925866f9afc164375 Mon Sep 17 00:00:00 2001
From: Akshen
Date: Fri, 3 Nov 2017 11:11:29 +0530
Subject: Update CHANGELOG

---
 CHANGELOG.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ab9e4b2..ddf0953 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -12,6 +12,7 @@
 * Fixed a bug that did not allow expected input in Standard I/O type question to be none.
 * UI changes in grade user, view answerpaper and monitor pages.
 * Fixed a bug that would require shebang to be put in for Bash assertion based questions.
+* Latest Course will be shown on top of Courses Page.
 
 === 0.6.0 (11-05-2017) ===
 
-- 
cgit 


From 9aeaf153851c7821336ab542b4fd8f4e621a8d65 Mon Sep 17 00:00:00 2001
From: Akshen
Date: Sat, 4 Nov 2017 13:35:36 +0530
Subject: Show Active Course on top of Courses Page

---
 yaksh/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yaksh/views.py b/yaksh/views.py
index 47d8c9f..0d6acfe 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -793,9 +793,9 @@ def courses(request):
     if not is_moderator(user):
         raise Http404('You are not allowed to view this page')
     courses = Course.objects.filter(
-        creator=user, is_trial=False).order_by('-id')
+        creator=user, is_trial=False).order_by('-active')
     allotted_courses = Course.objects.filter(
-        teachers=user, is_trial=False).order_by('-id')
+        teachers=user, is_trial=False).order_by('-active')
     context = {'courses': courses, "allotted_courses": allotted_courses}
     return my_render_to_response('yaksh/courses.html', context,
                                  context_instance=ci)
-- 
cgit 


From 52afb684b1bd59cc1d5f2f1a6963b877a5604b37 Mon Sep 17 00:00:00 2001
From: Akshen
Date: Mon, 6 Nov 2017 15:45:21 +0530
Subject: Show Latest Active Course on top of Courses Page

---
 CHANGELOG.txt  | 2 +-
 yaksh/views.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ddf0953..7da93c4 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -12,7 +12,7 @@
 * Fixed a bug that did not allow expected input in Standard I/O type question to be none.
 * UI changes in grade user, view answerpaper and monitor pages.
 * Fixed a bug that would require shebang to be put in for Bash assertion based questions.
-* Latest Course will be shown on top of Courses Page.
+* Updated Courses Page to show Active Courses on top.
 
 === 0.6.0 (11-05-2017) ===
 
diff --git a/yaksh/views.py b/yaksh/views.py
index 0d6acfe..e2412bb 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -793,9 +793,9 @@ def courses(request):
     if not is_moderator(user):
         raise Http404('You are not allowed to view this page')
     courses = Course.objects.filter(
-        creator=user, is_trial=False).order_by('-active')
+        creator=user, is_trial=False).order_by('-active', '-id')
     allotted_courses = Course.objects.filter(
-        teachers=user, is_trial=False).order_by('-active')
+        teachers=user, is_trial=False).order_by('-active', '-id')
     context = {'courses': courses, "allotted_courses": allotted_courses}
     return my_render_to_response('yaksh/courses.html', context,
                                  context_instance=ci)
-- 
cgit