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

refactor: patches to fix data, profile dashboard, lms mentor mapping page fixes

Browse Source
This commit is contained in:
pateljannat
2021-05-21 21:40:31 +05:30
parent 637c795321
commit 713dcf178a
23 changed files with 314 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,12 +90,12 @@
{% block content %}
<section>
<div class="dashboard__parent">
<div>
{{ widgets.Avatar(member=member, avatar_class="avatar-medium") }} <a href="/{{member.username}}">{{ member.full_name }}</a>
<div class="mr-5">
{{ widgets.Avatar(member=member, avatar_class="avatar-xl") }}
</div>
<div class="dashboard__details">
<div class="dashboard__name">
{{member.full_name}}
<a class="anchor_style" href="/{{member.username}}">{{ member.full_name }}</a>
</div>
<div>
<ul class="nav nav-tabs mt-4" id="myTab" role="tablist">
@@ -120,20 +120,18 @@
{% if activity %}
{% for message in activity %}
<div class="dashboard__message border m-5 p-3">
<a class="anchor_style bold" href="/{{message.member.username}}">{{ message.member.full_name }}</a>
<div class="text-muted float-right">
{{ message.course }} ({{message.batch}})
</div>
<div class="d-flex align-items-center w-100">
<div>
{{ widgets.Avatar(member=member, avatar_class="avatar-medium") }} <a href="/{{member.username}}">{{ member.full_name }}</a>
{{ widgets.Avatar(member=message.member, avatar_class="avatar-medium") }}
</div>
<div class="ml-5 mt-5">{{ frappe.utils.md_to_html(message.message) }}</div>
</div>
<div class="d-flex justify-content-between">
<div class="">
{{message.full_name}}
</div>
<div class="text-muted">
<div class="d-flex">
<div class="text-muted float-right">
{{ frappe.utils.pretty_date(message.creation) }}
</div>
</div>

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

@@ -8,13 +8,13 @@ def get_context(context):
frappe.local.flags.redirect_location = "/login"
raise frappe.Redirect
context.member = frappe.get_doc("User", frappe.session.user)
context.memberships = get_memberships(context.member.name)
context.memberships = get_memberships()
context.courses = get_courses(context.memberships)
context.activity = get_activity(context.memberships)
context.sketches = list(filter(lambda x: x.owner == frappe.session.user, Sketch.get_recent_sketches(owner=context.member.email)))
def get_memberships(member):
return frappe.get_all("LMS Batch Membership", {"member": member}, ["batch", "member_type", "creation"])
def get_memberships():
return frappe.get_all("LMS Batch Membership", {"member": frappe.session.user}, ["batch", "member_type", "creation"])
def get_courses(memberships):
courses = []
@@ -38,4 +38,5 @@ 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.member = frappe.get_doc("User", message.author)
return messages