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

fix: user validaton and community member name issue

Browse Source
This commit is contained in:
pateljannat
2021-04-28 13:08:09 +05:30
parent d68f1de796
commit c6bd47eb62
7 changed files with 71 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
community/lms/doctype/lms_message/lms_message.json
View File

@@ -58,7 +58,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2021-04-26 16:11:20.142164",
"modified": "2021-04-28 10:17:57.618127",
"modified_by": "Administrator",
"module": "LMS",
"name": "LMS Message",
@@ -80,5 +80,6 @@
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
"title_field": "author",
"track_changes": 1
}

64
community/lms/doctype/lms_message/lms_message.py
View File

@@ -7,10 +7,11 @@ import frappe
from frappe.model.document import Document
from frappe import _
from frappe.utils import add_days, nowdate
from community.www.courses.utils import get_batch_members
class LMSMessage(Document):
def after_insert(self):
self.send_email()
""" def after_insert(self):
self.send_email() """
def send_email(self):
membership = frappe.get_all("LMS Batch Membership", {"batch": self.batch}, ["member"])
@@ -63,38 +64,41 @@ def send_daily_digest():
)
def publish_message(doc, method):
print(frappe.session.user)
email = frappe.db.get_value("Community Member", doc.author, "email")
session_user = True if email == frappe.session.user else False
message = get_message_template(doc, session_user)
template = get_message_template()
message = frappe._dict()
message.author_name = doc.author_name
message.message_time = frappe.utils.pretty_date(doc.creation)
message.message = frappe.utils.md_to_html(doc.message)
js = """
$(".msger-input").val("");
$(".message-section").append(`{0}`);
""".format(message)
var template = `{0}`;
var message = {1};
var session_user = ("{2}" == frappe.session.user) ? true : false;
message.author_name = session_user ? "You" : message.author_name
message.is_author = session_user;
template = frappe.render_template(template, {{
"message": message
}})
$(".message-section").append(template);
""".format(template, message, email)
frappe.publish_realtime(event="eval_js", message=js, after_commit=True)
def get_message_template(message, session_user):
if session_user:
message.author_name = "You"
message.is_author = True
message.message_time = frappe.utils.pretty_date(message.creation)
template = """ <div class="discussion {% if message.is_author %} is-author {% endif %}">
<div class="d-flex justify-content-between">
<div class="font-weight-bold">
{{ message.author_name }}
</div>
<div class="text-muted">
{{ message.message_time }}
</div>
</div>
<div class="mt-5">
{{ message.message }}
</div>
</div>"""
template = frappe.render_template(template, {
"message": message
})
return template
def get_message_template():
return """
<div class="discussion {% if message.is_author %} is-author {% endif %}">
<div class="d-flex justify-content-between">
<div class="font-weight-bold">
{{ message.author_name }}
</div>
<div class="text-muted">
{{ message.message_time }}
</div>
</div>
<div class="mt-5">
{{ message.message }}
</div>
</div>
"""