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

3
Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs
View File

@@ -174,6 +174,9 @@ namespace TodoAPI2.Models
public string chief_a_remark { get; set; }
public DateTime? chief_a_date { get; set; }
[MaxLength(1000)]
public string chief_a_reject_reason { get; set; }
}
}

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 " ";
}
}
}

2
Models/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0AInputModel.cs
View File

@@ -26,6 +26,8 @@ namespace TodoAPI2.Models
public DateTime? chief_a_date { get; set; }
public string chief_a_reject_reason { get; set; }
public string active_mode { get; set; }
}
}

4
Models/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0AService.cs
View File

@@ -121,6 +121,7 @@ namespace TodoAPI2.Models
chief_a_result = m_eva_create_evaluation_detail_review0A.chief_a_result,
chief_a_remark = m_eva_create_evaluation_detail_review0A.chief_a_remark,
chief_a_date = m_eva_create_evaluation_detail_review0A.chief_a_date,
chief_a_reject_reason = m_eva_create_evaluation_detail_review0A.chief_a_reject_reason,
chief_a_result_external_linkage_external_name = fk_external_linkageResult3.external_name,
@@ -196,6 +197,7 @@ namespace TodoAPI2.Models
existingEntity.chief_a_result = model.chief_a_result;
existingEntity.chief_a_remark = model.chief_a_remark;
existingEntity.chief_a_date = model.chief_a_date;
existingEntity.chief_a_reject_reason = model.chief_a_reject_reason;
//existingEntity.SetAutoField(_repository.Context);
@@ -230,6 +232,7 @@ namespace TodoAPI2.Models
existingEntity.chief_a_result = i.chief_a_result;
existingEntity.chief_a_remark = i.chief_a_remark;
existingEntity.chief_a_date = i.chief_a_date;
existingEntity.chief_a_reject_reason = i.chief_a_reject_reason;
//existingEntity.SetAutoField(_repository.Context);
_repository.UpdateWithoutCommit(i.id.Value, existingEntity);
@@ -301,6 +304,7 @@ namespace TodoAPI2.Models
i.Add("chief_a_remark", "ความเห็นผู้ประเมินสูงสุด");
i.Add("chief_a_date", "วันที่ประเมิน");
i.Add("txt_chief_a_date", "วันที่ประเมิน");
i.Add("chief_a_reject_reason", "เหตุผลการส่งคืนเอกสาร");
return i;
}

2
Models/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0AViewModel.cs
View File

@@ -26,6 +26,8 @@ namespace TodoAPI2.Models
public string txt_chief_a_date { get { return MyHelper.GetDateStringForReport(this.chief_a_date); } }
public string chief_a_reject_reason { get; set; }
public string chief_a_result_external_linkage_external_name { get; set; }
}

4
Models/external_linkage/external_linkageService.cs
View File

@@ -272,13 +272,13 @@ namespace TodoAPI2.Models
var i = new external_linkageViewModel();
i.external_id = 1;
i.external_code = "Y";
i.external_name = "เห็นด้วยกับข้อตกลงการประเมิน";
i.external_name = "เห็นชอบ";
result.Add(i);
var j = new external_linkageViewModel();
j.external_id = 2;
j.external_code = "N";
j.external_name = "ไม่เห็นด้วยและมีความเห็นต่าง";
j.external_name = "ความเห็นอื่นๆ";
result.Add(j);
return result;