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

แก้ไขตาม feedback ในห้อง

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2021-02-17 16:44:40 +07:00
parent 2825bdde24
commit 96b8cbd159
10 changed files with 68 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
View File

@@ -180,6 +180,9 @@ namespace TodoAPI2.Models
start_date = start_date,
end_date = end_date,
status_self_a_click_date = m_eva_create_evaluation_detail_process.status_self_a_click_date,
status_chief_a_click_date = m_eva_create_evaluation_detail_process.status_chief_a_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

6
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs
View File

@@ -81,6 +81,9 @@ namespace TodoAPI2.Models
public DateTime? status_self_click_date { get; set; }
public DateTime? status_chief_click_date { get; set; }
public DateTime? status_self_a_click_date { get; set; }
public DateTime? status_chief_a_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; }
@@ -106,6 +109,9 @@ namespace TodoAPI2.Models
}
return " ";
}
public string txt_status_self_a_click_date { get { return MyHelper.GetDateStringForReport(status_self_a_click_date); } }
public string txt_status_chief_a_click_date { get { return MyHelper.GetDateStringForReport(status_chief_a_click_date); } }
}
}

15
Models/eva_evaluation_operating_agreement/eva_evaluation_operating_agreementViewModel.cs
View File

@@ -26,5 +26,20 @@ namespace TodoAPI2.Models
public int? create_evaluation_detail_id_eva_create_evaluation_detail_create_evaluation_id { get; set; }
public string mission_detail_with_enter { get { return replace_with_enter(mission_detail); } }
public string target_with_enter { get { return replace_with_enter(target); } }
public string indicators_with_enter { get { return replace_with_enter(indicators); } }
private string replace_with_enter(string data)
{
if (!string.IsNullOrEmpty(data))
{
return data.Replace("\n", "<br/>");
}
return data;
}
}
}

3
Models/rep_eva_x/rep_eva_xInputModel2.cs
View File

@@ -56,6 +56,9 @@ namespace TodoAPI2.Models
public decimal? count_absence_tad_processing_time_results { get; set; }
public decimal? sum_day_sick_personal_leave { get; set; }
public decimal? count_sick_personal_leave { get; set; }
public string txt_status_self_a_click_date { get; set; }
public string txt_status_chief_a_click_date { get; set; }
}
}