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

Merge pull request #454 from pateljannat/course-count

Browse Source
This commit is contained in:
Jannat Patel
2022-12-28 15:29:06 +05:30
committed by GitHub
parent 36bf0d7fb9 95ec31e238
commit aa8c65a00a
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lms/www/courses/index.html
View File

@@ -49,20 +49,20 @@
<ul class="nav lms-nav" id="courses-tab"> <ul class="nav lms-nav" id="courses-tab">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#live"> <a class="nav-link active" data-toggle="tab" href="#live">
{{ _("Live") }} {{ _("Live") }} ({{ live_courses | length }})
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#upcoming"> <a class="nav-link" data-toggle="tab" href="#upcoming">
{{ _("Upcoming") }} {{ _("Upcoming") }} ({{ upcoming_courses | length }})
</a> </a>
</li> </li>
{% if frappe.session.user != "Guest" %} {% if frappe.session.user != "Guest" %}
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#courses-enrolled"> <a class="nav-link" data-toggle="tab" href="#courses-enrolled">
{{ _("Enrolled") }} {{ _("Enrolled") }} ({{ enrolled_courses | length }})
</a> </a>
</li> </li>
{% endif %} {% endif %}
@@ -70,7 +70,7 @@
{% if show_creators_section %} {% if show_creators_section %}
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#courses-created"> <a class="nav-link" data-toggle="tab" href="#courses-created">
{{ _("Created") }} {{ _("Created") }} ({{ created_courses | length }})
</a> </a>
</li> </li>
{% endif %} {% endif %}
@@ -78,7 +78,7 @@
{% if show_review_section %} {% if show_review_section %}
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#courses-under-review"> <a class="nav-link" data-toggle="tab" href="#courses-under-review">
{{ _("Under Review") }} {{ _("Under Review") }} ({{ review_courses | length }})
</a> </a>
</li> </li>
{% endif %} {% endif %}
@@ -104,19 +104,28 @@
{% if frappe.session.user != "Guest" %} {% if frappe.session.user != "Guest" %}
<div class="tab-pane fade" id="courses-enrolled" role="tabpanel" aria-labelledby="courses-enrolled"> <div class="tab-pane fade" id="courses-enrolled" role="tabpanel" aria-labelledby="courses-enrolled">
{% include "lms/lms/web_template/courses_enrolled/courses_enrolled.html" %} {% set courses = enrolled_courses %}
{% set title = _("Enrolled Courses") %}
{% set classes = "enrolled-courses" %}
{% include "lms/templates/course_list.html" %}
</div> </div>
{% endif %} {% endif %}
{% if show_creators_section %} {% if show_creators_section %}
<div class="tab-pane fade" id="courses-created" role="tabpanel" aria-labelledby="courses-created"> <div class="tab-pane fade" id="courses-created" role="tabpanel" aria-labelledby="courses-created">
{% include "lms/templates/courses_created.html" %} {% set courses = created_courses %}
{% set title = _("Created Courses") %}
{% set classes = "created-courses" %}
{% include "lms/templates/course_list.html" %}
</div> </div>
{% endif %} {% endif %}
{% if show_review_section %} {% if show_review_section %}
<div class="tab-pane fade" id="courses-under-review" role="tabpanel" aria-labelledby="courses-under-review"> <div class="tab-pane fade" id="courses-under-review" role="tabpanel" aria-labelledby="courses-under-review">
{% include "lms/templates/courses_under_review.html" %} {% set courses = review_courses %}
{% set title = _("Review Courses") %}
{% set classes = "review-courses" %}
{% include "lms/templates/course_list.html" %}
</div> </div>
{% endif %} {% endif %}

8
lms/www/courses/index.py
View File

@@ -1,17 +1,23 @@
import frappe import frappe
from frappe import _ from frappe import _
from lms.lms.utils import ( from lms.lms.utils import (
can_create_courses, can_create_courses,
check_profile_restriction, check_profile_restriction,
get_restriction_details, get_restriction_details,
has_course_moderator_role, has_course_moderator_role,
get_courses_under_review,
) )
from lms.overrides.user import get_enrolled_courses, get_authored_courses
def get_context(context): def get_context(context):
context.no_cache = 1 context.no_cache = 1
context.live_courses, context.upcoming_courses = get_courses() context.live_courses, context.upcoming_courses = get_courses()
context.enrolled_courses = (
get_enrolled_courses()["in_progress"] + get_enrolled_courses()["completed"]
)
context.created_courses = get_authored_courses(None, False)
context.review_courses = get_courses_under_review()
context.restriction = check_profile_restriction() context.restriction = check_profile_restriction()
context.show_creators_section = can_create_courses() context.show_creators_section = can_create_courses()
context.show_review_section = ( context.show_review_section = (