summaryrefslogtreecommitdiff
path: root/yaksh/templates
diff options
context:
space:
mode:
Diffstat (limited to 'yaksh/templates')
-rw-r--r--yaksh/templates/exam.html34
-rw-r--r--yaksh/templates/yaksh/add_quiz.html7
-rw-r--r--yaksh/templates/yaksh/complete.html16
-rw-r--r--yaksh/templates/yaksh/course_detail.html31
-rw-r--r--yaksh/templates/yaksh/course_modules.html43
-rw-r--r--yaksh/templates/yaksh/design_questionpaper.html33
-rw-r--r--yaksh/templates/yaksh/monitor.html56
-rw-r--r--yaksh/templates/yaksh/question.html39
-rw-r--r--yaksh/templates/yaksh/quit.html16
-rw-r--r--yaksh/templates/yaksh/quizzes_user.html89
-rw-r--r--yaksh/templates/yaksh/show_video.html31
11 files changed, 220 insertions, 175 deletions
diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index 29ad167..d439c64 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -8,7 +8,7 @@
<span class="navbar-toggler-icon" style="color: white"></span>
</button>
<a class="navbar-brand">
- <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH" style="margin-top: -3px; margin-left:-15px">
+ <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH">
</img>
</a>
<div class="collapse navbar-collapse col-md-6" id="myNavbar">
@@ -24,8 +24,7 @@
{% endif %}
<span class="fa fa-power-off"></span></button></span>
</form>
-
- </div>
+ </div>
</div><!-- /.navbar -->
</div><!-- /.container -->
</nav><!-- /.navbar -->
@@ -57,15 +56,15 @@
{% endif %}
{% endif %}
{% if qid in paper.get_questions_answered %}
- <a class=" btn btn-outline-success " style="background-color:#B4B8BA;" href="#" data-toggle="tooltip"
+ <a class="btn btn-outline-light question-nav-bg" href="#" data-toggle="tooltip"
onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ qid.id }}/{{ paper.attempt_number }}/{{ module.id }}/{{ paper.question_paper.id }}/{{course.id}}/')"
title="{{ qid.description }}">{{ forloop.counter }}</a>
{% endif %}
{% else %}
{% if qid.id == question.id %}
- <a class="active btn btn-outline-success " data-toggle="tooltip" title="{{ qid.description|striptags }}">{{ forloop.counter }}</a>
+ <a class="active btn btn-outline-success" data-toggle="tooltip" title="{{ qid.description|striptags }}">{{ forloop.counter }}</a>
{% elif qid in paper.get_questions_answered %}
- <a class=" btn btn-outline-success " style="background-color:#B4B8BA;" href="#" data-toggle="tooltip"
+ <a class="btn btn-outline-success question-nav-bg" href="#" data-toggle="tooltip"
onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ qid.id }}/{{ paper.attempt_number }}/{{ module.id }}/{{ paper.question_paper.id }}/{{course.id}}/')"
title="{{ qid.description }}">{{ forloop.counter }}</a>
{% else %}
@@ -112,26 +111,3 @@
</div>
{% endblock %}
-
-{% block footer %}
- <!--footer-->
- <footer class="container-fluid yakshsidebarfooter text-center">
- <div class="row justify-content-center">
- <div class="col-sm-5 ">
- {% if user %}
- {% block info %}
- <b>{{user.get_full_name|title}}</b> with Roll no. <b>{{user.profile.roll_number}}</b> is logged in as <b>{{user.username}}</b>
- {% endblock %}
- {% endif %}
- </div>
- <div class="col-sm-2">
- |
- </div>
- <div class="col-sm-4 text-left">
- <b>Any Queries?</b> Email : info@fossee.in
- </div>
- </div>
- </footer>
- <!--footer end-->
-{% endblock %}
-
diff --git a/yaksh/templates/yaksh/add_quiz.html b/yaksh/templates/yaksh/add_quiz.html
index c955e65..0762f10 100644
--- a/yaksh/templates/yaksh/add_quiz.html
+++ b/yaksh/templates/yaksh/add_quiz.html
@@ -37,8 +37,13 @@
{% if quiz and course_id %}
{% if quiz.questionpaper_set.get.id %}
<center>
+ <a href="{{URL_ROOT}}/exam/manage/designquestionpaper/{{ quiz.id }}/{{quiz.questionpaper_set.get.id}}/{{course_id}}" class="btn btn-primary">Edit Question Paper</a>
+ <a href="{{URL_ROOT}}/exam/manage/preview_questionpaper/{{quiz.questionpaper_set.get.id}}" class="btn btn-primary" target="_blank">
+ Preview Question Paper
+ </a>
+ <br>
+ <br>
<h4>You can check the quiz by attempting it in the following modes:</h4>
- <a href="{{URL_ROOT}}/exam/manage/designquestionpaper/{{ quiz.id }}/{{quiz.questionpaper_set.get.id}}/{{course_id}}" class="btn btn-primary">View Question Paper</a>
<button class="btn btn-outline-info" type="button" name="button" onClick='usermode("{{URL_ROOT}}/exam/manage/usermode/{{quiz.id}}/{{course_id}}/");'>User Mode</button>
<button class="btn btn-outline-info" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/godmode/{{quiz.id}}/{{course_id}}/");'>
diff --git a/yaksh/templates/yaksh/complete.html b/yaksh/templates/yaksh/complete.html
index cced41c..a3324a6 100644
--- a/yaksh/templates/yaksh/complete.html
+++ b/yaksh/templates/yaksh/complete.html
@@ -1,11 +1,15 @@
{% extends "base.html" %}
-{% block pagetitle %}
-<div class="yakshnav fixed-top" style=" padding-top: 0.5%;padding-bottom: 0.5%;">
- <a class="navbar-brand" href="{{ URL_ROOT }}/exam/" >
- <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH">
- </img>
- </a>
+{% block nav %}
+<div class="container-fluid yakshnav">
+ <nav class="navbar fixed-top navbar-expand-lg yakshheading yakshnav">
+ <div class="container">
+ <a class="navbar-brand">
+ <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH">
+ </img>
+ </a>
+ </div><!-- /.container -->
+ </nav><!-- /.navbar -->
</div>
{% endblock %}
diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html
index a0a6ed2..f75e362 100644
--- a/yaksh/templates/yaksh/course_detail.html
+++ b/yaksh/templates/yaksh/course_detail.html
@@ -132,17 +132,26 @@
{% elif state == "course_status" %}
<div class="course_data">
- <center><div class="yakshlabel">
- <input type="hidden" id="course_name" value="{{course.name}}">
- <a href="#" class="btn btn-outline-success pull-right" id="export">Export to CSV</a><h5>Course Status</h5>
- </div></center>
+ <center>
+ <div class="row">
+ <div class="col">
+ <h5>Course Status</h5>
+ </div>
+ <div class="col-md-8">
+ Number Of Students: {{ student_details | length }}
+ </div>
+ <div class="col">
+ <input type="hidden" id="course_name" value="{{course.name}}">
+ <a href="#" class="btn btn-outline-success" id="export">Export to CSV</a>
+ </div>
+ </div>
+ </center>
<div class="yakshwell">
<table class="tablesorter table table-bordered table-responsive-sm" id="course_table" data-sortlist="[0,0]">
<thead>
<tr class="yakshlight">
- <th>Sr No.</th>
<th>Roll No.</th>
- <th>Email</th>
+ <th>Name</th>
<th>Current Unit</th>
<th>Course Completion Percentage</th>
<th>Grade</th>
@@ -151,26 +160,18 @@
<tbody>
{% for student, grade, percent, unit in student_details %}
<tr>
- <td width="5%">
- {{forloop.counter}}.
- </td>
<td>
{{ student.profile.roll_number}}
</td>
<td width="50%">
<a class="user_data" data-item-id="{{course.id}}+{{student.id}}" data-toggle="tooltip" title="Click to view Overall Course progress" data-placement="top">
- {% if student.email %}
- {{ student.email }}
- {% else %}
- {{ student.get_full_name|title}}
- {% endif %}
+ {{ student.get_full_name|title}}
<i class="fa fa-caret-down"></i>
</a>
<div id="show_status_{{course.id}}_{{student.id}}" style="display: None;">
</div>
</td>
<td>
- {{ student.get_full_name|title }}
{% if unit %}
{% if unit.type == 'quiz' %}
{{unit.quiz.description}}
diff --git a/yaksh/templates/yaksh/course_modules.html b/yaksh/templates/yaksh/course_modules.html
index 917f78c..e1fdc51 100644
--- a/yaksh/templates/yaksh/course_modules.html
+++ b/yaksh/templates/yaksh/course_modules.html
@@ -2,7 +2,6 @@
{% load custom_filters %}
{% block title %} Course Modules {% endblock %}
{% block script %}
-<script src="{{ URL_ROOT }}/static/yaksh/js/donutpiechart.js"></script>
<script>
function view_unit(unit){
$("#"+unit+"_down").toggle();
@@ -15,37 +14,33 @@
{% block main %}
<div class="container">
-<div class="row justify-content-md-center yakshwell ">
- <div class="col-md-10 bg-light card">
+<div class="row justify-content-md-center yakshwell">
+ <div class="col-md-10 bg-light card" id="card">
<div class="row align-items-center">
<div class="col h4"> {{ course.name }} </div>
- <div class="col-md-3 ml-auto yakshwell">
- <div class="row align-items-center">
- <div class="col-sm-6"> Overall
- Course</br>Completion :
- </div>
- <div class="col-sm-5">
- <span class="progress">
- <span class="progress-bar bg-warning " role="progressbar" style="width: {{ course_percentage }}%; color: black;" aria-valuenow="50" aria-valuemin="0" aria-valuemax="100">{{ course_percentage }} % completed</span>
- </span>
- </div>
- </div>
- </div>
+ <div class = "col">
+ {% if course.has_lessons %}
+ <a href="{% url 'yaksh:download_course' course.id %}" data-toggle="tooltip" title="Download course content" class="btn btn-primary pull-right">
+ Download Course
+ </a>
+ {% endif %}
+ </div>
</div>
</div>
</div>
<center>
-<div class=" col-md-8">
-<b>Grade: {% if grade %} {{ grade }} {% else %} Will be available once the course is complete {% endif %}</b>
-</div>
-
+ {% if course.view_grade %}
+ <div class=" col-md-8">
+ <b>Grade: {% if grade %} {{ grade }} {% else %} Will be available once the course is complete {% endif %}</b>
+ </div>
+ {% endif %}
-{% if msg %}
- <div class="col-md-8 alert alert-warning animated flash" role="alert">
- {{ msg }}
- </div>
-{% endif %}
+ {% if msg %}
+ <div class="col-md-8 alert alert-warning animated flash" role="alert">
+ {{ msg }}
+ </div>
+ {% endif %}
</center>
<div class="row justify-content-md-center ">
diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html
index bf1f23e..0ab7cc0 100644
--- a/yaksh/templates/yaksh/design_questionpaper.html
+++ b/yaksh/templates/yaksh/design_questionpaper.html
@@ -113,7 +113,14 @@ select
<li>
<label>
<input type="checkbox" name="questions" data-qid="{{question.id}}" value={{question.id}}>
- <span> {{ question.summary }} </span> <span> {{ question.points }} </span>
+ <span>
+ {% if user == question.user %}
+ <a href="{{URL_ROOT}}/exam/manage/addquestion/{{ question.id }}" target="_blank">{{ question.summary }}</a>
+ {% else %}
+ {{question.summary}}
+ {% endif %}
+ </span>
+ <span> {{ question.points }}</span>
</label>
</li>
{% endfor %}
@@ -134,7 +141,13 @@ select
<label>
<input type="checkbox" name="added-questions"
data-qid="{{question.id}}" value={{question.id}}>
- <span> {{ question.summary }} </span>
+ <span>
+ {% if user == question.user %}
+ <a href="{{URL_ROOT}}/exam/manage/addquestion/{{ question.id }}" target="_blank">{{ question.summary }}</a>
+ {% else %}
+ {{question.summary}}
+ {% endif %}
+ </span>
<span> {{ question.points }} </span>
</label>
</li>
@@ -175,7 +188,13 @@ select
<li>
<label>
<input type="checkbox" name="random_questions" data-qid="{{question.id}}" value={{question.id}}>
- <span> {{ question.summary }} </span> <span> {{ question.points }} </span>
+ <span>
+ {% if user == question.user %}
+ <a href="{{URL_ROOT}}/exam/manage/addquestion/{{ question.id }}" target="_blank">{{ question.summary }}</a>
+ {% else %}
+ {{question.summary}}
+ {% endif %}</span>
+ <span> {{ question.points }} </span>
</label>
</li>
{% endfor %}
@@ -201,7 +220,13 @@ select
{% for question in random_set.questions.all %}
<li>
<label>
- <span> {{ question.summary }} </span> <span> {{ question.points }} </span>
+ <span>
+ {% if user == question.user %}
+ <a href="{{URL_ROOT}}/exam/manage/addquestion/{{ question.id }}" target="_blank">{{ question.summary }}</a>
+ {% else %}
+ {{question.summary}}
+ {% endif %}</span>
+ <span> {{ question.points }} </span>
</label>
</li>
{% endfor %}
diff --git a/yaksh/templates/yaksh/monitor.html b/yaksh/templates/yaksh/monitor.html
index 1f85938..a9f8328 100644
--- a/yaksh/templates/yaksh/monitor.html
+++ b/yaksh/templates/yaksh/monitor.html
@@ -68,32 +68,49 @@ $(document).ready(function()
{% if quiz %}
{% if papers %}
<div class="row">
- <div class="card col-md-4">
- <div class="row">
- <div class="col"><b>Course Name:<br>Quiz Name:<br>Number of papers:<br>Papers completed:<br>Papers in progress:</b>
- </div>
- <div class="col">
- {{ course.name }}<br>
- {{ quiz.description }}<br>
- {{ papers|length }}<br>
- {% completed papers as completed_papers %}
- {# template tag used to get the count of completed papers #}
- <b class="yakshred"> {{ completed_papers }} </b><br>
- {% inprogress papers as inprogress_papers %}
- {# template tag used to get the count of inprogress papers #}
- <b class="yakshred"> {{ inprogress_papers }} </b>
- </div>
+ <div class="card col-md-10">
+ <div class = "table-responsive"">
+ <table class = "table">
+ <tr>
+ <td><b>Course Name:&nbsp</b></td>
+ <td>{{course.name}}</td>
+ </tr>
+ <tr>
+ <td><b>Quiz Name:&nbsp</b></td>
+ <td>{{quiz.description}}</td>
+ </tr>
+ <tr>
+ <td><b>Number of papers: &nbsp</b></td>
+ <td>{{papers|length}}</td>
+ </tr>
+ <tr>
+ <td><b>Papers Completed: &nbsp</b></td>
+ <td>
+ {% completed papers as completed_papers %}
+ <b class = "yakshgreen">{{completed_papers}}</b>
+ </td>
+ </tr>
+ <tr>
+ <td><b>Papers in progress: &nbsp</b></td>
+ <td>
+ {% inprogress papers as inprogress_papers %}
+ <b class="yakshred"> {{ inprogress_papers }} </b>
+ </td>
+ </tr>
+ </table>
</div>
</div>
- <div class="col">
+ <div class = "row">
+ <div class="col-md-2">
<p><a href="{{URL_ROOT}}/exam/manage/statistics/question/{{papers.0.question_paper.id}}/{{course.id}}" class="btn btn-primary">Question Statisitics</a></p>
<p>
<button type="button" class="btn btn-info" data-toggle="modal" data-target="#csvModal">
Download CSV <span class="fa fa-download"></span>
- </button></p>
+ </button>
+ </p>
+ </div>
</div>
- <div class="yakshwell container-fluid">
- <div class="table-wrapper-2">
+ <div class="table-wrapper-2">
<table id="result-table" class="tablesorter table table-striped table-responsive-sm">
<thead>
<tr class="table-info">
@@ -120,7 +137,6 @@ $(document).ready(function()
<td> {{ paper.answers.count }} </td>
<td id="time_left{{forloop.counter0}}"> {{ paper.time_left }} </td>
<td>{{ paper.status }}</td>
- </div>
</tr>
{% endfor %}
</tbody>
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index da77702..f13de1a 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -122,8 +122,8 @@ question_type = "{{ question.type }}"
<div class="card ">
<div class="col-md-12 bg-light">
<div class="row align-items-center ">
- <div class="col yakshheading"> {{ question.summary }} </div>
- <div class="col-md-4 ml-auto yakshwell text-center">
+ <div class="col-md-6 yakshheading"> {{ question.summary }} </div>
+ <div class="col-md-3 ml-auto yakshwell text-center">
{% if question.type == "mcq" %}
SINGLE CORRECT CHOICE
{% elif question.type == "mcc" %}
@@ -147,8 +147,16 @@ question_type = "{{ question.type }}"
ARRANGE THE OPTIONS IN CORRECT ORDER
{% endif %}
</div>
- <div class="col-md-1 ml-auto text-center">
- <span class="badge badge-warning">{{ question.points }}</span><br>Marks
+ <div class="col-md-2 ml-auto text-center">
+ <div class="row">
+ <div class="col-md-6">
+ <h5>
+ <span class="badge badge-warning">
+ {{ question.points }} Marks
+ </span>
+ </h5>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -160,7 +168,7 @@ question_type = "{{ question.type }}"
<span> Files to download for this question </span> <hr>
{% for f_name in files %}
<div class="yakshwell">
- <a href="{{f.file.url}}" class="btn btn-outline-secondary"><b>{{forloop.counter}}.</b> {{f_name.file.name}}</a>
+ <a href="{{f_name.file.url}}" class="btn btn-outline-secondary btn-sm " target="_blank">{{f_name.get_filename}}</a>
<br>
</div>
{% endfor %}
@@ -271,7 +279,7 @@ question_type = "{{ question.type }}"
<h5>Write your program below:</h5>
</div>
<div class="col-md-3 ml-auto">
- <a href="#answer" class=" btn btn-outline-primary" onclick="reset_editor()" name="reset" id="reset">Undo Changes&nbsp;<span class="glyphicon glyphicon-refresh"></span></a>
+ <a href="#answer" class=" btn btn-outline-primary" onclick="confirm()" name="reset" id="reset">Undo Changes&nbsp;<span class="glyphicon glyphicon-refresh"></span></a>
</div>
</div>
<div class="yakshwell">
@@ -335,5 +343,24 @@ question_type = "{{ question.type }}"
</div>
</div>
</div>
+
+ <!-- UNDO CHANGES Modal -->
+ <div class="modal" id="undo_changes" >
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h4 class="modal-title" id="myModalLabel">Are you Sure?</h4>
+ </div>
+ <div id = "modal_body"class="modal-body">
+ <font color="brown"><b>Your code will be reset.</b></font>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-warning" onclick="reset_editor()">OK</button>
+ <button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>
+ </div>
+ </div>
+ </div>
+ </div>
+
{% endblock main %}
diff --git a/yaksh/templates/yaksh/quit.html b/yaksh/templates/yaksh/quit.html
index 3d22746..dd06ff9 100644
--- a/yaksh/templates/yaksh/quit.html
+++ b/yaksh/templates/yaksh/quit.html
@@ -1,11 +1,15 @@
{% extends "base.html" %}
-{% block pagetitle %}
-<div class="yakshnav fixed-top" style=" padding-top: 0.5%;padding-bottom: 0.5%;">
- <a class="navbar-brand" href="{{ URL_ROOT }}/exam/" >
- <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH">
- </img>
- </a>
+{% block nav %}
+<div class="container-fluid yakshnav">
+ <nav class="navbar fixed-top navbar-expand-lg yakshheading yakshnav">
+ <div class="container">
+ <a class="navbar-brand">
+ <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH">
+ </img>
+ </a>
+ </div><!-- /.container -->
+ </nav><!-- /.navbar -->
</div>
{% endblock %}
diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html
index 548eef4..ee5b684 100644
--- a/yaksh/templates/yaksh/quizzes_user.html
+++ b/yaksh/templates/yaksh/quizzes_user.html
@@ -72,21 +72,21 @@
<div class="yakshwell">
<div class="row yakshlabel align-items-center">
<div class="col">
- <h4><b>
-
- {{ course.name }} by {{ course.creator.get_full_name }}
-
- </b></h4>
- {% if course.is_active_enrollment %}
+ <a data-toggle="collapse" href="#collapsedetails{{course.data.id}}" role="button" aria-expanded="false" aria-controls="#collapsedetails{{course.data.id}}">
+ <h4><b>
+ {{ course.data.name }} by {{ course.data.creator.get_full_name }}
+ </b></h4>
+ </a>
+ {% if course.data.is_active_enrollment %}
<div class="text-left">
- <span class="yakshgreen">{{course.start_enroll_time}}</span>&nbsp;&nbsp; to &nbsp;&nbsp;<span class="yakshgreen">{{course.end_enroll_time}}</span>
+ <span class="yakshgreen">{{course.data.start_enroll_time}}</span>&nbsp;&nbsp; to &nbsp;&nbsp;<span class="yakshgreen">{{course.data.end_enroll_time}}</span>
</div>
{% endif %}
</div>
<div class="col-sm-auto">
- {% if course.days_before_start != 0 %}
+ {% if course.data.days_before_start != 0 %}
<span class="label label-info" style="font-size: 15px">
- {{course.days_before_start}} day(s) to start
+ {{course.data.days_before_start}} day(s) to start
</span>
{% endif %}
@@ -94,20 +94,27 @@
<div class="container col-sm-4 offset-sm-2">
<span class="row align-items-center">
<span class="col-sm-4" >
- <a class="btn btn-primary" data-toggle="collapse" href="#collapsedetails{{course.id}}" role="button" aria-expanded="false" aria-controls="#collapsedetails{{course.id}}">DETAILS</a>
+ <a class="btn btn-primary" data-toggle="collapse" href="#collapsedetails{{course.data.id}}" role="button" aria-expanded="false" aria-controls="#collapsedetails{{course.data.id}}">DETAILS</a>
</span>
<span class="col-sm-auto">
- {% if user in course.requests.all %} <span class="badge badge-warning">Request Pending </span>
- {% elif user in course.rejected.all %}<span class="badge badge-danger">Request Rejected</span>
- {% elif user in course.students.all %}<a class="btn btn-success" href="{{URL_ROOT}}/exam/course_modules/{{course.id}}" >START</a>
+ {% if user in course.data.requests.all %} <span class="badge badge-warning">Request Pending </span>
+ {% elif user in course.data.rejected.all %}<span class="badge badge-danger">Request Rejected</span>
+ {% elif user in course.data.students.all %}
+ <a class="btn btn-success" href="{{URL_ROOT}}/exam/course_modules/{{course.data.id}}" >
+ {% if course.completion_percentage > 0 %}
+ CONTINUE
+ {% else %}
+ START
+ {% endif %}
+ </a>
{% else %}
- {% if course.active %}
- {% if course.is_active_enrollment %}
- {% if course.is_self_enroll %}
- <a class="btn btn-success" href="{{ URL_ROOT }}/exam/self_enroll/{{ course.id }}">ENROLL</a>
+ {% if course.data.active %}
+ {% if course.data.is_active_enrollment %}
+ {% if course.data.is_self_enroll %}
+ <a class="btn btn-success" href="{{ URL_ROOT }}/exam/self_enroll/{{ course.data.id }}">ENROLL</a>
{% else %}
- <a class="btn btn-success" href="{{ URL_ROOT }}/exam/enroll_request/{{ course.id }}">ENROLL</a>
+ <a class="btn btn-success" href="{{ URL_ROOT }}/exam/enroll_request/{{ course.data.id }}">ENROLL</a>
{% endif %}
{% else %}
<span class="btn btn-danger disabled" style="font-size: 15px">
@@ -124,39 +131,55 @@
</span>
</div>
<!-- About course-->
- <div class="collapse container-fluid" id="collapsedetails{{course.id}}">
+ <div class="collapse container-fluid" id="collapsedetails{{course.data.id}}">
<div class="card card-body ">
- <h4>{{ course.name }} by {{ course.creator.get_full_name }}</h4><hr>
+ <h4>{{ course.data.name }} by {{ course.data.creator.get_full_name }}</h4><hr>
<div class="row">
<div class="col-md-7">
- {% if course.description %}
+ {% if course.data.description %}
<p> <span class="yakshred yakshheading">About the course</span><br>
- {{ course.description }}
+ {{ course.data.description }}
</p>
{% endif %}
- {% if course.get_learning_modules %}
+ {% if course.data.get_learning_modules %}
<p> <span class="yakshred yakshheading">What you'll learn</span>
<ul>
- {% for module in course.get_learning_modules %}
+ {% for module in course.data.get_learning_modules %}
<li>{{module.name|title}}</li>
{% endfor %}
</ul>
</p>
{% endif %}
<p> <span class="yakshred yakshheading">Instructor</span><br>
- {{ course.creator.get_full_name }}
+ {{ course.data.creator.get_full_name }}
</p>
- {% if course.instructions %}
- <p> <span class="yakshred yakshheading">Requirement(s)</span><br>
- {{ course.instructions|safe }}
+ {% if course.data.instructions %}
+ <p> <span class="yakshred yakshheading">Instructions</span><br>
+ {{ course.data.instructions|safe }}
</p>
{% endif %}
</div>
- <div class="col-md-4 ">
- <table class="table table-borderless card table-responsive-sm">
- <tr><td class="yakshgreen">STARTS ON</td> <td>{{course.start_enroll_time}}</td></tr>
- <tr><td class="yakshgreen">ENDS ON</td> <td>{{course.end_enroll_time}}</td>
- </table>
+ <div class="col-md-4">
+ <div class="row my-3">
+ <div class="col-md-5">
+ STARTS ON
+ </div>
+ <div class="col-md-7">
+ {{course.data.start_enroll_time}}
+ </div>
+ </div>
+ <div class="row my-3">
+ <div class="col-md-5">
+ ENDS ON
+ </div>
+ <div class="col-md-7">
+ {{course.data.end_enroll_time}}
+ </div>
+ </div>
+ <div class="row my-3">
+ <div class="progress-bar bg-success" role="progressbar" style="width:{{course.completion_percentage}}%"; color: black;" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">{{course.completion_percentage}} % completed
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/yaksh/templates/yaksh/show_video.html b/yaksh/templates/yaksh/show_video.html
index 9f92bc3..9d24b44 100644
--- a/yaksh/templates/yaksh/show_video.html
+++ b/yaksh/templates/yaksh/show_video.html
@@ -94,37 +94,6 @@
{% if learning_module.html_data%}
{% endif %}
</div>
- <div class="yakshwell col-md-3">
- <div class="bg-light">
- {% if learning_module.get_learning_units %}
- <center><h4>Units in this module</h4></center><hr>
- {% for unit in learning_module.get_learning_units %}
- <div class="row justify-content-center">
- <span class="col-sm-2 yakshgreen">
- {% if unit.type == "quiz" %}
- {% if unit.quiz.is_exercise %}
- <span class="fa fa-pencil"></span>
- {% else %}
- <span class="fa fa-puzzle-piece"></span>
- {% endif %}
- {% else %}
- <span class="fa fa-book"></span>
- {% endif %}
- </span>
- <span class="col-sm-7">
- {% if unit.type == "quiz" %}
- {{unit.quiz.description}}
- {% else %}
- {{unit.lesson.name}}
- {% endif %}
- </span>
- </div>
- {% endfor %}
- {% else %}
- <center><h3>No Lessons/Quizzes Found</h3></center>
- {% endif %}
- </div>
- </div>
</div>
<div class="yakshwell text-center">
{% if first_unit %}
generated by cgit (git 2.34.1) at 2024-12-22 01:26:39 +0000