From d0c08efb57d0b83845ebccf67df09e798791c6e3 Mon Sep 17 00:00:00 2001 From: adityacp Date: Tue, 11 Feb 2020 15:12:49 +0530 Subject: Change templates, urls, views - Remove separate tab for allotted courses in moderator dashboard - Remove separate tab for enrolled courses in student dashboard - Increase pagination items for courses - Remove view function for allotted courses --- grades/templates/grading_systems.html | 5 -- yaksh/templates/yaksh/add_course.html | 5 -- yaksh/templates/yaksh/courses.html | 36 ++++++----- yaksh/templates/yaksh/grade_user.html | 31 ++++++++-- yaksh/templates/yaksh/lessons.html | 12 ++-- yaksh/templates/yaksh/moderator_dashboard.html | 2 +- yaksh/templates/yaksh/modules.html | 11 ++-- yaksh/templates/yaksh/monitor.html | 27 +++++++-- yaksh/templates/yaksh/quizzes.html | 12 ++-- yaksh/templates/yaksh/quizzes_user.html | 82 ++++++++------------------ yaksh/templates/yaksh/showquestions.html | 9 ++- yaksh/urls.py | 4 -- yaksh/views.py | 59 +++++++----------- 13 files changed, 134 insertions(+), 161 deletions(-) diff --git a/grades/templates/grading_systems.html b/grades/templates/grading_systems.html index 0b26e8e..8102230 100644 --- a/grades/templates/grading_systems.html +++ b/grades/templates/grading_systems.html @@ -11,11 +11,6 @@ My Courses -
  • - - Allotted Courses - -
  • Add New Course diff --git a/yaksh/templates/yaksh/add_course.html b/yaksh/templates/yaksh/add_course.html index 11a6497..72403ce 100644 --- a/yaksh/templates/yaksh/add_course.html +++ b/yaksh/templates/yaksh/add_course.html @@ -21,11 +21,6 @@ My Courses
    • -
  • - - Allotted Courses - -
  • Add New Course diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html index de8684f..2544956 100644 --- a/yaksh/templates/yaksh/courses.html +++ b/yaksh/templates/yaksh/courses.html @@ -21,11 +21,6 @@ My Courses
    • -
  • - - Allotted Courses - -
  • Add New Course @@ -52,13 +47,13 @@ - {% if not objects %} -
    -

    No Courses Found

    -
    -
    - {% else %} -
    +
    + {% if not objects %} +

    +
    +

    No Courses Found

    +
    + {% else %}
    {% if messages %} {% for message in messages %} @@ -92,7 +87,18 @@
    -
    +
    + {% if user.id != course.creator.id %} + + Allotted Course + + {% else %} + + Created Course + + {% endif %} +
    +
    {% if course.active %} Active @@ -103,8 +109,8 @@ {% endif %}
    -
    - +
    + {% if course.active %} {% else %} diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html index a8472c7..e3888b8 100644 --- a/yaksh/templates/yaksh/grade_user.html +++ b/yaksh/templates/yaksh/grade_user.html @@ -76,11 +76,16 @@ $(document).ready(function() {% endfor %}
    {% include "yaksh/paginator.html" %} +{% elif msg == 'grade' and not objects %} +
    +
    +

    No courses found to grade

    +
    {% endif %}
    - {% if not objects %} + {% if status == "grade" %} {% if users %}
      @@ -149,7 +154,7 @@ $(document).ready(function()
    {% if data.papers %} - {% for paper in data.papers %} + {% with data.papers.0 as paper %}
    Course Details @@ -159,8 +164,24 @@ $(document).ready(function()

    Course: {{ paper.course.name }}

    Quiz: {{ paper.question_paper.quiz.description }}

    +
    +

    Start time: {{ paper.start_time }}

    End time: {{ paper.end_time }}

    +
    +
    +
    +
    + {% endwith %} + {% for paper in data.papers %} +
    +
    +
    + Scorecard +
    +
    +
    +

    Status: {% if paper.passed %} Passed @@ -168,16 +189,16 @@ $(document).ready(function() Failed {% endif %}

    -
    -

    Total Marks: {{ paper.question_paper.total_marks }}

    Marks obtained: {{ paper.marks_obtained }}

    +
    +
    {% if paper.percent %}

    Percentage obtained: {{paper.percent}}%

    {% endif %}

    Total attempts at questions: {{ paper.answers.count }}

    - Attempt Number: + Attempt Number:  {{paper.attempt_number}} diff --git a/yaksh/templates/yaksh/lessons.html b/yaksh/templates/yaksh/lessons.html index 6bdc762..0146a6b 100644 --- a/yaksh/templates/yaksh/lessons.html +++ b/yaksh/templates/yaksh/lessons.html @@ -11,11 +11,6 @@ My Courses

    • -
  • - - Allotted Courses - -
  • Add New Course @@ -42,15 +37,16 @@ -
    +
     Add new Lesson {% if not lessons %}

    -

    No new Lessons added

    -

    +
    +

    No new Lessons added

    +
    {% else %}

    Lessons

    diff --git a/yaksh/templates/yaksh/moderator_dashboard.html b/yaksh/templates/yaksh/moderator_dashboard.html index 5d0de7b..b2d38b0 100644 --- a/yaksh/templates/yaksh/moderator_dashboard.html +++ b/yaksh/templates/yaksh/moderator_dashboard.html @@ -34,7 +34,7 @@ {% with objects as courses %}
    {% if not courses %} -
    +
    No Courses found. Add a new course or Create demo course
    {% else %} diff --git a/yaksh/templates/yaksh/modules.html b/yaksh/templates/yaksh/modules.html index 4edbf7d..4fafbf1 100644 --- a/yaksh/templates/yaksh/modules.html +++ b/yaksh/templates/yaksh/modules.html @@ -12,11 +12,6 @@ My Courses -
  • - - Allotted Courses - -
  • Add New Course @@ -43,14 +38,16 @@
    • -
    +
     Add new Module {% if not modules %} -

    No new learning modules added



    +
    +

    No new learning modules added

    +
    {% else %}

    Learning Modules

    diff --git a/yaksh/templates/yaksh/monitor.html b/yaksh/templates/yaksh/monitor.html index 51ca73e..cf6888c 100644 --- a/yaksh/templates/yaksh/monitor.html +++ b/yaksh/templates/yaksh/monitor.html @@ -2,7 +2,7 @@ {% load custom_filters %} {% load static %} {% block title %} Monitor {% endblock %} -{% block pagetitle %} {{ msg }} {% endblock pagetitle %} +{% block pagetitle %} Monitor {% endblock pagetitle %} {% block meta %} {% endblock meta %} @@ -87,8 +87,13 @@ $(document).ready(function() {% endfor %} {% include "yaksh/paginator.html" %} - {% endif %} + {% elif msg == 'Monitor' and not objects %} +
    +
    +

    No courses to monitor

    +
    + {% endif %} {# ############################################################### #} {# This is rendered when we are just viewing exam/monitor/quiz_num #} {% if msg != "Monitor" %} @@ -176,7 +181,7 @@ $(document).ready(function()
    -

    Uncheck unwanted columns

    +

    Download CSV for {{quiz.description}}

    @@ -184,13 +189,15 @@ $(document).ready(function()
    {% csrf_token %}
    + Uncheck unwanted columns +
    {% for field in csv_fields %}
    -
    +
    {% endfor %} Select Attempt Number: Default latest attempt
    - + @@ -214,7 +223,13 @@ $(document).ready(function()
    {% else %} -

    No answer papers found for {{ quiz.description }}

    +
    +
    +
    +

    No Users Found for {{ quiz.description }}

    +
    +
    +
    {% endif %} {# if papers #} {% else %}

    No Quiz Found

    diff --git a/yaksh/templates/yaksh/quizzes.html b/yaksh/templates/yaksh/quizzes.html index d42716c..7e53d31 100644 --- a/yaksh/templates/yaksh/quizzes.html +++ b/yaksh/templates/yaksh/quizzes.html @@ -12,11 +12,6 @@ My Courses -
  • - - Allotted Courses - -
  • Add New Course @@ -43,8 +38,8 @@
    • -
    +
     Add New Quiz @@ -53,8 +48,9 @@ {% if not quizzes %}

    -

    No new Quiz added

    -

    +
    +

    No new Quiz added

    +
    {% else %}

    Quizzes

    diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html index 1a708ef..7771954 100644 --- a/yaksh/templates/yaksh/quizzes_user.html +++ b/yaksh/templates/yaksh/quizzes_user.html @@ -7,56 +7,32 @@ {% block main %}
    - {% block navtab %} - {% if 'Enrolled Courses' not in title%} -
    -
    -
  • - - All Courses - -
    • -
  • - - Enrolled Courses - -
    • -
    -
    -
    -
    -
    - - {% csrf_token %} -
    -
    - - - - -
    -
    - +
    +

    All Courses

    +
    +
    +
    +
    +
    + {% csrf_token %} +
    +
    + + + + +
    -
    - {% else %} -
    -
    -
  • - - All Courses - -
    • -
  • - - Enrolled Courses - -
    • -
    + +
    + {% if title == "Search" %} +
    + +  Clear search +
    -
    {% endif %} - {% endblock %} +

    {% if messages %} {% for message in messages %} @@ -66,18 +42,10 @@ {{ message }}
    +
    {% endfor %} {% endif %} -
    - {% if msg %} -
    - - {{ msg }} -
    - {% endif %} -
    + {% if not courses %}
    {% include "yaksh/paginator.html" %} + {% else %} +

    +
    +

    No Questions created

    +
    {% endif %}

    @@ -195,9 +200,9 @@ {% if questions %} + {% endif %} - diff --git a/yaksh/urls.py b/yaksh/urls.py index e9f3539..49c3d4f 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -11,8 +11,6 @@ urlpatterns = [ url(r'^toggle_moderator/$', views.toggle_moderator_role, name='toggle_moderator'), url(r'^quizzes/$', views.quizlist_user, name='quizlist_user'), - url(r'^quizzes/(?P\w+)/$', views.quizlist_user, - name='quizlist_user'), url(r'^results/$', views.results_user), url(r'^start/(?P\d+)/(?P\d+)/' '(?P\d+)/$', views.start, name="start_quiz"), @@ -112,8 +110,6 @@ urlpatterns = [ url(r'^manage/duplicate_course/(?P\d+)/$', views.duplicate_course, name='duplicate_course'), url(r'manage/courses/$', views.courses, name='courses'), - url(r'manage/allotted/courses/$', views.allotted_courses, - name='allotted_courses'), url(r'manage/add_course/$', views.add_course, name='add_course'), url(r'manage/edit_course/(?P\d+)$', views.add_course, name='edit_course'), diff --git a/yaksh/views.py b/yaksh/views.py index 6d70766..28515fd 100644 --- a/yaksh/views.py +++ b/yaksh/views.py @@ -175,15 +175,16 @@ def quizlist_user(request, enrolled=None, msg=None): hidden_courses = Course.objects.get_hidden_courses(code=course_code) courses = hidden_courses title = 'Search' - elif enrolled is not None: - courses = user.students.filter(is_trial=False).order_by('-id') - title = 'Enrolled Courses' else: - courses = Course.objects.filter( - active=True, is_trial=False + courses = list(Course.objects.filter( + active=True, is_trial=False, ).exclude( ~Q(requests=user), ~Q(rejected=user), hidden=True - ).order_by('-id') + ).order_by('-id')) + enrolled_course = list( + user.students.filter(is_trial=False).order_by('-id') + ) + courses.extend(enrolled_course) title = 'All Courses' for course in courses: @@ -198,9 +199,10 @@ def quizlist_user(request, enrolled=None, msg=None): } ) + messages.info(request, msg) context = { 'user': user, 'courses': courses_data, - 'title': title, 'msg': msg + 'title': title } return my_render_to_response(request, "yaksh/quizzes_user.html", context) @@ -405,8 +407,8 @@ def prof_manage(request, msg=None): return my_redirect('/exam/') courses = Course.objects.get_queryset().filter( Q(creator=user) | Q(teachers=user), - is_trial=False).distinct().order_by("-id") - paginator = Paginator(courses, 10) + is_trial=False).distinct().order_by("-active") + paginator = Paginator(courses, 30) page = request.GET.get('page') try: courses = paginator.page(page) @@ -1041,8 +1043,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') - paginator = Paginator(courses, 20) + Q(creator=user) | Q(teachers=user), + is_trial=False).order_by('-active').distinct() + paginator = Paginator(courses, 30) page = request.GET.get('page') try: courses = paginator.page(page) @@ -1056,28 +1059,6 @@ def courses(request): return my_render_to_response(request, 'yaksh/courses.html', context) -@login_required -@email_verified -def allotted_courses(request): - user = request.user - if not is_moderator(user): - raise Http404('You are not allowed to view this page') - allotted_courses = Course.objects.filter( - teachers=user, is_trial=False).order_by('-id') - paginator = Paginator(allotted_courses, 20) - page = request.GET.get('page') - try: - allotted_courses = paginator.page(page) - except PageNotAnInteger: - # If page is not an integer, deliver first page. - allotted_courses = paginator.page(1) - except EmptyPage: - # If page is out of range (e.g. 9999), deliver last page of results. - allotted_courses = paginator.page(paginator.num_pages) - context = {'allotted': True, "objects": allotted_courses} - return my_render_to_response(request, 'yaksh/courses.html', context) - - @login_required @email_verified def course_detail(request, course_id): @@ -1256,7 +1237,7 @@ def monitor(request, quiz_id=None, course_id=None): Q(creator=user) | Q(teachers=user), is_trial=False ).order_by("-id").distinct() - paginator = Paginator(courses, 20) + paginator = Paginator(courses, 30) page = request.GET.get('page') try: courses = paginator.page(page) @@ -1727,7 +1708,7 @@ def grade_user(request, quiz_id=None, user_id=None, attempt_number=None, courses = Course.objects.filter( Q(creator=current_user) | Q(teachers=current_user), is_trial=False ).order_by("-id").distinct() - paginator = Paginator(courses, 20) + paginator = Paginator(courses, 30) page = request.GET.get('page') try: courses = paginator.page(page) @@ -1735,7 +1716,7 @@ def grade_user(request, quiz_id=None, user_id=None, attempt_number=None, courses = paginator.page(1) except EmptyPage: courses = paginator.page(paginator.num_pages) - context = {"objects": courses} + context = {"objects": courses, "msg": "grade"} if quiz_id is not None: questionpaper_id = QuestionPaper.objects.filter( @@ -1758,7 +1739,8 @@ def grade_user(request, quiz_id=None, user_id=None, attempt_number=None, "quiz_id": quiz_id, "quiz": quiz, "has_quiz_assignments": has_quiz_assignments, - "course_id": course_id + "course_id": course_id, + "status": "grade" } if user_id is not None: attempts = AnswerPaper.objects.get_user_all_attempts( @@ -1785,7 +1767,8 @@ def grade_user(request, quiz_id=None, user_id=None, attempt_number=None, "user_id": user_id, "has_user_assignments": has_user_assignments, "has_quiz_assignments": has_quiz_assignments, - "course_id": course_id + "course_id": course_id, + "status": "grade" } if request.method == "POST": papers = data['papers'] -- cgit