Merge pull request #239 from pateljannat/fix-rating-issue
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
"actions": [],
|
"actions": [],
|
||||||
|
"allow_import": 1,
|
||||||
"allow_rename": 1,
|
"allow_rename": 1,
|
||||||
"autoname": "format:{####} {title}",
|
"autoname": "format:{####} {title}",
|
||||||
"creation": "2021-05-03 05:49:08.383058",
|
"creation": "2021-05-03 05:49:08.383058",
|
||||||
@@ -58,7 +59,7 @@
|
|||||||
"link_fieldname": "chapter"
|
"link_fieldname": "chapter"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"modified": "2021-09-29 15:33:44.611228",
|
"modified": "2021-09-29 15:33:44.611229",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "LMS",
|
"module": "LMS",
|
||||||
"name": "Course Chapter",
|
"name": "Course Chapter",
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
"actions": [],
|
"actions": [],
|
||||||
|
"allow_import": 1,
|
||||||
"allow_rename": 1,
|
"allow_rename": 1,
|
||||||
"autoname": "format:{####} {title}",
|
"autoname": "format:{####} {title}",
|
||||||
"creation": "2021-05-03 06:21:12.995984",
|
"creation": "2021-05-03 06:21:12.995984",
|
||||||
@@ -72,7 +73,7 @@
|
|||||||
],
|
],
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2021-10-11 15:07:38.134809",
|
"modified": "2021-10-11 15:07:38.134808",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "LMS",
|
"module": "LMS",
|
||||||
"name": "Course Lesson",
|
"name": "Course Lesson",
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"allow_guest_to_view": 1,
|
"allow_guest_to_view": 1,
|
||||||
|
"allow_import": 1,
|
||||||
"allow_rename": 1,
|
"allow_rename": 1,
|
||||||
"creation": "2021-03-01 16:49:33.622422",
|
"creation": "2021-03-01 16:49:33.622422",
|
||||||
"doctype": "DocType",
|
"doctype": "DocType",
|
||||||
@@ -167,7 +168,7 @@
|
|||||||
"link_fieldname": "course"
|
"link_fieldname": "course"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"modified": "2021-09-30 10:36:48.759994",
|
"modified": "2021-09-30 10:36:48.759995",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "LMS",
|
"module": "LMS",
|
||||||
"name": "LMS Course",
|
"name": "LMS Course",
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
"actions": [],
|
"actions": [],
|
||||||
|
"allow_import": 1,
|
||||||
"allow_rename": 1,
|
"allow_rename": 1,
|
||||||
"autoname": "field:title",
|
"autoname": "field:title",
|
||||||
"creation": "2021-06-07 10:50:17.893625",
|
"creation": "2021-06-07 10:50:17.893625",
|
||||||
@@ -34,7 +35,7 @@
|
|||||||
],
|
],
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2021-09-30 13:10:06.929357",
|
"modified": "2021-09-30 13:10:06.929358",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "LMS",
|
"module": "LMS",
|
||||||
"name": "LMS Quiz",
|
"name": "LMS Quiz",
|
||||||
|
|||||||
@@ -10,9 +10,9 @@
|
|||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% if membership and not read_only %}
|
{% if membership and not read_only %}
|
||||||
{% if progress < 100 %}
|
{% 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 %}
|
{% 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 %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
@@ -25,7 +25,7 @@
|
|||||||
<div class="course-card-meta muted-text">
|
<div class="course-card-meta muted-text">
|
||||||
{% if course.get_chapters() | length %}
|
{% if course.get_chapters() | length %}
|
||||||
<span>
|
<span>
|
||||||
{{ course.get_chapters() | length }} Chapters
|
{{ course.get_chapters() | length }} _("Chapters")
|
||||||
</span>
|
</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if course.get_chapters() | length and course.get_upcoming_batches() | length %}
|
{% if course.get_chapters() | length and course.get_upcoming_batches() | length %}
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% if course.get_upcoming_batches() | length %}
|
{% if course.get_upcoming_batches() | length %}
|
||||||
<span class="">
|
<span class="">
|
||||||
{{ course.get_upcoming_batches() | length }} Open Batches
|
{{ course.get_upcoming_batches() | length }} _("Open Batches")
|
||||||
</span>
|
</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
@@ -57,7 +57,7 @@
|
|||||||
{% if avg_rating %}
|
{% if avg_rating %}
|
||||||
<span class="">
|
<span class="">
|
||||||
<img class="icon-background" src="/assets/community/icons/rating.svg" />
|
<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>
|
</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</span>
|
</span>
|
||||||
@@ -75,36 +75,36 @@
|
|||||||
|
|
||||||
{% if certificate %}
|
{% if certificate %}
|
||||||
<div class="view-course-link is-default">
|
<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>
|
</div>
|
||||||
<a class="stretched-link" href="/courses/{{ course.name }}/{{ certificate }}"></a>
|
<a class="stretched-link" href="/courses/{{ course.name }}/{{ certificate }}"></a>
|
||||||
|
|
||||||
{% elif course.enable_certification and progress == 100 %}
|
{% elif course.enable_certification and progress == 100 %}
|
||||||
<div class="view-course-link is-default" id="certification" data-course="{{ course.name }}">
|
<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>
|
</div>
|
||||||
|
|
||||||
{% elif progress == 100 %}
|
{% elif progress == 100 %}
|
||||||
<div class="view-course-link is-default">
|
<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>
|
</div>
|
||||||
<a class="stretched-link" href="/courses/{{ course.name }}"></a>
|
<a class="stretched-link" href="/courses/{{ course.name }}"></a>
|
||||||
|
|
||||||
{% elif course.upcoming %}
|
{% elif course.upcoming %}
|
||||||
<div class="view-course-link is-secondary border">
|
<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>
|
</div>
|
||||||
<a class="stretched-link" href="/courses/{{ course.name }}"></a>
|
<a class="stretched-link" href="/courses/{{ course.name }}"></a>
|
||||||
|
|
||||||
{% elif membership %}
|
{% elif membership %}
|
||||||
<div class="view-course-link is-primary">
|
<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>
|
</div>
|
||||||
<a class="stretched-link" href="{{ course.get_learn_url(lesson_index) }}{{ query_parameter }}"></a>
|
<a class="stretched-link" href="{{ course.get_learn_url(lesson_index) }}{{ query_parameter }}"></a>
|
||||||
|
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="view-course-link is-default">
|
<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>
|
</div>
|
||||||
<a class="stretched-link" href="/courses/{{ course.name }}"></a>
|
<a class="stretched-link" href="/courses/{{ course.name }}"></a>
|
||||||
|
|
||||||
|
|||||||
@@ -201,7 +201,7 @@
|
|||||||
{% if avg_rating %}
|
{% if avg_rating %}
|
||||||
<div class="overtime-item">
|
<div class="overtime-item">
|
||||||
<img class="icon-background mr-1" src="/assets/community/icons/rating.svg" />
|
<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>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user