From 6692252df9b710fbb04be132865e0959c36634f5 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Tue, 4 Mar 2025 17:33:39 +0530 Subject: [PATCH 1/2] fix: allow scheduling evals if furture eval has been calcelled --- .../lms_certificate_request/lms_certificate_request.js | 4 ++-- .../lms_certificate_request/lms_certificate_request.py | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js index f221d0c0..9942fc88 100644 --- a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js +++ b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js @@ -3,7 +3,7 @@ frappe.ui.form.on("LMS Certificate Request", { refresh: function (frm) { - if (!frm.is_new()) { + if (!frm.is_new() && frm.doc.status == "Upcoming") { frm.add_custom_button( __("Create LMS Certificate Evaluation"), () => { @@ -14,7 +14,7 @@ frappe.ui.form.on("LMS Certificate Request", { } ); } - if (!frm.doc.google_meet_link) { + if (!frm.doc.google_meet_link && frm.doc.status == "Upcoming") { frm.add_custom_button(__("Generate Google Meet Link"), () => { frappe.call({ method: "lms.lms.doctype.lms_certificate_request.lms_certificate_request.setup_calendar_event", diff --git a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py index c7515a81..49ef86e8 100644 --- a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py +++ b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py @@ -77,6 +77,7 @@ class LMSCertificateRequest(Document): "member": self.member, "course": self.course, "name": ["!=", self.name], + "status": "Upcoming", }, ["date", "start_time", "course"], ) @@ -150,7 +151,11 @@ def schedule_evals(): timelapse = add_to_date(get_datetime(), hours=-5) evals = frappe.get_all( "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"], ) for eval in evals: From 4149fa6ce44565ac8d3a3ff97a257baf25d1c318 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Tue, 4 Mar 2025 17:38:43 +0530 Subject: [PATCH 2/2] fix: renamed evaluation and certification buttons --- .../lms_certificate_evaluation.js | 2 +- .../lms_certificate_request.js | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.js b/lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.js index 5e93d55d..649f7b81 100644 --- a/lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.js +++ b/lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.js @@ -4,7 +4,7 @@ frappe.ui.form.on("LMS Certificate Evaluation", { refresh: function (frm) { 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({ method: "lms.lms.doctype.lms_certificate_evaluation.lms_certificate_evaluation.create_lms_certificate", frm: frm, diff --git a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js index 9942fc88..b4e20e60 100644 --- a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js +++ b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js @@ -4,15 +4,12 @@ frappe.ui.form.on("LMS Certificate Request", { refresh: function (frm) { if (!frm.is_new() && frm.doc.status == "Upcoming") { - frm.add_custom_button( - __("Create LMS Certificate Evaluation"), - () => { - frappe.model.open_mapped_doc({ - method: "lms.lms.doctype.lms_certificate_request.lms_certificate_request.create_lms_certificate_evaluation", - frm: frm, - }); - } - ); + frm.add_custom_button(__("Conduct Evaluation"), () => { + frappe.model.open_mapped_doc({ + method: "lms.lms.doctype.lms_certificate_request.lms_certificate_request.create_lms_certificate_evaluation", + frm: frm, + }); + }); } if (!frm.doc.google_meet_link && frm.doc.status == "Upcoming") { frm.add_custom_button(__("Generate Google Meet Link"), () => {