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

ปรับปรุง UI และ Flow ของงาน เพิ่มเติม

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2021-02-13 12:31:34 +07:00
parent fc5cd13a6e
commit 2159daa300
15 changed files with 898 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs
View File

@@ -248,7 +248,7 @@ namespace TodoAPI2.Models
&& (fk_external_employee.department_id == model.org_id || !model.org_id.HasValue)
&& (fk_external_employee.employee_no == model.search_employee_code || string.IsNullOrEmpty(model.search_employee_code))
&& (fk_external_employee.fullname.Contains(model.search_employee_fullname) || string.IsNullOrEmpty(model.search_employee_fullname))
&& m_eva_create_evaluation_detail_agreement.employee_id == emp_id
&& (m_eva_create_evaluation_detail_agreement.employee_id == emp_id || m_eva_create_evaluation_detail_agreement.chief == emp_id)
orderby m_eva_create_evaluation_detail_agreement.created descending
select new eva_create_evaluation_detail_firstdocViewModel()

20
Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocViewModel.cs
View File

@@ -68,11 +68,11 @@ namespace TodoAPI2.Models
public decimal? score2 { get; set; }
public string txt_status_self_a { get { return getStatusText(status_self_a) + MyHelper.GetDateStringForReport(status_self_a_click_date); } }
public string txt_status_self_a { get { return getStatusText2(status_self_a) + MyHelper.GetDateStringForReport(status_self_a_click_date); } }
public string txt_status_self { get { return getStatusText(status_self) + MyHelper.GetDateStringForReport(status_self_click_date); } }
public string txt_status_chief_a { get { return getStatusText(status_chief_a) + MyHelper.GetDateStringForReport(status_chief_a_click_date); } }
public string txt_status_chief_a { get { return getStatusText2(status_chief_a) + MyHelper.GetDateStringForReport(status_chief_a_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); } }
@@ -97,6 +97,22 @@ namespace TodoAPI2.Models
return " ";
}
private string getStatusText2(string s)
{
if (!string.IsNullOrEmpty(s))
{
if (s == "Y")
{
return "ส่งข้อตกลงแล้ว <br/>";
}
else if (s == "N")
{
return "ตีกลับ <br/>";
}
}
return " ";
}
}
}