From d9793c01304498d7f59820cf2ab2d7a5483851f8 Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Wed, 2 Mar 2016 15:48:39 +0530
Subject: Course module implemented
Moderator can now create courses. Under his courses he can create quizzes.
Students can enroll for the course. Moderator can approve or reject
enrollment request of the student.
Student can view quizzes only for the enrolled course.
---
yaksh/templates/manage.html | 6 +-
yaksh/templates/yaksh/add_course.html | 21 +++++
yaksh/templates/yaksh/add_quiz.html | 2 +-
yaksh/templates/yaksh/course_detail.html | 59 ++++++++++++
yaksh/templates/yaksh/courses.html | 39 ++++++++
yaksh/templates/yaksh/quizzes_user.html | 153 +++++++++++++++++++------------
6 files changed, 216 insertions(+), 64 deletions(-)
create mode 100644 yaksh/templates/yaksh/add_course.html
create mode 100644 yaksh/templates/yaksh/course_detail.html
create mode 100644 yaksh/templates/yaksh/courses.html
(limited to 'yaksh/templates')
diff --git a/yaksh/templates/manage.html b/yaksh/templates/manage.html
index ca2ac65..11e2187 100644
--- a/yaksh/templates/manage.html
+++ b/yaksh/templates/manage.html
@@ -27,9 +27,9 @@
Online Test
Course
+ {{ course.name }} + +You have not passed the prerequisite & hence you cannot take the quiz.
- {% endif %} -Quiz | -Pre requisite quiz | - {% for paper in quizzes %} -|||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
- {{ paper.quiz.description }} - |
- {% else %}
-
- {{ paper.quiz.description }} Expired - |
+
+
Quiz | +Pre requisite quiz | + {% for paper in quizzes %} + {% if paper.quiz.course_id == course.id %} +|
---|---|---|
+ {{ paper.quiz.description }} + |
+ {% else %}
+
+ {{ paper.quiz.description }} Expired + |
+ {% endif %}
+ + {% if paper.quiz.prerequisite %} + You have to pass {{ paper.quiz.prerequisite.description }} for taking {{ paper.quiz.description }} + {% else %} + No pre requisites for {{ paper.quiz.description }} + {% endif %} + | +
Quiz | +Result | +Marks Obtained | +Total Marks | +Percentage | + {% for paper in quizzes_taken %} +
---|---|---|---|---|
- {% if paper.quiz.prerequisite %} - You have to pass {{ paper.quiz.prerequisite.description }} for taking {{ paper.quiz.description }} + {{ paper.question_paper.quiz.description }} + | +
+ {% if paper.passed %}
+ Pass {% else %} - No pre requisites for {{ paper.quiz.description }} +Fail {% endif %} |
+ + {{ paper.marks_obtained }} + | ++ {{ paper.question_paper.total_marks }} + | ++ {{ paper.percent }} + |
Quiz | -Result | -Marks Obtained | -Total Marks | -Percentage | - {% for paper in quizzes_taken %} -
---|---|---|---|---|
- {{ paper.question_paper.quiz.description }} - | -
- {% if paper.passed %}
- Pass - {% else %} -Fail - {% endif %} - |
- - {{ paper.marks_obtained }} - | -- {{ paper.question_paper.total_marks }} - | -- {{ paper.percent }} - | -
You have not taken any quiz yet !!
- {% endif %} +{% else %} +You have not taken any quiz yet !!
+{% endif %} {% endblock %} -- cgit From c974da07d46709d3aa3640ba69c89d1a287ff3c1 Mon Sep 17 00:00:00 2001 From: prathamesh Date: Mon, 7 Mar 2016 17:20:55 +0530 Subject: UI modification and checks for answerpaper before evaluating. --- yaksh/templates/yaksh/course_detail.html | 4 ++-- yaksh/templates/yaksh/courses.html | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html index cae7335..ed56585 100644 --- a/yaksh/templates/yaksh/course_detail.html +++ b/yaksh/templates/yaksh/course_detail.html @@ -1,8 +1,8 @@ {% extends "manage.html" %} -{% block title %} Course Detail {% endblock title %} +{% block title %} Course {% endblock title %} -{% block subtitle %} Course Detail for {{ course.name }} {% endblock %} +{% block subtitle %} {{ course.name }} {% endblock %} {% block css %} diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html index 291a746..f8f8273 100644 --- a/yaksh/templates/yaksh/courses.html +++ b/yaksh/templates/yaksh/courses.html @@ -17,15 +17,26 @@Course
++ Course + {% if course.active %} + Active + {% else %} + Closed + {% endif %} +
{{ course.name }}Quiz(zes)
- {% for quiz in course.get_quizzes %} - {{ quiz.description }}No quiz
+ {% endif %}