eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #239 from pateljannat/fix-rating-issue

Browse Source
This commit is contained in:
Jannat Patel
2021-10-18 13:18:26 +05:30
committed by GitHub
parent b1aaddae59 eaa8876f4e
commit 3a51299e8d
6 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
community/lms/doctype/course_chapter/course_chapter.json
View File

@@ -1,5 +1,6 @@
{
"actions": [],
"allow_import": 1,
"allow_rename": 1,
"autoname": "format:{####} {title}",
"creation": "2021-05-03 05:49:08.383058",
@@ -58,7 +59,7 @@
"link_fieldname": "chapter"
}
],
"modified": "2021-09-29 15:33:44.611228",
"modified": "2021-09-29 15:33:44.611229",
"modified_by": "Administrator",
"module": "LMS",
"name": "Course Chapter",

3
community/lms/doctype/course_lesson/course_lesson.json
View File

@@ -1,5 +1,6 @@
{
"actions": [],
"allow_import": 1,
"allow_rename": 1,
"autoname": "format:{####} {title}",
"creation": "2021-05-03 06:21:12.995984",
@@ -72,7 +73,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2021-10-11 15:07:38.134809",
"modified": "2021-10-11 15:07:38.134808",
"modified_by": "Administrator",
"module": "LMS",
"name": "Course Lesson",

3
community/lms/doctype/lms_course/lms_course.json
View File

@@ -8,6 +8,7 @@
}
],
"allow_guest_to_view": 1,
"allow_import": 1,
"allow_rename": 1,
"creation": "2021-03-01 16:49:33.622422",
"doctype": "DocType",
@@ -167,7 +168,7 @@
"link_fieldname": "course"
}
],
"modified": "2021-09-30 10:36:48.759994",
"modified": "2021-09-30 10:36:48.759995",
"modified_by": "Administrator",
"module": "LMS",
"name": "LMS Course",

3
community/lms/doctype/lms_quiz/lms_quiz.json
View File

@@ -1,5 +1,6 @@
{
"actions": [],
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:title",
"creation": "2021-06-07 10:50:17.893625",
@@ -34,7 +35,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2021-09-30 13:10:06.929357",
"modified": "2021-09-30 13:10:06.929358",
"modified_by": "Administrator",
"module": "LMS",
"name": "LMS Quiz",

22
community/lms/widgets/CourseCard.html
View File

@@ -10,9 +10,9 @@
{% endfor %}
{% if membership and not read_only %}
{% if progress < 100 %}
 <div class="course-card-pills dark-pills ml-auto">{{ frappe.utils.rounded(progress) }}% Completed</div>
 <div class="course-card-pills dark-pills ml-auto">{{ frappe.utils.rounded(progress) }}% _("Completed")</div>
{% else %}
<div class="course-card-pills dark-pills ml-auto"> <img src="/assets/community/icons/check.svg"> Completed </div>
<div class="course-card-pills dark-pills ml-auto"> <img src="/assets/community/icons/check.svg"> _("Completed") </div>
{% endif %}
{% endif %}
</div>
@@ -25,7 +25,7 @@
<div class="course-card-meta muted-text">
{% if course.get_chapters() | length %}
<span>
{{ course.get_chapters() | length }} Chapters
{{ course.get_chapters() | length }} _("Chapters")
</span>
{% endif %}
{% if course.get_chapters() | length and course.get_upcoming_batches() | length %}
@@ -33,7 +33,7 @@
{% endif %}
{% if course.get_upcoming_batches() | length %}
<span class="">
{{ course.get_upcoming_batches() | length }} Open Batches
{{ course.get_upcoming_batches() | length }} _("Open Batches")
</span>
{% endif %}
</div>
@@ -57,7 +57,7 @@
{% if avg_rating %}
<span class="">
<img class="icon-background" src="/assets/community/icons/rating.svg" />
{{ avg_rating }}
{{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }}
</span>
{% endif %}
</span>
@@ -75,36 +75,36 @@
{% if certificate %}
<div class="view-course-link is-default">
Get Certificate <img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
_("Get Certificate") <img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
</div>
<a class="stretched-link" href="/courses/{{ course.name }}/{{ certificate }}"></a>
{% elif course.enable_certification and progress == 100 %}
<div class="view-course-link is-default" id="certification" data-course="{{ course.name }}">
Get Certificate <img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
_("Get Certificate") <img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
</div>
{% elif progress == 100 %}
<div class="view-course-link is-default">
Course Completed <img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
_("Course Completed") <img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
</div>
<a class="stretched-link" href="/courses/{{ course.name }}"></a>
{% elif course.upcoming %}
<div class="view-course-link is-secondary border">
Upcoming Course <img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
_("Upcoming Course") <img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
</div>
<a class="stretched-link" href="/courses/{{ course.name }}"></a>
{% elif membership %}
<div class="view-course-link is-primary">
Continue Course <img class="ml-3" src="/assets/community/icons/white-arrow.svg" />
_("Continue Course") <img class="ml-3" src="/assets/community/icons/white-arrow.svg" />
</div>
<a class="stretched-link" href="{{ course.get_learn_url(lesson_index) }}{{ query_parameter }}"></a>
{% else %}
<div class="view-course-link is-default">
View Course <img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
_("View Course") <img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
</div>
<a class="stretched-link" href="/courses/{{ course.name }}"></a>

2
community/www/courses/course.html
View File

@@ -201,7 +201,7 @@
{% if avg_rating %}
<div class="overtime-item">
<img class="icon-background mr-1" src="/assets/community/icons/rating.svg" />
{{ avg_rating }} Rating
{{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }} Rating
</div>
{% endif %}
</div>