admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change customizeCheckoutBug

Browse Source
This commit is contained in:
MahanCh
2025-04-21 13:44:42 +03:30
parent 47c53ce116
commit 8cb39f4a55
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
View File

@@ -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();
}