From e1c6d54149776b746308b30546dfc649e9e618a0 Mon Sep 17 00:00:00 2001 From: SamSys Date: Sat, 18 Jan 2025 16:10:15 +0330 Subject: [PATCH] Enable rotatingShift --- CompanyManagment.Application/RollCallApplication.cs | 2 +- .../Client/Pages/Company/RollCall/ModalCreateGroup.cshtml | 4 ++-- .../Pages/Company/RollCall/ModalEditEmployeeFromGroup.cshtml | 4 ++-- .../Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CompanyManagment.Application/RollCallApplication.cs b/CompanyManagment.Application/RollCallApplication.cs index 78317211..c6fd6229 100644 --- a/CompanyManagment.Application/RollCallApplication.cs +++ b/CompanyManagment.Application/RollCallApplication.cs @@ -414,7 +414,7 @@ public class RollCallApplication : IRollCallApplication List<(DateTime Start, DateTime End, long RollCallId)> result = new(); - if (workshopSettings.WorkshopShiftStatus == WorkshopShiftStatus.Regular || employeeSettings == WorkshopShiftStatus.Regular) + if (employeeSettings == WorkshopShiftStatus.Regular) { TimeOnly offset = diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCreateGroup.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCreateGroup.cshtml index b57a7b09..b4c8ea5b 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCreateGroup.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCreateGroup.cshtml @@ -32,8 +32,8 @@ - - + + diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditEmployeeFromGroup.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditEmployeeFromGroup.cshtml index 0fc878c6..0ada5b18 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditEmployeeFromGroup.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditEmployeeFromGroup.cshtml @@ -47,8 +47,8 @@ - - + + diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml index e76e10d6..177a3e00 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml @@ -36,8 +36,8 @@ - - + +