Merge branch 'main' of https://github.com/frappe/lms into class-flow

lms/install.py

@@ -9,6 +9,7 @@ def after_install():
 def after_sync():
 	create_lms_roles()
 	set_default_home()
+	set_default_certificate_print_format()
 	add_all_roles_to("Administrator")
 
 
@@ -76,7 +77,7 @@ def create_course_creator_role():
 				"desk_access": 0,
 			}
 		)
-		role.save(ignore_permissions=True)
+		role.save()
 
 
 def create_moderator_role():
@@ -89,7 +90,7 @@ def create_moderator_role():
 				"desk_access": 0,
 			}
 		)
-		role.save(ignore_permissions=True)
+		role.save()
 
 
 def create_evaluator_role():
@@ -102,7 +103,26 @@ def create_evaluator_role():
 				"desk_access": 0,
 			}
 		)
-		role.save(ignore_permissions=True)
+		role.save()
+
+
+def set_default_certificate_print_format():
+	filters = {
+		"doc_type": "LMS Certificate",
+		"property": "default_print_format",
+	}
+	if not frappe.db.exists("Property Setter", filters):
+		filters.update(
+			{
+				"doctype_or_field": "DocType",
+				"property_type": "Data",
+				"value": "Certificate",
+			}
+		)
+
+		doc = frappe.new_doc("Property Setter")
+		doc.update(filters)
+		doc.save()
 
 
 def delete_custom_fields():

lms/lms/doctype/lms_certificate/lms_certificate.py

@@ -24,17 +24,15 @@ class LMSCertificate(Document):
 				_("{0} is already certified for the course {1}").format(full_name, course_name)
 			)
 
-	def after_insert(self):
+	def on_update(self):
-		share = frappe.get_doc(
+		frappe.share.add_docshare(
-			{
+			self.doctype,
-				"doctype": "DocShare",
+			self.name,
-				"read": 1,
+			self.member,
-				"share_doctype": "LMS Certificate",
+			write=1,
-				"share_name": self.name,
+			share=1,
-				"user": self.member,
+			flags={"ignore_share_permission": True},
-			}
 		)
-		share.save(ignore_permissions=True)
 
 
 @frappe.whitelist()

lms/lms/print_format/certificate/certificate.json

@@ -1,7 +1,7 @@
 {
  "absolute_value": 0,
  "align_labels_right": 0,
- "creation": "2023-02-22 21:36:54.560420",
+ "creation": "2023-08-09 17:02:21.430320",
  "css": ".outer-border {\n    font-family: \"Inter\" sans-serif;\n    font-size: 16px;\n    border-radius: 0.5rem;\n    border: 1px solid #E2E6E9;\n    padding: 1rem;\n}\n\n.inner-border {\n    border: 10px solid #0089FF;\n    border-radius: 8px;\n    text-align: center;\n    padding: 6rem 4rem;\n    background-color: #FFFFFF;\n}\n\n.certificate-logo {\n    height: 1.5rem;\n    margin-bottom: 4rem;\n}\n\n.certificate-name {\n    font-size: 2rem;\n    font-weight: 500;\n    color: #192734;\n    margin-bottom: 0.5rem;\n}\n\n.certificate-footer {\n    margin: 4rem auto 0;\n    width: 70%;\n    text-align: center;\n}\n\n.certificate-footer-item {\n    color: #192734;\n}\n\n.cursive-font {\n    font-family: cursive;\n    font-weight: 600;\n}\n\n.certificate-divider {\n    margin: 0.5rem 0;\n}\n\n.certificate-expiry {\n    margin-left: 2rem;\n}",
  "custom_format": 1,
  "disabled": 0,
@@ -10,14 +10,14 @@
  "doctype": "Print Format",
  "font_size": 14,
  "format_data": "{\"header\":\"<div class=\\\"document-header\\\">\\n\\t<h3>LMS Certificate</h3>\\n\\t<p>{{ doc.name }}</p>\\n</div>\",\"sections\":[{\"label\":\"\",\"columns\":[{\"label\":\"\",\"fields\":[{\"label\":\"Course\",\"fieldname\":\"course\",\"fieldtype\":\"Link\",\"options\":\"LMS Course\"},{\"label\":\"Member\",\"fieldname\":\"member\",\"fieldtype\":\"Link\",\"options\":\"User\"},{\"label\":\"Member Name\",\"fieldname\":\"member_name\",\"fieldtype\":\"Data\"},{\"label\":\"Evaluator\",\"fieldname\":\"evaluator\",\"fieldtype\":\"Data\",\"options\":\"\"}]},{\"label\":\"\",\"fields\":[{\"label\":\"Issue Date\",\"fieldname\":\"issue_date\",\"fieldtype\":\"Date\"},{\"label\":\"Expiry Date\",\"fieldname\":\"expiry_date\",\"fieldtype\":\"Date\"},{\"label\":\"Version\",\"fieldname\":\"version\",\"fieldtype\":\"Select\",\"options\":\"V13\\nV14\"},{\"label\":\"Module Names for Certificate\",\"fieldname\":\"module_names_for_certificate\",\"fieldtype\":\"Data\"}]}],\"has_fields\":true}]}",
- "html": "{% set certificate = frappe.db.get_value(\"LMS Certificate\", doc.name, [\"name\", \"member\", \"issue_date\", \"expiry_date\", \"course\"], as_dict=True) %}\n{% set member = frappe.db.get_value(\"User\", doc.member, [\"full_name\"], as_dict=True) %}\n{% set course = frappe.db.get_value(\"LMS Course\", doc.course, [\"title\", \"name\", \"image\"], as_dict=True) %}\n{% set logo = frappe.db.get_single_value(\"Website Settings\", \"banner_image\") %}\n{% set instructors = frappe.get_all(\"Course Instructor\", {\"parent\": doc.course}, pluck=\"instructor\", order_by=\"idx\") %}\n\n<meta name=\"pdfkit-orientation\" content=\"Landscape\">\n<link rel=\"preconnect\" href=\"https://fonts.googleapis.com\">\n<link rel=\"preconnect\" href=\"https://fonts.gstatic.com\" crossorigin>\n<link href=\"https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500&display=swap\" rel=\"stylesheet\">\n\n<div class=\"outer-border\">\n    <div class=\"inner-border\">\n    \n        <img src=\"{{ logo }}\" class=\"certificate-logo\">\n        <div>\n            {{ _(\"This certifies that\") }}\n        </div>\n    \n        <div class=\"certificate-name\" style=\"\">\n            {{ member.full_name }}\n        </div>\n        <div>\n            {{ _(\"has successfully completed the course on\") }}\n            <b> {{ course.title }} </b>\n            on {{ frappe.utils.format_date(certificate.issue_date, \"medium\") }}.\n        </div>\n    \n        <table class=\"certificate-footer\">\n            <tr>\n                 {% if instructors %}\n                <td>\n                    <div class=\"certificate-footer-item cursive-font\">\n                        {% for i in instructors %}\n    \t\t\t\t\t{{ frappe.db.get_value(\"User\", i, \"full_name\") }}\n    \t\t\t\t\t{% if not loop.last %}\n    \t\t\t\t\t,\n    \t\t\t\t\t{% endif %}\n    \t\t\t\t\t{% endfor %}\n                    </div>\n                    <hr class=\"certificate-divider\">\n                    <div class=\"text-center\"> {{ _(\"Course Instructor\") }} </div>\n                </td>\n                {% endif %}\n                \n                {% if certificate.expiry_date %}\n                <td style=\"width: 30%\"></td>\n                \n                <td class=\"certificate-expiry\">\n                    <div class=\"certificate-footer-item\">\n                        {{ frappe.utils.format_date(certificate.expiry_date, \"medium\") }}\n                    </div>\n                    <hr class=\"certificate-divider\">\n                    <div class=\"text-center\"> {{ _(\"Expiry Date\") }} </div>\n                </td>\n                {% endif %}\n                </tr>\n        </table>\n    </div>\n    </div>",
+ "html": "{% set certificate = frappe.db.get_value(\"LMS Certificate\", doc.name, [\"name\", \"member\", \"issue_date\", \"expiry_date\", \"course\"], as_dict=True) %}\n{% set member = frappe.db.get_value(\"User\", doc.member, [\"full_name\"], as_dict=True) %}\n{% set course = frappe.db.get_value(\"LMS Course\", doc.course, [\"title\", \"name\", \"image\"], as_dict=True) %}\n{% set logo = frappe.db.get_single_value(\"Website Settings\", \"banner_image\") %}\n{% set instructors = frappe.get_all(\"Course Instructor\", {\"parent\": doc.course}, pluck=\"instructor\", order_by=\"idx\") %}\n\n<meta name=\"pdfkit-orientation\" content=\"Landscape\">\n<link rel=\"preconnect\" href=\"https://fonts.googleapis.com\">\n<link rel=\"preconnect\" href=\"https://fonts.gstatic.com\" crossorigin>\n<link href=\"https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500&display=swap\" rel=\"stylesheet\">\n\n<div class=\"outer-border\">\n    <div class=\"inner-border\">\n    \n        {% if logo %}\n        <img src=\"{{ logo }}\" class=\"certificate-logo\">\n        {% endif %}\n        <div>\n            {{ _(\"This certifies that\") }}\n        </div>\n    \n        <div class=\"certificate-name\" style=\"\">\n            {{ member.full_name }}\n        </div>\n        <div>\n            {{ _(\"has successfully completed the course on\") }}\n            <b> {{ course.title }} </b>\n            on {{ frappe.utils.format_date(certificate.issue_date, \"medium\") }}.\n        </div>\n    \n        <table class=\"certificate-footer\">\n            <tr>\n                 {% if instructors %}\n                <td>\n                    <div class=\"certificate-footer-item cursive-font\">\n                        {% for i in instructors %}\n    \t\t\t\t\t{{ frappe.db.get_value(\"User\", i, \"full_name\") }}\n    \t\t\t\t\t{% if not loop.last %}\n    \t\t\t\t\t,\n    \t\t\t\t\t{% endif %}\n    \t\t\t\t\t{% endfor %}\n                    </div>\n                    <hr class=\"certificate-divider\">\n                    <div class=\"text-center\"> {{ _(\"Course Instructor\") }} </div>\n                </td>\n                {% endif %}\n                \n                {% if certificate.expiry_date %}\n                <td style=\"width: 30%\"></td>\n                \n                <td class=\"certificate-expiry\">\n                    <div class=\"certificate-footer-item\">\n                        {{ frappe.utils.format_date(certificate.expiry_date, \"medium\") }}\n                    </div>\n                    <hr class=\"certificate-divider\">\n                    <div class=\"text-center\"> {{ _(\"Expiry Date\") }} </div>\n                </td>\n                {% endif %}\n                </tr>\n        </table>\n    </div>\n    </div>",
  "idx": 0,
  "line_breaks": 0,
  "margin_bottom": 0.0,
  "margin_left": 0.0,
  "margin_right": 0.0,
  "margin_top": 0.0,
- "modified": "2023-04-17 13:46:38.633751",
+ "modified": "2023-08-09 17:02:21.430320",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Certificate",

lms/www/courses/certificate.py

@@ -1,4 +1,5 @@
 import frappe
+from frappe import _
 from frappe.utils.jinja import render_template
 from frappe.utils import get_url
 
@@ -30,18 +31,10 @@ def get_context(context):
 	)
 	context.url = f"{get_url()}/courses/{context.course.name}/{context.doc.name}"
 
-	default_print_format = frappe.db.get_value(
+	print_format = get_print_format()
-		"Property Setter",
-		{
-			"doc_type": "LMS Certificate",
-			"property": "default_print_format",
-		},
-		["value"],
-		as_dict=True,
-	)
 
 	template = frappe.db.get_value(
-		"Print Format", default_print_format.value, ["html", "css"], as_dict=True
+		"Print Format", print_format, ["html", "css"], as_dict=True
 	)
 	merged_template = "<style> " + template.css + " </style>" + template.html
 	final_template = render_template(merged_template, context)
@@ -51,3 +44,30 @@ def get_context(context):
 def redirect_to_course_list():
 	frappe.local.flags.redirect_location = "/courses"
 	raise frappe.Redirect
+
+
+def get_print_format():
+	print_format = None
+	default = frappe.db.get_value(
+		"Property Setter",
+		{
+			"doc_type": "LMS Certificate",
+			"property": "default_print_format",
+		},
+		"value",
+	)
+
+	if frappe.db.exists("Print Format", default):
+		print_format = default
+
+	if not print_format and frappe.db.exists("Print Format", "Certificate"):
+		print_format = "Certificate"
+
+	if not print_format:
+		raise ValueError(
+			_(
+				"Default Print Format is not set for Certificate. Please contact the Administrator."
+			)
+		)
+
+	return print_format