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

change checkout footer [TotalPresent and TotalWorking]

Browse Source
This commit is contained in:
SamSys
2025-07-26 16:05:25 +03:30
parent aedaf84d57
commit 751c1a4131
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -825,10 +825,16 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
#region SaveRollCall
GroupedRollCalls = groupedRollCall,
TotalWorkingTimeSpan = sumSpansWhitOutleaves,
//کارکرد واقعی - محاسبات شامل مرخصی افزوده شده
TotalWorkingTimeSpan = sumSpans,
// ساعت استراحت
TotalBreakTimeSpan = totalBreakTime,
TotalPresentTimeSpan = sumSpansWhitOutleaves + totalBreakTime,
// ساعت حضور - بدون مرخصی افزده شده
TotalPresentTimeSpan = sumSpansWhitOutleaves,
// مرخصی استحقاقی
TotalPaidLeave = totalLeaveSpan,
//مرخصی استعلاجی
TotalSickLeave = new TimeSpan(sickLeaveTimeSpans.Sum(x => x.Ticks)),
#endregion
};

11
ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs
View File

@@ -1028,16 +1028,17 @@ public class IndexModel : PageModel
TotalDayOfBunosesCompute = bunosesPay.Bunoses > 0 ? $"{bunosesPay.TotalDayCompute}" : "0",
HolidayWorking = workshop.WorkshopHolidayWorking,
ShiftWork = workingHours.ShiftWork,
//کارکرد واقعی - محاسبات شامل مرخصی افزوده شده
TotalWorkingTimeSpan = mandatoryCompute.TotalWorkingTimeSpan,
//ساعت استراحت
TotalBreakTimeSpan = mandatoryCompute.TotalBreakTimeSpan,
// ساعت حضور - بدون مرخصی افزده شده
TotalPresentTimeSpan = mandatoryCompute.TotalPresentTimeSpan,
//مدت مرخصی استحقاقی
TotalPaidLeave = mandatoryCompute.TotalPaidLeave,
//مدت مرخصی استعلاجی
TotalSickLeave = mandatoryCompute.TotalSickLeave,
//لیست حضورغیاب جهت ذخیره سازی
GroupedRollCalls = mandatoryCompute.GroupedRollCalls,
HasInsuranceChekoutOverTime = workshop.InsuranceCheckoutOvertime