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

Merge pull request #129 from fossunited/minor-fix

Browse Source 
fix: minor issues
This commit is contained in:
Jannat Patel
2021-06-15 18:46:33 +05:30
committed by GitHub
parent e94c3f27ab 9c1506d3c8
commit aa77c60abd
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,7 @@ def create_membership(batch, member=None, member_type="Student", role="Member"):
return "OK" return "OK"
@frappe.whitelist() @frappe.whitelist()
def update_current_membership(batch, course, member=frappe.session.user): def update_current_membership(batch, course, member):
all_memberships = frappe.get_all("LMS Batch Membership", {"member": member, "course": course}) all_memberships = frappe.get_all("LMS Batch Membership", {"member": member, "course": course})
for membership in all_memberships: for membership in all_memberships:
frappe.db.set_value("LMS Batch Membership", membership.name, "is_current", 0) frappe.db.set_value("LMS Batch Membership", membership.name, "is_current", 0)

6
community/lms/doctype/lms_course/lms_course.py
View File

@@ -192,16 +192,16 @@ class LMSCourse(Document):
return return
return f"/courses/{self.name}/learn/{lesson_number}" return f"/courses/{self.name}/learn/{lesson_number}"
def get_current_batch(self, member=frappe.session.user): def get_current_batch(self, member):
current_membership = frappe.get_all("LMS Batch Membership", {"member": member, "course": self.name, "is_current": 1}, pluck="batch") current_membership = frappe.get_all("LMS Batch Membership", {"member": member, "course": self.name, "is_current": 1}, pluck="batch")
print(current_membership, member, self.name) print(current_membership, member, self.name, frappe.session.user)
if len(current_membership): if len(current_membership):
return current_membership[0] return current_membership[0]
print(frappe.db.get_value("LMS Batch Membership", {"member": member, "course": self.name}, "batch")) print(frappe.db.get_value("LMS Batch Membership", {"member": member, "course": self.name}, "batch"))
return frappe.db.get_value("LMS Batch Membership", {"member": member, "course": self.name}, "batch") return frappe.db.get_value("LMS Batch Membership", {"member": member, "course": self.name}, "batch")
def get_all_memberships(self, member=frappe.session.user): def get_all_memberships(self, member=frappe.session.user):
print(member) print(member, frappe.session.user)
all_memberships = frappe.get_all("LMS Batch Membership", {"member": member, "course": self.name}, ["batch", "is_current"]) all_memberships = frappe.get_all("LMS Batch Membership", {"member": member, "course": self.name}, ["batch", "is_current"])
print(all_memberships) print(all_memberships)
for membership in all_memberships: for membership in all_memberships:

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

@@ -65,7 +65,8 @@
method: "community.lms.doctype.lms_batch_membership.lms_batch_membership.update_current_membership", method: "community.lms.doctype.lms_batch_membership.lms_batch_membership.update_current_membership",
args: { args: {
batch: batch, batch: batch,
course: course course: course,
member: frappe.session.user
}, },
callback: (data) => { callback: (data) => {
window.location.reload(); window.location.reload();

3
community/www/batch/join.html
View File

@@ -72,7 +72,8 @@ frappe.ready(() => {
method: "community.lms.doctype.lms_batch_membership.lms_batch_membership.update_current_membership", method: "community.lms.doctype.lms_batch_membership.lms_batch_membership.update_current_membership",
args: { args: {
"batch": "{{ batch.name }}", "batch": "{{ batch.name }}",
"course": "{{ batch.course}}" "course": "{{ batch.course}}",
"member": frappe.session.user
}, },
callback: (data) => { callback: (data) => {
window.location.href = "/courses/{{ batch.course }}/home" window.location.href = "/courses/{{ batch.course }}/home"

2
community/www/batch/utils.py
View File

@@ -11,7 +11,7 @@ def get_common_context(context):
context.template = "www/404.html" context.template = "www/404.html"
return return
batch_name = course.get_current_batch() batch_name = course.get_current_batch(frappe.session.user)
batch = course.get_batch(batch_name) batch = course.get_batch(batch_name)
context.batch = batch context.batch = batch
if batch_name: if batch_name:

3
community/www/courses/course.js
View File

@@ -82,7 +82,8 @@ frappe.ready(() => {
method: "community.lms.doctype.lms_batch_membership.lms_batch_membership.update_current_membership", method: "community.lms.doctype.lms_batch_membership.lms_batch_membership.update_current_membership",
args: { args: {
batch: batch, batch: batch,
course: course course: course,
member: frappe.session.user
}, },
callback: (data) => { callback: (data) => {
window.location.href = `/courses/${course}/home`; window.location.href = `/courses/${course}/home`;