summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPalaparthy Adityachandra2021-02-08 11:58:50 +0530
committerGitHub2021-02-08 11:58:50 +0530
commitc179633d31dbdd1bb4cc9a6e157664bc5712756c (patch)
treed6966ca0ba1a12254163fda53a28a64b6adebfef
parent1206e886588b3d7e8dfe5fb88a6891e85c5b73ee (diff)
parent7cf71fe471553c7b0f92d96f3b2da48d06eaa43d (diff)
downloadonline_test-c179633d31dbdd1bb4cc9a6e157664bc5712756c.tar.gz
online_test-c179633d31dbdd1bb4cc9a6e157664bc5712756c.tar.bz2
online_test-c179633d31dbdd1bb4cc9a6e157664bc5712756c.zip
Merge pull request #815 from adityacp/release_0_30_1v0.30.1
Release changes
-rw-r--r--CHANGELOG.txt7
-rw-r--r--requirements/requirements-common.txt3
-rw-r--r--yaksh/models.py2
-rw-r--r--yaksh/templatetags/custom_filters.py2
4 files changed, 11 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f6ef277..2fe7308 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,10 @@
+=== 0.30.1 (08-02-2021) ===
+
+* UI changes in course and questions page.
+* Refactor code in some parts and optimize.
+* Fix a issue where student interface shows error without question paper in quiz.
+* Fix a minor bug where trial modules are shown.
+
=== 0.30.0 (12-01-2021) ===
* Add new UI skin.
diff --git a/requirements/requirements-common.txt b/requirements/requirements-common.txt
index 534e97b..9805dc5 100644
--- a/requirements/requirements-common.txt
+++ b/requirements/requirements-common.txt
@@ -19,4 +19,5 @@ django-celery-results==1.2.1
djangorestframework==3.11.0
django-cors-headers==3.1.0
Pillow
-pandas \ No newline at end of file
+pandas
+more-itertools==8.4.0
diff --git a/yaksh/models.py b/yaksh/models.py
index 0f62948..b4d0f76 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -1067,7 +1067,7 @@ class Course(models.Model):
return students
def get_learning_modules(self):
- return self.learning_module.order_by("order")
+ return self.learning_module.filter(is_trial=False).order_by("order")
def get_learning_module(self, quiz):
modules = self.get_learning_modules()
diff --git a/yaksh/templatetags/custom_filters.py b/yaksh/templatetags/custom_filters.py
index b026159..78f321f 100644
--- a/yaksh/templatetags/custom_filters.py
+++ b/yaksh/templatetags/custom_filters.py
@@ -216,7 +216,7 @@ def get_lesson_views(course_id, lesson_id):
@register.simple_tag
def get_percent_value(dictionary, key, total):
return round((dictionary.get(str(key), 0)/total)*100)
-
+
@register.simple_tag
def get_dict_value(dictionary, key):