diff --git a/Company.Domain/CustomizeWorkshopGroupSettingsAgg/Entities/CustomizeWorkshopGroupSettings.cs b/Company.Domain/CustomizeWorkshopGroupSettingsAgg/Entities/CustomizeWorkshopGroupSettings.cs
index f6fb2e6f..79a731e6 100644
--- a/Company.Domain/CustomizeWorkshopGroupSettingsAgg/Entities/CustomizeWorkshopGroupSettings.cs
+++ b/Company.Domain/CustomizeWorkshopGroupSettingsAgg/Entities/CustomizeWorkshopGroupSettings.cs
@@ -17,341 +17,344 @@ namespace Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities;
 
 public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
 {
-    public CustomizeWorkshopGroupSettings()
-    {
+	public CustomizeWorkshopGroupSettings()
+	{
 
-    }
+	}
 
-    public CustomizeWorkshopGroupSettings(string groupName, double salary,
-        long customizeWorkshopSettingId, ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
-         FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay,
-        BonusesPay bonusesPay, NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
-        FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
-        FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
-        HolidayWork holidayWork, BreakTime breakTime, WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, int leavePermittedDays,
-        ICollection<CustomizeRotatingShift> rotatingShifts, List<WeeklyOffDay> weeklyOffDays) :
-        base(fridayPay, overTimePay, baseYearsPay, bonusesPay, nightWorkPay,
-        marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
-        earlyExit, holidayWork, breakTime, leavePermittedDays,weeklyOffDays)
-    {
-        GroupName = groupName;
-        Salary = salary;
-        CustomizeWorkshopSettingId = customizeWorkshopSettingId;
-        GuardGroupShifts(customizeWorkshopGroupSettingsShifts);
-        WorkshopShiftStatus = workshopShiftStatus;
+	public CustomizeWorkshopGroupSettings(string groupName, double salary,
+		long customizeWorkshopSettingId, ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
+		 FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay,
+		BonusesPay bonusesPay, NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
+		FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
+		FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
+		HolidayWork holidayWork, BreakTime breakTime, WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, int leavePermittedDays,
+		ICollection<CustomizeRotatingShift> rotatingShifts, List<WeeklyOffDay> weeklyOffDays) :
+		base(fridayPay, overTimePay, baseYearsPay, bonusesPay, nightWorkPay,
+		marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
+		earlyExit, holidayWork, breakTime, leavePermittedDays, weeklyOffDays)
+	{
+		GroupName = groupName;
+		Salary = salary;
+		CustomizeWorkshopSettingId = customizeWorkshopSettingId;
+		GuardGroupShifts(customizeWorkshopGroupSettingsShifts);
+		WorkshopShiftStatus = workshopShiftStatus;
 
-        CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
+		CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
 
-        CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
+		CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
 
-        IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
-            new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
-            : new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
-    }
+		IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
+			new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
+			: new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
+	}
 
-    private void GuardGroupShifts(ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts)
-    {
-        if (customizeWorkshopGroupSettingsShifts.Count >= 4)
-        {
-            throw new InvalidDataException("شما نمیتوانید بیشتر از سه ساعت کاری در کارگاه بگذارید");
-        }
-    }
+	private void GuardGroupShifts(ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts)
+	{
+		if (customizeWorkshopGroupSettingsShifts.Count >= 4)
+		{
+			throw new InvalidDataException("شما نمیتوانید بیشتر از سه ساعت کاری در کارگاه بگذارید");
+		}
+	}
 
-    public string GroupName { get; private set; }
-    public double Salary { get; private set; }
-    public long CustomizeWorkshopSettingId { get; private set; }
-    public WorkshopShiftStatus WorkshopShiftStatus { get; private set; }
-    public bool MainGroup { get; private set; }
-    public bool IsShiftChange { get; private set; }
-    public bool IsSettingChange { get; private set; }
-    public IrregularShift IrregularShift { get; set; }
-    public ICollection<CustomizeWorkshopGroupSettingsShift> CustomizeWorkshopGroupSettingsShifts { get; set; }
-    public ICollection<CustomizeWorkshopEmployeeSettings> CustomizeWorkshopEmployeeSettingsCollection { get; set; }
-    public ICollection<CustomizeRotatingShift> CustomizeRotatingShifts { get; set; }
-    public CustomizeWorkshopSettings CustomizeWorkshopSettings { get; set; }
+	public string GroupName { get; private set; }
+	public double Salary { get; private set; }
+	public long CustomizeWorkshopSettingId { get; private set; }
+	public WorkshopShiftStatus WorkshopShiftStatus { get; private set; }
+	public bool MainGroup { get; private set; }
+	public bool IsShiftChange { get; private set; }
+	public bool IsSettingChange { get; private set; }
+	public IrregularShift IrregularShift { get; set; }
+	public ICollection<CustomizeWorkshopGroupSettingsShift> CustomizeWorkshopGroupSettingsShifts { get; set; }
+	public ICollection<CustomizeWorkshopEmployeeSettings> CustomizeWorkshopEmployeeSettingsCollection { get; set; }
+	public ICollection<CustomizeRotatingShift> CustomizeRotatingShifts { get; set; }
+	public CustomizeWorkshopSettings CustomizeWorkshopSettings { get; set; }
 
 
 
-    public CustomizeWorkshopGroupSettings CreateMainGroup(FridayPay fridayPay,
-        OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
-        NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
-        LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
-        LateToWork lateToWork, EarlyExit earlyExit,
-        ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
-        HolidayWork holidayWork, IrregularShift irregularShift, ICollection<CustomizeRotatingShift> rotatingShifts,
-        WorkshopShiftStatus workshopShiftStatus, long customizeWorkshopSettingId, BreakTime breakTime, int leavePermittedDays)
-    {
-        GuardGroupShifts(customizeWorkshopGroupSettingsShifts);
-        GroupName = "اصلی";
-        Salary = 0;
-        FridayPay = fridayPay;
-        OverTimePay = overTimePay;
-        BaseYearsPay = baseYearsPay;
-        BonusesPay = bonusesPay;
-        NightWorkPay = nightWorkPay;
-        MarriedAllowance = marriedAllowance;
-        ShiftPay = shiftPay;
-        FamilyAllowance = familyAllowance;
-        LeavePay = leavePay;
-        InsuranceDeduction = insuranceDeduction;
-        FineAbsenceDeduction = fineAbsenceDeduction;
-        LateToWork = lateToWork;
-        EarlyExit = earlyExit;
-        HolidayWork = holidayWork;
-        LeavePermittedDays = leavePermittedDays;
-        CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
+	public CustomizeWorkshopGroupSettings CreateMainGroup(FridayPay fridayPay,
+		OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
+		NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
+		LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
+		LateToWork lateToWork, EarlyExit earlyExit,
+		ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
+		HolidayWork holidayWork, IrregularShift irregularShift, ICollection<CustomizeRotatingShift> rotatingShifts,
+		WorkshopShiftStatus workshopShiftStatus, long customizeWorkshopSettingId, BreakTime breakTime, int leavePermittedDays)
+	{
+		GuardGroupShifts(customizeWorkshopGroupSettingsShifts);
+		GroupName = "اصلی";
+		Salary = 0;
+		FridayPay = fridayPay;
+		OverTimePay = overTimePay;
+		BaseYearsPay = baseYearsPay;
+		BonusesPay = bonusesPay;
+		NightWorkPay = nightWorkPay;
+		MarriedAllowance = marriedAllowance;
+		ShiftPay = shiftPay;
+		FamilyAllowance = familyAllowance;
+		LeavePay = leavePay;
+		InsuranceDeduction = insuranceDeduction;
+		FineAbsenceDeduction = fineAbsenceDeduction;
+		LateToWork = lateToWork;
+		EarlyExit = earlyExit;
+		HolidayWork = holidayWork;
+		LeavePermittedDays = leavePermittedDays;
+		CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
 
-        CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
+		CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
 
-        IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
-            new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
-            : new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
-        WorkshopShiftStatus = workshopShiftStatus;
-        CustomizeWorkshopSettingId = customizeWorkshopSettingId;
-        MainGroup = true;
-        BreakTime = breakTime;
-        CustomizeWorkshopEmployeeSettingsCollection = [];
+		IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
+			new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
+			: new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
+		WorkshopShiftStatus = workshopShiftStatus;
+		CustomizeWorkshopSettingId = customizeWorkshopSettingId;
+		MainGroup = true;
+		BreakTime = breakTime;
+		CustomizeWorkshopEmployeeSettingsCollection = [];
 
-        return this;
+		return this;
 
-    }
+	}
 
 
 
-    public void EditAndOverwriteOnEmployees(string groupName, double salary, IEnumerable<long> employeeIds,
-        FridayPay fridayPay,
-        OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
-        NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
-        LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
-        LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
-    {
-        GroupName = groupName;
-        Salary = salary;
-        FridayPay = fridayPay;
-        OverTimePay = overTimePay;
-        BaseYearsPay = baseYearsPay;
-        BonusesPay = bonusesPay;
-        NightWorkPay = nightWorkPay;
-        MarriedAllowance = marriedAllowance;
-        ShiftPay = shiftPay;
-        FamilyAllowance = familyAllowance;
-        LeavePay = leavePay;
-        InsuranceDeduction = insuranceDeduction;
-        FineAbsenceDeduction = fineAbsenceDeduction;
-        LateToWork = lateToWork;
-        EarlyExit = earlyExit;
-        HolidayWork = holidayWork;
-        IsSettingChange = isSettingChange;
-        LeavePermittedDays = leavePermittedDays;
+	public void EditAndOverwriteOnEmployees(string groupName, double salary, IEnumerable<long> employeeIds,
+		FridayPay fridayPay,
+		OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
+		NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
+		LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
+		LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
+	{
+		GroupName = groupName;
+		Salary = salary;
+		FridayPay = fridayPay;
+		OverTimePay = overTimePay;
+		BaseYearsPay = baseYearsPay;
+		BonusesPay = bonusesPay;
+		NightWorkPay = nightWorkPay;
+		MarriedAllowance = marriedAllowance;
+		ShiftPay = shiftPay;
+		FamilyAllowance = familyAllowance;
+		LeavePay = leavePay;
+		InsuranceDeduction = insuranceDeduction;
+		FineAbsenceDeduction = fineAbsenceDeduction;
+		LateToWork = lateToWork;
+		EarlyExit = earlyExit;
+		HolidayWork = holidayWork;
+		IsSettingChange = isSettingChange;
+		LeavePermittedDays = leavePermittedDays;
 
 
-        var employeeSettingsShift = CustomizeWorkshopGroupSettingsShifts
-            .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
+		var employeeSettingsShift = CustomizeWorkshopGroupSettingsShifts
+			.Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
 
-        var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
-        foreach (var item in permittedToOverWrite)
-        {
-            item.EditEmployees(Salary, FridayPay, OverTimePay, BaseYearsPay, BonusesPay
-                , NightWorkPay, MarriedAllowance, ShiftPay, FamilyAllowance, LeavePay, InsuranceDeduction, FineAbsenceDeduction,
-                LateToWork, EarlyExit, HolidayWork, IrregularShift, false, leavePermittedDays);
-        }
-    }
-    public void EditAndOverwriteOnAllEmployees(string groupName, double salary,
-        FridayPay fridayPay,
-        OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
-        NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
-        LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
-        LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
-    {
-        SetValueObjects(fridayPay, overTimePay, baseYearsPay, bonusesPay
-            , nightWorkPay, marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction,
-            lateToWork, earlyExit);
-        GroupName = groupName;
-        Salary = salary;
-        HolidayWork = holidayWork;
-        IsSettingChange = isSettingChange;
-        LeavePermittedDays = leavePermittedDays;
+		var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
+		foreach (var item in permittedToOverWrite)
+		{
+			item.EditEmployees(Salary, FridayPay, OverTimePay, BaseYearsPay, BonusesPay
+				, NightWorkPay, MarriedAllowance, ShiftPay, FamilyAllowance, LeavePay, InsuranceDeduction, FineAbsenceDeduction,
+				LateToWork, EarlyExit, HolidayWork, IrregularShift, false, leavePermittedDays);
+		}
+	}
+	public void EditAndOverwriteOnAllEmployees(string groupName, double salary,
+		FridayPay fridayPay,
+		OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
+		NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
+		LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
+		LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
+	{
+		SetValueObjects(fridayPay, overTimePay, baseYearsPay, bonusesPay
+			, nightWorkPay, marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction,
+			lateToWork, earlyExit);
+		GroupName = groupName;
+		Salary = salary;
+		HolidayWork = holidayWork;
+		IsSettingChange = isSettingChange;
+		LeavePermittedDays = leavePermittedDays;
 
 
-        var employeeSettingsShift = CustomizeWorkshopGroupSettingsShifts
-            .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
+		var employeeSettingsShift = CustomizeWorkshopGroupSettingsShifts
+			.Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
 
-        foreach (var item in CustomizeWorkshopEmployeeSettingsCollection)
-        {
-            item.EditEmployees(Salary, FridayPay, OverTimePay, BaseYearsPay, BonusesPay
-                , NightWorkPay, MarriedAllowance, ShiftPay, FamilyAllowance, LeavePay, InsuranceDeduction, FineAbsenceDeduction,
-                LateToWork, EarlyExit, HolidayWork, IrregularShift, false, leavePermittedDays);
-        }
-    }
+		foreach (var item in CustomizeWorkshopEmployeeSettingsCollection)
+		{
+			item.EditEmployees(Salary, FridayPay, OverTimePay, BaseYearsPay, BonusesPay
+				, NightWorkPay, MarriedAllowance, ShiftPay, FamilyAllowance, LeavePay, InsuranceDeduction, FineAbsenceDeduction,
+				LateToWork, EarlyExit, HolidayWork, IrregularShift, false, leavePermittedDays);
+		}
+	}
 
-    public void RemoveEmployeeFromGroup(long employeeId)
-    {
-        var currentItem = CustomizeWorkshopEmployeeSettingsCollection.FirstOrDefault(x => x.EmployeeId == employeeId);
-        if (currentItem != null)
-            CustomizeWorkshopEmployeeSettingsCollection.Remove(currentItem);
-    }
+	public void RemoveEmployeeFromGroup(long employeeId)
+	{
+		var currentItem = CustomizeWorkshopEmployeeSettingsCollection.FirstOrDefault(x => x.EmployeeId == employeeId);
+		if (currentItem != null)
+			CustomizeWorkshopEmployeeSettingsCollection.Remove(currentItem);
+	}
 
-    public void EditSimpleAndOverwriteOnEmployee(string groupName, IEnumerable<long> employeeIds,
-        ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts, WorkshopShiftStatus workshopShiftStatus,
-        IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange, HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts, List<WeeklyOffDay> weeklyOffDays)
-    {
-        GroupName = groupName;
-        CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
-        WorkshopShiftStatus = workshopShiftStatus;
+	public void EditSimpleAndOverwriteOnEmployee(string groupName, IEnumerable<long> employeeIds,
+		ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts, WorkshopShiftStatus workshopShiftStatus,
+		IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange, HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts, List<WeeklyOffDay> weeklyOffDays)
+	{
+		GroupName = groupName;
+		CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
+		WorkshopShiftStatus = workshopShiftStatus;
 
-        IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
-            new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
-            : new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
-        CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
+		IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
+			new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
+			: new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
+		CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
 
 
-        BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
-        IsShiftChange = isShiftChange;
+		BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
+		IsShiftChange = isShiftChange;
 
-        HolidayWork = holidayWork;
+		HolidayWork = holidayWork;
 
-        WeeklyOffDays = weeklyOffDays;
+		WeeklyOffDays = weeklyOffDays;
 
-        //var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
-        // .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
-        if (isShiftChange)
-        {
+		//var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
+		// .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
+		if (isShiftChange)
+		{
 
-        }
+		}
 
-        var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
+		var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
 
-        foreach (var item in permittedToOverWrite)
-        {
-            var newRotatingShifts = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime))
-                .ToList();
-            item.SimpleEdit(customizeWorkshopGroupSettingsShifts
-                .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList(),
-                IrregularShift, WorkshopShiftStatus, BreakTime, false, HolidayWork, newRotatingShifts,WeeklyOffDays.ToList());
-        }
+		foreach (var item in permittedToOverWrite)
+		{
+			var employeeWeeklyOffDays = WeeklyOffDays.Select(x => new WeeklyOffDay(x.DayOfWeek)).ToList();
+			var newRotatingShifts = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime))
+				.ToList();
+			item.SimpleEdit(customizeWorkshopGroupSettingsShifts
+				.Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList(),
+				IrregularShift, WorkshopShiftStatus, BreakTime, false, HolidayWork, newRotatingShifts, employeeWeeklyOffDays);
+		}
 
-    }
+	}
 
-    public void EditSimpleAndOverwriteOnAllEmployees(string groupName,
-        ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
-        WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange, 
-        HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts ,List<WeeklyOffDay> weeklyOffDays)
-    {
-        GroupName = groupName;
-        CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
-        WorkshopShiftStatus = workshopShiftStatus;
+	public void EditSimpleAndOverwriteOnAllEmployees(string groupName,
+		ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
+		WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange,
+		HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts, List<WeeklyOffDay> weeklyOffDays)
+	{
+		GroupName = groupName;
+		CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
+		WorkshopShiftStatus = workshopShiftStatus;
 
-        IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
-            new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
-            : new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
+		IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
+			new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
+			: new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
 
-        CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
+		CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
 
 
-        BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
-        IsShiftChange = isShiftChange;
-        HolidayWork = holidayWork;
+		BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
+		IsShiftChange = isShiftChange;
+		HolidayWork = holidayWork;
 
-        WeeklyOffDays = weeklyOffDays;
-        //var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
-        // .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
-
-        foreach (var item in CustomizeWorkshopEmployeeSettingsCollection)
-        {
-            var newRotatingShifts = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime))
-                .ToList();
-            item.SimpleEdit(customizeWorkshopGroupSettingsShifts
-                .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList(),
-                irregularShift, workshopShiftStatus, breakTime, false, HolidayWork, newRotatingShifts,WeeklyOffDays.ToList());
-        }
-
-    }
-
-    public void AddEmployeeSettingToGroupWithGroupData(long employeeId, long workshopId)
-    {
-        var shifts = CustomizeWorkshopGroupSettingsShifts
-            .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
-
-        FridayPay fridayPay = new(FridayPay.FridayPayType, FridayPay.Value);
-        OverTimePay overTimePay = new(OverTimePay.OverTimePayType, OverTimePay.Value);
-        BaseYearsPay baseYearsPay = new(BaseYearsPay.BaseYearsPayType, BaseYearsPay.Value, BaseYearsPay.PaymentType);
-        BonusesPay bonusesPay = new(BonusesPay.BonusesPayType, BonusesPay.Value, BonusesPay.PaymentType);
-        NightWorkPay nightWorkPay = new(NightWorkPay.NightWorkingType, NightWorkPay.Value);
-        MarriedAllowance marriedAllowance = new(MarriedAllowance.MarriedAllowanceType, MarriedAllowance.Value);
-        ShiftPay shiftPay = new(ShiftType.None, ShiftPayType.None, 0);
-        FamilyAllowance familyAllowance = new(FamilyAllowance.FamilyAllowanceType, FamilyAllowance.Value);
-        LeavePay leavePay = new(LeavePay.LeavePayType, LeavePay.Value);
-        InsuranceDeduction insuranceDeduction = new(InsuranceDeduction.InsuranceDeductionType, InsuranceDeduction.Value);
-        FineAbsenceDeduction fineAbsenceDeduction = new(
-            FineAbsenceDeduction.FineAbsenceDeductionType, FineAbsenceDeduction.Value,
-            FineAbsenceDeduction.FineAbsenceDayOfWeekCollection
-                .Select(x => new FineAbsenceDayOfWeek(x.DayOfWeek)).ToList()
-        );
-        LateToWork lateToWork = new(
-            LateToWork.LateToWorkType,
-            LateToWork.LateToWorkTimeFines.Select(x => new LateToWorkTimeFine(x.Minute, x.FineMoney))
-                .ToList(), LateToWork.Value
-        );
-        EarlyExit earlyExit = new(EarlyExit.EarlyExitType,
-            EarlyExit.EarlyExitTimeFines.Select(x => new EarlyExitTimeFine(x.Minute, x.FineMoney))
-                .ToList(), EarlyExit.Value);
-        IrregularShift irregularShift = new(IrregularShift.StartTime, IrregularShift.EndTime,
-            IrregularShift.WorkshopIrregularShifts);
-        BreakTime breakTime = new(BreakTime.HasBreakTimeValue, BreakTime.BreakTimeValue);
-        List<WeeklyOffDay> weeklyOffDays = WeeklyOffDays.Select(x => new WeeklyOffDay(x.DayOfWeek)).ToList();
-
-        var rotatingShift = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime)).ToList();
-
-        var customizeWorkshopEmployeeSettings = new CustomizeWorkshopEmployeeSettings(fridayPay, overTimePay, baseYearsPay, bonusesPay, nightWorkPay,
-            marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
-            earlyExit, employeeId, workshopId, Salary, id, shifts, HolidayWork, irregularShift,
-            WorkshopShiftStatus, breakTime, LeavePermittedDays, rotatingShift, weeklyOffDays);
-
-        CustomizeWorkshopEmployeeSettingsCollection.Add(customizeWorkshopEmployeeSettings);
-    }
+		WeeklyOffDays = weeklyOffDays;
+		//var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
+		// .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
 
 
-    private void SetValueObjects(FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay,
-        BonusesPay bonusesPay
-        , NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
-        FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
-        FineAbsenceDeduction fineAbsenceDeduction,
-        LateToWork lateToWork, EarlyExit earlyExit)
-    {
-        FridayPay = new(fridayPay.FridayPayType, fridayPay.Value);
-        OverTimePay = new(overTimePay.OverTimePayType, overTimePay.Value);
-        BaseYearsPay = new(baseYearsPay.BaseYearsPayType, baseYearsPay.Value, baseYearsPay.PaymentType);
-        BonusesPay = new(bonusesPay.BonusesPayType, bonusesPay.Value, bonusesPay.PaymentType);
-        NightWorkPay = new(nightWorkPay.NightWorkingType, nightWorkPay.Value);
-        MarriedAllowance = new(marriedAllowance.MarriedAllowanceType, marriedAllowance.Value);
-        ShiftPay = new(shiftPay.ShiftType, shiftPay.ShiftPayType, shiftPay.Value);
-        FamilyAllowance = new(familyAllowance.FamilyAllowanceType, familyAllowance.Value);
-        LeavePay = new(leavePay.LeavePayType, leavePay.Value);
-        InsuranceDeduction = new(insuranceDeduction.InsuranceDeductionType, insuranceDeduction.Value);
-        FineAbsenceDeduction = new(
-            fineAbsenceDeduction.FineAbsenceDeductionType, fineAbsenceDeduction.Value,
-            fineAbsenceDeduction.FineAbsenceDayOfWeekCollection
-                .Select(x => new FineAbsenceDayOfWeek(x.DayOfWeek)).ToList()
-        );
-        LateToWork = new(
-            lateToWork.LateToWorkType,
-            lateToWork.LateToWorkTimeFines.Select(x => new LateToWorkTimeFine(x.Minute, x.FineMoney))
-                .ToList(), lateToWork.Value
-        );
-        EarlyExit = new(earlyExit.EarlyExitType,
-            earlyExit.EarlyExitTimeFines.Select(x => new EarlyExitTimeFine(x.Minute, x.FineMoney))
-                .ToList(), earlyExit.Value);
-    }
+		foreach (var item in CustomizeWorkshopEmployeeSettingsCollection)
+		{
+			var employeeWeeklyOffDays = WeeklyOffDays.Select(x => new WeeklyOffDay(x.DayOfWeek)).ToList();
+			var newRotatingShifts = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime))
+				.ToList();
+			item.SimpleEdit(customizeWorkshopGroupSettingsShifts
+				.Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList(),
+				irregularShift, workshopShiftStatus, breakTime, false, HolidayWork, newRotatingShifts, employeeWeeklyOffDays);
+		}
+
+	}
+
+	public void AddEmployeeSettingToGroupWithGroupData(long employeeId, long workshopId)
+	{
+		var shifts = CustomizeWorkshopGroupSettingsShifts
+			.Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
+
+		FridayPay fridayPay = new(FridayPay.FridayPayType, FridayPay.Value);
+		OverTimePay overTimePay = new(OverTimePay.OverTimePayType, OverTimePay.Value);
+		BaseYearsPay baseYearsPay = new(BaseYearsPay.BaseYearsPayType, BaseYearsPay.Value, BaseYearsPay.PaymentType);
+		BonusesPay bonusesPay = new(BonusesPay.BonusesPayType, BonusesPay.Value, BonusesPay.PaymentType);
+		NightWorkPay nightWorkPay = new(NightWorkPay.NightWorkingType, NightWorkPay.Value);
+		MarriedAllowance marriedAllowance = new(MarriedAllowance.MarriedAllowanceType, MarriedAllowance.Value);
+		ShiftPay shiftPay = new(ShiftType.None, ShiftPayType.None, 0);
+		FamilyAllowance familyAllowance = new(FamilyAllowance.FamilyAllowanceType, FamilyAllowance.Value);
+		LeavePay leavePay = new(LeavePay.LeavePayType, LeavePay.Value);
+		InsuranceDeduction insuranceDeduction = new(InsuranceDeduction.InsuranceDeductionType, InsuranceDeduction.Value);
+		FineAbsenceDeduction fineAbsenceDeduction = new(
+			FineAbsenceDeduction.FineAbsenceDeductionType, FineAbsenceDeduction.Value,
+			FineAbsenceDeduction.FineAbsenceDayOfWeekCollection
+				.Select(x => new FineAbsenceDayOfWeek(x.DayOfWeek)).ToList()
+		);
+		LateToWork lateToWork = new(
+			LateToWork.LateToWorkType,
+			LateToWork.LateToWorkTimeFines.Select(x => new LateToWorkTimeFine(x.Minute, x.FineMoney))
+				.ToList(), LateToWork.Value
+		);
+		EarlyExit earlyExit = new(EarlyExit.EarlyExitType,
+			EarlyExit.EarlyExitTimeFines.Select(x => new EarlyExitTimeFine(x.Minute, x.FineMoney))
+				.ToList(), EarlyExit.Value);
+		IrregularShift irregularShift = new(IrregularShift.StartTime, IrregularShift.EndTime,
+			IrregularShift.WorkshopIrregularShifts);
+		BreakTime breakTime = new(BreakTime.HasBreakTimeValue, BreakTime.BreakTimeValue);
+		List<WeeklyOffDay> weeklyOffDays = WeeklyOffDays.Select(x => new WeeklyOffDay(x.DayOfWeek)).ToList();
+
+		var rotatingShift = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime)).ToList();
+
+		var customizeWorkshopEmployeeSettings = new CustomizeWorkshopEmployeeSettings(fridayPay, overTimePay, baseYearsPay, bonusesPay, nightWorkPay,
+			marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
+			earlyExit, employeeId, workshopId, Salary, id, shifts, HolidayWork, irregularShift,
+			WorkshopShiftStatus, breakTime, LeavePermittedDays, rotatingShift, weeklyOffDays);
+
+		CustomizeWorkshopEmployeeSettingsCollection.Add(customizeWorkshopEmployeeSettings);
+	}
 
 
-    //public void OverWriteEmployeesShiftAndSalary(IEnumerable<long> ids,ICollection<RollCallWorkshopEmployeeSettingsShift> employeeSettingsShifts,double salary)
-    //{
-    //    var  permittedToOverWrite= RollCallWorkshopEmployeeSettingsCollection.Where(x => ids.Contains(x.id));
-    //    foreach (var item in permittedToOverWrite)
-    //    {
-    //        item.OverWriteSalaryAndShift(employeeSettingsShifts, salary);
-    //    }
-    //}
+	private void SetValueObjects(FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay,
+		BonusesPay bonusesPay
+		, NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
+		FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
+		FineAbsenceDeduction fineAbsenceDeduction,
+		LateToWork lateToWork, EarlyExit earlyExit)
+	{
+		FridayPay = new(fridayPay.FridayPayType, fridayPay.Value);
+		OverTimePay = new(overTimePay.OverTimePayType, overTimePay.Value);
+		BaseYearsPay = new(baseYearsPay.BaseYearsPayType, baseYearsPay.Value, baseYearsPay.PaymentType);
+		BonusesPay = new(bonusesPay.BonusesPayType, bonusesPay.Value, bonusesPay.PaymentType);
+		NightWorkPay = new(nightWorkPay.NightWorkingType, nightWorkPay.Value);
+		MarriedAllowance = new(marriedAllowance.MarriedAllowanceType, marriedAllowance.Value);
+		ShiftPay = new(shiftPay.ShiftType, shiftPay.ShiftPayType, shiftPay.Value);
+		FamilyAllowance = new(familyAllowance.FamilyAllowanceType, familyAllowance.Value);
+		LeavePay = new(leavePay.LeavePayType, leavePay.Value);
+		InsuranceDeduction = new(insuranceDeduction.InsuranceDeductionType, insuranceDeduction.Value);
+		FineAbsenceDeduction = new(
+			fineAbsenceDeduction.FineAbsenceDeductionType, fineAbsenceDeduction.Value,
+			fineAbsenceDeduction.FineAbsenceDayOfWeekCollection
+				.Select(x => new FineAbsenceDayOfWeek(x.DayOfWeek)).ToList()
+		);
+		LateToWork = new(
+			lateToWork.LateToWorkType,
+			lateToWork.LateToWorkTimeFines.Select(x => new LateToWorkTimeFine(x.Minute, x.FineMoney))
+				.ToList(), lateToWork.Value
+		);
+		EarlyExit = new(earlyExit.EarlyExitType,
+			earlyExit.EarlyExitTimeFines.Select(x => new EarlyExitTimeFine(x.Minute, x.FineMoney))
+				.ToList(), earlyExit.Value);
+	}
+
+
+	//public void OverWriteEmployeesShiftAndSalary(IEnumerable<long> ids,ICollection<RollCallWorkshopEmployeeSettingsShift> employeeSettingsShifts,double salary)
+	//{
+	//    var  permittedToOverWrite= RollCallWorkshopEmployeeSettingsCollection.Where(x => ids.Contains(x.id));
+	//    foreach (var item in permittedToOverWrite)
+	//    {
+	//        item.OverWriteSalaryAndShift(employeeSettingsShifts, salary);
+	//    }
+	//}
 
 
 }
diff --git a/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CustomizeWorkshopGroupSettingsViewModel.cs b/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CustomizeWorkshopGroupSettingsViewModel.cs
index a19afa21..82f02021 100644
--- a/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CustomizeWorkshopGroupSettingsViewModel.cs
+++ b/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CustomizeWorkshopGroupSettingsViewModel.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using _0_Framework.Domain.CustomizeCheckoutShared.Base;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
 
@@ -18,4 +20,5 @@ public class CustomizeWorkshopGroupSettingsViewModel
     public BreakTime BreakTime { get; set; }
     public FridayWork FridayWork { get; set; }
     public HolidayWork HolidayWork { get; set; }
+    public List<DayOfWeek> OffDayOfWeeks { get; set; }
 }
\ No newline at end of file
diff --git a/CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs b/CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs
index b9fe479d..ed28d05e 100644
--- a/CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs
+++ b/CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs
@@ -348,7 +348,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 			workshopSettings.BaseYearsPay, workshopSettings.BonusesPay, workshopSettings.NightWorkPay, workshopSettings.MarriedAllowance,
 			workshopSettings.ShiftPay, workshopSettings.FamilyAllowance, workshopSettings.LeavePay, workshopSettings.InsuranceDeduction, workshopSettings.FineAbsenceDeduction,
 			workshopSettings.LateToWork, workshopSettings.EarlyExit,
-			command.HolidayWork, breakTime, command.WorkshopShiftStatus, command.IrregularShift, command.LeavePermittedDays, customizeRotatingShifts, workshopSettings.WeeklyOffDays);
+			command.HolidayWork, breakTime, command.WorkshopShiftStatus, command.IrregularShift, command.LeavePermittedDays, customizeRotatingShifts, weeklyOffDays);
 
 		_customizeWorkshopGroupSettingsRepository.Create(entity);
 
@@ -387,7 +387,9 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 		var isChanged = false;
 		#region validation
 
-		var commandOffDayHashSet = command.WeeklyOffDays.ToHashSet();
+		//var commandOffDayHashSet = command.WeeklyOffDays.ToHashSet();
+		var commandOffDayHashSet = command.WeeklyOffDays?.ToHashSet() ?? [];
+
 		var groupOffDayHashSet = customizeWorkshopGroupSettings.WeeklyOffDays.Select(x => x.DayOfWeek).ToHashSet();
 
 		if (command.WorkshopShiftStatus == WorkshopShiftStatus.Regular)
@@ -554,13 +556,13 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 		var breakTime = new BreakTime(command.BreakTime.HasBreakTimeValue, command.BreakTime.BreakTimeValue);
 
 
-
+        var weeklyOffDays = command.WeeklyOffDays?.Select(x => new WeeklyOffDay(x)).ToList() ?? [];
 
 		var entity = new CustomizeWorkshopEmployeeSettings(customizeWorkshopGroupSettings.FridayPay, customizeWorkshopGroupSettings.OverTimePay,
 			customizeWorkshopGroupSettings.BaseYearsPay, customizeWorkshopGroupSettings.BonusesPay, customizeWorkshopGroupSettings.NightWorkPay, customizeWorkshopGroupSettings.MarriedAllowance,
 			customizeWorkshopGroupSettings.ShiftPay, customizeWorkshopGroupSettings.FamilyAllowance, customizeWorkshopGroupSettings.LeavePay, customizeWorkshopGroupSettings.InsuranceDeduction, customizeWorkshopGroupSettings.FineAbsenceDeduction,
 			customizeWorkshopGroupSettings.LateToWork, customizeWorkshopGroupSettings.EarlyExit, command.EmployeeIds.First(), command.WorkshopId, customizeWorkshopGroupSettings.Salary, command.GroupId,
-			 shiftCollection, command.HolidayWork, command.IrregularShift, command.WorkshopShiftStatus, breakTime, command.LeavePermittedDays, rotatingShift, customizeWorkshopGroupSettings.WeeklyOffDays);
+			 shiftCollection, command.HolidayWork, command.IrregularShift, command.WorkshopShiftStatus, breakTime, command.LeavePermittedDays, rotatingShift, weeklyOffDays);
 
 		_customizeWorkshopEmployeeSettingsRepository.Create(entity);
 
@@ -671,7 +673,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 
 		using var transActionScope = new TransactionScope();
 		entity.ChangeWorkshopShifts(shiftCollection, workshopShiftStatus, holidayWork, offDays);
-
+			
 
 		//op = ChangeAllGroupsShiftsWithEmployees(entity, replaceChangedGroups);
 		//if (!op.IsSuccedded)
@@ -718,7 +720,9 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 		ICollection<CustomizeRotatingShift> rotatingShift = [];
 		bool isChanged;
 
-		var commandOffDayHashSet = command.OffDayOfWeeks.ToHashSet();
+		//var commandOffDayHashSet = command.OffDayOfWeeks.ToHashSet();
+		var commandOffDayHashSet = command.OffDayOfWeeks?.ToHashSet() ?? [];
+
 		var workshopOffDayHashSet = workshopSettings.WeeklyOffDays.Select(x => x.DayOfWeek).ToHashSet();
 
 		if (command.WorkshopShiftStatus == WorkshopShiftStatus.Regular)
@@ -866,7 +870,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 		ICollection<CustomizeRotatingShift> rotatingShift = [];
 		bool isChanged = false;
 
-		var commandOffDayHashSet = command.WeeklyOffDays.ToHashSet();
+		var commandOffDayHashSet = command.WeeklyOffDays?.ToHashSet()??[];
 		var groupOffDayHashSet = groupSettings.WeeklyOffDays.Select(x => x.DayOfWeek).ToHashSet();
 
 		if (command.WorkshopShiftStatus == WorkshopShiftStatus.Regular)
@@ -1436,7 +1440,8 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 
 		double salary = command.Salary.MoneyToDouble();
 
-		var commandOffDayHashSet = command.WeeklyOffDays.ToHashSet();
+		var commandOffDayHashSet = command.WeeklyOffDays?.ToHashSet()??[];
+
 		var entityOffDayHashSet = entity.WeeklyOffDays.Select(x => x.DayOfWeek).ToHashSet();
 
 		bool isChanged;
diff --git a/CompanyManagment.EFCore/Repository/CustomizeWorkshopSettingsRepository.cs b/CompanyManagment.EFCore/Repository/CustomizeWorkshopSettingsRepository.cs
index 51d02eb7..d5e612fd 100644
--- a/CompanyManagment.EFCore/Repository/CustomizeWorkshopSettingsRepository.cs
+++ b/CompanyManagment.EFCore/Repository/CustomizeWorkshopSettingsRepository.cs
@@ -318,7 +318,8 @@ public class CustomizeWorkshopSettingsRepository(CompanyContext companyContext,
                         {
                             EndTime = r.EndTime.ToString("HH:mm"),
                             StartTime = r.StartTime.ToString("HH:mm")
-                        }).ToList()
+                        }).ToList(),
+                        OffDayOfWeeks = g.WeeklyOffDays.Select(x=>x.DayOfWeek).ToList()
 
                     }).ToList(),
 
diff --git a/CompanyManagment.EFCore/Repository/RollCallRepository.cs b/CompanyManagment.EFCore/Repository/RollCallRepository.cs
index 0e07d3bb..2f83995b 100644
--- a/CompanyManagment.EFCore/Repository/RollCallRepository.cs
+++ b/CompanyManagment.EFCore/Repository/RollCallRepository.cs
@@ -969,7 +969,7 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, IRollCallRepos
         var activatedEmployeesList = activeEmployeesQuery.ToList();
         var leavesList = leavesQuery.ToList();
 
-        //start search year may be in another year
+        //start of search year may be different to end of search year
         var holidays1 = _holidayItemApplication.Search(new HolidayItemSearchModel()
         {
             HolidayYear = startSearch.ToFarsiYear()
@@ -984,33 +984,46 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, IRollCallRepos
         List<RollCallsByDateViewModel> result = new();
         foreach (var day in days)
         {
-
-            List<RollCallEmployee> activatedEmployeesListInDay = new();
             bool isHoliday = totalHolidays.Any(x => x.HolidaydateGr == day);
 
-            //in working days everyone should be present
-            if (day.DayOfWeek != DayOfWeek.Friday && !isHoliday)
+            List<RollCallEmployee> activatedEmployeesListInDay = new();
+
+            activatedEmployeesListInDay = activatedEmployeesList
+                    .Join(employeeSettingsList.Where(x => x.WeeklyOffDays == null || !x.WeeklyOffDays.Select(w => w.DayOfWeek).Contains(day.DayOfWeek))
+                        , x => x.EmployeeId, y => y.EmployeeId,
+                        (x, _) => x).ToList();
+
+            if (isHoliday)
             {
-                activatedEmployeesListInDay = activatedEmployeesList;
+                activatedEmployeesListInDay = activatedEmployeesListInDay
+                    .Join(employeeSettingsList.Where(x => x.WeeklyOffDays == null || x.HolidayWork != HolidayWork.Default)
+                        , x => x.EmployeeId, y => y.EmployeeId,
+                        (x, _) => x).ToList();
             }
 
-            //in fridays, friday workers should be present
-            else if (day.DayOfWeek == DayOfWeek.Friday)
-            {
-                activatedEmployeesListInDay = activatedEmployeesList
-                    .Join(employeeSettingsList.Where(x => x.FridayWork != FridayWork.Default)
-                        , x => x.EmployeeId, y => y.EmployeeId,
-                        (x, y) => x).ToList();
-            }
+            ////in working days everyone should be present
+            //if (day.DayOfWeek != DayOfWeek.Friday && isHoliday == false)
+            //{
+            //    activatedEmployeesListInDay = activatedEmployeesList;
+            //}
 
-            //in holidays holiday worksers should be present
-            else
-            {
-                activatedEmployeesListInDay = activatedEmployeesList
-                    .Join(employeeSettingsList.Where(x => x.HolidayWork != HolidayWork.Default)
-                        , x => x.EmployeeId, y => y.EmployeeId,
-                        (x, y) => x).ToList();
-            }
+            ////in fridays, friday workers should be present
+            //else if (day.DayOfWeek == DayOfWeek.Friday)
+            //{
+            //    activatedEmployeesListInDay = activatedEmployeesList
+            //        .Join(employeeSettingsList.Where(x => x.FridayWork != FridayWork.Default)
+            //            , x => x.EmployeeId, y => y.EmployeeId,
+            //            (x, y) => x).ToList();
+            //}
+
+            ////in holidays holiday workers should be present
+            //else
+            //{
+            //    activatedEmployeesListInDay = activatedEmployeesList
+            //        .Join(employeeSettingsList.Where(x => x.HolidayWork != HolidayWork.Default)
+            //            , x => x.EmployeeId, y => y.EmployeeId,
+            //            (x, y) => x).ToList();
+            //}
             var item = new RollCallsByDateViewModel()
             {
                 DateGr = day,
@@ -1037,6 +1050,7 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, IRollCallRepos
     }
 
 
+
     //گزارش آنلاین حضور غیاب کارگاه
     public CurrentDayRollCall GetWorkshopCurrentDayRollCalls(long workshopId)
     {
diff --git a/ServiceHost/Areas/Client/Pages/Company/Employees/_Partials/WorkshopSettingGrouping.cshtml b/ServiceHost/Areas/Client/Pages/Company/Employees/_Partials/WorkshopSettingGrouping.cshtml
index c9e9a871..6ff38ac0 100644
--- a/ServiceHost/Areas/Client/Pages/Company/Employees/_Partials/WorkshopSettingGrouping.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Company/Employees/_Partials/WorkshopSettingGrouping.cshtml
@@ -173,7 +173,7 @@
 
 
 <div class="container my-3" id="footer-section">
-	<div class="row breack-time">
+	<div class="row breack-time mb-2">
 		<div>
 			<div class="d-flex align-items-center my-1 breakTimeDiv">
 				<input type="checkbox" id="BreakTimeFirst" class="form-check-input">
@@ -226,47 +226,109 @@
 		</div>
 	</div>
 
-    <div class="row mt-2">
-        <div class="col-12">
-            <div class="lableCheckBreakTime text-center">وضعیت فعالیت مجموعه در روز های جمعه و تعطیلات رسمی</div>
-            <div class="row extraOptionBorder">
+	<div class="day-off-parent">
+		<div class="day-off-title mb-2">
+			روزهای تعطیل هفته
+		</div>
 
-                <div class="col-6 p-0">
-                    <div class="group-container">
-                        @* <div class="lableCheckBreakTime">وضعیت فعالیت مجموعه در روز های جمعه</div> *@
-                        <div class="d-flex form-group my-1 group">
-                            <input type="radio" name="FridayWork1" id="Friday1" class="form-check-input Main-Radio" value="@((int)(FridayWork.Default))" />
-                            <label for="Friday1" class="lableCheckBreakTime">پرسنل در روزهای جمعه کار نمی‌کند.</label>
-                        </div>
-                        <div class="d-flex form-group my-1 group">
-                            <input type="radio" name="FridayWork1" id="Friday2" class="form-check-input Main-Radio" value="@((int)(FridayWork.WorkInFriday))" />
-                            <label for="Friday2" class="lableCheckBreakTime">پرسنل در روزهای جمعه کار می‌کند.</label>
-                        </div>
-                    </div>
+		<div class="day-off-button-container mb-3">
+			<button type="button" name="Saturday" value="@((int)(DayOfWeek.Saturday))"
+					class="day-off-button text-center day-off-button__active  ">
+				شنبه
+			</button>
 
-                </div>
+			<button type="button" name="Sunday" value="@((int)(DayOfWeek.Sunday))"
+					class="day-off-button text-center  ">
+				یکشنبه
+			</button>
+
+			<button type="button" name="Monday" value="@((int)(DayOfWeek.Monday))"
+					class="day-off-button text-center  ">
+				دوشنبه
+			</button>
+
+			<button type="button" name="Tuesday" value="@((int)(DayOfWeek.Tuesday))"
+					class="day-off-button text-center ">
+				سه‌شنبه
+			</button>
+
+			<button type="button" name="Wednesday" value="@((int)(DayOfWeek.Wednesday))"
+					class="day-off-button text-center  ">
+				چهارشنبه
+			</button>
+
+			<button type="button" name="Thursday" value="@((int)(DayOfWeek.Thursday))"
+					class="day-off-button text-center  ">
+				پنج‌شنبه
+			</button>
+
+			<button type="button" name="Friday" value="@((int)(DayOfWeek.Friday))"
+					class="day-off-button text-center ">
+				جمعه
+			</button>
 
 
-                <div class="col-6 p-0">
-                    <div class="group-container">
-                        @* <div class="lableCheckBreakTime">وضعیت فعالیت مجموعه در روز های تعطیلات رسمی</div> *@
-                        <div class="d-flex form-group my-1 group">
-                            <input type="radio" name="HolidayWork1" id="HolidayWork1" class="form-check-input Main-Radio" value="@HolidayWork.Default" />
-                            <label for="HolidayWork1" class="lableCheckBreakTime">پرسنل در ایام تعطیل رسمی کار نمی‌کند.</label>
-                        </div>
-                        <div class="d-flex form-group my-1 group">
-                            <input type="radio" name="HolidayWork1" id="HolidayWork2" class="form-check-input Main-Radio" value="@HolidayWork.WorkInHolidays" />
-                            <label for="HolidayWork2" class="lableCheckBreakTime">پرسنل در ایام تعطیل رسمی کار می‌کند.</label>
-                        </div>
-                    </div>
-                </div>
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.CreateCustomizeEmployeeSettings.WeeklyOffDays" id="SaturdayInput"
+				   value="@((int)(DayOfWeek.Saturday))" />
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.CreateCustomizeEmployeeSettings.WeeklyOffDays" id="SundayInput" value="@((int)(DayOfWeek.Sunday))" />
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.CreateCustomizeEmployeeSettings.WeeklyOffDays" id="MondayInput" value="@((int)(DayOfWeek.Monday))" />
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.CreateCustomizeEmployeeSettings.WeeklyOffDays" id="TuesdayInput" value="@((int)(DayOfWeek.Tuesday))" />
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.CreateCustomizeEmployeeSettings.WeeklyOffDays" id="WednesdayInput"
+			 
+				   value="@((int)(DayOfWeek.Wednesday))" />
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.CreateCustomizeEmployeeSettings.WeeklyOffDays" id="ThursdayInput"
+				   value="@((int)(DayOfWeek.Thursday))" />
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.CreateCustomizeEmployeeSettings.WeeklyOffDays" id="FridayInput" value="@((int)(DayOfWeek.Friday))" />
 
 
 
-				<input type="hidden" id="GroupId" name="Command.CreateCustomizeEmployeeSettings.GroupId" value="" />
-            </div>
-        </div>
-    </div>
+		</div>
+		<div class="day-off-title mb-2">
+			وضعیت فعالیت مجموعه در روزهای جمعه و تعطیلات رسمی
+		</div>
+		<div class="day-off-status-person mb-3">
+			<div class="d-flex align-items-center gap-3">
+				<span class="day-off-status-person__item">وضعیت پرسنل در روز های تعطیل رسمی : </span>
+
+				<div class="d-flex align-items-center gap-1 day-off-status-person__item">
+					<input type="radio" class="custom-checkbox" name="Command.CreateCustomizeEmployeeSettings.HolidayWork" id="OffDays2"
+					 
+						   value="@((int)(HolidayWork.WorkInHolidays))" />
+					<label class="text-nowrap day-off-status-person__item--label" for="OffDays2">
+						اشتغال دارد
+					</label>
+				</div>
+
+				<div class="d-flex align-items-center gap-1 day-off-status-person__item">
+					<input type="radio" name="Command.CreateCustomizeEmployeeSettings.HolidayWork" id="OffDays1" class="custom-checkbox"
+					 
+						   value="@((int)(HolidayWork.Default))" />
+					<label for="OffDays1" class="text-nowrap day-off-status-person__item--label">
+						اشتغال ندارد
+					</label>
+				</div>
+
+			</div>
+			<div>
+			</div>
+
+		</div>
+
+	</div>
+
 </div>
 
 <script src="~/assetsclient/pages/employees/js/WorkshopSettingGrouping.js?ver=@clientVersion"></script>
\ No newline at end of file
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCreateGroup.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCreateGroup.cshtml
index c34c2aaa..91d73f8b 100644
--- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCreateGroup.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCreateGroup.cshtml
@@ -221,45 +221,114 @@
 				</div>
 			</div>
 
-			
-			<div class="row mt-2">
-				<div class="col-12">
-					<div class="lableCheckBreakTime text-center">وضعیت فعالیت مجموعه در روز های جمعه و تعطیلات رسمی</div>
-					<div class="row extraOptionBorder">
+			<div class="day-off-parent">
+				<div class="day-off-title mb-2">
+					روزهای تعطیل هفته
+				</div>
 
-						<div class="col-6 p-0">
-							<div class="group-container">
-								@* <div class="lableCheckBreakTime">وضعیت فعالیت مجموعه در روز های جمعه</div> *@
-								@* <div class="d-flex form-group my-1 group">
-									<input type="radio" name="Command.FridayWork" id="Friday1" class="form-check-input Main-Radio" @(Model.FridayWork == FridayWork.Default ? "checked" : "") value="@((int)(FridayWork.Default))"/>
-									<label for="Friday1" class="lableCheckBreakTime">پرسنل در روزهای جمعه کار نمی‌کند.</label>
-								</div>
-								<div class="d-flex form-group my-1 group">
-									<input type="radio" name="Command.FridayWork" id="Friday2" class="form-check-input Main-Radio" @(Model.FridayWork == FridayWork.WorkInFriday ? "checked" : "") value="@((int)(FridayWork.WorkInFriday))"/>
-									<label for="Friday2" class="lableCheckBreakTime">پرسنل در روزهای جمعه کار می‌کند.</label>
-								</div> *@
-							</div>
+				<div class="day-off-button-container mb-3">
+					<button type="button" name="Saturday" value="@((int)(DayOfWeek.Saturday))"
+							class="day-off-button text-center day-off-button__active">
+						شنبه
+					</button>
 
+
+
+					<button type="button" name="Sunday" value="@((int)(DayOfWeek.Sunday))"
+							class="day-off-button text-center day-off-button__active">
+						یکشنبه
+
+					</button>
+
+
+
+					<button type="button" name="Monday" value="@((int)(DayOfWeek.Monday))"
+							class="day-off-button text-center day-off-button__active">
+						دوشنبه
+					</button>
+
+					<button type="button" name="Tuesday" value="@((int)(DayOfWeek.Tuesday))"
+							class="day-off-button text-center day-off-button__active">
+						سه‌شنبه
+					</button>
+
+					<button type="button" name="Wednesday" value="@((int)(DayOfWeek.Wednesday))"
+							class="day-off-button text-center day-off-button__active">
+						چهارشنبه
+					</button>
+
+					<button type="button" name="Thursday" value="@((int)(DayOfWeek.Thursday))"
+							class="day-off-button text-center day-off-button__active">
+						پنج‌شنبه
+					</button>
+
+					<button type="button" name="Friday" value="@((int)(DayOfWeek.Friday))"
+							class="day-off-button text-center day-off-button__diactive">
+						جمعه
+					</button>
+
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input  day-off-button__active"
+						   name="Command.WeeklyOffDays" id="SaturdayInput"
+						   value="@((int)(DayOfWeek.Saturday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input  day-off-button__active"
+						   name="Command.WeeklyOffDays" id="SundayInput" value="@((int)(DayOfWeek.Sunday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input  day-off-button__active"
+						   name="Command.WeeklyOffDays" id="MondayInput" value="@((int)(DayOfWeek.Monday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input  day-off-button__active"
+						   name="Command.WeeklyOffDays" id="TuesdayInput" value="@((int)(DayOfWeek.Tuesday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input  day-off-button__active"
+						   name="Command.WeeklyOffDays" id="WednesdayInput"
+						   value="@((int)(DayOfWeek.Wednesday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input  day-off-button__active"
+						   name="Command.WeeklyOffDays" id="ThursdayInput"
+						   value="@((int)(DayOfWeek.Thursday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input day-off-button__diactive"
+						   name="Command.WeeklyOffDays" id="FridayInput" value="@((int)(DayOfWeek.Friday))" checked="checked" />
+
+
+
+				</div>
+				<div class="day-off-title mb-2">
+					وضعیت فعالیت مجموعه در روزهای جمعه و تعطیلات رسمی
+				</div>
+				<div class="day-off-status-person mb-3">
+					<div class="d-flex align-items-center gap-3">
+						<span class="day-off-status-person__item">وضعیت پرسنل در روز های تعطیل رسمی : </span>
+
+						<div class="d-flex align-items-center gap-1 day-off-status-person__item">
+							<input type="radio" class="custom-checkbox" name="command.HolidayWork" id="OffDays2"
+							@(Model.HolidayWork == HolidayWork.WorkInHolidays ? "checked" : "")
+								   value="@((int)(HolidayWork.WorkInHolidays))" />
+							<label class="text-nowrap day-off-status-person__item--label" for="OffDays2">
+								اشتغال دارد
+							</label>
 						</div>
 
-
-						<div class="col-6 p-0">
-							<div class="group-container">
-								@* <div class="lableCheckBreakTime">وضعیت فعالیت مجموعه در روز های تعطیلات رسمی</div> *@
-								<div class="d-flex form-group my-1 group">
-									<input type="radio" name="Command.HolidayWork" id="OffDays1" class="form-check-input Main-Radio" @(Model.HolidayWork == HolidayWork.Default ? "checked" : "") value="@((int)(HolidayWork.Default))"/>
-									<label for="OffDays1" class="lableCheckBreakTime">پرسنل در ایام تعطیل رسمی کار نمی‌کند.</label>
-								</div>
-								<div class="d-flex form-group my-1 group">
-									<input type="radio" name="Command.HolidayWork" id="OffDays2" class="form-check-input Main-Radio" @(Model.HolidayWork == HolidayWork.WorkInHolidays ? "checked" : "") value="@((int)(HolidayWork.WorkInHolidays))"/>
-									<label for="OffDays2" class="lableCheckBreakTime">پرسنل در ایام تعطیل رسمی کار می‌کند.</label>
-								</div>
-							</div>
+						<div class="d-flex align-items-center gap-1 day-off-status-person__item">
+							<input type="radio" name="command.HolidayWork" id="OffDays1" class="custom-checkbox"
+							@(Model.HolidayWork == HolidayWork.Default ? "checked" : "")
+								   value="@((int)(HolidayWork.Default))" />
+							<label for="OffDays1" class="text-nowrap day-off-status-person__item--label">
+								اشتغال ندارد
+							</label>
 						</div>
 
 					</div>
+					<div>
+					</div>
+
 				</div>
+
 			</div>
+
+
 			
 		</div>
 
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditEmployeeFromGroup.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditEmployeeFromGroup.cshtml
index 684c25a3..0daac264 100644
--- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditEmployeeFromGroup.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditEmployeeFromGroup.cshtml
@@ -379,46 +379,118 @@
 				</div>
 			</div>
 		</div>
-			
 
-		<div class="row mt-2">
-			<div class="col-12">
-				<div class="lableCheckBreakTime text-center">وضعیت فعالیت مجموعه در روز های جمعه و تعطیلات رسمی</div>
-				<div class="row extraOptionBorder">
 
-					<div class="col-6 p-0">
-						<div class="group-container">
-							@* <div class="lableCheckBreakTime">وضعیت فعالیت مجموعه در روز های جمعه</div> *@
-							@* <div class="d-flex form-group my-1 group">
-								<input type="radio" name="FridayWork" id="Friday1" class="form-check-input Main-Radio" @(Model.FridayWork == FridayWork.Default ? "checked" : "") value="@((int)(FridayWork.Default))" />
-								<label for="Friday1" class="lableCheckBreakTime">پرسنل در روزهای جمعه کار نمی‌کند.</label>
-							</div>
-							<div class="d-flex form-group my-1 group">
-								<input type="radio" name="FridayWork" id="Friday2" class="form-check-input Main-Radio" @(Model.FridayWork == FridayWork.WorkInFriday ? "checked" : "") value="@((int)(FridayWork.WorkInFriday))" />
-								<label for="Friday2" class="lableCheckBreakTime">پرسنل در روزهای جمعه کار می‌کند.</label>
-							</div> *@
+			<div class="day-off-parent">
+				<div class="day-off-title mb-2">
+					روزهای تعطیل هفته
+				</div>
+
+				<div class="day-off-button-container mb-3">
+					<button type="button" name="Saturday" value="@((int)(DayOfWeek.Saturday))"
+							class="day-off-button text-center @(Model.WeeklyOffDays.Contains(DayOfWeek.Saturday) ? "day-off-button__diactive" : "day-off-button__active")">
+						شنبه
+					</button>
+
+
+
+					<button type="button" name="Sunday" value="@((int)(DayOfWeek.Sunday))"
+							class="day-off-button text-center @(Model.WeeklyOffDays.Contains(DayOfWeek.Sunday) ? "day-off-button__diactive" : "day-off-button__active")">
+						یکشنبه
+					</button>
+
+					<button type="button" name="Monday" value="@((int)(DayOfWeek.Monday))"
+							class="day-off-button text-center @(Model.WeeklyOffDays.Contains(DayOfWeek.Monday) ? "day-off-button__diactive" : "day-off-button__active")">
+						دوشنبه
+					</button>
+
+					<button type="button" name="Tuesday" value="@((int)(DayOfWeek.Tuesday))"
+							class="day-off-button text-center @(Model.WeeklyOffDays.Contains(DayOfWeek.Tuesday) ? "day-off-button__diactive" : "day-off-button__active")">
+						سه‌شنبه
+					</button>
+
+					<button type="button" name="Wednesday" value="@((int)(DayOfWeek.Wednesday))"
+							class="day-off-button text-center @(Model.WeeklyOffDays.Contains(DayOfWeek.Wednesday) ? "day-off-button__diactive" : "day-off-button__active")">
+						چهارشنبه
+					</button>
+
+					<button type="button" name="Thursday" value="@((int)(DayOfWeek.Thursday))"
+							class="day-off-button text-center @(Model.WeeklyOffDays.Contains(DayOfWeek.Thursday) ? "day-off-button__diactive" : "day-off-button__active")">
+						پنج‌شنبه
+					</button>
+
+					<button type="button" name="Friday" value="@((int)(DayOfWeek.Friday))"
+							class="day-off-button text-center @(Model.WeeklyOffDays.Contains(DayOfWeek.Friday) ? "day-off-button__diactive" : "day-off-button__active")">
+						جمعه
+					</button>
+
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+						   name="Command.WeeklyOffDays" id="SaturdayInput"
+					@(Model.WeeklyOffDays.Contains(DayOfWeek.Saturday) ? "checked" : "")
+						   value="@((int)(DayOfWeek.Saturday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+						   name="Command.WeeklyOffDays" id="SundayInput" @(Model.WeeklyOffDays.Contains(DayOfWeek.Sunday) ?
+						   "checked" : "") value="@((int)(DayOfWeek.Sunday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+						   name="Command.WeeklyOffDays" id="MondayInput" @(Model.WeeklyOffDays.Contains(DayOfWeek.Monday) ?
+						   "checked" : "") value="@((int)(DayOfWeek.Monday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+						   name="Command.WeeklyOffDays" id="TuesdayInput" @(Model.WeeklyOffDays.Contains(DayOfWeek.Tuesday)
+						   ? "checked" : "") value="@((int)(DayOfWeek.Tuesday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+						   name="Command.WeeklyOffDays" id="WednesdayInput"
+					@(Model.WeeklyOffDays.Contains(DayOfWeek.Wednesday) ? "checked" : "")
+						   value="@((int)(DayOfWeek.Wednesday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+						   name="Command.WeeklyOffDays" id="ThursdayInput"
+					@(Model.WeeklyOffDays.Contains(DayOfWeek.Thursday) ? "checked" : "")
+						   value="@((int)(DayOfWeek.Thursday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+						   name="Command.WeeklyOffDays" id="FridayInput" @(Model.WeeklyOffDays.Contains(DayOfWeek.Friday) ?
+						   "checked" : "") value="@((int)(DayOfWeek.Friday))" />
+
+
+
+				</div>
+				<div class="day-off-title mb-2">
+					وضعیت فعالیت مجموعه در روزهای جمعه و تعطیلات رسمی
+				</div>
+				<div class="day-off-status-person mb-3">
+					<div class="d-flex align-items-center gap-3">
+						<span class="day-off-status-person__item">وضعیت پرسنل در روز های تعطیل رسمی : </span>
+
+						<div class="d-flex align-items-center gap-1 day-off-status-person__item">
+							<input type="radio" class="custom-checkbox" name="command.HolidayWork" id="OffDays2"
+							@(Model.HolidayWork == HolidayWork.WorkInHolidays ? "checked" : "")
+								   value="@((int)(HolidayWork.WorkInHolidays))" />
+							<label class="text-nowrap day-off-status-person__item--label" for="OffDays2">
+								اشتغال دارد
+							</label>
+						</div>
+
+						<div class="d-flex align-items-center gap-1 day-off-status-person__item">
+							<input type="radio" name="command.HolidayWork" id="OffDays1" class="custom-checkbox"
+							@(Model.HolidayWork == HolidayWork.Default ? "checked" : "")
+								   value="@((int)(HolidayWork.Default))" />
+							<label for="OffDays1" class="text-nowrap day-off-status-person__item--label">
+								اشتغال ندارد
+							</label>
 						</div>
 
 					</div>
-
-
-					<div class="col-6 p-0">
-						<div class="group-container">
-							@* <div class="lableCheckBreakTime">وضعیت فعالیت مجموعه در روز های تعطیلات رسمی</div> *@
-							<div class="d-flex form-group my-1 group">
-								<input type="radio" name="HolidayWork" id="OffDays1" class="form-check-input Main-Radio" @(Model.HolidayWork == HolidayWork.Default ? "checked" : "") value="@((int)(HolidayWork.Default))" />
-								<label for="OffDays1" class="lableCheckBreakTime">پرسنل در ایام تعطیل رسمی کار نمی‌کند.</label>
-							</div>
-							<div class="d-flex form-group my-1 group">
-								<input type="radio" name="HolidayWork" id="OffDays2" class="form-check-input Main-Radio" @(Model.HolidayWork == HolidayWork.WorkInHolidays ? "checked" : "") value="@((int)(HolidayWork.WorkInHolidays))" />
-								<label for="OffDays2" class="lableCheckBreakTime">پرسنل در ایام تعطیل رسمی کار می‌کند.</label>
-							</div>
-						</div>
+					<div>
 					</div>
 
 				</div>
+
 			</div>
-		</div>
 			
 	</div>
 
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml
index 642b43fc..227dc226 100644
--- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalEditGroup.cshtml
@@ -391,46 +391,119 @@
 				</div>
 
 
-
-				<div class="row mt-2">
-					<div class="col-12">
-						<div class="lableCheckBreakTime text-center">وضعیت فعالیت مجموعه در روز های جمعه و تعطیلات رسمی</div>
-						<div class="row extraOptionBorder">
-
-							<div class="col-6 p-0">
-								<div class="group-container">
-									@* <div class="lableCheckBreakTime">وضعیت فعالیت مجموعه در روز های جمعه</div> *@
-									@* <div class="d-flex form-group my-1 group">
-										<input type="radio" name="FridayWork" id="Friday1" class="form-check-input Main-Radio" @(Model.FridayWork == FridayWork.Default ? "checked" : "") value="@((int)(FridayWork.Default))" />
-										<label for="Friday1" class="lableCheckBreakTime">پرسنل در روزهای جمعه کار نمی‌کند.</label>
-									</div>
-									<div class="d-flex form-group my-1 group">
-										<input type="radio" name="FridayWork" id="Friday2" class="form-check-input Main-Radio" @(Model.FridayWork == FridayWork.WorkInFriday ? "checked" : "") value="@((int)(FridayWork.WorkInFriday))" />
-										<label for="Friday2" class="lableCheckBreakTime">پرسنل در روزهای جمعه کار می‌کند.</label>
-									</div> *@
-								</div>
-
-							</div>
-
-
-							<div class="col-6 p-0">
-								<div class="group-container">
-									@* <div class="lableCheckBreakTime">وضعیت فعالیت مجموعه در روز های تعطیلات رسمی</div> *@
-									<div class="d-flex form-group my-1 group">
-										<input type="radio" name="HolidayWork" id="OffDays1" class="form-check-input Main-Radio" @(Model.HolidayWork == HolidayWork.Default ? "checked" : "") value="@((int)(HolidayWork.Default))" />
-										<label for="OffDays1" class="lableCheckBreakTime">پرسنل در ایام تعطیل رسمی کار نمی‌کند.</label>
-									</div>
-									<div class="d-flex form-group my-1 group">
-										<input type="radio" name="HolidayWork" id="OffDays2" class="form-check-input Main-Radio" @(Model.HolidayWork == HolidayWork.WorkInHolidays ? "checked" : "") value="@((int)(HolidayWork.WorkInHolidays))" />
-										<label for="OffDays2" class="lableCheckBreakTime">پرسنل در ایام تعطیل رسمی کار می‌کند.</label>
-									</div>
-								</div>
-							</div>
-
-						</div>
-					</div>
+			<div class="day-off-parent">
+				<div class="day-off-title mb-2">
+					روزهای تعطیل هفته
 				</div>
 
+				<div class="day-off-button-container mb-3">
+					<button type="button" name="Saturday" value="@((int)(DayOfWeek.Saturday))"
+							class="day-off-button text-center @(Model.OffDayOfWeeks.Contains(DayOfWeek.Saturday) ? "day-off-button__diactive" : "day-off-button__active")">
+						شنبه
+					</button>
+
+
+
+					<button type="button" name="Sunday" value="@((int)(DayOfWeek.Sunday))"
+							class="day-off-button text-center @(Model.OffDayOfWeeks.Contains(DayOfWeek.Sunday) ? "day-off-button__diactive" : "day-off-button__active")">
+						یکشنبه
+					</button>
+
+					<button type="button" name="Monday" value="@((int)(DayOfWeek.Monday))"
+							class="day-off-button text-center @(Model.OffDayOfWeeks.Contains(DayOfWeek.Monday) ? "day-off-button__diactive" : "day-off-button__active")">
+						دوشنبه
+					</button>
+
+					<button type="button" name="Tuesday" value="@((int)(DayOfWeek.Tuesday))"
+							class="day-off-button text-center @(Model.OffDayOfWeeks.Contains(DayOfWeek.Tuesday) ? "day-off-button__diactive" : "day-off-button__active")">
+						سه‌شنبه
+					</button>
+
+					<button type="button" name="Wednesday" value="@((int)(DayOfWeek.Wednesday))"
+							class="day-off-button text-center @(Model.OffDayOfWeeks.Contains(DayOfWeek.Wednesday) ? "day-off-button__diactive" : "day-off-button__active")">
+						چهارشنبه
+					</button>
+
+					<button type="button" name="Thursday" value="@((int)(DayOfWeek.Thursday))"
+							class="day-off-button text-center @(Model.OffDayOfWeeks.Contains(DayOfWeek.Thursday) ? "day-off-button__diactive" : "day-off-button__active")">
+						پنج‌شنبه
+					</button>
+
+					<button type="button" name="Friday" value="@((int)(DayOfWeek.Friday))"
+							class="day-off-button text-center @(Model.OffDayOfWeeks.Contains(DayOfWeek.Friday) ? "day-off-button__diactive" : "day-off-button__active")">
+						جمعه
+					</button>
+
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+						   name="Command.WeeklyOffDays" id="SaturdayInput"
+					@(Model.OffDayOfWeeks.Contains(DayOfWeek.Saturday) ? "checked" : "")
+						   value="@((int)(DayOfWeek.Saturday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+						   name="Command.WeeklyOffDays" id="SundayInput" @(Model.OffDayOfWeeks.Contains(DayOfWeek.Sunday) ?
+						   "checked" : "") value="@((int)(DayOfWeek.Sunday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+						   name="Command.WeeklyOffDays" id="MondayInput" @(Model.OffDayOfWeeks.Contains(DayOfWeek.Monday) ?
+						   "checked" : "") value="@((int)(DayOfWeek.Monday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+						   name="Command.WeeklyOffDays" id="TuesdayInput" @(Model.OffDayOfWeeks.Contains(DayOfWeek.Tuesday)
+						   ? "checked" : "") value="@((int)(DayOfWeek.Tuesday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+						   name="Command.WeeklyOffDays" id="WednesdayInput"
+					@(Model.OffDayOfWeeks.Contains(DayOfWeek.Wednesday) ? "checked" : "")
+						   value="@((int)(DayOfWeek.Wednesday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+						   name="Command.WeeklyOffDays" id="ThursdayInput"
+					@(Model.OffDayOfWeeks.Contains(DayOfWeek.Thursday) ? "checked" : "")
+						   value="@((int)(DayOfWeek.Thursday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+						   name="Command.WeeklyOffDays" id="FridayInput" @(Model.OffDayOfWeeks.Contains(DayOfWeek.Friday) ?
+						   "checked" : "") value="@((int)(DayOfWeek.Friday))" />
+
+
+
+				</div>
+				<div class="day-off-title mb-2">
+					وضعیت فعالیت مجموعه در روزهای جمعه و تعطیلات رسمی
+				</div>
+				<div class="day-off-status-person mb-3">
+					<div class="d-flex align-items-center gap-3">
+						<span class="day-off-status-person__item">وضعیت پرسنل در روز های تعطیل رسمی : </span>
+
+						<div class="d-flex align-items-center gap-1 day-off-status-person__item">
+							<input type="radio" class="custom-checkbox" name="command.HolidayWork" id="OffDays2"
+							@(Model.HolidayWork == HolidayWork.WorkInHolidays ? "checked" : "")
+								   value="@((int)(HolidayWork.WorkInHolidays))" />
+							<label class="text-nowrap day-off-status-person__item--label" for="OffDays2">
+								اشتغال دارد
+							</label>
+						</div>
+
+						<div class="d-flex align-items-center gap-1 day-off-status-person__item">
+							<input type="radio" name="command.HolidayWork" id="OffDays1" class="custom-checkbox"
+							@(Model.HolidayWork == HolidayWork.Default ? "checked" : "")
+								   value="@((int)(HolidayWork.Default))" />
+							<label for="OffDays1" class="text-nowrap day-off-status-person__item--label">
+								اشتغال ندارد
+							</label>
+						</div>
+
+					</div>
+					<div>
+					</div>
+
+				</div>
+
+			</div>
+
+
+
 			</div>
 
 			<div class="container m-0">
@@ -488,4 +561,4 @@
 	var ajaxReCalculateValuesUrl = `@Url.Page("./Grouping", "ReCalculateValues")`;
 	
 </script>
-<script src="~/assetsclient/pages/rollcall/js/modaleditgroup.js?ver=clientVersion"></script>
\ No newline at end of file
+<script src="~/assetsclient/pages/rollcall/js/modaleditgroup.js?ver=@clientVersion"></script>
\ No newline at end of file
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/WorkshopSetting/_Partials/ModalCreateSettingWorkshop.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/WorkshopSetting/_Partials/ModalCreateSettingWorkshop.cshtml
index de2d4228..6322a8a8 100644
--- a/ServiceHost/Areas/Client/Pages/Company/RollCall/WorkshopSetting/_Partials/ModalCreateSettingWorkshop.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/WorkshopSetting/_Partials/ModalCreateSettingWorkshop.cshtml
@@ -88,45 +88,109 @@
 
 		<div class="modal-footer">
 
-			<div class="container my-2">
+			<div class="day-off-parent">
+				<div class="day-off-title mb-2">
+					روزهای تعطیل هفته
+				</div>
 
-				<div class="row mt-2">
-					<div class="col-12">
-						<div class="lableCheckBreakTime text-center">وضعیت فعالیت مجموعه در روز های جمعه و تعطیلات رسمی</div>
-						<div class="row extraOptionBorder">
-
-							<div class="col-6 p-0">
-								<div class="group-container">
-									@* <div class="lableCheckBreakTime">وضعیت فعالیت مجموعه در روز های جمعه</div> *@
-									@* <div class="d-flex form-group my-1 group">
-										<input type="radio" name="FridayWork" id="Friday1" class="form-check-input Main-Radio" @(Model.FridayWork == FridayWork.Default ? "checked" : "") value="@((int)(FridayWork.Default))" />
-										<label for="Friday1" class="lableCheckBreakTime">پرسنل در روزهای جمعه کار نمی‌کند.</label>
-									</div>
-									<div class="d-flex form-group my-1 group">
-										<input type="radio" name="FridayWork" id="Friday2" class="form-check-input Main-Radio" @(Model.FridayWork == FridayWork.WorkInFriday ? "checked" : "") value="@((int)(FridayWork.WorkInFriday))" />
-										<label for="Friday2" class="lableCheckBreakTime">پرسنل در روزهای جمعه کار می‌کند.</label>
-									</div> *@
-								</div>
-
-							</div>
+				<div class="day-off-button-container mb-3">
+					<button type="button" name="Saturday" value="@((int)(DayOfWeek.Saturday))"
+							class="day-off-button text-center day-off-button__active">
+						شنبه
+					</button>
 
 
-							<div class="col-6 p-0">
-								<div class="group-container">
-									@* <div class="lableCheckBreakTime">وضعیت فعالیت مجموعه در روز های تعطیلات رسمی</div> *@
-									<div class="d-flex form-group my-1 group">
-										<input type="radio" name="HolidayWork" id="OffDays1" class="form-check-input Main-Radio" @(Model.HolidayWork == HolidayWork.Default ? "checked" : "") value="@((int)(HolidayWork.Default))" />
-										<label for="OffDays1" class="lableCheckBreakTime">پرسنل در ایام تعطیل رسمی کار نمی‌کند.</label>
-									</div>
-									<div class="d-flex form-group my-1 group">
-										<input type="radio" name="HolidayWork" id="OffDays2" class="form-check-input Main-Radio" @(Model.HolidayWork == HolidayWork.WorkInHolidays ? "checked" : "") value="@((int)(HolidayWork.WorkInHolidays))" />
-										<label for="OffDays2" class="lableCheckBreakTime">پرسنل در ایام تعطیل رسمی کار می‌کند.</label>
-									</div>
-								</div>
-							</div>
 
+					<button type="button" name="Sunday" value="@((int)(DayOfWeek.Sunday))"
+							class="day-off-button text-center day-off-button__active">
+						یکشنبه
+
+					</button>
+
+
+
+					<button type="button" name="Monday" value="@((int)(DayOfWeek.Monday))"
+							class="day-off-button text-center day-off-button__active">
+						دوشنبه
+					</button>
+
+					<button type="button" name="Tuesday" value="@((int)(DayOfWeek.Tuesday))"
+							class="day-off-button text-center day-off-button__active">
+						سه‌شنبه
+					</button>
+
+					<button type="button" name="Wednesday" value="@((int)(DayOfWeek.Wednesday))"
+							class="day-off-button text-center day-off-button__active">
+						چهارشنبه
+					</button>
+
+					<button type="button" name="Thursday" value="@((int)(DayOfWeek.Thursday))"
+							class="day-off-button text-center day-off-button__active">
+						پنج‌شنبه
+					</button>
+
+					<button type="button" name="Friday" value="@((int)(DayOfWeek.Friday))"
+							class="day-off-button text-center day-off-button__diactive">
+						جمعه
+					</button>
+
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input  day-off-button__active"
+						   name="Command.OffDays" id="SaturdayInput"
+						   value="@((int)(DayOfWeek.Saturday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input  day-off-button__active"
+						   name="OffDays" id="SundayInput" value="@((int)(DayOfWeek.Sunday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input  day-off-button__active"
+						   name="OffDays" id="MondayInput" value="@((int)(DayOfWeek.Monday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input  day-off-button__active"
+						   name="OffDays" id="TuesdayInput" value="@((int)(DayOfWeek.Tuesday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input  day-off-button__active"
+						   name="OffDays" id="WednesdayInput"
+						   value="@((int)(DayOfWeek.Wednesday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input  day-off-button__active"
+						   name="OffDays" id="ThursdayInput"
+						   value="@((int)(DayOfWeek.Thursday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input day-off-button__diactive"
+						   name="OffDays" id="FridayInput" value="@((int)(DayOfWeek.Friday))" checked="checked" />
+
+
+
+				</div>
+				<div class="day-off-title mb-2">
+					وضعیت فعالیت مجموعه در روزهای جمعه و تعطیلات رسمی
+				</div>
+				<div class="day-off-status-person mb-3">
+					<div class="d-flex align-items-center gap-3">
+						<span class="day-off-status-person__item">وضعیت پرسنل در روز های تعطیل رسمی : </span>
+
+						<div class="d-flex align-items-center gap-1 day-off-status-person__item">
+							<input type="radio" class="custom-checkbox" name="HolidayWork" id="OffDays2"
+							@(Model.HolidayWork == HolidayWork.WorkInHolidays ? "checked" : "")
+								   value="@((int)(HolidayWork.WorkInHolidays))" />
+							<label class="text-nowrap day-off-status-person__item--label" for="OffDays2">
+								اشتغال دارد
+							</label>
 						</div>
+
+						<div class="d-flex align-items-center gap-1 day-off-status-person__item">
+							<input type="radio" name="HolidayWork" id="OffDays1" class="custom-checkbox"
+							@(Model.HolidayWork == HolidayWork.Default ? "checked" : "")
+								   value="@((int)(HolidayWork.Default))" />
+							<label for="OffDays1" class="text-nowrap day-off-status-person__item--label">
+								اشتغال ندارد
+							</label>
+						</div>
+
 					</div>
+					<div>
+					</div>
+
 				</div>
 
 			</div>
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/WorkshopSetting/_Partials/ModalSettingWorkTime.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/WorkshopSetting/_Partials/ModalSettingWorkTime.cshtml
index 3f57dddb..f865c7a3 100644
--- a/ServiceHost/Areas/Client/Pages/Company/RollCall/WorkshopSetting/_Partials/ModalSettingWorkTime.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/WorkshopSetting/_Partials/ModalSettingWorkTime.cshtml
@@ -152,51 +152,120 @@
 
 		<div class="modal-footer">
 
-			<div class="container my-2">
+			<div class="day-off-parent">
+				<div class="day-off-title mb-2">
+					روزهای تعطیل هفته
+				</div>
 
-				<div class="row mt-2">
-					<div class="col-12">
-						<div class="lableCheckBreakTime text-center">وضعیت فعالیت مجموعه در روز های جمعه و تعطیلات رسمی</div>
-						<div class="row extraOptionBorder">
-
-							<div class="col-6 p-0">
-								<div class="group-container">
-									@* <div class="lableCheckBreakTime">وضعیت فعالیت مجموعه در روز های جمعه</div> *@
-									@* <div class="d-flex form-group my-1 group">
-										<input type="radio" name="FridayWork" id="Friday1" class="form-check-input Main-Radio" @(Model.FridayWork == FridayWork.Default ? "checked" : "") value="@((int)(FridayWork.Default))"/>
-										<label for="Friday1" class="lableCheckBreakTime">پرسنل در روزهای جمعه کار نمی‌کند.</label>
-									</div>
-									<div class="d-flex form-group my-1 group">
-										<input type="radio" name="FridayWork" id="Friday2" class="form-check-input Main-Radio" @(Model.FridayWork == FridayWork.WorkInFriday ? "checked" : "") value="@((int)(FridayWork.WorkInFriday))"/>
-										<label for="Friday2" class="lableCheckBreakTime">پرسنل در روزهای جمعه کار می‌کند.</label>
-									</div> *@
-								</div>
-
-							</div>
+				<div class="day-off-button-container mb-3">
+					<button type="button" name="Saturday" value="@((int)(DayOfWeek.Saturday))"
+							class="day-off-button text-center @(Model.OffDays.Contains(DayOfWeek.Saturday) ? "day-off-button__diactive" : "day-off-button__active")">
+						شنبه
+					</button>
 
 
-							<div class="col-6 p-0">
-								<div class="group-container">
-									@* <div class="lableCheckBreakTime">وضعیت فعالیت مجموعه در روز های تعطیلات رسمی</div> *@
-									<div class="d-flex form-group my-1 group">
-										<input type="radio" name="HolidayWork" id="OffDays1" class="form-check-input Main-Radio" @(Model.HolidayWork == HolidayWork.Default ? "checked" : "") value="@((int)(HolidayWork.Default))"/>
-										<label for="OffDays1" class="lableCheckBreakTime">پرسنل در ایام تعطیل رسمی کار نمی‌کند.</label>
-									</div>
-									<div class="d-flex form-group my-1 group">
-										<input type="radio" name="HolidayWork" id="OffDays2" class="form-check-input Main-Radio" @(Model.HolidayWork == HolidayWork.WorkInHolidays ? "checked" : "") value="@((int)(HolidayWork.WorkInHolidays))"/>
-										<label for="OffDays2" class="lableCheckBreakTime">پرسنل در ایام تعطیل رسمی کار می‌کند.</label>
-									</div>
-								</div>
-							</div>
 
+					<button type="button" name="Sunday" value="@((int)(DayOfWeek.Sunday))"
+							class="day-off-button text-center @(Model.OffDays.Contains(DayOfWeek.Sunday) ? "day-off-button__diactive" : "day-off-button__active")">
+						یکشنبه
+					</button>
+
+					<button type="button" name="Monday" value="@((int)(DayOfWeek.Monday))"
+							class="day-off-button text-center @(Model.OffDays.Contains(DayOfWeek.Monday) ? "day-off-button__diactive" : "day-off-button__active")">
+						دوشنبه
+					</button>
+
+					<button type="button" name="Tuesday" value="@((int)(DayOfWeek.Tuesday))"
+							class="day-off-button text-center @(Model.OffDays.Contains(DayOfWeek.Tuesday) ? "day-off-button__diactive" : "day-off-button__active")">
+						سه‌شنبه
+					</button>
+
+					<button type="button" name="Wednesday" value="@((int)(DayOfWeek.Wednesday))"
+							class="day-off-button text-center @(Model.OffDays.Contains(DayOfWeek.Wednesday) ? "day-off-button__diactive" : "day-off-button__active")">
+						چهارشنبه
+					</button>
+
+					<button type="button" name="Thursday" value="@((int)(DayOfWeek.Thursday))"
+							class="day-off-button text-center @(Model.OffDays.Contains(DayOfWeek.Thursday) ? "day-off-button__diactive" : "day-off-button__active")">
+						پنج‌شنبه
+					</button>
+
+					<button type="button" name="Friday" value="@((int)(DayOfWeek.Friday))"
+							class="day-off-button text-center @(Model.OffDays.Contains(DayOfWeek.Friday) ? "day-off-button__diactive" : "day-off-button__active")">
+						جمعه
+					</button>
+
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox offDayOfWeeks-Input"
+						   name="offDayOfWeeks" id="SaturdayInput"
+					@(Model.OffDays.Contains(DayOfWeek.Saturday) ? "checked" : "")
+						   value="@((int)(DayOfWeek.Saturday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox offDayOfWeeks-Input"
+						   name="offDayOfWeeks" id="SundayInput" @(Model.OffDays.Contains(DayOfWeek.Sunday) ?
+						   "checked" : "") value="@((int)(DayOfWeek.Sunday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox offDayOfWeeks-Input"
+						   name="offDayOfWeeks" id="MondayInput" @(Model.OffDays.Contains(DayOfWeek.Monday) ?
+						   "checked" : "") value="@((int)(DayOfWeek.Monday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox offDayOfWeeks-Input"
+						   name="offDayOfWeeks" id="TuesdayInput" @(Model.OffDays.Contains(DayOfWeek.Tuesday)
+						   ? "checked" : "") value="@((int)(DayOfWeek.Tuesday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox offDayOfWeeks-Input"
+						   name="offDayOfWeeks" id="WednesdayInput"
+					@(Model.OffDays.Contains(DayOfWeek.Wednesday) ? "checked" : "")
+						   value="@((int)(DayOfWeek.Wednesday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox offDayOfWeeks-Input"
+						   name="offDayOfWeeks" id="ThursdayInput"
+					@(Model.OffDays.Contains(DayOfWeek.Thursday) ? "checked" : "")
+						   value="@((int)(DayOfWeek.Thursday))" />
+
+					<input type="checkbox" style="display: none;" class="custom-checkbox offDayOfWeeks-Input"
+						   name="offDayOfWeeks" id="FridayInput" @(Model.OffDays.Contains(DayOfWeek.Friday) ?
+						   "checked" : "") value="@((int)(DayOfWeek.Friday))" />
+
+
+
+				</div>
+				<div class="day-off-title mb-2">
+					وضعیت فعالیت مجموعه در روزهای جمعه و تعطیلات رسمی
+				</div>
+				<div class="day-off-status-person mb-3">
+					<div class="d-flex align-items-center gap-3">
+						<span class="day-off-status-person__item">وضعیت پرسنل در روز های تعطیل رسمی : </span>
+
+						<div class="d-flex align-items-center gap-1 day-off-status-person__item">
+							<input type="radio" class="custom-checkbox" name="HolidayWork" id="OffDays2"
+							@(Model.HolidayWork == HolidayWork.WorkInHolidays ? "checked" : "")
+								   value="@((int)(HolidayWork.WorkInHolidays))" />
+							<label class="text-nowrap day-off-status-person__item--label" for="OffDays2">
+								اشتغال دارد
+							</label>
 						</div>
+
+						<div class="d-flex align-items-center gap-1 day-off-status-person__item">
+							<input type="radio" name="HolidayWork" id="OffDays1" class="custom-checkbox"
+							@(Model.HolidayWork == HolidayWork.Default ? "checked" : "")
+								   value="@((int)(HolidayWork.Default))" />
+							<label for="OffDays1" class="text-nowrap day-off-status-person__item--label">
+								اشتغال ندارد
+							</label>
+						</div>
+
 					</div>
+					<div>
+					</div>
+
 				</div>
 
 			</div>
 
 
 
+
 			<div class="container m-0">
 				<div class="row">
 					<div class="col-6 text-end">
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/WorkshopSettingWithTakeImage.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/WorkshopSettingWithTakeImage.cshtml
index 739419ff..22839dfb 100644
--- a/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/WorkshopSettingWithTakeImage.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/WorkshopSettingWithTakeImage.cshtml
@@ -216,46 +216,106 @@
 		</div>
 	</div>
 
-	<div class="row mt-2">
-		<div class="col-12">
-			<div class="lableCheckBreakTime text-center">وضعیت فعالیت مجموعه در روز های جمعه و تعطیلات رسمی</div>
-			<div class="row extraOptionBorder">
-
-				<div class="col-6 p-0">
-					<div class="group-container">
-						@* <div class="lableCheckBreakTime">وضعیت فعالیت مجموعه در روز های جمعه</div> *@
-						<div class="d-flex form-group my-1 group">
-							<input type="radio" name="FridayWork1" id="Friday1" class="form-check-input Main-Radio" value="@((int)(FridayWork.Default))" />
-							<label for="Friday1" class="lableCheckBreakTime">پرسنل در روزهای جمعه کار نمی‌کند.</label>
-						</div>
-						<div class="d-flex form-group my-1 group">
-							<input type="radio" name="FridayWork1" id="Friday2" class="form-check-input Main-Radio" value="@((int)(FridayWork.WorkInFriday))" />
-							<label for="Friday2" class="lableCheckBreakTime">پرسنل در روزهای جمعه کار می‌کند.</label>
-						</div>
-					</div>
-
-				</div>
-
-
-				<div class="col-6 p-0">
-					<div class="group-container">
-						@* <div class="lableCheckBreakTime">وضعیت فعالیت مجموعه در روز های تعطیلات رسمی</div> *@
-						<div class="d-flex form-group my-1 group">
-							<input type="radio" name="HolidayWork1" id="HolidayWork1" class="form-check-input Main-Radio" value="@HolidayWork.Default" />
-							<label for="HolidayWork1" class="lableCheckBreakTime">پرسنل در ایام تعطیل رسمی کار نمی‌کند.</label>
-						</div>
-						<div class="d-flex form-group my-1 group">
-							<input type="radio" name="HolidayWork1" id="HolidayWork2" class="form-check-input Main-Radio" value="@HolidayWork.WorkInHolidays" />
-							<label for="HolidayWork2" class="lableCheckBreakTime">پرسنل در ایام تعطیل رسمی کار می‌کند.</label>
-						</div>
-					</div>
-				</div>
-
-
-
-				<input type="hidden" id="GroupId" name="Command.GroupId" value="" />
-			</div>
+	<div class="day-off-parent mb-4">
+		<div class="day-off-title mb-2">
+			روزهای تعطیل هفته
 		</div>
+
+		<div class="day-off-button-container mb-3">
+			<button type="button" name="Saturday" value="@((int)(DayOfWeek.Saturday))"
+					class="day-off-button text-center  ">
+				شنبه
+			</button>
+
+
+
+			<button type="button" name="Sunday" value="@((int)(DayOfWeek.Sunday))"
+					class="day-off-button text-center  ">
+				یکشنبه
+			</button>
+
+			<button type="button" name="Monday" value="@((int)(DayOfWeek.Monday))"
+					class="day-off-button text-center  ">
+				دوشنبه
+			</button>
+
+			<button type="button" name="Tuesday" value="@((int)(DayOfWeek.Tuesday))"
+					class="day-off-button text-center ">
+				سه‌شنبه
+			</button>
+
+			<button type="button" name="Wednesday" value="@((int)(DayOfWeek.Wednesday))"
+					class="day-off-button text-center  ">
+				چهارشنبه
+			</button>
+
+			<button type="button" name="Thursday" value="@((int)(DayOfWeek.Thursday))"
+					class="day-off-button text-center  ">
+				پنج‌شنبه
+			</button>
+
+			<button type="button" name="Friday" value="@((int)(DayOfWeek.Friday))"
+					class="day-off-button text-center ">
+				جمعه
+			</button>
+
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.WeeklyOffDays" id="SaturdayInput"
+				   value="@((int)(DayOfWeek.Saturday))" />
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.WeeklyOffDays" id="SundayInput" value="@((int)(DayOfWeek.Sunday))" />
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.WeeklyOffDays" id="MondayInput" value="@((int)(DayOfWeek.Monday))" />
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.WeeklyOffDays" id="TuesdayInput" value="@((int)(DayOfWeek.Tuesday))" />
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.WeeklyOffDays" id="WednesdayInput"
+				   value="@((int)(DayOfWeek.Wednesday))" />
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.WeeklyOffDays" id="ThursdayInput"
+				   value="@((int)(DayOfWeek.Thursday))" />
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.WeeklyOffDays" id="FridayInput" value="@((int)(DayOfWeek.Friday))" />
+
+
+
+		</div>
+		<div class="day-off-title mb-2">
+			وضعیت فعالیت مجموعه در روزهای جمعه و تعطیلات رسمی
+		</div>
+		<div class="day-off-status-person mb-3">
+			<div class="d-flex align-items-center gap-3">
+				<span class="day-off-status-person__item">وضعیت پرسنل در روز های تعطیل رسمی : </span>
+
+				<div class="d-flex align-items-center gap-1 day-off-status-person__item">
+					<input type="radio" class="custom-checkbox" name="command.HolidayWork" id="OffDays2"
+						   value="@((int)(HolidayWork.WorkInHolidays))" />
+					<label class="text-nowrap day-off-status-person__item--label" for="OffDays2">
+						اشتغال دارد
+					</label>
+				</div>
+
+				<div class="d-flex align-items-center gap-1 day-off-status-person__item">
+					<input type="radio" name="command.HolidayWork" id="OffDays1" class="custom-checkbox"
+						   value="@((int)(HolidayWork.Default))" />
+					<label for="OffDays1" class="text-nowrap day-off-status-person__item--label">
+						اشتغال ندارد
+					</label>
+				</div>
+
+			</div>
+			<div>
+			</div>
+
+		</div>
+
 	</div>
 </div>
 
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/WorkshopSettingWithTakeImageEmpty.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/WorkshopSettingWithTakeImageEmpty.cshtml
index 0d9d4528..16be1fcb 100644
--- a/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/WorkshopSettingWithTakeImageEmpty.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/_Partials/WorkshopSettingWithTakeImageEmpty.cshtml
@@ -166,46 +166,106 @@
 
 
 
-	<div class="row mt-2">
-		<div class="col-12">
-			<div class="lableCheckBreakTime text-center">وضعیت فعالیت مجموعه در روز های جمعه و تعطیلات رسمی</div>
-			<div class="row extraOptionBorder">
-
-				<div class="col-6 p-0">
-					<div class="group-container">
-						@* <div class="lableCheckBreakTime">وضعیت فعالیت مجموعه در روز های جمعه</div> *@
-						<div class="d-flex form-group my-1 group">
-							<input type="radio" name="Command.FridayWork" id="Friday1" class="form-check-input Main-Radio" @* @(Model.FridayWork == FridayWork.Default ? "checked" : "") *@ value="@((int)(FridayWork.Default))" />
-							<label for="Friday1" class="lableCheckBreakTime">پرسنل در روزهای جمعه کار نمی‌کند.</label>
-						</div>
-						<div class="d-flex form-group my-1 group">
-							<input type="radio" name="Command.FridayWork" id="Friday2" class="form-check-input Main-Radio" @* @(Model.FridayWork == FridayWork.WorkInFriday ? "checked" : "") *@ value="@((int)(FridayWork.WorkInFriday))" />
-							<label for="Friday2" class="lableCheckBreakTime">پرسنل در روزهای جمعه کار می‌کند.</label>
-						</div>
-					</div>
-
-				</div>
-
-
-				<div class="col-6 p-0">
-					<div class="group-container">
-						@* <div class="lableCheckBreakTime">وضعیت فعالیت مجموعه در روز های تعطیلات رسمی</div> *@
-						<div class="d-flex form-group my-1 group">
-							<input type="radio" name="Command.HolidayWork" id="HolidayWork1" class="form-check-input Main-Radio" @* @(Model.HolidayWork == HolidayWork.Default ? "checked" : "") *@ value="0" />
-							<label for="HolidayWork1" class="lableCheckBreakTime">پرسنل در ایام تعطیل رسمی کار نمی‌کند.</label>
-						</div>
-						<div class="d-flex form-group my-1 group">
-							<input type="radio" name="Command.HolidayWork" id="HolidayWork2" class="form-check-input Main-Radio" @* @(Model.HolidayWork == HolidayWork.WorkInHolidays ? "checked" : "") *@ value="1" />
-							<label for="HolidayWork2" class="lableCheckBreakTime">پرسنل در ایام تعطیل رسمی کار می‌کند.</label>
-						</div>
-					</div>
-				</div>
-
-
-
-				<input type="hidden" id="GroupId" name="command.GroupId" value="" />
-			</div>
+	<div class="day-off-parent">
+		<div class="day-off-title mb-2">
+			روزهای تعطیل هفته
 		</div>
+
+		<div class="day-off-button-container mb-3">
+			<button type="button" name="Saturday" value="@((int)(DayOfWeek.Saturday))"
+					class="day-off-button text-center  ">
+				شنبه
+			</button>
+
+
+
+			<button type="button" name="Sunday" value="@((int)(DayOfWeek.Sunday))"
+					class="day-off-button text-center  ">
+				یکشنبه
+			</button>
+
+			<button type="button" name="Monday" value="@((int)(DayOfWeek.Monday))"
+					class="day-off-button text-center  ">
+				دوشنبه
+			</button>
+
+			<button type="button" name="Tuesday" value="@((int)(DayOfWeek.Tuesday))"
+					class="day-off-button text-center ">
+				سه‌شنبه
+			</button>
+
+			<button type="button" name="Wednesday" value="@((int)(DayOfWeek.Wednesday))"
+					class="day-off-button text-center  ">
+				چهارشنبه
+			</button>
+
+			<button type="button" name="Thursday" value="@((int)(DayOfWeek.Thursday))"
+					class="day-off-button text-center  ">
+				پنج‌شنبه
+			</button>
+
+			<button type="button" name="Friday" value="@((int)(DayOfWeek.Friday))"
+					class="day-off-button text-center ">
+				جمعه
+			</button>
+
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.WeeklyOffDays" id="SaturdayInput"
+				   value="@((int)(DayOfWeek.Saturday))" />
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.WeeklyOffDays" id="SundayInput" value="@((int)(DayOfWeek.Sunday))" />
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.WeeklyOffDays" id="MondayInput" value="@((int)(DayOfWeek.Monday))" />
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.WeeklyOffDays" id="TuesdayInput" value="@((int)(DayOfWeek.Tuesday))" />
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.WeeklyOffDays" id="WednesdayInput"
+				   value="@((int)(DayOfWeek.Wednesday))" />
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.WeeklyOffDays" id="ThursdayInput"
+				   value="@((int)(DayOfWeek.Thursday))" />
+
+			<input type="checkbox" style="display: none;" class="custom-checkbox weeklyOffDays-Input"
+				   name="Command.WeeklyOffDays" id="FridayInput" value="@((int)(DayOfWeek.Friday))" />
+
+
+
+		</div>
+		<div class="day-off-title mb-2">
+			وضعیت فعالیت مجموعه در روزهای جمعه و تعطیلات رسمی
+		</div>
+		<div class="day-off-status-person mb-3">
+			<div class="d-flex align-items-center gap-3">
+				<span class="day-off-status-person__item">وضعیت پرسنل در روز های تعطیل رسمی : </span>
+
+				<div class="d-flex align-items-center gap-1 day-off-status-person__item">
+					<input type="radio" class="custom-checkbox" name="command.HolidayWork" id="OffDays2"
+						   value="@((int)(HolidayWork.WorkInHolidays))" />
+					<label class="text-nowrap day-off-status-person__item--label" for="OffDays2">
+						اشتغال دارد
+					</label>
+				</div>
+
+				<div class="d-flex align-items-center gap-1 day-off-status-person__item">
+					<input type="radio" name="command.HolidayWork" id="OffDays1" class="custom-checkbox"
+						   value="@((int)(HolidayWork.Default))" />
+					<label for="OffDays1" class="text-nowrap day-off-status-person__item--label">
+						اشتغال ندارد
+					</label>
+				</div>
+
+			</div>
+			<div>
+			</div>
+
+		</div>
+
 	</div>
 
 </div>
diff --git a/ServiceHost/wwwroot/AssetsClient/css/style.css b/ServiceHost/wwwroot/AssetsClient/css/style.css
index c034777b..a34a6668 100644
--- a/ServiceHost/wwwroot/AssetsClient/css/style.css
+++ b/ServiceHost/wwwroot/AssetsClient/css/style.css
@@ -3339,4 +3339,145 @@ button.btn-employee-payment {
 /************************* End Button *************************/
 .sweet-alert h2 {
     font-size: 22px !important;
-}
\ No newline at end of file
+}
+
+
+
+.day-off-parent {
+    width: 100%;
+}
+
+.day-off-title {
+    color: #000000;
+    font-weight: 500;
+    font-size: 12px;
+    text-align: center;
+}
+
+.day-off-button-container {
+    display: flex;
+    justify-content: center;
+    gap: 5px;
+    border: 1px solid #d9d9d9;
+    border-radius: 10px;
+    padding: 10px 4px;
+}
+
+.day-off-button {
+    width: 42px;
+    height: 22px;
+    border-radius: 4px;
+    font-weight: 500;
+    font-size: 8px;
+}
+
+.day-off-button__active {
+    background-color: #148989;
+    color: white;
+    transition: all 0.3s ease-in-out;
+}
+
+    .day-off-button__active:hover {
+        background-color: #106b6b;
+    }
+
+.day-off-button__diactive {
+    border: 1px solid #f2c2c2;
+    color: #4c4c4c;
+    background-color: #fff3f3;
+    transition: all 0.3s ease-in-out;
+}
+
+    .day-off-button__diactive:hover {
+        background-color: #f7dbdb;
+    }
+
+.day-off-status-person {
+    border: 1px solid #d9d9d9;
+    border-radius: 10px;
+    padding: 10px 5px;
+}
+
+.day-off-status-person__item {
+    font-weight: 500;
+    font-size: 9px;
+    color: #646464;
+}
+
+@media screen and (min-width: 431px) and (max-width: 767px) {
+    .day-off-button {
+        width: 55px;
+        height: 22px;
+        border-radius: 4px;
+        font-weight: 500;
+        font-size: 12px;
+    }
+    /* .day-off-status-person__item {
+    font-weight: 500;
+    font-size: 12px;
+    color: #646464;
+  } */
+}
+
+@media screen and (min-width: 768px) {
+    .day-off-button-container {
+        display: flex;
+        justify-content: center;
+        gap: 8px;
+        border: 1px solid #d9d9d9;
+        border-radius: 10px;
+        padding: 10px 5px;
+    }
+
+    .day-off-button {
+        width: 71px;
+        height: 22px;
+        border-radius: 4px;
+        font-weight: 500;
+        font-size: 12px;
+    }
+
+    .day-off-status-person__item {
+        font-weight: 500;
+        font-size: 14px;
+        color: #646464;
+    }
+}
+
+.custom-checkbox {
+    /* Hide the default checkbox */
+    appearance: none;
+    -webkit-appearance: none;
+    width: 20px;
+    height: 20px;
+    border-radius: 6px;
+    border: 1px solid #cfd3d4;
+    cursor: pointer;
+    position: relative;
+    background-color: #fff;
+    transition: all 0.2s ease-in-out;
+}
+
+    .custom-checkbox:checked {
+        background-color: #23a8a8;
+        border: 1px solid #ffffff !important;
+        outline: 1px solid #23a8a8;
+    }
+
+        .custom-checkbox:checked::after {
+            content: "";
+            position: absolute;
+            left: 6px;
+            top: 2px;
+            width: 6px;
+            height: 12px;
+            border: solid white;
+            border-width: 0 3px 3px 0;
+            transform: rotate(45deg);
+        }
+
+
+
+
+
+
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/WorkshopSettingGrouping.js b/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/WorkshopSettingGrouping.js
index 45fd14d1..723b8bd3 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/WorkshopSettingGrouping.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/WorkshopSettingGrouping.js
@@ -1,6 +1,34 @@
 var currentUrlGroup = window.location.href;
 
 $(document).ready(function () {
+	var buttons = document.querySelectorAll(".day-off-button");
+	buttons.forEach((button) => {
+		button.addEventListener("click", () => {
+			const isDiactive = button.classList.toggle("day-off-button__diactive");
+			button.classList.toggle("day-off-button__active");
+
+			const name = button.name;
+			const $checkbox = $("#" + name + "Input");
+
+			if ($checkbox.length === 0) {
+				console.warn(`Checkbox with id '${name}Input' not found.`);
+				return;
+			}
+
+			if (isDiactive) {
+				$checkbox.prop("checked", true).attr("checked", "checked");
+			} else {
+				$checkbox.prop("checked", false).removeAttr("checked");
+			}
+		});
+	});
+
+
+
+	document.querySelectorAll('.day-off-button').forEach(button => {
+		button.classList.add('day-off-button__active');
+	});
+
 	$(document).on("click", ".btn-cancel2", function () {
 		$('#MainModal').modal('toggle');
 	});
@@ -748,7 +776,7 @@ function loadWorkshopSettingList() {
 						$('#TimeOnly').val('');
 						$('#computeTime').addClass('disable');
 					}
-					
+					console.log(item);
 					$('#Friday1').prop('checked', (item.fridayWork === 0 ? true : false));
 					$('#Friday2').prop('checked', (item.fridayWork === 1 ? true : false));
 
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/WorkshopSetting/css/ModalCreateSettingWorkshop.css b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/WorkshopSetting/css/ModalCreateSettingWorkshop.css
index 6fad6ff4..62aa46db 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/WorkshopSetting/css/ModalCreateSettingWorkshop.css
+++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/WorkshopSetting/css/ModalCreateSettingWorkshop.css
@@ -6,7 +6,7 @@
 }
 
 .modal-dialog, .modal-content {
-    height: 460px;
+    height: 560px;
     width: 510px;
 }
 
@@ -125,7 +125,7 @@
         color: #1B929C;
     }
 
-    
+
 
 .radio-label-workTimeOption {
     font-size: 13px;
@@ -262,4 +262,4 @@
     .container, .container-sm {
         max-width: none;
     }
-}
\ No newline at end of file
+}
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/WorkshopSetting/css/ModalSettingWorkTime.css b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/WorkshopSetting/css/ModalSettingWorkTime.css
index e2a94942..2f9dd3c6 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/WorkshopSetting/css/ModalSettingWorkTime.css
+++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/WorkshopSetting/css/ModalSettingWorkTime.css
@@ -5,13 +5,14 @@
     border: 1px solid #eb3434 !important;
 }
 
-.modal-dialog, .modal-content {
-    height: 460px;
+.modal-dialog,
+.modal-content {
+    height: 560px;
     width: 510px;
 }
 
 .timeWorkTitle {
-    color: #5C5C5C;
+    color: #5c5c5c;
     font-weight: 600;
     font-size: 12px;
     margin: auto 0 auto 6px;
@@ -19,9 +20,9 @@
 }
 
 .groupBox {
-    background-color: #F5F5F5;
+    background-color: #f5f5f5;
     border-radius: 10px;
-    border: 1px solid #E7E7E7;
+    border: 1px solid #e7e7e7;
     padding: 6px;
     margin: 6px 3px;
 }
@@ -35,7 +36,8 @@
             opacity: 1; /* Firefox */
         }
 
-        .groupBox .form-control::-ms-input-placeholder { /* Edge 12-18 */
+        .groupBox .form-control::-ms-input-placeholder {
+            /* Edge 12-18 */
             color: #bfbfbf;
         }
 
@@ -43,7 +45,7 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    background-color: #84CC16;
+    background-color: #84cc16;
     border-radius: 5px;
     color: #ffffff;
     font-size: 12px;
@@ -55,7 +57,7 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    background-color: #F87171;
+    background-color: #f87171;
     border-radius: 7px;
     padding: 3px;
     width: 30px;
@@ -75,7 +77,6 @@
     justify-content: center;
 }
 
-
 .btn-workTimeOption-container {
     display: flex;
 }
@@ -87,8 +88,8 @@
 .radio-label-workTimeOption {
     font-size: 13px;
     font-weight: 500;
-    color: #0F8080;
-    background-color: #DDF4F4;
+    color: #0f8080;
+    background-color: #ddf4f4;
     text-align: center;
     padding: 8px 16px;
     border-radius: 4px;
@@ -98,20 +99,20 @@
 }
 
     .radio-label-workTimeOption:hover {
-        color: #FFFFFF;
+        color: #ffffff;
         background-color: #1c7474;
-        border-color: #23A8A8;
+        border-color: #23a8a8;
     }
 
 .radio-workTimeOption:checked + .radio-label-workTimeOption {
-    color: #FFFFFF;
-    background: linear-gradient(93.83deg, #2EBEBE 1.59%, #1E9D9D 47.86%, #0B7878 101.16%);
+    color: #ffffff;
+    background: linear-gradient( 93.83deg, #2ebebe 1.59%, #1e9d9d 47.86%, #0b7878 101.16% );
 }
 
 .show-disorganized {
     height: 81px;
-    background: #F2FEFF;
-    border: 1px solid #B0EBF0;
+    background: #f2feff;
+    border: 1px solid #b0ebf0;
     border-radius: 10px;
     display: flex;
     align-items: center;
@@ -122,16 +123,14 @@
     .show-disorganized p {
         font-weight: 500;
         font-size: 14px;
-        color: #1B929C;
+        color: #1b929c;
     }
 
-
-
 .radio-label-workTimeOption {
     font-size: 13px;
     font-weight: 500;
-    color: #0F8080;
-    background-color: #DDF4F4;
+    color: #0f8080;
+    background-color: #ddf4f4;
     text-align: center;
     padding: 8px 16px;
     border-radius: 9px;
@@ -141,20 +140,20 @@
 }
 
     .radio-label-workTimeOption:hover {
-        color: #FFFFFF;
+        color: #ffffff;
         background-color: #1c7474;
-        border-color: #23A8A8;
+        border-color: #23a8a8;
     }
 
 .radio-workTimeOption:checked + .radio-label-workTimeOption {
-    color: #FFFFFF;
-    background: linear-gradient(93.83deg, #2EBEBE 1.59%, #1E9D9D 47.86%, #0B7878 101.16%);
+    color: #ffffff;
+    background: linear-gradient( 93.83deg, #2ebebe 1.59%, #1e9d9d 47.86%, #0b7878 101.16% );
 }
 
 .show-disorganized {
     height: 81px;
-    background: #F2FEFF;
-    border: 1px solid #B0EBF0;
+    background: #f2feff;
+    border: 1px solid #b0ebf0;
     border-radius: 10px;
     display: flex;
     align-items: center;
@@ -165,7 +164,7 @@
     .show-disorganized p {
         font-weight: 500;
         font-size: 14px;
-        color: #1B929C;
+        color: #1b929c;
     }
 
 #computeTime span,
@@ -197,7 +196,7 @@
     height: 15px;
     border-radius: 6px;
     padding: 8px;
-    border: 1px solid #CFD3D4;
+    border: 1px solid #cfd3d4;
     background-color: white;
     background-position: center;
     background-size: contain;
@@ -214,32 +213,32 @@
         background-size: 75%;
     }
 
-.form-check-input[type=checkbox]:indeterminate {
-    background-color: #148989;
-    border-color: #ffffff;
-    --bs-form-check-bg-image: url(data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'%3e%3cpath fill='none' stroke='%23fff' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='M6 10h8'/%3e%3c/svg%3e);
-}
+    .form-check-input[type="checkbox"]:indeterminate {
+        background-color: #148989;
+        border-color: #ffffff;
+        --bs-form-check-bg-image: url( data:image/svg + xml, %3csvgxmlns="http://www.w3.org/2000/svg"viewBox="0 0 20 20"%3e%3cpathfill="none"stroke="%23fff"stroke-linecap="round"stroke-linejoin="round"stroke-width="3"d="M6 10h8"/%3e%3c/svg%3e );
+    }
 
-.form-check-input[type="radio"]:focus,
-.form-check-input[type="checkbox"]:focus {
-    outline: none;
-    box-shadow: none;
-}
+    .form-check-input[type="radio"]:focus,
+    .form-check-input[type="checkbox"]:focus {
+        outline: none;
+        box-shadow: none;
+    }
 
-.form-check-input[type="radio"] + label,
-.form-check-input[type="checkbox"] + label {
-    color: #83898C;
-}
+    .form-check-input[type="radio"] + label,
+    .form-check-input[type="checkbox"] + label {
+        color: #83898c;
+    }
 
-.form-check-input[type="radio"]:checked + label,
-.form-check-input[type="checkbox"]:checked + label {
-    color: #2B2F32;
-}
+    .form-check-input[type="radio"]:checked + label,
+    .form-check-input[type="checkbox"]:checked + label {
+        color: #2b2f32;
+    }
 /************************ Radio Button Input (Like Checkbox appearance) ************************/
 
-
 @media (max-width: 992px) {
-    .modal-dialog, .modal-content {
+    .modal-dialog,
+    .modal-content {
         /*height: 622px;*/
         height: 600px;
         width: auto;
@@ -259,7 +258,8 @@
 }
 
 @media (min-width: 576px) {
-    .container, .container-sm {
+    .container,
+    .container-sm {
         max-width: none;
     }
 }
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/WorkshopSetting/js/ModalCreateSettingWorkshop.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/WorkshopSetting/js/ModalCreateSettingWorkshop.js
index be556ea4..ef4c02c3 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/WorkshopSetting/js/ModalCreateSettingWorkshop.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/WorkshopSetting/js/ModalCreateSettingWorkshop.js
@@ -259,3 +259,28 @@ function saveNewWorkshopSetting() {
         }
     });
 }
+
+
+$(document).ready(function () {
+    var buttons = document.querySelectorAll(".day-off-button");
+    buttons.forEach((button) => {
+        button.addEventListener("click", () => {
+            const isDiactive = button.classList.toggle("day-off-button__diactive");
+            button.classList.toggle("day-off-button__active");
+
+            const name = button.name;
+            const $checkbox = $("#" + name + "Input");
+
+            if ($checkbox.length === 0) {
+                console.warn(`Checkbox with id '${name}Input' not found.`);
+                return;
+            }
+
+            if (isDiactive) {
+                $checkbox.prop("checked", true).attr("checked", "checked");
+            } else {
+                $checkbox.prop("checked", false).removeAttr("checked");
+            }
+        });
+    });
+});
\ No newline at end of file
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/WorkshopSetting/js/ModalSettingWorkTime.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/WorkshopSetting/js/ModalSettingWorkTime.js
index 577c8457..4ba6b6fc 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/WorkshopSetting/js/ModalSettingWorkTime.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/WorkshopSetting/js/ModalSettingWorkTime.js
@@ -344,3 +344,26 @@ function saveEditSettingWorkTime() {
         }
     });
 }
+$(document).ready(function () {
+    var buttons = document.querySelectorAll(".day-off-button");
+    buttons.forEach((button) => {
+        button.addEventListener("click", () => {
+            const isDiactive = button.classList.toggle("day-off-button__diactive");
+            button.classList.toggle("day-off-button__active");
+
+            const name = button.name;
+            const $checkbox = $("#" + name + "Input");
+
+            if ($checkbox.length === 0) {
+                console.warn(`Checkbox with id '${name}Input' not found.`);
+                return;
+            }
+
+            if (isDiactive) {
+                $checkbox.prop("checked", true).attr("checked", "checked");
+            } else {
+                $checkbox.prop("checked", false).removeAttr("checked");
+            }
+        });
+    });
+});
\ No newline at end of file
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/css/ModalTakeImages.css b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/css/ModalTakeImages.css
index af5b7523..1a9437b1 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/css/ModalTakeImages.css
+++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/css/ModalTakeImages.css
@@ -461,7 +461,7 @@ video {
 
 @media (max-width: 992px) {
     .modal-dialog, .modal-content {
-        height: 840px;
+        height: 860px;
     }
 }
 
@@ -484,4 +484,19 @@ video {
     .form-control {
         margin: 0 !important;
     }
+}
+
+
+.stick-to-bottom {
+    position: fixed;
+    bottom: 0px; /* adjust as needed */
+    left: 0;
+    right: 0;
+    width: 100%;
+    text-align: center;
+    z-index: 1000; /* to make sure it's on top */
+}
+
+#mobileDisplay{
+    height:800px;
 }
\ No newline at end of file
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditEmployeeGroup.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditEmployeeGroup.js
index 70032389..33ca458f 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditEmployeeGroup.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditEmployeeGroup.js
@@ -798,11 +798,16 @@ function saveDataLocal() {
         saveData[item.name] = item.value;
     });
 
+    const checkedValues = $('.weeklyOffDays-Input:checked').map(function () {
+        return $(this).val();
+    }).get();
 
     saveData['Command.BreakTime.HasBreakTimeValue'] = hasBreakTime;
     saveData['Command.BreakTime.BreakTimeValue'] = breakTimeValue;
     saveData['Command.FridayWork'] = FridayWork;
     saveData['Command.HolidayWork'] = HolidayWork;
+    saveData["Command.WeeklyOffDays"] = checkedValues;
+
 
     console.log(saveData);
 
@@ -886,4 +891,31 @@ async function postChangeEditEmployee() {
         $('#ConfirmRecalculationLoading').hide();
         $('.btn-confirm').removeClass('disable');
     }
-}
\ No newline at end of file
+}
+
+
+
+
+$(document).ready(function () {
+    var buttons = document.querySelectorAll(".day-off-button");
+    buttons.forEach((button) => {
+        button.addEventListener("click", () => {
+            const isDiactive = button.classList.toggle("day-off-button__diactive");
+            button.classList.toggle("day-off-button__active");
+
+            const name = button.name;
+            const $checkbox = $("#" + name + "Input");
+
+            if ($checkbox.length === 0) {
+                console.warn(`Checkbox with id '${name}Input' not found.`);
+                return;
+            }
+
+            if (isDiactive) {
+                $checkbox.prop("checked", true).attr("checked", "checked");
+            } else {
+                $checkbox.prop("checked", false).removeAttr("checked");
+            }
+        });
+    });
+});
\ No newline at end of file
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditGroup.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditGroup.js
index 7a329e6b..60ec1b36 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditGroup.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalEditGroup.js
@@ -16,6 +16,7 @@
             numeralThousandsGroupStyle: 'thousand'
         });
     });
+  
 
     $(".dateTime").each(function () {
         let element = $(this);
@@ -836,11 +837,16 @@ function saveDataLocal() {
         saveData[item.name] = item.value;
     });
 
+    const checkedValues = $('.weeklyOffDays-Input:checked').map(function () {
+        return $(this).val();
+    }).get();
+
     saveData['BreakTime.HasBreakTimeValue'] = hasBreakTime;
     saveData['BreakTime.BreakTimeValue'] = breakTimeValue;
     saveData['FridayWork'] = FridayWork;
     saveData['HolidayWork'] = HolidayWork;
     saveData['IsShiftChanged'] = isShiftChanged;
+    saveData["OffDayOfWeeks"] = checkedValues;
 }
 
 
@@ -968,4 +974,31 @@ async function saveReCalculateValues(command) {
         if (e.responseText) console.error('Response Text:', e.responseText);
         return false;
     }
-}
\ No newline at end of file
+}
+
+
+$(document).ready(function () {
+    var buttons = document.querySelectorAll(".day-off-button");
+    buttons.forEach((button) => {
+        button.addEventListener("click", () => {
+            const isDiactive = button.classList.toggle("day-off-button__diactive");
+            button.classList.toggle("day-off-button__active");
+
+            const name = button.name;
+            const $checkbox = $("#" + name + "Input");
+
+            if ($checkbox.length === 0) {
+                console.warn(`Checkbox with id '${name}Input' not found.`);
+                return;
+            }
+
+            if (isDiactive) {
+                $checkbox.prop("checked", true).attr("checked", "checked");
+            } else {
+                $checkbox.prop("checked", false).removeAttr("checked");
+            }
+        });
+    });
+});
+
+ 
\ No newline at end of file
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalTakeImages.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalTakeImages.js
index 0acded60..358945c2 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalTakeImages.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalTakeImages.js
@@ -12,8 +12,8 @@ var rollCallStatusIdTemp;
 
 $(document).ready(function () {
 
-	$("#next-step").on("click", function () {
-		if ($("#step-form2").is(":visible") && !hasUploadedImage) {
+    $("#next-step").on("click", function () {
+        if ($("#step-form2").is(":visible") && !hasUploadedImage) {
 
             if ($("#workshopSettingSelect").val() === "0") {
                 $('.alert-msg').show();
@@ -21,94 +21,101 @@ $(document).ready(function () {
                 $('.errorSelection').addClass("errored");
                 setTimeout(function () {
                     $('.alert-msg').hide();
-					$('.alert-msg p').text('');
+                    $('.alert-msg p').text('');
                     $('.errorSelection').removeClass("errored");
                 }, 2500);
             } else {
-			    set();
+                set();
             }
-		}
+        }
 
-		if ($('#step-form1').is(":visible")) {
-			$('#step-form1').hide();
-			$('#step-form2').show();
-			$('#step-2').removeClass('not-step');
-			$('#prev-step').text('مرحله قبل');
-			$('#next-step #textShowBtn').text('ثبت');
-		}
+        if ($('#step-form1').is(":visible")) {
+            $('#step-form1').hide();
+            $('#step-form2').show();
+            $('#step-2').removeClass('not-step');
+            $('#prev-step').text('مرحله قبل');
+            $('#next-step #textShowBtn').text('ثبت');
+
+        }
     });
 
-	$("#prev-step").on("click", function () {		
-		if ($('#desktopDisplay').is(":visible")) {
+    document.querySelectorAll('.day-off-button').forEach(button => {
+        button.classList.add('day-off-button__active');
+    });
+
+
+    $("#prev-step").on("click", function () {
+        if ($('#desktopDisplay').is(":visible")) {
             $("#MainModal").modal("hide");
-		}
-		if ($('#step-form1').is(":visible")) {
+        }
+        if ($('#step-form1').is(":visible")) {
             $("#MainModal").modal("hide");
-			$('#step-2').addClass('not-step');
-			$('#prev-step').text('انصراف');
-		}
-		if ($('#step-form2').is(":visible")) {
-			$('#step-form1').show();
-            $('#step-form2').hide();
-			$('#step-2').addClass('not-step');
+            $('#step-2').addClass('not-step');
             $('#prev-step').text('انصراف');
-			$('#next-step #textShowBtn').text('مرحله بعد');
-		}
+        }
+        if ($('#step-form2').is(":visible")) {
+            $('#step-form1').show();
+            $('#step-form2').hide();
+            $('#step-2').addClass('not-step');
+            $('#prev-step').text('انصراف');
+            $('#next-step #textShowBtn').text('مرحله بعد');
+        }
     });
+    //$('#prev-step').addClass('stick-to-bottom');
+    //$('#next-step').addClass('stick-to-bottom');
 
 
-
-	if ($(window).width() > 992) {
+    if ($(window).width() > 992) {
         if (hasUploadedImage) {
             $('#desktopDisplay').hide();
             $('#mobileDisplay').show();
-			$('#desktopDisplay').html('');
+            $('#desktopDisplay').html('');
 
-			$('#step-form1').show();
-			$('#step-form2').hide();
-			$('#next-step').removeClass('disable');
-			$('#step-2').addClass('not-step');
-            
-		} else {
-			$('#footerButtons #submitButton').remove();
-			$('#footerButtons #closeButton').removeClass('col-6').addClass('col-12');
+            $('#step-form1').show();
+            $('#step-form2').hide();
+            $('#next-step').removeClass('disable');
+            $('#step-2').addClass('not-step');
+
+        } else {
+            $('#footerButtons #submitButton').remove();
+            $('#footerButtons #closeButton').removeClass('col-6').addClass('col-12');
 
             $('#desktopDisplay').show();
             $('#mobileDisplay').hide();
-			$('#mobileDisplay').html('');
+            $('#mobileDisplay').html('');
         }
-	}
+    }
 
-	if ($(window).width() <= 992) {
-		//if (!hasUploadedImage) {
-            $('#desktopDisplay').hide();
-            $('#mobileDisplay').show();
-            $('#desktopDisplay').html('');
+    if ($(window).width() <= 992) {
+        //if (!hasUploadedImage) {
+        $('#desktopDisplay').hide();
+        $('#mobileDisplay').show();
+        $('#desktopDisplay').html('');
         //} else {
         //    $('#desktopDisplay').show();
         //    $('#mobileDisplay').hide();
         //    $('#mobileDisplay').html('');
         //}
-	}
+    }
 
-	$(document).on('click', '.upload-image1', function () {
-		$('.md-modal').addClass('md-show');
-		$('.take_snapshot1').show();
-		$('.take_snapshot2').hide();
-		startCamera();
-	});
+    $(document).on('click', '.upload-image1', function () {
+        $('.md-modal').addClass('md-show');
+        $('.take_snapshot1').show();
+        $('.take_snapshot2').hide();
+        startCamera();
+    });
 
-	$(document).on('click', '.upload-image2', function () {
-		$('.md-modal').addClass('md-show');
-		$('.take_snapshot1').hide();
-		$('.take_snapshot2').show();
-		startCamera();
-	});
+    $(document).on('click', '.upload-image2', function () {
+        $('.md-modal').addClass('md-show');
+        $('.take_snapshot1').hide();
+        $('.take_snapshot2').show();
+        startCamera();
+    });
 
-	$(document).on('click', '.camera_close', function () {
-		$('.md-modal').removeClass('md-show');
-		stopCamera();
-	});
+    $(document).on('click', '.camera_close', function () {
+        $('.md-modal').removeClass('md-show');
+        stopCamera();
+    });
 
     updateSaveButton();
 });
@@ -129,7 +136,7 @@ var modelsLoaded = false;
 //};
 
 var updateSaveButton = () => {
-	if (!hasErrorPic1 && checkFace1 && !hasErrorPic2 && checkFace2) {
+    if (!hasErrorPic1 && checkFace1 && !hasErrorPic2 && checkFace2) {
         $('#next-step').removeClass('disable');
     } else {
         $('#next-step').addClass('disable');
@@ -141,22 +148,22 @@ var runCheckFace1 = async () => {
     const img1 = document.getElementById('pic1');
 
     const detectionPromise1 = await faceapi.detectAllFaces(img1).withFaceLandmarks().withFaceDescriptors();
-    
-	if (detectionPromise1.length === 1) {
+
+    if (detectionPromise1.length === 1) {
         console.log('یک چهره در تصویر اول شناسایی شد');
 
         checkFace1 = true;
         hasErrorPic1 = false;
         $('#demoResult1').css('border', '2px dashed #148b8b');
-	} else if (detectionPromise1.length > 1) {
+    } else if (detectionPromise1.length > 1) {
         $('.alert-msg').show();
         $('.alert-msg p').text('بیش از یک چهره در تصویر اول شناسایی شد');
         setTimeout(function () {
             $('.alert-msg').hide();
             $('.alert-msg p').text('');
-		}, 4000);
+        }, 4000);
 
-		hasErrorPic1 = true;
+        hasErrorPic1 = true;
 
         $('#next-step').addClass('disable');
         $('.upload-image1').css('background', '#ff090940');
@@ -176,28 +183,28 @@ var runCheckFace1 = async () => {
         $('#demoResult1').css('border', '2px dashed #ff5c5c');
     }
     updateSaveButton();
-	$('#loadingImage1').hide();
+    $('#loadingImage1').hide();
 };
 
 var runCheckFace2 = async () => {
 
     const img2 = document.getElementById('pic2');
 
-	const detectionPromise2 = await faceapi.detectAllFaces(img2).withFaceLandmarks().withFaceDescriptors();
+    const detectionPromise2 = await faceapi.detectAllFaces(img2).withFaceLandmarks().withFaceDescriptors();
 
-	if (detectionPromise2.length === 1) {
-		console.log('یک چهره در تصویر دوم شناسایی شد');
+    if (detectionPromise2.length === 1) {
+        console.log('یک چهره در تصویر دوم شناسایی شد');
         checkFace2 = true;
-		hasErrorPic2 = false;
-  
+        hasErrorPic2 = false;
+
         $('#demoResult2').css('border', '2px dashed #148b8b');
-	} else if (detectionPromise2.length > 1) {
+    } else if (detectionPromise2.length > 1) {
         $('.alert-msg').show();
         $('.alert-msg p').text('بیش از یک چهره در تصویر دوم شناسایی شد');
         setTimeout(function () {
             $('.alert-msg').hide();
             $('.alert-msg p').text('');
-		}, 4000);
+        }, 4000);
 
         hasErrorPic2 = true;
 
@@ -219,7 +226,7 @@ var runCheckFace2 = async () => {
         $('#demoResult2').css('border', '2px dashed #ff5c5c');
     }
     updateSaveButton();
-	$('#loadingImage2').hide();
+    $('#loadingImage2').hide();
 };
 
 
@@ -228,64 +235,64 @@ var IMAGE_TYPES = JslibHtml5CameraPhoto.IMAGE_TYPES;
 
 // Check if videoElement is already declared to avoid redeclaration
 // if (typeof videoElement === 'undefined') {
-	var videoElement = document.getElementById('videoElement');
-	var cameraPhoto = new JslibHtml5CameraPhoto.default(videoElement);
+var videoElement = document.getElementById('videoElement');
+var cameraPhoto = new JslibHtml5CameraPhoto.default(videoElement);
 // }
 
 function startCamera() {
-	// startCameraMaxResolution
-	cameraPhoto.startCamera(FACING_MODES.USER).then(() => {
-		console.log('Camera started!');
-	}).catch((error) => {
-		console.log(error);
-		console.error('Camera not started!', error);
-	});
+    // startCameraMaxResolution
+    cameraPhoto.startCamera(FACING_MODES.USER).then(() => {
+        console.log('Camera started!');
+    }).catch((error) => {
+        console.log(error);
+        console.error('Camera not started!', error);
+    });
 }
 
 function stopCamera() {
-	cameraPhoto.stopCamera().then(() => {
-		console.log('Camera stopped!');
-	}).catch((error) => {
-		console.log('No camera to stop!:', error);
-	});
+    cameraPhoto.stopCamera().then(() => {
+        console.log('Camera stopped!');
+    }).catch((error) => {
+        console.log('No camera to stop!:', error);
+    });
 }
 
 function cropAndResizeImage(base64Str, newWidth, newHeight) {
-	return new Promise((resolve) => {
-		let img = new Image();
-		img.src = base64Str;
-		img.onload = () => {
-			let canvas = document.createElement('canvas');
-			let ctx = canvas.getContext('2d');
+    return new Promise((resolve) => {
+        let img = new Image();
+        img.src = base64Str;
+        img.onload = () => {
+            let canvas = document.createElement('canvas');
+            let ctx = canvas.getContext('2d');
 
-			let sideLength = Math.min(img.width, img.height);
-			let startX = (img.width - sideLength) / 2;
-			let startY = (img.height - sideLength) / 2;
+            let sideLength = Math.min(img.width, img.height);
+            let startX = (img.width - sideLength) / 2;
+            let startY = (img.height - sideLength) / 2;
 
-			canvas.width = newWidth;
-			canvas.height = newHeight;
+            canvas.width = newWidth;
+            canvas.height = newHeight;
 
-			ctx.drawImage(img, startX, startY, sideLength, sideLength, 0, 0, newWidth, newHeight);
-			resolve(canvas.toDataURL('image/jpeg'));
-		};
-	});
+            ctx.drawImage(img, startX, startY, sideLength, sideLength, 0, 0, newWidth, newHeight);
+            resolve(canvas.toDataURL('image/jpeg'));
+        };
+    });
 }
 
 function take_snapshot1() {
     $('#next-step').addClass('disable');
-	var sizeFactor = 1;
-	var imageType = IMAGE_TYPES.JPG;
-	var imageCompression = 1;
+    var sizeFactor = 1;
+    var imageType = IMAGE_TYPES.JPG;
+    var imageCompression = 1;
 
-	var config = {
-		sizeFactor,
-		imageType,
-		imageCompression
-	};
+    var config = {
+        sizeFactor,
+        imageType,
+        imageCompression
+    };
 
-	var dataUri = cameraPhoto.getDataUri(config);
-	cropAndResizeImage(dataUri, 1800, 1800).then((resizedDataUri) => {
-		document.getElementById('result1').innerHTML = '<img style="display:none; object-fit: cover;" id="pic1" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
+    var dataUri = cameraPhoto.getDataUri(config);
+    cropAndResizeImage(dataUri, 1800, 1800).then((resizedDataUri) => {
+        document.getElementById('result1').innerHTML = '<img style="display:none; object-fit: cover;" id="pic1" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
         document.getElementById('demoResult1').innerHTML =
             '<div class="closeImage" onclick="closeImage(\'image1\')">' +
             '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">' +
@@ -300,34 +307,34 @@ function take_snapshot1() {
             '<span class="visually-hidden">Loading...</span>' +
             '</div>' +
             '</div>' +
-			'<img style="width: 100%; height: 100%; border-radius:10px; object-fit: cover;" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
-		//document.getElementById('demoResult1').innerHTML = '<div class="closeImage" onclick="closeImage("image1")"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor"><path fill-rule="evenodd" d="M10 18a8 8 0 1 0 0-16 8 8 0 0 0 0 16ZM8.28 7.22a.75.75 0 0 0-1.06 1.06L8.94 10l-1.72 1.72a.75.75 0 1 0 1.06 1.06L10 11.06l1.72 1.72a.75.75 0 1 0 1.06-1.06L11.06 10l1.72-1.72a.75.75 0 0 0-1.06-1.06L10 8.94 8.28 7.22Z" clip-rule="evenodd" /></svg></div><button type="button" class="upload-image1"><p class="textUpload textUploaded">عکس اول</p></button><div class="loadingImage" id="loadingImage1"><div class="spinner-border" role="status"><span class="visually-hidden">Loading...</span></div></div><img style="width: 100%; height: 100%; border-radius:10px; object-fit: cover;" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
+            '<img style="width: 100%; height: 100%; border-radius:10px; object-fit: cover;" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
+        //document.getElementById('demoResult1').innerHTML = '<div class="closeImage" onclick="closeImage("image1")"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor"><path fill-rule="evenodd" d="M10 18a8 8 0 1 0 0-16 8 8 0 0 0 0 16ZM8.28 7.22a.75.75 0 0 0-1.06 1.06L8.94 10l-1.72 1.72a.75.75 0 1 0 1.06 1.06L10 11.06l1.72 1.72a.75.75 0 1 0 1.06-1.06L11.06 10l1.72-1.72a.75.75 0 0 0-1.06-1.06L10 8.94 8.28 7.22Z" clip-rule="evenodd" /></svg></div><button type="button" class="upload-image1"><p class="textUpload textUploaded">عکس اول</p></button><div class="loadingImage" id="loadingImage1"><div class="spinner-border" role="status"><span class="visually-hidden">Loading...</span></div></div><img style="width: 100%; height: 100%; border-radius:10px; object-fit: cover;" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
         $('#loadingImage1').css('display', 'flex');
         runCheckFace1();
-	}).catch((error) => {
-		console.error('Error cropping and resizing photo:', error);
-	});
+    }).catch((error) => {
+        console.error('Error cropping and resizing photo:', error);
+    });
 
-	$('.md-modal').removeClass('md-show');
+    $('.md-modal').removeClass('md-show');
 
-	stopCamera();
+    stopCamera();
 }
 
 function take_snapshot2() {
     $('#next-step').addClass('disable');
-	var sizeFactor = 1;
-	var imageType = IMAGE_TYPES.JPG;
-	var imageCompression = 1;
+    var sizeFactor = 1;
+    var imageType = IMAGE_TYPES.JPG;
+    var imageCompression = 1;
 
-	var config = {
-		sizeFactor,
-		imageType,
-		imageCompression
-	};
+    var config = {
+        sizeFactor,
+        imageType,
+        imageCompression
+    };
 
-	var dataUri = cameraPhoto.getDataUri(config);
-	cropAndResizeImage(dataUri, 1800, 1800).then((resizedDataUri) => {
-		document.getElementById('result2').innerHTML = '<img style="display:none; object-fit: cover;"  id="pic2" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
+    var dataUri = cameraPhoto.getDataUri(config);
+    cropAndResizeImage(dataUri, 1800, 1800).then((resizedDataUri) => {
+        document.getElementById('result2').innerHTML = '<img style="display:none; object-fit: cover;"  id="pic2" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
         document.getElementById('demoResult2').innerHTML =
             '<div class="closeImage" onclick="closeImage(\'image2\')">' +
             '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">' +
@@ -343,26 +350,26 @@ function take_snapshot2() {
             '</div>' +
             '</div>' +
             '<img style="width: 100%; height: 100%; border-radius:10px; object-fit: cover;" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
-		//document.getElementById('demoResult2').innerHTML = '<div class="closeImage" onclick="closeImage("image2")"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor"><path fill-rule="evenodd" d="M10 18a8 8 0 1 0 0-16 8 8 0 0 0 0 16ZM8.28 7.22a.75.75 0 0 0-1.06 1.06L8.94 10l-1.72 1.72a.75.75 0 1 0 1.06 1.06L10 11.06l1.72 1.72a.75.75 0 1 0 1.06-1.06L11.06 10l1.72-1.72a.75.75 0 0 0-1.06-1.06L10 8.94 8.28 7.22Z" clip-rule="evenodd" /></svg></div><button type="button" class="upload-image2"><p class="textUpload textUploaded">عکس دوم</p></button><div class="loadingImage" id="loadingImage2"><div class="spinner-border" role="status"><span class="visually-hidden">Loading...</span></div></div><img style="width: 100%; height: 100%; border-radius:10px; object-fit: cover;" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
+        //document.getElementById('demoResult2').innerHTML = '<div class="closeImage" onclick="closeImage("image2")"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor"><path fill-rule="evenodd" d="M10 18a8 8 0 1 0 0-16 8 8 0 0 0 0 16ZM8.28 7.22a.75.75 0 0 0-1.06 1.06L8.94 10l-1.72 1.72a.75.75 0 1 0 1.06 1.06L10 11.06l1.72 1.72a.75.75 0 1 0 1.06-1.06L11.06 10l1.72-1.72a.75.75 0 0 0-1.06-1.06L10 8.94 8.28 7.22Z" clip-rule="evenodd" /></svg></div><button type="button" class="upload-image2"><p class="textUpload textUploaded">عکس دوم</p></button><div class="loadingImage" id="loadingImage2"><div class="spinner-border" role="status"><span class="visually-hidden">Loading...</span></div></div><img style="width: 100%; height: 100%; border-radius:10px; object-fit: cover;" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
         $('#loadingImage2').css('display', 'flex');
         runCheckFace2();
-	}).catch((error) => {
-		console.error('Error cropping and resizing photo:', error);
-	});
+    }).catch((error) => {
+        console.error('Error cropping and resizing photo:', error);
+    });
 
-	$('.md-modal').removeClass('md-show');
-	stopCamera();
+    $('.md-modal').removeClass('md-show');
+    stopCamera();
 }
 
 function closeImage(type) {
-	if (type === "image1") {
+    if (type === "image1") {
         $('#demoResult1').html('');
         $('#demoResult1').html('<button type="button" class="upload-image1"><p class="textUpload">بارگذاری عکس اول</p></button>');
-		$('#demoResult1').removeAttr('style');
-	} else if (type === "image2") {
+        $('#demoResult1').removeAttr('style');
+    } else if (type === "image2") {
         $('#demoResult2').html('');
-		$('#demoResult2').html('<button type="button" class="upload-image2"><p class="textUpload">بارگذاری عکس دوم</p></button>');
-		$('#demoResult2').removeAttr('style');
+        $('#demoResult2').html('<button type="button" class="upload-image2"><p class="textUpload">بارگذاری عکس دوم</p></button>');
+        $('#demoResult2').removeAttr('style');
     } else {
         $('.alert-msg').show();
         $('.alert-msg p').text('خطایی رخ داده است.');
@@ -370,157 +377,162 @@ function closeImage(type) {
             $('.alert-msg').hide();
             $('.alert-msg p').text('');
         }, 4000);
-	}
+    }
 
     $('#next-step').addClass('disable');
 }
 
 async function set() {
-	let pic1 = $("#pic1").attr('src');
-	let pic2 = $("#pic2").attr('src');
-	const img1 = document.getElementById('pic1');
-	const img2 = document.getElementById('pic2');
+    let pic1 = $("#pic1").attr('src');
+    let pic2 = $("#pic2").attr('src');
+    const img1 = document.getElementById('pic1');
+    const img2 = document.getElementById('pic2');
 
-	let workshopId = Number($('#workshopId').val());
-	let employeeId = Number($('#employeeId').val());
+    let workshopId = Number($('#workshopId').val());
+    let employeeId = Number($('#employeeId').val());
 
-	if (!hasErrorPic1 && checkFace1 && !hasErrorPic2 && checkFace2) {
-		const detection1 = await faceapi.detectSingleFace(img1).withFaceLandmarks().withFaceDescriptor();
-		const detection2 = await faceapi.detectSingleFace(img2).withFaceLandmarks().withFaceDescriptor();
+    if (!hasErrorPic1 && checkFace1 && !hasErrorPic2 && checkFace2) {
+        const detection1 = await faceapi.detectSingleFace(img1).withFaceLandmarks().withFaceDescriptor();
+        const detection2 = await faceapi.detectSingleFace(img2).withFaceLandmarks().withFaceDescriptor();
 
-		const distance = faceapi.euclideanDistance(detection1.descriptor, detection2.descriptor);
-		if (distance > 0.45) {
-			$('.alert-msg').show();
-			$('.alert-msg p').text('چهره اول با چهره دوم مطابقت ندارد');
-			setTimeout(function () {
-				$('.alert-msg').hide();
-				$('.alert-msg p').text('');
-			}, 4000);
-			return;
-		}
+        const distance = faceapi.euclideanDistance(detection1.descriptor, detection2.descriptor);
+        if (distance > 0.45) {
+            $('.alert-msg').show();
+            $('.alert-msg p').text('چهره اول با چهره دوم مطابقت ندارد');
+            setTimeout(function () {
+                $('.alert-msg').hide();
+                $('.alert-msg p').text('');
+            }, 4000);
+            return;
+        }
 
-		//var command = $('#create-form').serializeArray();
+        //var command = $('#create-form').serializeArray();
 
-		//var dataGroupSettings = {
-		//	"base64pic1": pic1,
-		//	"base64pic2": pic2,
-		//	"workshopId": workshopId,
-		//	"employeeId": employeeId,
-		//}
+        //var dataGroupSettings = {
+        //	"base64pic1": pic1,
+        //	"base64pic2": pic2,
+        //	"workshopId": workshopId,
+        //	"employeeId": employeeId,
+        //}
 
-		//var hasbreaktime = "false";
-		//if ($('#breaktime').prop('checked')) {
-		//	hasbreaktime = $("#breaktime").prop("checked") ? "true" : "false";
-		//} else if ($('#breaktimefirst').prop('checked')) {
-		//	hasbreaktime = $("#breaktimefirst").prop("checked") ? "true" : "false";
-		//}
+        //var hasbreaktime = "false";
+        //if ($('#breaktime').prop('checked')) {
+        //	hasbreaktime = $("#breaktime").prop("checked") ? "true" : "false";
+        //} else if ($('#breaktimefirst').prop('checked')) {
+        //	hasbreaktime = $("#breaktimefirst").prop("checked") ? "true" : "false";
+        //}
 
-		//var breaktimevalue = $("#timeonly").val();
+        //var breaktimevalue = $("#timeonly").val();
 
-		//var fridaywork = "default";
-		//if ($('#friday1').prop('checked')) {
-		//	fridaywork = "default";
-		//} else if ($('#friday2').prop('checked')) {
-		//	fridaywork = "workinfriday";
-		//}
+        //var fridaywork = "default";
+        //if ($('#friday1').prop('checked')) {
+        //	fridaywork = "default";
+        //} else if ($('#friday2').prop('checked')) {
+        //	fridaywork = "workinfriday";
+        //}
 
 
-		//var holidaywork = "default";
-		//if ($('#offdays1').prop('checked')) {
-		//	holidaywork = "default";
-		//} else if ($('#offdays2').prop('checked')) {
-		//	holidaywork = "workinholidays";
-		//}
+        //var holidaywork = "default";
+        //if ($('#offdays1').prop('checked')) {
+        //	holidaywork = "default";
+        //} else if ($('#offdays2').prop('checked')) {
+        //	holidaywork = "workinholidays";
+        //}
 
 
-		//command.push({ name: 'command.breaktime.hasbreaktimevalue', value: hasbreaktime });
-		//command.push({ name: 'command.breaktime.breaktimevalue', value: breaktimevalue });
-		//command.push({ name: 'command.fridaywork', value: fridaywork });
-		//command.push({ name: 'command.holidaywork', value: holidaywork });
+        //command.push({ name: 'command.breaktime.hasbreaktimevalue', value: hasbreaktime });
+        //command.push({ name: 'command.breaktime.breaktimevalue', value: breaktimevalue });
+        //command.push({ name: 'command.fridaywork', value: fridaywork });
+        //command.push({ name: 'command.holidaywork', value: holidaywork });
 
-		//dataGroupSettings = $.param(command);
+        //dataGroupSettings = $.param(command);
 
-		//command.forEach(item => { dataGroupSettings[item.name] = item.value; });
+        //command.forEach(item => { dataGroupSettings[item.name] = item.value; });
 
 
-		var command = $('#create-form').serializeArray();
-		var dataGroupSettings = {
-			"base64pic1": pic1,
-			"base64pic2": pic2,
-			"workshopId": workshopId,
-			"employeeId": employeeId
-		};
+        var command = $('#create-form').serializeArray();
+        var dataGroupSettings = {
+            "base64pic1": pic1,
+            "base64pic2": pic2,
+            "workshopId": workshopId,
+            "employeeId": employeeId
+        };
 
-		var hasbreaktime = "false";
-		if ($('#BreakTime').prop('checked')) {
-			hasbreaktime = $("#BreakTime").prop("checked") ? "true" : "false";
-		} else if ($('#BreakTimeFirst').prop('checked')) {
-			hasbreaktime = $("#BreakTimeFirst").prop("checked") ? "true" : "false";
-		}
+        var hasbreaktime = "false";
+        if ($('#BreakTime').prop('checked')) {
+            hasbreaktime = $("#BreakTime").prop("checked") ? "true" : "false";
+        } else if ($('#BreakTimeFirst').prop('checked')) {
+            hasbreaktime = $("#BreakTimeFirst").prop("checked") ? "true" : "false";
+        }
 
-		var breaktimevalue = $("#TimeOnly").val();
+        var breaktimevalue = $("#TimeOnly").val();
 
-		var FridayWork = "Default";
-		if ($('#Friday1').prop('checked')) {
-			FridayWork = "Default";
-		} else if ($('#Friday2').prop('checked')) {
-			FridayWork = "WorkInFriday";
-		}
+        var FridayWork = "Default";
+        if ($('#Friday1').prop('checked')) {
+            FridayWork = "Default";
+        } else if ($('#Friday2').prop('checked')) {
+            FridayWork = "WorkInFriday";
+        }
 
-		var HolidayWork = "Default";
-		if ($('#HolidayWork1').prop('checked')) {
-			HolidayWork = "Default";
-		} else if ($('#HolidayWork2').prop('checked')) {
-			HolidayWork = "WorkInHolidays";
-		}
+        var HolidayWork = "Default";
+        if ($('#HolidayWork1').prop('checked')) {
+            HolidayWork = "Default";
+        } else if ($('#HolidayWork2').prop('checked')) {
+            HolidayWork = "WorkInHolidays";
+        }
+        const checkedValues = $('.weeklyOffDays-Input:checked').map(function () {
+            return $(this).val();
+        }).get();
+        
 
-		command.push({ name: 'Command.BreakTime.HasBreakTimeValue', value: hasbreaktime });
-		command.push({ name: 'Command.BreakTime.BreakTimeValue', value: breaktimevalue });
-		command.push({ name: 'Command.FridayWork', value: FridayWork });
-		command.push({ name: 'Command.HolidayWork', value: HolidayWork });
+        command.push({ name: 'Command.BreakTime.HasBreakTimeValue', value: hasbreaktime });
+        command.push({ name: 'Command.BreakTime.BreakTimeValue', value: breaktimevalue });
+        command.push({ name: 'Command.FridayWork', value: FridayWork });
+        command.push({ name: 'Command.HolidayWork', value: HolidayWork });
+        command.push({ name: 'Command.WeeklyOffDays', value: checkedValues });
 
-		command.forEach(item => { dataGroupSettings[item.name] = item.value; });
+        command.forEach(item => { dataGroupSettings[item.name] = item.value; });
 
 
 
-		if (pic1 != null && pic2 != null) {
-			const loading = $('.spinner-loading-progress').show();
-			const loadingBtn = $('.spinner-loading').show();
-			let startTime = Date.now();
+        if (pic1 != null && pic2 != null) {
+            const loading = $('.spinner-loading-progress').show();
+            const loadingBtn = $('.spinner-loading').show();
+            let startTime = Date.now();
 
-			$('#next-step').addClass('disable');
+            $('#next-step').addClass('disable');
 
-			$.ajax({
-				type: 'POST',
-				url: takePictureAjax,
-				data: dataGroupSettings,
-				headers: {
-					"RequestVerificationToken": antiForgeryToken
-				},
-				xhr: function () {
-					let xhr = new XMLHttpRequest();
-					// Track the progress of the upload
-					xhr.upload.onprogress = function (e) {
-						if (e.lengthComputable) {
-							var percentComplete = (e.loaded / e.total) * 100;
-							$('#progressBar').text(Math.round(percentComplete) + '%');
-							$('.spinner-loading-progress').css('width', `${Math.round(percentComplete)}%`);
-						}
-					};
-					return xhr;
-				},
-				success: function (response) {
-					let elapsedTime = Date.now() - startTime;
-					let delay = Math.max(1000 - elapsedTime, 0); 
+            $.ajax({
+                type: 'POST',
+                url: takePictureAjax,
+                data: dataGroupSettings,
+                headers: {
+                    "RequestVerificationToken": antiForgeryToken
+                },
+                xhr: function () {
+                    let xhr = new XMLHttpRequest();
+                    // Track the progress of the upload
+                    xhr.upload.onprogress = function (e) {
+                        if (e.lengthComputable) {
+                            var percentComplete = (e.loaded / e.total) * 100;
+                            $('#progressBar').text(Math.round(percentComplete) + '%');
+                            $('.spinner-loading-progress').css('width', `${Math.round(percentComplete)}%`);
+                        }
+                    };
+                    return xhr;
+                },
+                success: function (response) {
+                    let elapsedTime = Date.now() - startTime;
+                    let delay = Math.max(1000 - elapsedTime, 0);
 
-					setTimeout(function () {
-						if (response.isSuccedded) {
-							$('.alert-success-msg').show();
-							$('.alert-success-msg p').text(response.message);
-							setTimeout(function () {
-								$('.alert-success-msg').hide();
-								$('.alert-success-msg p').text('');
-							}, 1000);
+                    setTimeout(function () {
+                        if (response.isSuccedded) {
+                            $('.alert-success-msg').show();
+                            $('.alert-success-msg p').text(response.message);
+                            setTimeout(function () {
+                                $('.alert-success-msg').hide();
+                                $('.alert-success-msg p').text('');
+                            }, 1000);
 
                             $(`#ImageEmployee_${employeeId}`).attr("src", `data:image/jpeg;base64,${response.src}`);
                             $(`#ImageEmployeeMobile_${employeeId}`).attr("src", `data:image/jpeg;base64,${response.src}`);
@@ -529,30 +541,30 @@ async function set() {
 
 
 
-							$(`.changeNameBtn_${employeeId}`).removeClass('disable');
+                            $(`.changeNameBtn_${employeeId}`).removeClass('disable');
 
                             //if (!hasPicture) {
-							$(`.btnAvticeAction_${employeeId}`)
-								.removeClass('disable')
-								.addClass('btn-deactive')
-								.prop('disabled', false)
-								.prop('checked', true)
-								.attr('id', `togglePersonnelStatus_${response.id}_desktop`);
-                                $(`.IsActiveStringFind_${employeeId}`).attr('id', `IsActiveString_${employeeId}_desktop`).text("غیر فعال کردن");
+                            $(`.btnAvticeAction_${employeeId}`)
+                                .removeClass('disable')
+                                .addClass('btn-deactive')
+                                .prop('disabled', false)
+                                .prop('checked', true)
+                                .attr('id', `togglePersonnelStatus_${response.id}_desktop`);
+                            $(`.IsActiveStringFind_${employeeId}`).attr('id', `IsActiveString_${employeeId}_desktop`).text("غیر فعال کردن");
 
                             $(`.btnAvticeActionMobile_${employeeId}`)
-								.removeClass('disable')
+                                .removeClass('disable')
                                 .addClass('btn-deactive')
-								.prop('disabled', false)
-								.prop('checked', true)
-								.attr('id', `togglePersonnelStatus_${response.id}_mobile`);
-                                $(`.IsActiveStringFindMobile_${employeeId}`).attr('id', `IsActiveString_${employeeId}_mobile`).text("غیر فعال کردن");
+                                .prop('disabled', false)
+                                .prop('checked', true)
+                                .attr('id', `togglePersonnelStatus_${response.id}_mobile`);
+                            $(`.IsActiveStringFindMobile_${employeeId}`).attr('id', `IsActiveString_${employeeId}_mobile`).text("غیر فعال کردن");
                             //}
 
 
 
-							employeeIdTemp = employeeId;
-							rollCallStatusIdTemp = response.id;
+                            employeeIdTemp = employeeId;
+                            rollCallStatusIdTemp = response.id;
 
 
 
@@ -563,44 +575,44 @@ async function set() {
                             $(`#Section_${employeeId}`).removeClass("deactive");
                             $('#next-step').removeClass('disable');
 
-							//-----------------------------
+                            //-----------------------------
                             loadingBtn.hide();
 
-							$('#MainModal').modal('hide');
-							//-----------------------------
+                            $('#MainModal').modal('hide');
+                            //-----------------------------
 
-						} else {
-							$('#next-step').removeClass('disable');
-							$('.alert-msg').show();
-							$('.alert-msg p').text(response.message);
-							setTimeout(function () {
-								$('.alert-msg').hide();
-								$('.alert-msg p').text('');
-							}, 3500);
-							loadingBtn.hide();
-						}
-					}, delay); // Delay the hiding of the spinner
-				},
-				error: function (response) {
-					console.log(5, response);
-				}
-			});
-		} else {
-			$('.alert-msg').show();
-			$('.alert-msg p').text('گرفتن دو عکس الزامیست');
-			setTimeout(function () {
-				$('.alert-msg').hide();
-				$('.alert-msg p').text('');
-			}, 3500);
-		}
-	} else {
-		$('.alert-msg').show();
-		$('.alert-msg p').text('گرفتن دو عکس الزامیست');
-		setTimeout(function () {
-			$('.alert-msg').hide();
-			$('.alert-msg p').text('');
-		}, 3500);
-	}
+                        } else {
+                            $('#next-step').removeClass('disable');
+                            $('.alert-msg').show();
+                            $('.alert-msg p').text(response.message);
+                            setTimeout(function () {
+                                $('.alert-msg').hide();
+                                $('.alert-msg p').text('');
+                            }, 3500);
+                            loadingBtn.hide();
+                        }
+                    }, delay); // Delay the hiding of the spinner
+                },
+                error: function (response) {
+                    console.log(5, response);
+                }
+            });
+        } else {
+            $('.alert-msg').show();
+            $('.alert-msg p').text('گرفتن دو عکس الزامیست');
+            setTimeout(function () {
+                $('.alert-msg').hide();
+                $('.alert-msg p').text('');
+            }, 3500);
+        }
+    } else {
+        $('.alert-msg').show();
+        $('.alert-msg p').text('گرفتن دو عکس الزامیست');
+        setTimeout(function () {
+            $('.alert-msg').hide();
+            $('.alert-msg p').text('');
+        }, 3500);
+    }
 }
 
 
@@ -608,37 +620,37 @@ async function set() {
 // ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 $(document).ready(function () {
-	$(document).on("click", ".btn-cancel2", function () {
-		$('#MainModal').modal('toggle');
-	});
+    $(document).on("click", ".btn-cancel2", function () {
+        $('#MainModal').modal('toggle');
+    });
 
-	$(".money").each(function () {
-		let element = $(this);
+    $(".money").each(function () {
+        let element = $(this);
 
-		element.on('input', function () {
-			let value = convertPersianNumbersToEnglish(element.val());
-			element.val(value);
-		});
+        element.on('input', function () {
+            let value = convertPersianNumbersToEnglish(element.val());
+            element.val(value);
+        });
 
-		new Cleave('.money', {
-			numeral: true,
-			numeralThousandsGroupStyle: 'thousand'
-		});
-	});
+        new Cleave('.money', {
+            numeral: true,
+            numeralThousandsGroupStyle: 'thousand'
+        });
+    });
 
-	$(".dateTime").each(function () {
-		let element = $(this);
+    $(".dateTime").each(function () {
+        let element = $(this);
 
-		element.on('input', function () {
-			let value = convertPersianNumbersToEnglish(element.val());
-			element.val(value);
-		});
+        element.on('input', function () {
+            let value = convertPersianNumbersToEnglish(element.val());
+            element.val(value);
+        });
 
-		new Cleave(this, {
-			time: true,
-			timePattern: ['h', 'm']
-		});
-	});
+        new Cleave(this, {
+            time: true,
+            timePattern: ['h', 'm']
+        });
+    });
 
 
     $(".dateTimeRS").each(function () {
@@ -655,19 +667,19 @@ $(document).ready(function () {
         });
     });
 
-	$(".dateTimeIrregular").each(function () {
-		let element = $(this);
+    $(".dateTimeIrregular").each(function () {
+        let element = $(this);
 
-		element.on('input', function () {
-			let value = convertPersianNumbersToEnglish(element.val());
-			element.val(value);
-		});
+        element.on('input', function () {
+            let value = convertPersianNumbersToEnglish(element.val());
+            element.val(value);
+        });
 
-		new Cleave(this, {
-			time: true,
-			timePattern: ['h', 'm']
-		});
-	});
+        new Cleave(this, {
+            time: true,
+            timePattern: ['h', 'm']
+        });
+    });
 
     $(document).on("click", "#organized", function () {
         $('#step_workTimeOption').show();
@@ -679,7 +691,7 @@ $(document).ready(function () {
             $('.dateTime').each(function () {
                 updateAddButtonText(currentCount);
             });
-		}
+        }
 
         $('.irregularShiftWorkshopIrregularShiftsCheckBox').prop('checked', false);
         $('#irregularShiftsDateTime').addClass('disable');
@@ -708,120 +720,120 @@ $(document).ready(function () {
         $('#step_workTimeOptionIrregular').show();
     });
 
-	
-	$(document).on('change', '.irregularShiftWorkshopIrregularShiftsCheckBox',function () {
-		if ($('.irregularShiftWorkshopIrregularShiftsCheckBox:checked').length > 0) {
-			$('#irregularShiftsDateTime').removeClass('disable');
-			$('#irregularShiftsStartDateTime').focus();
-		} else {
-			$('#irregularShiftsDateTime').addClass('disable');
-			$('.irregularShiftWorkshopIrregularShiftsCheckBox').attr('checked', false);
-		}
 
-		$('.dateTimeIrregular').val('');
+    $(document).on('change', '.irregularShiftWorkshopIrregularShiftsCheckBox', function () {
+        if ($('.irregularShiftWorkshopIrregularShiftsCheckBox:checked').length > 0) {
+            $('#irregularShiftsDateTime').removeClass('disable');
+            $('#irregularShiftsStartDateTime').focus();
+        } else {
+            $('#irregularShiftsDateTime').addClass('disable');
+            $('.irregularShiftWorkshopIrregularShiftsCheckBox').attr('checked', false);
+        }
 
-		updateIrregularButton();
-	});
+        $('.dateTimeIrregular').val('');
 
-	$('#BreakTime, #BreakTimeFirst').on('change', function () {
+        updateIrregularButton();
+    });
 
-		$('#BreakTime, #BreakTimeFirst').not(this).prop('checked', false);
+    $('#BreakTime, #BreakTimeFirst').on('change', function () {
+
+        $('#BreakTime, #BreakTimeFirst').not(this).prop('checked', false);
 
         if ($("#organized").is(":Checked")) {
             var currentCount = $('.groupBox').length;
 
         } else if ($("#rotating_shift").is(":Checked")) {
             var currentCount = $('.groupBoxRS').length;
-		}
+        }
 
-		if (currentCount >= 2) {
-			showAlert('به دلیل داشتن 2 یا 3 نوبت، امکان فعال سازی ساعت استراحت ندارید', $(this));
-			$(this).prop('checked', false);
-			$("#hour").val("00");
-			$("#min").val("00");
-			$('#computeTimeText').text('');
-			$('#computeTime').addClass('disable');
-			return false;
-		}
+        if (currentCount >= 2) {
+            showAlert('به دلیل داشتن 2 یا 3 نوبت، امکان فعال سازی ساعت استراحت ندارید', $(this));
+            $(this).prop('checked', false);
+            $("#hour").val("00");
+            $("#min").val("00");
+            $('#computeTimeText').text('');
+            $('#computeTime').addClass('disable');
+            return false;
+        }
 
-		if ($('#BreakTime').is(':Checked')) {
-			$("#hour").val("00");
-			$("#min").val("00");
-			$('#computeTimeText').text('');
-			$('#computeTime').removeClass('disable');
-			$("#TimeOnly").val('');
-		} else {
-			$("#hour").val("00");
-			$("#min").val("00");
-			$('#computeTimeText').text('');
-			$('#computeTime').addClass('disable');
-			$("#TimeOnly").val('');
-		}
-	});
+        if ($('#BreakTime').is(':Checked')) {
+            $("#hour").val("00");
+            $("#min").val("00");
+            $('#computeTimeText').text('');
+            $('#computeTime').removeClass('disable');
+            $("#TimeOnly").val('');
+        } else {
+            $("#hour").val("00");
+            $("#min").val("00");
+            $('#computeTimeText').text('');
+            $('#computeTime').addClass('disable');
+            $("#TimeOnly").val('');
+        }
+    });
 
-	$('select[name="Command.selectCheckBreakTime"]').on('change', function () {
-		if (parseInt($("#hour").val(), 10) === 3) {
-			$("#min").val("00");
-		}
-		// $('#computeTimeText').text($("#hour").val() + ' ساعت ' + $("#min").val() + ' دقیقه ');
+    $('select[name="Command.selectCheckBreakTime"]').on('change', function () {
+        if (parseInt($("#hour").val(), 10) === 3) {
+            $("#min").val("00");
+        }
+        // $('#computeTimeText').text($("#hour").val() + ' ساعت ' + $("#min").val() + ' دقیقه ');
 
-		$("#TimeOnly").val($("#hour").val() + ':' + $("#min").val());
-	});
+        $("#TimeOnly").val($("#hour").val() + ':' + $("#min").val());
+    });
 
 
-	//$(document).on("click", ".btnAddTimeWork", function () {
-	$(document).off("click", ".btnAddTimeWork").on("click", ".btnAddTimeWork", function () {
-		var currentCount = $('.groupBox').length;
-		var $inputs = $('.dateTime');
-		var allFilled = true;
+    //$(document).on("click", ".btnAddTimeWork", function () {
+    $(document).off("click", ".btnAddTimeWork").on("click", ".btnAddTimeWork", function () {
+        var currentCount = $('.groupBox').length;
+        var $inputs = $('.dateTime');
+        var allFilled = true;
 
-		if ($("#BreakTime").is(':Checked') && parseInt($("#hour").val(), 10) === 3) {
-			showAlert('به دلیل داشتن 3 ساعت استراحت، بیشتر از نوبت اول نمیتوانید ایجاد نمائید.', $(this));
-			return false;
-		}
+        if ($("#BreakTime").is(':Checked') && parseInt($("#hour").val(), 10) === 3) {
+            showAlert('به دلیل داشتن 3 ساعت استراحت، بیشتر از نوبت اول نمیتوانید ایجاد نمائید.', $(this));
+            return false;
+        }
 
-		console.log($inputs.val());
+        console.log($inputs.val());
 
-		$inputs.each(function () {
-			if ($(this).val() === '') {
-				allFilled = false;
-				showAlert('ابتدا ساعت شروع و پایان را وارد نمائید.', $(this));
-			}
-		});
+        $inputs.each(function () {
+            if ($(this).val() === '') {
+                allFilled = false;
+                showAlert('ابتدا ساعت شروع و پایان را وارد نمائید.', $(this));
+            }
+        });
 
-		if (!allFilled) {
-			return false;
-		}
+        if (!allFilled) {
+            return false;
+        }
 
-		if (currentCount >= 1) {
-			$('#BreakTime').prop('checked', false);
-			$('#BreakTimeFirst').prop('checked', false);
-			$('#computeTimeText').text('');
-			$("#hour").val("00");
-			$("#min").val("00");
-			$('#computeTime').addClass('disable');
-		} else {
-			$('#computeTime').removeClass('disable');
-		}
+        if (currentCount >= 1) {
+            $('#BreakTime').prop('checked', false);
+            $('#BreakTimeFirst').prop('checked', false);
+            $('#computeTimeText').text('');
+            $("#hour").val("00");
+            $("#min").val("00");
+            $('#computeTime').addClass('disable');
+        } else {
+            $('#computeTime').removeClass('disable');
+        }
 
 
-		if (currentCount < 3) {
-			var namePlacement = "";
-			var namePlacementPersian = "";
+        if (currentCount < 3) {
+            var namePlacement = "";
+            var namePlacementPersian = "";
 
-			switch (currentCount + 1) {
-				case 2:
-					namePlacement = "Second";
-					namePlacementPersian = "دوم";
-					break;
-				case 3:
-					namePlacement = "Third";
-					namePlacementPersian = "سوم";
-					break;
-				default:
-			}
+            switch (currentCount + 1) {
+                case 2:
+                    namePlacement = "Second";
+                    namePlacementPersian = "دوم";
+                    break;
+                case 3:
+                    namePlacement = "Third";
+                    namePlacementPersian = "سوم";
+                    break;
+                default:
+            }
 
-			var timeWorkHtml = `
+            var timeWorkHtml = `
 					<div class="groupBox timeWork">
 						<div class="row align-items-center justify-content-between">
 							<div class="col-2 d-flex align-items-center">
@@ -847,112 +859,112 @@ $(document).ready(function () {
 						</div>
 					</div>`;
 
-			$('#appendChildTimeWorkHtml').append(timeWorkHtml);
+            $('#appendChildTimeWorkHtml').append(timeWorkHtml);
 
-			const newStartTimeInput = $(`input[name="Command.ShiftViewModel[${currentCount}].StartTime"]`);
-			const newEndTimeInput = $(`input[name="Command.ShiftViewModel[${currentCount}].EndTime"]`);
+            const newStartTimeInput = $(`input[name="Command.ShiftViewModel[${currentCount}].StartTime"]`);
+            const newEndTimeInput = $(`input[name="Command.ShiftViewModel[${currentCount}].EndTime"]`);
 
-			newStartTimeInput.on('input', function () {
-				const value = convertPersianNumbersToEnglish($(this).val());
-				$(this).val(value);
-			});
+            newStartTimeInput.on('input', function () {
+                const value = convertPersianNumbersToEnglish($(this).val());
+                $(this).val(value);
+            });
 
-			newEndTimeInput.on('input', function () {
-				const value = convertPersianNumbersToEnglish($(this).val());
-				$(this).val(value);
-			});
+            newEndTimeInput.on('input', function () {
+                const value = convertPersianNumbersToEnglish($(this).val());
+                $(this).val(value);
+            });
 
-			new Cleave(newStartTimeInput[0], {
-				time: true,
-				timePattern: ['h', 'm']
-			});
+            new Cleave(newStartTimeInput[0], {
+                time: true,
+                timePattern: ['h', 'm']
+            });
 
-			new Cleave(newEndTimeInput[0], {
-				time: true,
-				timePattern: ['h', 'm']
-			});
+            new Cleave(newEndTimeInput[0], {
+                time: true,
+                timePattern: ['h', 'm']
+            });
 
-			new Cleave(`input[name="Command.ShiftViewModel[${currentCount}].StartTime"]`, {
-				time: true,
-				timePattern: ['h', 'm']
-			});
+            new Cleave(`input[name="Command.ShiftViewModel[${currentCount}].StartTime"]`, {
+                time: true,
+                timePattern: ['h', 'm']
+            });
 
-			new Cleave(`input[name="Command.ShiftViewModel[${currentCount}].EndTime"]`, {
-				time: true,
-				timePattern: ['h', 'm']
-			});
+            new Cleave(`input[name="Command.ShiftViewModel[${currentCount}].EndTime"]`, {
+                time: true,
+                timePattern: ['h', 'm']
+            });
 
-			updateAddButtonText(currentCount + 1);
+            updateAddButtonText(currentCount + 1);
 
-			if (currentCount + 1 === 3) {
-				$(".btnAddTimeWork").hide();
-			}
+            if (currentCount + 1 === 3) {
+                $(".btnAddTimeWork").hide();
+            }
 
-			// Update Remove button enable/disable state
-			updateRemoveButtons();
-		}
-	});
+            // Update Remove button enable/disable state
+            updateRemoveButtons();
+        }
+    });
 
-	//$(document).on("click", ".btnAddTimeWorkRS", function () {
-	$(document).off("click", ".btnAddTimeWorkRS").on("click", ".btnAddTimeWorkRS", function () {
-		var currentCount = $('.groupBoxRS').length;
-		var $inputs = $('.dateTimeRS');
-		var allFilled = true;
+    //$(document).on("click", ".btnAddTimeWorkRS", function () {
+    $(document).off("click", ".btnAddTimeWorkRS").on("click", ".btnAddTimeWorkRS", function () {
+        var currentCount = $('.groupBoxRS').length;
+        var $inputs = $('.dateTimeRS');
+        var allFilled = true;
 
-		if ($("#BreakTime").is(':Checked') && parseInt($("#hour").val(), 10) === 3) {
-			showAlert('به دلیل داشتن 3 ساعت استراحت، بیشتر از نوبت اول نمیتوانید ایجاد نمائید.', $(this));
-			return false;
-		}
+        if ($("#BreakTime").is(':Checked') && parseInt($("#hour").val(), 10) === 3) {
+            showAlert('به دلیل داشتن 3 ساعت استراحت، بیشتر از نوبت اول نمیتوانید ایجاد نمائید.', $(this));
+            return false;
+        }
 
-		$inputs.each(function () {
-			if ($(this).val() === '') {
-				allFilled = false;
-				showAlert('ابتدا ساعت شروع و پایان را وارد نمائید.', $(this));
-			}
-		});
+        $inputs.each(function () {
+            if ($(this).val() === '') {
+                allFilled = false;
+                showAlert('ابتدا ساعت شروع و پایان را وارد نمائید.', $(this));
+            }
+        });
 
-		if (!allFilled) {
-			return false;
-		}
+        if (!allFilled) {
+            return false;
+        }
 
-		if (currentCount >= 1) {
-			$('#BreakTime').prop('checked', false);
-			$('#BreakTimeFirst').prop('checked', false);
-			$('#computeTimeText').text('');
-			$("#hour").val("0");
-			$("#min").val("00");
-			$('#computeTime').addClass('disable');
-			$("#TimeOnly").val('');
-		} else {
-			$('#computeTime').removeClass('disable');
-		}
+        if (currentCount >= 1) {
+            $('#BreakTime').prop('checked', false);
+            $('#BreakTimeFirst').prop('checked', false);
+            $('#computeTimeText').text('');
+            $("#hour").val("0");
+            $("#min").val("00");
+            $('#computeTime').addClass('disable');
+            $("#TimeOnly").val('');
+        } else {
+            $('#computeTime').removeClass('disable');
+        }
 
 
-		if (currentCount < 5) {
-			var namePlacement = "";
-			var namePlacementPersian = "";
+        if (currentCount < 5) {
+            var namePlacement = "";
+            var namePlacementPersian = "";
 
-			switch (currentCount + 1) {
-				case 2:
-					namePlacement = "Second";
-					namePlacementPersian = "دوم";
-					break;
-				case 3:
-					namePlacement = "Third";
-					namePlacementPersian = "سوم";
-					break;
-				case 4:
-					namePlacement = "Third";
-					namePlacementPersian = "چهارم";
-					break;
-				case 5:
-					namePlacement = "Third";
-					namePlacementPersian = "پنجم";
-					break;
-				default:
-			}
+            switch (currentCount + 1) {
+                case 2:
+                    namePlacement = "Second";
+                    namePlacementPersian = "دوم";
+                    break;
+                case 3:
+                    namePlacement = "Third";
+                    namePlacementPersian = "سوم";
+                    break;
+                case 4:
+                    namePlacement = "Third";
+                    namePlacementPersian = "چهارم";
+                    break;
+                case 5:
+                    namePlacement = "Third";
+                    namePlacementPersian = "پنجم";
+                    break;
+                default:
+            }
 
-			var timeWorkHtml = `
+            var timeWorkHtml = `
                 <div class="groupBoxRS timeWorkRS">
                     <div class="row align-items-center justify-content-between">
                         <div class="col-3 d-flex align-items-center">
@@ -977,57 +989,57 @@ $(document).ready(function () {
                     </div>
                 </div>`;
 
-			$('#appendChildTimeWorkHtmlRS').append(timeWorkHtml);
+            $('#appendChildTimeWorkHtmlRS').append(timeWorkHtml);
 
-			const newStartTimeInput = $(`input[name="Command.CustomizeRotatingShifts[${currentCount}].StartTime"]`);
-			const newEndTimeInput = $(`input[name="Command.CustomizeRotatingShifts[${currentCount}].EndTime"]`);
+            const newStartTimeInput = $(`input[name="Command.CustomizeRotatingShifts[${currentCount}].StartTime"]`);
+            const newEndTimeInput = $(`input[name="Command.CustomizeRotatingShifts[${currentCount}].EndTime"]`);
 
-			newStartTimeInput.on('input', function () {
-				const value = convertPersianNumbersToEnglish($(this).val());
-				$(this).val(value);
-			});
+            newStartTimeInput.on('input', function () {
+                const value = convertPersianNumbersToEnglish($(this).val());
+                $(this).val(value);
+            });
 
-			newEndTimeInput.on('input', function () {
-				const value = convertPersianNumbersToEnglish($(this).val());
-				$(this).val(value);
-			});
+            newEndTimeInput.on('input', function () {
+                const value = convertPersianNumbersToEnglish($(this).val());
+                $(this).val(value);
+            });
 
-			new Cleave(newStartTimeInput[0], {
-				time: true,
-				timePattern: ['h', 'm']
-			});
+            new Cleave(newStartTimeInput[0], {
+                time: true,
+                timePattern: ['h', 'm']
+            });
 
-			new Cleave(newEndTimeInput[0], {
-				time: true,
-				timePattern: ['h', 'm']
-			});
+            new Cleave(newEndTimeInput[0], {
+                time: true,
+                timePattern: ['h', 'm']
+            });
 
 
-			updateAddButtonTextRS(currentCount + 1);
+            updateAddButtonTextRS(currentCount + 1);
 
-			if (currentCount + 1 === 4) {
-				$(".btnAddTimeWorkRS").hide();
-			}
+            if (currentCount + 1 === 4) {
+                $(".btnAddTimeWorkRS").hide();
+            }
 
-			// Update Remove button enable/disable state
-			updateRemoveButtonsRS();
-		}
-	});
+            // Update Remove button enable/disable state
+            updateRemoveButtonsRS();
+        }
+    });
 
-	$(document).on("click", ".btnRemoveTimeWork", function () {
-		$(".btnAddTimeWork").removeClass('d-none');
-		$(this).closest(".groupBox").remove();
-		var currentCount = $('.groupBox').length;
+    $(document).on("click", ".btnRemoveTimeWork", function () {
+        $(".btnAddTimeWork").removeClass('d-none');
+        $(this).closest(".groupBox").remove();
+        var currentCount = $('.groupBox').length;
 
-		updateAddButtonText(currentCount);
+        updateAddButtonText(currentCount);
 
-		if (currentCount < 3) {
-			$(".btnAddTimeWork").show();
-		}
+        if (currentCount < 3) {
+            $(".btnAddTimeWork").show();
+        }
 
-		// Update Remove button enable/disable state
-		updateRemoveButtons();
-	});
+        // Update Remove button enable/disable state
+        updateRemoveButtons();
+    });
 
     $(document).on("click", ".btnRemoveTimeWorkRS", function () {
         $(this).closest(".groupBoxRS").remove();
@@ -1046,8 +1058,8 @@ $(document).ready(function () {
 
 
 function updateRemoveButtons() {
-	$(".btnRemoveTimeWork").addClass("disable");
-	$(".btnRemoveTimeWork").last().removeClass("disable");
+    $(".btnRemoveTimeWork").addClass("disable");
+    $(".btnRemoveTimeWork").last().removeClass("disable");
 }
 function updateRemoveButtonsRS() {
     $(".btnRemoveTimeWorkRS").addClass("disable");
@@ -1055,26 +1067,26 @@ function updateRemoveButtonsRS() {
 }
 
 function updateAddButtonText(currentCount) {
-	if (currentCount === 1) {
-		$('.btnAppendChildTimeWork').text('افزودن نوبت دوم');
-	} else if (currentCount === 2) {
-		$('.btnAppendChildTimeWork').text('افزودن نوبت سوم');
-	}
+    if (currentCount === 1) {
+        $('.btnAppendChildTimeWork').text('افزودن نوبت دوم');
+    } else if (currentCount === 2) {
+        $('.btnAppendChildTimeWork').text('افزودن نوبت سوم');
+    }
 
-	let allFilled = true;
-	$('.dateTime').each(function () {
-		const value = $(this).val().trim();
-		if (value === "" || !timeValidCheck(value)) {
-			allFilled = false;
-			return false; // Break the loop
-		}
-	});
+    let allFilled = true;
+    $('.dateTime').each(function () {
+        const value = $(this).val().trim();
+        if (value === "" || !timeValidCheck(value)) {
+            allFilled = false;
+            return false; // Break the loop
+        }
+    });
 
-	if (allFilled) {
-		$('#next-step').removeClass('disable');
-	} else {
-		$('#next-step').addClass('disable');
-	}
+    if (allFilled) {
+        $('#next-step').removeClass('disable');
+    } else {
+        $('#next-step').addClass('disable');
+    }
 }
 
 function updateAddButtonTextRS(currentCount) {
@@ -1096,29 +1108,29 @@ function updateAddButtonTextRS(currentCount) {
             return false;
         }
     });
-	
-	if (allFilled) {
-		$('#next-step').removeClass('disable');
-	} else {
-		$('#next-step').addClass('disable');
-	}
+
+    if (allFilled) {
+        $('#next-step').removeClass('disable');
+    } else {
+        $('#next-step').addClass('disable');
+    }
 }
 
 function updateIrregularButton() {
-	let allFilled = true;
-	$('.dateTimeIrregular').each(function () {
-		const value = $(this).val().trim();
-		if (value === "" || !timeValidCheck(value)) {
-			allFilled = false;
-			return false;
-		}
-	});
+    let allFilled = true;
+    $('.dateTimeIrregular').each(function () {
+        const value = $(this).val().trim();
+        if (value === "" || !timeValidCheck(value)) {
+            allFilled = false;
+            return false;
+        }
+    });
 
-	if (allFilled) {
-		$('#next-step').removeClass('disable');
-	} else {
-		$('#next-step').addClass('disable');
-	}
+    if (allFilled) {
+        $('#next-step').removeClass('disable');
+    } else {
+        $('#next-step').addClass('disable');
+    }
 }
 
 //******************** برای نوشتن تاریخ ********************
@@ -1129,25 +1141,25 @@ function updateIrregularButton() {
 //});
 
 $(document).on('keyup', ".dateTime", function () {
-	let $input = $(this);
-	let value = $input.val();
-	let lengthValue = value.length;
-	let currentCount = $('.groupBox').length;
+    let $input = $(this);
+    let value = $input.val();
+    let lengthValue = value.length;
+    let currentCount = $('.groupBox').length;
 
-	if (lengthValue >= 5) {
-		if (!timeValidCheck(value)) {
-			showAlert('ساعت را به درستی وارد نمائید', $input);
-			updateAddButtonText(currentCount);
-		} else {
-			clearAlert($input);
-			// validateAllTimes();
-			updateAddButtonText(currentCount);
+    if (lengthValue >= 5) {
+        if (!timeValidCheck(value)) {
+            showAlert('ساعت را به درستی وارد نمائید', $input);
+            updateAddButtonText(currentCount);
+        } else {
+            clearAlert($input);
+            // validateAllTimes();
+            updateAddButtonText(currentCount);
 
-			//focusNextTimeInput($input);
-		}
-	} else {
-		updateAddButtonText(currentCount);
-	}
+            //focusNextTimeInput($input);
+        }
+    } else {
+        updateAddButtonText(currentCount);
+    }
 });
 
 $(document).on("keyup", ".dateTimeRS", function () {
@@ -1170,305 +1182,305 @@ $(document).on("keyup", ".dateTimeRS", function () {
 });
 
 $(document).on("keyup", ".dateTimeIrregular", function () {
-	let $input = $(this);
-	let value = $input.val();
-	let lengthValue = value.length;
+    let $input = $(this);
+    let value = $input.val();
+    let lengthValue = value.length;
 
-	if (lengthValue >= 5) {
-		if (!timeValidCheck(value)) {
-			showAlert('ساعت را به درستی وارد نمائید', $input);
-		} else {
-			clearAlert($input);
-		}
-	}
-	updateIrregularButton();
+    if (lengthValue >= 5) {
+        if (!timeValidCheck(value)) {
+            showAlert('ساعت را به درستی وارد نمائید', $input);
+        } else {
+            clearAlert($input);
+        }
+    }
+    updateIrregularButton();
 });
 
 $(document).on("keyup", "#irregularShiftsStartDateTime", function () {
-	let $input = $(this);
-	let value = $input.val();
+    let $input = $(this);
+    let value = $input.val();
 
-	let timeRegex = /^([01]\d|2[0-3]):([0-5]\d)$/;
-	if (!timeRegex.test(value)) {
-		$("#irregularShiftsEndDateTime").val("");
-		return;
-	}
+    let timeRegex = /^([01]\d|2[0-3]):([0-5]\d)$/;
+    if (!timeRegex.test(value)) {
+        $("#irregularShiftsEndDateTime").val("");
+        return;
+    }
 
-	let [hours, minutes] = value.split(":").map(Number);
+    let [hours, minutes] = value.split(":").map(Number);
 
-	let hoursToAdd = 0;
-	if ($("#TwelveTwentyFour").is(":checked")) {
-		hoursToAdd = 12;
-	} else if ($("#TwentyFourTwentyFour").is(":checked")) {
-		hoursToAdd = 24;
-	} else if ($("#TwelveThirtySix").is(":checked")) {
-		hoursToAdd = 12;
-	} else if ($("#TwentyFourFortyEight").is(":checked")) {
-		hoursToAdd = 24;
-	}
+    let hoursToAdd = 0;
+    if ($("#TwelveTwentyFour").is(":checked")) {
+        hoursToAdd = 12;
+    } else if ($("#TwentyFourTwentyFour").is(":checked")) {
+        hoursToAdd = 24;
+    } else if ($("#TwelveThirtySix").is(":checked")) {
+        hoursToAdd = 12;
+    } else if ($("#TwentyFourFortyEight").is(":checked")) {
+        hoursToAdd = 24;
+    }
 
-	let endHours = (hours + hoursToAdd) % 24;
-	let endTime = `${endHours.toString().padStart(2, "00")}:${minutes.toString().padStart(2, "00")}`;
+    let endHours = (hours + hoursToAdd) % 24;
+    let endTime = `${endHours.toString().padStart(2, "00")}:${minutes.toString().padStart(2, "00")}`;
 
-	let maxHours = hours + 12;
-	if (endHours > maxHours) {
-		$("#irregularShiftsEndDateTime").val("");
-		return;
-	}
+    let maxHours = hours + 12;
+    if (endHours > maxHours) {
+        $("#irregularShiftsEndDateTime").val("");
+        return;
+    }
 
-	$("#irregularShiftsEndDateTime").val(endTime);
+    $("#irregularShiftsEndDateTime").val(endTime);
 
-	updateIrregularButton();
+    updateIrregularButton();
 });
 
 $(document).on("keyup", "#irregularShiftsEndDateTime", function () {
-	if ($("#TwelveTwentyFour").is(":checked") || $("#TwelveThirtySix").is(":checked")) {
-		let $input = $(this);
-		let value = $input.val();
+    if ($("#TwelveTwentyFour").is(":checked") || $("#TwelveThirtySix").is(":checked")) {
+        let $input = $(this);
+        let value = $input.val();
 
-		let timeRegex = /^([01]\d|2[0-3]):([0-5]\d)$/;
-		if (!timeRegex.test(value)) {
-			$('#next-step').addClass('disable');
-			showAlert('بیشتر از 12 ساعت را نمی توانید وارد نمائید', $input);
-			return;
-		}
+        let timeRegex = /^([01]\d|2[0-3]):([0-5]\d)$/;
+        if (!timeRegex.test(value)) {
+            $('#next-step').addClass('disable');
+            showAlert('بیشتر از 12 ساعت را نمی توانید وارد نمائید', $input);
+            return;
+        }
 
-		let [endHours, endMinutes] = value.split(":").map(Number);
+        let [endHours, endMinutes] = value.split(":").map(Number);
 
-		let startValue = $("#irregularShiftsStartDateTime").val();
-		if (!timeRegex.test(startValue)) {
-			$('#next-step').addClass('disable');
-			showAlert('بیشتر از 12 ساعت را نمی توانید وارد نمائید', $input);
-			return;
-		}
+        let startValue = $("#irregularShiftsStartDateTime").val();
+        if (!timeRegex.test(startValue)) {
+            $('#next-step').addClass('disable');
+            showAlert('بیشتر از 12 ساعت را نمی توانید وارد نمائید', $input);
+            return;
+        }
 
-		let [startHours, startMinutes] = startValue.split(":").map(Number);
-		let startTotalMinutes = startHours * 60 + startMinutes;
-		let endTotalMinutes = endHours * 60 + endMinutes;
+        let [startHours, startMinutes] = startValue.split(":").map(Number);
+        let startTotalMinutes = startHours * 60 + startMinutes;
+        let endTotalMinutes = endHours * 60 + endMinutes;
 
-		let maxRangeInMinutes = 0;
-		if ($("#TwelveTwentyFour").is(":checked") || $("#TwelveThirtySix").is(":checked")) {
-			maxRangeInMinutes = 12 * 60;
-		}
-		//else if ($("#TwentyFourTwentyFour").is(":checked") || $("#TwentyFourFortyEight").is(":checked")) {
-		//    maxRangeInMinutes = 24 * 60;
-		//}
+        let maxRangeInMinutes = 0;
+        if ($("#TwelveTwentyFour").is(":checked") || $("#TwelveThirtySix").is(":checked")) {
+            maxRangeInMinutes = 12 * 60;
+        }
+        //else if ($("#TwentyFourTwentyFour").is(":checked") || $("#TwentyFourFortyEight").is(":checked")) {
+        //    maxRangeInMinutes = 24 * 60;
+        //}
 
-		let maxEndTotalMinutes = (startTotalMinutes + maxRangeInMinutes) % (24 * 60); // Wrap around 24 hours
+        let maxEndTotalMinutes = (startTotalMinutes + maxRangeInMinutes) % (24 * 60); // Wrap around 24 hours
 
-		let isValid = false;
-		if (startTotalMinutes <= maxEndTotalMinutes) {
-			isValid = endTotalMinutes >= startTotalMinutes && endTotalMinutes <= maxEndTotalMinutes;
-		} else {
-			isValid = endTotalMinutes >= startTotalMinutes || endTotalMinutes <= maxEndTotalMinutes;
-		}
+        let isValid = false;
+        if (startTotalMinutes <= maxEndTotalMinutes) {
+            isValid = endTotalMinutes >= startTotalMinutes && endTotalMinutes <= maxEndTotalMinutes;
+        } else {
+            isValid = endTotalMinutes >= startTotalMinutes || endTotalMinutes <= maxEndTotalMinutes;
+        }
 
-		if (!isValid) {
-			$('#next-step').addClass('disable');
-			showAlert('بیشتر از 12 ساعت را نمی توانید وارد نمائید', $input);
-			return;
-		}
+        if (!isValid) {
+            $('#next-step').addClass('disable');
+            showAlert('بیشتر از 12 ساعت را نمی توانید وارد نمائید', $input);
+            return;
+        }
 
-		$('#next-step').removeClass('disable');
-		updateIrregularButton();
-	}
+        $('#next-step').removeClass('disable');
+        updateIrregularButton();
+    }
 });
 
 function showAlert(message, inputElement) {
-	inputElement.addClass("errored");
-	$('.alert-msg').show().find('p').text(message);
-	setTimeout(function () {
-		clearAlert(inputElement);
-	}, 3500);
+    inputElement.addClass("errored");
+    $('.alert-msg').show().find('p').text(message);
+    setTimeout(function () {
+        clearAlert(inputElement);
+    }, 3500);
 }
 
 function clearAlert(inputElement) {
-	inputElement.removeClass("errored");
-	$('.alert-msg').hide().find('p').text('');
+    inputElement.removeClass("errored");
+    $('.alert-msg').hide().find('p').text('');
 }
 
 function timeValidCheck(value) {
-	const timePattern = /^([01]\d|2[0-3]):([0-5]\d)$/; // Validates HH:mm format
-	return timePattern.test(value);
+    const timePattern = /^([01]\d|2[0-3]):([0-5]\d)$/; // Validates HH:mm format
+    return timePattern.test(value);
 }
 //******************** برای نوشتن تاریخ ********************
 
 
 $(document).ready(function () {
-	loadWorkshopSettingList();
+    loadWorkshopSettingList();
 
-	var selectedValueBy_LoadWorkshopSettingList = $('#workshopSettingSelect').val();
-	if (selectedValueBy_LoadWorkshopSettingList != 0) {
-		loadWorkshopSettingSelectAjax(selectedValueBy_LoadWorkshopSettingList);
-	}
+    var selectedValueBy_LoadWorkshopSettingList = $('#workshopSettingSelect').val();
+    if (selectedValueBy_LoadWorkshopSettingList != 0) {
+        loadWorkshopSettingSelectAjax(selectedValueBy_LoadWorkshopSettingList);
+    }
 
-	if ($("#workshopSettingSelect").val() === "0") {
+    if ($("#workshopSettingSelect").val() === "0") {
         $('#next-step').addClass('disable');
     } else {
         $('#next-step').removeClass('disable');
     }
 
-	$("#workshopSettingSelect").select2({
-		language: "fa",
-		dir: "rtl",
-		dropdownParent: $('#MainModal')
-	});
+    $("#workshopSettingSelect").select2({
+        language: "fa",
+        dir: "rtl",
+        dropdownParent: $('#MainModal')
+    });
 });
 
 
 function loadWorkshopSettingList() {
-	$.ajax({
-		async: false,
-		contentType: 'charset=utf-8',
-		dataType: 'json',
-		type: 'GET',
-		url: workshopSettingListAjax,
-		headers: { "RequestVerificationToken": `${antiForgeryToken}` },
-		success: function (response) {
-			$('#footer-section').hide();
-			var responseData = response.data;
-			console.log(workshopSettingEmployeeSelecting);
-		/*	${ workshopSettingEmployeeSelecting.name === item.groupName ? 'selected' : '' }*/
-			if (response.success) {
-				var groupOptionsHtml = '<option value="0">انتخاب گروه ...</option>';
+    $.ajax({
+        async: false,
+        contentType: 'charset=utf-8',
+        dataType: 'json',
+        type: 'GET',
+        url: workshopSettingListAjax,
+        headers: { "RequestVerificationToken": `${antiForgeryToken}` },
+        success: function (response) {
+            $('#footer-section').hide();
+            var responseData = response.data;
+            console.log(responseData);
+            /*	${ workshopSettingEmployeeSelecting.name === item.groupName ? 'selected' : '' }*/
+            if (response.success) {
+                var groupOptionsHtml = '<option value="0">انتخاب گروه ...</option>';
                 responseData.groupSettings.forEach(function (item) {
-					groupOptionsHtml += `<option value="${item.id}" data-name-group="${item.groupName}" ${workshopSettingEmployeeSelecting?.name === item.groupName ? 'selected' : ''}>${item.groupName}</option>`;
-
-						
+                    groupOptionsHtml += `<option value="${item.id}" data-name-group="${item.groupName}" ${workshopSettingEmployeeSelecting?.name === item.groupName ? 'selected' : ''}>${item.groupName}</option>`;
 
 
 
-					//--------------------------------------------------- لود کردن مقادیر مربوط به ساعت استراحت، تعطیلات
+
+
+                    //--------------------------------------------------- لود کردن مقادیر مربوط به ساعت استراحت، تعطیلات
 
                     $('#GroupId').val(item.id);
 
-					$('#BreakTimeFirst').prop('checked', (item.breakTime.breakTimeType === 2 ? true : false));
-					$('#BreakTime').prop('checked', (item.breakTime.breakTimeType === 1 ? true : false));
+                    $('#BreakTimeFirst').prop('checked', (item.breakTime.breakTimeType === 2 ? true : false));
+                    $('#BreakTime').prop('checked', (item.breakTime.breakTimeType === 1 ? true : false));
 
-					if (item.breakTime.hasBreakTimeValue) {
-						let breakTimeValue = item.breakTime.breakTimeValue;
-						let formattedBreakTime = breakTimeValue.substring(0, 5);
-						let [hour, minute] = breakTimeValue.split(':');
-						$('#hour').val(hour);
-						$('#min').val(minute);
+                    if (item.breakTime.hasBreakTimeValue) {
+                        let breakTimeValue = item.breakTime.breakTimeValue;
+                        let formattedBreakTime = breakTimeValue.substring(0, 5);
+                        let [hour, minute] = breakTimeValue.split(':');
+                        $('#hour').val(hour);
+                        $('#min').val(minute);
 
-						$('#TimeOnly').val(formattedBreakTime);
-						$('#computeTime').removeClass('disable');
-					} else {
-						$('#hour').val("00");
-						$('#min').val("00");
-						$('#TimeOnly').val('');
-						$('#computeTime').addClass('disable');
-					}
+                        $('#TimeOnly').val(formattedBreakTime);
+                        $('#computeTime').removeClass('disable');
+                    } else {
+                        $('#hour').val("00");
+                        $('#min').val("00");
+                        $('#TimeOnly').val('');
+                        $('#computeTime').addClass('disable');
+                    }
 
 
-					$('#Friday1').prop('checked', (item.fridayWork === 0 ? true : false));
-					$('#Friday2').prop('checked', (item.fridayWork === 1 ? true : false));
+                    $('#Friday1').prop('checked', (item.fridayWork === 0 ? true : false));
+                    $('#Friday2').prop('checked', (item.fridayWork === 1 ? true : false));
 
-					$('#HolidayWork1').prop('checked', (item.holidayWork === 0 ? true : false));
-					$('#HolidayWork2').prop('checked', (item.holidayWork === 1 ? true : false));
+                    $('#HolidayWork1').prop('checked', (item.holidayWork === 0 ? true : false));
+                    $('#HolidayWork2').prop('checked', (item.holidayWork === 1 ? true : false));
                 });
                 $('#workshopSettingSelect').append(groupOptionsHtml);
             }
         },
-		failure: function (response) {
-			console.log(5, response);
-		}
-	});
+        failure: function (response) {
+            console.log(5, response);
+        }
+    });
 }
 
 $('#workshopSettingSelect').on('change', function () {
-	var id = Number($(this).val());
+    var id = Number($(this).val());
 
-	loadWorkshopSettingSelectAjax(id)
+    loadWorkshopSettingSelectAjax(id)
 });
 
 
 function loadWorkshopSettingSelectAjax(idSelected) {
-	var id = Number(idSelected);
+    var id = Number(idSelected);
 
-	let htmlElement = '';
+    let htmlElement = '';
 
-	if (id == 0) {
-		$('#footer-section').hide();
-	}
+    if (id == 0) {
+        $('#footer-section').hide();
+    }
 
-	if (id === 0) {
-		$('#stepWorkTimeOptionRadio').hide();
-		$('#step_workTimeOptionNull').show();
-		$('#step_workTimeOption').hide();
-		$('#step_workTimeOptionRotatingShift').hide();
-		$('#step_workTimeOptionIrregular').hide();
-		$('#step_workTimeOptionWithoutGroup').hide();
-		$('#next-step').addClass('disable');
-	} else {
-		$('#next-step').removeClass('disable');
-	}
+    if (id === 0) {
+        $('#stepWorkTimeOptionRadio').hide();
+        $('#step_workTimeOptionNull').show();
+        $('#step_workTimeOption').hide();
+        $('#step_workTimeOptionRotatingShift').hide();
+        $('#step_workTimeOptionIrregular').hide();
+        $('#step_workTimeOptionWithoutGroup').hide();
+        $('#next-step').addClass('disable');
+    } else {
+        $('#next-step').removeClass('disable');
+    }
 
-	$.ajax({
-		async: false,
-		dataType: 'json',
-		type: 'GET',
-		url: workshopSettingListAjax,
-		headers: { "RequestVerificationToken": antiForgeryToken },
-		success: function (response) {
-			const workshopSettingGroupSelecting = response.data;
+    $.ajax({
+        async: false,
+        dataType: 'json',
+        type: 'GET',
+        url: workshopSettingListAjax,
+        headers: { "RequestVerificationToken": antiForgeryToken },
+        success: function (response) {
+            const workshopSettingGroupSelecting = response.data;
 
-			var regularShiftsIndex = 0;
-			var rotatingShiftsIndex = 0;
+            var regularShiftsIndex = 0;
+            var rotatingShiftsIndex = 0;
 
-			if (workshopSettingGroupSelecting.groupSettings.length > 0) {
-				workshopSettingGroupSelecting.groupSettings.forEach(function (itemGroupSettings) {
+            if (workshopSettingGroupSelecting.groupSettings.length > 0) {
+                workshopSettingGroupSelecting.groupSettings.forEach(function (itemGroupSettings) {
 
-					if (itemGroupSettings.id === id) {
-						if ($('#workshopSettingSelect').find(':selected').data('name-group') === "بدون گروه") {
-							$('#stepWorkTimeOptionRadio').hide();
-							$('#step_workTimeOptionNull').hide();
-							$('#step_workTimeOption').hide();
-							$('#step_workTimeOptionRotatingShift').hide();
-							$('#step_workTimeOptionIrregular').hide();
-							$('#step_workTimeOptionWithoutGroup').show();
-							$('#footer-section').hide();
-						} else {
-							if (itemGroupSettings.workshopShiftStatus === 0) {
+                    if (itemGroupSettings.id === id) {
+                        if ($('#workshopSettingSelect').find(':selected').data('name-group') === "بدون گروه") {
+                            $('#stepWorkTimeOptionRadio').hide();
+                            $('#step_workTimeOptionNull').hide();
+                            $('#step_workTimeOption').hide();
+                            $('#step_workTimeOptionRotatingShift').hide();
+                            $('#step_workTimeOptionIrregular').hide();
+                            $('#step_workTimeOptionWithoutGroup').show();
+                            $('#footer-section').hide();
+                        } else {
+                            if (itemGroupSettings.workshopShiftStatus === 0) {
 
-								// Regular Shift
-								regularShiftsIndex = itemGroupSettings.rollCallWorkshopShifts.length;
+                                // Regular Shift
+                                regularShiftsIndex = itemGroupSettings.rollCallWorkshopShifts.length;
 
-								//radio btn
-								$("#organized").prop('checked', true);
-								$("#rotating_shift").prop('checked', false);
-								$("#disorganized").prop('checked', false);
-								//form
-								$('#step_workTimeOption').show();
-								$('#step_workTimeOptionRotatingShift').hide();
-								$('#step_workTimeOptionIrregular').hide();
-								$('#footer-section').show();
+                                //radio btn
+                                $("#organized").prop('checked', true);
+                                $("#rotating_shift").prop('checked', false);
+                                $("#disorganized").prop('checked', false);
+                                //form
+                                $('#step_workTimeOption').show();
+                                $('#step_workTimeOptionRotatingShift').hide();
+                                $('#step_workTimeOptionIrregular').hide();
+                                $('#footer-section').show();
 
-								itemGroupSettings.rollCallWorkshopShifts.forEach(function (itemWorkshopShifts, indexRollCallTime) {
+                                itemGroupSettings.rollCallWorkshopShifts.forEach(function (itemWorkshopShifts, indexRollCallTime) {
 
-									let namePlacementPersian = '';
-									switch (indexRollCallTime) {
-										case 0:
-											namePlacementPersian = "اول";
-											break;
-										case 1:
-											namePlacementPersian = "دوم";
-											break;
-										case 2:
-											namePlacementPersian = "سوم";
-											break;
-										case 3:
-											namePlacementPersian = "چهارم";
-											break;
-										case 4:
-											namePlacementPersian = "پنجم";
-											break;
-										default:
-											namePlacementPersian = "";
-									}
+                                    let namePlacementPersian = '';
+                                    switch (indexRollCallTime) {
+                                        case 0:
+                                            namePlacementPersian = "اول";
+                                            break;
+                                        case 1:
+                                            namePlacementPersian = "دوم";
+                                            break;
+                                        case 2:
+                                            namePlacementPersian = "سوم";
+                                            break;
+                                        case 3:
+                                            namePlacementPersian = "چهارم";
+                                            break;
+                                        case 4:
+                                            namePlacementPersian = "پنجم";
+                                            break;
+                                        default:
+                                            namePlacementPersian = "";
+                                    }
 
-									htmlElement += `<div class="groupBox timeWork">
+                                    htmlElement += `<div class="groupBox timeWork">
                                     <div class="row align-items-center justify-content-between">
                                         <div class="col-2 pe-0 d-flex align-items-center">
 							                <input type="hidden" name="Command.ShiftViewModel[${indexRollCallTime}].Placement" value="${itemWorkshopShifts.placement}"/>
@@ -1483,11 +1495,11 @@ function loadWorkshopSettingSelectAjax(idSelected) {
                                             <input type="text" class="form-control text-center dateTime" name="Command.ShiftViewModel[${indexRollCallTime}].EndTime" value="${itemWorkshopShifts.endTime}" placeholder="00:00" style="direction: ltr;">
                                         </div>`;
 
-									if (indexRollCallTime === 0) {
-										htmlElement += `<div class="col-2 d-flex align-items-center justify-content-end">                                            
+                                    if (indexRollCallTime === 0) {
+                                        htmlElement += `<div class="col-2 d-flex align-items-center justify-content-end">                                            
                                 </div>`;
-									} else {
-										htmlElement += `<div class="col-2 d-flex align-items-center justify-content-end">
+                                    } else {
+                                        htmlElement += `<div class="col-2 d-flex align-items-center justify-content-end">
                                     <button type="button" class="btnRemoveTimeWork">
                                         <svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
                                             <circle cx="11" cy="11" r="8.25" stroke="white"/>
@@ -1495,87 +1507,87 @@ function loadWorkshopSettingSelectAjax(idSelected) {
                                         </svg>
                                     </button>
                                 </div>`;
-									}
+                                    }
 
-									htmlElement += `</div></div>`;
+                                    htmlElement += `</div></div>`;
 
-									//const newStartTimeInput = $(`input[name="Command.ShiftViewModel[${indexRollCallTime}].StartTime"]`);
-									//const newEndTimeInput = $(`input[name="Command.ShiftViewModel[${indexRollCallTime}].EndTime"]`);
-									//
-									//newStartTimeInput.on('input', function () {
-									//    const value = convertPersianNumbersToEnglish($(this).val());
-									//    $(this).val(value);
-									//});
-									//
-									//newEndTimeInput.on('input', function () {
-									//    const value = convertPersianNumbersToEnglish($(this).val());
-									//    $(this).val(value);
-									//});
-									//
-									//new Cleave(newStartTimeInput[0], {
-									//    time: true,
-									//    timePattern: ['h', 'm']
-									//});
-									//
-									//new Cleave(newEndTimeInput[0], {
-									//    time: true,
-									//    timePattern: ['h', 'm']
-									//});
+                                    //const newStartTimeInput = $(`input[name="Command.ShiftViewModel[${indexRollCallTime}].StartTime"]`);
+                                    //const newEndTimeInput = $(`input[name="Command.ShiftViewModel[${indexRollCallTime}].EndTime"]`);
+                                    //
+                                    //newStartTimeInput.on('input', function () {
+                                    //    const value = convertPersianNumbersToEnglish($(this).val());
+                                    //    $(this).val(value);
+                                    //});
+                                    //
+                                    //newEndTimeInput.on('input', function () {
+                                    //    const value = convertPersianNumbersToEnglish($(this).val());
+                                    //    $(this).val(value);
+                                    //});
+                                    //
+                                    //new Cleave(newStartTimeInput[0], {
+                                    //    time: true,
+                                    //    timePattern: ['h', 'm']
+                                    //});
+                                    //
+                                    //new Cleave(newEndTimeInput[0], {
+                                    //    time: true,
+                                    //    timePattern: ['h', 'm']
+                                    //});
 
 
-								});
+                                });
 
-								$('#step_workTimeOptionNull').hide();
-								$('#step_workTimeOptionWithoutGroup').hide();
-								$('#stepWorkTimeOptionRadio').show();
+                                $('#step_workTimeOptionNull').hide();
+                                $('#step_workTimeOptionWithoutGroup').hide();
+                                $('#stepWorkTimeOptionRadio').show();
 
-								$('#step_workTimeOption').show();
-								$('#appendChildTimeWorkHtml').html(htmlElement);
+                                $('#step_workTimeOption').show();
+                                $('#appendChildTimeWorkHtml').html(htmlElement);
 
-								$('#step_workTimeOptionRotatingShift').hide();
-								$('#step_workTimeOptionRotatingShift').html(loadRotatingHtml());
+                                $('#step_workTimeOptionRotatingShift').hide();
+                                $('#step_workTimeOptionRotatingShift').html(loadRotatingHtml());
 
-								$('#step_workTimeOptionIrregular').hide();
-								$('#step_workTimeOptionIrregular').html(loadIrregularHtml());
+                                $('#step_workTimeOptionIrregular').hide();
+                                $('#step_workTimeOptionIrregular').html(loadIrregularHtml());
 
 
-								updateAddButtonText(regularShiftsIndex);
-								if ((regularShiftsIndex) === 3) {
-									$(".btnAddTimeWork").hide();
-								} else {
-									$(".btnAddTimeWork").show();
-								}
-								// Update Remove button enable/disable state
-								updateRemoveButtons();
-								loadCleaveClasses();
+                                updateAddButtonText(regularShiftsIndex);
+                                if ((regularShiftsIndex) === 3) {
+                                    $(".btnAddTimeWork").hide();
+                                } else {
+                                    $(".btnAddTimeWork").show();
+                                }
+                                // Update Remove button enable/disable state
+                                updateRemoveButtons();
+                                loadCleaveClasses();
 
-							} else if (itemGroupSettings.workshopShiftStatus === 1) {
+                            } else if (itemGroupSettings.workshopShiftStatus === 1) {
 
-								//radio btn
-								$("#organized").prop('checked', false);
-								$("#rotating_shift").prop('checked', false);
-								$("#disorganized").prop('checked', true);
-								//form
-								$('#step_workTimeOption').hide();
-								$('#step_workTimeOptionRotatingShift').hide();
-								$('#step_workTimeOptionIrregular').show();
-								$('#footer-section').show();
+                                //radio btn
+                                $("#organized").prop('checked', false);
+                                $("#rotating_shift").prop('checked', false);
+                                $("#disorganized").prop('checked', true);
+                                //form
+                                $('#step_workTimeOption').hide();
+                                $('#step_workTimeOptionRotatingShift').hide();
+                                $('#step_workTimeOptionIrregular').show();
+                                $('#footer-section').show();
 
 
-								// Irregular Shift
-								const rawStartTime = itemGroupSettings.irregularShift.startTime;
-								const rawEndTime = itemGroupSettings.irregularShift.endTime;
+                                // Irregular Shift
+                                const rawStartTime = itemGroupSettings.irregularShift.startTime;
+                                const rawEndTime = itemGroupSettings.irregularShift.endTime;
 
-								const today = new Date();
-								const startTime = new Date(`${today.toISOString().split("T")[0]}T${rawStartTime}`);
-								const endTime = new Date(`${today.toISOString().split("T")[0]}T${rawEndTime}`);
+                                const today = new Date();
+                                const startTime = new Date(`${today.toISOString().split("T")[0]}T${rawStartTime}`);
+                                const endTime = new Date(`${today.toISOString().split("T")[0]}T${rawEndTime}`);
 
-								const formattedStartTime =
-									startTime.toLocaleTimeString("en-GB", { hour: '2-digit', minute: '2-digit' });
-								const formattedEndTime =
-									endTime.toLocaleTimeString("en-GB", { hour: '2-digit', minute: '2-digit' });
+                                const formattedStartTime =
+                                    startTime.toLocaleTimeString("en-GB", { hour: '2-digit', minute: '2-digit' });
+                                const formattedEndTime =
+                                    endTime.toLocaleTimeString("en-GB", { hour: '2-digit', minute: '2-digit' });
 
-								htmlElement += `
+                                htmlElement += `
 				            
 			            <div class="btn-workTimeOption-container align-items-center justify-content-center mt-3">
 				            <input type="radio" id="TwelveTwentyFour" value="1" name="Command.IrregularShift.WorkshopIrregularShifts" class="radio-workTimeOption irregularShiftWorkshopIrregularShiftsCheckBox" ${itemGroupSettings.irregularShift.workshopIrregularShifts === 1 ? "checked" : ""}>
@@ -1617,77 +1629,77 @@ function loadWorkshopSettingSelectAjax(idSelected) {
 				            </div>
 			            </div>`;
 
-								$('#step_workTimeOptionNull').hide();
-								$('#step_workTimeOptionWithoutGroup').hide();
-								$('#stepWorkTimeOptionRadio').show();
+                                $('#step_workTimeOptionNull').hide();
+                                $('#step_workTimeOptionWithoutGroup').hide();
+                                $('#stepWorkTimeOptionRadio').show();
 
-								$('#step_workTimeOption').hide();
-								$('#step_workTimeOption').html(loadRegularHtml());
+                                $('#step_workTimeOption').hide();
+                                $('#step_workTimeOption').html(loadRegularHtml());
 
-								$('#step_workTimeOptionRotatingShift').hide();
-								$('#step_workTimeOptionRotatingShift').html(loadRotatingHtml());
+                                $('#step_workTimeOptionRotatingShift').hide();
+                                $('#step_workTimeOptionRotatingShift').html(loadRotatingHtml());
 
-								$('#step_workTimeOptionIrregular').show();
-								$('#step_workTimeOptionIrregular').html(htmlElement);
+                                $('#step_workTimeOptionIrregular').show();
+                                $('#step_workTimeOptionIrregular').html(htmlElement);
 
-								updateIrregularButton();
+                                updateIrregularButton();
 
-								loadCleaveClasses();
+                                loadCleaveClasses();
 
 
-								////new Cleave(`input[name="Command.IrregularShift.StartTime"]`, {
-								//new Cleave(`#irregularShiftsStartDateTime`,
-								//	{
-								//		time: true,
-								//		timePattern: ['h', 'm']
-								//	});
-								//
-								////new Cleave(`input[name="Command.IrregularShift.EndTime"]`, {
-								//new Cleave(`#irregularShiftsEndDateTime`,
-								//	{
-								//		time: true,
-								//		timePattern: ['h', 'm']
-								//	});
+                                ////new Cleave(`input[name="Command.IrregularShift.StartTime"]`, {
+                                //new Cleave(`#irregularShiftsStartDateTime`,
+                                //	{
+                                //		time: true,
+                                //		timePattern: ['h', 'm']
+                                //	});
+                                //
+                                ////new Cleave(`input[name="Command.IrregularShift.EndTime"]`, {
+                                //new Cleave(`#irregularShiftsEndDateTime`,
+                                //	{
+                                //		time: true,
+                                //		timePattern: ['h', 'm']
+                                //	});
 
-							} else {
+                            } else {
 
-								// Rotating Shift
-								rotatingShiftsIndex = itemGroupSettings.customizeRotatingShiftsViewModels.length;
+                                // Rotating Shift
+                                rotatingShiftsIndex = itemGroupSettings.customizeRotatingShiftsViewModels.length;
 
-								//radio btn
-								$("#organized").prop('checked', false);
-								$("#rotating_shift").prop('checked', true);
-								$("#disorganized").prop('checked', false);
-								//form
-								$('#step_workTimeOption').hide();
-								$('#step_workTimeOptionRotatingShift').show();
-								$('#step_workTimeOptionIrregular').hide();
-								$('#footer-section').show();
+                                //radio btn
+                                $("#organized").prop('checked', false);
+                                $("#rotating_shift").prop('checked', true);
+                                $("#disorganized").prop('checked', false);
+                                //form
+                                $('#step_workTimeOption').hide();
+                                $('#step_workTimeOptionRotatingShift').show();
+                                $('#step_workTimeOptionIrregular').hide();
+                                $('#footer-section').show();
 
-								itemGroupSettings.customizeRotatingShiftsViewModels.forEach(function (itemRotatingShifts, indexRollCallTimeRs) {
-									let namePlacementPersian = '';
+                                itemGroupSettings.customizeRotatingShiftsViewModels.forEach(function (itemRotatingShifts, indexRollCallTimeRs) {
+                                    let namePlacementPersian = '';
 
-									switch (indexRollCallTimeRs) {
-										case 0:
-											namePlacementPersian = "اول";
-											break;
-										case 1:
-											namePlacementPersian = "دوم";
-											break;
-										case 2:
-											namePlacementPersian = "سوم";
-											break;
-										case 3:
-											namePlacementPersian = "چهارم";
-											break;
-										case 4:
-											namePlacementPersian = "پنجم";
-											break;
-										default:
-											namePlacementPersian = "";
-									}
+                                    switch (indexRollCallTimeRs) {
+                                        case 0:
+                                            namePlacementPersian = "اول";
+                                            break;
+                                        case 1:
+                                            namePlacementPersian = "دوم";
+                                            break;
+                                        case 2:
+                                            namePlacementPersian = "سوم";
+                                            break;
+                                        case 3:
+                                            namePlacementPersian = "چهارم";
+                                            break;
+                                        case 4:
+                                            namePlacementPersian = "پنجم";
+                                            break;
+                                        default:
+                                            namePlacementPersian = "";
+                                    }
 
-									htmlElement += `<div class="groupBoxRS timeWork">
+                                    htmlElement += `<div class="groupBoxRS timeWork">
                                     <div class="row align-items-center justify-content-between">
                                         <div class="col-3 pe-0 d-flex align-items-center">							
                                             <div class="timeWorkTitle text-nowrap">نوبت ${namePlacementPersian}</div>
@@ -1701,11 +1713,11 @@ function loadWorkshopSettingSelectAjax(idSelected) {
                                             <input type="text" class="form-control text-center dateTimeRS" name="Command.CustomizeRotatingShifts[${indexRollCallTimeRs}].EndTime" value="${itemRotatingShifts.endTime}" placeholder="00:00" style="direction: ltr;">
                                         </div>`;
 
-									if (indexRollCallTimeRs === 0) {
-										htmlElement += `<div class="col-1 d-flex align-items-center justify-content-end">                                            
+                                    if (indexRollCallTimeRs === 0) {
+                                        htmlElement += `<div class="col-1 d-flex align-items-center justify-content-end">                                            
                                     </div>`;
-									} else {
-										htmlElement += `<div class="col-1 d-flex align-items-center justify-content-end">
+                                    } else {
+                                        htmlElement += `<div class="col-1 d-flex align-items-center justify-content-end">
                                         <button type="button" class="btnRemoveTimeWorkRS">
                                             <svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
                                                 <circle cx="11" cy="11" r="8.25" stroke="white"/>
@@ -1713,105 +1725,135 @@ function loadWorkshopSettingSelectAjax(idSelected) {
                                             </svg>
                                         </button>
                                     </div>`;
-									}
+                                    }
 
-									htmlElement += `</div></div>`;
+                                    htmlElement += `</div></div>`;
 
 
-									//const newStartTimeInput = $(`input[name="Command.RollCallRecords[${indexRollCallTimeRs}].StartTime"]`);
-									//const newEndTimeInput = $(`input[name="Command.RollCallRecords[${indexRollCallTimeRs}].EndTime"]`);
-									//
-									//newStartTimeInput.on('input', function () {
-									//	const value = convertPersianNumbersToEnglish($(this).val());
-									//	$(this).val(value);
-									//});
-									//
-									//newEndTimeInput.on('input', function () {
-									//	const value = convertPersianNumbersToEnglish($(this).val());
-									//	$(this).val(value);
-									//});
-									//
-									//new Cleave(newStartTimeInput[0], {
-									//	time: true,
-									//	timePattern: ['h', 'm']
-									//});
-									//
-									//new Cleave(newEndTimeInput[0], {
-									//	time: true,
-									//	timePattern: ['h', 'm']
-									//});
+                                    //const newStartTimeInput = $(`input[name="Command.RollCallRecords[${indexRollCallTimeRs}].StartTime"]`);
+                                    //const newEndTimeInput = $(`input[name="Command.RollCallRecords[${indexRollCallTimeRs}].EndTime"]`);
+                                    //
+                                    //newStartTimeInput.on('input', function () {
+                                    //	const value = convertPersianNumbersToEnglish($(this).val());
+                                    //	$(this).val(value);
+                                    //});
+                                    //
+                                    //newEndTimeInput.on('input', function () {
+                                    //	const value = convertPersianNumbersToEnglish($(this).val());
+                                    //	$(this).val(value);
+                                    //});
+                                    //
+                                    //new Cleave(newStartTimeInput[0], {
+                                    //	time: true,
+                                    //	timePattern: ['h', 'm']
+                                    //});
+                                    //
+                                    //new Cleave(newEndTimeInput[0], {
+                                    //	time: true,
+                                    //	timePattern: ['h', 'm']
+                                    //});
 
 
-								});
+                                });
 
-								$('#step_workTimeOptionNull').hide();
-								$('#step_workTimeOptionWithoutGroup').hide();
-								$('#stepWorkTimeOptionRadio').show();
+                                $('#step_workTimeOptionNull').hide();
+                                $('#step_workTimeOptionWithoutGroup').hide();
+                                $('#stepWorkTimeOptionRadio').show();
 
-								$('#step_workTimeOption').hide();
-								$('#step_workTimeOption').html(loadRegularHtml());
+                                $('#step_workTimeOption').hide();
+                                $('#step_workTimeOption').html(loadRegularHtml());
 
-								$('#step_workTimeOptionRotatingShift').show();
-								$('#appendChildTimeWorkHtmlRS').html(htmlElement);
+                                $('#step_workTimeOptionRotatingShift').show();
+                                $('#appendChildTimeWorkHtmlRS').html(htmlElement);
 
-								$('#step_workTimeOptionIrregular').hide();
-								$('#step_workTimeOptionIrregular').html(loadIrregularHtml());
+                                $('#step_workTimeOptionIrregular').hide();
+                                $('#step_workTimeOptionIrregular').html(loadIrregularHtml());
 
 
-								updateAddButtonTextRS(rotatingShiftsIndex);
-								if ((rotatingShiftsIndex) === 4) {
-									$(".btnAddTimeWorkRS").hide();
-								} else {
-									$(".btnAddTimeWorkRS").show();
-								}
-								// Update Remove button enable/disable state
-								updateRemoveButtonsRS();
-								loadCleaveClasses();
-							}
+                                updateAddButtonTextRS(rotatingShiftsIndex);
+                                if ((rotatingShiftsIndex) === 4) {
+                                    $(".btnAddTimeWorkRS").hide();
+                                } else {
+                                    $(".btnAddTimeWorkRS").show();
+                                }
+                                // Update Remove button enable/disable state
+                                updateRemoveButtonsRS();
+                                loadCleaveClasses();
+                            }
 
-						}
+                        }
 
 
 
 
 
 
-						$('#GroupId').val(itemGroupSettings.id);
+                        $('#GroupId').val(itemGroupSettings.id);
 
-						$('#BreakTimeFirst').prop('checked', (itemGroupSettings.breakTime.breakTimeType === 2 ? true : false));
-						$('#BreakTime').prop('checked', (itemGroupSettings.breakTime.breakTimeType === 1 ? true : false));
+                        $('#BreakTimeFirst').prop('checked', (itemGroupSettings.breakTime.breakTimeType === 2 ? true : false));
+                        $('#BreakTime').prop('checked', (itemGroupSettings.breakTime.breakTimeType === 1 ? true : false));
 
 
-						if (itemGroupSettings.breakTime.hasBreakTimeValue) {
-							let breakTimeValue = itemGroupSettings.breakTime.breakTimeValue;
-							let formattedBreakTime = breakTimeValue.substring(0, 5);
-							let [hour, minute] = breakTimeValue.split(':');
-							$('#hour').val(hour);
-							$('#min').val(minute);
+                        if (itemGroupSettings.breakTime.hasBreakTimeValue) {
+                            let breakTimeValue = itemGroupSettings.breakTime.breakTimeValue;
+                            let formattedBreakTime = breakTimeValue.substring(0, 5);
+                            let [hour, minute] = breakTimeValue.split(':');
+                            $('#hour').val(hour);
+                            $('#min').val(minute);
 
-							$('#TimeOnly').val(formattedBreakTime);
-							$('#computeTime').removeClass('disable');
+                            $('#TimeOnly').val(formattedBreakTime);
+                            $('#computeTime').removeClass('disable');
 
-							// console.log('hour='+ hour);
-							// console.log('min='+ minute);
+                            // console.log('hour='+ hour);
+                            // console.log('min='+ minute);
 
-						} else {
-							$('#hour').val("00");
-							$('#min').val("00");
-							$('#TimeOnly').val('');
-							$('#computeTime').addClass('disable');
+                        } else {
+                            $('#hour').val("00");
+                            $('#min').val("00");
+                            $('#TimeOnly').val('');
+                            $('#computeTime').addClass('disable');
 
-							// console.log($('hour='+ $('#hour').val()));
-							// console.log('min='+ $('#min').val());
-						}
+                            // console.log($('hour='+ $('#hour').val()));
+                            // console.log('min='+ $('#min').val());
+                        }
+                        debugger;
+                        document.querySelectorAll('.day-off-button__diactive').forEach(button => {
+                            button.click();
+                        });
+                        itemGroupSettings.offDayOfWeeks.forEach(function (dayOffWeek) {
+                            var dayOfWeekStr;
+                            switch (dayOffWeek) {
+                                case 0:
+                                    dayOfWeekStr = "Sunday";
+                                    break;
+                                case 1:
+                                    dayOfWeekStr = "Monday";
+                                    break;
+                                case 2:
+                                    dayOfWeekStr = "Tuesday";
+                                    break;
+                                case 3:
+                                    dayOfWeekStr = "Wednesday";
+                                case 4:
+                                    dayOfWeekStr = "Thursday";
+                                    break;
+                                case 5:
+                                    dayOfWeekStr = "Friday";
+                                    break;
+                                case 6:
+                                    dayOfWeekStr = "Saturday";
+                                    break;
+                            }
+                            // حالا روی دکمه کلیک می‌کنیم
+                            $('button[name="' + dayOfWeekStr + '"]').click();
+                            
+                        });
+                        //$('#Friday1').prop('checked', (itemGroupSettings.fridayWork === 0 ? true : false));
+                        //$('#Friday2').prop('checked', (itemGroupSettings.fridayWork === 1 ? true : false));
 
-
-						$('#Friday1').prop('checked', (itemGroupSettings.fridayWork === 0 ? true : false));
-						$('#Friday2').prop('checked', (itemGroupSettings.fridayWork === 1 ? true : false));
-
-						$('#HolidayWork1').prop('checked', (itemGroupSettings.holidayWork === 0 ? true : false));
-						$('#HolidayWork2').prop('checked', (itemGroupSettings.holidayWork === 1 ? true : false));
-					}
+                        $('#OffDays1').prop('checked', (itemGroupSettings.holidayWork === 0 ? true : false));
+                        $('#OffDays2').prop('checked', (itemGroupSettings.holidayWork === 1 ? true : false));
+                    }
 
 
 
@@ -1819,17 +1861,17 @@ function loadWorkshopSettingSelectAjax(idSelected) {
 
 
 
-					if ($('.groupBox').length === 3) {
-						$('.btnAddTimeWork').closest('div').css("display", "none");
-					} else {
-						$('.btnAddTimeWork').closest('div').css("display", "flex");
-					}
+                    if ($('.groupBox').length === 3) {
+                        $('.btnAddTimeWork').closest('div').css("display", "none");
+                    } else {
+                        $('.btnAddTimeWork').closest('div').css("display", "flex");
+                    }
 
-					if ($('.groupBoxRS').length === 4) {
-						$('.btnAddTimeWorkRS').closest('div').css("display", "none");
-					} else {
-						$('.btnAddTimeWorkRS').closest('div').css("display", "flex");
-					}
+                    if ($('.groupBoxRS').length === 4) {
+                        $('.btnAddTimeWorkRS').closest('div').css("display", "none");
+                    } else {
+                        $('.btnAddTimeWorkRS').closest('div').css("display", "flex");
+                    }
 
 
 
@@ -1841,62 +1883,62 @@ function loadWorkshopSettingSelectAjax(idSelected) {
 
 
 
-				});
-			} else {
-				htmlElement += `<div>مشکلی از سرور پیش آمده است.</div>`;
-				$('#step_workTimeOption').html(htmlElement);
-			}
+                });
+            } else {
+                htmlElement += `<div>مشکلی از سرور پیش آمده است.</div>`;
+                $('#step_workTimeOption').html(htmlElement);
+            }
 
-		},
-		error: function (err) {
-			console.log('Error fetching roll call data:', err);
-		}
-	});
+        },
+        error: function (err) {
+            console.log('Error fetching roll call data:', err);
+        }
+    });
 }
 
-function loadCleaveClasses(){
+function loadCleaveClasses() {
 
-	$(".dateTimeRS").each(function () {
-		let element = $(this);
+    $(".dateTimeRS").each(function () {
+        let element = $(this);
 
-		element.on('input', function () {
-			let value = convertPersianNumbersToEnglish(element.val());
-			element.val(value);
-		});
+        element.on('input', function () {
+            let value = convertPersianNumbersToEnglish(element.val());
+            element.val(value);
+        });
 
-		new Cleave(this, {
-			time: true,
-			timePattern: ['h', 'm']
-		});
-	});
-								
-	$(".dateTime").each(function () {
-		let element = $(this);
+        new Cleave(this, {
+            time: true,
+            timePattern: ['h', 'm']
+        });
+    });
 
-		element.on('input', function () {
-			let value = convertPersianNumbersToEnglish(element.val());
-			element.val(value);
-		});
+    $(".dateTime").each(function () {
+        let element = $(this);
 
-		new Cleave(this, {
-			time: true,
-			timePattern: ['h', 'm']
-		});
-	});
+        element.on('input', function () {
+            let value = convertPersianNumbersToEnglish(element.val());
+            element.val(value);
+        });
 
-	$(".dateTimeIrregular").each(function () {
-		let element = $(this);
+        new Cleave(this, {
+            time: true,
+            timePattern: ['h', 'm']
+        });
+    });
 
-		element.on('input', function () {
-			let value = convertPersianNumbersToEnglish(element.val());
-			element.val(value);
-		});
+    $(".dateTimeIrregular").each(function () {
+        let element = $(this);
 
-		new Cleave(this, {
-			time: true,
-			timePattern: ['h', 'm']
-		});
-	});
+        element.on('input', function () {
+            let value = convertPersianNumbersToEnglish(element.val());
+            element.val(value);
+        });
+
+        new Cleave(this, {
+            time: true,
+            timePattern: ['h', 'm']
+        });
+    });
 }
 
 
@@ -1986,7 +2028,7 @@ function loadRotatingHtml() {
 }
 
 function loadIrregularHtml() {
-	var html = `<div class="btn-workTimeOption-container align-items-center justify-content-center mt-4">
+    var html = `<div class="btn-workTimeOption-container align-items-center justify-content-center mt-4">
 		<input type="radio" id="TwelveTwentyFour" value="1" name="Command.IrregularShift.WorkshopIrregularShifts" class="radio-workTimeOption irregularShiftWorkshopIrregularShiftsCheckBox">
 		<label for="TwelveTwentyFour" class="radio-label-workTimeOption w-100 outlineDate">12 ساعت کار 24 ساعت استراحت</label>
 
@@ -2027,4 +2069,29 @@ function loadIrregularHtml() {
 	</div>`;
 
     return html;
-}
\ No newline at end of file
+}
+
+
+$(document).ready(function () {
+    var buttons = document.querySelectorAll(".day-off-button");
+    buttons.forEach((button) => {
+        button.addEventListener("click", () => {
+            const isDiactive = button.classList.toggle("day-off-button__diactive");
+            button.classList.toggle("day-off-button__active");
+
+            const name = button.name;
+            const $checkbox = $("#" + name + "Input");
+
+            if ($checkbox.length === 0) {
+                console.warn(`Checkbox with id '${name}Input' not found.`);
+                return;
+            }
+
+            if (isDiactive) {
+                $checkbox.prop("checked", true).attr("checked", "checked");
+            } else {
+                $checkbox.prop("checked", false).removeAttr("checked");
+            }
+        });
+    });
+});
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/modalcreategroup.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/modalcreategroup.js
index 84febfa9..e1acbcc5 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/modalcreategroup.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/modalcreategroup.js
@@ -727,11 +727,16 @@ function ajaxSaveData() {
         HolidayWork = "WorkInHolidays";
     }
 
+    const checkedValues = $('.weeklyOffDays-Input:checked').map(function () {
+        return $(this).val();
+    }).get();
 
     data.push({ name: 'BreakTime.HasBreakTimeValue', value: hasBreakTime });
     data.push({ name: 'BreakTime.BreakTimeValue', value: breakTimeValue });
     data.push({ name: 'FridayWork', value: FridayWork });
     data.push({ name: 'HolidayWork', value: HolidayWork });
+    data.push({ name: 'OffDays', value: checkedValues });
+
 
     var requestData = $.param(data);
 
@@ -771,3 +776,27 @@ function ajaxSaveData() {
         }
     });
 }
+
+$(document).ready(function () {
+    var buttons = document.querySelectorAll(".day-off-button");
+    buttons.forEach((button) => {
+        button.addEventListener("click", () => {
+            const isDiactive = button.classList.toggle("day-off-button__diactive");
+            button.classList.toggle("day-off-button__active");
+
+            const name = button.name;
+            const $checkbox = $("#" + name + "Input");
+
+            if ($checkbox.length === 0) {
+                console.warn(`Checkbox with id '${name}Input' not found.`);
+                return;
+            }
+
+            if (isDiactive) {
+                $checkbox.prop("checked", true).attr("checked", "checked");
+            } else {
+                $checkbox.prop("checked", false).removeAttr("checked");
+            }
+        });
+    });
+});
\ No newline at end of file