From 69be5362a54f5c84dda50e3d2e716d6cbe3ea3b9 Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Mon, 13 Nov 2017 18:32:06 +0530 Subject: [PATCH] minor fixes in the assessment result (#11543) --- erpnext/schools/doctype/assessment_result/assessment_result.js | 2 +- .../doctype/assessment_result_tool/assessment_result_tool.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/schools/doctype/assessment_result/assessment_result.js b/erpnext/schools/doctype/assessment_result/assessment_result.js index 7bd1d1960ba..6d2089681f4 100644 --- a/erpnext/schools/doctype/assessment_result/assessment_result.js +++ b/erpnext/schools/doctype/assessment_result/assessment_result.js @@ -32,7 +32,7 @@ frappe.ui.form.on("Assessment Result", { frappe.ui.form.on("Assessment Result Detail", { score: function(frm, cdt, cdn) { var d = locals[cdt][cdn]; - if (d.score >= d.maximum_score) { + if (d.score > d.maximum_score) { frappe.throw(__("Score cannot be greater than Maximum Score")); } else { diff --git a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js b/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js index dfa7b142f70..142bbf4756e 100644 --- a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +++ b/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js @@ -12,10 +12,11 @@ frappe.ui.form.on('Assessment Result Tool', { frm.set_value("student_group", frappe.route_options.student_group); frm.set_value("assessment_plan", frappe.route_options.assessment_plan); frappe.route_options = null; + } else { + frm.trigger("assessment_plan"); } frm.disable_save(); frm.page.clear_indicator(); - frm.trigger("assessment_plan"); }, assessment_plan: function(frm) {