diff --git a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs index 8f82163b..4b06cb3f 100644 --- a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs +++ b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs @@ -825,10 +825,16 @@ public class RollCallMandatoryRepository : RepositoryBase, 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 }; diff --git a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs index 6f130f0f..18adf7f2 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs +++ b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs @@ -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