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

แก้ไข Feature OP ข้อ 2990

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-08-12 21:39:10 +07:00
parent 1b8c7d4a9f
commit 7d46ee9b2d
15 changed files with 841 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs
View File

@@ -110,5 +110,17 @@ namespace TodoAPI2.Models
[MaxLength(1)]
public string status_supervisor2A { get; set; }
//existingEntity.status_self = model.status_self;
// existingEntity.status_chief = model.status_chief;
// existingEntity.status_supervisor = model.status_supervisor;
// existingEntity.status_supervisor1A = model.status_supervisor1A;
// existingEntity.status_supervisor2A = model.status_supervisor2A;
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; }
}
}

6
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
View File

@@ -275,6 +275,12 @@ namespace TodoAPI2.Models
fk_eva_create_evaluationResult10.supervisor1_id,
fk_eva_create_evaluationResult10.supervisor2_id, path),
status_self_click_date = m_eva_create_evaluation_detail_process.status_self_click_date,
status_chief_click_date = m_eva_create_evaluation_detail_process.status_chief_click_date,
status_supervisor_click_date = m_eva_create_evaluation_detail_process.status_supervisor_click_date,
status_supervisor1A_click_date = m_eva_create_evaluation_detail_process.status_supervisor1A_click_date,
status_supervisor2A_click_date = m_eva_create_evaluation_detail_process.status_supervisor2A_click_date,
isActive = m_eva_create_evaluation_detail_process.isActive,
Created = m_eva_create_evaluation_detail_process.created,
Updated = m_eva_create_evaluation_detail_process.updated

28
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs
View File

@@ -60,6 +60,34 @@ namespace TodoAPI2.Models
public string role_code { get; set; }
public string remark_hrm_work_record { 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 " ";
}
}
}

2
Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusInputModel.cs
View File

@@ -28,6 +28,8 @@ namespace TodoAPI2.Models
public string status_supervisor2A { get; set; }
public string status_mode { get; set; }
public string active_mode { get; set; }
}
}

47
Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusService.cs
View File

@@ -105,6 +105,12 @@ namespace TodoAPI2.Models
status_supervisor1A = m_eva_create_evaluation_detail_status.status_supervisor1A,
status_supervisor2A = m_eva_create_evaluation_detail_status.status_supervisor2A,
status_self_click_date = m_eva_create_evaluation_detail_status.status_self_click_date,
status_chief_click_date = m_eva_create_evaluation_detail_status.status_chief_click_date,
status_supervisor_click_date = m_eva_create_evaluation_detail_status.status_supervisor_click_date,
status_supervisor1A_click_date = m_eva_create_evaluation_detail_status.status_supervisor1A_click_date,
status_supervisor2A_click_date = m_eva_create_evaluation_detail_status.status_supervisor2A_click_date,
isActive = m_eva_create_evaluation_detail_status.isActive,
Created = m_eva_create_evaluation_detail_status.created,
Updated = m_eva_create_evaluation_detail_status.updated
@@ -168,6 +174,47 @@ namespace TodoAPI2.Models
if(existingEntity.status_chief == "Y") existingEntity.status_supervisor = existingEntity.status_chief;
}
if (model.status_mode == "next0")
{
existingEntity.status_self_click_date = MyHelper.RemoveTimeFromDate(DateTime.Now);
}
else if (model.status_mode == "next1")
{
existingEntity.status_chief_click_date = MyHelper.RemoveTimeFromDate(DateTime.Now);
}
else if (model.status_mode == "back1")
{
existingEntity.status_chief_click_date = MyHelper.RemoveTimeFromDate(DateTime.Now);
existingEntity.status_self_click_date = null;
}
else if (model.status_mode == "next2")
{
existingEntity.status_supervisor_click_date = MyHelper.RemoveTimeFromDate(DateTime.Now);
}
else if (model.status_mode == "back2")
{
existingEntity.status_supervisor_click_date = MyHelper.RemoveTimeFromDate(DateTime.Now);
existingEntity.status_chief_click_date = null;
}
else if (model.status_mode == "next3")
{
existingEntity.status_supervisor1A_click_date = MyHelper.RemoveTimeFromDate(DateTime.Now);
}
else if (model.status_mode == "back3")
{
existingEntity.status_supervisor1A_click_date = MyHelper.RemoveTimeFromDate(DateTime.Now);
existingEntity.status_supervisor_click_date = null;
}
else if (model.status_mode == "next4")
{
existingEntity.status_supervisor2A_click_date = MyHelper.RemoveTimeFromDate(DateTime.Now);
}
else if (model.status_mode == "back4")
{
existingEntity.status_supervisor2A_click_date = MyHelper.RemoveTimeFromDate(DateTime.Now);
existingEntity.status_supervisor1A_click_date = null;
}
var updated = _repository.Update(id, existingEntity);
return Get(updated.id);
}

12
Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusViewModel.cs
View File

@@ -25,6 +25,18 @@ namespace TodoAPI2.Models
public string status_supervisor1A { get; set; }
public string status_supervisor2A { 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_click_date { get { return MyHelper.GetDateStringForReport(status_self_click_date); } }
public string txt_status_chief_click_date { get { return MyHelper.GetDateStringForReport(status_chief_click_date); } }
public string txt_status_supervisor_click_date { get { return MyHelper.GetDateStringForReport(status_supervisor_click_date); } }
public string txt_status_supervisor1A_click_date { get { return MyHelper.GetDateStringForReport(status_supervisor1A_click_date); } }
public string txt_status_supervisor2A_click_date { get { return MyHelper.GetDateStringForReport(status_supervisor2A_click_date); } }
}
}