thamming_dev01/hrm_eva
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

แก้ไข OP 2751

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-08-23 17:03:50 +07:00
parent 9244531bb0
commit 4f47414d1b
4 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs
View File

@@ -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,

28
Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs
View File

@@ -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 "ส่งแบบประเมินแล้ว <br/>";
}
else if (s == "N")
{
return "ตีกลับ <br/>";
}
}
return " ";
}
}
}

8
Views/eva_create_evaluationView/eva_create_evaluation_d_summary.cshtml
View File

@@ -121,12 +121,10 @@
<th>เลือก</th>
<th><label>รหัสพนักงาน</label></th>
<th><label>ผู้รับการประเมิน</label></th>
<th><label>ประเภทตำแหน่ง</label></th>
<th><label>ตำแหน่ง</label></th>
<th><label>ระดับตำแหน่ง</label></th>
<th><label>หมายเหตุ</label></th>
<th><label>ผู้ประเมิน</label></th>
<th><label>หน่วยงาน</label></th>
<th><label>ระดับ</label></th>
<th><label>สถานะทำแบบประเมิน<br/>(ผู้ประเมิน)</label></th>
<th><label>สถานะทำแบบประเมิน<br />(ผู้ประเมินสูงสุด)</label></th>
</tr>
</thead>
<tbody></tbody>

7
wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail_summary.js
View File

@@ -152,7 +152,7 @@ var eva_create_evaluation_detailTableV;
var eva_create_evaluation_detail_setupTable = function (result) {
console.log(result);
var groupColumn = 8;
var groupColumn = 7;
tmp = '"';
eva_create_evaluation_detailTableV = $('#eva_create_evaluation_detailTable').DataTable({
@@ -167,11 +167,10 @@ var eva_create_evaluation_detail_setupTable = function (result) {
{ "data": "employee_no" },
{ "data": "employee_id_external_linkage_external_name" },
{ "data": "position_type_text" },
{ "data": "position_name" },
{ "data": "position_level_text" },
{ "data": "remark" },
{ "data": "chief_external_linkage_external_name" },
{ "data": "txt_status_chief" },
{ "data": "txt_status_supervisor" },
{ "data": "department_name" },
],