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

Update report signature

Browse Source
This commit is contained in:
nakorn
2022-03-13 12:04:14 +07:00
parent 67a4c35f8e
commit f6afc23b45
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApiControllers/rep_eva_xControllers.cs
View File

@@ -291,6 +291,10 @@ namespace TodoAPI2.Controllers
{
url = $"{mainurl}{reportsite}/rep_eva_x{k}B2.{model.filetype}?{MyHelper.GetParameterForJasperReport(p1)}&j_username={username}&j_password={password}";
}
else if (string.IsNullOrEmpty(p1.supervisor3A_fullname))
{
url = $"{mainurl}{reportsite}/rep_eva_x{k}C.{model.filetype}?{MyHelper.GetParameterForJasperReport(p1)}&j_username={username}&j_password={password}";
}
}
}
@@ -450,6 +454,15 @@ namespace TodoAPI2.Controllers
i.txt_status_chief_a_click_date = MyHelper.GetDateStringForReport(p.status_chief_a_click_date);
if (i.txt_status_chief_a_click_date == "") i.txt_status_chief_a_click_date = "..................................";
i.txt_status_supervisor_click_date = MyHelper.GetDateStringForReport(p.status_supervisor_click_date);
if (i.txt_status_supervisor_click_date == "") i.txt_status_supervisor_click_date = "..................................";
i.txt_status_supervisor1A_click_date = MyHelper.GetDateStringForReport(p.status_supervisor1A_click_date);
if (i.txt_status_supervisor1A_click_date == "") i.txt_status_supervisor1A_click_date = "..................................";
i.txt_status_supervisor2A_click_date = MyHelper.GetDateStringForReport(p.status_supervisor2A_click_date);
if (i.txt_status_supervisor2A_click_date == "") i.txt_status_supervisor2A_click_date = "..................................";
i.txt_status_supervisor3A_click_date = MyHelper.GetDateStringForReport(p.status_supervisor3A_click_date);
if (i.txt_status_supervisor3A_click_date == "") i.txt_status_supervisor3A_click_date = "..................................";
i.print_dt = MyHelper.GetDateStringForReport(DateTime.Now) + " " + MyHelper.GetTimeStringFromDate(DateTime.Now);
return i;

5
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
View File

@@ -218,6 +218,11 @@ namespace TodoAPI2.Models
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,
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,
status_supervisor3A_click_date = m_eva_create_evaluation_detail_process.status_supervisor3A_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,

5
Models/rep_eva_x/rep_eva_xInputModel2.cs
View File

@@ -63,6 +63,11 @@ namespace TodoAPI2.Models
public string txt_status_self_a_click_date { get; set; }
public string txt_status_chief_a_click_date { get; set; }
public string txt_status_supervisor_click_date { get; set; }
public string txt_status_supervisor1A_click_date { get; set; }
public string txt_status_supervisor2A_click_date { get; set; }
public string txt_status_supervisor3A_click_date { get; set; }
public string plan_remark { get; set; }
public string eva_detail_remark { get; set; }