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

refactor: moved community member class functions to user override

Browse Source
This commit is contained in:
pateljannat
2021-05-21 16:22:59 +05:30
parent 63d00a46c4
commit 637c795321
13 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
community/www/dashboard/index.html
View File

@@ -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 %}

3
community/www/dashboard/index.py
View File

@@ -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