From f13bb494ef0f24e54d1757d3f3024e564f842e60 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Mon, 3 May 2021 15:50:14 +0530 Subject: [PATCH] fix: converted tabs to spaces --- community/lms/doctype/lms_batch/lms_batch.py | 16 ++--- .../lms_batch_membership.py | 58 +++++++++---------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/community/lms/doctype/lms_batch/lms_batch.py b/community/lms/doctype/lms_batch/lms_batch.py index ad5c32b1..5d26ef49 100644 --- a/community/lms/doctype/lms_batch/lms_batch.py +++ b/community/lms/doctype/lms_batch/lms_batch.py @@ -8,14 +8,14 @@ from frappe.model.document import Document from community.www.courses.utils import get_member_with_email class LMSBatch(Document): - def validate(self): - if not self.code: - self.generate_code() + def validate(self): + if not self.code: + self.generate_code() - def generate_code(self): - short_code = frappe.db.get_value("LMS Course", self.course, "short_code") - course_batches = frappe.get_all("LMS Batch",{"course":self.course}) - self.code = short_code + str(len(course_batches) + 1) + def generate_code(self): + short_code = frappe.db.get_value("LMS Course", self.course, "short_code") + course_batches = frappe.get_all("LMS Batch",{"course":self.course}) + self.code = short_code + str(len(course_batches) + 1) @frappe.whitelist() def get_messages(batch): @@ -36,4 +36,4 @@ def save_message(message, batch): "author": get_member_with_email(), "message": message }) - doc.save(ignore_permissions=True) \ No newline at end of file + doc.save(ignore_permissions=True) diff --git a/community/lms/doctype/lms_batch_membership/lms_batch_membership.py b/community/lms/doctype/lms_batch_membership/lms_batch_membership.py index ba218209..956d7df4 100644 --- a/community/lms/doctype/lms_batch_membership/lms_batch_membership.py +++ b/community/lms/doctype/lms_batch_membership/lms_batch_membership.py @@ -8,36 +8,36 @@ from frappe.model.document import Document from frappe import _ class LMSBatchMembership(Document): - - def validate(self): - self.validate_membership_in_same_batch() - self.validate_membership_in_different_batch_same_course() - - def validate_membership_in_same_batch(self): - previous_membership = frappe.db.get_value("LMS Batch Membership", {"member": self.member, "batch": self.batch, "name": ["!=", self.name]}, ["member_type","member"], as_dict=1) - if previous_membership: - member_name = frappe.db.get_value("Community Member", self.member, "full_name") - frappe.throw(_("{0} is already a {1} of {2}").format(member_name, previous_membership.member_type, self.batch)) - def validate_membership_in_different_batch_same_course(self): - course = frappe.db.get_value("LMS Batch", self.batch, "course") - previous_membership = frappe.get_all("LMS Batch Membership", {"member": self.member}, ["batch", "member_type"]) - 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"): - member_name = frappe.db.get_value("Community Member", 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)) + def validate(self): + self.validate_membership_in_same_batch() + self.validate_membership_in_different_batch_same_course() + + def validate_membership_in_same_batch(self): + previous_membership = frappe.db.get_value("LMS Batch Membership", {"member": self.member, "batch": self.batch, "name": ["!=", self.name]}, ["member_type","member"], as_dict=1) + if previous_membership: + member_name = frappe.db.get_value("Community Member", self.member, "full_name") + frappe.throw(_("{0} is already a {1} of {2}").format(member_name, previous_membership.member_type, self.batch)) + + def validate_membership_in_different_batch_same_course(self): + course = frappe.db.get_value("LMS Batch", self.batch, "course") + previous_membership = frappe.get_all("LMS Batch Membership", {"member": self.member}, ["batch", "member_type"]) + 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"): + member_name = frappe.db.get_value("Community Member", 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)) @frappe.whitelist() def create_membership(batch, course, member=None, member_type="Student", role="Member"): - if not member: - member = frappe.db.get_value("Community Member", {"email": frappe.session.user}, "name") - frappe.get_doc({ - "doctype": "LMS Batch Membership", - "batch": batch, - "role": role, - "member_type": member_type, - "member": member - }).save(ignore_permissions=True) - course_slug = frappe.db.get_value("LMS Course", {"title": course}, ["slug"]) - return course_slug \ No newline at end of file + if not member: + member = frappe.db.get_value("Community Member", {"email": frappe.session.user}, "name") + frappe.get_doc({ + "doctype": "LMS Batch Membership", + "batch": batch, + "role": role, + "member_type": member_type, + "member": member + }).save(ignore_permissions=True) + course_slug = frappe.db.get_value("LMS Course", {"title": course}, ["slug"]) + return course_slug