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

Merge pull request #255 from pateljannat/fixes

Browse Source
This commit is contained in:
Jannat Patel
2021-11-01 15:08:00 +05:30
committed by GitHub
parent 27b92607c4 43311dfb73
commit f1692763d3
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
school/lms/report/course_progress_summary/course_progress_summary.js
View File

@@ -8,7 +8,8 @@ frappe.query_reports["Course Progress Summary"] = {
"fieldname": "course", "fieldname": "course",
"label": __("Course"), "label": __("Course"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "LMS Course" "options": "LMS Course",
"reqd": 1,
} }
] ]
}; };

16
school/lms/widgets/CourseCard.html
View File

@@ -51,13 +51,13 @@
</span> </span>
<span class="course-student-count"> <span class="course-student-count">
{% if course.get_students() | length %} {% if course.get_students() | length %}
<span class="mr-4"> <span class="vertically-center mr-4">
<img class="icon-background" src="/assets/school/icons/user.svg" /> <img class="icon-background" src="/assets/school/icons/user.svg" />
{{ course.get_students() | length }} {{ course.get_students() | length }}
</span> {% endif %} </span> {% endif %}
{% set avg_rating = course.get_average_rating() %} {% set avg_rating = course.get_average_rating() %}
{% if avg_rating %} {% if avg_rating %}
<span class=""> <span class="vertically-center">
<img class="icon-background" src="/assets/school/icons/rating.svg" /> <img class="icon-background" src="/assets/school/icons/rating.svg" />
{{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }} {{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }}
</span> </span>
@@ -77,36 +77,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/school/icons/black-arrow.svg" /> _("Get Certificate") <img class="ml-1" src="/assets/school/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/school/icons/black-arrow.svg" /> {{ _("Get Certificate") }} <img class="ml-1" src="/assets/school/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/school/icons/black-arrow.svg" /> {{ _("Course Completed") }} <img class="ml-1" src="/assets/school/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/school/icons/black-arrow.svg" /> {{ _("Upcoming Course") }} <img class="ml-1" src="/assets/school/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/school/icons/white-arrow.svg" /> {{ _("Continue Course") }} <img class="ml-1" src="/assets/school/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/school/icons/black-arrow.svg" /> {{ _("View Course") }} <img class="ml-1" src="/assets/school/icons/black-arrow.svg" />
</div> </div>
<a class="stretched-link" href="/courses/{{ course.name }}"></a> <a class="stretched-link" href="/courses/{{ course.name }}"></a>

12
school/public/css/style.css
View File

@@ -151,12 +151,12 @@ input[type=checkbox] {
} }
.card-divider { .card-divider {
border: 1px solid #EEF0F2; border-top: 1px solid #EEF0F2;
margin-bottom: 1rem; margin-bottom: 1rem;
} }
.card-divider-dark { .card-divider-dark {
border: 1px solid #C8CFD5; border-top: 1px solid #C8CFD5;
margin-bottom: 16px; margin-bottom: 16px;
} }
@@ -168,8 +168,8 @@ input[type=checkbox] {
} }
.course-student-count { .course-student-count {
display: flex;
font-size: 12px; font-size: 12px;
line-height: 135%;
float: right; float: right;
} }
@@ -907,7 +907,6 @@ input[type=checkbox] {
} }
.breadcrumb { .breadcrumb {
padding: 0 1rem;
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 12px; font-size: 12px;
@@ -1376,3 +1375,8 @@ pre {
border-radius: 8px; border-radius: 8px;
padding: 2.5rem; padding: 2.5rem;
} }
.vertically-center {
display: flex;
align-items: center;
}