Merge branch 'develop'

BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveBeginingRepository.cs

@@ -293,7 +293,12 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                     FirstName = pf.FirstName,
                     LastName = pf.LastName,
                     LeaveDaysUsed = 0,
-                    LeaveDays = leaveType?.Code == "LV-005" ? limit : 0
+                    LeaveDays = leaveType?.Code == "LV-005" ? limit : 0,
+                    RootDnaId = pf.RootDnaId,
+                    Child1DnaId = pf.Child1DnaId,
+                    Child2DnaId = pf.Child2DnaId,
+                    Child3DnaId = pf.Child3DnaId,
+                    Child4DnaId = pf.Child4DnaId
                 };
 
                 _dbContext.Set<LeaveBeginning>().Add(data);
@@ -305,6 +310,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<List<LeaveBeginning>> GetAllByYearAndTypeAsync(int year, Guid typeId, List<ProfileData> userIdList)
         {
+            
+
             var updateList = new List<LeaveBeginning>();
             var result = new List<LeaveBeginning>();
 
@@ -321,6 +328,12 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                 //    continue; // Goto Next Id
                 //}
 
+                var profile = await _userProfileRepository.GetProfileByProfileIdAsync(pf.Id, AccessToken);
+                if (profile == null)
+                {
+                    return null;
+                }
+
                 var govAge = (pf?.DateStart?.Date ?? DateTime.Now.Date).DiffDay(DateTime.Now.Date);
 
                 var leaveType = await _dbContext.Set<LeaveType>().FirstOrDefaultAsync(x => x.Id == typeId);
@@ -368,7 +381,12 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                         FirstName = pf.FirstName,
                         LastName = pf.LastName,
                         LeaveDaysUsed = 0,
-                        LeaveDays = leaveType?.Code == "LV-005" ? limit : 0
+                        LeaveDays = leaveType?.Code == "LV-005" ? limit : 0,
+                        RootDnaId = profile.RootDnaId,
+                        Child1DnaId = profile.Child1DnaId,
+                        Child2DnaId = profile.Child2DnaId,
+                        Child3DnaId = profile.Child3DnaId,
+                        Child4DnaId = profile.Child4DnaId
                     };
 
                     updateList.Add(data);

BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs

@@ -1103,9 +1103,17 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                 throw new Exception(GlobalMessages.DataNotFound);
             }
 
-            if (rawData.ApproveStep != "st3")
+            // ถ้าไม่มี commander ข้ามไปเช็ค approver ได้เลย
+            var commanders = rawData.Approvers
+                                .Where(x => x.ApproveType!.ToUpper() == "COMMANDER")
+                                .OrderBy(x => x.Seq)
+                                .ToList();
+            if(commanders.Count > 0 || commanders != null)
             {
-                throw new Exception("คำขอนี้ยังไม่ได้อยู่ในขั้นตอนที่สามารถอนุมัติได้ ไม่สามารถทำรายการได้");
+                if (rawData.ApproveStep != "st3")
+                {
+                    throw new Exception("คำขอนี้ยังไม่ได้อยู่ในขั้นตอนที่สามารถอนุมัติได้ ไม่สามารถทำรายการได้");
+                }
             }
 
             // check commander approve

BMA.EHR.Leave/Controllers/LeaveBeginningController.cs

@@ -311,6 +311,35 @@ namespace BMA.EHR.Leave.Service.Controllers
             }
         }
 
+        [HttpGet("update-dna")]
+        public async Task<ActionResult<ResponseObject>> UpdateDnaAsync()
+        {
+            try
+            {
+                var leaveBeginnings = await _context.LeaveBeginnings.ToListAsync();
+                foreach (var item in leaveBeginnings)
+                {
+                    var profile = await _userProfileRepository.GetProfileByProfileIdAsync(item.ProfileId, AccessToken);
+                    if (profile != null)
+                    {
+                        item.RootDnaId = profile.RootDnaId;
+                        item.Child1DnaId = profile.Child1DnaId;
+                        item.Child2DnaId = profile.Child2DnaId;
+                        item.Child3DnaId = profile.Child3DnaId;
+                        item.Child4DnaId = profile.Child4DnaId;   
+                        _context.LeaveBeginnings.Update(item);
+                    }
+                    
+                }
+                await _context.SaveChangesAsync();
+                return Success("อัพเดทข้อมูลสำเร็จ");
+            }
+            catch (Exception ex)
+            {
+                return Error(ex);
+            }
+        }
+
 
         // <summary>
         /// แก้ไขรายการ
@@ -358,6 +387,12 @@ namespace BMA.EHR.Leave.Service.Controllers
                 leaveBeginning.LastUpdateFullName = FullName ?? "";
                 leaveBeginning.LastUpdatedAt = DateTime.Now;
 
+                leaveBeginning.RootDnaId = profile.RootDnaId;
+                leaveBeginning.Child1DnaId = profile.Child1DnaId;
+                leaveBeginning.Child2DnaId = profile.Child2DnaId;
+                leaveBeginning.Child3DnaId = profile.Child3DnaId;
+                leaveBeginning.Child4DnaId = profile.Child4DnaId;
+
                 await _leaveBeginningRepository.UpdateAsync(leaveBeginning);
                 return Success("แก้ไขข้อมูลสำเร็จ");
             }

BMA.EHR.Leave/Controllers/LeaveReportController.cs

@@ -238,11 +238,13 @@ namespace BMA.EHR.Leave.Service.Controllers
             if (toDay >= new DateTime(toDay.Year, 10, 1) && toDay <= new DateTime(toDay.Year, 12, 31))
                 thisYear = thisYear + 1;
 
-            var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUserAsync(thisYear, data.Type.Id, data.KeycloakUserId);
+            var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUser2Async(thisYear, data.Type.Id, data.KeycloakUserId);
-
+            //var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUser2Async(thisYear, rawData.Type.Id, rawData.KeycloakUserId);
-            var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear);
+            //var leaveSummary = leaveData == null ? 0.0 : leaveData.LeaveDaysUsed;
 
+            //var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear);
 
+            var sumLeave = leaveData == null ? 0.0 : leaveData.LeaveDaysUsed;
             var leaveLimit = leaveData == null ? 0.0 : leaveData.LeaveDays;
             var extendLeave = leaveLimit - 10;
 
@@ -938,7 +940,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 var count = 1;
                 var employees = new List<dynamic>();
                 // กรองตามที่ fe ส่งมา
-                if ((role == "ROOT" || role == "OWNER" || role == "CHILD" || role == "PARENT") && req.node > profileAdmin?.Node)
+                if ((role == "ROOT" || role == "OWNER" || role == "CHILD" || role == "PARENT") /*&& req.node > profileAdmin?.Node*/)
                 {
                     profile = profile
                         .Where(x => req.node == 4 ? x.OrgChild4Id == req.nodeId : req.node == 3 ? x.OrgChild3Id == req.nodeId : req.node == 2 ? x.OrgChild2Id == req.nodeId : req.node == 1 ? x.OrgChild1Id == req.nodeId : req.node == 0 ? x.OrgRootId == req.nodeId : true)
@@ -1609,7 +1611,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 var workTotal = 0;
                 var seminarTotal = 0;
                 // กรองตามที่ fe ส่งมา
-                if ((role == "ROOT" || role == "OWNER" || role == "CHILD" || role == "PARENT") && req.node > profileAdmin?.Node)
+                if ((role == "ROOT" || role == "OWNER" || role == "CHILD" || role == "PARENT") /*&& req.node > profileAdmin?.Node*/)
                 {
                     profile = profile
                         .Where(x => req.node == 4 ? x.OrgChild4Id == req.nodeId : req.node == 3 ? x.OrgChild3Id == req.nodeId : req.node == 2 ? x.OrgChild2Id == req.nodeId : req.node == 1 ? x.OrgChild1Id == req.nodeId : req.node == 0 ? x.OrgRootId == req.nodeId : true)
@@ -1875,7 +1877,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     profile = await _userProfileRepository.GetEmployeeByAdminRole(AccessToken, profileAdmin?.Node, nodeId, role, req.revisionId, req.node, req.nodeId);
                 }
                 // Child กรองตามที่ fe ส่งมาอีกชั้น
-                if ((role == "ROOT" || role == "OWNER" || role == "CHILD" || role == "PARENT") && req.node > profileAdmin?.Node)
+                if ((role == "ROOT" || role == "OWNER" || role == "CHILD" || role == "PARENT") /*&& req.node > profileAdmin?.Node*/)
                 {
                     profile = profile
                         .Where(x => req.node == 4 ? x.OrgChild4Id == req.nodeId : req.node == 3 ? x.OrgChild3Id == req.nodeId : req.node == 2 ? x.OrgChild2Id == req.nodeId : req.node == 1 ? x.OrgChild1Id == req.nodeId : req.node == 0 ? x.OrgRootId == req.nodeId : true)