refactor: moved community member class functions to user override

community/www/batch/learn.py

@@ -18,7 +18,7 @@ def get_context(context):
     context.lesson = context.course.get_lesson(chapter_index, lesson_index)
     context.lesson_index = lesson_index
     context.chapter_index = chapter_index
-
+    print(context.lesson)
     outline = context.course.get_outline()
     next_ = outline.get_next(lesson_number)
     prev_ = outline.get_prev(lesson_number)

community/www/batch/members.html

@@ -25,7 +25,7 @@
 	{% for member in members %}
 	<div class="d-flex align-items-center">
 		<div>
-			{{ Profile(member.photo, member.full_name, member.abbr, "small") }}
+      {{ widgets.Avatar(member=member, avatar_class="avatar-medium") }} <a href="/{{member.username}}">{{ member.full_name }}</a>
 		</div>
 		<div class="mr-5">
 			{{member.full_name}}

community/www/dashboard/index.html

@@ -91,7 +91,7 @@
 <section>
 	<div class="dashboard__parent">
 		<div>
-			{{ Profile(member.photo, member.full_name, member.abbr, "large")}}
+      {{ widgets.Avatar(member=member, avatar_class="avatar-medium") }} <a href="/{{member.username}}">{{ member.full_name }}</a>
 		</div>
 		<div class="dashboard__details">
 			<div class="dashboard__name">
@@ -125,7 +125,7 @@
 								</div>
 								<div class="d-flex align-items-center w-100">
 									<div>
-										{{ Profile(message.profile, message.full_name, message.abbr, "small")}}
+                    {{ widgets.Avatar(member=member, avatar_class="avatar-medium") }} <a href="/{{member.username}}">{{ member.full_name }}</a>
 									</div>
 									<div class="ml-5 mt-5">{{ frappe.utils.md_to_html(message.message) }}</div>
 								</div>
@@ -209,4 +209,4 @@
 	</div>
 
 </section>
-{% endblock %}
+{% endblock %}

community/www/dashboard/index.py

@@ -7,7 +7,7 @@ def get_context(context):
     if frappe.session.user == "Guest":
         frappe.local.flags.redirect_location = "/login"
         raise frappe.Redirect
-    context.member = frappe.get_all("Community Member", {"email": frappe.session.user}, ["name", "email", "photo", "full_name", "abbr"])[0]
+    context.member = frappe.get_doc("User", frappe.session.user)
     context.memberships = get_memberships(context.member.name)
     context.courses = get_courses(context.memberships)
     context.activity = get_activity(context.memberships)
@@ -38,5 +38,4 @@ def get_activity(memberships):
     messages = frappe.get_all("LMS Message", {"batch": ["in", ",".join(batches)]}, ["message", "author", "creation", "batch"], order_by='creation desc')
     for message in messages:
         message.course = courses[message.batch]
-        message.profile, message.full_name, message.abbr = frappe.db.get_value("Community Member", message.author, ["photo", "full_name", "abbr"])
     return messages

community/www/macros/profile.html

@@ -1,10 +0,0 @@
-{% macro Profile(photo, full_name, abbr, icon) %}
-{% if photo %}
-<img class="avatar rounded-circle img-fluid mr-5{% if icon == 'large' %} dashboard__profile {% else %} dashboard__profileSmall {% endif %}"
-	src="{{ photo }}" alt="{{ full_name }}">
-{% else %}
-<div class="standard-image mr-5 {% if icon == 'large' %} dashboard__abbr {% else %} dashboard__abbrSmall {% endif %}">
-	{{ abbr }}
-</div>
-{% endif %}
-{% endmacro %}

community/www/profiles/profile.html

@@ -94,7 +94,7 @@
 {% block page_content %}
     <div class="dashboard__parent">
         <div class="dashboard__photo">
-            {{ Profile(member.photo, member.full_name, member.abbr, "large")}}
+          {{ widgets.Avatar(member=member, avatar_class="avatar-medium") }} <a href="/{{member.username}}">{{ member.full_name }}</a>
         </div>
         <div class="dashboard__details">
             <div class="dashboard__name">