+ {{ CourseBasicDetail(course)}}
+ {{ InstructorsSection(instructor) }}
+ {% if batch.description %}
+ {{ BatchDetails(batch.description) }}
+ {% endif %}
+ {{ MentorsSection(mentors, True) }}
{% endblock %}
+
+{% macro CourseBasicDetail(course) %}
+
+{{ Sidebar(course_slug, batch_code) }}
+
+
+
+ {{ Messages(messages) }}
+
+ {{ TextArea() }}
{% endblock %}
+
+{% macro Messages(messages) %}
+{% for message in messages %}
+
+
+
+ {{ message.author_name }}
+
+
+ {{ frappe.utils.pretty_date(message.creation) }}
+
+
+
+ {{ message.message }}
+
+
+
+{% endfor %}
+{% endmacro %}
+
+{% macro TextArea() %}
+
+{% endmacro %}
\ No newline at end of file
diff --git a/community/www/courses/discuss/index.js b/community/www/courses/discuss/index.js
new file mode 100644
index 00000000..64ab83b5
--- /dev/null
+++ b/community/www/courses/discuss/index.js
@@ -0,0 +1,41 @@
+frappe.ready(() => {
+ const assets = [
+ "/assets/frappe/js/lib/socket.io.min.js",
+ "/assets/frappe/js/frappe/socketio_client.js"
+ ]
+ frappe.require(assets, () => {
+ if (window.dev_server) {
+ frappe.boot.socketio_port = "9000" //use socketio port shown when bench starts
+ }
+ frappe.socketio.init(9000);
+ console.log(frappe.socketio)
+ })
+ frappe.realtime.on("new_lms_message", (data) => {
+ console.log(data)
+ })
+
+ setTimeout(() => {
+ window.scrollTo(0, document.body.scrollHeight);
+ }, 0);
+
+ $(".msger-send-btn").click((e) => {
+ e.preventDefault();
+ var message = $(".msger-input").val().trim();
+ if (message) {
+ frappe.call({
+ "method": "community.lms.doctype.lms_batch.lms_batch.save_message",
+ "args": {
+ "batch": decodeURIComponent($(e.target).attr("data-batch")),
+ "message": message
+ },
+ "callback": (data) => {
+ $(".msger-input").val("");
+ frappe.realtime.publish("new_lms_message", {"message":"JJK"})
+ }
+ })
+ }
+ else {
+ $(".msger-input").val("");
+ }
+ })
+})
\ No newline at end of file
diff --git a/community/www/courses/discuss/index.py b/community/www/courses/discuss/index.py
index 03180785..7c34761a 100644
--- a/community/www/courses/discuss/index.py
+++ b/community/www/courses/discuss/index.py
@@ -1,8 +1,15 @@
import frappe
-from community.www.courses.utils import redirect_if_not_a_member
+from community.www.courses.utils import redirect_if_not_a_member, get_course, get_batch_members, get_batch
+from community.lms.doctype.lms_batch.lms_batch import get_messages
def get_context(context):
context.no_cache = 1
- context.course = frappe.form_dict["course"]
+ context.course_slug = frappe.form_dict["course"]
+ context.course = get_course(context.course_slug)
context.batch_code = frappe.form_dict["batch"]
- redirect_if_not_a_member(context.course, context.batch_code)
\ No newline at end of file
+ redirect_if_not_a_member(context.course_slug, context.batch_code)
+
+ context.batch = get_batch(context.batch_code)
+ context.members = get_batch_members(context.batch.name)
+ context.member_count = len(context.members)
+ context.messages = get_messages(context.batch.name)
\ No newline at end of file
diff --git a/community/www/courses/members/index.html b/community/www/courses/members/index.html
index 651b3aa8..618ce2ac 100644
--- a/community/www/courses/members/index.html
+++ b/community/www/courses/members/index.html
@@ -1,6 +1,8 @@
{% extends "templates/base.html" %}
{% from "www/macros/sidebar.html" import Sidebar %}
{% from "www/macros/profile.html" import Profile %}
+{% from "www/macros/common_macro.html" import BatchHearder %}
+
{% block title %}Members{% endblock %}
{% block head_include %}
@@ -8,28 +10,29 @@
{% endblock %}
{% block content %}
-{{ Sidebar(course, batch_code) }}
+{{ Sidebar(course_slug, batch_code) }}
-
-
{{course.name}}
-
{{member_count}} members
-
-
-
- {% for member in members %}
-
-
- {{ Profile(member.photo, member.full_name, member.abbr, "small") }}
-
-
- {{member.full_name}}
-
- {% if member.is_mentor %}
-
Mentor
- {% endif %}
-
-
- {% endfor %}
-
+ {{ BatchHearder(course.name, member_count)}}
+ {{ MembersList(members)}}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+
+
+{% macro MembersList(members) %}
+
+ {% for member in members %}
+
+
+ {{ Profile(member.photo, member.full_name, member.abbr, "small") }}
+
+
+ {{member.full_name}}
+
+ {% if member.is_mentor %}
+
Mentor
+ {% endif %}
+
+
+ {% endfor %}
+
+{% endmacro %}
\ No newline at end of file
diff --git a/community/www/courses/members/index.py b/community/www/courses/members/index.py
index 1ae3e266..7e9bf36a 100644
--- a/community/www/courses/members/index.py
+++ b/community/www/courses/members/index.py
@@ -1,5 +1,5 @@
import frappe
-from community.www.courses.utils import redirect_if_not_a_member, get_batch, get_member_with_name, get_course
+from community.www.courses.utils import redirect_if_not_a_member, get_batch, get_member_with_name, get_course, get_batch_members
def get_context(context):
context.no_cache = 1
@@ -8,16 +8,5 @@ def get_context(context):
context.batch_code = frappe.form_dict["batch"]
redirect_if_not_a_member(context.course_slug, context.batch_code)
context.batch = get_batch(context.batch_code)
- context.members = get_members(context.batch)
- context.member_count = len(context.members)
-
-def get_members(batch):
- members = []
- memberships = frappe.get_all("LMS Batch Membership", {"batch": batch}, ["member", "member_type"])
-
- for membership in memberships:
- member = get_member_with_name(membership.member)
- if membership.member_type == "Mentor":
- member.is_mentor = True
- members.append(member)
- return members
\ No newline at end of file
+ context.members = get_batch_members(context.batch.name)
+ context.member_count = len(context.members)
\ No newline at end of file
diff --git a/community/www/courses/utils.py b/community/www/courses/utils.py
index 424b88e1..9537d320 100644
--- a/community/www/courses/utils.py
+++ b/community/www/courses/utils.py
@@ -14,12 +14,12 @@ def get_member_with_name(name):
def get_batch(code):
try:
- return frappe.db.get_value("LMS Batch", {"code": code}, "name")
+ return frappe.db.get_value("LMS Batch", {"code": code}, ["name", "description"], as_dict=True)
except frappe.DoesNotExistError:
return
def is_member_of_batch(batch_code):
- membership = frappe.get_all("LMS Batch Membership", {"batch": get_batch(batch_code), "member": get_member_with_email()})
+ membership = frappe.get_all("LMS Batch Membership", {"batch": get_batch(batch_code).name, "member": get_member_with_email()})
if len(membership):
return True
return False
@@ -31,6 +31,27 @@ def redirect_if_not_a_member(course,batch_code):
def get_course(slug):
try:
- return frappe.db.get_value("LMS Course", {"slug": slug}, "name", as_dict=True)
+ return frappe.get_doc("LMS Course", {"slug": slug})
except frappe.DoesNotExistError:
- return
\ No newline at end of file
+ return
+
+def get_instructor(owner):
+ instructor = frappe._dict()
+ try:
+ instructor = frappe.get_doc("Community Member", {"email": owner})
+ except frappe.DoesNotExistError:
+ instructor.full_name = owner
+ instructor.abbr = ("").join([ s[0] for s in owner.split() ])
+ instructor.course_count = len(frappe.get_all("LMS Course", {"owner": owner}))
+ return instructor
+
+def get_batch_members(batch):
+ members = []
+ memberships = frappe.get_all("LMS Batch Membership", {"batch": batch}, ["member", "member_type"])
+
+ for membership in memberships:
+ member = get_member_with_name(membership.member)
+ if membership.member_type == "Mentor":
+ member.is_mentor = True
+ members.append(member)
+ return members
\ No newline at end of file
diff --git a/community/www/macros/common_macro.html b/community/www/macros/common_macro.html
new file mode 100644
index 00000000..f5cf190e
--- /dev/null
+++ b/community/www/macros/common_macro.html
@@ -0,0 +1,32 @@
+{% macro InstructorsSection(instructor) %}
+
Instructor
+
+
{{instructor.full_name}}
+
Created {{instructor.course_count}} courses
+
+{% endmacro %}
+
+{% macro MentorsSection(mentors, is_mentor) %}
+
Mentors
+{% for m in mentors %}
+
+
{{m.full_name}}
+
Mentored {{m.batch_count}} batches
+
+{% endfor %}
+{% if not is_mentor %}
+
+ Interested to become a mentor?
+
+
+
+{% endif %}
+{% endmacro %}
+
+
+{% macro BatchHearder(course_name, member_count) %}
+
+
{{course_name}}
+
{{member_count}} members
+
+{% endmacro %}
\ No newline at end of file