nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes in the assessment result (#11543)

Browse Source
This commit is contained in:
Manas Solanki
2017-11-13 18:32:06 +05:30
committed by Nabin Hait
parent ec8a0a22d7
commit 69be5362a5
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/schools/doctype/assessment_result/assessment_result.js
View File

@@ -32,7 +32,7 @@ frappe.ui.form.on("Assessment Result", {
frappe.ui.form.on("Assessment Result Detail", { frappe.ui.form.on("Assessment Result Detail", {
score: function(frm, cdt, cdn) { score: function(frm, cdt, cdn) {
var d = locals[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")); frappe.throw(__("Score cannot be greater than Maximum Score"));
} }
else { else {

3
erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js
View File

@@ -12,10 +12,11 @@ frappe.ui.form.on('Assessment Result Tool', {
frm.set_value("student_group", frappe.route_options.student_group); frm.set_value("student_group", frappe.route_options.student_group);
frm.set_value("assessment_plan", frappe.route_options.assessment_plan); frm.set_value("assessment_plan", frappe.route_options.assessment_plan);
frappe.route_options = null; frappe.route_options = null;
} else {
frm.trigger("assessment_plan");
} }
frm.disable_save(); frm.disable_save();
frm.page.clear_indicator(); frm.page.clear_indicator();
frm.trigger("assessment_plan");
}, },
assessment_plan: function(frm) { assessment_plan: function(frm) {