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

แก้ไข op 10 ข้อ

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2021-03-07 12:48:25 +07:00
parent 9530d1aa37
commit 9bac5ef7d3
23 changed files with 1567 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusService.cs
View File

@@ -312,7 +312,7 @@ namespace TodoAPI2.Models
select i).FirstOrDefault();
string sql = $@"
insert into notifications(id,type,notifiable_type,notifiable_id,data,created_at)
values('{Guid.NewGuid().ToString()}','App\Notifications\WorkflowNotification','App\Models\User',{noti_to_user_id.ToString()},@data,NOW())
values('{Guid.NewGuid().ToString()}','App\Notifications\WorkflowNotification','App\Models\User',{noti_to_user_id.ToString()},@data,NOW()now()+interval'7h')
";
DataOfNotification d = new DataOfNotification();
d.title = noti_message.Replace("{0}", owner_info.fullname);

2
Models/eva_evaluation_achievement/Ieva_evaluation_achievementService.cs
View File

@@ -21,7 +21,7 @@ namespace TodoAPI2.Models
eva_evaluation_achievementWithSelectionViewModel GetWithSelection(int id);
eva_evaluation_achievementWithSelectionViewModel GetBlankItem();
void reset_achievement(int id);
}
}

2
Models/eva_evaluation_achievement/eva_evaluation_achievementEntity.cs
View File

@@ -20,7 +20,7 @@ namespace TodoAPI2.Models
public eva_create_evaluation_detailEntity eva_create_evaluation_detail { get; set; }
public int? create_evaluation_detail_id { get; set; }
[MaxLength(1000)]
[MaxLength(3000)]
public string achievement { get; set; }
public decimal? weight { get; set; }

48
Models/eva_evaluation_achievement/eva_evaluation_achievementService.cs
View File

@@ -23,7 +23,8 @@ namespace TodoAPI2.Models
private IMyDatabase db;
private Iexternal_linkageService ext;
public eva_evaluation_achievementService(IBaseRepository2<eva_evaluation_achievementEntity, int> repository, IMyDatabase mydb, Iexternal_linkageService inext)
public eva_evaluation_achievementService(IBaseRepository2<eva_evaluation_achievementEntity, int> repository,
IMyDatabase mydb, Iexternal_linkageService inext)
{
_repository = repository;
db = mydb;
@@ -96,7 +97,7 @@ namespace TodoAPI2.Models
&& (m_eva_evaluation_achievement.create_evaluation_detail_id == model.create_evaluation_detail_id || !model.create_evaluation_detail_id.HasValue)
orderby m_eva_evaluation_achievement.achievement
orderby m_eva_evaluation_achievement.created
select new eva_evaluation_achievementViewModel()
{
id = m_eva_evaluation_achievement.id,
@@ -161,7 +162,7 @@ namespace TodoAPI2.Models
where i.id == model.create_evaluation_detail_id
select i).FirstOrDefault();
if(current_detail.status_self == "Y")
if (current_detail.status_self == "Y")
{
throw new Exception("คุณนำส่งข้อตกลงการประเมินไปแล้ว ไม่สามารถบันทึกได้");
}
@@ -240,6 +241,47 @@ namespace TodoAPI2.Models
throw new NotificationException("No data to update");
}
public void reset_achievement(int id)
{
var current_detail = (from i in _repository.Context.eva_create_evaluation_detail
where i.id == id
select i).FirstOrDefault();
if(current_detail == null) throw new NotificationException("No data to update");
if (current_detail.status_self == "Y")
{
throw new Exception("คุณนำส่งข้อตกลงการประเมินไปแล้ว ไม่สามารถบันทึกได้");
}
var current_achievement = (from i in _repository.Context.eva_evaluation_achievement
where i.create_evaluation_detail_id == id
select i);
_repository.Context.RemoveRange(current_achievement);
var opt = (from i in _repository.Context.eva_evaluation_operating_agreement
where i.create_evaluation_detail_id == id
orderby i.mission_no
select i).ToList();
var newid = GetNewPrimaryKey();
var enter = "\n";
foreach (var i in opt)
{
var n = new eva_evaluation_achievementEntity();
n.id = newid;
n.create_evaluation_detail_id = id;
n.achievement = "รายละเอียดภารกิจ" + enter + enter + i.mission_detail + enter + enter + "เป้าหมาย" + enter + enter + i.target + enter + enter + "ตัวชี้วัด" + enter + enter + i.indicators;
n.weight = 0;
n.created = DateTime.Now.AddMinutes(-1 * newid);
newid++;
_repository.Context.Add(n);
}
_repository.Context.SaveChanges();
}
public string UpdateMultiple(List<eva_evaluation_achievementInputModel> model)
{
foreach (var i in model)

9
Models/eva_evaluation_achievement/eva_evaluation_achievementViewModel.cs
View File

@@ -42,7 +42,14 @@ namespace TodoAPI2.Models
public string target_score5 { get; set; }
public int? create_evaluation_detail_id_eva_create_evaluation_detail_create_evaluation_id { get; set; }
public string achievement_display
{
get
{
if (achievement == null) achievement = "";
return achievement.Replace("\n", "<br/>");
}
}
}
}

8
Models/eva_evaluation_achievement_process/eva_evaluation_achievement_processViewModel.cs
View File

@@ -36,5 +36,13 @@ namespace TodoAPI2.Models
public int? create_evaluation_detail_id_eva_create_evaluation_detail_create_evaluation_id { get; set; }
public string achievement_display {
get
{
if (achievement == null) achievement = "";
return achievement.Replace("\n", "<br/>");
}
}
}
}

8
Models/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2ViewModel.cs
View File

@@ -58,5 +58,13 @@ namespace TodoAPI2.Models
public int? create_evaluation_detail_id_eva_create_evaluation_detail_create_evaluation_id { get; set; }
public string achievement_display
{
get
{
if (achievement == null) achievement = "";
return achievement.Replace("\n", "<br/>");
}
}
}
}

1
Models/rep_eva_x/rep_eva_xSearchModel.cs
View File

@@ -18,6 +18,7 @@ namespace TodoAPI2.Models
public List<int> detail_id { get; set; }
public int? is_print_22 { get; set; }
}
}