From ea06fe8cf87be67be100180db4b35497b61b24a7 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 20 Dec 2021 14:18:22 +0530
Subject: [PATCH] feat: hooks for profile mandatory fields

---
 .../doctype/lms_settings/lms_settings.json    |  4 ++--
 school/lms/web_form/profile/profile.json      |  4 ++--
 school/overrides/user.py                      |  1 +
 school/public/js/profile.js                   | 21 +++++++++++--------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/school/lms/doctype/lms_settings/lms_settings.json b/school/lms/doctype/lms_settings/lms_settings.json
index f5340711..c92a796c 100644
--- a/school/lms/doctype/lms_settings/lms_settings.json
+++ b/school/lms/doctype/lms_settings/lms_settings.json
@@ -71,7 +71,7 @@
   {
    "fieldname": "profile_restrictions_section",
    "fieldtype": "Section Break",
-   "label": "Profile Restrictions"
+   "label": "Profile"
   },
   {
    "default": "0",
@@ -83,7 +83,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2021-12-15 11:30:06.506403",
+ "modified": "2021-12-20 12:11:26.628925",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Settings",
diff --git a/school/lms/web_form/profile/profile.json b/school/lms/web_form/profile/profile.json
index e5a77c0d..7044f897 100644
--- a/school/lms/web_form/profile/profile.json
+++ b/school/lms/web_form/profile/profile.json
@@ -21,7 +21,7 @@
  "is_standard": 1,
  "login_required": 1,
  "max_attachment_size": 0,
- "modified": "2021-12-14 16:35:24.751439",
+ "modified": "2021-12-20 13:20:19.810134",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "profile",
@@ -335,7 +335,7 @@
    "max_value": 0,
    "options": "",
    "read_only": 0,
-   "reqd": 1,
+   "reqd": 0,
    "show_in_filter": 0
   },
   {
diff --git a/school/overrides/user.py b/school/overrides/user.py
index 26d60024..417ab656 100644
--- a/school/overrides/user.py
+++ b/school/overrides/user.py
@@ -12,6 +12,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):
diff --git a/school/public/js/profile.js b/school/public/js/profile.js
index f3879c2a..dd093224 100644
--- a/school/public/js/profile.js
+++ b/school/public/js/profile.js
@@ -11,14 +11,17 @@ const hide_profile_for_guest_users = () => {
 };
 
 const restrict_users_to_profile_page = () => {
-  if (frappe.session.user != "Guest") {
-    frappe.call({
-      "method": "school.lms.doctype.lms_settings.lms_settings.check_profile_restriction",
-      "callback": (data) => {
-        if (data.message && data.message.redirect) {
-          window.location.href = `${data.message.prefix}${data.message.username}`;
+  setTimeout(() => {
+    var link_array = $('.nav-link').filter((i, elem) => $(elem).text().trim() === "My Profile");
+    if (frappe.session.user != "Guest" && link_array.length && !$(link_array[0]).hasClass("active")) {
+      frappe.call({
+        "method": "school.lms.doctype.lms_settings.lms_settings.check_profile_restriction",
+        "callback": (data) => {
+          if (data.message && data.message.redirect) {
+            window.location.href = `${data.message.prefix}${data.message.username}`;
+          }
         }
-      }
-    });
-  }
+      });
+    }
+  }, 10);
 };