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

fix: tabs and learn page

Browse Source
This commit is contained in:
pateljannat
2021-05-24 19:24:07 +05:30
parent ca42c32f54
commit c9185ae68c
12 changed files with 102 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
community/lms/doctype/lms_batch_membership/lms_batch_membership.py
View File

@@ -32,12 +32,12 @@ class LMSBatchMembership(Document):
filters={
"member": self.member
},
fields=["batch", "member_type"]
fields=["batch", "member_type", "name"]
)
for membership in previous_membership:
batch_course = frappe.db.get_value("LMS Batch", membership.batch, "course")
if batch_course == course and (membership.member_type == "Student" or self.member_type == "Student"):
if self.name != membership.name and batch_course == course and (membership.member_type == "Student" or self.member_type == "Student"):
member_name = frappe.db.get_value("User", self.member, "full_name")
frappe.throw(_("{0} is already a {1} of {2} course through {3} batch").format(member_name, membership.member_type, course, membership.batch))

4
community/lms/widgets/BatchHeader.html Normal file
View File

@@ -0,0 +1,4 @@
<div class="mt-5">
<h3>{{course_name}}</h3>
<div class="text-muted">{{member_count}} members</div>
</div>

34
community/lms/widgets/BatchTabs.html
View File

@@ -1,28 +1,36 @@
<ul class="nav nav-tabs mt-4" id="myTab" role="tablist">
<div class="mt-5">
<a class="font-weight-bold anchor_style" href="/courses">Courses</a> / <a class="font-weight-bold anchor_style" href="/courses/{{ course.name }}"> {{ course.title }}</a>
</div>
<ul class="nav nav-tabs mt-4">
<li class="nav-item">
<a class="nav-link active" id="home-tab" data-toggle="tab" href="/courses/{{course.name}}/{{batch.name}}/learn"
role="tab" aria-controls="home" aria-selected="true">Learn</a>
<a class="nav-link" id="learn" href="/courses/{{course.name}}/{{batch.name}}/learn">Learn</a>
</li>
<li class="nav-item">
<a class="nav-link" id="schedule-tab" data-toggle="tab" href="/courses/{{course.name}}/{{batch.name}}/schedule"
role="tab" aria-controls="schedule" aria-selected="false">Schedule</a>
<a class="nav-link" id="schedule" href="/courses/{{course.name}}/{{batch.name}}/schedule">Schedule</a>
</li>
<li class="nav-item">
<a class="nav-link" id="members-tab" data-toggle="tab" href="/courses/{{course.name}}/{{batch.name}}/members"
role="tab" aria-controls="members" aria-selected="false">Members</a>
<a class="nav-link" id="members" href="/courses/{{course.name}}/{{batch.name}}/members">Members</a>
</li>
<li class="nav-item">
<a class="nav-link" id="discussion-tab" data-toggle="tab" href="/courses/{{course.name}}/{{batch.name}}/discuss"
role="tab" aria-controls="discussion" aria-selected="false">Discussion</a>
<a class="nav-link" id="discussion" href="/courses/{{course.name}}/{{batch.name}}/discuss">Discussion</a>
</li>
<li class="nav-item">
<a class="nav-link" id="about-tab" data-toggle="tab" href="/courses/{{course.name}}/{{batch.name}}/about" role="tab"
aria-controls="about" aria-selected="false">About</a>
<a class="nav-link" id="about" href="/courses/{{course.name}}/{{batch.name}}/about">About</a>
</li>
{% if batch.is_member(frappe.session.user, member_type="Mentor") %}
<li class="nav-item">
<a class="nav-link" id="progress-tab" data-toggle="tab" href="/courses/{{course.name}}/{{batch.name}}/progress"
role="tab" aria-controls="progress" aria-selected="false">Progress</a>
<a class="nav-link" id="progress" href="/courses/{{course.name}}/{{batch.name}}/progress">Progress</a>
</li>
{% endif %}
</ul>
<script>
frappe.ready(() => {
var selector = document.querySelector(`a[href="${decodeURIComponent(window.location.pathname)}"]`)
if (selector) {
selector.classList.add('active');
}
else {
$("#learn").addClass('active')
}
})
</script>