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

Merge pull request #285 from pateljannat/profile-fixes

Browse Source
This commit is contained in:
Jannat Patel
2022-01-03 10:21:05 +05:30
committed by GitHub
parent 8aceaf0595 730f1a6c47
commit 9150def93e
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
school/overrides/user.py
View File

@@ -71,8 +71,8 @@ class CustomUser(User):
frappe.throw(_("Skills must be unique")) frappe.throw(_("Skills must be unique"))
def validate_completion(self): def validate_completion(self):
all_fields_have_value = True
if frappe.db.get_single_value("LMS Settings", "force_profile_completion"): if frappe.db.get_single_value("LMS Settings", "force_profile_completion"):
all_fields_have_value = True
profile_mandatory_fields = frappe.get_hooks("profile_mandatory_fields") profile_mandatory_fields = frappe.get_hooks("profile_mandatory_fields")
docfields = frappe.get_meta(self.doctype).fields docfields = frappe.get_meta(self.doctype).fields

14
school/www/profiles/profile.html
View File

@@ -81,20 +81,20 @@
<div class="common-card-style overview-card small-title"> <div class="common-card-style overview-card small-title">
{% if enrollment %} {% if enrollment %}
<div class="overview-item"> <div class="overview-item">
<img class="icon-background mr-1" src="/assets/school/icons/course.svg" /> <img class="mr-1" src="/assets/school/icons/course.svg" />
{{ enrollment }} {% if enrollment > 1 %} Courses {% else %} Course {% endif %} Taken <span> {{ enrollment }} {% if enrollment > 1 %} Courses {% else %} Course {% endif %} Taken </span>
</div> </div>
{% endif %} {% endif %}
{% if reviews %} {% if reviews %}
<div class="overview-item"> <div class="overview-item">
<img class="icon-background mr-1" src="/assets/school/icons/rating.svg" /> <img class="mr-1" src="/assets/school/icons/rating.svg" />
{{ reviews }} {% if reviews > 1 %} Courses {% else %} Course {% endif %} Reviewed <span> {{ reviews }} {% if reviews > 1 %} Courses {% else %} Course {% endif %} Reviewed </span>
</div> </div>
{% endif %} {% endif %}
{% if mentorship %} {% if mentorship %}
<div class="overview-item"> <div class="overview-item">
<img class="icon-background mr-1" src="/assets/school/icons/calendar.svg" /> <img class="mr-1" src="/assets/school/icons/calendar.svg" />
{{ mentorship }} {% if mentorship > 1 %} Courses {% else %} Course {% endif %} Mentored <span> {{ mentorship }} {% if mentorship > 1 %} Courses {% else %} Course {% endif %} Mentored </span>
</div> </div>
{% endif %} {% endif %}
</div> </div>
@@ -238,6 +238,7 @@
{% endmacro %} {% endmacro %}
{% macro Contact(member) %} {% macro Contact(member) %}
{% if show_contacts_section %}
<div class="education-details"> <div class="education-details">
<div class="course-home-headings"> {{ _("Contact") }} </div> <div class="course-home-headings"> {{ _("Contact") }} </div>
<div class="common-card-style overview-card"> <div class="common-card-style overview-card">
@@ -269,6 +270,7 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
{% endif %}
{% endmacro %} {% endmacro %}
{% macro Skills(member) %} {% macro Skills(member) %}

8
school/www/profiles/profile.py
View File

@@ -18,8 +18,16 @@ def get_context(context):
context.template = "www/404.html" context.template = "www/404.html"
return return
context.hide_primary_contact = frappe.db.get_single_value("LMS Settings", "hide_primary_contact") context.hide_primary_contact = frappe.db.get_single_value("LMS Settings", "hide_primary_contact")
context.show_contacts_section = show_contacts_section(context.member, context.hide_primary_contact)
context.profile_tabs = get_profile_tabs(context.member) context.profile_tabs = get_profile_tabs(context.member)
def show_contacts_section(member, hide_primary_contact):
if member.github or member.linkedin or member.medium:
return True
if hide_primary_contact or member.hide_private:
return False
return True
def get_profile_tabs(user): def get_profile_tabs(user):
"""Returns the enabled ProfileTab objects. """Returns the enabled ProfileTab objects.