diff --git a/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml.cs b/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml.cs index bee8d971..5bcd50fb 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml.cs +++ b/ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml.cs @@ -109,7 +109,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.Checkouts var workingHours = _workingHoursTempApplication.GetByContractIdConvertToShiftwork4(checkout.ContractId); if (checkout.HasRollCall) { - result = await _rollCallMandatoryApplication.RotatingShiftReport(checkout.WorkshopId, checkout.EmployeeId, checkout.ContractStartGr, checkout.ContractEndGr, workingHours.ShiftWork); + result = await _rollCallMandatoryApplication.RotatingShiftReport(checkout.WorkshopId, checkout.EmployeeId, checkout.ContractStartGr, checkout.ContractEndGr, workingHours.ShiftWork, true, workingHours, false); result.HasRollCall = true; } else @@ -130,7 +130,8 @@ namespace ServiceHost.Areas.Client.Pages.Company.Checkouts workingHours.WorkshopId = contract.WorkshopIds; workingHours.EmployeeId = contract.EmployeeId; - result = MandatoryHours(workingHours, workshop.WorkshopHolidayWorking, 0); + //result = MandatoryHours(workingHours, workshop.WorkshopHolidayWorking, 0); + result = await _rollCallMandatoryApplication.RotatingShiftReport(checkout.WorkshopId, checkout.EmployeeId, checkout.ContractStartGr, checkout.ContractEndGr, workingHours.ShiftWork, false, workingHours, workshop.WorkshopHolidayWorking);