hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop
Some checks failed
release-dev / release-dev (push) Failing after 10s
Details

Browse source 
* 'develop' of github.com:Frappet/BMA-EHR-BackEnd:
  no message
  edit report probation
This commit is contained in:
Warunee Tamkoo 2025-01-11 12:46:50 +07:00
commit 91afbdf2e3
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs
View file

@ -124,6 +124,8 @@ namespace BMA.EHR.Application.Repositories.Reports
Knowledges = knowledges, Knowledges = knowledges,
Competencys = competencys, Competencys = competencys,
Outputs = outputs, Outputs = outputs,
Skills=skills,
Laws=laws,
OtherDesc = string.IsNullOrEmpty(probation_assign.result.assign.other_desc) ? "-" : probation_assign.result.assign.other_desc, OtherDesc = string.IsNullOrEmpty(probation_assign.result.assign.other_desc) ? "-" : probation_assign.result.assign.other_desc,
Other4Desc = string.IsNullOrEmpty(probation_assign.result.assign.other4_desc) ? "-" : probation_assign.result.assign.other4_desc, Other4Desc = string.IsNullOrEmpty(probation_assign.result.assign.other4_desc) ? "-" : probation_assign.result.assign.other4_desc,
Other5No1Desc = string.IsNullOrEmpty(probation_assign.result.assign.other5_no1_desc) ? "-" : probation_assign.result.assign.other5_no1_desc, Other5No1Desc = string.IsNullOrEmpty(probation_assign.result.assign.other5_no1_desc) ? "-" : probation_assign.result.assign.other5_no1_desc,

4
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -445,8 +445,8 @@ namespace BMA.EHR.Placement.Service.Controllers
Education = x.PlacementEducations.Select(p => new Education = x.PlacementEducations.Select(p => new
{ {
Id = p.Id, Id = p.Id,
EducationLevel = p.EducationLevelId, EducationLevel = p.EducationLevelName,
EducationLevelId = p.EducationLevelName, EducationLevelId = p.EducationLevelId,
Institute = p.Institute, Institute = p.Institute,
Degree = p.Degree, Degree = p.Degree,
Field = p.Field, Field = p.Field,