fix: evaluator info and other styles
This commit is contained in:
@@ -9,6 +9,7 @@ from frappe.query_builder.functions import Count
|
||||
from frappe.utils import time_diff, now_datetime, get_datetime
|
||||
from typing import Optional
|
||||
|
||||
|
||||
@frappe.whitelist()
|
||||
def autosave_section(section, code):
|
||||
"""Saves the code edited in one of the sections."""
|
||||
@@ -614,22 +615,23 @@ def check_app_permission():
|
||||
|
||||
@frappe.whitelist()
|
||||
def save_evaluation_details(
|
||||
member: str,
|
||||
course: str,
|
||||
batch_name: str,
|
||||
date: str,
|
||||
start_time: str,
|
||||
end_time: str,
|
||||
status: str,
|
||||
rating: int,
|
||||
summary: str) -> None:
|
||||
member,
|
||||
course,
|
||||
batch_name,
|
||||
evaluator,
|
||||
date,
|
||||
start_time,
|
||||
end_time,
|
||||
status,
|
||||
rating,
|
||||
summary,
|
||||
):
|
||||
"""
|
||||
Save evaluation details for a member against a course.
|
||||
"""
|
||||
evaluation = frappe.db.exists("LMS Certificate Evaluation", {
|
||||
"member": member,
|
||||
"course": course
|
||||
})
|
||||
evaluation = frappe.db.exists(
|
||||
"LMS Certificate Evaluation", {"member": member, "course": course}
|
||||
)
|
||||
|
||||
details = {
|
||||
"date": date,
|
||||
@@ -638,7 +640,7 @@ def save_evaluation_details(
|
||||
"status": status,
|
||||
"rating": rating / 5,
|
||||
"summary": summary,
|
||||
"batch_name": batch_name
|
||||
"batch_name": batch_name,
|
||||
}
|
||||
|
||||
if evaluation:
|
||||
@@ -646,10 +648,13 @@ def save_evaluation_details(
|
||||
return evaluation
|
||||
else:
|
||||
doc = frappe.new_doc("LMS Certificate Evaluation")
|
||||
details.update({
|
||||
"member": member,
|
||||
"course": course,
|
||||
})
|
||||
details.update(
|
||||
{
|
||||
"member": member,
|
||||
"course": course,
|
||||
"evaluator": evaluator,
|
||||
}
|
||||
)
|
||||
doc.update(details)
|
||||
doc.insert()
|
||||
return doc.name
|
||||
@@ -657,39 +662,40 @@ def save_evaluation_details(
|
||||
|
||||
@frappe.whitelist()
|
||||
def save_certificate_details(
|
||||
member: str,
|
||||
course: str,
|
||||
batch_name: str,
|
||||
member,
|
||||
course,
|
||||
batch_name,
|
||||
evaluator,
|
||||
issue_date,
|
||||
expiry_date,
|
||||
template,
|
||||
published=True,
|
||||
) -> None:
|
||||
):
|
||||
"""
|
||||
Save certificate details for a member against a course.
|
||||
"""
|
||||
certificate = frappe.db.exists("LMS Certificate", {
|
||||
"member": member,
|
||||
"course": course
|
||||
})
|
||||
certificate = frappe.db.exists("LMS Certificate", {"member": member, "course": course})
|
||||
|
||||
details = {
|
||||
"published": published,
|
||||
"issue_date": issue_date,
|
||||
"expiry_date": expiry_date,
|
||||
"template": template,
|
||||
"batch_name": batch_name
|
||||
"batch_name": batch_name,
|
||||
}
|
||||
|
||||
|
||||
if certificate:
|
||||
frappe.db.set_value("LMS Certificate", certificate, details)
|
||||
return certificate
|
||||
else:
|
||||
doc = frappe.new_doc("LMS Certificate")
|
||||
details.update({
|
||||
"member": member,
|
||||
"course": course,
|
||||
})
|
||||
details.update(
|
||||
{
|
||||
"member": member,
|
||||
"course": course,
|
||||
"evaluator": evaluator,
|
||||
}
|
||||
)
|
||||
doc.update(details)
|
||||
doc.insert()
|
||||
return doc.name
|
||||
return doc.name
|
||||
|
||||
@@ -15,8 +15,10 @@
|
||||
"template",
|
||||
"published",
|
||||
"section_break_scyf",
|
||||
"expiry_date",
|
||||
"evaluator",
|
||||
"evaluator_name",
|
||||
"column_break_slaw",
|
||||
"expiry_date",
|
||||
"batch_name"
|
||||
],
|
||||
"fields": [
|
||||
@@ -95,11 +97,24 @@
|
||||
{
|
||||
"fieldname": "column_break_slaw",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "evaluator",
|
||||
"fieldtype": "Link",
|
||||
"label": "Evaluator",
|
||||
"options": "User"
|
||||
},
|
||||
{
|
||||
"fetch_from": "evaluator.full_name",
|
||||
"fieldname": "evaluator_name",
|
||||
"fieldtype": "Data",
|
||||
"label": "Evaluator Name",
|
||||
"read_only": 1
|
||||
}
|
||||
],
|
||||
"index_web_pages_for_search": 1,
|
||||
"links": [],
|
||||
"modified": "2024-07-16 15:29:19.708888",
|
||||
"modified": "2024-09-11 11:37:20.419955",
|
||||
"modified_by": "Administrator",
|
||||
"module": "LMS",
|
||||
"name": "LMS Certificate",
|
||||
|
||||
@@ -119,9 +119,9 @@
|
||||
{
|
||||
"fieldname": "evaluator",
|
||||
"fieldtype": "Link",
|
||||
"in_standard_filter": 1,
|
||||
"label": "Evaluator",
|
||||
"options": "User",
|
||||
"reqd": 1
|
||||
"options": "User"
|
||||
},
|
||||
{
|
||||
"fetch_from": "evaluator.full_name",
|
||||
@@ -133,7 +133,7 @@
|
||||
],
|
||||
"index_web_pages_for_search": 1,
|
||||
"links": [],
|
||||
"modified": "2024-09-10 20:17:49.908093",
|
||||
"modified": "2024-09-11 11:20:06.233491",
|
||||
"modified_by": "Administrator",
|
||||
"module": "LMS",
|
||||
"name": "LMS Certificate Evaluation",
|
||||
|
||||
@@ -48,8 +48,7 @@
|
||||
"fieldtype": "Link",
|
||||
"in_standard_filter": 1,
|
||||
"label": "Evaluator",
|
||||
"options": "User",
|
||||
"read_only": 1
|
||||
"options": "User"
|
||||
},
|
||||
{
|
||||
"fieldname": "date",
|
||||
@@ -149,7 +148,7 @@
|
||||
],
|
||||
"index_web_pages_for_search": 1,
|
||||
"links": [],
|
||||
"modified": "2024-09-10 13:13:48.282623",
|
||||
"modified": "2024-09-11 11:19:44.669132",
|
||||
"modified_by": "Administrator",
|
||||
"module": "LMS",
|
||||
"name": "LMS Certificate Request",
|
||||
|
||||
Reference in New Issue
Block a user