diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs
index e06394e..6d013c9 100644
--- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs
+++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs
@@ -179,6 +179,12 @@ namespace TodoAPI2.Models
position_name = fk_external_linkageResult2.position_name,
remark = null,
+ status_self_click_date = m_eva_create_evaluation_detail.status_self_click_date,
+ status_chief_click_date = m_eva_create_evaluation_detail.status_chief_click_date,
+ status_supervisor_click_date = m_eva_create_evaluation_detail.status_supervisor_click_date,
+ status_supervisor1A_click_date = m_eva_create_evaluation_detail.status_supervisor1A_click_date,
+ status_supervisor2A_click_date = m_eva_create_evaluation_detail.status_supervisor2A_click_date,
+
department_name = fk_external_linkageResult2.department_name,
isActive = m_eva_create_evaluation_detail.isActive,
diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs
index 83621fb..b5a1bf7 100644
--- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs
+++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs
@@ -97,5 +97,33 @@ namespace TodoAPI2.Models
public string position_name { get; set; }
public string remark { get; set; }
public string department_name { get; set; }
+
+ public DateTime? status_self_click_date { get; set; }
+ public DateTime? status_chief_click_date { get; set; }
+ public DateTime? status_supervisor_click_date { get; set; }
+ public DateTime? status_supervisor1A_click_date { get; set; }
+ public DateTime? status_supervisor2A_click_date { 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); } }
+ public string txt_status_supervisor1A { get { return getStatusText(status_supervisor1A) + MyHelper.GetDateStringForReport(status_supervisor1A_click_date); } }
+ public string txt_status_supervisor2A { get { return getStatusText(status_supervisor2A) + MyHelper.GetDateStringForReport(status_supervisor2A_click_date); } }
+
+ private string getStatusText(string s)
+ {
+ if (!string.IsNullOrEmpty(s))
+ {
+ if (s == "Y")
+ {
+ return "ส่งแบบประเมินแล้ว
";
+ }
+ else if (s == "N")
+ {
+ return "ตีกลับ
";
+ }
+ }
+ return " ";
+ }
}
}
\ No newline at end of file
diff --git a/Views/eva_create_evaluationView/eva_create_evaluation_d_summary.cshtml b/Views/eva_create_evaluationView/eva_create_evaluation_d_summary.cshtml
index 4a189da..0f1308c 100644
--- a/Views/eva_create_evaluationView/eva_create_evaluation_d_summary.cshtml
+++ b/Views/eva_create_evaluationView/eva_create_evaluation_d_summary.cshtml
@@ -121,12 +121,10 @@