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

ปรับปรุงหลายข้อ

Browse Source
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-09-14 15:52:06 +07:00
parent d4212da199
commit 7fdf9f7b01
26 changed files with 2316 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Models/eva_performance_plan/eva_performance_planEntity.cs
View File

@@ -26,6 +26,9 @@ namespace TodoAPI2.Models
public DateTime? end_leave { get; set; }
[MaxLength(500)]
public string remark { get; set; }
[NotMapped]
public string display_text
{

2
Models/eva_performance_plan/eva_performance_planInputModel.cs
View File

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

7
Models/eva_performance_plan/eva_performance_planService.cs
View File

@@ -101,6 +101,7 @@ namespace TodoAPI2.Models
percent = m_eva_performance_plan.percent,
start_leave = m_eva_performance_plan.start_leave,
end_leave = m_eva_performance_plan.end_leave,
remark = m_eva_performance_plan.remark,
isActive = m_eva_performance_plan.isActive,
Created = m_eva_performance_plan.created,
@@ -128,6 +129,7 @@ namespace TodoAPI2.Models
percent = m_eva_performance_plan.percent,
start_leave = m_eva_performance_plan.start_leave,
end_leave = m_eva_performance_plan.end_leave,
remark = m_eva_performance_plan.remark,
isActive = m_eva_performance_plan.isActive,
Created = m_eva_performance_plan.created,
@@ -149,7 +151,7 @@ namespace TodoAPI2.Models
&& (m_eva_performance_plan.theTime == model.theTime || !model.theTime.HasValue)
orderby m_eva_performance_plan.created descending
orderby m_eva_performance_plan.fiscal_year descending, m_eva_performance_plan.theTime descending
select new eva_performance_planViewModel()
{
id = m_eva_performance_plan.id,
@@ -158,6 +160,7 @@ namespace TodoAPI2.Models
percent = m_eva_performance_plan.percent,
start_leave = m_eva_performance_plan.start_leave,
end_leave = m_eva_performance_plan.end_leave,
remark = m_eva_performance_plan.remark,
isActive = m_eva_performance_plan.isActive,
Created = m_eva_performance_plan.created,
@@ -193,6 +196,7 @@ namespace TodoAPI2.Models
existingEntity.percent = model.percent;
existingEntity.start_leave = model.start_leave;
existingEntity.end_leave = model.end_leave;
existingEntity.remark = model.remark;
var updated = _repository.Update(id, existingEntity);
return Get(updated.id);
@@ -215,6 +219,7 @@ namespace TodoAPI2.Models
existingEntity.percent = i.percent;
existingEntity.start_leave = i.start_leave;
existingEntity.end_leave = i.end_leave;
existingEntity.remark = i.remark;
_repository.UpdateWithoutCommit(i.id.Value, existingEntity);
}

2
Models/eva_performance_plan/eva_performance_planViewModel.cs
View File

@@ -28,6 +28,6 @@ namespace TodoAPI2.Models
public string txt_end_leave { get { return MyHelper.GetDateStringForReport(this.end_leave); } }
public string remark { get; set; }
}
}