From 8cb39f4a551789d1a8452150fc0ee71fc784358d Mon Sep 17 00:00:00 2001 From: MahanCh Date: Mon, 21 Apr 2025 13:44:42 +0330 Subject: [PATCH] change customizeCheckoutBug --- .../Repository/RollCallMandatoryRepository.cs | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs index 0256af06..8c795eec 100644 --- a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs +++ b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs @@ -1677,6 +1677,7 @@ CreateWorkingHoursTemp command, bool holidayWorking) var totalDays = (int)(contractEnd - contractStart).TotalDays + 1; mandatoryDays = totalDays; + #endregion @@ -2455,14 +2456,14 @@ CreateWorkingHoursTemp command, bool holidayWorking) double lateToWorkDeduction = 0; TimeSpan totalLateToWorkSpan = TimeSpan.Zero; - + if (customizeWorkshopEmployeeSettings.WorkshopShiftStatus == WorkshopShiftStatus.Rotating) { foreach (var rollCall in groupedRollCall) { - + var rollCallShift = rollCall.TotalShiftDurationTimeSpan; var dayMinuteWage = rollCallShift.TotalMinutes == 0 ? 0 : (dailyWage / rollCallShift.TotalMinutes); (DateTime start, DateTime end)? firstShift = null; @@ -2475,7 +2476,7 @@ CreateWorkingHoursTemp command, bool holidayWorking) firstShift = shift; } - + if (shift.start == firstShift.Value.start && shift.end == firstShift.Value.end) { minutes += rc.LateEntryDuration.TotalMinutes; @@ -2486,7 +2487,7 @@ CreateWorkingHoursTemp command, bool holidayWorking) } - + } else { @@ -2502,9 +2503,15 @@ CreateWorkingHoursTemp command, bool holidayWorking) } } + if (mandatoryDays == 31) + { + mandatoryDays = 30; + } + + #endregion - return new CustomizeCheckoutMandatoryViewModel + return new CustomizeCheckoutMandatoryViewModel { InsuranceDeduction = Math.Truncate(insuranceDeductionAmount), FridayPay = Math.Truncate(fridayPayAmount), @@ -2640,7 +2647,10 @@ CreateWorkingHoursTemp command, bool holidayWorking) #endregion - + if (mandatoryDays == 31) + { + mandatoryDays = 30; + } return new CustomizeCheckoutMandatoryViewModel() { MonthlySalary = dailyWage * mandatoryDays, @@ -2664,7 +2674,7 @@ CreateWorkingHoursTemp command, bool holidayWorking) && x.GrantDate >= start && x.GrantDate <= end && x.RewardType == RewardType.CreatedByCheckoutForBirthDay) == false) { - var reward = new Reward(employeeId, workshopId, amount, "", 0,UserType.System, contractStart, "هدیه تولد", + var reward = new Reward(employeeId, workshopId, amount, "", 0, UserType.System, contractStart, "هدیه تولد", RewardType.CreatedByCheckoutForBirthDay); _context.Rewards.Add(reward); _context.SaveChanges(); @@ -2680,7 +2690,7 @@ CreateWorkingHoursTemp command, bool holidayWorking) && x.GrantDate >= start && x.GrantDate <= end && x.RewardType == type) == false) { - var reward = new Reward(employeeId, workshopId, amount, "", 0,UserType.System, contractStart, title, type); + var reward = new Reward(employeeId, workshopId, amount, "", 0, UserType.System, contractStart, title, type); _context.Rewards.Add(reward); _context.SaveChanges(); }