BMA.EHR.Leave/Controllers/LeaveBeginningController.cs

@@ -500,7 +500,7 @@ namespace BMA.EHR.Leave.Service.Controllers
 
         [HttpPut("schedule")]
         [AllowAnonymous]
-        public async Task<ActionResult<ResponseObject>> ScheduleUpdateLeaveBeginningAsync([FromBody] ScheduleEditLeaveBeginningDto req)
+        public async Task<ActionResult<ResponseObject>> ScheduleUpdateLeaveBeginningAsync([FromBody] EditLeaveBeginningDto req)
         {
             try
             {
@@ -520,10 +520,10 @@ namespace BMA.EHR.Leave.Service.Controllers
                     oldData.LeaveTypeId = req.LeaveTypeId;
                     oldData.LeaveYear = req.LeaveYear;
                     oldData.LeaveDays = req.LeaveDays;
-                    // oldData.LeaveDaysUsed = req.LeaveDaysUsed;
-                    // oldData.LeaveCount = req.LeaveCount;
-                    // oldData.BeginningLeaveDays = req.BeginningLeaveDays;
-                    // oldData.BeginningLeaveCount = req.BeginningLeaveCount;
+                    oldData.LeaveDaysUsed = req.LeaveDaysUsed;
+                    oldData.LeaveCount = req.LeaveCount;
+                    oldData.BeginningLeaveDays = req.BeginningLeaveDays;
+                    oldData.BeginningLeaveCount = req.BeginningLeaveCount;
 
                     oldData.ProfileId = req.ProfileId;
                     oldData.Prefix = profile.Prefix;
@@ -536,7 +536,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     oldData.Child4DnaId = profile.Child4DnaId;
 
                     oldData.LastUpdateUserId = "";
-                    oldData.LastUpdateFullName = "System";
+                    oldData.LastUpdateFullName = FullName ?? "";
                     oldData.LastUpdatedAt = DateTime.Now;
 
                     await _leaveBeginningRepository.UpdateAsync(oldData);
@@ -547,10 +547,10 @@ namespace BMA.EHR.Leave.Service.Controllers
                     leaveBeginning.LeaveTypeId = req.LeaveTypeId;
                     leaveBeginning.LeaveYear = req.LeaveYear;
                     leaveBeginning.LeaveDays = req.LeaveDays;
-                    leaveBeginning.LeaveDaysUsed = 0;
-                    leaveBeginning.LeaveCount = 0;
-                    leaveBeginning.BeginningLeaveDays = 0;
-                    leaveBeginning.BeginningLeaveCount = 0;
+                    leaveBeginning.LeaveDaysUsed = req.LeaveDaysUsed;
+                    leaveBeginning.LeaveCount = req.LeaveCount;
+                    leaveBeginning.BeginningLeaveDays = req.BeginningLeaveDays;
+                    leaveBeginning.BeginningLeaveCount = req.BeginningLeaveCount;
 
                     leaveBeginning.ProfileId = req.ProfileId;
                     leaveBeginning.Prefix = profile.Prefix;
@@ -564,7 +564,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     leaveBeginning.Child4DnaId = profile.Child4DnaId;
 
                     leaveBeginning.CreatedUserId = "";
-                    leaveBeginning.CreatedFullName = "System";
+                    leaveBeginning.CreatedFullName = FullName ?? "";
                     leaveBeginning.CreatedAt = DateTime.Now;
 
                     await _leaveBeginningRepository.AddAsync(leaveBeginning);

BMA.EHR.Leave/Controllers/LeaveRequestController.cs

@@ -2323,31 +2323,12 @@ namespace BMA.EHR.Leave.Service.Controllers
                 await _leaveRequestRepository.SendToOfficerAsync(id);
 
                 // Remove Workflow Integration
-                var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
-                var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
-                if (profile == null)
-                {
-                    return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
-                }
-
-                // Get Officer List
-                var officers = await _userProfileRepository.GetOCStaffAsync(profile.Id, AccessToken);
-                if(officers != null && officers.Count > 0)
-                {
-                    foreach (var officer in officers)
-                    {
-                        // Send Notification
-                        var noti = new Notification
-                        {
-                            Body = $"มีคำร้องขอลาจาก {profile.Prefix}{profile.FirstName} {profile.LastName} รอรับการอนุมัติจากคุณ",
-                            ReceiverUserId = officer.ProfileId,
-                            Type = "",
-                            Payload = $"{URL}/leave/detail/{id}",
-                        };
-                        _appDbContext.Set<Notification>().Add(noti);
-                    }
-                    await _appDbContext.SaveChangesAsync();
-                }
+                // var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+                // var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+                // if (profile == null)
+                // {
+                //     return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+                // }
                 // var baseAPIOrg = _configuration["API"];
                 // var apiUrlOrg = $"{baseAPIOrg}/org/workflow/add-workflow";
                 // if (profile.ProfileType == "OFFICER")

BMA.EHR.Leave/DTOs/LeaveBeginnings/EditLeaveBeginningDto.cs

@@ -29,20 +29,4 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveBeginnings
         [Comment("จำนวนครั้งที่ลายกมา")]
         public int BeginningLeaveCount { get; set; } = 0;
     }
-
-
-    public class ScheduleEditLeaveBeginningDto
-    {
-        [Required]
-        public Guid ProfileId { get; set; } = Guid.Empty;
-
-        [Required]
-        public Guid LeaveTypeId { get; set; } = Guid.Empty;
-
-        [Required, Comment("ปีงบประมาณ")]
-        public int LeaveYear { get; set; } = 0;
-
-        [Required, Comment("จำนวนวันลายกมา")]
-        public double LeaveDays { get; set; } = 0.0;
-    }
 }