From cdab789f4e06f8484ef1c79ca66f37bb971be454 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Mon, 24 May 2021 17:37:48 +0530
Subject: Fix minor ui issue in moderator interface
- Move 'Deactivate course' to the end of the dropdown.
- First page of 'Manage Course' shows enrollments.
---
yaksh/templates/yaksh/course_detail.html | 29 -----
yaksh/templates/yaksh/course_detail_options.html | 149 +++++++++++++++--------
yaksh/templates/yaksh/courses.html | 76 +++++++-----
yaksh/urls.py | 2 -
yaksh/views.py | 39 ++----
5 files changed, 159 insertions(+), 136 deletions(-)
diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html
index 8661aea..04a11e8 100644
--- a/yaksh/templates/yaksh/course_detail.html
+++ b/yaksh/templates/yaksh/course_detail.html
@@ -58,35 +58,6 @@
{% elif is_upload_download_md %}
{% include "yaksh/upload_download_course_md.html" %}
{% else %}
-
-
Manage Course
-
-
-
- -
- Students enrollments
-
- -
- Add and View Modules, Lessons and Quizzes
-
- -
- Send mail to the students
-
- -
- View Students course progress
-
- -
- Add and View Teachers/TAs
-
-
-
-
-
-
- Learn more
-
-
-
-
- -
-
- Enrollments
-
-
- -
-
- Course Modules
-
-
- -
-
- Design Course
-
-
- -
-
- Course Progress
-
-
- -
-
- Send Mail
-
-
- -
-
- Discussion Forum
-
-
- -
-
- Add Teachers/TAs
-
-
- -
-
- Current Teachers/TAs
-
-
- -
-
- Upload / Download MD
-
-
+
\ No newline at end of file
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index b9e48d6..1d6ee7f 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -122,38 +122,54 @@
diff --git a/yaksh/urls.py b/yaksh/urls.py
index a1aa607..f31e450 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -220,8 +220,6 @@ urlpatterns = [
views.download_course, name="download_course"),
url(r'^download_course/(?P\d+)/$',
views.download_course, name="download_course"),
- url(r'^manage/course/enrollments/(?P\d+)',
- views.course_students, name="course_students"),
url(r'^manage/course/all/modules/(?P\d+)',
views.get_course_modules, name="get_course_modules"),
url(r'^manage/course/teachers/(?P\d+)',
diff --git a/yaksh/views.py b/yaksh/views.py
index 4a6f462..4a97d1a 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -1182,7 +1182,6 @@ def courses(request):
@email_verified
def course_detail(request, course_id):
user = request.user
-
if not is_moderator(user):
raise Http404('You are not allowed to view this page')
@@ -1190,9 +1189,18 @@ def course_detail(request, course_id):
if not course.is_creator(user) and not course.is_teacher(user):
raise Http404('This course does not belong to you')
- return my_render_to_response(
- request, 'yaksh/course_detail.html', {'course': course}
- )
+ enrolled_users = course.get_enrolled()
+ requested_users = course.get_requests()
+ rejected_users = course.get_rejected()
+ context = {
+ "enrolled_users": enrolled_users,
+ "requested_users": requested_users,
+ "course": course,
+ "rejected_users": rejected_users,
+ "is_students": True
+ }
+
+ return my_render_to_response(request, 'yaksh/course_detail.html', context)
@login_required
@@ -3346,29 +3354,6 @@ def download_course(request, course_id):
return response
-@login_required
-@email_verified
-def course_students(request, course_id):
- user = request.user
- if not is_moderator(user):
- raise Http404('You are not allowed to view this page!')
- course = get_object_or_404(Course, pk=course_id)
- if not course.is_creator(user) and not course.is_teacher(user):
- raise Http404("You are not allowed to view {0}".format(
- course.name))
- enrolled_users = course.get_enrolled()
- requested_users = course.get_requests()
- rejected_users = course.get_rejected()
- context = {
- "enrolled_users": enrolled_users,
- "requested_users": requested_users,
- "course": course,
- "rejected_users": rejected_users,
- "is_students": True
- }
- return my_render_to_response(request, 'yaksh/course_detail.html', context)
-
-
@login_required
@email_verified
def course_teachers(request, course_id):
--
cgit