เพิ่มช่อง วันที่เริ่มลา / สิ้นสุด ลา
This commit is contained in:
@@ -15,26 +15,30 @@ namespace TodoAPI2.Models
|
||||
public class eva_performance_planEntity : BaseEntity<Guid>
|
||||
{
|
||||
|
||||
|
||||
public int? fiscal_year { get; set; }
|
||||
|
||||
public int? theTime { get; set; }
|
||||
|
||||
public decimal? percent { get; set; }
|
||||
|
||||
public DateTime? start_leave { get; set; }
|
||||
|
||||
public DateTime? end_leave { get; set; }
|
||||
|
||||
[NotMapped]
|
||||
public string display_text
|
||||
public string display_text { get; set; }
|
||||
|
||||
|
||||
public void SetAutoField(DataContext context)
|
||||
{
|
||||
get
|
||||
{
|
||||
if(!theTime.HasValue || !fiscal_year.HasValue)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
else
|
||||
{
|
||||
return theTime.ToString() + "/" + fiscal_year.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void DoAfterInsertUpdate(DataContext context)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,6 +22,10 @@ namespace TodoAPI2.Models
|
||||
|
||||
public decimal? percent { get; set; }
|
||||
|
||||
public DateTime? start_leave { get; set; }
|
||||
|
||||
public DateTime? end_leave { get; set; }
|
||||
|
||||
public string active_mode { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,6 +14,8 @@ namespace TodoAPI2.Models
|
||||
public class eva_performance_planSearchModel
|
||||
{
|
||||
|
||||
public Guid id { get; set; }
|
||||
|
||||
public int? fiscal_year { get; set; }
|
||||
|
||||
public int? theTime { get; set; }
|
||||
|
||||
@@ -99,6 +99,8 @@ namespace TodoAPI2.Models
|
||||
fiscal_year = m_eva_performance_plan.fiscal_year,
|
||||
theTime = m_eva_performance_plan.theTime,
|
||||
percent = m_eva_performance_plan.percent,
|
||||
start_leave = m_eva_performance_plan.start_leave,
|
||||
end_leave = m_eva_performance_plan.end_leave,
|
||||
|
||||
isActive = m_eva_performance_plan.isActive,
|
||||
Created = m_eva_performance_plan.created,
|
||||
@@ -124,6 +126,8 @@ namespace TodoAPI2.Models
|
||||
fiscal_year = m_eva_performance_plan.fiscal_year,
|
||||
theTime = m_eva_performance_plan.theTime,
|
||||
percent = m_eva_performance_plan.percent,
|
||||
start_leave = m_eva_performance_plan.start_leave,
|
||||
end_leave = m_eva_performance_plan.end_leave,
|
||||
|
||||
isActive = m_eva_performance_plan.isActive,
|
||||
Created = m_eva_performance_plan.created,
|
||||
@@ -152,6 +156,8 @@ namespace TodoAPI2.Models
|
||||
fiscal_year = m_eva_performance_plan.fiscal_year,
|
||||
theTime = m_eva_performance_plan.theTime,
|
||||
percent = m_eva_performance_plan.percent,
|
||||
start_leave = m_eva_performance_plan.start_leave,
|
||||
end_leave = m_eva_performance_plan.end_leave,
|
||||
|
||||
isActive = m_eva_performance_plan.isActive,
|
||||
Created = m_eva_performance_plan.created,
|
||||
@@ -185,6 +191,8 @@ namespace TodoAPI2.Models
|
||||
existingEntity.fiscal_year = model.fiscal_year;
|
||||
existingEntity.theTime = model.theTime;
|
||||
existingEntity.percent = model.percent;
|
||||
existingEntity.start_leave = model.start_leave;
|
||||
existingEntity.end_leave = model.end_leave;
|
||||
|
||||
var updated = _repository.Update(id, existingEntity);
|
||||
return Get(updated.id);
|
||||
@@ -205,6 +213,8 @@ namespace TodoAPI2.Models
|
||||
existingEntity.fiscal_year = i.fiscal_year;
|
||||
existingEntity.theTime = i.theTime;
|
||||
existingEntity.percent = i.percent;
|
||||
existingEntity.start_leave = i.start_leave;
|
||||
existingEntity.end_leave = i.end_leave;
|
||||
|
||||
_repository.UpdateWithoutCommit(i.id.Value, existingEntity);
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ using TTSW.Common;
|
||||
|
||||
namespace TodoAPI2.Models
|
||||
{
|
||||
public class eva_performance_planViewModel : BaseViewModel<Guid>
|
||||
public class eva_performance_planViewModel : BaseViewModel2<Guid>
|
||||
{
|
||||
|
||||
public int? fiscal_year { get; set; }
|
||||
@@ -19,5 +19,15 @@ namespace TodoAPI2.Models
|
||||
public int? theTime { get; set; }
|
||||
|
||||
public decimal? percent { get; set; }
|
||||
|
||||
public DateTime? start_leave { get; set; }
|
||||
|
||||
public string txt_start_leave { get { return MyHelper.GetDateStringForReport(this.start_leave); } }
|
||||
|
||||
public DateTime? end_leave { get; set; }
|
||||
|
||||
public string txt_end_leave { get { return MyHelper.GetDateStringForReport(this.end_leave); } }
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user