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

ปรับปรุงรายงานแบบประเมิน และแก้ไข bug จากผล unit test

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-08-30 11:16:09 +07:00
parent a049fa6d8b
commit 2df3962e59
10 changed files with 160 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Models/eva_idp_plan/eva_idp_planEntity.cs
View File

@@ -40,6 +40,7 @@ namespace TodoAPI2.Models
{
temp += " ถึง " + MyHelper.GetDateStringForReport(end_date);
}
period_text = temp;
}
public void DoAfterInsertUpdate(DataContext context)

48
Models/eva_idp_plan/eva_idp_planService.cs
View File

@@ -20,14 +20,14 @@ namespace TodoAPI2.Models
public class eva_idp_planService : Ieva_idp_planService
{
private IBaseRepository2<eva_idp_planEntity, int> _repository;
private IMyDatabase db;
private Iexternal_linkageService ext;
private IMyDatabase db;
private Iexternal_linkageService ext;
public eva_idp_planService(IBaseRepository2<eva_idp_planEntity, int> repository, IMyDatabase mydb, Iexternal_linkageService inext)
{
_repository = repository;
db = mydb;
ext = inext;
db = mydb;
ext = inext;
}
#region Private Functions
@@ -47,7 +47,7 @@ namespace TodoAPI2.Models
{
return Mapper.Map<List<eva_idp_planViewModel>>(entities);
}
#endregion
#region Public Functions
@@ -77,18 +77,18 @@ namespace TodoAPI2.Models
public List<eva_idp_planViewModel> GetListBycreate_evaluation_detail_id(int? create_evaluation_detail_id)
{
var model = new eva_idp_planSearchModel();
var model = new eva_idp_planSearchModel();
model.create_evaluation_detail_id = create_evaluation_detail_id;
return GetListBySearch(model);
}
public List<eva_idp_planViewModel> GetListBySearch(eva_idp_planSearchModel model)
public List<eva_idp_planViewModel> GetListBySearch(eva_idp_planSearchModel model)
{
var data = (
from m_eva_idp_plan in _repository.Context.eva_idp_plan
where 1==1
where 1 == 1
//&& (m_eva_idp_plan.id == model.id || !model.id.HasValue)
&& (m_eva_idp_plan.create_evaluation_detail_id == model.create_evaluation_detail_id || !model.create_evaluation_detail_id.HasValue)
@@ -122,10 +122,10 @@ namespace TodoAPI2.Models
int? newkey = 0;
var x = (from i in _repository.Context.eva_idp_plan
orderby i.id descending
select i).Take(1).ToList();
orderby i.id descending
select i).Take(1).ToList();
if(x.Count > 0)
if (x.Count > 0)
{
newkey = x[0].id + 1;
}
@@ -141,7 +141,7 @@ namespace TodoAPI2.Models
entity.SetAutoField(_repository.Context);
var inserted = _repository.Insert(entity);
return Get(inserted.id);
}
@@ -161,23 +161,23 @@ namespace TodoAPI2.Models
return Get(updated.id);
}
else
throw new NotificationException("No data to update");
throw new NotificationException("No data to update");
}
public string UpdateMultiple(List<eva_idp_planInputModel> model)
public string UpdateMultiple(List<eva_idp_planInputModel> model)
{
foreach(var i in model)
foreach (var i in model)
{
if (i.active_mode == "1" && i.id.HasValue) // update
{
{
var existingEntity = _repository.Get(i.id.Value);
if (existingEntity != null)
{
existingEntity.create_evaluation_detail_id = i.create_evaluation_detail_id;
existingEntity.develop = i.develop;
existingEntity.development_method = i.development_method;
existingEntity.start_date = i.start_date;
existingEntity.end_date = i.end_date;
existingEntity.create_evaluation_detail_id = i.create_evaluation_detail_id;
existingEntity.develop = i.develop;
existingEntity.development_method = i.development_method;
existingEntity.start_date = i.start_date;
existingEntity.end_date = i.end_date;
_repository.UpdateWithoutCommit(i.id.Value, existingEntity);
@@ -190,15 +190,15 @@ namespace TodoAPI2.Models
_repository.InsertWithoutCommit(entity);
}
else if (i.active_mode == "0" && i.id.HasValue) // remove
{
{
_repository.DeleteWithoutCommit(i.id.Value);
}
else if (i.active_mode == "0" && !i.id.HasValue)
{
// nothing to do
}
}
}
_repository.Context.SaveChanges();
_repository.Context.SaveChanges();
return model.Count().ToString();
}