From e09da14e15c522ace2bbbf8cbfab5f9aa3892144 Mon Sep 17 00:00:00 2001
From: SamSys <f0604741@gmail.com>
Date: Sat, 10 Aug 2024 21:49:16 +0330
Subject: [PATCH] multiple select aoutoExtention - minuse OverTimeWorking And
 FridayWorking from checkout if has leaving

---
 .../Repository/LeaveRepository.cs             |   23 +-
 .../Pages/Company/Checkouts/Create.cshtml     |    3 +-
 .../Pages/Company/Checkouts/Index.cshtml.cs   | 1148 +++++++++++--
 .../Company/InstitutionContracts/Index.cshtml |   11 +-
 .../Pages/Company/SmsResult/Index.cshtml      |    3 +-
 .../Company/Workshops/AutoExtension.cshtml    | 1506 +++++++++--------
 .../Company/Workshops/AutoExtension.cshtml.cs |    3 +
 7 files changed, 1846 insertions(+), 851 deletions(-)

diff --git a/CompanyManagment.EFCore/Repository/LeaveRepository.cs b/CompanyManagment.EFCore/Repository/LeaveRepository.cs
index c95d6de5..ee7afa42 100644
--- a/CompanyManagment.EFCore/Repository/LeaveRepository.cs
+++ b/CompanyManagment.EFCore/Repository/LeaveRepository.cs
@@ -61,9 +61,26 @@ public class LeaveRepository : RepositoryBase<long, Leave>, ILeaveRepository
             Year = x.Year,
             Month = x.Month
         });
-        if (searchModel.WorkshopId != 0 && searchModel.EmployeeId != 0)
-            query = query.Where(x => x.WorkshopId == searchModel.WorkshopId && x.EmployeeId == searchModel.EmployeeId && x.LeaveType == searchModel.LeaveType);
-        return query.OrderByDescending(x => x.Id).ToList();
+       
+		if (searchModel.WorkshopId != 0 && searchModel.EmployeeId != 0)
+            query = query.Where(x => x.WorkshopId == searchModel.WorkshopId && x.EmployeeId == searchModel.EmployeeId);
+      
+        if (!string.IsNullOrWhiteSpace(searchModel.LeaveType))
+	        query = query.Where(x => x.LeaveType == searchModel.LeaveType);
+
+        if (!string.IsNullOrWhiteSpace(searchModel.PaidLeaveType))
+	       query = query.Where(x => x.PaidLeaveType == searchModel.PaidLeaveType);
+        if (!string.IsNullOrWhiteSpace(searchModel.StartLeave) && !string.IsNullOrWhiteSpace(searchModel.EndLeave))
+        {
+            DateTime startSearch = searchModel.StartLeave.ToGeorgianDateTime();
+            DateTime endSearch = searchModel.EndLeave.ToGeorgianDateTime();
+            query = query.Where(x => (startSearch <= x.StartLeaveGr && endSearch >= x.StartLeaveGr) ||
+                                     (startSearch <= x.EndLeaveGr && endSearch >= x.EndLeaveGr) ||
+                                     (startSearch >= x.StartLeaveGr && startSearch <= x.EndLeaveGr) ||
+                                     (endSearch >= x.StartLeaveGr && endSearch <= x.EndLeaveGr));
+        }
+
+		return query.OrderByDescending(x => x.Id).ToList();
     }
 
     public List<LeaveMainViewModel> searchClient(LeaveSearchModel searchModel)
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Create.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Create.cshtml
index 0ea8611e..d49d37a3 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Create.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Create.cshtml
@@ -1,4 +1,5 @@
 @model CompanyManagment.App.Contracts.Checkout.CreateCheckout
+@Html.AntiForgeryToken()
 @{
 	<style>
         .sendSelectDate {
@@ -695,10 +696,10 @@
 	$('#createForm').submit(function(e) {
 		$('#createProcess').show();
 
-
 		e.preventDefault();
 		e.stopImmediatePropagation();
 		$.ajax({
+			async: false,
 			type: "POST",
 			url: $(this).attr('action'),
 			data: $(this).serialize(),
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs
index fac21e63..f3f2318f 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs
+++ b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs
@@ -17,6 +17,7 @@ using CompanyManagment.App.Contracts.WorkingHoursItems;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;
 using CompanyManagment.App.Contracts.Workshop;
 using CompanyManagment.App.Contracts.YearlySalary;
+using CompanyManagment.EFCore.Migrations;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
@@ -443,7 +444,7 @@ public class IndexModel : PageModel
 							separation.ContractEndGr, contract.EmployeeId, contract.WorkshopIds);
 						if (hasLeave != null)
 						{
-							var LeaveCompute = MandatoryHours(workingHours, hasLeave.Id);
+							//var LeaveCompute = MandatoryHours(workingHours, hasLeave.Id);
 						}
 					}
 
@@ -1663,11 +1664,20 @@ public class IndexModel : PageModel
 
 
 	///////////////Mandatory Compute//////////////////////
-
 	#region MandatoryCompute
 
 	public ComputingViewModel MandatoryHours(CreateWorkingHoursTemp command, long leavId)
 	{
+		var serachModel = new LeaveSearchModel()
+		{
+			EmployeeId = command.EmployeeId,
+			WorkshopId = command.WorkshopId,
+			LeaveType = "استحقاقی",
+			PaidLeaveType = "روزانه",
+			StartLeave = command.ContarctStart,
+			EndLeave = command.ContractEnd
+		};
+		var leavList = _leaveApplication.search(serachModel);
 		#region entityes
 
 		var Notholiday = string.Empty;
@@ -2601,9 +2611,11 @@ public class IndexModel : PageModel
 		#endregion
 
 		#region Rotating
-
+		
 		else if (command.ShiftWork == "4")
 		{
+
+
 			for (var da = d1; da <= d2; da.AddDays(1))
 			{
 				var FirstDayOfMonth = new PersianDateTime(da.Year, da.Month, 1);
@@ -2694,7 +2706,16 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
+									
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -2710,7 +2731,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.Shanbe1 && leavId > 0)
@@ -2740,7 +2769,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -2754,7 +2791,15 @@ public class IndexModel : PageModel
 										endTimeSingel2 = endTimeSingel2.Subtract(rest0w2);
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.Shanbe2 && leavId > 0)
@@ -2784,7 +2829,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -2799,7 +2852,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.Shanbe3 && leavId > 0)
@@ -2829,7 +2890,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -2843,7 +2912,16 @@ public class IndexModel : PageModel
 										endTimeSingel2 = endTimeSingel2.Subtract(rest0w4);
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
+									
 								}
 							}
 							else if (command.Shanbe4 && leavId > 0)
@@ -2873,7 +2951,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -2888,7 +2974,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.Shanbe1 && leavId > 0)
@@ -2918,7 +3012,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -2932,7 +3034,15 @@ public class IndexModel : PageModel
 										endTimeSingel2 = endTimeSingel2.Subtract(rest0w2);
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.Shanbe2 && leavId > 0)
@@ -2965,7 +3075,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -2980,7 +3098,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.YekShanbe1 && leavId > 0)
@@ -3010,7 +3136,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3025,7 +3159,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.YekShanbe2 && leavId > 0)
@@ -3055,7 +3197,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3070,7 +3220,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.YekShanbe3 && leavId > 0)
@@ -3100,7 +3258,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3115,7 +3281,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.YekShanbe4 && leavId > 0)
@@ -3145,7 +3319,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3160,7 +3342,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.YekShanbe1 && leavId > 0)
@@ -3190,7 +3380,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3205,7 +3403,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.YekShanbe2 && leavId > 0)
@@ -3239,7 +3445,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3254,7 +3468,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.DoShanbe1 && leavId > 0)
@@ -3284,7 +3506,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3299,7 +3529,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.DoShanbe2 && leavId > 0)
@@ -3329,7 +3567,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3344,7 +3590,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.DoShanbe3 && leavId > 0)
@@ -3374,7 +3628,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3389,7 +3651,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.DoShanbe4 && leavId > 0)
@@ -3419,7 +3689,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3434,7 +3712,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.DoShanbe1 && leavId > 0)
@@ -3464,7 +3750,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3479,7 +3773,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.DoShanbe2 && leavId > 0)
@@ -3512,7 +3814,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3527,7 +3837,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.SeShanbe1 && leavId > 0)
@@ -3557,7 +3875,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3572,7 +3898,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.SeShanbe2 && leavId > 0)
@@ -3602,7 +3936,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3617,7 +3959,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.SeShanbe3 && leavId > 0)
@@ -3647,7 +3997,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3662,7 +4020,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.SeShanbe4 && leavId > 0)
@@ -3692,7 +4058,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3707,7 +4081,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.SeShanbe1 && leavId > 0)
@@ -3737,7 +4119,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3752,7 +4142,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.SeShanbe2 && leavId > 0)
@@ -3785,7 +4183,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3800,7 +4206,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.CheharShanbe1 && leavId > 0)
@@ -3830,7 +4244,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3845,7 +4267,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.CheharShanbe2 && leavId > 0)
@@ -3875,7 +4305,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3890,7 +4328,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.CheharShanbe3 && leavId > 0)
@@ -3920,7 +4366,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3935,7 +4389,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.CheharShanbe4 && leavId > 0)
@@ -3965,7 +4427,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -3980,7 +4450,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.CheharShanbe1 && leavId > 0)
@@ -4010,7 +4488,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -4025,7 +4511,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.CheharShanbe2 && leavId > 0)
@@ -4058,7 +4552,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -4073,7 +4575,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.PanjShanbe1 && leavId > 0)
@@ -4103,7 +4613,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -4118,7 +4636,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.PanjShanbe2 && leavId > 0)
@@ -4148,7 +4674,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -4163,7 +4697,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.PanjShanbe3 && leavId > 0)
@@ -4193,7 +4735,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -4208,7 +4758,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.PanjShanbe4 && leavId > 0)
@@ -4238,7 +4796,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -4253,7 +4819,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.PanjShanbe1 && leavId > 0)
@@ -4283,7 +4857,15 @@ public class IndexModel : PageModel
 										startTimeTowSh1, endTimeTowSh2);
 									rotatingCheck.RotatingDate = test;
 									rotatingResultList.Add(rotatingCheck);
-									notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										notHolidays = notHolidays.Add(dailyFix);
+									}
+									else
+									{
+										notHolidays = notHolidays.Add(rotatingCheck.TotalWorkingTime);
+									}
 									Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 								}
 								else
@@ -4298,7 +4880,15 @@ public class IndexModel : PageModel
 
 									var rotatingCheck = RotatingShiftCheck(starTimeSingel1, endTimeSingel2,
 										startTimeTowSh1, endTimeTowSh2);
-									HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									DateTime testGr = test.ToGeorgianDateTime();
+									if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(dailyFix);
+									}
+									else
+									{
+										HolidaysAndNot = HolidaysAndNot.Add(rotatingCheck.TotalWorkingTime);
+									}
 								}
 							}
 							else if (command.PanjShanbe2 && leavId > 0)
@@ -4330,7 +4920,16 @@ public class IndexModel : PageModel
 									endTimeTowSh2);
 								rotatingCheck.RotatingDate = test;
 								rotatingResultList.Add(rotatingCheck);
-								jomeh = jomeh.Add(rotatingCheck.TotalWorkingTime);
+							
+								DateTime testGr = test.ToGeorgianDateTime();
+								if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+								{
+									jomeh = jomeh.Add(dailyFix);
+								}
+								else
+								{
+									jomeh = jomeh.Add(rotatingCheck.TotalWorkingTime);
+								}
 								Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 							}
 							else if (command.Jome1 && leavId > 0)
@@ -4358,7 +4957,15 @@ public class IndexModel : PageModel
 									endTimeTowSh2);
 								rotatingCheck.RotatingDate = test;
 								rotatingResultList.Add(rotatingCheck);
-								jomeh = jomeh.Add(rotatingCheck.TotalWorkingTime);
+								DateTime testGr = test.ToGeorgianDateTime();
+								if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+								{
+									jomeh = jomeh.Add(dailyFix);
+								}
+								else
+								{
+									jomeh = jomeh.Add(rotatingCheck.TotalWorkingTime);
+								}
 								Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 							}
 							else if (command.Jome2 && leavId > 0)
@@ -4386,7 +4993,15 @@ public class IndexModel : PageModel
 									endTimeTowSh2);
 								rotatingCheck.RotatingDate = test;
 								rotatingResultList.Add(rotatingCheck);
-								jomeh = jomeh.Add(rotatingCheck.TotalWorkingTime);
+								DateTime testGr = test.ToGeorgianDateTime();
+								if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+								{
+									jomeh = jomeh.Add(dailyFix);
+								}
+								else
+								{
+									jomeh = jomeh.Add(rotatingCheck.TotalWorkingTime);
+								}
 								Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 							}
 							else if (command.Jome3 && leavId > 0)
@@ -4414,7 +5029,15 @@ public class IndexModel : PageModel
 									endTimeTowSh2);
 								rotatingCheck.RotatingDate = test;
 								rotatingResultList.Add(rotatingCheck);
-								jomeh = jomeh.Add(rotatingCheck.TotalWorkingTime);
+								DateTime testGr = test.ToGeorgianDateTime();
+								if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+								{
+									jomeh = jomeh.Add(dailyFix);
+								}
+								else
+								{
+									jomeh = jomeh.Add(rotatingCheck.TotalWorkingTime);
+								}
 								Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 							}
 							else if (command.Jome4 && leavId > 0)
@@ -4442,7 +5065,15 @@ public class IndexModel : PageModel
 									endTimeTowSh2);
 								rotatingCheck.RotatingDate = test;
 								rotatingResultList.Add(rotatingCheck);
-								jomeh = jomeh.Add(rotatingCheck.TotalWorkingTime);
+								DateTime testGr = test.ToGeorgianDateTime();
+								if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+								{
+									jomeh = jomeh.Add(dailyFix);
+								}
+								else
+								{
+									jomeh = jomeh.Add(rotatingCheck.TotalWorkingTime);
+								}
 								Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 							}
 							else if (command.Jome1 && leavId > 0)
@@ -4470,7 +5101,15 @@ public class IndexModel : PageModel
 									endTimeTowSh2);
 								rotatingCheck.RotatingDate = test;
 								rotatingResultList.Add(rotatingCheck);
-								jomeh = jomeh.Add(rotatingCheck.TotalWorkingTime);
+								DateTime testGr = test.ToGeorgianDateTime();
+								if (leavList.Any(x => x.StartLeaveGr <= testGr && x.EndLeaveGr >= testGr) && rotatingCheck.TotalWorkingTime > dailyFix)
+								{
+									jomeh = jomeh.Add(dailyFix);
+								}
+								else
+								{
+									jomeh = jomeh.Add(rotatingCheck.TotalWorkingTime);
+								}
 								Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
 							}
 							else if (command.Jome2 && leavId > 0)
@@ -4570,7 +5209,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 					var endCal = end - start;
 					var NextStart = start.AddHours(36);
 					end = NextStart.Add(endCal);
@@ -4612,7 +5259,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					var endCal = end - start;
@@ -4635,7 +5290,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					i += 1;
@@ -4657,7 +5320,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					i1 += 1;
@@ -4680,7 +5351,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					i2 += 1;
@@ -4703,7 +5382,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                      (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                      (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                      (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 					i3 += 1;
 					var NextStart = start.AddHours(36);
@@ -4723,7 +5410,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					i4 += 1;
@@ -4822,7 +5517,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+										               (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+										               (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+													(x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 					var NextStart = start.AddHours(48);
 					end = NextStart.Add(WorkHours);
@@ -4862,7 +5565,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					var NextStart = start.AddHours(48);
@@ -4884,7 +5595,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					i += 1;
@@ -4906,7 +5625,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					i1 += 1;
@@ -4929,7 +5656,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					i2 += 1;
@@ -4951,7 +5686,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					i3 += 1;
@@ -4973,7 +5716,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					i4 += 1;
@@ -5074,7 +5825,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 					var WorkHours = end - start;
 					var NextStart = start.AddHours(48);
@@ -5118,7 +5877,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 					var WorkHours = end - start;
 					var NextStart = start.AddHours(48);
@@ -5141,7 +5908,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					i += 1;
@@ -5164,7 +5939,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					i1 += 1;
@@ -5188,7 +5971,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					i2 += 1;
@@ -5212,7 +6003,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= endComplex && x.EndLeaveGr >= endComplex) ||
+					                                  (x.StartLeaveGr >= startComplex && x.StartLeaveGr <= endComplex) ||
+					                                  (x.EndLeaveGr >= startComplex && x.EndLeaveGr <= endComplex));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 					i3 += 1;
 					var NextStart = start.AddHours(48);
@@ -5234,7 +6033,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					i4 += 1;
@@ -5333,7 +6140,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+					
 
 					var WorkHours = end - start;
 					var NextStart = start.AddHours(72);
@@ -5375,7 +6190,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					var WorkHours = end - start;
@@ -5398,7 +6221,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					i += 1;
@@ -5420,7 +6251,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					i1 += 1;
@@ -5443,7 +6282,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					i2 += 1;
@@ -5465,7 +6312,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 					i3 += 1;
 					var NextStart = start.AddHours(72);
@@ -5486,7 +6341,15 @@ public class IndexModel : PageModel
 					rotatingCheck.RotatingDate = test;
 					rotatingResultList.Add(rotatingCheck);
 					//var Over22Computing = Over22Complex2424(start, end);
-					Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					bool hasLeave = leavList.Any(x => (x.StartLeaveGr <= start && x.EndLeaveGr >= start) ||
+					                                  (x.StartLeaveGr <= end && x.EndLeaveGr >= end) ||
+					                                  (x.StartLeaveGr >= start && x.StartLeaveGr <= end) ||
+					                                  (x.EndLeaveGr >= start && x.EndLeaveGr <= end));
+					if (!hasLeave)
+					{
+						Over22 = Over22.Add(rotatingCheck.NightWorkSpan);
+					}
+
 
 
 					i4 += 1;
@@ -6032,17 +6895,38 @@ public class IndexModel : PageModel
 			shiftOver22Hours = Over22hours.ToString();
 			shiftOver22Minuts = Over22Minuts.ToString();
 		}
-
+		var ComplexNotHolidays = string.Empty;
 		if (command.ShiftWork == "5" || command.ShiftWork == "6" || command.ShiftWork == "7" ||
 		    command.ShiftWork == "8")
 		{
 			shift1Hourse = workingDaysH.ToString();
 			shift1Minuts = workingDaysM.ToString();
-
-
+			
 			// اضافه کاری
 			if (totalHoursShift1 > ComplexFix)
 			{
+				var leavs = leavList.Where(x => x.StartLeaveGr >= conStartGr && x.EndLeaveGr <= conEndGr)
+					.Sum(x => x.LeaveHourses.ConvertToInt());
+				//کسر اضافه کار مرخصی
+				if(leavs > 0) {
+					var avrageOfTotalShift = totalHoursShift1 / sumDays;
+					var avrageOfComplexFix = ComplexFix / sumDays;
+					var mandatoryPerOneDay = avrageOfTotalShift - avrageOfComplexFix;
+					var minuseMondatory = mandatoryPerOneDay * leavs;
+					if (minuseMondatory < Mandatory)
+					{
+						var newManadatory = Mandatory.Subtract(minuseMondatory);
+						mandatoryHours = (int)newManadatory.TotalHours;
+						mandatoryminuts = newManadatory.Minutes % 60;
+					}
+					else
+					{
+						mandatoryHours = 0;
+						mandatoryminuts = 0;
+					}
+					
+				}
+
 				overMandatoryHours = mandatoryHours.ToString();
 				overMandatoryMinuts = mandatoryminuts.ToString();
 				//line3 = "مجموع ساعات اضافه کاری " + " : " + $" {mandatoryHours} " + "ساعت و " + $" {mandatoryminuts} " + "دقیقه";
@@ -6051,16 +6935,43 @@ public class IndexModel : PageModel
 
 			shiftOver22Hours = Over22hours.ToString();
 			shiftOver22Minuts = Over22Minuts.ToString();
-		}
-
-		var ComplexNotHolidays = string.Empty;
-		if (command.ShiftWork == "5" || command.ShiftWork == "6" || command.ShiftWork == "7" ||
-		    command.ShiftWork == "8")
-		{
 			ComplexNotHolidays = Notholiday;
 			Notholiday = "0";
 		}
 
+		//کسر جمعه های مرخصی
+		#region LeavesFriday
+
+		int fridayLeav = 0;
+		foreach (var item in leavList)
+		{
+			for (var daa = item.StartLeaveGr; daa <= item.EndLeaveGr; daa = daa.AddDays(1))
+			{
+
+				if (daa.DayOfWeek == DayOfWeek.Friday)
+				{
+					fridayLeav += 1;
+				}
+
+			}
+		}
+
+		if (fridayLeav > 0)
+		{
+			if (fridayLeav <= holidaysCount)
+			{
+				Holidays = (holidaysCount - fridayLeav).ToString();
+			}
+			else
+			{
+				Holidays = "0";
+
+			}
+
+		}
+
+		#endregion
+
 		#endregion
 
 		#region RtatingStatus
@@ -6165,7 +7076,6 @@ public class IndexModel : PageModel
 	}
 
 	#endregion
-
 	#region MandatoryDependingMetods
 
 	public RotatingShiftViewModel RotatingShiftCheck(DateTime? singleShift1, DateTime? singleShift2,
diff --git a/ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml b/ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml
index 3d50367e..0cf280c5 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml
@@ -626,9 +626,6 @@
   
   .countPersonel{
   
-
-     
-
     position: relative !important;
     top: 55px !important;
     display: inline-block !important;
@@ -647,7 +644,7 @@
    
   
     }
-     .eye{   z-index: 100;
+     .eye{   z-index: 1;
     position: relative !important;
     top: 63px !important;
     display: inline-block !important;
@@ -667,6 +664,7 @@
 .eye{
         float: right !important;
         top: 20px !important;    margin-right: 5px !important;
+		z-index : 1;
 }
   }    
          @@media screen and (max-width: 500px) {     
@@ -676,10 +674,7 @@
 }    
 
 
-.eye{
-        float: right !important;
-        top: 20px !important;    margin-right: 5px !important;
-}
+
    }
    
 
diff --git a/ServiceHost/Areas/Admin/Pages/Company/SmsResult/Index.cshtml b/ServiceHost/Areas/Admin/Pages/Company/SmsResult/Index.cshtml
index 87396796..512a783c 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/SmsResult/Index.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/SmsResult/Index.cshtml
@@ -355,7 +355,8 @@
 							<option value="اعلام مسدودی طرف حساب"> اعلام مسدودی طرف حساب </option>
 							<option value="هشدار اول"> هشدار اول </option>
 							<option value="هشدار دوم"> هشدار دوم </option>
-							<option value="اقدام قضایی"> اقدام قضایی </option>
+                            <option value="اقدام قضایی"> اقدام قضایی </option>
+							<option value="یادآور وظایف"> یادآور وظایف </option>
 						</select>
 					</div>
 				</div>
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml
index f3a66972..2553b058 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml
@@ -2,439 +2,456 @@
 @model ServiceHost.Areas.Admin.Pages.Company.Workshops.AutoExtensionModel
 @Html.AntiForgeryToken()
 @{
-@section Styles{
-	<style>
-             .errored {
-                 animation: shake 300ms;
-                 box-shadow: inset 0 0 2px #eb3434, 0 0 5px #eb3434 !important;
-                 border: 1px solid #eb3434 !important;
-             }
-             .zero-ps-code {
-           
-                 background-color: #eb3434;
-                 animation: color-change 800ms linear infinite;
-             }
-             .firstCheckAlert {
-           
-                 background-color: #eb3434;
-                 animation: color-change 800ms linear infinite;
-             }
-             .contractExist {
-                 background-color: #ffb715 !important;
-             }
-             .leftInvalid {
-                 display: none;
-             }
-             @@keyframes color-change {
-                 0% {
-                     background-color: #eb3434;
-                 }
-                 50% {
-                     background-color: #e5e5e5;
-                 }
-                 100% {
-                     background-color: #eb3434;
-                 }
+	@section Styles{
+			<style>
+										 	.errored {
+											 	animation: shake 300ms;
+											 	box-shadow: inset 0 0 2px #eb3434, 0 0 5px #eb3434 !important;
+											 	border: 1px solid #eb3434 !important;
+										 	}
+										 	.zero-ps-code {
+									   	
+											 	background-color: #eb3434;
+											 	animation: color-change 800ms linear infinite;
+										 	}
+										 	.firstCheckAlert {
+									   	
+											 	background-color: #eb3434;
+											 	animation: color-change 800ms linear infinite;
+										 	}
+										 	.contractExist {
+											 	background-color: #ffb715 !important;
+										 	}
+										 	.leftInvalid {
+											 	display: none;
+										 	}
+										 	.red{
+											 	border-radius: 5px;
+										 	}
+										 	@@keyframes color-change {
+											 	0% {
+												 	background-color: #eb3434;
+											 	}
+											 	50% {
+												 	background-color: #e5e5e5;
+											 	}
+											 	100% {
+												 	background-color: #eb3434;
+											 	}
 
-             }
+										 	}
 
-             .tooltip-container {
-                 cursor: pointer;
-                 position: relative;
-                 /*    display: inline-block;*/
-             }
-             .tooltip {
-                 opacity: 0;
-                 z-index: 99;
-                 color: #fff;
-                 /*  width: 180px;*/
-                 display: block;
-                 font-size: 12px;
-                 font-family: 'IranSans';
-                 padding: 5px 10px;
-                 border-radius: 15px;
-                 text-align: center;
-                 /*text-shadow: 1px 1px 2px #111;*/
-                 background:  #eb3434;
-                 border: 1px solid #eb3434;
-                 box-shadow: 0 0 3px rgba(0,0,0,0.5);
-                 -webkit-transition: all .2s ease-in-out;
-                 -moz-transition: all .2s ease-in-out;
-                 -o-transition: all .2s ease-in-out;
-                 /*  -ms-transition: all .2s ease-in-out;*/
-                 transition: all .2s ease-in-out;
-                 -webkit-transform: scale(0);
-                 -moz-transform: scale(0);
-                 -o-transform: scale(0);
-                 -ms-transform: scale(0);
-                 transform: scale(0);
-                 position: absolute;
-                 right: -2px;
-                 bottom: 23px;
-                 white-space: nowrap;
-             }
+										 	.tooltip-container {
+											 	cursor: pointer;
+											 	position: relative;
+											 	/*    display: inline-block;*/
+										 	}
+										 	.tooltip {
+											 	opacity: 0;
+											 	z-index: 99;
+											 	color: #fff;
+											 	/*  width: 180px;*/
+											 	display: block;
+											 	font-size: 12px;
+											 	font-family: 'IranSans';
+											 	padding: 5px 10px;
+											 	border-radius: 15px;
+											 	text-align: center;
+											 	/*text-shadow: 1px 1px 2px #111;*/
+											 	background:  #eb3434;
+											 	border: 1px solid #eb3434;
+											 	box-shadow: 0 0 3px rgba(0,0,0,0.5);
+											 	-webkit-transition: all .2s ease-in-out;
+											 	-moz-transition: all .2s ease-in-out;
+											 	-o-transition: all .2s ease-in-out;
+											 	/*  -ms-transition: all .2s ease-in-out;*/
+											 	transition: all .2s ease-in-out;
+											 	-webkit-transform: scale(0);
+											 	-moz-transform: scale(0);
+											 	-o-transform: scale(0);
+											 	-ms-transform: scale(0);
+											 	transform: scale(0);
+											 	position: absolute;
+											 	right: -2px;
+											 	bottom: 23px;
+											 	white-space: nowrap;
+										 	}
 
-             .tooltip:before, .tooltip:after {
-                 content: '';
-                 border-left: 10px solid transparent;
-                 border-right: 10px solid transparent;
-                 border-top: 10px solid  #eb3434;
-                 position: absolute;
-                 bottom: -10px;
-                 right: 20px;
-             }
+										 	.tooltip:before, .tooltip:after {
+											 	content: '';
+											 	border-left: 10px solid transparent;
+											 	border-right: 10px solid transparent;
+											 	border-top: 10px solid  #eb3434;
+											 	position: absolute;
+											 	bottom: -10px;
+											 	right: 20px;
+										 	}
 
-             .tooltip-container:hover .tooltip, a:hover .tooltip {
-                 opacity: 1;
-                 -webkit-transform: scale(1);
-                 -moz-transform: scale(1);
-                 -o-transform: scale(1);
-                 -ms-transform: scale(1);
-                 transform: scale(1);
-             }
-             .pdate{
-                 background-color: rgba(255,255,255,0.9) !important;
-                 border: 1px solid #bdbdbd  !important;
-                 direction: ltr;
-         
-             }
-             .sizeSet {
-                 padding: 2px !important;        
-                 text-align: center !important;
-             }
-             .ionSize {
-                 font-size: 22px !important;
-                 top: 2px !important;
-                 position: relative;
-                 padding: 0px 2px 0px 2px;
-             }
-             .iconSize {
-                 min-width: 90px !important;
-                 width: 90px;
-             }
-             .rad {
-                 border-radius: 8px !important;
-                 /* padding: 10px; */
-                 padding: 2px 5px 0px 5px;
-             }
-             @@media screen and (max-width: 1920px) {
-                 .pannelSize {
-                     width: 85%
-                 }
+										 	.tooltip-container:hover .tooltip, a:hover .tooltip {
+											 	opacity: 1;
+											 	-webkit-transform: scale(1);
+											 	-moz-transform: scale(1);
+											 	-o-transform: scale(1);
+											 	-ms-transform: scale(1);
+											 	transform: scale(1);
+										 	}
+										 	.pdate{
+											 	background-color: rgba(255,255,255,0.9) !important;
+											 	border: 1px solid #bdbdbd  !important;
+											 	direction: ltr;
+									 	
+										 	}
+										 	.sizeSet {
+											 	padding: 2px !important;        
+											 	text-align: center !important;
+										 	}
+										 	.ionSize {
+											 	font-size: 22px !important;
+											 	top: 2px !important;
+											 	position: relative;
+											 	padding: 0px 2px 0px 2px;
+										 	}
+										 	.iconSize {
+											 	min-width: 90px !important;
+											 	width: 90px;
+										 	}
+										 	.rad {
+											 	border-radius: 8px !important;
+											 	/* padding: 10px; */
+											 	padding: 2px 5px 0px 5px;
+										 	}
+										 	.select {
+											 	background-color: #fafafa;
+											 	color: rgba(0, 0, 0, 0.6);
+											 	font-size: 14px;
+											 	border: 1px solid #c7c7c7 !important;
+											 	-webkit-border-radius: 2px;
+											 	-moz-border-radius: 2px;
+											 	border-radius: 10px;
+											 	-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+											 	-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+											 	box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+											 	border: 1px solid #eee;
+											 	box-shadow: none;
+											 	text-align: center;
+										 	}
+										 	@@media screen and (max-width: 1920px) {
+											 	.pannelSize {
+												 	width: 85%
+											 	}
 
-                 .modal-content2 {
-                     background-color: whitesmoke;
-                     width: 36%;
-                     height: 490px;
-                     border: 1px solid #a5a5a59e;
-                     border-radius: 25px;
-                     margin-top: 150px;
-                     margin-right: 32%;
-                     padding: 0px 30px;
-                 }
-             }
+											 	.modal-content2 {
+												 	background-color: whitesmoke;
+												 	width: 36%;
+												 	height: 490px;
+												 	border: 1px solid #a5a5a59e;
+												 	border-radius: 25px;
+												 	margin-top: 150px;
+												 	margin-right: 32%;
+												 	padding: 0px 30px;
+											 	}
+										 	}
 
 
-             @@media screen and (max-width: 1440px) {
-                 .pannelSize {
-                     width: 80%
-                 }
-                 .modal-content2 {
-                     background-color: whitesmoke;
-                     width: 50%;
-                     height: 490px;
-                     border: 1px solid #a5a5a59e;
-                     border-radius: 25px;
-                     margin-top: 80px;
-                     margin-right: 25%;
-                     padding: 0px 30px;
-                 }
-             }
+										 	@@media screen and (max-width: 1440px) {
+											 	.pannelSize {
+												 	width: 80%
+											 	}
+											 	.modal-content2 {
+												 	background-color: whitesmoke;
+												 	width: 50%;
+												 	height: 490px;
+												 	border: 1px solid #a5a5a59e;
+												 	border-radius: 25px;
+												 	margin-top: 80px;
+												 	margin-right: 25%;
+												 	padding: 0px 30px;
+											 	}
+										 	}
 
-             @@media screen and (max-width: 1366px) {
-                 .pannelSize {
-                     width: 79%
-                 }
-             }
+										 	@@media screen and (max-width: 1366px) {
+											 	.pannelSize {
+												 	width: 79%
+											 	}
+										 	}
 
-             @@media screen and (max-width: 1280px) {
-                 .pannelSize {
-                     width: 77%
-                 }
-             }
-        
-             .pannelHead {
-                 border-radius: 15px 15px 0px 0px;
-                 height: 40px;
-                 background: linear-gradient(to right, #016603, #06ab08 50%, #06ab08 50%, #016603);
-                 margin: -10px -15px 25px -15px;
-             }
+										 	@@media screen and (max-width: 1280px) {
+											 	.pannelSize {
+												 	width: 77%
+											 	}
+										 	}
+										
+										 	.pannelHead {
+											 	border-radius: 15px 15px 0px 0px;
+											 	height: 40px;
+											 	background: linear-gradient(to right, #016603, #06ab08 50%, #06ab08 50%, #016603);
+											 	margin: -10px -15px 25px -15px;
+										 	}
 
-             .pannelHead2 {
-                 height: 40px;
-                 background: linear-gradient(to right, #9a9a9a, #ffffff 50%, #ffffff 50%, #9a9a9a);
-                 margin: -25px -15px 25px -15px;
-             }
+										 	.pannelHead2 {
+											 	height: 40px;
+											 	background: linear-gradient(to right, #9a9a9a, #ffffff 50%, #ffffff 50%, #9a9a9a);
+											 	margin: -25px -15px 25px -15px;
+										 	}
 
-             .headText {
-                 text-align: center;
-                 margin-top: 8px;
-                 font-size: 16px;
-                 color: #e5e5e5;
-             }
+										 	.headText {
+											 	text-align: center;
+											 	margin-top: 8px;
+											 	font-size: 16px;
+											 	color: #e5e5e5;
+										 	}
 
-             .inpt {
-                 display: inline-block;
-                 border-radius: 15px 0px 5px 15px;
-                 text-align: center;
-             }
+										 	.inpt {
+											 	display: inline-block;
+											 	border-radius: 15px 0px 5px 15px;
+											 	text-align: center;
+										 	}
 
-             .disc {
-                 border-radius: 0px 15px 15px 0px;
-                 height: 34px;
-                 position: absolute;
-                 cursor: unset;
-             }
+										 	.disc {
+											 	border-radius: 0px 15px 15px 0px;
+											 	height: 34px;
+											 	position: absolute;
+											 	cursor: unset;
+										 	}
 
-             .disc:hover {
-                 box-shadow: unset;
-             }
+										 	.disc:hover {
+											 	box-shadow: unset;
+										 	}
 
-             .inputCol {
-                 margin-top: 15%;
-             }
-             .redColor {
-                 background-color: #ffe8e8 !important;
-             }
-             .greenColor {
-                 background-color: #c9eecf !important;
-             }
-             .contractType {
-                 border-radius: 5px;
-                 width: 60px;
-                 border-color: #5b5b5b;
-                 color: #5b5b5b;
-             }
-             .contractPeryod {
-                 border-radius: 5px;
-                 width: 80px;
-                 border-color: #5b5b5b;
-                 color: #5b5b5b;
-             }
+										 	.inputCol {
+											 	margin-top: 15%;
+										 	}
+										 	.redColor {
+											 	background-color: #ffe8e8 !important;
+										 	}
+										 	.greenColor {
+											 	background-color: #c9eecf !important;
+										 	}
+										 	.contractType {
+											 	border-radius: 5px;
+											 	width: 60px;
+											 	border-color: #5b5b5b;
+											 	color: #5b5b5b;
+										 	}
+										 	.contractPeryod {
+											 	border-radius: 5px;
+											 	width: 80px;
+											 	border-color: #5b5b5b;
+											 	color: #5b5b5b;
+										 	}
 
 
-             /*modal2 */
+										 	/*modal2 */
 
-  
-             .modal-footer {
-                 border-top: unset !important;
-             }
-             .modal-header {
-                 border-bottom: unset !important;
-                 padding: unset !important;
-             }
+							  	
+										 	.modal-footer {
+											 	border-top: unset !important;
+										 	}
+										 	.modal-header {
+											 	border-bottom: unset !important;
+											 	padding: unset !important;
+										 	}
 
-             .close {
-                 margin-top: 12px;
-                 margin-left: -19px;
-                 font-size: 26px;
-                 position: absolute;
-   
-             }
+										 	.close {
+											 	margin-top: 12px;
+											 	margin-left: -19px;
+											 	font-size: 26px;
+											 	position: absolute;
+							   	
+										 	}
 
-             .main-title {
-                 position: absolute;
-                 width: 195px;
-                 font-size: 19px;
-                 background-color: inherit;
-                 left: 50%;
-                 top: 6px;
-                 margin-left: -100px;
-                 text-align: center;
-                 color: black;
-                 border: 1px solid #00000030;
-                 border-radius: 9px;
-                 padding: 2px 0px;
-             }
+										 	.main-title {
+											 	position: absolute;
+											 	width: 195px;
+											 	font-size: 19px;
+											 	background-color: inherit;
+											 	left: 50%;
+											 	top: 6px;
+											 	margin-left: -100px;
+											 	text-align: center;
+											 	color: black;
+											 	border: 1px solid #00000030;
+											 	border-radius: 9px;
+											 	padding: 2px 0px;
+										 	}
 
-             .modal2-btns {
-                 float: left;
-                 padding: 15px;
-             }
-             .modal2-btn {
-                 border-radius: 16px;
-                 font-size: 12px;
-             }
-             .modal-content2 .main-title {
-                 top: 35px;
-             }
-             .modal-content2 label {
-                 color: #2c2c2c;
-                 font-size: 10px;
-             }
-             .modal .modal-dialoge .modal-content2 .modal-body {
-                 padding: 0px 50px;
-                 display: flex;
-                 flex-wrap: wrap;
-                 padding: 10px 0px;
-           
-             }
+										 	.modal2-btns {
+											 	float: left;
+											 	padding: 15px;
+										 	}
+										 	.modal2-btn {
+											 	border-radius: 16px;
+											 	font-size: 12px;
+										 	}
+										 	.modal-content2 .main-title {
+											 	top: 35px;
+										 	}
+										 	.modal-content2 label {
+											 	color: #2c2c2c;
+											 	font-size: 10px;
+										 	}
+										 	.modal .modal-dialoge .modal-content2 .modal-body {
+											 	padding: 0px 50px;
+											 	display: flex;
+											 	flex-wrap: wrap;
+											 	padding: 10px 0px;
+									   	
+										 	}
 
-             div span.week {
-                 border-radius: 5px;
-                 padding: 2px 8px;
-                 margin-right: 15px;
-             }
+										 	div span.week {
+											 	border-radius: 5px;
+											 	padding: 2px 8px;
+											 	margin-right: 15px;
+										 	}
 
-             #shanbeh, #yekshanbeh, #doshanbeh, #seshanbeh, #cheharshanbeh, #panjshanbeh, #jomeh {
-                 width: 80px;
-             }
+										 	#shanbeh, #yekshanbeh, #doshanbeh, #seshanbeh, #cheharshanbeh, #panjshanbeh, #jomeh {
+											 	width: 80px;
+										 	}
 
-             #Sh1, #Sh2, #Sh3, #Sh4, #Sh5, #Sh6, #Sh7, #Sh8 {
-                 width: 80px;
-                 margin-right: 30%;
-             }
+										 	#Sh1, #Sh2, #Sh3, #Sh4, #Sh5, #Sh6, #Sh7, #Sh8 {
+											 	width: 80px;
+											 	margin-right: 30%;
+										 	}
 
-             .time {
-                 width: 10%;
-                 text-align: center;
-                 direction: ltr;
-                 border-radius: 5px;
-                 border: 1px solid #47c848 !important;
-             }
+										 	.time {
+											 	width: 10%;
+											 	text-align: center;
+											 	direction: ltr;
+											 	border-radius: 5px;
+											 	border: 1px solid #47c848 !important;
+										 	}
 
-             .time2 {
-                 width: 32%;
-                 text-align: center;
-                 direction: ltr;
-                 border-radius: 5px;
-                 border: 1px solid #47c848 !important;
-             }
+										 	.time2 {
+											 	width: 32%;
+											 	text-align: center;
+											 	direction: ltr;
+											 	border-radius: 5px;
+											 	border: 1px solid #47c848 !important;
+										 	}
 
-             .fild {
-                 border: 1px solid #878686;
-                 background-color: #e7e7e7;
-                 border-radius: 10px;
-                 padding: 15px 0 15px 0;
-                 display: inline;
-                 float: left;
-                 width: 100%;
-                 margin: 5px 0px;
-             }
+										 	.fild {
+											 	border: 1px solid #878686;
+											 	background-color: #e7e7e7;
+											 	border-radius: 10px;
+											 	padding: 15px 0 15px 0;
+											 	display: inline;
+											 	float: left;
+											 	width: 100%;
+											 	margin: 5px 0px;
+										 	}
 
-             .fild2 {
-                 border: 1px solid #878686;
-                 background-color: #d9d9d9;
-                 border-radius: 10px;
-                 padding: 10px 0 10px 0;
-                 display: inline;
-                 float: left;
-                 width: 80%;
-                 margin-left: 15px;
-             }
+										 	.fild2 {
+											 	border: 1px solid #878686;
+											 	background-color: #d9d9d9;
+											 	border-radius: 10px;
+											 	padding: 10px 0 10px 0;
+											 	display: inline;
+											 	float: left;
+											 	width: 80%;
+											 	margin-left: 15px;
+										 	}
 
-             .fild3 {
-                 border: 1px solid #878686;
-                 background-color: #e7e7e7;
-                 border-radius: 10px;
-                 display: inline;
-                 float: left;
-                 width: 100%;
-             }
-             input[type=radio]:hover {
-                 cursor: pointer;
-             }
-             hr {
-                 margin-top: 10px;
-                 margin-bottom: 10px;
-                 border-top: 1px solid #d3d3d3;
-             }
+										 	.fild3 {
+											 	border: 1px solid #878686;
+											 	background-color: #e7e7e7;
+											 	border-radius: 10px;
+											 	display: inline;
+											 	float: left;
+											 	width: 100%;
+										 	}
+										 	input[type=radio]:hover {
+											 	cursor: pointer;
+										 	}
+										 	hr {
+											 	margin-top: 10px;
+											 	margin-bottom: 10px;
+											 	border-top: 1px solid #d3d3d3;
+										 	}
 
-             .checkbox + .checkbox, .radio + .radio {
-                 margin-top: 0px !important;
-             }
+										 	.checkbox + .checkbox, .radio + .radio {
+											 	margin-top: 0px !important;
+										 	}
 
-             .radio {
-                 margin-top: 0px !important;
-             }
-             .anim {
-                 animation-name: animationProgress;
-             }
+										 	.radio {
+											 	margin-top: 0px !important;
+										 	}
+										 	.anim {
+											 	animation-name: animationProgress;
+										 	}
 
-         @*heder*@
-             .top-Bar {
-                 background-color: #c1dcd8;
-                 height: 100px;
-                 border-radius: 15px;
-                 margin: 0px 2px 10px 2px;
-                 box-shadow: 0px 1px 15px 0 #749883;
-          
-             }
-             .workshopName {
-                 color: #fff;
-                 background-color: #10aa12;
-                 font-size: 15px;
-                 border-radius: 15px;
-                 height: 25px;
-                 line-height: 1.8;
-             }
-             .manual {
-                 background-color: #efefef;
-                 min-height: 160px;
-                 border-radius: 15px;
-                 width: 49%;
-                 box-shadow: 0px 1px 15px 0 #4cb733;
-             }
-             .automatic {
-                 background-color: #efefef;
-                 min-height: 160px;
-                 border-radius: 15px;
-                 width: 49%;
-                 box-shadow: 0px 1px 15px 0 #b7b233
-             }
-             .discManual {
-                 border-radius: 20px 5px 0px 0px;
-                 cursor: unset;
-                 font-size: 12px;
-                 padding: 3px 10px;
-             }
-             .inptAutomatic {
-                 display: inline-block;
-                 border-radius: 15px;
-                 text-align: center;
-             }
-             .trueStatusHide {
-                 display: none;
-             }
-             .falseStatusHide {
-                 display: none;
-             }
-             .progBar {
-                 display: none;
-             }
-             #createProcess {
-                 background-color: #fdfdfd;
-                 height: 100px;
-                 border-radius: 15px;
-                 margin: 0px 2px 10px 2px;
-                 box-shadow: 0px 1px 15px 0 #1ebb5f;
-             }
-             .progress-bar {
-                 color: #fff!important;
-                 font-size: 17px !important;
-                 line-height: 23px !important;
-                 border-radius: 10px !important;
-             
-             }
-    </style>
+									 	@*heder*@
+										 	.top-Bar {
+											 	background-color: #c1dcd8;
+											 	height: 100px;
+											 	border-radius: 15px;
+											 	margin: 0px 2px 10px 2px;
+											 	box-shadow: 0px 1px 15px 0 #749883;
+									  	
+										 	}
+										 	.workshopName {
+											 	color: #fff;
+											 	background-color: #1b9998;
+											 	font-size: 15px;
+											 	border-radius: 15px;
+											 	height: 25px;
+											 	line-height: 1.8;
+										 	}
+										 	.manual {
+											 	background-color: #efefef;
+											 	min-height: 160px;
+											 	border-radius: 15px;
+											 	width: 49%;
+											 	box-shadow: 0px 1px 15px 0 #0f8181;
+										 	}
+										 	.automatic {
+											 	background-color: #efefef;
+											 	min-height: 160px;
+											 	border-radius: 15px;
+											 	width: 49%;
+											 	box-shadow: 0px 1px 15px 0 #0f8181
+										 	}
+										 	.discManual {
+											 	border-radius: 20px 5px 0px 0px;
+											 	cursor: unset;
+											 	font-size: 12px;
+											 	padding: 3px 10px;
+										 	}
+										 	.inptAutomatic {
+											 	display: inline-block;
+											 	border-radius: 15px;
+											 	text-align: center;
+										 	}
+										 	.trueStatusHide {
+											 	display: none;
+										 	}
+										 	.falseStatusHide {
+											 	display: none;
+										 	}
+										 	.progBar {
+											 	display: none;
+										 	}
+										 	#createProcess {
+											 	background-color: #fdfdfd;
+											 	height: 100px;
+											 	border-radius: 15px;
+											 	margin: 0px 2px 10px 2px;
+											 	box-shadow: 0px 1px 15px 0 #1ebb5f;
+										 	}
+										 	.progress-bar {
+											 	color: #fff!important;
+											 	font-size: 17px !important;
+											 	line-height: 23px !important;
+											 	border-radius: 10px !important;
+										 	
+										 	}
+									</style>
 
-}
-	var i = 1;
-	var zeropscode = "zero-ps-code tooltip-container";
+	}
+    var i = 1;
+    var zeropscode = "zero-ps-code tooltip-container";
 
 
-	<link href="~/AdminTheme/assets/datatables/jquery.dataTables.min.css" rel="stylesheet" type="text/css"/>
-
+		<link href="~/AdminTheme/assets/datatables/jquery.dataTables.min.css" rel="stylesheet" type="text/css"/>
 }
 <input type="hidden" id="workshopId" value="@Model.WorkshopId" name="workshopId"/>
 <input type="hidden" id="archiveCode" value="@Model.ArchiveCode" name="ArchiveCode"/>
@@ -442,379 +459,428 @@
 <input type="hidden" id="employerId" value="@Model.EmployerId" name="employerId"/>
 
 @{
-	if (Model.HavingPersonel && Model.EmployerWarning == false)
-	{
-		<div class="pannelSize" style="border-top: unset;
-                                       padding: 5px 15px;
-                                       background: rgba(219, 237, 220, 0.7);
-                                       border-radius: 25px 5px 5px 25px;
-                                       position: fixed;
-                                       z-index: 999;
-                                       width: 370px;">
+    if (Model.HavingPersonel && Model.EmployerWarning == false)
+    {
+			<div class="pannelSize" style="border-top: unset;
+																   	padding: 5px 15px;
+																   	background: rgba(219, 237, 220, 0.7);
+																   	border-radius: 25px 5px 5px 25px;
+																   	position: fixed;
+																   	z-index: 999;
+																   	width: 370px;">
 
 
-			<div class="row" dir="rtl" style="width: 400px">
-				<div class="col-xs-12 m-t-5">
-					<a id="firstCheckBtn" class="btn btn-warning btn-rounded waves-effect waves-light m-b-5 send" style="opacity: 1.0; border-radius: 15px 5px 5px 15px; z-index: 3; font-family: 'Web_Yekan' !important; margin-left: -3px"> بررسی اولیه <i class="ion-chevron-left" style="padding-left: 3px; font-size: 15px; position: relative; top: 3px;"></i></a>
+				<div class="row" dir="rtl" style="width: 400px">
+					<div class="col-xs-12 m-t-5">
+						<a id="firstCheckBtn" class="btn btn-warning btn-rounded waves-effect waves-light m-b-5 send" style="opacity: 1.0; border-radius: 15px 5px 5px 15px; z-index: 3; font-family: 'Web_Yekan' !important; margin-left: -3px"> بررسی اولیه <i class="ion-chevron-left" style="padding-left: 3px; font-size: 15px; position: relative; top: 3px;"></i></a>
 
-					<a id="startProcess" class="btn btn-success btn-rounded waves-effect waves-light m-b-5 send" style="background-color: #06ab08; border-color: #06ab08; opacity: 1.0; z-index: 2; border-radius: 15px 5px 5px 15px; right: -15px; font-family: 'Web_Yekan' !important; margin-left: -3px"> شروع عملیات <span>&nbsp;</span><i class="ion-ios7-pulse-strong" style="padding-left: 3px; font-size: 15px; position: relative; top: 3px;"></i></a>
-					<a id="fakeStartProcess" class="btn btn-success btn-rounded waves-effect waves-light m-b-5 send" style="background-color: #06ab08; border-color: #06ab08; opacity: 1.0; z-index: 2; border-radius: 15px 5px 5px 15px; right: -15px; font-family: 'Web_Yekan' !important; margin-left: -3px"> شروع عملیات <span>&nbsp;</span><i class="ion-ios7-pulse-strong" style="padding-left: 3px; font-size: 15px; position: relative; top: 3px;"></i></a>
+						<a id="startProcess" class="btn btn-success btn-rounded waves-effect waves-light m-b-5 send" style="background-color: #06ab08; border-color: #06ab08; opacity: 1.0; z-index: 2; border-radius: 15px 5px 5px 15px; right: -15px; font-family: 'Web_Yekan' !important; margin-left: -3px"> شروع عملیات <span>&nbsp;</span><i class="ion-ios7-pulse-strong" style="padding-left: 3px; font-size: 15px; position: relative; top: 3px;"></i></a>
+						<a id="fakeStartProcess" class="btn btn-success btn-rounded waves-effect waves-light m-b-5 send" style="background-color: #06ab08; border-color: #06ab08; opacity: 1.0; z-index: 2; border-radius: 15px 5px 5px 15px; right: -15px; font-family: 'Web_Yekan' !important; margin-left: -3px"> شروع عملیات <span>&nbsp;</span><i class="ion-ios7-pulse-strong" style="padding-left: 3px; font-size: 15px; position: relative; top: 3px;"></i></a>
 
-					<a asp-page="./Index" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 counter" style="width: 110px; border-bottom-right-radius: 0px; border-top-right-radius: 0px; z-index: 1; right: -30px; background-color: #545353; border-color: #545353; font-family: 'Web_Yekan' !important;">
-						بازگشت <i class="fa faSize ion-arrow-return-left"></i>
-					</a>
+						<a asp-page="./Index" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 counter" style="width: 110px; border-bottom-right-radius: 0px; border-top-right-radius: 0px; z-index: 1; right: -30px; background-color: #545353; border-color: #545353; font-family: 'Web_Yekan' !important;">
+							بازگشت <i class="fa faSize ion-arrow-return-left"></i>
+						</a>
 
 
+					</div>
 				</div>
+
+
 			</div>
+			<div class="row top-Bar progress-bar-striped">
+				<div class="form-group" style="padding: 0px 10px;">
+					<span style="text-align: center">
+						<h4 style="font-size: 15px; color: #767575; margin-top: 10px; margin-bottom: 30px;">ایجاد قرارداد گروهی خودکار</h4>
+					</span>
 
-
-		</div>
-		<div class="row top-Bar progress-bar-striped">
-			<div class="form-group" style="padding: 0px 10px;">
-				<span style="text-align: center">
-					<h4 style="font-size: 15px; color: #767575; margin-top: 10px; margin-bottom: 30px;">ایجاد قرارداد گروهی خودکار</h4>
-				</span>
-
-				<span style="text-align: center">
-					<h4 class="workshopName">@Model.workshopName</h4>
-				</span>
-			</div>
-
-
-		</div>
-		<div class="row" style="padding: 15px 12px;">
-			@*اتوماتیک*@
-			<div class="col-xs-6 automatic progress-bar-striped">
-				<div class="row" style="height: 50%">
-					<span style="text-align: center; display: block">
-						<h4 style="font-size: 18px; color: #666262; margin-top: 35px;">ایجاد قرارداد بصورت خودکار</h4>
-
+					<span style="text-align: center">
+						<h4 class="workshopName">@Model.workshopName</h4>
 					</span>
 				</div>
-				<hr/>
-				<div class="row">
-					<div class="col-xs-12 col-sm-12 col-md-6" style="padding: 20px">
-						<span class="btn btn-success disc" style="background-color: #dcf5e9; color: #666464 !important;">تاریخ شروع</span>
-						<input class="form-control inptAutomatic date">
 
-					</div>
-					<div class="col-xs-12 col-sm-12 col-md-6" style="padding: 20px">
-						<span class="btn btn-warning disc" style="background-color: beige; color: #666464 !important;">تاریخ پایان</span>
-						<input class="form-control inptAutomatic date">
-					</div>
-
-				</div>
 
 			</div>
-			@*دستی*@
-			<div class="col-xs-6 manual progress-bar-striped pull-right">
-				<div class="row" style="height: 50%">
-					<div class="form-group col-md-3 visible-md visible-lg" style="direction: ltr; padding: 23px; margin: 0 auto; font-size: 14px !important;">
-						قرارداد یک ماهه
-					</div>
-					<div class="form-group col-xs-12 visible-xs visible-sm" style="direction: rtl; padding: 23px; margin: 0 auto; font-size: 14px !important;">
-						قرارداد یک ماهه
-					</div>
-					<div class="form-group col-md-4" style="padding: 15px; margin: 0 auto;">
+			<div class="row">
+				<div class="col-xs-2">
 
-						<select name="yearSelected" class="form-control " style="width: 100% !important">
-							<option value="0"> سال </option>
-							@foreach (var itemi in Model.YearlyList)
-							{
-								<option style="font-family: 'IranSans' !important;" value="@itemi"> @itemi </option>
-							}
-						</select>
+				</div>
+				<div class="col-xs-8">
+					<span>انتخاب موردی</span>
+					<select class="select-city select" id="selctedList" style="width: 60%" multiple="multiple" asp-items="@Model.EmployeeSelectList">
+						<option value="0">انتخاب پرسنل</option>
+					</select>
+					<a type="button" id="acceptedList" class="btn btn-success red">
+						<span>تایید</span>
+					</a>
+					<a type="button" id="resetPage" class="btn btn-info red">
+						<span> تازه سازی</span>
+					</a>
+				</div>
+				<div class="col-xs-2">
+
+				</div>
+			</div>
+			<div class="row" style="padding: 15px 12px;">
+				@*اتوماتیک*@
+				<div class="col-xs-6 automatic progress-bar-striped">
+					<div class="row" style="height: 50%">
+						<span style="text-align: center; display: block">
+							<h4 style="font-size: 18px; color: #666262; margin-top: 35px;">ایجاد قرارداد بصورت خودکار</h4>
+
+						</span>
+					</div>
+					<hr/>
+					<div class="row">
+						<div class="col-xs-12 col-sm-12 col-md-6" style="padding: 20px">
+							<span class="btn btn-success disc" style="background-color: #dcf5e9; color: #666464 !important;">تاریخ شروع</span>
+							<input class="form-control inptAutomatic date">
+
+						</div>
+						<div class="col-xs-12 col-sm-12 col-md-6" style="padding: 20px">
+							<span class="btn btn-warning disc" style="background-color: beige; color: #666464 !important;">تاریخ پایان</span>
+							<input class="form-control inptAutomatic date">
+						</div>
 
 					</div>
-					<div class="form-group col-md-4" style="padding: 15px; margin: 0 auto;">
 
-						<select id="monthSelected" class="form-control" style="width: 100% !important">
-							<option value="0"> ماه</option>
-							<option value="01"> فروردین</option>
-							<option value="02"> اردیبهشت</option>
-							<option value="03"> خرداد</option>
-							<option value="04"> تیر</option>
-							<option value="05"> مرداد</option>
-							<option value="06"> شهریور</option>
-							<option value="07"> مهر</option>
-							<option value="08"> آبان</option>
-							<option value="09"> آذر</option>
-							<option value="10"> دی</option>
-							<option value="11"> بهمن</option>
-							<option value="12"> اسفند</option>
-						</select>
+				</div>
+				@*دستی*@
+				<div class="col-xs-6 manual progress-bar-striped pull-right">
+					<div class="row" style="height: 50%">
+						<div class="form-group col-md-3 visible-md visible-lg" style="direction: ltr; padding: 23px; margin: 0 auto; font-size: 14px !important;">
+							قرارداد یک ماهه
+						</div>
+						<div class="form-group col-xs-12 visible-xs visible-sm" style="direction: rtl; padding: 23px; margin: 0 auto; font-size: 14px !important;">
+							قرارداد یک ماهه
+						</div>
+						<div class="form-group col-md-4" style="padding: 15px; margin: 0 auto;">
 
+							<select name="yearSelected" class="form-control " style="width: 100% !important">
+								<option value="0"> سال </option>
+								@foreach (var itemi in Model.YearlyList)
+                            {
+									<option style="font-family: 'IranSans' !important;" value="@itemi"> @itemi </option>
+                            }
+							</select>
+
+						</div>
+						<div class="form-group col-md-4" style="padding: 15px; margin: 0 auto;">
+
+							<select id="monthSelected" class="form-control" style="width: 100% !important">
+								<option value="0"> ماه</option>
+								<option value="01"> فروردین</option>
+								<option value="02"> اردیبهشت</option>
+								<option value="03"> خرداد</option>
+								<option value="04"> تیر</option>
+								<option value="05"> مرداد</option>
+								<option value="06"> شهریور</option>
+								<option value="07"> مهر</option>
+								<option value="08"> آبان</option>
+								<option value="09"> آذر</option>
+								<option value="10"> دی</option>
+								<option value="11"> بهمن</option>
+								<option value="12"> اسفند</option>
+							</select>
+
+						</div>
+					</div>
+					<hr/>
+					<div class="row">
+						<div class="form-group col-md-3 visible-md visible-lg" style="direction: ltr; padding: 23px; margin: 0 auto; font-size: 14px !important;">
+							بیشتر از یک ماه
+						</div>
+						<div class="form-group col-xs-12 visible-xs visible-sm" style="direction: rtl; padding: 23px; margin: 0 auto; font-size: 14px !important;">
+							بیشتر از یک ماه
+						</div>
+						<div class="col-md-4 col-xs-12">
+							<span class="btn btn-success discManual">تاریخ شروع</span>
+							<input id="start" dir="ltr" class="form-control inpt date">
+
+						</div>
+						<div class="col-md-4 col-xs-12">
+
+
+							<span class="btn btn-warning discManual">تاریخ پایان</span>
+							<input id="end" dir="ltr" class="form-control inpt date">
+						</div>
 					</div>
 				</div>
-				<hr/>
-				<div class="row">
-					<div class="form-group col-md-3 visible-md visible-lg" style="direction: ltr; padding: 23px; margin: 0 auto; font-size: 14px !important;">
-						بیشتر از یک ماه
-					</div>
-					<div class="form-group col-xs-12 visible-xs visible-sm" style="direction: rtl; padding: 23px; margin: 0 auto; font-size: 14px !important;">
-						بیشتر از یک ماه
-					</div>
-					<div class="col-md-4 col-xs-12">
-						<span class="btn btn-success discManual">تاریخ شروع</span>
-						<input id="start" dir="ltr" class="form-control inpt date">
-
-					</div>
-					<div class="col-md-4 col-xs-12">
 
 
-						<span class="btn btn-warning discManual">تاریخ پایان</span>
-						<input id="end" dir="ltr" class="form-control inpt date">
+			</div>
+			<div id="createProcess" class="row progress-bar-striped progBar">
+				<div class="form-group" style="padding: 0px 10px;">
+					<span style="text-align: center">
+						<h3 style="font-size: 15px;
+														   	color: #767575;
+														   	margin-top: 20px;
+														   	margin-bottom: 15px;">درصد پیشرفت عملیات</h3>
+					</span>
+
+
+					<div class="progress" style="height: 20px">
+						<div id="progress-bar-w" style="background-color: rgb(16 170 18)" class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
 					</div>
 				</div>
+
+
 			</div>
 
 
-		</div>
-		<div id="createProcess" class="row progress-bar-striped progBar">
-			<div class="form-group" style="padding: 0px 10px;">
-				<span style="text-align: center">
-					<h3 style="font-size: 15px;
-                               color: #767575;
-                               margin-top: 20px;
-                               margin-bottom: 15px;">درصد پیشرفت عملیات</h3>
-				</span>
+			<div class="row">
+				<div class="col-sm-12 myList">
+					<div class="panel panel-default">
+						<div class="panel-heading" style="background-color: #1b9998 !important">
+							<h3 class="panel-title"><i class="fa fa-list" style="padding-left: 3px; font-size: 14px"></i> لیست پرسنل</h3>
+						</div>
+						<div class="panel-body">
+							<div class="row">
+								<div class="col-sm-12 col-sm-12 col-xs-12" id="mainPanel">
+									<table id="datatable" class="table table-striped table-bordered">
+										<thead style="background-color: #ecefee">
+										<tr class="sorting_asc_disabled sorting_desc_disabled">
+
+											<th style="font-size: 10px !important" class="sizeSet sorting_asc_disabled  sorting_asc_disabled">#</th>
+											<th style="font-size: 10px !important; display: none" class="sizeSet sorting_asc_disabled  sorting_asc_disabled">
+												<span style="z-index: 1;position: relative;">
+													<input class="checkboxtitle" type="checkbox" id="checkSelect"/>
+
+												</span>
+
+											</th>
+											<th style="font-size: 10px !important" class="sizeSet sorting_asc_disabled  sorting_asc_disabled">وضعیت</th>
+											<th style="font-size: 10px !important" class="sizeSet sorting_asc_disabled  sorting_asc_disabled">کد پرسنلی</th>
+											<th style="font-size: 10px !important" class="sizeSet sorting_asc_disabled sorting_desc_disabled">پرسنل</th>
+
+											<th style="font-size: 10px !important" class="sizeSet sorting_asc_disabled  sorting_asc_disabled">سمت</th>
+											<th style="display: none;font-size: 10px !important" class="sizeSet sorting_asc_disabled  sorting_asc_disabled">نوع قرارداد</th>
+											<th style="display: none;font-size: 10px !important" class="sizeSet sorting_asc_disabled  sorting_asc_disabled">مدت قرارداد</th>
+
+											<th style="font-size: 10px !important" class="sizeSet sorting_asc_disabled sorting_desc_disabled">تاریخ شروع</th>
+											<th style="font-size: 10px !important" class="sizeSet sorting_asc_disabled sorting_desc_disabled">تاریخ پایان</th>
 
 
-				<div class="progress" style="height: 20px">
-					<div id="progress-bar-w" style="background-color: rgb(16 170 18)" class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
-				</div>
-			</div>
+											<th style="font-size: 10px !important;" class="sizeSet sorting_asc_disabled sorting_desc_disabled">
 
-
-		</div>
-
-
-		<div class="row">
-			<div class="col-sm-12 myList">
-				<div class="panel panel-default">
-					<div class="panel-heading" style="background-color: #036205 !important">
-						<h3 class="panel-title"><i class="fa fa-list" style="padding-left: 3px; font-size: 14px"></i> لیست پرسنل</h3>
-					</div>
-					<div class="panel-body">
-						<div class="row">
-							<div class="col-sm-12 col-sm-12 col-xs-12" id="mainPanel">
-								<table id="datatable" class="table table-striped table-bordered">
-									<thead style="background-color: #ecefee">
-									<tr class="sorting_asc_disabled sorting_desc_disabled">
-
-										<th style="font-size: 10px !important" class="sizeSet sorting_asc_disabled  sorting_asc_disabled">#</th>
-										<th style="font-size: 10px !important;" class="sizeSet sorting_asc_disabled  sorting_asc_disabled">
-											<span style="z-index: 1;position: relative;">
-												<input class="checkboxtitle" type="checkbox" id="checkSelect"/>
-
-											</span>
-
-										</th>
-										<th style="font-size: 10px !important" class="sizeSet sorting_asc_disabled  sorting_asc_disabled">وضعیت</th>
-										<th style="font-size: 10px !important" class="sizeSet sorting_asc_disabled  sorting_asc_disabled">کد پرسنلی</th>
-										<th style="font-size: 10px !important" class="sizeSet sorting_asc_disabled sorting_desc_disabled">پرسنل</th>
-
-										<th style="font-size: 10px !important" class="sizeSet sorting_asc_disabled  sorting_asc_disabled">سمت</th>
-										<th style="display: none;font-size: 10px !important" class="sizeSet sorting_asc_disabled  sorting_asc_disabled">نوع قرارداد</th>
-										<th style="display: none;font-size: 10px !important" class="sizeSet sorting_asc_disabled  sorting_asc_disabled">مدت قرارداد</th>
-
-										<th style="font-size: 10px !important" class="sizeSet sorting_asc_disabled sorting_desc_disabled">تاریخ شروع</th>
-										<th style="font-size: 10px !important" class="sizeSet sorting_asc_disabled sorting_desc_disabled">تاریخ پایان</th>
-
-
-										<th style="font-size: 10px !important;" class="sizeSet sorting_asc_disabled sorting_desc_disabled">
-
-											عملیات
-										</th>
-
-									</tr>
-									</thead>
-									<tbody>
-
-									@foreach (var item in Model.EmployeeList)
-									{
-										<tr class="redColor" data-employeeId="@item.EmployeeId">
-
-
-											<td style="font-size: 12px !important; text-align: center; width: 10px">@i </td>
-											<td style="font-size: 12px !important; text-align: center; width: 4px">
-												<input type="checkbox" name="selectItem" value="@item.EmployeeId"/>
-											</td>
-											<td style="font-size: 12px !important; text-align: center; width: 4px">
-
-
-												<i class="ion-checkmark-circled trueStatusHide" style="color: #06ab08;font-size: 19px;position: relative;top: 2px;"></i>
-
-												<input style="display: none" type="checkbox" name="isStatusTrue" value="@item.EmployeeId"/>
-												<i class="ion-close-circled" style="color: #ea5b5b;font-size: 19px;position: relative;top: 2px;"></i>
-
-											</td>
-											<td class=" @{ if (item.PersonnelCode == 0) { @zeropscode } }" style="font-size: 12px !important; text-align: center; width: 10px">
-												@item.PersonnelCode
-												<input type="hidden" name="personelCode" value="@item.PersonnelCode"/>
-												@{
-													if (item.PersonnelCode == 0)
-													{
-														<span class="tooltip">
-															<span style="font-size: 14px"> این پرسنل کد پرسنلی ندارد </span><br/>
-															<span> می توانید در باکس زیر کد پرسنلی را تعیین نمایید </span><br/>
-															<span>&nbsp;</span><br/>
-															<span>
-																<input style="text-align: center; width: 90px" class="form-control" value="@Model.MaxPersonnelCode"/>
-																<a href="#" class="btn btn-success" style="border-radius: 15px;"> تایید </a>
-															</span>
-														</span>
-													}
-												}
-											</td>
-
-											<td style="font-size: 12px !important; text-align: right;">
-
-
-												@item.EmployeeName
-
-												<input type="hidden" name="employeeName" value="@item.EmployeeName"/>
-
-
-											</td>
-
-											<td class=" @{ if (item.JobType == null) { @zeropscode } }" style="font-size: 12px !important; text-align: center;">
-												@item.JobType
-												@{
-													if (item.JobType == null)
-													{
-														<span class="tooltip">سمت پرسنل مشخص نشده است</span>
-													}
-												}
-												<input type="hidden" name="jobId" value="@item.JobTypeId"/>
-												<input type="hidden" name="jobName" value="@item.JobType"/>
-											</td>
-
-
-											<td style="display: none;font-family: 'IranSans' !important; font-size: 12px !important; text-align: center; min-width: 70px;">
-
-
-												<select name="contractType" class="contractType">
-													<option value="موقت">موقت</option>
-													<option value="دائم">دائم</option>
-													<option value="معین">معین</option>
-												</select>
-
-
-											</td>
-											<td style="display: none;font-family: 'IranSans' !important; font-size: 12px !important; text-align: center; min-width: 90px;">
-
-
-												<select name="contractPeryod" class="contractPeryod">
-													<option value="1">یک ماهه</option>
-													<option value="2">دو ماهه</option>
-													<option value="3">سه ماهه</option>
-													<option value="6">شش ماهه</option>
-													<option value="12">یک ساله</option>
-
-												</select>
-
-
-											</td>
-											<td style="font-family: 'IranSans' !important; font-size: 12px !important; text-align: center; width: 15%;">
-
-
-												<input type="text" class="pdate sdate form-control date" style="text-align: center; border-radius: 7px; height: 24px;" name="contarctStart" value="@item.ContarctStart"/>
-
-
-											</td>
-											<td style="font-family: 'IranSans' !important; font-size: 12px !important; text-align: center; width: 15%;">
-
-
-												<input type="text" class="pdate edate form-control date" style="text-align: center; border-radius: 7px; height: 24px;" name="contractEnd" value="@item.ContractEnd"/>
-
-
-											</td>
-
-
-											@{
-												i++;
-											}
-											<td class="iconSize">
-
-
-												<a class="btn btn-danger pull-left rad" style="margin-left: 5px" onclick="clockModal(@item.EmployeeId, @item.WorkshopIds, @item.PersonnelCode, @item.JobTypeId)"
-												   href="#">
-													<i class="ion-android-clock ionSize"></i>
-
-													<input type="hidden" name="workshopAddress" value="@item.WorkshopAddress1"/>
-
-												</a>
-												<a class="btn btn-success pull-left rad" style="margin-left: 5px"
-												   href="#showmodal=@Url.Page("./AutoExtension", "ContractStatus", new { employeeId = item.EmployeeId, workshopId = item.WorkshopIds, employeeName = item.EmployeeName, workshopname = Model.workshopName })">
-													<i class="ion-information-circled ionSize"></i>
-												</a>
-
-
-											</td>
+												عملیات
+											</th>
 
 										</tr>
-									}
+										</thead>
+										<tbody>
+
+										@foreach (var item in Model.EmployeeList)
+                                    {
+											<tr class="redColor" data-employeeId="@item.EmployeeId">
 
 
+												<td style="font-size: 12px !important; text-align: center; width: 10px">@i</td>
+												<td style="font-size: 12px !important; text-align: center; width: 4px; display: none">
 
-									</tbody>
-								</table>
+												</td>
+												<td style="font-size: 12px !important; text-align: center; width: 4px">
+
+
+													<i class="ion-checkmark-circled trueStatusHide" style="color: #06ab08;font-size: 19px;position: relative;top: 2px;"></i>
+
+													<input style="display: none" type="checkbox" name="isStatusTrue" value="@item.EmployeeId"/>
+													<i class="ion-close-circled" style="color: #ea5b5b;font-size: 19px;position: relative;top: 2px;"></i>
+
+												</td>
+												<td class=" @{if (item.PersonnelCode == 0) { @zeropscode }}" style="font-size: 12px !important; text-align: center; width: 10px">
+													@item.PersonnelCode
+													<input type="hidden" name="personelCode" value="@item.PersonnelCode"/>
+													@{
+                                                    if (item.PersonnelCode == 0)
+                                                    {
+																<span class="tooltip">
+																	<span style="font-size: 14px"> این پرسنل کد پرسنلی ندارد </span><br/>
+																	<span> می توانید در باکس زیر کد پرسنلی را تعیین نمایید </span><br/>
+																	<span>&nbsp;</span><br/>
+																	<span>
+																		<input style="text-align: center; width: 90px" class="form-control" value="@Model.MaxPersonnelCode"/>
+																		<a href="#" class="btn btn-success" style="border-radius: 15px;"> تایید </a>
+																	</span>
+																</span>
+                                                    }
+													}
+												</td>
+
+												<td style="font-size: 12px !important; text-align: right;">
+
+
+													@item.EmployeeName
+
+													<input type="hidden" name="employeeName" value="@item.EmployeeName"/>
+													<input style="visibility: hidden" type="checkbox" name="selectItem" checked="checked" value="@item.EmployeeId"/>
+
+												</td>
+
+												<td class=" @{if (item.JobType == null) { @zeropscode }}" style="font-size: 12px !important; text-align: center;">
+													@item.JobType
+													@{
+                                                    if (item.JobType == null)
+                                                    {
+																<span class="tooltip">سمت پرسنل مشخص نشده است</span>
+                                                    }
+													}
+													<input type="hidden" name="jobId" value="@item.JobTypeId"/>
+													<input type="hidden" name="jobName" value="@item.JobType"/>
+												</td>
+
+
+												<td style="display: none;font-family: 'IranSans' !important; font-size: 12px !important; text-align: center; min-width: 70px;">
+
+
+													<select name="contractType" class="contractType">
+														<option value="موقت">موقت</option>
+														<option value="دائم">دائم</option>
+														<option value="معین">معین</option>
+													</select>
+
+
+												</td>
+												<td style="display: none;font-family: 'IranSans' !important; font-size: 12px !important; text-align: center; min-width: 90px;">
+
+
+													<select name="contractPeryod" class="contractPeryod">
+														<option value="1">یک ماهه</option>
+														<option value="2">دو ماهه</option>
+														<option value="3">سه ماهه</option>
+														<option value="6">شش ماهه</option>
+														<option value="12">یک ساله</option>
+
+													</select>
+
+
+												</td>
+												<td style="font-family: 'IranSans' !important; font-size: 12px !important; text-align: center; width: 15%;">
+
+
+													<input type="text" class="pdate sdate form-control date" style="text-align: center; border-radius: 7px; height: 24px;" name="contarctStart" value="@item.ContarctStart"/>
+
+
+												</td>
+												<td style="font-family: 'IranSans' !important; font-size: 12px !important; text-align: center; width: 15%;">
+
+
+													<input type="text" class="pdate edate form-control date" style="text-align: center; border-radius: 7px; height: 24px;" name="contractEnd" value="@item.ContractEnd"/>
+
+
+												</td>
+
+
+												@{
+                                                i++;
+												}
+												<td class="iconSize">
+
+
+													<a class="btn btn-danger pull-left rad" style="margin-left: 5px" onclick="clockModal(@item.EmployeeId, @item.WorkshopIds, @item.PersonnelCode, @item.JobTypeId)"
+												   	href="#">
+														<i class="ion-android-clock ionSize"></i>
+
+														<input type="hidden" name="workshopAddress" value="@item.WorkshopAddress1"/>
+
+													</a>
+													<a class="btn btn-success pull-left rad" style="margin-left: 5px"
+												   	href="#showmodal=@Url.Page("./AutoExtension", "ContractStatus", new { employeeId = item.EmployeeId, workshopId = item.WorkshopIds, employeeName = item.EmployeeName, workshopname = Model.workshopName })">
+														<i class="ion-information-circled ionSize"></i>
+													</a>
+
+
+												</td>
+
+											</tr>
+                                    }
+
+
+										</tbody>
+									</table>
+								</div>
 							</div>
 						</div>
 					</div>
 				</div>
 			</div>
-		</div>
-	}
-	else
-	{
-		if (Model.EmployerWarning)
-		{
-			<div class="alert alert-danger" style="font-size: 20px; ">
-				<span>@Model.EmployerWarningMessage</span>
-			</div>
-		}
-		if (Model.HavingPersonel == false)
-		{
-			<div class="alert alert-danger" style="font-size: 20px; "> <span>@Model.workshopName</span> هیچ پرسنلی ندارد</div>
-		}
-		<a asp-page="./Index" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 counter" style="width: 110px;  background-color: #545353; border-color: #545353; font-family: 'Web_Yekan' !important;">
-			<i class="fa faSize fa-share-square-o"></i> بازگشت
-		</a>
-	}
+    }
+    else
+    {
+        if (Model.EmployerWarning)
+        {
+				<div class="alert alert-danger" style="font-size: 20px; ">
+					<span>@Model.EmployerWarningMessage</span>
+				</div>
+        }
 
-	// <div class="modal fade" id="edit-modal" tabindex="-1" role="dialog" aria-labelledby="edit-modal-label" aria-hidden="true" style="backdrop-filter: blur(6px);background-color: #0000005c;">
-	// <div class="modal-dialoge" role="document">
-	//     <div class="modal-content2">
+        if (Model.HavingPersonel == false)
+        {
+				<div class="alert alert-danger" style="font-size: 20px; "> <span>@Model.workshopName</span> هیچ پرسنلی ندارد</div>
+        }
+
+			<a asp-page="./Index" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 counter" style="width: 110px;  background-color: #545353; border-color: #545353; font-family: 'Web_Yekan' !important;">
+				<i class="fa faSize fa-share-square-o"></i> بازگشت
+			</a>
+    }
+
+    // <div class="modal fade" id="edit-modal" tabindex="-1" role="dialog" aria-labelledby="edit-modal-label" aria-hidden="true" style="backdrop-filter: blur(6px);background-color: #0000005c;">
+    // <div class="modal-dialoge" role="document">
+    //     <div class="modal-content2">
 
 
-	//          <partial name="clock"/>
+    //          <partial name="clock"/>
 
-	//     </div>
-	// </div>
-	//</div>
+    //     </div>
+    // </div>
+    //</div>
 }
 
 @section Script {
 
-	<script src="~/AdminTheme/assets/js/site.js"></script>
-	<script src="~/adminTheme/assets/datatables/jquery.dataTables.min.js"></script>
-	<script src="~/adminTheme/assets/datatables/dataTables.bootstrap.js"></script>
-	<script src="~/admintheme/js/jquery.mask_1.14.16.min.js"></script>
-	<script src="~/js/signalr/dist/browser/signalr.js"></script>
-	@*    <script src="~/js/tracking.js"></script>*@
-	@*    <script src="~/adminTheme/js/admin.js"></script>*@
+    <script src="~/AdminTheme/assets/js/site.js"></script>
+    <script src="~/adminTheme/assets/datatables/jquery.dataTables.min.js"></script>
+    <script src="~/adminTheme/assets/datatables/dataTables.bootstrap.js"></script>
+    <script src="~/admintheme/js/jquery.mask_1.14.16.min.js"></script>
+    <script src="~/js/signalr/dist/browser/signalr.js"></script>
+    @*    <script src="~/js/tracking.js"></script>*@
+    @*    <script src="~/adminTheme/js/admin.js"></script>*@
 
 
-	<script>
+    <script>
 		function trueStatus(iTagTrue, iTagFalse, isStatusTrue) {
 			iTagTrue.removeClass("trueStatusHide");
 			iTagFalse.addClass("falseStatusHide");
 			isStatusTrue.prop("checked", true);
 		}
-
+		$('#resetPage').on("click", function () {
+			location.reload();
+		});
+		$('#acceptedList').on("click", function () {
+			let n = 1;
+				
+			$('#selctedList > option:selected').each(function (i) {
+				let selectedId = $(this).val();
+				
+				$('#datatable tbody tr').each(function (i) {
+					if (selectedId == $(this).attr("data-employeeId")) {
+						$(this).addClass("selectedOk");
+					}
+					
+				});
+			});
+			$('#datatable tbody tr').each(function (i) {
+					if (!$(this).hasClass("selectedOk")) {
+						$(this).removeData();
+						$(this).remove();
+					}else{
+						$(this).children('td:first-child').text(n);
+						n++;
+					}
+					
+			});
+			$('#selctedList').empty();
+			$('#datatable_info').remove();
+		});
 
 		$('#checkSelect').on('click',
 			function() {
@@ -838,7 +904,9 @@
 			$(".date").mask("0000/00/00");
 			$('#datatable').dataTable(
 				{
-					"lengthMenu": [[-1, 10, 50, 100, 25], ["All", 10, 50, 100, 25]]
+					"lengthMenu": [[-1, 10, 50, 100, 25], ["All", 10, 50, 100, 25]],
+				  "sort":false,
+				
 				}
 			);
 			var wrkid = Number($('#workshopId').val());
@@ -1544,7 +1612,7 @@
 
 		}
 	</script>
-	<script>
+    <script>
 		$("#start").keyup(function() {
 			const value = $(this).val();
 			const lengthValue = value.length;
@@ -1595,7 +1663,7 @@
 		});
 	</script>
 
-	<script>
+    <script>
 		$('#monthSelected').on('change',
 			function() {
 
@@ -1862,7 +1930,7 @@
 
 	</script>
 
-	@* <script>
+    @* <script>
         function clock(element) {
             var row =$(element);
             var rowId =  row.attr('data-employeeId');
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs b/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs
index e900f8cf..c063ad73 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs
+++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs
@@ -15,6 +15,7 @@ using CompanyManagment.App.Contracts.Workshop;
 using CompanyManagment.App.Contracts.YearlySalary;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.SignalR;
 using PersianTools.Core;
 using ServiceHost.Hubs;
@@ -38,6 +39,7 @@ public class AutoExtensionModel : PageModel
 	private readonly IYearlySalaryApplication _yearlySalaryApplication;
 	private readonly IYearlySalaryRepository _yearlySalaryRepository;
 	public List<ContractViweModel> EmployeeList;
+	public SelectList EmployeeSelectList { get; set; }
 	private string InterferenceMessage = string.Empty;
 	public List<string> YearlyList;
 
@@ -156,6 +158,7 @@ public class AutoExtensionModel : PageModel
 				ArchiveCode = selctedWorkshop.ArchiveCode,
 				WorkshopAddress1 = selctedWorkshop.Address
 			}).OrderBy(x => x.PersonnelCode).ToList();
+			EmployeeSelectList = new SelectList(personelList, "EmployeeId", "EmployeeFullName");
 		}
 		else
 		{