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

fix: email patch and conference portal

Browse Source
This commit is contained in:
pateljannat
2021-04-06 18:51:40 +05:30
parent 87acbb9f6e
commit 7658942500
9 changed files with 142 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,11 +30,11 @@
</li>
{% if discussions %}
<li class="nav-item">
<a class="nav-link" id="discussions-tab" data-toggle="tab" href="#discussions" role="tab" aria-controls="discussions"
aria-selected="false">Discussions</a>
<a class="nav-link" id="discussions-tab" data-toggle="tab" href="#discussions" role="tab"
aria-controls="discussions" aria-selected="false">Discussions</a>
</li>
{% endif %}
</ul>
</ul>
</div>
<div class="tab-content">
<div class="tab-pane fade py-4 show active" role="tabpanel" id="home">
@@ -43,7 +43,8 @@
<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>
<h5><a href="/courses/topic?course={{course.name}}&topic={{topic.name}}">{{topic.title}}</a>
</h5>
<div>{{topic.preview | markdown }}</div>
</div>
{% endfor %}
@@ -53,18 +54,28 @@
<div class="tab-pane fade py-4" role="tabpanel" id="discussions">
<div>
{% if batches %}
<div class="">
<select id="batches-dropdown" class="m-5">
{% for batch in batches %}
<option value="{{batch}}">{{ batch }}</option>
{% endfor %}
</select>
<div class="dropdown">
<button class="btn btn-default dropdown-toggle mb-5" data-toggle="dropdown" aria-expanded="false">
<span class="current-batch">{{ batches[0] }}</span>
<b class="caret"></b>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
{% for batch in batches %}
<li>
<a class="grey-link dropdown-item list-batch" href="#" onclick="return false;" data-label="{{ batch | urlencode}}">
<span class="alt-underline"> {{ batch }} </span>
</a>
</li>
{% endfor %}
</ul>
</div>
{% endif %}
<div class="border p-5">
<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>
<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>
</div>
{% if discussions %}
@@ -75,11 +86,11 @@
{{ message.message }}
<div class="small text-muted text-right">{{ message.creation }}</div>
</div>
{% endfor %}
{% endfor %}
</div>
{% endif %}
</div>
</div>
</div>
</section>
{% endblock %}
{% endblock %}

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

@@ -1,19 +1,18 @@
frappe.ready(() => {
var dropdown = document.getElementById("batches-dropdown");
if (dropdown) {
dropdown.onchange = () => {
$(".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 element = add_message(data.message[i])
$(".discussions").append(element);
}
$(".list-batch").click((e) => {
var batch = decodeURIComponent($(e.currentTarget).attr("data-label"))
$(".current-batch").text(batch)
$(".send-message").attr("data-batch", batch)
frappe.call("community.www.courses.course.get_messages", { batch: batch }, (data) => {
if (data.message) {
$(".discussions").children().remove();
for (var i = 0; i < data.message.length; i++) {
var element = add_message(data.message[i])
$(".discussions").append(element);
}
})
}
}
}
})
})
$(".send-message").click((e) => {
var message = $(".message-text").val().trim();
if (message) {
@@ -35,7 +34,7 @@ frappe.ready(() => {
$(".message-text").val("");
}
})
var add_message = (message, session_user=false) => {
var add_message = (message, session_user = false) => {
var author = session_user ? "You" : message.author
return `<div class="list-group-item">
<h6> ${author} </h6>

12
community/www/courses/index.html
View File

@@ -2,10 +2,10 @@
{% block title %}{{ 'Courses' }}{% endblock %}
{% from "www/courses/macros/card.html" import course_card %}
{% block head_include %}
<meta name="description" content="{{ 'Courses' }}" />
<meta name="keywords" content="Courses" />
<style>
</style>
<meta name="description" content="{{ 'Courses' }}" />
<meta name="keywords" content="Courses" />
<style>
</style>
{% endblock %}
{% block content %}
@@ -16,8 +16,8 @@
<div class='container'>
<div class="row mt-5">
{% for course in courses %}
{{ course_card(course) }}
{% endfor %}
{{ course_card(course) }}
{% endfor %}
</div>
</div>
</section>