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

fix: message from course page

Browse Source
This commit is contained in:
pateljannat
2021-03-23 19:26:31 +05:30
parent 6433af6613
commit 389254b673
8 changed files with 93 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
community/www/courses/course.html
View File

@@ -39,11 +39,21 @@
<div class="tab-content">
<div class="tab-pane fade py-4 show active" role="tabpanel" id="home">
<div>{{ frappe.utils.md_to_html(course.description) }}</div>
<div class='container'>
<div class="list-group">
{% for topic in course.topics %}
<div class="list-group-item">
<h5><a href="/courses/topic?course={{course.name}}&topic={{topic.name}}">{{topic.title}}</a></h5>
<div>{{topic.preview | markdown }}</div>
</div>
{% endfor %}
</div>
</div>
</div>
<div class="tab-pane fade py-4" role="tabpanel" id="discussions">
<div>
{% if batches %}
<div class="d-inline-block">
<div class="">
<select id="batches-dropdown" class="m-5">
{% for batch in batches %}
<option value="{{batch}}">{{ batch }}</option>
@@ -51,10 +61,11 @@
</select>
</div>
{% endif %}
<div class="form-group">
<textarea class="form-control message-text" rows="3" placeholder="Enter your message here."></textarea>
<button class="btn btn-primary mt-5 send-message" data-author="{{ author | urlencode}}" data-batch="{{ current_batch | urlencode }}">Send</button>
</div>
{% if discussions %}
<p class="d-inline-block float-right add-message">
<a href="/add-messages?new=1&batch={{ current_batch }}&author={{ author }}&course={{ course.title }}" class="btn btn-secondary btn-sm">Add Message</a>
</p>
<div class="discussions">
{% for message in discussions %}
<div class="list-group-item">
@@ -68,15 +79,5 @@
</div>
</div>
</div>
<div class='container'>
<div class="list-group">
{% for topic in course.topics %}
<div class="list-group-item">
<h5><a href="/courses/topic?course={{course.name}}&topic={{topic.name}}">{{topic.title}}</a></h5>
<div>{{topic.preview | markdown }}</div>
</div>
{% endfor %}
</div>
</div>
</section>
{% endblock %}

51
community/www/courses/course.js
View File

@@ -1,25 +1,48 @@
frappe.ready(() => {
var dropdown = document.getElementById("batches-dropdown")
var dropdown = document.getElementById("batches-dropdown");
if (dropdown) {
dropdown.onchange = () => {
frappe.call("community.www.courses.course.get_messages", {batch: dropdown.value}, (data) => {
var href_params = new URLSearchParams($(".add-message").children("a")[0].href)
$(".add-message").children("a")[0].href = `/add-messages?new=1&batch=${dropdown.value}&author=${href_params.get("author")}&course=${href_params.get("course")}`
if(data.message){
$(".discussions").children().remove()
$(".send-message").attr("data-batch", dropdown.value)
frappe.call("community.www.courses.course.get_messages", { batch: dropdown.value }, (data) => {
if (data.message) {
$(".discussions").children().remove();
for (var i = 0; i < data.message.length; i++) {
var message = data.message[i]
var element = `<div class="list-group-item">
<h6> ${message.author} </h6>
${ message.message }
<div class="small text-muted text-right"> ${ message.creation } </div>
</div>`
$(".discussions").append(element)
var element = add_message(data.message[i])
$(".discussions").append(element);
}
}
})
}
}
$(".send-message").click((e) => {
var message = $(".message-text").val().trim();
if (message) {
frappe.call({
"method": "community.www.courses.course.save_message",
"args": {
"batch": decodeURIComponent($(e.target).attr("data-batch")),
"author": decodeURIComponent($(e.target).attr("data-author")),
"message": message
},
"callback": (data) => {
$(".message-text").val("");
var element = add_message(data.message, true)
$(".discussions").prepend(element);
}
})
}
else {
$(".message-text").val("");
}
})
var add_message = (message, session_user=false) => {
var author = session_user ? "You" : message.author
return `<div class="list-group-item">
<h6> ${author} </h6>
${message.message}
<div class="small text-muted text-right"> ${message.creation} </div>
</div>`;
}
/* if(frappe.session.user != "Guest"){
frappe.call('community.www.courses.course.has_enrolled', { course: get_search_params().get("course") }, (data) => {
if (data.message) {
@@ -28,7 +51,7 @@ frappe.ready(() => {
})
} */
})
/*
/*
var show_enrollment_badge = () => {
$(".btn-enroll").addClass("hide");
$(".enrollment-badge").removeClass("hide");

11
community/www/courses/course.py
View File

@@ -66,3 +66,14 @@ def enroll(course):
"user": frappe.session.user
}).save()
@frappe.whitelist()
def save_message(message, author, batch):
doc = frappe.get_doc({
"doctype": "LMS Message",
"author": author,
"batch": batch,
"message": message
})
doc.save(ignore_permissions=True)
return doc