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

fix: conflicts

Browse Source
This commit is contained in:
Jannat Patel
2021-12-21 11:34:43 +05:30
parent d3a3e7066d df3c5060e9
commit 7d9b60c16a
74 changed files with 2114 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
school/overrides/user.py
View File

@@ -15,6 +15,7 @@ class CustomUser(User):
super(CustomUser, self).validate()
self.validate_username_characters()
self.validate_skills()
self.validate_completion()
def validate_username_characters(self):
if len(self.username):
@@ -53,6 +54,12 @@ class CustomUser(User):
if len(self.username) < 4:
frappe.throw(_("Username cannot be less than 4 characters"))
def get_username_from_first_name(self):
return frappe.scrub(self.first_name) + str(random.randint(0, 99))
def remove_illegal_characters(self):
return re.sub("[^\w]+", "", self.username).strip("_")
def validate_skills(self):
unique_skills = []
for skill in self.skill:
@@ -63,12 +70,18 @@ class CustomUser(User):
else:
frappe.throw(_("Skills must be unique"))
def validate_completion(self):
all_fields_have_value = True
if frappe.db.get_single_value("LMS Settings", "force_profile_completion"):
profile_mandatory_fields = frappe.get_hooks("profile_mandatory_fields")
docfields = frappe.get_meta(self.doctype).fields
def get_username_from_first_name(self):
return frappe.scrub(self.first_name) + str(random.randint(0, 99))
for field in profile_mandatory_fields:
if not self.get(field):
all_fields_have_value = False
break
def remove_illegal_characters(self):
return re.sub("[^\w]+", "", self.username).strip("_")
self.profile_complete = all_fields_have_value
def get_authored_courses(self) -> int:
"""Returns the number of courses authored by this user.