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 @@
 								<input type="radio" value="Regular" name="workshopShiftStatus" id="organized" class="radio-workTimeOption">
 								<label for="organized" class="radio-label-workTimeOption w-100">منظم</label>
 
-								<input type="radio" value="Rotating" name="workshopShiftStatus" id="rotating_shift" disabled="disabled" class="radio-workTimeOption">
-								<label for="rotating_shift" class="radio-label-workTimeOption w-100" style="display:none">گردشی</label>
+								<input type="radio" value="Rotating" name="workshopShiftStatus" id="rotating_shift" class="radio-workTimeOption">
+								<label for="rotating_shift" class="radio-label-workTimeOption w-100">گردشی</label>
 
 								<input type="radio" value="Irregular" name="workshopShiftStatus" id="disorganized" class="radio-workTimeOption">
 								<label for="disorganized" class="radio-label-workTimeOption w-100">مختلط</label>
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 @@
 							<input type="radio" value="Regular" name="Command.workshopShiftStatus" id="organized" class="radio-workTimeOption">
 							<label for="organized" class="radio-label-workTimeOption w-100">منظم</label>
 							
-							<input type="radio" value="Rotating" name="Command.workshopShiftStatus" id="rotating_shift" disabled="disabled" class="radio-workTimeOption">
-							<label for="rotating_shift" class="radio-label-workTimeOption w-100" style="display: none">گردشی</label>
+							<input type="radio" value="Rotating" name="Command.workshopShiftStatus" id="rotating_shift"  class="radio-workTimeOption">
+							<label for="rotating_shift" class="radio-label-workTimeOption w-100">گردشی</label>
 
 							<input type="radio" value="Irregular" name="Command.workshopShiftStatus" id="disorganized" class="radio-workTimeOption">
 							<label for="disorganized" class="radio-label-workTimeOption w-100">مختلط</label>
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 @@
 								<input type="radio" value="Regular" name="workshopShiftStatus" id="organized" class="radio-workTimeOption">
 								<label for="organized" class="radio-label-workTimeOption w-100">منظم</label>
 								
-								<input type="radio" value="Rotating" name="workshopShiftStatus" id="rotating_shift" class="radio-workTimeOption" disabled="disabled">
-							    <label for="rotating_shift" style="display:none" class=" radio-label-workTimeOption w-100" disabled>گردشی</label>
+								<input type="radio" value="Rotating" name="workshopShiftStatus" id="rotating_shift" class="radio-workTimeOption">
+							    <label for="rotating_shift"  class=" radio-label-workTimeOption w-100" >گردشی</label>
 
 								<input type="radio" value="Irregular" name="workshopShiftStatus" id="disorganized" class="radio-workTimeOption">
 								<label for="disorganized" class="radio-label-workTimeOption w-100">مختلط</label>