Skip to content

Commit 810c19d

Browse files
authored
Merge pull request #1068 from efeone/appraisal_issue_mskt_20250710
fix: appraisal score and rating vanishing
2 parents cd81550 + 402655d commit 810c19d

3 files changed

Lines changed: 24 additions & 7 deletions

File tree

beams/beams/custom_scripts/appraisal/appraisal.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,3 +515,20 @@ function set_table_properties(frm, table_name) {
515515
frm.set_df_property(table_name, 'cannot_delete_rows', true);
516516
frm.set_df_property(table_name, 'cannot_delete_all_rows', true);
517517
}
518+
519+
frappe.ui.form.on('Employee Feedback Rating', {
520+
marks: function (frm, cdt, cdn) {
521+
const row = locals[cdt][cdn];
522+
if (row.marks > 5) {
523+
frappe.msgprint(__('Marks cannot be greater than 5.'));
524+
frappe.model.set_value(cdt, cdn, 'marks', 0);
525+
} else if (row.marks < 0) {
526+
frappe.msgprint(__('Marks cannot be less than 0.'));
527+
frappe.model.set_value(cdt, cdn, 'marks', 0);
528+
}
529+
else {
530+
row.rating = row.marks/5
531+
}
532+
frm.refresh_fields();
533+
}
534+
});

beams/beams/custom_scripts/appraisal/appraisal.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import frappe
1+
import datetime
22
import json
3+
4+
import frappe
35
from frappe import _
4-
from six import string_types
56
from frappe.utils import get_link_to_form
6-
import datetime
7-
from frappe.desk.form.assign_to import add as add_assign
7+
from six import string_types
88

99

1010
def validate_kra_marks(doc, method):
@@ -15,6 +15,8 @@ def validate_kra_marks(doc, method):
1515
for row in doc.get(field):
1616
if row.marks and float(row.marks) > 5:
1717
frappe.throw(_("Marks cannot be greater than 5."))
18+
if row.marks and float(row.marks) < 0:
19+
frappe.throw(_("Marks cannot be less than 0."))
1820

1921
@frappe.whitelist()
2022
def create_employee_feedback(data, employee , appraisal_name , feedback_exists=False, method='save'):
@@ -220,7 +222,7 @@ def add_to_category_details(parent_docname, category, remarks):
220222

221223
parent_doc.save(ignore_permissions=True)
222224
return "Success"
223-
except Exception as e:
225+
except Exception:
224226
frappe.log_error(frappe.get_traceback(), "Add to Category Details Error")
225227
return "Failed"
226228

beams/hooks.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,6 @@
316316
"beams.beams.custom_scripts.appraisal.appraisal.set_category_based_on_marks",
317317
"beams.beams.custom_scripts.appraisal.appraisal.validate_kra_marks",
318318
],
319-
"before_save": [
320-
"beams.beams.custom_scripts.appraisal.appraisal.set_self_appraisal",]
321319
},
322320
"Event" :{
323321
"on_update":[

0 commit comments

Comments
 (0)