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

no message

Browse source
This commit is contained in:
kittapath 2024-11-05 11:20:55 +07:00
parent 6713ec6cf0
commit ae67d4381d
8 changed files with 70 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

44
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
View file

@ -57,9 +57,6 @@ namespace BMA.EHR.Placement.Service.Controllers
private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value;
private string? token => _httpContextAccessor?.HttpContext?.Request.Headers["Authorization"];
//private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.IsInRole("placement1");
private bool? PlacementAdmin => _httpContextAccessor?.HttpContext?.User?.Claims?.Any(claim => new[] { "placement", "placement1", "placement2" }.Contains(claim.Value));
#endregion
/// <summary>
@ -164,32 +161,6 @@ namespace BMA.EHR.Placement.Service.Controllers
p.typeCommand,
})
.ToListAsync();
// if (PlacementAdmin == true)
// placementAppointments.Where(x => x.Status.Trim().ToUpper().Contains("PENDING"));
// if (keyword != "")
// {
// var data = placementAppointments.Where(x =>
// (x.citizenId != null && x.citizenId.Contains(keyword)) ||
// (x.prefix != null && x.prefix.Contains(keyword)) ||
// (x.firstName != null && x.firstName.Contains(keyword)) ||
// (x.lastName != null && x.lastName.Contains(keyword)) ||
// (x.rootShortNameOld != null && x.rootShortNameOld.Contains(keyword)) ||
// (x.posMasterNoOld != null && x.posMasterNoOld.ToString().Contains(keyword)) ||
// (x.OrganizationOld != null && x.OrganizationOld.Contains(keyword)) ||
// (x.posTypeNameOld != null && x.posTypeNameOld.Contains(keyword)) ||
// (x.posLevelNameOld != null && x.posLevelNameOld.Contains(keyword)) ||
// (x.OrganizationPositionOld != null && x.OrganizationPositionOld.Contains(keyword)) ||
// (x.Reason != null && x.Reason.Contains(keyword)) ||
// (x.nodeName != null && x.nodeName.Contains(keyword)))
// .OrderByDescending(x => x.CreatedAt)
// .Skip((page - 1) * pageSize)
// .Take(pageSize)
// .ToList();
// placementAppointments = data;
// }
return Success(placementAppointments);
}
@ -864,7 +835,8 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
@ -1070,7 +1042,8 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
@ -1274,7 +1247,8 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
OldOrganization = _null,
@ -1474,7 +1448,8 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
OldOc = _null,
@ -1683,7 +1658,8 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,