diff --git a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs index 8e889dea..9eb98555 100644 --- a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs +++ b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs @@ -840,7 +840,7 @@ CreateWorkingHoursTemp command, bool holidayWorking) var nightWorkingTime = new TimeSpan(); #endregion - + foreach (var shift in item.ShiftList) { #region DatePeriod @@ -1015,6 +1015,7 @@ CreateWorkingHoursTemp command, bool holidayWorking) #region Result var result = new RotatingShiftViewModel(); + result.RotatingDate = item.CreationDate.ToFarsi(); result.MorningWorkSpan = morningWorkingTime; result.EveningWorkSpan = eveningWorkingTime; result.NightWorkSpan = nightWorkingTime; diff --git a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/RotatingShiftReport.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/RotatingShiftReport.cshtml index 1defe4f4..8e8b867c 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/RotatingShiftReport.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/RotatingShiftReport.cshtml @@ -24,7 +24,7 @@ .modal-body2 { background-color: #f2fbfb; width: 100%; - height: 615px; + height: 644px; border-radius: 25px; position: absolute; } @@ -59,7 +59,20 @@