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

Merge pull request #1359 from pateljannat/evaluation-validation-issue

Browse Source 
fix: allow scheduling evals if future eval has been cancelled
This commit is contained in:
Jannat Patel
2025-03-04 17:47:42 +05:30
committed by GitHub
parent 7a69611f09 4149fa6ce4
commit dee2c51c60
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.js
View File

@@ -4,7 +4,7 @@
frappe.ui.form.on("LMS Certificate Evaluation", { frappe.ui.form.on("LMS Certificate Evaluation", {
refresh: function (frm) { refresh: function (frm) {
if (!frm.is_new() && frm.doc.status == "Pass") { if (!frm.is_new() && frm.doc.status == "Pass") {
frm.add_custom_button(__("Create LMS Certificate"), () => { frm.add_custom_button(__("Create Certificate"), () => {
frappe.model.open_mapped_doc({ frappe.model.open_mapped_doc({
method: "lms.lms.doctype.lms_certificate_evaluation.lms_certificate_evaluation.create_lms_certificate", method: "lms.lms.doctype.lms_certificate_evaluation.lms_certificate_evaluation.create_lms_certificate",
frm: frm, frm: frm,

19
lms/lms/doctype/lms_certificate_request/lms_certificate_request.js
View File

@@ -3,18 +3,15 @@
frappe.ui.form.on("LMS Certificate Request", { frappe.ui.form.on("LMS Certificate Request", {
refresh: function (frm) { refresh: function (frm) {
if (!frm.is_new()) { if (!frm.is_new() && frm.doc.status == "Upcoming") {
frm.add_custom_button( frm.add_custom_button(__("Conduct Evaluation"), () => {
__("Create LMS Certificate Evaluation"), frappe.model.open_mapped_doc({
() => { method: "lms.lms.doctype.lms_certificate_request.lms_certificate_request.create_lms_certificate_evaluation",
frappe.model.open_mapped_doc({ frm: frm,
method: "lms.lms.doctype.lms_certificate_request.lms_certificate_request.create_lms_certificate_evaluation", });
frm: frm, });
});
}
);
} }
if (!frm.doc.google_meet_link) { if (!frm.doc.google_meet_link && frm.doc.status == "Upcoming") {
frm.add_custom_button(__("Generate Google Meet Link"), () => { frm.add_custom_button(__("Generate Google Meet Link"), () => {
frappe.call({ frappe.call({
method: "lms.lms.doctype.lms_certificate_request.lms_certificate_request.setup_calendar_event", method: "lms.lms.doctype.lms_certificate_request.lms_certificate_request.setup_calendar_event",

7
lms/lms/doctype/lms_certificate_request/lms_certificate_request.py
View File

@@ -77,6 +77,7 @@ class LMSCertificateRequest(Document):
"member": self.member, "member": self.member,
"course": self.course, "course": self.course,
"name": ["!=", self.name], "name": ["!=", self.name],
"status": "Upcoming",
}, },
["date", "start_time", "course"], ["date", "start_time", "course"],
) )
@@ -150,7 +151,11 @@ def schedule_evals():
timelapse = add_to_date(get_datetime(), hours=-5) timelapse = add_to_date(get_datetime(), hours=-5)
evals = frappe.get_all( evals = frappe.get_all(
"LMS Certificate Request", "LMS Certificate Request",
{"creation": [">=", timelapse], "google_meet_link": ["is", "not set"]}, {
"creation": [">=", timelapse],
"google_meet_link": ["is", "not set"],
"status": "Upcoming",
},
["name", "member", "member_name", "evaluator", "date", "start_time", "end_time"], ["name", "member", "member_name", "evaluator", "date", "start_time", "end_time"],
) )
for eval in evals: for eval in evals: