refactor: PR review changes

frappe · Apr 23, 2024 · dc6610a · dc6610a
1 parent 1712990
commit dc6610a
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 40 deletions.
diff --git a/hrms/hr/doctype/appraisal/appraisal.py b/hrms/hr/doctype/appraisal/appraisal.py
@@ -183,16 +183,16 @@ def calculate_final_score(self):
 		if self.appraisal_cycle:
 			final_score = 0
 			appraisal_cycle_doc = frappe.get_doc("Appraisal Cycle", self.appraisal_cycle)
-			employee_doc = frappe.get_doc("Employee", self.employee)
 
 			formula = appraisal_cycle_doc.final_score_formula
 			based_on_formula = appraisal_cycle_doc.calculate_final_score_based_on_formula
 
-			if not based_on_formula == 1:
+			if not based_on_formula:
 				final_score = (
 					flt(self.total_score) + flt(self.avg_feedback_score) + flt(self.self_score)
 				) / 3
 			else:
+				employee_doc = frappe.get_doc("Employee", self.employee)
 				sanitized_formula = sanitize_expression(formula)
 
 				data = {

diff --git a/hrms/hr/doctype/appraisal_cycle/appraisal_cycle.js b/hrms/hr/doctype/appraisal_cycle/appraisal_cycle.js
@@ -3,43 +3,6 @@
 
 frappe.ui.form.on("Appraisal Cycle", {
 	refresh(frm) {
-		async function set_autocompletions_for_final_score_formula(frm) {
-			const autocompletions = [
-				{
-					value: "goal_score",
-					score: 8,
-					meta: "Goal field",
-				},
-				{
-					value: "average_feedback_score",
-					score: 8,
-					meta: "Appraisal field",
-				},
-				{
-					value: "self_appraisal_score",
-					score: 8,
-					meta: "Appraisal field",
-				},
-			];
-
-			const doctypes = ["Employee", "Appraisal Cycle"];
-
-			await Promise.all(
-				doctypes.map((doctype) =>
-					frappe.model.with_doctype(doctype, () => {
-						autocompletions.push(
-							...frappe.get_meta(doctype).fields.map((f) => ({
-								value: f.fieldname,
-								score: 8,
-								meta: __("{0} Field", [doctype]),
-							})),
-						);
-					}),
-				),
-			);
-			frm.set_df_property("final_score_formula", "autocompletions", autocompletions);
-		}
-
 		set_autocompletions_for_final_score_formula(frm);
 		frm.set_query("department", () => {
 			return {
@@ -94,6 +57,43 @@ frappe.ui.form.on("Appraisal Cycle", {
 		}
 	},
 
+	set_autocompletions_for_final_score_formula: async (frm) => {
+		const autocompletions = [
+			{
+				value: "goal_score",
+				score: 8,
+				meta: "Goal field",
+			},
+			{
+				value: "average_feedback_score",
+				score: 8,
+				meta: "Appraisal field",
+			},
+			{
+				value: "self_appraisal_score",
+				score: 8,
+				meta: "Appraisal field",
+			},
+		];
+
+		const doctypes = ["Employee", "Appraisal Cycle"];
+
+		await Promise.all(
+			doctypes.map((doctype) =>
+				frappe.model.with_doctype(doctype, () => {
+					autocompletions.push(
+						...frappe.get_meta(doctype).fields.map((f) => ({
+							value: f.fieldname,
+							score: 8,
+							meta: __("{0} Field", [doctype]),
+						})),
+					);
+				}),
+			),
+		);
+		frm.set_df_property("final_score_formula", "autocompletions", autocompletions);
+	},
+
 	get_employees(frm) {
 		frappe.call({
 			method: "set_employees",

diff --git a/hrms/public/js/hrms.bundle.js b/hrms/public/js/hrms.bundle.js
@@ -5,4 +5,3 @@ import "./templates/rating.html";
 import "./utils";
 import "./utils/payroll_utils";
 import "./utils/leave_utils";
-import "./utils/appraisal_utils";