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

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-08-20 11:07:39 +07:00
commit a879c38512
34 changed files with 60943 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs
View file

@ -4965,6 +4965,7 @@ namespace BMA.EHR.Application.Repositories
.ToList()
.Select(h => new InsigniaRequestItem
{
Id = h.Id,
ProfileId = h.Profile.Id,
FullName = $"{h.Profile.FirstName} {h.Profile.LastName}",
Position = h.Profile.Position.Name,
@ -5109,7 +5110,13 @@ namespace BMA.EHR.Application.Repositories
Period = period,
Organization = oc,
RequestStatus = "st1",
RequestNote = ""
RequestNote = "",
CreatedUserId = FullName ?? "",
CreatedFullName = UserId ?? "System Administrator",
CreatedAt = DateTime.Now,
LastUpdateFullName = FullName ?? "System Administrator",
LastUpdateUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
};
foreach (var item in items)
@ -5126,8 +5133,13 @@ namespace BMA.EHR.Application.Repositories
RequestInsignia = req_insignia,
Salary = item.Salary == null ? null : item.Salary,
RequestDate = DateTime.Now,
MatchingConditions = System.Text.Json.JsonSerializer.Serialize(item.MatchingConditions) // serialize to string
MatchingConditions = System.Text.Json.JsonSerializer.Serialize(item.MatchingConditions), // serialize to string
CreatedUserId = FullName ?? "",
CreatedFullName = UserId ?? "System Administrator",
CreatedAt = DateTime.Now,
LastUpdateFullName = FullName ?? "System Administrator",
LastUpdateUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
});
}
}

13
BMA.EHR.Application/Requests/InsigniaManageRequest.cs Normal file
View file

@ -0,0 +1,13 @@
using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore;
namespace BMA.EHR.Application.Requests
{
public class InsigniaManageRequest
{
public Guid Insignia { get; set; }
public int Year { get; set; }
public int Total { get; set; }
public string Type { get; set; }
}
}

1
BMA.EHR.Application/Requests/InsigniaRequestItem.cs
View file

@ -2,6 +2,7 @@
{
public class InsigniaRequestItem
{
public Guid Id { get; set; }
public Guid ProfileId { get; set; }
public string FullName { get; set; }
public string Position { get; set; }