feat: course page redesign

community/lms/doctype/lms_batch/lms_batch.json

@@ -8,8 +8,12 @@
  "field_order": [
   "course",
   "title",
+  "start_date",
+  "start_time",
   "column_break_3",
   "code",
+  "sessions_on",
+  "end_time",
   "section_break_5",
   "description",
   "section_break_7",
@@ -83,11 +87,32 @@
   {
    "fieldname": "section_break_7",
    "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "start_date",
+   "fieldtype": "Date",
+   "label": "Start Date"
+  },
+  {
+   "fieldname": "start_time",
+   "fieldtype": "Time",
+   "label": "Start Time"
+  },
+  {
+   "description": "Enter Days of the week comma separated.",
+   "fieldname": "sessions_on",
+   "fieldtype": "Data",
+   "label": "Sessions On"
+  },
+  {
+   "fieldname": "end_time",
+   "fieldtype": "Time",
+   "label": "End Time"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-03-19 12:56:33.054884",
+ "modified": "2021-04-15 10:52:24.358628",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Batch",

community/lms/doctype/lms_batch_membership/lms_batch_membership.json

@@ -6,9 +6,11 @@
  "engine": "InnoDB",
  "field_order": [
   "batch",
+  "role",
+  "column_break_3",
   "member",
-  "member_type",
-  "role"
+  "member_name",
+  "member_type"
  ],
  "fields": [
   {
@@ -38,11 +40,23 @@
    "in_list_view": 1,
    "label": "Role",
    "options": "\nMember\nAdmin"
+  },
+  {
+   "fetch_from": "member.full_name",
+   "fieldname": "member_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Member Name",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-03-19 15:06:21.374601",
+ "modified": "2021-04-16 09:57:52.926943",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Batch Membership",

community/lms/doctype/lms_batch_membership/lms_batch_membership.py

@@ -26,4 +26,17 @@ class LMSBatchMembership(Document):
 			batch_course = frappe.db.get_value("LMS Batch", membership.batch, "course")
 			if batch_course == course and (membership.member_type == "Student" or self.member_type == "Student"):
 				member_name = frappe.db.get_value("Community Member", self.member, "full_name")
-				frappe.throw(_("{0} is already a {1} of {2} course through {3} batch").format(member_name, membership.member_type, course, membership.batch))
+				frappe.throw(_("{0} is already a {1} of {2} course through {3} batch").format(member_name, membership.member_type, course, membership.batch))
+
+@frappe.whitelist()
+def create_member(batch, member=None, member_type="Student", role="Member"):
+	if not member:
+		member = frappe.db.get_value("Community Member", {"email": frappe.session.user}, "name")
+	frappe.get_doc({
+		"doctype": "LMS Batch Membership",
+		"batch": batch,
+		"role": role,
+		"member_type": member_type,
+		"member": member
+	}).save(ignore_permissions=True)
+	return "OK"

community/lms/doctype/lms_course/lms_course.json

@@ -58,7 +58,7 @@
   {
    "fieldname": "video_link",
    "fieldtype": "Data",
-   "label": "Video Link"
+   "label": "Video Embed Link"
   },
   {
    "fieldname": "section_break_5",
@@ -73,7 +73,7 @@
  "index_web_pages_for_search": 1,
  "is_published_field": "is_published",
  "links": [],
- "modified": "2021-04-14 15:23:39.592341",
+ "modified": "2021-04-15 10:09:25.608422",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",

community/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.js

@@ -0,0 +1,8 @@
+// Copyright (c) 2021, FOSS United and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('LMS Course Mentor Mapping', {
+	// refresh: function(frm) {
+
+	// }
+});

community/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.json

@@ -0,0 +1,61 @@
+{
+ "actions": [],
+ "creation": "2021-04-20 12:45:33.369767",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "course",
+  "mentor",
+  "mentor_name"
+ ],
+ "fields": [
+  {
+   "fieldname": "course",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Course",
+   "options": "LMS Course"
+  },
+  {
+   "fieldname": "mentor",
+   "fieldtype": "Link",
+   "in_standard_filter": 1,
+   "label": "Mentor",
+   "options": "Community Member"
+  },
+  {
+   "fetch_from": "mentor.full_name",
+   "fieldname": "mentor_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Mentor Name",
+   "read_only": 1
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2021-04-20 12:46:48.460934",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "LMS Course Mentor Mapping",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

community/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2021, FOSS United and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class LMSCourseMentorMapping(Document):
+	pass

community/lms/doctype/lms_course_mentor_mapping/test_lms_course_mentor_mapping.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2021, FOSS United and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestLMSCourseMentorMapping(unittest.TestCase):
+	pass

community/lms/doctype/lms_mentor_request/lms_mentor_request.js

@@ -0,0 +1,8 @@
+// Copyright (c) 2021, FOSS United and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('LMS Mentor Request', {
+	// refresh: function(frm) {
+
+	// }
+});

community/lms/doctype/lms_mentor_request/lms_mentor_request.json

@@ -0,0 +1,87 @@
+{
+ "actions": [],
+ "creation": "2021-04-18 11:48:02.635688",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "member",
+  "course",
+  "reviewed_by",
+  "column_break_3",
+  "member_name",
+  "status",
+  "comments"
+ ],
+ "fields": [
+  {
+   "fieldname": "member",
+   "fieldtype": "Link",
+   "in_standard_filter": 1,
+   "label": "Member",
+   "options": "Community Member"
+  },
+  {
+   "fieldname": "course",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Course",
+   "options": "LMS Course"
+  },
+  {
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fetch_from": "member.full_name",
+   "fieldname": "member_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Member Name"
+  },
+  {
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Status",
+   "options": "Pending\nApproved\nRejected\nWithdrawn"
+  },
+  {
+   "fieldname": "reviewed_by",
+   "fieldtype": "Link",
+   "label": "Reviewed By",
+   "options": "Community Member"
+  },
+  {
+   "fieldname": "comments",
+   "fieldtype": "Small Text",
+   "label": "Comments"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2021-04-19 09:27:03.814016",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "LMS Mentor Request",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

community/lms/doctype/lms_mentor_request/lms_mentor_request.py

@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2021, FOSS United and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe import _
+
+class LMSMentorRequest(Document):
+	def on_update(self):
+		if self.has_value_changed('status'):
+			template = frappe.db.get_single_value('LMS Settings', 'mentor_request_status_update')
+			email_template = frappe.get_doc('Email Template', template)
+			message = frappe.render_template(email_template.response, {'member_name': self.member_name, 'status': self.status})
+			subject = _('The status of your application has changed.')
+			member_email = frappe.db.get_value("Community Member", self.member, "email")
+			if self.status == 'Approved' or self.status == 'Rejected':
+				reviewed_by = frappe.db.get_value('Community Member', self.reviewed_by, 'email')
+				send_email(member_email, [get_course_author(self.course), reviewed_by], subject, message)
+			elif self.status == 'Withdrawn':
+				send_email([member_email, get_course_author(self.course)], None, subject, message)
+
+@frappe.whitelist()
+def has_requested(course):
+	return len(frappe.get_all('LMS Mentor Request',
+					filters = {
+						'member': get_member().name,
+						'course': course,
+						'status': ['in', ('Pending', 'Approved')]
+					}
+				)
+			)
+
+@frappe.whitelist()
+def create_request(course):
+	if not has_requested(course):
+		member = get_member()
+		frappe.get_doc({
+			'doctype': 'LMS Mentor Request',
+			'member': member.name,
+			'course': course,
+			'status': 'Pending'
+		}).save(ignore_permissions=True)
+		send_creation_email(course, member)
+		return 'OK'
+	else:
+		return 'Already Applied'
+
+@frappe.whitelist()
+def cancel_request(course):
+	request = frappe.get_doc('LMS Mentor Request', {'member': get_member().name, 'course': course, 'status': ['in', ('Pending', 'Approved')]})
+	request.status = 'Withdrawn'
+	request.save(ignore_permissions=True)
+	return 'OK'
+
+def get_member():
+	try:
+		return frappe.get_doc('Community Member', {'email': frappe.session.user})
+	except frappe.DoesNotExistError:
+		return
+
+def get_course_author(course):
+	return frappe.db.get_value('LMS Course', course, 'owner')
+
+def send_creation_email(course, member):
+	template = frappe.db.get_single_value('LMS Settings', 'mentor_request_creation')
+	email_template = frappe.get_doc('Email Template', template)
+	member_name = member.full_name
+	message = frappe.render_template(email_template.response, {'member_name': member_name})
+	subject = _('Request for Mentorship')
+	send_email([frappe.session.user, get_course_author(course)], None, subject, message)
+
+def send_email(recipients, cc, subject, message):
+	frappe.sendmail(
+		recipients = recipients,
+		cc = cc,
+		sender = frappe.db.get_single_value('LMS Settings', 'email_sender'),
+		subject = subject, 
+		send_priority = 0, 
+		queue_separately = True,
+		message = message
+	)

community/lms/doctype/lms_mentor_request/test_lms_mentor_request.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2021, FOSS United and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestLMSMentorRequest(unittest.TestCase):
+	pass

community/lms/doctype/lms_settings/lms_settings.json

@@ -5,7 +5,10 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "livecode_url"
+  "livecode_url",
+  "mentor_request_creation",
+  "mentor_request_status_update",
+  "email_sender"
  ],
  "fields": [
   {
@@ -13,12 +16,30 @@
    "fieldname": "livecode_url",
    "fieldtype": "Data",
    "label": "LiveCode URL"
+  },
+  {
+   "fieldname": "mentor_request_creation",
+   "fieldtype": "Link",
+   "label": "Mentor Request Creation",
+   "options": "Email Template"
+  },
+  {
+   "fieldname": "mentor_request_status_update",
+   "fieldtype": "Link",
+   "label": "Mentor Request Status update",
+   "options": "Email Template"
+  },
+  {
+   "fieldname": "email_sender",
+   "fieldtype": "Data",
+   "label": "Email Sender",
+   "options": "Email"
   }
  ],
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2021-03-09 14:30:15.807410",
+ "modified": "2021-04-19 13:18:40.497636",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Settings",

community/lms/web_form/add_a_new_batch/add_a_new_batch.js

@@ -0,0 +1,3 @@
+frappe.ready(function() {
+	// bind events here
+})

community/lms/web_form/add_a_new_batch/add_a_new_batch.json

@@ -0,0 +1,124 @@
+{
+ "accept_payment": 0,
+ "allow_comments": 0,
+ "allow_delete": 0,
+ "allow_edit": 0,
+ "allow_incomplete": 0,
+ "allow_multiple": 0,
+ "allow_print": 0,
+ "amount": 0.0,
+ "amount_based_on_field": 0,
+ "apply_document_permissions": 0,
+ "button_label": "Save",
+ "creation": "2021-04-20 11:37:49.135114",
+ "doc_type": "LMS Batch",
+ "docstatus": 0,
+ "doctype": "Web Form",
+ "idx": 0,
+ "is_standard": 1,
+ "login_required": 1,
+ "max_attachment_size": 0,
+ "modified": "2021-04-20 11:51:35.815876",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "add-a-new-batch",
+ "owner": "Administrator",
+ "payment_button_label": "Buy Now",
+ "published": 1,
+ "route": "add-a-new-batch",
+ "route_to_success_link": 0,
+ "show_attachments": 0,
+ "show_in_grid": 0,
+ "show_sidebar": 0,
+ "sidebar_items": [],
+ "success_url": "/add-a-new-batch",
+ "title": "Add a new batch",
+ "web_form_fields": [
+  {
+   "allow_read_on_all_link_options": 0,
+   "fieldname": "course",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "label": "Course",
+   "max_length": 0,
+   "max_value": 0,
+   "options": "LMS Course",
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  },
+  {
+   "allow_read_on_all_link_options": 0,
+   "fieldname": "start_date",
+   "fieldtype": "Date",
+   "hidden": 0,
+   "label": "Start Date",
+   "max_length": 0,
+   "max_value": 0,
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  },
+  {
+   "allow_read_on_all_link_options": 0,
+   "fieldname": "start_time",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "label": "Start Time",
+   "max_length": 0,
+   "max_value": 0,
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  },
+  {
+   "allow_read_on_all_link_options": 0,
+   "fieldname": "",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "max_length": 0,
+   "max_value": 0,
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  },
+  {
+   "allow_read_on_all_link_options": 0,
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "label": "Title",
+   "max_length": 0,
+   "max_value": 0,
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  },
+  {
+   "allow_read_on_all_link_options": 0,
+   "description": "Enter Days of the week comma separated.",
+   "fieldname": "sessions_on",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "label": "Sessions On",
+   "max_length": 0,
+   "max_value": 0,
+   "options": "",
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  },
+  {
+   "allow_read_on_all_link_options": 0,
+   "fieldname": "end_time",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "label": "End Time",
+   "max_length": 0,
+   "max_value": 0,
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  }
+ ]
+}

community/lms/web_form/add_a_new_batch/add_a_new_batch.py

@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+
+import frappe
+
+def get_context(context):
+	# do your magic here
+	pass

community/lms/web_form/join_a_batch/join_a_batch.js

@@ -0,0 +1,3 @@
+frappe.ready(function() {
+	// bind events here
+})

community/lms/web_form/join_a_batch/join_a_batch.json

@@ -0,0 +1,48 @@
+{
+ "accept_payment": 0,
+ "allow_comments": 0,
+ "allow_delete": 0,
+ "allow_edit": 0,
+ "allow_incomplete": 0,
+ "allow_multiple": 0,
+ "allow_print": 0,
+ "amount": 0.0,
+ "amount_based_on_field": 0,
+ "apply_document_permissions": 0,
+ "button_label": "Save",
+ "creation": "2021-04-15 13:32:14.171328",
+ "doc_type": "LMS Batch Membership",
+ "docstatus": 0,
+ "doctype": "Web Form",
+ "idx": 0,
+ "is_standard": 1,
+ "login_required": 1,
+ "max_attachment_size": 0,
+ "modified": "2021-04-15 13:32:14.171328",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "join-a-batch",
+ "owner": "Administrator",
+ "payment_button_label": "Buy Now",
+ "published": 1,
+ "route": "join-a-batch",
+ "route_to_success_link": 0,
+ "show_attachments": 0,
+ "show_in_grid": 0,
+ "show_sidebar": 0,
+ "sidebar_items": [],
+ "success_url": "/join-a-batch",
+ "title": "Join a Batch",
+ "web_form_fields": [
+  {
+   "allow_read_on_all_link_options": 0,
+   "fieldtype": "Attach",
+   "hidden": 0,
+   "max_length": 0,
+   "max_value": 0,
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  }
+ ]
+}

community/lms/web_form/join_a_batch/join_a_batch.py

@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+
+import frappe
+
+def get_context(context):
+	# do your magic here
+	pass