diff --git a/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementService.cs b/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementService.cs index 60b56d9..b74ad13 100644 --- a/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementService.cs +++ b/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementService.cs @@ -130,6 +130,9 @@ namespace TodoAPI2.Models remark_hrm_work_record = fk_external_employee.remark_hrm_work_record + GetWorkTimeText(fk_external_employee.packing_date, endDate), + score1 = fk_eva_create_evaluationResult10.score1, + score2 = fk_eva_create_evaluationResult10.score2, + isActive = m_eva_create_evaluation_detail_agreement.isActive, Created = m_eva_create_evaluation_detail_agreement.created, Updated = m_eva_create_evaluation_detail_agreement.updated diff --git a/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementViewModel.cs b/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementViewModel.cs index 70044af..be64814 100644 --- a/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementViewModel.cs +++ b/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementViewModel.cs @@ -56,6 +56,10 @@ namespace TodoAPI2.Models public DateTime? status_chief_click_date { get; set; } public DateTime? status_supervisor_click_date { get; set; } + public decimal? score1 { get; set; } + + public decimal? score2 { get; set; } + public string txt_status_self { get { return getStatusText(status_self) + MyHelper.GetDateStringForReport(status_self_click_date); } } public string txt_status_chief { get { return getStatusText(status_chief) + MyHelper.GetDateStringForReport(status_chief_click_date); } } public string txt_status_supervisor { get { return getStatusText(status_supervisor) + MyHelper.GetDateStringForReport(status_supervisor_click_date); } } diff --git a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml index da0d6f3..5c8d0ee 100644 --- a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml +++ b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml @@ -268,7 +268,7 @@
-
ผลสัมฤทธิ์ของงาน
+
ผลสัมฤทธิ์ของงาน (น้ำหนัก %)
@@ -315,7 +315,7 @@
-
พฤติกรรมการปฏิบัติงาน
+
พฤติกรรมการปฏิบัติงาน (น้ำหนัก %)
diff --git a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml index c5f41ca..b9bed88 100644 --- a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml +++ b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml @@ -141,7 +141,7 @@
-
ผลสัมฤทธิ์ของงาน
+
ผลสัมฤทธิ์ของงาน (น้ำหนัก %)
@@ -196,7 +196,7 @@
-
พฤติกรรมการปฏิบัติงาน (สมรรถนะ)
+
พฤติกรรมการปฏิบัติงาน (สมรรถนะ) (น้ำหนัก %)
diff --git a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml index 2665acf..f8d6e6a 100644 --- a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml +++ b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml @@ -191,7 +191,7 @@
-
ผลสัมฤทธิ์ของงาน
+
ผลสัมฤทธิ์ของงาน (น้ำหนัก %)
@@ -246,7 +246,7 @@
-
พฤติกรรมการปฏิบัติงาน (สมรรถนะ)
+
พฤติกรรมการปฏิบัติงาน (สมรรถนะ) (น้ำหนัก %)
diff --git a/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement_d.js b/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement_d.js index f676ba4..6932214 100644 --- a/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement_d.js +++ b/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement_d.js @@ -4,23 +4,26 @@ var eva_create_evaluation_detail_agreement_API = "/api/eva_create_evaluation_det //================= Form Data Customizaiton ========================================= function eva_create_evaluation_detail_agreement_FeedDataToForm(data) { -$("#eva_create_evaluation_detail_agreement_id").val(data.id); -$("#eva_create_evaluation_detail_agreement_evaluation_round").text(data.evaluation_round); -$("#eva_create_evaluation_detail_agreement_employee_code").text(data.employee_code); -$("#eva_create_evaluation_detail_agreement_employee_fullname").text(data.employee_fullname); -$("#eva_create_evaluation_detail_agreement_employee_position").text(data.employee_position); -$("#eva_create_evaluation_detail_agreement_employee_position_type").text(data.employee_position_type); -$("#eva_create_evaluation_detail_agreement_employee_position_level").text(data.employee_position_level); -$("#eva_create_evaluation_detail_agreement_employee_org").text(data.employee_org); -$("#eva_create_evaluation_detail_agreement_chief_fullname").text(data.chief_fullname); -$("#eva_create_evaluation_detail_agreement_chief_position").text(data.chief_position); -$("#eva_create_evaluation_detail_agreement_create_evaluation_id").val(data.create_evaluation_id); + $("#eva_create_evaluation_detail_agreement_id").val(data.id); + $("#eva_create_evaluation_detail_agreement_evaluation_round").text(data.evaluation_round); + $("#eva_create_evaluation_detail_agreement_employee_code").text(data.employee_code); + $("#eva_create_evaluation_detail_agreement_employee_fullname").text(data.employee_fullname); + $("#eva_create_evaluation_detail_agreement_employee_position").text(data.employee_position); + $("#eva_create_evaluation_detail_agreement_employee_position_type").text(data.employee_position_type); + $("#eva_create_evaluation_detail_agreement_employee_position_level").text(data.employee_position_level); + $("#eva_create_evaluation_detail_agreement_employee_org").text(data.employee_org); + $("#eva_create_evaluation_detail_agreement_chief_fullname").text(data.chief_fullname); + $("#eva_create_evaluation_detail_agreement_chief_position").text(data.chief_position); + $("#eva_create_evaluation_detail_agreement_create_evaluation_id").val(data.create_evaluation_id); -$("#remark_hrm_work_record").text(data.remark_hrm_work_record); + $("#eva_create_evaluation_detail_agreement_score1").text(data.score1); + $("#eva_create_evaluation_detail_agreement_score2").text(data.score2); + + $("#remark_hrm_work_record").text(data.remark_hrm_work_record); status_self = data.status_self; CheckPermission(); - + console.log(data); } function eva_create_evaluation_detail_agreement_GetFromForm() { diff --git a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js index 6c3434f..0653baf 100644 --- a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js +++ b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js @@ -61,6 +61,9 @@ $("#w1").text(data.create_evaluation_score1.toFixed(2)); $("#w2").text(data.create_evaluation_score2.toFixed(2)); $("#w3").text((data.create_evaluation_score1+data.create_evaluation_score2).toFixed(2)); + $("#eva_create_evaluation_detail_process_score1").text(data.create_evaluation_score1); + $("#eva_create_evaluation_detail_process_score2").text(data.create_evaluation_score2); + } function eva_create_evaluation_detail_process_GetFromForm() { diff --git a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d2.js b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d2.js index d190c99..3ca4eaa 100644 --- a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d2.js +++ b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d2.js @@ -59,6 +59,9 @@ $("#w1").text(data.create_evaluation_score1.toFixed(2)); $("#w2").text(data.create_evaluation_score2.toFixed(2)); $("#w3").text((data.create_evaluation_score1+data.create_evaluation_score2).toFixed(2)); + $("#eva_create_evaluation_detail_process_score1").text(data.create_evaluation_score1); + $("#eva_create_evaluation_detail_process_score2").text(data.create_evaluation_score2); + } function eva_create_evaluation_detail_process_GetFromForm() {