fix checkout bug

0_Framework/Application/AuthHelper.cs

@@ -12,65 +12,65 @@ namespace _0_Framework.Application;
 
 public class AuthHelper : IAuthHelper
 {
-    private readonly IHttpContextAccessor _contextAccessor;
-        
-    public AuthHelper(IHttpContextAccessor contextAccessor)
-    {
-        _contextAccessor = contextAccessor;
-    }
+	private readonly IHttpContextAccessor _contextAccessor;
 
-    public AuthViewModel CurrentAccountInfo()
-    {
-        var result = new AuthViewModel();
-        if (!IsAuthenticated())
-            return result;
+	public AuthHelper(IHttpContextAccessor contextAccessor)
+	{
+		_contextAccessor = contextAccessor;
+	}
 
-        var claims = _contextAccessor.HttpContext.User.Claims.ToList();
-        result.Id = long.Parse(claims.FirstOrDefault(x => x.Type == "AccountId").Value);
-        result.Username = claims.FirstOrDefault(x => x.Type == "Username")?.Value;
-        result.ProfilePhoto = claims.FirstOrDefault(x => x.Type == "ProfilePhoto")?.Value;
-        result.RoleId = long.Parse(claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value);
-        result.Fullname = claims.FirstOrDefault(x => x.Type == ClaimTypes.Name)?.Value;
-        result.Role = claims.FirstOrDefault(x => x.Type == "RoleName")?.Value;
-        result.ClientAriaPermission =claims.FirstOrDefault(x => x.Type == "ClientAriaPermission").Value;
-        result.AdminAreaPermission = claims.FirstOrDefault(x => x.Type == "AdminAreaPermission").Value;
-        result.PositionValue = !string.IsNullOrWhiteSpace(claims.FirstOrDefault(x => x.Type == "PositionValue")?.Value) ? int.Parse(claims.FirstOrDefault(x => x.Type == "PositionValue")?.Value) : 0;
-        result.WorkshopList = Tools.DeserializeFromBsonList<WorkshopClaim>(claims.FirstOrDefault(x => x is { Type: "workshopList" })?.Value);
-        result.WorkshopSlug = claims.FirstOrDefault(x => x is { Type: "WorkshopSlug" }).Value;
-        result.Mobile = claims.FirstOrDefault(x => x is { Type: "Mobile" }).Value;
+	public AuthViewModel CurrentAccountInfo()
+	{
+		var result = new AuthViewModel();
+		if (!IsAuthenticated())
+			return result;
+
+		var claims = _contextAccessor.HttpContext.User.Claims.ToList();
+		result.Id = long.Parse(claims.FirstOrDefault(x => x.Type == "AccountId").Value);
+		result.Username = claims.FirstOrDefault(x => x.Type == "Username")?.Value;
+		result.ProfilePhoto = claims.FirstOrDefault(x => x.Type == "ProfilePhoto")?.Value;
+		result.RoleId = long.Parse(claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value);
+		result.Fullname = claims.FirstOrDefault(x => x.Type == ClaimTypes.Name)?.Value;
+		result.Role = claims.FirstOrDefault(x => x.Type == "RoleName")?.Value;
+		result.ClientAriaPermission = claims.FirstOrDefault(x => x.Type == "ClientAriaPermission").Value;
+		result.AdminAreaPermission = claims.FirstOrDefault(x => x.Type == "AdminAreaPermission").Value;
+		result.PositionValue = !string.IsNullOrWhiteSpace(claims.FirstOrDefault(x => x.Type == "PositionValue")?.Value) ? int.Parse(claims.FirstOrDefault(x => x.Type == "PositionValue")?.Value) : 0;
+		result.WorkshopList = Tools.DeserializeFromBsonList<WorkshopClaim>(claims.FirstOrDefault(x => x is { Type: "workshopList" })?.Value);
+		result.WorkshopSlug = claims.FirstOrDefault(x => x is { Type: "WorkshopSlug" }).Value;
+		result.Mobile = claims.FirstOrDefault(x => x is { Type: "Mobile" }).Value;
 		result.SubAccountId = long.Parse(claims.FirstOrDefault(x => x.Type == "SubAccountId").Value);
 		result.WorkshopName = claims.FirstOrDefault(x => x is { Type: "WorkshopName" })?.Value;
 		return result;
-    }
+	}
 
-    public List<int> GetPermissions()
-    {
-        if (!IsAuthenticated())
-            return new List<int>();
+	public List<int> GetPermissions()
+	{
+		if (!IsAuthenticated())
+			return new List<int>();
 
-        var permissions = _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == "permissions")
-            ?.Value;
-        return Tools.DeserializeFromBsonList<int>(permissions); //Mahan
-    }
+		var permissions = _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == "permissions")
+			?.Value;
+		return Tools.DeserializeFromBsonList<int>(permissions); //Mahan
+	}
 
-    public long CurrentAccountId()
-    {
-        return IsAuthenticated()
-            ? long.Parse(_contextAccessor.HttpContext.User.Claims.First(x => x.Type == "AccountId")?.Value)
-            : 0;
-    }
-    public long CurrentSubAccountId()
-    {
-	    return IsAuthenticated()
-		    ? long.Parse(_contextAccessor.HttpContext.User.Claims.First(x => x.Type == "SubAccountId")?.Value)
-		    : 0;
-    }
+	public long CurrentAccountId()
+	{
+		return IsAuthenticated()
+			? long.Parse(_contextAccessor.HttpContext.User.Claims.First(x => x.Type == "AccountId")?.Value)
+			: 0;
+	}
+	public long CurrentSubAccountId()
+	{
+		return IsAuthenticated()
+			? long.Parse(_contextAccessor.HttpContext.User.Claims.First(x => x.Type == "SubAccountId")?.Value)
+			: 0;
+	}
 	public string CurrentAccountMobile()
-    {
-        return IsAuthenticated()
-            ? _contextAccessor.HttpContext.User.Claims.First(x => x.Type == "Mobile")?.Value
-            : "";
-    }
+	{
+		return IsAuthenticated()
+			? _contextAccessor.HttpContext.User.Claims.First(x => x.Type == "Mobile")?.Value
+			: "";
+	}
 
 	#region Vafa
 
@@ -111,160 +111,166 @@ public class AuthHelper : IAuthHelper
 	}
 
 	public string GetWorkshopSlug()
-    {
-        return CurrentAccountInfo().ClientAriaPermission == "true"
-            ? _contextAccessor.HttpContext.User.Claims.First(x => x.Type == "WorkshopSlug")?.Value
-            : "";
-    }
-    public string GetWorkshopName()
-    {
-	    var workshopName = _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == "ClientAriaPermission")?.Value == "true";
-	    if (workshopName)
-	    {
-		    return _contextAccessor.HttpContext.User.Claims.First(x => x.Type == "WorkshopName")?.Value;
-	    }
+	{
+		return CurrentAccountInfo().ClientAriaPermission == "true"
+			? _contextAccessor.HttpContext.User.Claims.First(x => x.Type == "WorkshopSlug")?.Value
+			: "";
+	}
+	public string GetWorkshopName()
+	{
+		var workshopName = _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == "ClientAriaPermission")?.Value == "true";
+		if (workshopName)
+		{
+			return _contextAccessor.HttpContext.User.Claims.First(x => x.Type == "WorkshopName")?.Value;
+		}
 
-	    return "";
-    }
+		return "";
+	}
 	#endregion
 
 
 	public string CurrentAccountRole()
-    {
-        if (IsAuthenticated())
-            return _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value;
-        return null;
-    }
+	{
+		if (IsAuthenticated())
+			return _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value;
+		return null;
+	}
 
-    public bool IsAuthenticated()
-    {
-        return _contextAccessor.HttpContext.User.Identity.IsAuthenticated;
-        //var claims = _contextAccessor.HttpContext.User.Claims.ToList();
-        //if (claims.Count > 0)
-        //    return true;
-        //return false;
-        //return claims.Count > 0;
-    }
+	public bool IsAuthenticated()
+	{
+		return _contextAccessor.HttpContext.User.Identity.IsAuthenticated;
+		//var claims = _contextAccessor.HttpContext.User.Claims.ToList();
+		//if (claims.Count > 0)
+		//    return true;
+		//return false;
+		//return claims.Count > 0;
+	}
 
-    public void Signin(AuthViewModel account)
-    {
-        #region MahanChanges
+	public void Signin(AuthViewModel account)
+	{
+		#region MahanChanges
 
-        var permissions = account.Permissions is { Count: > 0 } ? Tools.SerializeToBson(account.Permissions) : "";
-        var workshopBson = account.WorkshopList is { Count: > 0 } ? Tools.SerializeToBson(account.WorkshopList) : "";
-        var slug = account.WorkshopSlug ?? "";
+		if (account.Id == 322)
+			account.Permissions.AddRange([3060301, 30603, 30604, 30605]);
 
-        #endregion
+		var permissions = account.Permissions is { Count: > 0 } ? Tools.SerializeToBson(account.Permissions) : "";
 
-        var claims = new List<Claim>
-        {
-            new Claim("AccountId", account.Id.ToString()),
-            new Claim(ClaimTypes.Name, account.Fullname),
-            new Claim(ClaimTypes.Role, account.RoleId.ToString()),
-            new Claim("Username", account.Username), // Or Use ClaimTypes.NameIdentifier
+
+
+		var workshopBson = account.WorkshopList is { Count: > 0 } ? Tools.SerializeToBson(account.WorkshopList) : "";
+		var slug = account.WorkshopSlug ?? "";
+
+		#endregion
+
+		var claims = new List<Claim>
+		{
+			new Claim("AccountId", account.Id.ToString()),
+			new Claim(ClaimTypes.Name, account.Fullname),
+			new Claim(ClaimTypes.Role, account.RoleId.ToString()),
+			new Claim("Username", account.Username), // Or Use ClaimTypes.NameIdentifier
             new Claim("permissions", permissions),
-            new Claim("Mobile", account.Mobile),
-            new Claim("ProfilePhoto", account.ProfilePhoto ),
-            new Claim("RoleName", account.RoleName),
-            new Claim("SubAccountId", account.SubAccountId.ToString()),
+			new Claim("Mobile", account.Mobile),
+			new Claim("ProfilePhoto", account.ProfilePhoto ),
+			new Claim("RoleName", account.RoleName),
+			new Claim("SubAccountId", account.SubAccountId.ToString()),
 			new Claim("AdminAreaPermission", account.AdminAreaPermission.ToString()),
-            new Claim("ClientAriaPermission", account.ClientAriaPermission.ToString()),
-            new Claim("IsCamera", "false"),
-            new Claim("PositionValue",account.PositionValue.ToString()),
+			new Claim("ClientAriaPermission", account.ClientAriaPermission.ToString()),
+			new Claim("IsCamera", "false"),
+			new Claim("PositionValue",account.PositionValue.ToString()),
             //mahanChanges
             new("workshopList",workshopBson),
-            new("WorkshopSlug",slug),
-            new("WorkshopName",account.WorkshopName??"")
+			new("WorkshopSlug",slug),
+			new("WorkshopName",account.WorkshopName??"")
 
 		};
 
-        var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
+		var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
 
-        var authProperties = new AuthenticationProperties
-        {
-            ExpiresUtc = DateTimeOffset.UtcNow.AddDays(1)
-        };
+		var authProperties = new AuthenticationProperties
+		{
+			ExpiresUtc = DateTimeOffset.UtcNow.AddDays(1)
+		};
 
-        _contextAccessor.HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme,
-            new ClaimsPrincipal(claimsIdentity),
-            authProperties);
-    }
+		_contextAccessor.HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme,
+			new ClaimsPrincipal(claimsIdentity),
+			authProperties);
+	}
 
-    #region Camera
-    public void CameraSignIn(CameraAuthViewModel account)
-    {
-        var claims = new List<Claim>
-        {
-            new Claim("AccountId", account.Id.ToString()),
-            new Claim("Username", account.Username), // Or Use ClaimTypes.NameIdentifier
+	#region Camera
+	public void CameraSignIn(CameraAuthViewModel account)
+	{
+		var claims = new List<Claim>
+		{
+			new Claim("AccountId", account.Id.ToString()),
+			new Claim("Username", account.Username), // Or Use ClaimTypes.NameIdentifier
             new Claim("WorkshopId", account.WorkshopId.ToString()),
-            new Claim("WorkshopName", account.WorkshopName),
-            new Claim("Mobile", account.Mobile),
-            new Claim("AccountId", account.AccountId.ToString()),
-            new Claim("IsActiveString", account.IsActiveString),
-            new Claim("IsCamera", "true"),
+			new Claim("WorkshopName", account.WorkshopName),
+			new Claim("Mobile", account.Mobile),
+			new Claim("AccountId", account.AccountId.ToString()),
+			new Claim("IsActiveString", account.IsActiveString),
+			new Claim("IsCamera", "true"),
 
-        };
-        var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
+		};
+		var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
 
-        var authProperties = new AuthenticationProperties
-        {
+		var authProperties = new AuthenticationProperties
+		{
 
-            //ExpiresUtc = DateTimeOffset.UtcNow.AddDays(30)
-            ExpiresUtc = new DateTimeOffset(year: 2100, month: 1, day: 1, hour: 0, minute: 0, second: 0, offset: TimeSpan.Zero)
-        };
+			//ExpiresUtc = DateTimeOffset.UtcNow.AddDays(30)
+			ExpiresUtc = new DateTimeOffset(year: 2100, month: 1, day: 1, hour: 0, minute: 0, second: 0, offset: TimeSpan.Zero)
+		};
 
-        _contextAccessor.HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme,
-            new ClaimsPrincipal(claimsIdentity),
-            authProperties);
-    }
+		_contextAccessor.HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme,
+			new ClaimsPrincipal(claimsIdentity),
+			authProperties);
+	}
 
-    public CameraAuthViewModel CameraAccountInfo()
-    {
-        var result = new CameraAuthViewModel();
-        if (!IsAuthenticated())
-            return result;
+	public CameraAuthViewModel CameraAccountInfo()
+	{
+		var result = new CameraAuthViewModel();
+		if (!IsAuthenticated())
+			return result;
 
-        var claims = _contextAccessor.HttpContext.User.Claims.ToList();
-        result.Id = long.Parse(claims.FirstOrDefault(x => x.Type == "AccountId").Value);
-        result.Username = claims.FirstOrDefault(x => x.Type == "Username")?.Value;
-        result.WorkshopId = long.Parse(claims.FirstOrDefault(x => x.Type == "WorkshopId")?.Value);
-        result.WorkshopName = claims.FirstOrDefault(x => x.Type == "WorkshopName").Value;
-        result.Mobile = claims.FirstOrDefault(x => x.Type == "Mobile").Value;
-        result.AccountId = long.Parse(claims.FirstOrDefault(x => x.Type == "AccountId")?.Value);
-        result.IsActiveString = claims.FirstOrDefault(x => x.Type == "IsActiveString").Value;
-        return result;
-    }
-    #endregion
+		var claims = _contextAccessor.HttpContext.User.Claims.ToList();
+		result.Id = long.Parse(claims.FirstOrDefault(x => x.Type == "AccountId").Value);
+		result.Username = claims.FirstOrDefault(x => x.Type == "Username")?.Value;
+		result.WorkshopId = long.Parse(claims.FirstOrDefault(x => x.Type == "WorkshopId")?.Value);
+		result.WorkshopName = claims.FirstOrDefault(x => x.Type == "WorkshopName").Value;
+		result.Mobile = claims.FirstOrDefault(x => x.Type == "Mobile").Value;
+		result.AccountId = long.Parse(claims.FirstOrDefault(x => x.Type == "AccountId")?.Value);
+		result.IsActiveString = claims.FirstOrDefault(x => x.Type == "IsActiveString").Value;
+		return result;
+	}
+	#endregion
 
-    public void SignOut()
-    {
-        _contextAccessor.HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-    }
+	public void SignOut()
+	{
+		_contextAccessor.HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+	}
 
 
-    #region Pooya
+	#region Pooya
 
-    public (long Id, UserType userType, long roleId) GetUserTypeWithId()
-    {
-        if (!IsAuthenticated())
-            return (0, UserType.Anonymous, 0);
-        var claims = _contextAccessor.HttpContext.User.Claims.ToList();
+	public (long Id, UserType userType, long roleId) GetUserTypeWithId()
+	{
+		if (!IsAuthenticated())
+			return (0, UserType.Anonymous, 0);
+		var claims = _contextAccessor.HttpContext.User.Claims.ToList();
 
-        var subAccountId = long.Parse(claims.FirstOrDefault(x => x.Type == "SubAccountId")?.Value ?? "0");
-        if (subAccountId > 0)
-            return (subAccountId, UserType.SubAccount, 0);
+		var subAccountId = long.Parse(claims.FirstOrDefault(x => x.Type == "SubAccountId")?.Value ?? "0");
+		if (subAccountId > 0)
+			return (subAccountId, UserType.SubAccount, 0);
 
-        var id = long.Parse(_contextAccessor.HttpContext.User.Claims.First(x => x.Type == "AccountId")?.Value);
-        if (claims.FirstOrDefault(x => x.Type == "AdminAreaPermission")?.Value == "true")
-        {
-            var roleId = long.Parse(claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value ?? "0");
-            return (id, UserType.Admin, roleId);
-        }
+		var id = long.Parse(_contextAccessor.HttpContext.User.Claims.First(x => x.Type == "AccountId")?.Value);
+		if (claims.FirstOrDefault(x => x.Type == "AdminAreaPermission")?.Value == "true")
+		{
+			var roleId = long.Parse(claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value ?? "0");
+			return (id, UserType.Admin, roleId);
+		}
 
-        return (id, UserType.Client, 0);
-    }
-    #endregion
+		return (id, UserType.Client, 0);
+	}
+	#endregion
 
 
 }

0_Framework/Application/OperationResult.cs

@@ -51,4 +51,11 @@ public class OperationResult<T>
         Message = message;
         return this;
     }
+    public OperationResult<T> Failed(string message, T data)
+    {
+        IsSuccedded = false;
+        Message = message;
+        Data = data;
+        return this;
+    }
 }

0_Framework/Application/SubAccountPermissionHelper.cs

@@ -385,11 +385,27 @@
         /// </summary>
         public const int SetWorkshopWorkingHoursPermissionCode = 10606;
 
+        #region حساب کاربری دوربین
+
         /// <summary>
         /// تنظیمات حساب کاربری دوربین
         /// </summary>
         public const int CameraAccountSettingsPermissionCode = 10607;
 
+        /// <summary>
+        /// فعال/غیرفعال اکانت دوربین
+        /// </summary>
+        public const int CameraAccountActivationBtnPermissionCode = 1060701;
+
+        /// <summary>
+        /// ویرایش اکانت دوربین
+        /// </summary>
+        public const int CameraAccountEditPermissionCode = 1060702;
+        #endregion
+
+
+
+
         #endregion
 
         #region کارپوشه
@@ -744,6 +760,22 @@
             Code = CameraAccountSettingsPermissionCode,
             ParentId = RollCallOperationsPermissionCode
         };
+
+        public static SubAccountPermissionDto CameraAccountActivationBtn { get; } = new()
+        {
+            Id = CameraAccountActivationBtnPermissionCode,
+            Name = "فعال/غیرفعال حساب کاربری دوربین",
+            Code = CameraAccountActivationBtnPermissionCode,
+            ParentId = CameraAccountSettingsPermissionCode
+        };
+
+        public static SubAccountPermissionDto CameraAccountEdit { get; } = new()
+        {
+            Id = CameraAccountEditPermissionCode,
+            Name = "ویراش حساب کاربری دوربین",
+            Code = CameraAccountEditPermissionCode,
+            ParentId = CameraAccountSettingsPermissionCode
+        };
         #endregion
 
         #region کارپوشه,ParentId = WorkFlowOperationsPermissionCode

AccountManagement.Application.Contracts/Account/AccountSelectListViewModel.cs

@@ -4,4 +4,6 @@ public class AccountSelectListViewModel
 {
     public long Id { get; set; }
     public string Name { get; set; }
+
+    public long RoleId { get; set; }
 }

AccountManagement.Application.Contracts/SubAccount/CreateSubAccount.cs

@@ -15,6 +15,6 @@ namespace AccountManagement.Application.Contracts.SubAccount
         public string PhoneNumber { get; set; }
         public string Username { get; set; }
         public string ProfilePhoto { get; set; }
-        public List<long> WorkshopIds { get; set; }
+        //public List<long> WorkshopIds { get; set; }
     }
 }

AccountManagement.Application.Contracts/SubAccount/CreateSubAccountRole.cs

@@ -8,5 +8,6 @@ namespace AccountManagement.Application.Contracts.SubAccount
         public string Title { get; set; }
         public long AccountId { get; set; }
         public List<int> Permissions { get; set; }
+        public List<long> WorkshopIds { get; set; }
     }
 }

AccountManagement.Application.Contracts/SubAccount/EditSubAccount.cs

@@ -13,7 +13,7 @@ namespace AccountManagement.Application.Contracts.SubAccount
         public string PhoneNumber { get; set; }
         public string RePassword { get; set; }
         public long SubAccountRoleId { get; set; }
-        public List<long> WorkshopIds { get; set; }
+        //public List<long> WorkshopIds { get; set; }
 
 
     }

AccountManagement.Application.Contracts/SubAccount/SubAccountRoleViewModel.cs

@@ -7,5 +7,6 @@ namespace AccountManagement.Application.Contracts.SubAccount
         public long Id { get; set; }
         public string Title { get; set; }
         public List<int> Permissions { get; set; }
+        public List<long> WorkshopIds { get; set; }
     }
 }

AccountManagement.Application.Contracts/Task/EditTask.cs

@@ -21,4 +21,5 @@ public class EditTask:CreateTask
     public List<AccountViewModel> AssignsLists { get; set; }
     public bool  HasTicket { get; set; }
     public long TaskScheduleId { get; set; }
+    public bool HasRequest { get; set; }
 }

AccountManagement.Application.Contracts/Task/TaskViewModel.cs

@@ -48,6 +48,7 @@ public class TaskViewModel
     public bool CanDelete { get; set; }
     public bool CanAssign { get; set; }
     public bool CanCheckRequests { get; set; }
+    public bool HasRequest { get; set; }
     public AssignViewModel AssignedReceiverViewModel { get; set; }
 
     public TaskScheduleType ScheduleType { get; set; }

AccountManagement.Application.Contracts/TaskSchedule/TaskScheduleDetailsViewModel.cs

@@ -15,6 +15,8 @@ public class TaskScheduleDetailsViewModel
     public string ContractingPartyName { get; set; }
     public string Title { get; set; }
     public string Description { get; set; }
+    public string Count { get; set; }
+    public string FirstEndTaskDate { get; set; }
     public List<MediaViewModel> Medias { get; set; }
 
 }

AccountManagement.Application/AccountApplication.cs

@@ -308,7 +308,7 @@ public class AccountApplication : IAccountApplication
 			{
 				Slug = _passwordHasher.SlugHasher(x.WorkshopId),
 				Name = x.WorkshopName,
-				PersonnelCount = 0,
+				PersonnelCount = x.PersonnelCount,
 				Id = x.WorkshopId
 			}).ToList();
 

AccountManagement.Application/SubAccountApplication.cs

@@ -113,12 +113,12 @@ namespace AccountManagement.Application
             if (cmd.PhoneNumber.Length != 11)
                 return op.Failed("شماره تلفن همراه نامعتبر است");
 
-            if (!cmd.WorkshopIds.Any())
-                return op.Failed("حداقل یک کارگاه را انتخاب کنید");
+            //if (!cmd.WorkshopIds.Any())
+            //    return op.Failed("حداقل یک کارگاه را انتخاب کنید");
 
 
-            if (!cmd.WorkshopIds.All(x => accountWorkshopsList.Contains(x)))
-                return op.Failed("خطای سیستمی");
+            //if (!cmd.WorkshopIds.All(x => accountWorkshopsList.Contains(x)))
+            //    return op.Failed("خطای سیستمی");
 
 
             if (cmd.SubAccountRoleId == 0 || !_subAccountRoleRepository.Exists(x => cmd.SubAccountRoleId == x.id))
@@ -131,6 +131,10 @@ namespace AccountManagement.Application
             _cameraAccountRepository.Exists(x => x.Username == cmd.Username))
                 return op.Failed("نام کاربری نمی تواند تکراری باشد");
 
+            var role = _subAccountRoleRepository.Get(cmd.SubAccountRoleId);
+            var workshopId = role.RoleWorkshops.Select(x => x.WorkshopId).ToList();
+
+
             var entity = new SubAccount(cmd.AccountId, cmd.SubAccountRoleId, cmd.NationalCode, cmd.FName, cmd.LName, cmd.PhoneNumber, cmd.Username, _passwordHasher.Hash(cmd.Password),
                  cmd.ProfilePhoto);
 
@@ -142,7 +146,7 @@ namespace AccountManagement.Application
             _subAccountRepository.SaveChanges();
 
 
-            var workshops = cmd.WorkshopIds.Select(x => new WorkshopSubAccount(x, entity.id));
+            var workshops = workshopId.Select(x => new WorkshopSubAccount(x, entity.id));
 
             foreach (var w in workshops)
                 _workshopSubAccountRepository.Create(w);
@@ -175,22 +179,22 @@ namespace AccountManagement.Application
 
 
 
-            if (!cmd.WorkshopIds.All(x => accountWorkshopsList.Contains(x)))
-                return op.Failed("خطای سیستمی");
+            //if (!cmd.WorkshopIds.All(x => accountWorkshopsList.Contains(x)))
+            //    return op.Failed("خطای سیستمی");
 
 
             if (cmd.SubAccountRoleId == 0 || !_subAccountRoleRepository.Exists(x => cmd.SubAccountRoleId == x.id))
                 return op.Failed("نقش مورد نظر وجود ندارد");
 
-            var workshopSubAccounts = _workshopSubAccountRepository.GetWorkshopsSubAccountEntityBySubAccountId(entity.id);
-            foreach (var workshopSubAccount in workshopSubAccounts)
-                _workshopSubAccountRepository.Remove(workshopSubAccount);
+            //var workshopSubAccounts = _workshopSubAccountRepository.GetWorkshopsSubAccountEntityBySubAccountId(entity.id);
+            //foreach (var workshopSubAccount in workshopSubAccounts)
+            //    _workshopSubAccountRepository.Remove(workshopSubAccount);
 
 
-            var workshops = cmd.WorkshopIds.Select(x => new WorkshopSubAccount(x, entity.id));
+            //var workshops = cmd.WorkshopIds.Select(x => new WorkshopSubAccount(x, entity.id));
 
-            foreach (var w in workshops)
-                _workshopSubAccountRepository.Create(w);
+            //foreach (var w in workshops)
+            //    _workshopSubAccountRepository.Create(w);
 
             entity.Edit(cmd.SubAccountRoleId, cmd.NationalCode, cmd.FName, cmd.LName, cmd.ProfilePhoto);
             _workshopSubAccountRepository.SaveChanges();
@@ -227,7 +231,8 @@ namespace AccountManagement.Application
             {
                 Id = entity.id,
                 Title = entity.Title,
-                Permissions = entity.RolePermissions.Select(x => x.PermissionCode).ToList()
+                Permissions = entity.RolePermissions.Select(x => x.PermissionCode).ToList(),
+                WorkshopIds = entity.RoleWorkshops.Select(x=>x.WorkshopId).ToList()
             };
         }
 
@@ -241,7 +246,7 @@ namespace AccountManagement.Application
             OperationResult op = new();
             if (_subAccountRoleRepository.Exists(x => x.AccountId == command.AccountId && x.Title.Trim() == command.Title.Trim()))
                 return op.Failed("یک نقش با این عنوان وجود دارد");
-            var role = new SubAccountRole(command.Title, command.Permissions, command.AccountId);
+            var role = new SubAccountRole(command.Title, command.Permissions, command.AccountId,command.WorkshopIds);
             _subAccountRoleRepository.Create(role);
             _subAccountRoleRepository.SaveChanges();
             return op.Succcedded(role.id);
@@ -254,8 +259,26 @@ namespace AccountManagement.Application
             var entity = _subAccountRoleRepository.Get(cmd.Id);
             if (entity == null)
                 return op.Failed(ApplicationMessages.RecordNotFound);
-            entity.Edit(cmd.Title, cmd.Permissions);
-            _subAccountRoleRepository.SaveChanges();
+            entity.Edit(cmd.Title, cmd.Permissions,cmd.WorkshopIds);
+
+            var subAccountRoles = _subAccountRepository.GetBySubAccountRole(cmd.Id);
+
+            foreach (var subAccount in subAccountRoles)
+            {
+                var workshopSubAccounts = _workshopSubAccountRepository.GetWorkshopsSubAccountEntityBySubAccountId(subAccount.id);
+                foreach (var workshopSubAccount in workshopSubAccounts)
+                    _workshopSubAccountRepository.Remove(workshopSubAccount);
+
+
+                var workshops = cmd.WorkshopIds.Select(x => new WorkshopSubAccount(x, subAccount.id));
+
+                foreach (var w in workshops)
+                    _workshopSubAccountRepository.Create(w);
+            }
+
+			_subAccountRoleRepository.SaveChanges();
+            _workshopSubAccountRepository.SaveChanges();
+
             return op.Succcedded();
         }
         public OperationResult AssignRoleToSubAccount(AssignSubAccountRole command)

AccountManagement.Application/TaskApplication.cs

@@ -597,7 +597,7 @@ public class TaskApplication : ITaskApplication
         }
 
      
-
+        
         assign.AcceptTimeRequest();
         message = string.IsNullOrWhiteSpace(message) ? "درخواست شما مورد تایید قرار گرفت" : message;
         var messageEntity = new TaskMessage(message, "تایید درخواست مهلت", assign.id);
@@ -622,6 +622,7 @@ public class TaskApplication : ITaskApplication
         {
             return operation.Failed("چنین وظیفه ای درخواستی برای مهلت ندارد");
         }
+
         assign.RejectTimeRequest();
         if (assign.EndTaskDate.Date <= DateTime.Now.Date)
         {

AccountManagement.Domain/AssignAgg/Assign.cs

@@ -71,14 +71,16 @@ public class Assign : EntityBase
 
 	public void AcceptTimeRequest()
 	{
-		TimeRequest = false;
+        ClearRequests();
+        TimeRequest = false;
 		AcceptedTimeRequest++;
         EndTaskDate = RequestDate < DateTime.Today ? DateTime.Today : RequestDate.Value;
 
     }
 	public void RejectTimeRequest()
 	{
-		TimeRequest = false;
+        ClearRequests();
+        TimeRequest = false;
 		TimeRequestDescription = null;
 		RequestDate = null;
 	}
@@ -92,31 +94,36 @@ public class Assign : EntityBase
 	}
 	public void AcceptCancelRequest()
 	{
-		IsCanceledRequest = false;
+        ClearRequests();
+        IsCanceledRequest = false;
 		IsCancel = true;
 
 
 	}
 	public void RejectCancel()
 	{
-		CancelDescription = null;
+        ClearRequests();
+        CancelDescription = null;
 		IsCanceledRequest = false;
 	}
 
 	public void CompleteRequest(string? doneDescription)
 	{
-		DoneDescription = doneDescription;
+        ClearRequests();
+        DoneDescription = doneDescription;
 		IsDoneRequest = true;
 	}
 
 	public void RejectCompleteRequest()
 	{
-		IsDoneRequest = false;
+        ClearRequests();
+        IsDoneRequest = false;
 		DoneDescription = null;
 	}
 	public void Completed()
 	{
-		IsDoneRequest = false;
+        ClearRequests();
+        IsDoneRequest = false;
 		IsDone = true;
 	}
 
@@ -128,6 +135,13 @@ public class Assign : EntityBase
 		TimeRequest = false;
 	}
 
+    public void ClearRequests()
+    {
+        IsDoneRequest = false;
+        IsCanceledRequest = false;
+        TimeRequest = false;
+    }
+
 	public void InsertNewData(DateTime endTaskDate,bool timeRequest,int acceptedTimeRequest,DateTime? requestDate, string timeRequestDescription, bool isCanceledRequest,
 		bool isCancel,string cancelDescription,bool isDone,bool isDoneRequest,string? doneDescription)
 	{

AccountManagement.Domain/SubAccountAgg/ISubAccountRepository.cs

@@ -2,6 +2,7 @@
 using _0_Framework.Domain;
 using AccountManagement.Application.Contracts.SubAccount;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 
 namespace AccountManagement.Domain.SubAccountAgg
 {
@@ -13,5 +14,6 @@ namespace AccountManagement.Domain.SubAccountAgg
         SubAccount GetDetails(long subAccountId);
         SubAccount GetBy(string commandUsername);
         SubAccountViewModel GetByVerifyCodeAndPhoneNumber(string code, string phone);
+        List<SubAccount> GetBySubAccountRole(long subAccountRoleId);
     }
 }

AccountManagement.Domain/SubAccountRoleAgg/SubAccountRole.cs

@@ -13,17 +13,21 @@ namespace AccountManagement.Domain.SubAccountRoleAgg
 
         public List<SubAccountRolePermission> RolePermissions { get; private set; }
         public List<SubAccount> SubAccounts { get; private set; }
+        public List<SubAccountRoleWorkshop> RoleWorkshops { get; set; }
 
         private SubAccountRole()
         {
         }
 
-        public SubAccountRole(string title, List<int> permissions, long accountId)
+        public SubAccountRole(string title, List<int> permissions, long accountId, List<long> workshopIds)
         {
             Title = title;
             RolePermissions = permissions.Select(x => new SubAccountRolePermission(x, id)).ToList();
             AccountId = accountId;
+            RoleWorkshops = workshopIds.Select(x => new SubAccountRoleWorkshop(x, id)).ToList();
+
         }
+
         public void ChangeTitle(string title)
         {
             Title = title;
@@ -32,10 +36,12 @@ namespace AccountManagement.Domain.SubAccountRoleAgg
         {
             RolePermissions.AddRange(permissionIds.Select(x => new SubAccountRolePermission(x, id)));
         }
-        public void Edit(string title, List<int> permissions)
+        public void Edit(string title, List<int> permissions,List<long> workshopIds)
         {
             Title = title;
             RolePermissions = permissions.Select(x => new SubAccountRolePermission(x, id)).ToList();
-        }
-    }
+            RoleWorkshops = workshopIds.Select(x => new SubAccountRoleWorkshop(x, id)).ToList();
+
+		}
+	}
 }

AccountManagement.Domain/SubAccountRoleAgg/SubAccountRoleWorkshop.cs

@@ -0,0 +1,16 @@
+using _0_Framework.Domain;
+
+namespace AccountManagement.Domain.SubAccountRoleAgg;
+
+public class SubAccountRoleWorkshop:EntityBase
+{
+	public SubAccountRoleWorkshop(long workshopId, long subAccountId)
+	{
+		WorkshopId = workshopId;
+		SubAccountId = subAccountId;
+	}
+
+	public long WorkshopId { get; set; }
+	public long SubAccountId { get; set; }
+	public SubAccountRole SubAccountRole { get; set; }
+}

AccountManagement.Domain/TaskScheduleAgg/TaskSchedule.cs

@@ -16,7 +16,7 @@ public class TaskSchedule:EntityBase
         UnitType = unitType;
         UnitNumber = unitNumber;
         LastEndTaskDate = lastEndTaskDate;
-        IsActive = IsActive.False;
+        IsActive = IsActive.True;
     }
     public string Count { get; private set; }
     public TaskScheduleType Type { get; private set; }

AccountMangement.Infrastructure.EFCore/Mappings/SubAccountRoleMapping.cs

@@ -21,6 +21,10 @@ namespace AccountMangement.Infrastructure.EFCore.Mappings
                 opt.WithOwner(x => x.SubAccountRole);
             });
 
+            builder.OwnsMany(x => x.RoleWorkshops, roleWorkshop =>
+            {
+	            roleWorkshop.WithOwner(x => x.SubAccountRole).HasForeignKey(x => x.SubAccountId);
+            });
         }
     }
 }

AccountMangement.Infrastructure.EFCore/Migrations/20250530133036_add workshop to subAccountRole.cs

@@ -0,0 +1,43 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace AccountMangement.Infrastructure.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addworkshoptosubAccountRole : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "SubAccountRoleWorkshop",
+                columns: table => new
+                {
+                    id = table.Column<long>(type: "bigint", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    SubAccountId = table.Column<long>(type: "bigint", nullable: false),
+                    WorkshopId = table.Column<long>(type: "bigint", nullable: false),
+                    CreationDate = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_SubAccountRoleWorkshop", x => new { x.SubAccountId, x.id });
+                    table.ForeignKey(
+                        name: "FK_SubAccountRoleWorkshop_SubAccountRoles_SubAccountId",
+                        column: x => x.SubAccountId,
+                        principalTable: "SubAccountRoles",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "SubAccountRoleWorkshop");
+        }
+    }
+}

AccountMangement.Infrastructure.EFCore/Migrations/AccountContextModelSnapshot.cs

@@ -1078,6 +1078,33 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations
 
             modelBuilder.Entity("AccountManagement.Domain.SubAccountRoleAgg.SubAccountRole", b =>
                 {
+                    b.OwnsMany("AccountManagement.Domain.SubAccountRoleAgg.SubAccountRoleWorkshop", "RoleWorkshops", b1 =>
+                        {
+                            b1.Property<long>("SubAccountId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<long>("id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("bigint");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("id"));
+
+                            b1.Property<DateTime>("CreationDate")
+                                .HasColumnType("datetime2");
+
+                            b1.Property<long>("WorkshopId")
+                                .HasColumnType("bigint");
+
+                            b1.HasKey("SubAccountId", "id");
+
+                            b1.ToTable("SubAccountRoleWorkshop");
+
+                            b1.WithOwner("SubAccountRole")
+                                .HasForeignKey("SubAccountId");
+
+                            b1.Navigation("SubAccountRole");
+                        });
+
                     b.OwnsMany("AccountManagement.Domain.SubAccountRoleAgg.SubAccountRolePermission", "RolePermissions", b1 =>
                         {
                             b1.Property<long>("id")
@@ -1105,6 +1132,8 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations
                         });
 
                     b.Navigation("RolePermissions");
+
+                    b.Navigation("RoleWorkshops");
                 });
 
             modelBuilder.Entity("AccountManagement.Domain.TaskAgg.Tasks", b =>

AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs

@@ -318,7 +318,8 @@ public class AccountRepository : RepositoryBase<long, Account>, IAccountReposito
         return await _context.Accounts.Where(x => x.AdminAreaPermission == "true").Select(x => new AccountSelectListViewModel()
         {
             Id = x.id,
-            Name = x.Fullname
+            Name = x.Fullname,
+            RoleId = x.RoleId
         }).ToListAsync();
     }
 

AccountMangement.Infrastructure.EFCore/Repository/SubAccountRepository.cs

@@ -77,5 +77,10 @@ namespace AccountMangement.Infrastructure.EFCore.Repository
                 Username = entity.Username
             };
         }
+
+        public List<SubAccount> GetBySubAccountRole(long subAccountRoleId)
+        {
+	        return _context.SubAccounts.Where(x => x.SubAccountRoleId == subAccountRoleId).ToList();
+        }
     }
 }

AccountMangement.Infrastructure.EFCore/Repository/TaskRepository.cs

@@ -106,14 +106,16 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         {
             res.EndTaskDate = _accountContext.Assigns.First(a => a.TaskId == res.Id && a.AssignedId == userId)
                 .EndTaskDate.ToFarsi();
-
+            var userAssign = res.AssignViewModels.First(x => x.AssignedId == userId);
 
             res.AssignViewModels = res.AssignViewModels.Where(x => x.AssignedId == userId).ToList();
-            res.IsDone = res.AssignViewModels.First(x => x.AssignedId == userId).IsDone;
-            res.IsCancel = res.AssignViewModels.First(x => x.AssignedId == userId).IsCancel;
+            res.IsDone = userAssign.IsDone;
+            res.IsCancel = userAssign.IsCancel;
+            res.HasRequest = userAssign.IsCanceledRequest || userAssign.TimeRequest ||
+                             userAssign.IsDoneRequest;
         }
 
-        if (res.TaskScheduleId>0)
+        if (res.TaskScheduleId > 0)
         {
             var taskSchedule = _accountContext.TaskSchedules.FirstOrDefault(x => x.id == res.TaskScheduleId);
 
@@ -121,7 +123,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             res.ScheduleType = taskSchedule.Type;
             res.ScheduleCount = taskSchedule.Count;
             res.ScheduleUnitNumber = taskSchedule.UnitNumber;
-		}
+        }
 
 
         //_accountContext.Tasks.Where(x => x.id == TaskId).Select(x => new EditTask()
@@ -160,8 +162,6 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         Remove(task);
     }
 
-
-
     public List<TaskViewModel> GetRequestedTasks(TaskSearchModel searchModel)
     {
         var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
@@ -900,7 +900,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             AcceptedTimeRequest = x.AcceptedTimeRequest,
             IsCancelRequest = x.IsCancelRequest,
             ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel,false),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -1229,7 +1229,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             AcceptedTimeRequest = x.AcceptedTimeRequest,
             IsCancelRequest = x.IsCancelRequest,
             ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -1788,7 +1788,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             AcceptedTimeRequest = x.AcceptedTimeRequest,
             IsCancelRequest = x.IsCancelRequest,
             ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -1866,7 +1866,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             .Include(x => x.Task).ThenInclude(x => x.TaskSchedule)
             .Where(x =>
                 x.Task.IsActiveString == "true" && x.Task.SenderId == accountId
-                                                && x.Task.TaskScheduleId != null && x.Task.TaskScheduleId > 0 && (!x.IsCanceledRequest && !x.TimeRequest && !x.IsDoneRequest) && x.Task.TaskSchedule.IsActive == IsActive.True);
+                                                && x.Task.TaskScheduleId != null && x.Task.TaskScheduleId > 0 && (!x.IsCanceledRequest && !x.TimeRequest && !x.IsDoneRequest) && x.Task.TaskSchedule.IsActive== IsActive.True);
         if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
         {
             raw = raw.Where(x =>
@@ -2056,7 +2056,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             TaskScheduleId = x.TaskScheduleId
 
 
-		}).ToList();
+        }).ToList();
 
 
         final = final.Select(x => new TaskViewModel()
@@ -2082,7 +2082,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             AcceptedTimeRequest = x.AcceptedTimeRequest,
             IsCancelRequest = x.IsCancelRequest,
             ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -2095,7 +2095,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             ScheduleUnitType = x.ScheduleUnitType,
             TaskScheduleId = x.TaskScheduleId
 
-		}).ToList();
+        }).ToList();
 
         final = final.Select(x => new TaskViewModel()
         {
@@ -2149,12 +2149,15 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             ScheduleUnitType = x.ScheduleUnitType,
             TaskScheduleId = x.TaskScheduleId
 
-		}).ToList();
+        }).ToList();
         return final;
     }
 
-    public string SetTasksColors(DateTime date, bool isCancel)
+    public string SetTasksColors(DateTime date, bool isCancel,bool hasRequest)
     {
+        if (hasRequest)
+            return "red";
+
         if (isCancel)
         {
             //return "brown";
@@ -2390,7 +2393,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
 
     public List<Tasks> GetTasksByTaskScheduleId(long taskScheduleId)
     {
-        return _accountContext.Tasks.Include(x=>x.Assigns).Where(x => x.TaskScheduleId != null && x.TaskScheduleId == taskScheduleId).ToList();
+        return _accountContext.Tasks.Include(x => x.Assigns).Where(x => x.TaskScheduleId != null && x.TaskScheduleId == taskScheduleId).ToList();
     }
 
 
@@ -2658,7 +2661,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             AcceptedTimeRequest = x.AcceptedTimeRequest,
             IsCancelRequest = x.IsCancelRequest,
             ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -2722,6 +2725,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
     {
         var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
         var positionValue = int.Parse(_contextAccessor.HttpContext.User.FindFirst("PositionValue").Value);
+        var today = DateTime.Today;
         var emptyAcc = new AccountViewModel()
         {
             Fullname = "-",
@@ -2731,7 +2735,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         var raw = _accountContext.Assigns.Include(x => x.Task).ThenInclude(x => x.TaskMedias)
             .ThenInclude(x => x.Media)
             .Where(x =>
-                x.Task.IsActiveString == "true" && x.AssignedId == accountId && (!x.IsCanceledRequest && !x.TimeRequest && !x.IsDoneRequest) && x.Task.TicketId == null);
+                x.Task.IsActiveString == "true" && x.AssignedId == accountId  && x.Task.TicketId == null &&!x.IsDoneRequest && !x.IsCanceledRequest);
         if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
         {
             raw = raw.Where(x =>
@@ -2764,6 +2768,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                 MediaCount = _accountContext.TaskMedias.Count(m => m.TaskId == x.Task.id),
                 Description = x.Task.Description,
                 IsDoneRequest = x.IsDoneRequest,
+                
             });
         if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
         {
@@ -2802,7 +2807,8 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             ContractingPartyName = x.ContractingPartyName,
             MediaCount = x.MediaCount,
             Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest
+            IsDoneRequest = x.IsDoneRequest,
+            HasRequest = x.IsCancelRequest || x.RequestTime || x.IsDoneRequest
         });
         if (!string.IsNullOrWhiteSpace(searchModel.StartDate) && !string.IsNullOrWhiteSpace(searchModel.EndDate))
         {
@@ -2871,8 +2877,10 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         }
 
 
-        var orderResult = result.OrderByDescending(x => x.IsCancel ? 0 : 1).ThenBy(x => x.IsDone ? 1 : 0)
-            .ThenBy(x => x.EndTaskDateGE);
+        var orderResult = result.OrderBy(x => x.IsDone || x.IsCancel)
+            .ThenByDescending(x => x.EndTaskDateGE <= today.AddDays(1) && !x.RequestTime)
+            .ThenByDescending(x => x.RequestTime)
+            .ThenBy(x => x.EndTaskDateGE); // مرتب‌سازی داخلی بر اساس تاریخ
 
 
         var final = orderResult.Skip(searchModel.PageIndex).Take(30).ToList();
@@ -2906,7 +2914,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             MediaCount = x.MediaCount,
             SelfName = x.SelfName,
             Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest
+            IsDoneRequest = x.IsDoneRequest,
 
         }).ToList();
 
@@ -2934,7 +2942,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             AcceptedTimeRequest = x.AcceptedTimeRequest,
             IsCancelRequest = x.IsCancelRequest,
             ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel,x.RequestTime),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -2993,6 +3001,8 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                     AssignedName = "-",
                     AssignedPositionValue = 0
                 },
+            HasRequest = x.IsCancelRequest || x.RequestTime || x.IsDoneRequest
+
         }).ToList();
         return final;
     }

AccountMangement.Infrastructure.EFCore/Repository/TaskScheduleRepository.cs

@@ -3,25 +3,26 @@ using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using AccountManagement.Application.Contracts.Media;
+using AccountManagement.Application.Contracts.Task;
 using AccountManagement.Application.Contracts.TaskSchedule;
 using AccountManagement.Domain.TaskScheduleAgg;
 using Microsoft.EntityFrameworkCore;
 
 namespace AccountMangement.Infrastructure.EFCore.Repository;
 
-public class TaskScheduleRepository: RepositoryBase<long, TaskSchedule>, ITaskScheduleRepository
+public class TaskScheduleRepository : RepositoryBase<long, TaskSchedule>, ITaskScheduleRepository
 {
     private readonly AccountContext _accountContext;
 
-    public TaskScheduleRepository(AccountContext accountContext):base(accountContext)
+    public TaskScheduleRepository(AccountContext accountContext) : base(accountContext)
     {
         _accountContext = accountContext;
     }
 
     public async Task<TaskScheduleDetailsViewModel> GetDetails(long id)
     {
-        var taskSchedule=await _accountContext.TaskSchedules.Include(x=>x.TasksList).ThenInclude(x=>x.Assigns)
-            .Include(x=>x.TasksList).ThenInclude(x=>x.TaskMedias).ThenInclude(x=>x.Media).FirstOrDefaultAsync(x => x.id == id);
+        var taskSchedule = await _accountContext.TaskSchedules.Include(x => x.TasksList).ThenInclude(x => x.Assigns)
+            .Include(x => x.TasksList).ThenInclude(x => x.TaskMedias).ThenInclude(x => x.Media).FirstOrDefaultAsync(x => x.id == id);
         if (taskSchedule == null)
         {
             return null;
@@ -29,7 +30,7 @@ public class TaskScheduleRepository: RepositoryBase<long, TaskSchedule>, ITaskSc
 
         var firstTaskDetails = taskSchedule.TasksList.First();
 
-        var firstTimeAssigns = firstTaskDetails.Assigns.Where(x=>x.FirstTimeCreation).ToList();
+        var firstTimeAssigns = firstTaskDetails.Assigns.Where(x => x.FirstTimeCreation).ToList();
 
         var assignedIds = firstTimeAssigns.Select(x => x.AssignedId).ToList();
 
@@ -46,13 +47,15 @@ public class TaskScheduleRepository: RepositoryBase<long, TaskSchedule>, ITaskSc
             Title = firstTaskDetails.Title,
             Description = firstTaskDetails.Description,
             ContractingPartyName = firstTaskDetails.ContractingPartyName,
-            AssignedName = assignedAccounts.Select(x=>x.Fullname).ToList(),
+            AssignedName = assignedAccounts.Select(x => x.Fullname).ToList(),
             CreationDateFa = firstTaskDetails.CreationDate.ToFarsi(),
             SenderName = sender.Fullname,
             TaskScheduleType = taskSchedule.Type,
             TaskScheduleUnitType = taskSchedule.UnitType,
             UnitNumber = taskSchedule.UnitNumber,
-            Medias = firstTaskDetails.TaskMedias.Select(x=> new MediaViewModel()
+            Count = taskSchedule.Type == TaskScheduleType.Limited ? taskSchedule.Count : "نامحدود",
+            FirstEndTaskDate = firstTaskDetails.Assigns.FirstOrDefault()?.EndTaskDate.ToFarsi() ?? "",
+            Medias = firstTaskDetails.TaskMedias.Select(x => new MediaViewModel()
             {
                 Category = x.Media.Category,
                 Id = x.MediaId,

Company.Domain/CheckoutAgg/Checkout.cs

@@ -1,6 +1,10 @@
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using _0_Framework.Application;
 using _0_Framework.Domain;
+using Company.Domain.CheckoutAgg.ValueObjects;
+using Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 using Company.Domain.WorkshopAgg;
 
 namespace Company.Domain.CheckoutAgg;
@@ -21,7 +25,11 @@ public class Checkout : EntityBase
         double salaryAidDeduction, double absenceDeduction, string sumOfWorkingDays
         , string archiveCode, string personnelCode, 
         string totalClaims, string totalDeductions, double totalPayment, string signature, double marriedAllowance, bool leaveCheckout,
-        double creditLeaves, double absencePeriod, double averageHoursPerDay, bool hasRollCall, string overTimeWorkvalue, string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue, string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute)
+        double creditLeaves, double absencePeriod, double averageHoursPerDay, bool hasRollCall, string overTimeWorkvalue,
+        string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue,
+        string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute,
+        ICollection<CheckoutLoanInstallment> loanInstallments,
+        ICollection<CheckoutSalaryAid> salaryAids)
     {
         EmployeeFullName = employeeFullName;
         FathersName = fathersName;
@@ -78,6 +86,8 @@ public class Checkout : EntityBase
         TotalDayOfLeaveCompute = totalDayOfLeaveCompute;
         TotalDayOfYearsCompute = totalDayOfYearsCompute;
         TotalDayOfBunosesCompute = totalDayOfBunosesCompute;
+        LoanInstallments = loanInstallments;
+        SalaryAids = salaryAids;
     }
 
     public string EmployeeFullName { get; private set; }
@@ -181,7 +191,15 @@ public class Checkout : EntityBase
    /// </summary>
    public string TotalDayOfBunosesCompute { get; private set; }
 
-	public Workshop Workshop { get; set; }
+
+   #region valueObjects
+
+   public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
+   public ICollection<CheckoutSalaryAid> SalaryAids { get; set; } = [];
+   #endregion
+
+
+    public Workshop Workshop { get; set; }
     //public WorkingHours WorkingHours { get; set; }
 
     public void Edit(string employeeFullName, string fathersName, string nationalCode, string dateOfBirth,
@@ -278,4 +296,16 @@ public class Checkout : EntityBase
         this.TotalDeductions = totalDeductions;
         this.TotalPayment = totalPayment;
     }
+
+
+    public void SetSalaryAid(ICollection<CheckoutSalaryAid> salaryAids,double salaryAidAmount)
+    {
+        SalaryAids = salaryAids;
+        SalaryAidDeduction = salaryAidAmount;
+    }
+    public void SetLoanInstallment(ICollection<CheckoutLoanInstallment> lonaInstallments, double installmentsAmount)
+    {
+        LoanInstallments = lonaInstallments;
+        InstallmentDeduction = installmentsAmount;
+    }
 }

Company.Domain/CheckoutAgg/ICheckoutRepository.cs

@@ -22,7 +22,24 @@ public interface ICheckoutRepository : IRepository<long, Checkout>
         string year, string month);
     EditCheckout GetDetails(long id);
 
-    void CreateCkeckout(Checkout command);
+    Task CreateCkeckout(Checkout command);
+    /// <summary>
+    /// لود لیست اولیه جهت ایجاد فیش حقوقی
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <param name="employeeId"></param>
+    /// <param name="year"></param>
+    /// <param name="month"></param>
+    /// <param name="contractStart"></param>
+    /// <param name="contractEnd"></param>
+    /// <returns></returns>
+    /// <exception cref="NotImplementedException"></exception>
+    Task<CreateCheckoutListViewModel> GetContractResultToCreateCheckout(long workshopId, long employeeId, string year,
+        string month,
+        string contractStart, string contractEnd);
+    //void CreateCkeckout(Checkout command);
+
+
 
     Task<List<CheckoutViewModel>> Search(CheckoutSearchModel searchModel);
 

Company.Domain/CheckoutAgg/ValueObjects/CheckoutLoanInstallment.cs

@@ -0,0 +1,25 @@
+using _0_Framework.Application;
+
+namespace Company.Domain.CheckoutAgg.ValueObjects;
+
+public class CheckoutLoanInstallment
+{
+    public CheckoutLoanInstallment(string amountForMonth, string month, string year, IsActive isActive, string loanRemaining, string loanAmount, long entityId)
+    {
+        AmountForMonth = amountForMonth;
+        Month = month;
+        Year = year;
+        IsActive = isActive;
+        LoanRemaining = loanRemaining;
+        LoanAmount = loanAmount;
+        EntityId = entityId;
+    }
+
+    public string AmountForMonth { get; private set; }
+    public string Month { get; private set; }
+    public string Year { get; private set; }
+    public string LoanRemaining { get; set; }
+    public IsActive IsActive { get; private set; }
+    public string LoanAmount { get; set; }
+    public long EntityId { get; set; }
+}

Company.Domain/CheckoutAgg/ValueObjects/CheckoutSalaryAid.cs

@@ -0,0 +1,24 @@
+using System;
+using AccountManagement.Domain.AccountAgg;
+
+namespace Company.Domain.CheckoutAgg.ValueObjects;
+
+public class CheckoutSalaryAid
+{
+    public CheckoutSalaryAid(string amount, DateTime salaryAidDateTime, string salaryAidDateTimeFa, DateTime calculationDateTime, string calculationDateTimeFa, long entityId)
+    {
+        Amount = amount;
+        SalaryAidDateTime = salaryAidDateTime;
+        SalaryAidDateTimeFa = salaryAidDateTimeFa;
+        CalculationDateTime = calculationDateTime;
+        CalculationDateTimeFa = calculationDateTimeFa;
+        EntityId = entityId;
+    }
+    public string Amount { get; private set; }
+    public DateTime SalaryAidDateTime { get; private set; }
+    public string SalaryAidDateTimeFa { get; private set; }
+
+    public DateTime CalculationDateTime { get; private set; }
+    public string CalculationDateTimeFa { get; private set; }
+    public long EntityId { get; set; }
+}

Company.Domain/Company.Domain.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -14,4 +14,8 @@
     <ProjectReference Include="..\CompanyManagment.App.Contracts\CompanyManagment.App.Contracts.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="CheckoutAgg\ValueObjects\" />
+  </ItemGroup>
+
 </Project>

Company.Domain/CustomizeWorkshopEmployeeSettingsAgg/Entities/CustomizeWorkshopEmployeeSettings.cs

@@ -213,6 +213,60 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
             earlyExit.EarlyExitTimeFines.Select(x => new EarlyExitTimeFine(x.Minute, x.FineMoney))
                 .ToList(), earlyExit.Value);
     }
+    public void UpdateIsShiftChange()
+    {
+        var groupSetting = CustomizeWorkshopGroupSettings;
+        if (groupSetting == null)
+            return;
+        bool isShiftChange;
 
 
+        if (WorkshopShiftStatus == WorkshopShiftStatus.Regular)
+        {
+
+
+
+            if (CustomizeWorkshopEmployeeSettingsShifts.All(x => groupSetting.CustomizeWorkshopGroupSettingsShifts.Any(y => x.Equals(y)))
+                && WorkshopShiftStatus == groupSetting.WorkshopShiftStatus && FridayWork == groupSetting.FridayWork &&
+                HolidayWork == groupSetting.HolidayWork && BreakTime == groupSetting.BreakTime)
+            {
+                isShiftChange = false;
+            }
+
+            else
+            {
+                isShiftChange = true;
+            }
+        }
+        else if (WorkshopShiftStatus == WorkshopShiftStatus.Irregular)
+        {
+            if (WorkshopShiftStatus == groupSetting.WorkshopShiftStatus && BreakTime == groupSetting.BreakTime &&
+                IrregularShift == groupSetting.IrregularShift && FridayWork == groupSetting.FridayWork &&
+                HolidayWork == groupSetting.HolidayWork)
+            {
+                isShiftChange = false;
+            }
+            else
+            {
+                isShiftChange = true;
+            }
+        }
+        else
+        {
+            if (CustomizeRotatingShifts.All(x => groupSetting.CustomizeRotatingShifts.Any(y => x.Equals(y)))
+                && WorkshopShiftStatus == groupSetting.WorkshopShiftStatus && FridayWork == groupSetting.FridayWork &&
+                HolidayWork == groupSetting.HolidayWork && BreakTime == groupSetting.BreakTime)
+            {
+                isShiftChange = false;
+            }
+
+            else
+            {
+                isShiftChange = true;
+            }
+
+        }
+
+        IsShiftChanged = isShiftChange;
+    }
 }

Company.Domain/CustomizeWorkshopGroupSettingsAgg/Entities/CustomizeWorkshopGroupSettings.cs

@@ -219,7 +219,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
 
         }
 
-        var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.id));
+        var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
 
         foreach (var item in permittedToOverWrite)
         {

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -25,7 +25,7 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
 
     double GetcontractAmount(int countPerson);
 
-    string ExpColor(DateTime contractEndGr, double contractAmount,
+    (string result, string isExpier) ExpColor(DateTime contractEndGr, double contractAmount,
         string isActiveString);
 
     TotalbalancViewModel TotalBalance(long contractingPartyId);

Company.Domain/InsurancJobAgg/IInsuranceJobRepositpry.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.InsuranceJob;
+using CompanyManagment.App.Contracts.InsuranceJobItem;
 
 namespace Company.Domain.InsurancJobAgg;
 
@@ -13,10 +14,16 @@ public interface IInsuranceJobRepositpry:IRepository<long, InsuranceJob>
 {
     //OperationResult Create(CreateInsurancJob command);
     // OperationResult Edit(EditInsurancJob command);
-    EditInsuranceJob GetDetails(long id);
+    EditInsuranceJob GetDetails(long id, string year, string month);
     List<InsuranceJobViewModel> GetInsurancJob();
     List<InsuranceJobViewModel> Search(InsuranceJobSearchModel searchModel);
     OperationResult CreateInsuranceJob(CreateInsuranceJob command);
+    List<(long id, string date)> GetOldYersInsuranceItemIds();
+    OperationResult CopyFromLastYear(CopyFromLastYearViewModel command);
+    OperationResult RecoveryOldData1403();
     OperationResult Remove(long id);
     OperationResult EditInsuranceJob(EditInsuranceJob command);
-}
+
+
+}
+

Company.Domain/InsuranceJobItemAgg/IInsuranceJobItemRepositpry.cs

@@ -14,8 +14,11 @@ public interface IInsuranceJobItemRepositpry : IRepository<long, InsuranceJobIte
 {
     void CreateInsuranceJobItem(InsuranceJobItemViewModel model);
     DetailsInsuranceJobItem GetDetails(long id);
-    List<InsuranceJobItemViewModel> GetInsuranceJobItemByInsuranceJobId(long Id);
+    List<InsuranceJobItemViewModel> GetInsuranceJobItemByInsuranceJobId(long Id, string year, string month);
     List<InsuranceJobItemViewModel> Search(InsuranceJobItemSearchModel searchModel);
-    InsuranceJobItemViewModel GetInsuranceJobItemByInsuranceJobIdForFixedSalary(long insuranceJobId, long jobId); 
+    InsuranceJobItemViewModel GetInsuranceJobItemByInsuranceJobIdForFixedSalary(long insuranceJobId, long jobId,
+        string year, string month);
+
+    (List<string> workshopList, bool hasAnyWorkshop) GetWorkshopUsedThisInsuranceJob(long insuranceJobId);
 
 }

Company.Domain/InsuranceJobItemAgg/InsuranceJobItem.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using _0_Framework.Domain;
 using Company.Domain.InsuranceJobAndJobsAgg;
 using Company.Domain.InsurancJobAgg;
@@ -8,13 +9,15 @@ namespace Company.Domain.InsuranceJobItemAgg;
 
 public class InsuranceJobItem : EntityBase
 {
-    public InsuranceJobItem(double percentageLessThan, double salaeyLessThan, double percentageMoreThan, double salaryMoreThan, long insuranceJobId)
+    public InsuranceJobItem(double percentageLessThan, double salaeyLessThan, double percentageMoreThan, double salaryMoreThan, long insuranceJobId, DateTime? startDate, DateTime? endDate)
     {
         PercentageLessThan = percentageLessThan;
         SalaeyLessThan = salaeyLessThan;
         PercentageMoreThan = percentageMoreThan;
         SalaryMoreThan = salaryMoreThan;
         InsuranceJobId = insuranceJobId;
+        StartDate = startDate;
+        EndDate = endDate;
     }
 
     public double PercentageLessThan { get; private set; }
@@ -22,6 +25,9 @@ public class InsuranceJobItem : EntityBase
     public double PercentageMoreThan { get; private set; }
     public double SalaryMoreThan { get; private set; }
 
+    public DateTime? StartDate { get; private set; }
+    public DateTime? EndDate { get; private set; }
+
     public long InsuranceJobId { get; private set; }
     public InsuranceJob InsuranceJob { get; set; }
     public List<InsuranceJobAndJobs> InsuranceJobAndJobs { get; set; }
@@ -31,12 +37,14 @@ public class InsuranceJobItem : EntityBase
         InsuranceJobAndJobs = new List<InsuranceJobAndJobs>();
     }
 
-    public void Edit(double percentageLessThan, double salaeyLessThan, double percentageMoreThan, double salaryMoreThan, long insuranceJobId)
+    public void Edit(double percentageLessThan, double salaeyLessThan, double percentageMoreThan, double salaryMoreThan, long insuranceJobId, DateTime? startDate, DateTime? endDate)
     {
         PercentageLessThan = percentageLessThan;
         SalaeyLessThan = salaeyLessThan;
         PercentageMoreThan = percentageMoreThan;
         SalaryMoreThan = salaryMoreThan;
         InsuranceJobId = insuranceJobId;
+        StartDate = startDate;
+        EndDate = endDate;
     }
 }

Company.Domain/LeftWorkAgg/ILeftWorkRepository.cs

@@ -45,4 +45,5 @@ public interface ILeftWorkRepository : IRepository<long, LeftWork>
     #endregion
 
     Task<LeftWork> GetLastLeftWork(long employeeId, long workshopId);
+    List<LeftWorkViewModel> SearchCreateContract(LeftWorkSearchModel searchModel);
 }

Company.Domain/LeftWorkInsuranceAgg/ILeftWorkInsuranceRepository.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.InsuranceList;
+using CompanyManagment.App.Contracts.LeftWork;
 using CompanyManagment.App.Contracts.LeftWorkInsurance;
 using CompanyManagment.App.Contracts.PersonnleCode;
 
@@ -40,5 +41,19 @@ public interface ILeftWorkInsuranceRepository : IRepository<long, LeftWorkInsura
     /// <returns></returns>
 	List<EmployeeDetailsForInsuranceListViewModel> GetEmployeeInsuranceLeftWorksAndInformation(long workshopId, DateTime startDate, DateTime endDate);
 
-	#endregion
+    #endregion
+
+    #region Mahan
+
+    /// <summary>
+    /// پرسنل هایی که در قرارداد ترک کار دارند ولی در بیمه ترک کاری برایشان نخورده
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <returns></returns>
+    List<LeftWorkViewModel> GetEmployeesWithContractExitOnly(long workshopId);
+
+    LeftWorkInsurance GetLastLeftWorkByEmployeeIdAndWorkshopId(long workshopId, long employeeId);
+
+    #endregion
+
 }

Company.Domain/RollCallAgg/IRollCallMandatoryRepository.cs

@@ -6,7 +6,9 @@ using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities;
 using CompanyManagment.App.Contracts.Contract;
 using CompanyManagment.App.Contracts.CustomizeCheckout;
 using CompanyManagment.App.Contracts.Leave;
+using CompanyManagment.App.Contracts.Loan;
 using CompanyManagment.App.Contracts.RollCall;
+using CompanyManagment.App.Contracts.SalaryAid;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;
 
 namespace Company.Domain.RollCallAgg;
@@ -14,7 +16,19 @@ namespace Company.Domain.RollCallAgg;
 public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
 {
 	ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking, bool isStaticCheckout);
-	TimeSpan AfterSubtract(CreateWorkingHoursTemp command, TimeSpan sumOneDaySpan, DateTime creationDate);
+
+    /// <summary>
+    /// محاسبه ساعات کارکرد پرسنل در صورت داشتن حضور غیاب
+    /// </summary>
+    /// <param name="employeeId"></param>
+    /// <param name="workshopId"></param>
+    /// <param name="contractStart"></param>
+    /// <param name="contractEnd"></param>
+    /// <returns></returns>
+    (bool hasRollCall, TimeSpan sumOfSpan) GetRollCallWorkingSpan(long employeeId, long workshopId,
+        DateTime contractStart, DateTime contractEnd);
+
+    TimeSpan AfterSubtract(CreateWorkingHoursTemp command, TimeSpan sumOneDaySpan, DateTime creationDate);
 
 	List<RotatingShiftViewModel> RotatingShiftCheck(List<GroupedRollCalls> rollCallList);
 
@@ -33,6 +47,12 @@ public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
     /// <param name="contractEnd"></param>
     /// <param name="shiftwork"></param>
     /// <returns></returns>
+    List<LoanInstallmentViewModel> LoanInstallmentForCheckout(long employeeId, long workshopId, DateTime contractStart,
+        DateTime contractEnd);
+
+    List<SalaryAidViewModel> SalaryAidsForCheckout(long employeeId, long workshopId, DateTime checkoutStart,
+        DateTime checkoutEnd);
+
     Task<ComputingViewModel> RotatingShiftReport(long workshopId, long employeeId, DateTime contractStart,
         DateTime contractEnd, string shiftwork, bool hasRollCall, CreateWorkingHoursTemp command,bool holidayWorking);
 }

Company.Domain/RollCallEmployeeAgg/IRollCallEmployeeRepository.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.RollCallEmployee;
 
@@ -6,6 +7,7 @@ namespace Company.Domain.RollCallEmployeeAgg;
 
 public interface IRollCallEmployeeRepository : IRepository<long, RollCallEmployee>
 {
+    bool HasRollCallRecord(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd);
     List<RollCallEmployeeViewModel> GetByWorkshopId(long workshopId);
     EditRollCallEmployee GetDetails(long id);
     RollCallEmployeeViewModel GetByEmployeeIdAndWorkshopId(long employeeId, long workshopId);

CompanyManagment.App.Contracts/AdminMonthlyOverview/IAdminMonthlyOverviewApplication.cs

@@ -67,6 +67,7 @@ public class AdminMonthlyOverviewListViewModel
     public long WorkshopId { get; set; }
     public string WorkshopName { get; set; }
     public string WorkshopArchiveCode { get; set; }
+    public int WorkshopArchiveCodeInt { get; set; }
     public string Province { get; set; }
     public string City { get; set; }
     public string Address { get; set; }
@@ -74,7 +75,8 @@ public class AdminMonthlyOverviewListViewModel
     public string AdminFullName { get; set; }
     public string EmployerName { get; set; }
     public string EmployerPhoneNumber { get; set; }
-    public int EmployeeCount { get; set; }
+    public int ContractEmployeeCount { get; set; }
+    public int CheckoutEmployeeCount { get; set; }
     public AdminMonthlyOverviewStatus Status { get; set; }
     public bool IsBlock { get; set; }
 }

CompanyManagment.App.Contracts/Checkout/CheckoutViewModel.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using CompanyManagment.App.Contracts.Employer;
+using CompanyManagment.App.Contracts.Loan;
 using CompanyManagment.App.Contracts.RollCall;
+using CompanyManagment.App.Contracts.SalaryAid;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;
 
 namespace CompanyManagment.App.Contracts.Checkout;
@@ -120,5 +122,17 @@ public class CheckoutViewModel
     /// تعداد روزهای محاسبه شده برای عیدی و پاداش
     /// </summary>
     public string TotalDayOfBunosesCompute { get; set; }
+
+    /// <summary>
+    /// مدت مرخصی استعلاجی 
+    /// </summary>
+    public string TotalSickLeave { get; set; }
+
+    /// <summary>
+    /// مدت مرخصی استحقاقی
+    /// </summary>
+    public string TotalPaidLeave { get; set; }
 	public List<CheckoutDailyRollCallViewModel> MonthlyRollCall { get; set; }
+    public List<LoanInstallmentViewModel> InstallmentViewModels { get; set; }
+    public List<SalaryAidViewModel> SalaryAidViewModels { get; set; }
 }

CompanyManagment.App.Contracts/Checkout/CreateCheckoutListViewModel.cs

@@ -0,0 +1,45 @@
+using System.Collections.Generic;
+
+namespace CompanyManagment.App.Contracts.Checkout;
+
+public class CreateCheckoutListViewModel
+{
+    public long Id { get; set; }
+
+    public long PersonnelCode { get; set; }
+
+    public long EmployeeId { get; set; }
+
+    public string ContractNo { get; set; }
+
+    public string EmployerName { get; set; }
+
+    public string WorkshopName { get; set; }
+    public string EmployeeName { get; set; }
+
+    public string ContractStart { get; set; }
+
+    public string ContractEnd { get; set; }
+
+    public string LeftWorkDate { get; set; }
+
+    //public string NextMonthStart { get; set; }
+
+    //public bool RedColor { get; set; }
+
+    public bool LaterThanEnd { get; set; }
+
+    public bool Extension { get; set; }
+
+    public bool HasCheckout { get; set; }
+
+    //public bool MoreThanOneMonth { get; set; }
+
+    //public bool Waiting { get; set; }
+
+
+    public string Description { get; set; }
+
+
+    public List<CreateCheckoutListViewModel> CreateCheckoutList { get; set; }
+}

CompanyManagment.App.Contracts/Checkout/ICheckoutApplication.cs

@@ -13,7 +13,20 @@ public interface ICheckoutApplication
     OperationResult Edit(EditCheckout command);
     EditCheckout GetDetails(long id);
 
-
+    /// <summary>
+    /// لود لیست اولیه جهت ایجاد فیش حقوقی
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <param name="employeeId"></param>
+    /// <param name="year"></param>
+    /// <param name="month"></param>
+    /// <param name="contractStart"></param>
+    /// <param name="contractEnd"></param>
+    /// <returns></returns>
+    /// <exception cref="NotImplementedException"></exception>
+    Task<CreateCheckoutListViewModel> GetContractResultToCreateCheckout(long workshopId, long employeeId, string year,
+        string month,
+        string contractStart, string contractEnd);
     Task<List<CheckoutViewModel>> Search(CheckoutSearchModel searchModel);
     List<CheckoutViewModel> SimpleSearch(CheckoutSearchModel searchModel);
     List<CheckoutViewModel> PrintAll(List<long> id);

CompanyManagment.App.Contracts/Contract/ComputingViewModel.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using CompanyManagment.App.Contracts.Loan;
+using CompanyManagment.App.Contracts.SalaryAid;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;
 
 namespace CompanyManagment.App.Contracts.Contract;

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/ICustomizeWorkshopSettingsApplication.cs

@@ -33,7 +33,7 @@ public interface ICustomizeWorkshopSettingsApplication
     //Remove the Employee From the Group Settings
     OperationResult RemoveEmployeeFromRollCallWorkshopGroup(long employeeId, long groupId, long workshopId);
 
-    OperationResult EditSimpleRollCallGroupSetting(EditCustomizeWorkshopGroupSettings command);
+    OperationResult EditSimpleRollCallGroupSetting(EditCustomizeWorkshopGroupSettings command, List<ReCalculateRollCallValues> reCalculateCommand);
 
     #region Vafa
     OperationResult EditSimpleRollCallEmployeeSetting(EditCustomizeEmployeeSettings command,
@@ -90,7 +90,13 @@ public interface ICustomizeWorkshopSettingsApplication
     List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingsByWorkshopId(long workshopId);
     CustomizeWorkshopGroupSettingsViewModel GetEmployeesGroupSettingsByEmployeeId(long employeeId, long workshopId);
 
-
+    /// <summary>
+    /// این متد برای قبل از ویرایش گروهی و محاسبه مجدد گروهی استفاده میشود برای اینکه پرسنل هایی که دارای فیش هستند رو فرانت نمایش بده
+    /// </summary>
+    /// <param name="command"></param>
+    /// <param name="workshopId"></param>
+    /// <returns></returns>
+    OperationResult<List<long>> ValidateReCalculateValueForGroupEdit(List<ReCalculateRollCallValues> command, long workshopId);
     bool HasAnyEmployeeWithoutGroup(long workshopId);
 
     /// <summary>

CompanyManagment.App.Contracts/DateSalary/DateSalaryViewModel.cs

@@ -1,4 +1,6 @@
-namespace CompanyManagment.App.Contracts.DateSalary;
+using System;
+
+namespace CompanyManagment.App.Contracts.DateSalary;
 
 public class DateSalaryViewModel
 {
@@ -7,4 +9,6 @@ public class DateSalaryViewModel
     public string Month { get; set; }
     public string StartDateFa { get; set; }
     public string EndDateFa { get; set; }
+    public DateTime StartDateGr { get; set; }
+    public DateTime EndDateGr { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractViewModel.cs

@@ -69,4 +69,5 @@ public class InstitutionContractViewModel
     public double ValueAddedTax { get; set; }
     public int LeftWorkEmployeeCount { get; set; }
     public int InsuranceLeftWorkEmployeeCount { get; set; }
+    public string IsExpier { get; set; }
 }

CompanyManagment.App.Contracts/InsuranceJob/CopyFromLastYearViewModel.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using CompanyManagment.App.Contracts.InsuranceJobItem;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace CompanyManagment.App.Contracts.InsuranceJob;
+
+public class CopyFromLastYearViewModel
+{
+    public string StartDate { get; set; }
+    public string EndDate { get; set; }
+
+    public long InsuranceJobItemId { get; set; }
+
+    public SelectList InsuranceJobItemViewModels { get; set; }
+}

CompanyManagment.App.Contracts/InsuranceJob/CreateInsuranceJob.cs

@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using CompanyManagment.App.Contracts.InsuranceJobItem;
 using CompanyManagment.App.Contracts.Job;
+using Microsoft.AspNetCore.Mvc.Rendering;
 
 namespace CompanyManagment.App.Contracts.InsuranceJob;
 
@@ -14,7 +15,20 @@ public class CreateInsuranceJob
     public long YearlySalaryId { get; set; }
     public string EconomicCode { get; set; }
     public string Year { get; set; }
+    public string Month { get; set; }
     public long JobId { get; set; }
+
+    public string StartDateFa { get; set; }
+    public string EndDateFa { get; set; }
     public List<JobViewModel> Jobs { get; set; }
     public List<InsuranceJobItemViewModel> InsuranceJobItems { get; set; }
+
+    public List<string> WorkshopList { get; set; }
+    public bool HasAnyWorkshop { get; set; }
+
+    public long InsuranceJobItemId { get; set; }
+
+    public SelectList InsuranceJobItemViewModels { get; set; }
+
+
 }

CompanyManagment.App.Contracts/InsuranceJob/IInsuranceJobApplication.cs

@@ -10,9 +10,12 @@ namespace CompanyManagment.App.Contracts.InsuranceJob;
 
 public interface IInsuranceJobApplication
 {
+    List<(long id, string date)> GetOldYersInsuranceItemIds();
+    OperationResult CopyFromLastYear(CopyFromLastYearViewModel command);
+    OperationResult RecoveryOldData1403();
     OperationResult Create(CreateInsuranceJob command);
     OperationResult Edit(EditInsuranceJob command);
-    EditInsuranceJob GetDetails(long id);
+    EditInsuranceJob GetDetails(long id,string year, string month);
     List<InsuranceJobViewModel> GetInsurancJob();
  
     List<InsuranceJobViewModel> Search(InsuranceJobSearchModel searchModel);

CompanyManagment.App.Contracts/InsuranceJob/InsuranceJobViewModel.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using CompanyManagment.App.Contracts.InsuranceJobItem;
 
 namespace CompanyManagment.App.Contracts.InsuranceJob;
 
@@ -13,4 +14,7 @@ public class InsuranceJobViewModel
     //public long YearlySalaryId { get; set; }
     public string EconomicCode { get; set; }
     public string Year { get; set; }
+    public string Month { get; set; }
+    public List<InsuranceJobItemViewModel> InsuranceJobItemViewModels { get; set; }
+
 }

CompanyManagment.App.Contracts/InsuranceJobItem/InsuranceJobItemViewModel.cs

@@ -11,14 +11,32 @@ namespace CompanyManagment.App.Contracts.InsuranceJobItem;
 public class InsuranceJobItemViewModel
 {
     public long Id { get; set; }
+
+   
+
+    /// <summary>
+    /// آیای این درصد در لیست مبالغ مبلغ پر شده دارد
+    /// </summary>
+    public bool IsPercentageLessThanUse { get; set; }
     public double PercentageLessThan { get; set; }
+
+  
+
+    /// <summary>
+    /// آیای این درصد در لیست مبالغ مبلغ پر شده دارد
+    /// </summary>
+    public bool IsPercentageMoreThanUse { get; set; }
     public double PercentageMoreThan { get; set; }
+
     public double SalaeyLessThan { get; set; }
     public double SalaryMoreThan { get; set; }
     public string SalaeyLessThanString { get; set; }
     public string SalaryMoreThanString { get; set; }
     public long InsuranceJobId { get; set; }
 
+    public DateTime? StartDate { get; set; }
+    public DateTime? EndDate { get; set; }
+
     public List<long> JobIds { get; set; }
     public List<JobViewModel> JobList { get; set; }
 }

CompanyManagment.App.Contracts/InsuranceList/EditInsuranceList.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using CompanyManagment.App.Contracts.LeftWork;
 
 namespace CompanyManagment.App.Contracts.InsuranceList;
 
@@ -14,4 +15,8 @@ public class EditInsuranceList:CreateInsuranceList
     public string Population { get; set; }
     public long? InsuranceJobId { get; set; }
 
+    /// <summary>
+    /// پرسنل هایی که قرارداد ترک کار کرده اند ولی ترک کار بیمه ندارند
+    /// </summary>
+    public List<LeftWorkViewModel> LeftWorkEmployees { get; set; }
 }

CompanyManagment.App.Contracts/LeftWork/ILeftWorkApplication.cs

@@ -16,6 +16,9 @@ public interface ILeftWorkApplication
     EditLeftWork GetDetails(long id);
     LeftWorkViewModel CheckoutleftWorkCheck(DateTime contractStart, long workshopId, long employeeId);
     List<LeftWorkViewModel> search(LeftWorkSearchModel searchModel);
+
+
+    List<LeftWorkViewModel> SearchCreateContract(LeftWorkSearchModel searchModel);
     Task<List<LeftWorkViewModel>> searchAsync(LeftWorkSearchModel searchModel);
     string StartWork(long employeeId, long workshopId, string leftWork);
     OperationResult RemoveLeftWork(long id);

CompanyManagment.App.Contracts/RollCall/RollCallViewModel.cs

@@ -65,4 +65,6 @@ public class RollCallViewModel
     /// مدت زمان استراحت
     /// </summary>
     public TimeSpan BreakTimeSpan { get; set; }
+
+    public DateTime? ShiftEndWithoutRest { get; set; }
 }

CompanyManagment.App.Contracts/RollCallEmployee/IRollCallEmployeeApplication.cs

@@ -38,4 +38,5 @@ public interface IRollCallEmployeeApplication
     (int activeEmployees, int deActiveEmployees) GetActiveAndDeActiveRollCallEmployees(long workshopId);
     bool HasEmployees(long workshopId);
     #endregion
+
 }

CompanyManagment.App.Contracts/RollCallEmployeeStatus/IRollCallEmployeeStatusApplication.cs

@@ -17,5 +17,7 @@ namespace CompanyManagment.App.Contracts.RollCallEmployeeStatus
         List<RollCallEmployeeStatusViewModel> GetActiveByWorkshopIdInDate(long workshopId, DateTime startDateGr, DateTime endDateGr);
 
         bool IsActiveInPeriod(long employeeId, long workshopId, DateTime startDate, DateTime endDate);
-    }
+        void SyncRollCallEmployeeWithLeftWork(long rollCallEmployeeId);
+
+	}
 }

CompanyManagment.App.Contracts/SalaryAid/CreateSalaryAidViewModel.cs

@@ -8,6 +8,7 @@ public class CreateSalaryAidViewModel
 	public long WorkshopId { get; set; }
 	public string Amount { get; set; }
 	public string SalaryDateTime { get; set; }
+	public string CalculationDateTime { get; set; }
     public string NationalCode { get; set; }
     public int CalculationMonth { get; set; }
     public int CalculationYear { get; set; }

CompanyManagment.App.Contracts/SalaryAid/SalaryAidGroupedByDateViewModel.cs

@@ -6,6 +6,8 @@ public class SalaryAidGroupedByDateViewModel
 {
     public string MonthFa { get; set; }
     public string YearFa { get; set; }
+    public int Month { get; set; }
+    public int Year { get; set; }
     public List<SalaryAidGroupedByDateViewModelItems> SalaryAidViewModels { get; set; }
     public string TotalAmount { get; set; }
 

CompanyManagment.App.Contracts/SalaryAid/SalaryAidViewModel.cs

@@ -15,7 +15,8 @@ public class SalaryAidViewModel
     public string CalculationDateTimeFa { get; set; }
     public DateTime CalculationDateTimeGe { get; set; }
 
-
+    public int Month { get; set; }
+    public int Year { get; set; }
 
     public string EmployeeFullName { get; set; }
     public string PersonnelCode { get; set; }

CompanyManagment.App.Contracts/Workshop/WorkshopSubAccountViewModel.cs

@@ -7,5 +7,6 @@ namespace CompanyManagment.App.Contracts.Workshop
         public string WorkshopName { get; set; }
         public long SubAccountId { get; set; }
         public string IsActive { get; set; }
+        public int PersonnelCount { get; set; }
     }
 }

CompanyManagment.Application/CheckoutApplication.cs

@@ -5,9 +5,11 @@ using System.Linq;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using Company.Domain.CheckoutAgg;
+using Company.Domain.CheckoutAgg.ValueObjects;
 using Company.Domain.LeftWorkAgg;
 using Company.Domain.YearlySalaryAgg;
 using Company.Domain.empolyerAgg;
+using Company.Domain.RollCallAgg;
 using CompanyManagment.App.Contracts.Checkout;
 using CompanyManagment.App.Contracts.PersonalContractingParty;
 using CompanyManagment.App.Contracts.Leave;
@@ -24,11 +26,12 @@ public class CheckoutApplication : ICheckoutApplication
     private readonly IPersonalContractingPartyApp _contractingPartyApp;
     private readonly ILeaveApplication _leaveApplication;
     private readonly IMandatoryHoursApplication _mandatoryHoursApplication;
+    private readonly IRollCallMandatoryRepository _rollCallMandatoryRepository;
 
 
     public CheckoutApplication(ICheckoutRepository checkoutRepository, IYearlySalaryRepository yearlySalaryRepository,
         ILeftWorkRepository leftWorkRepository,
-        IEmployerRepository employerRepository, IPersonalContractingPartyApp contractingPartyApp, ILeaveApplication leaveApplication, IMandatoryHoursApplication mandatoryHoursApplication)
+        IEmployerRepository employerRepository, IPersonalContractingPartyApp contractingPartyApp, ILeaveApplication leaveApplication, IMandatoryHoursApplication mandatoryHoursApplication, IRollCallMandatoryRepository rollCallMandatoryRepository)
     {
         _checkoutRepository = checkoutRepository;
         _yearlySalaryRepository = yearlySalaryRepository;
@@ -37,6 +40,7 @@ public class CheckoutApplication : ICheckoutApplication
         _contractingPartyApp = contractingPartyApp;
         _leaveApplication = leaveApplication;
         _mandatoryHoursApplication = mandatoryHoursApplication;
+        _rollCallMandatoryRepository = rollCallMandatoryRepository;
     }
 
     [SuppressMessage("ReSharper.DPA", "DPA0007: Large number of DB records", MessageId = "count: 241")]
@@ -48,73 +52,85 @@ public class CheckoutApplication : ICheckoutApplication
         string month = string.Empty;
         switch (smonth)
         {
-            case 1: month = "فروردین";
+            case 1:
+                month = "فروردین";
                 break;
-            case 2: month = "اردیبهشت";
+            case 2:
+                month = "اردیبهشت";
                 break;
-            case 3:month = "خرداد";
+            case 3:
+                month = "خرداد";
                 break;
-            case 4: month = "تیر";
+            case 4:
+                month = "تیر";
                 break;
-            case 5: month = "مرداد";
+            case 5:
+                month = "مرداد";
                 break;
-            case 6: month = "شهریور";
+            case 6:
+                month = "شهریور";
                 break;
-            case 7:month = "مهر";
+            case 7:
+                month = "مهر";
                 break;
-            case 8: month = "آبان";
+            case 8:
+                month = "آبان";
                 break;
-            case 9: month = "آذر";
+            case 9:
+                month = "آذر";
                 break;
-            case 10: month = "دی";
+            case 10:
+                month = "دی";
                 break;
-            case 11: month = "بهمن";
+            case 11:
+                month = "بهمن";
                 break;
-            case 12: month = "اسفند";
+            case 12:
+                month = "اسفند";
                 break;
         }
         var year = syear.ToString();
 
-		#region SickLeav
+        #region SickLeav
 
-		//var serachModel = new LeaveSearchModel()
-		//{
-		//	EmployeeId = command.EmployeeId,
-		//	WorkshopId = command.WorkshopId,
-		//	LeaveType = "استعلاجی",
-		//	StartLeave = command.ContractStart,
-		//	EndLeave = command.ContractEnd,
-		//	IsAccepted = true,
-		//};
-		//var leavList = _leaveApplication.search(serachModel);
-  //      int sickLeaveCount = 0;
-		//if (leavList.Count > 0)
-		//{
-			
-		//	foreach (var leave in leavList)
-		//	{
-		//		if (leave.StartLeaveGr < command.ContractStartGr && leave.EndLeaveGr <= command.ContractEndGr)
-		//		{
-  //                  int res = (int)((leave.EndLeaveGr - command.ContractStartGr).TotalDays +1);
-  //                  sickLeaveCount += res;
-		//		}
-		//		else if (leave.StartLeaveGr >= command.ContractStartGr && leave.EndLeaveGr > command.ContractEndGr)
-		//		{
-		//			int res = (int)((command.ContractEndGr - leave.StartLeaveGr).TotalDays + 1);
-		//			sickLeaveCount += res;
-		//		}
-		//		else
-		//		{
-		//			int res = (int)((leave.EndLeaveGr - leave.StartLeaveGr).TotalDays + 1);
-		//			sickLeaveCount += res;
-		//		}
-				
-		//	}
-		//}
+        //var serachModel = new LeaveSearchModel()
+        //{
+        //	EmployeeId = command.EmployeeId,
+        //	WorkshopId = command.WorkshopId,
+        //	LeaveType = "استعلاجی",
+        //	StartLeave = command.ContractStart,
+        //	EndLeave = command.ContractEnd,
+        //	IsAccepted = true,
+        //};
+        //var leavList = _leaveApplication.search(serachModel);
+        //      int sickLeaveCount = 0;
+        //if (leavList.Count > 0)
+        //{
 
-		#endregion
+        //	foreach (var leave in leavList)
+        //	{
+        //		if (leave.StartLeaveGr < command.ContractStartGr && leave.EndLeaveGr <= command.ContractEndGr)
+        //		{
+        //                  int res = (int)((leave.EndLeaveGr - command.ContractStartGr).TotalDays +1);
+        //                  sickLeaveCount += res;
+        //		}
+        //		else if (leave.StartLeaveGr >= command.ContractStartGr && leave.EndLeaveGr > command.ContractEndGr)
+        //		{
+        //			int res = (int)((command.ContractEndGr - leave.StartLeaveGr).TotalDays + 1);
+        //			sickLeaveCount += res;
+        //		}
+        //		else
+        //		{
+        //			int res = (int)((leave.EndLeaveGr - leave.StartLeaveGr).TotalDays + 1);
+        //			sickLeaveCount += res;
+        //		}
 
-		var dayliWage = command.DayliWage.MoneyToDouble();
+        //	}
+        //}
+
+        #endregion
+
+        var dayliWage = command.DayliWage.MoneyToDouble();
         // کمک هزینه اقلام
         var consumableItem = command.ConsumableItems.MoneyToDouble();
         //حق اولاد
@@ -124,8 +140,8 @@ public class CheckoutApplication : ICheckoutApplication
         //حق تاهل
         var marriedAllowance = command.MarriedAllowance.MoneyToDouble();
         var MontlyYearsBunos =
-            _yearlySalaryRepository.GetMontlyBunosYears(command.WeeklyTime, command.ContractStartGr, command.ContractEndGr, dayliWage,command.WorkingWeeklyTime,command.officialholiday,command.friday, command.TotalHolidaysAndNotH, command.TotalHolidaysAndNotM, command.Basic, command.FridayStarttoEnd,command.DailFeeComplete,command.HasRollCall, command.HolidayWorking, command.ShiftWork);
-       //دستمزد ماهانه
+            _yearlySalaryRepository.GetMontlyBunosYears(command.WeeklyTime, command.ContractStartGr, command.ContractEndGr, dayliWage, command.WorkingWeeklyTime, command.officialholiday, command.friday, command.TotalHolidaysAndNotH, command.TotalHolidaysAndNotM, command.Basic, command.FridayStarttoEnd, command.DailFeeComplete, command.HasRollCall, command.HolidayWorking, command.ShiftWork);
+        //دستمزد ماهانه
         var monthlyWage = MontlyYearsBunos.MontlyWage;
         //سنوات
         var years = command.YearsPay;
@@ -143,7 +159,7 @@ public class CheckoutApplication : ICheckoutApplication
         //حق بیمه سهم کارگر
         var insuranceDeduction = (monthlyWage + bacicYears + consumableItem + housingAllowance + marriedAllowance) * 7 / 100;
 
-        if (command.OvertimePay > 0 && command.AbsenceDeduction>0)
+        if (command.OvertimePay > 0 && command.AbsenceDeduction > 0)
         {
             if (command.AbsenceDeduction >= command.OvertimePay)
             {
@@ -157,12 +173,26 @@ public class CheckoutApplication : ICheckoutApplication
             }
 
         }
+        var checkoutStart = $"{command.Year}/{command.Month}/01";
+        var checkoutEnd = checkoutStart.FindeEndOfMonth();
+        var salaryAids =
+            _rollCallMandatoryRepository.SalaryAidsForCheckout(command.EmployeeId, command.WorkshopId, checkoutStart.ToGeorgianDateTime(), checkoutEnd.ToGeorgianDateTime())
+                .Select(x => new CheckoutSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa, x.CalculationDateTimeGe, x.CalculationDateTimeFa, x.Id)).ToList();
+
+        command.SalaryAidDeduction = salaryAids.Sum(x => x.Amount.MoneyToDouble());
+
+
+        var loanInstallments = _rollCallMandatoryRepository.LoanInstallmentForCheckout(command.EmployeeId,
+                command.WorkshopId, command.ContractStartGr, command.ContractEndGr)
+            .Select(x => new CheckoutLoanInstallment(x.Amount, x.Month, x.Year, x.IsActive, x.RemainingAmount, x.LoanAmount, x.Id)).ToList();
+
+        command.InstallmentDeduction = loanInstallments.Sum(x => x.AmountForMonth.MoneyToDouble());
 
 
         var totalClaimsDouble = monthlyWage + bacicYears + consumableItem + housingAllowance + marriedAllowance + command.OvertimePay +
                                 command.NightworkPay + familyAllowance + bunos + years + command.LeavePay + command.FridayPay + command.ShiftPay;
         var totalClaims = totalClaimsDouble.ToMoney();
-        var totalDeductionDouble = insuranceDeduction + command.AbsenceDeduction;
+        var totalDeductionDouble = insuranceDeduction + command.AbsenceDeduction + command.InstallmentDeduction + command.SalaryAidDeduction;
         var totalDeductions = totalDeductionDouble.ToMoney();
         var totalPayment = totalClaimsDouble - totalDeductionDouble;
 
@@ -177,14 +207,16 @@ public class CheckoutApplication : ICheckoutApplication
             {
                 command.Signature = "0";
             }
-                  
-            var checkout = new Checkout(command.EmployeeFullName, command.FathersName ,command.NationalCode
+
+
+
+            var checkout = new Checkout(command.EmployeeFullName, command.FathersName, command.NationalCode
                 , command.DateOfBirth, command.EmployeeId, command.WorkshopName, command.WorkshopId, command.ContractNo, command.ContractStartGr, command.ContractEndGr, month, year,
                 command.ContractId, command.WorkingHoursId, monthlyWage, bacicYears, consumableItem, housingAllowance
-                , command.OvertimePay, command.NightworkPay, command.FridayPay, 0, command.ShiftPay, familyAllowance, bunos, years, command.LeavePay, insuranceDeduction, 0, 0, 0, command.AbsenceDeduction, sumOfWorkingDays,
-                command.ArchiveCode, command.PersonnelCode, totalClaims, totalDeductions, totalPayment, command.Signature,marriedAllowance,command.LeaveCheckout,command.CreditLeaves,command.AbsencePeriod,command.AverageHoursPerDay,command.HasRollCall,command.OverTimeWorkValue,command.OverNightWorkValue
-                ,command.FridayWorkValue, command.RotatingShiftValue,command.AbsenceValue,command.TotalDayOfLeaveCompute,command.TotalDayOfYearsCompute,command.TotalDayOfBunosesCompute);
-            _checkoutRepository.CreateCkeckout(checkout);
+                , command.OvertimePay, command.NightworkPay, command.FridayPay, 0, command.ShiftPay, familyAllowance, bunos, years, command.LeavePay, insuranceDeduction, 0, command.InstallmentDeduction, command.SalaryAidDeduction, command.AbsenceDeduction, sumOfWorkingDays,
+                command.ArchiveCode, command.PersonnelCode, totalClaims, totalDeductions, totalPayment, command.Signature, marriedAllowance, command.LeaveCheckout, command.CreditLeaves, command.AbsencePeriod, command.AverageHoursPerDay, command.HasRollCall, command.OverTimeWorkValue, command.OverNightWorkValue
+                , command.FridayWorkValue, command.RotatingShiftValue, command.AbsenceValue, command.TotalDayOfLeaveCompute, command.TotalDayOfYearsCompute, command.TotalDayOfBunosesCompute, loanInstallments, salaryAids);
+            _checkoutRepository.CreateCkeckout(checkout).GetAwaiter().GetResult();
             //_checkoutRepository.SaveChanges();
 
             //var employeeFullName = new SqlParameter("@EmployeeFullName", SqlDbType.NVarChar, 50);
@@ -194,7 +226,7 @@ public class CheckoutApplication : ICheckoutApplication
 
         }
 
-           
+
     }
 
     public OperationResult Edit(EditCheckout command)
@@ -207,10 +239,17 @@ public class CheckoutApplication : ICheckoutApplication
         return _checkoutRepository.GetDetails(id);
     }
 
+    public async Task<CreateCheckoutListViewModel> GetContractResultToCreateCheckout(long workshopId, long employeeId, string year, string month,
+        string contractStart, string contractEnd)
+    {
+        return await _checkoutRepository.GetContractResultToCreateCheckout(workshopId, employeeId, year, month, contractStart,
+            contractEnd);
+
+    }
     public async Task<List<CheckoutViewModel>> Search(CheckoutSearchModel searchModel)
     {
         var result = new List<CheckoutViewModel>();
-        var query =await _checkoutRepository.SearchForMainCheckout(searchModel);
+        var query = await _checkoutRepository.SearchForMainCheckout(searchModel);
         query = query.Select(x => new CheckoutViewModel()
         {
             Id = x.Id,
@@ -248,7 +287,7 @@ public class CheckoutApplication : ICheckoutApplication
         //    //        .Select(x => x.EmployerId).FirstOrDefault();
         //    //var employerName = _context.Employers?.FirstOrDefault(x => x.id == employeId).FullName;
         //    // = employerName;
-                
+
         //}
 
         return query;
@@ -268,31 +307,30 @@ public class CheckoutApplication : ICheckoutApplication
             return new();
         result.ForEach(x =>
         {
-            if (x.HasRollCall)
-            {
 
-                int yearFa;
-                int monthFa;
-                try
-                {
-                    yearFa = int.Parse(oneRecord.Year);
-                    monthFa = oneRecord.Month.ToMonthByStringValue();
-                }
-                catch (Exception e)
-                {
-                    return;
-                }
-                double mandatoryHours = _mandatoryHoursApplication.GetMandatoryHoursByYearAndMonth(yearFa, monthFa);
-                int mandatoryWholeHours = (int)mandatoryHours;
-                int mandatoryMinutes = (int)((mandatoryHours - mandatoryWholeHours) * 60);
-                var totalWorking = new TimeSpan(x.MonthlyRollCall.Sum(y => y.TotalhourseSpan.Ticks));
-                var totalBreakTime = new TimeSpan(x.MonthlyRollCall.Sum(y => y.BreakTimeTimeSpan.Ticks));
-                var totalPresent = totalWorking + totalBreakTime;
-                x.TotalWorkingTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalWorking.TotalHours, totalWorking.Minutes, "-");
-                x.TotalBreakTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalBreakTime.TotalHours, totalBreakTime.Minutes, "-");
-                x.TotalPresentTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalPresent.TotalHours, totalPresent.Minutes, "-");
-                x.TotalMandatoryTimeStr = Tools.ToFarsiHoursAndMinutes(mandatoryWholeHours, mandatoryMinutes, "-");
+
+            int yearFa;
+            int monthFa;
+            try
+            {
+                yearFa = int.Parse(oneRecord.Year);
+                monthFa = oneRecord.Month.ToMonthByStringValue();
             }
+            catch (Exception e)
+            {
+                return;
+            }
+            double mandatoryHours = _mandatoryHoursApplication.GetMandatoryHoursByYearAndMonth(yearFa, monthFa);
+            int mandatoryWholeHours = (int)mandatoryHours;
+            int mandatoryMinutes = (int)((mandatoryHours - mandatoryWholeHours) * 60);
+            var totalWorking = new TimeSpan(x.MonthlyRollCall.Sum(y => y.TotalhourseSpan.Ticks));
+            var totalBreakTime = new TimeSpan(x.MonthlyRollCall.Sum(y => y.BreakTimeTimeSpan.Ticks));
+            var totalPresent = totalWorking + totalBreakTime;
+            x.TotalWorkingTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalWorking.TotalHours, totalWorking.Minutes, "-");
+            x.TotalBreakTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalBreakTime.TotalHours, totalBreakTime.Minutes, "-");
+            x.TotalPresentTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalPresent.TotalHours, totalPresent.Minutes, "-");
+            x.TotalMandatoryTimeStr = Tools.ToFarsiHoursAndMinutes(mandatoryWholeHours, mandatoryMinutes, "-");
+
         });
         return result;
     }
@@ -301,31 +339,41 @@ public class CheckoutApplication : ICheckoutApplication
     {
         var result = _checkoutRepository.PrintOne(id);
 
+        int yearFa;
+        int monthFa;
+        try
+        {
+            yearFa = int.Parse(result.Year);
+            monthFa = result.Month.ToMonthByStringValue();
+        }
+        catch (Exception e)
+        {
+            return new();
+        }
+        double mandatoryHours = _mandatoryHoursApplication.GetMandatoryHoursByYearAndMonth(yearFa, monthFa);
+        int mandatoryWholeHours = (int)mandatoryHours;
+        int mandatoryMinutes = (int)((mandatoryHours - mandatoryWholeHours) * 60);
+        TimeSpan totalWorking;
+        TimeSpan totalBreakTime;
+        TimeSpan totalPresent;
         if (result.HasRollCall)
         {
-            int yearFa;
-            int monthFa;
-            try
-            {
-                yearFa = int.Parse(result.Year);
-                monthFa = result.Month.ToMonthByStringValue();
-            }
-            catch (Exception e)
-            {
-                return new();
-            }
-            double mandatoryHours = _mandatoryHoursApplication.GetMandatoryHoursByYearAndMonth(yearFa, monthFa);
-            int mandatoryWholeHours = (int)mandatoryHours;
-            int mandatoryMinutes = (int)((mandatoryHours - mandatoryWholeHours) * 60);
-            var totalWorking = new TimeSpan(result.MonthlyRollCall.Sum(x => x.TotalhourseSpan.Ticks));
-            var totalBreakTime = new TimeSpan(result.MonthlyRollCall.Sum(x => x.BreakTimeTimeSpan.Ticks));
-            var totalPresent = totalWorking + totalBreakTime;
-
-            result.TotalWorkingTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalWorking.TotalHours, totalWorking.Minutes, "-");
-            result.TotalBreakTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalBreakTime.TotalHours, totalBreakTime.Minutes, "-");
-            result.TotalPresentTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalPresent.TotalHours, totalPresent.Minutes, "-");
-            result.TotalMandatoryTimeStr = Tools.ToFarsiHoursAndMinutes(mandatoryWholeHours, mandatoryMinutes, "-");
+            totalWorking = new TimeSpan(result.MonthlyRollCall.Sum(x => x.TotalhourseSpan.Ticks));
+            totalBreakTime = new TimeSpan(result.MonthlyRollCall.Sum(x => x.BreakTimeTimeSpan.Ticks));
+            totalPresent = totalWorking + totalBreakTime;
         }
+        else
+        {
+            totalBreakTime = new TimeSpan(result.MonthlyRollCall.Sum(x => x.BreakTimeTimeSpan.Ticks));
+            totalPresent = new TimeSpan(result.MonthlyRollCall.Sum(x => x.TotalhourseSpan.Ticks));
+            totalWorking = totalPresent - totalBreakTime;
+        }
+
+        result.TotalWorkingTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalWorking.TotalHours, totalWorking.Minutes, "-");
+        result.TotalBreakTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalBreakTime.TotalHours, totalBreakTime.Minutes, "-");
+        result.TotalPresentTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalPresent.TotalHours, totalPresent.Minutes, "-");
+        result.TotalMandatoryTimeStr = Tools.ToFarsiHoursAndMinutes(mandatoryWholeHours, mandatoryMinutes, "-");
+
         return result;
     }
 
@@ -388,7 +436,7 @@ public class CheckoutApplication : ICheckoutApplication
 
 
         _checkoutRepository.SaveChanges();
-         
+
         return opration.Succcedded();
     }
 
@@ -403,7 +451,7 @@ public class CheckoutApplication : ICheckoutApplication
         var checkout = _checkoutRepository.Get(id);
         var totalClaimsDouble = checkout.TotalClaims.MoneyToDouble();
         var totalDeductionsDouble = checkout.TotalDeductions.MoneyToDouble();
-        totalClaimsDouble = (double) (totalClaimsDouble - checkout.RewardPay);
+        totalClaimsDouble = (double)(totalClaimsDouble - checkout.RewardPay);
         totalDeductionsDouble = totalDeductionsDouble - checkout.SalaryAidDeduction;
 
         var totalClaims = totalClaimsDouble + rewardPay;

CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs

@@ -21,6 +21,10 @@ using System.Threading.Tasks;
 using System.Transactions;
 using CompanyManagment.App.Contracts.RollCall;
 using Microsoft.EntityFrameworkCore.Query;
+using Company.Domain.CheckoutAgg;
+using Company.Domain.CustomizeCheckoutAgg;
+using Company.Domain.CustomizeCheckoutTempAgg;
+using CompanyManagment.EFCore.Repository;
 
 
 namespace CompanyManagment.Application;
@@ -30,7 +34,10 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
     ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository, IEmployeeRepository employeeRepository,
     ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository,
     IRollCallEmployeeApplication rollCallEmployeeApplication,
-    IRollCallApplication rollCallAppllication)
+    IRollCallApplication rollCallAppllication,
+    ICheckoutRepository checkoutRepository,
+    ICustomizeCheckoutRepository customizeCheckoutRepository,
+    ICustomizeCheckoutTempRepository customizeCheckoutTempRepository)
     : ICustomizeWorkshopSettingsApplication
 {
     private readonly ICustomizeWorkshopSettingsRepository _customizeWorkshopSettingsRepository = customizeWorkshopSettingsRepository;
@@ -42,6 +49,9 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
     private readonly ICameraAccountApplication _cameraAccountApplication = cameraAccountApplication;
     private readonly IRollCallEmployeeApplication _rollCallEmployeeApplication = rollCallEmployeeApplication;
     private readonly IRollCallApplication _rollCallApplication = rollCallAppllication;
+    private readonly ICheckoutRepository _checkoutRepository = checkoutRepository;
+    private readonly ICustomizeCheckoutRepository _customizeCheckoutRepository = customizeCheckoutRepository;
+    private readonly ICustomizeCheckoutTempRepository _customizeCheckoutTempRepository = customizeCheckoutTempRepository;
 
     #region RollCallShifts
 
@@ -670,7 +680,8 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
         transActionScope.Complete();
         return op.Succcedded();
     }
-    public OperationResult EditSimpleRollCallGroupSetting(EditCustomizeWorkshopGroupSettings command)
+    public OperationResult EditSimpleRollCallGroupSetting(EditCustomizeWorkshopGroupSettings command,
+       List<ReCalculateRollCallValues> reCalculateCommand)
     {
         OperationResult op = new();
 
@@ -689,9 +700,11 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 
         var workshopSettings = _customizeWorkshopSettingsRepository.Get(entity.CustomizeWorkshopSettingId);
 
-        var employeeIds = command.IsShiftChanged ? entity.CustomizeWorkshopEmployeeSettingsCollection
-            .Select(x => x.id).ToList() : entity.CustomizeWorkshopEmployeeSettingsCollection.Where(x => !x.IsShiftChanged)
-            .Select(x => x.id).ToList();
+        //var employeeIds = command.IsShiftChanged ? entity.CustomizeWorkshopEmployeeSettingsCollection
+        //	.Select(x => x.id).ToList() : entity.CustomizeWorkshopEmployeeSettingsCollection.Where(x => !x.IsShiftChanged)
+        //	.Select(x => x.id).ToList();
+
+
         var groupSettingsShifts = new List<CustomizeWorkshopGroupSettingsShift>();
         ICollection<CustomizeRotatingShift> rotatingShift = [];
         bool isChanged;
@@ -708,7 +721,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
                 return new CustomizeWorkshopGroupSettingsShift(start, end, x.Placement);
 
             }).ToList();
-            ;
+
             if (groupSettingsShifts.All(x => workshopSettings.CustomizeWorkshopSettingsShifts.Any(y => x.Equals(y)))
                 && command.WorkshopShiftStatus == workshopSettings.WorkshopShiftStatus && command.FridayWork == workshopSettings.FridayWork &&
                 command.HolidayWork == workshopSettings.HolidayWork &&
@@ -782,10 +795,38 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 
         var breakTime = new BreakTime(command.BreakTime.HasBreakTimeValue, command.BreakTime.BreakTimeValue);
 
-        entity.EditSimpleAndOverwriteOnEmployee(command.Name, employeeIds, groupSettingsShifts, command.WorkshopShiftStatus,
+        var employeeSettings = entity.CustomizeWorkshopEmployeeSettingsCollection;
+
+        var employeeSettingIds = employeeSettings.Select(x => x.EmployeeId).ToList();
+
+        reCalculateCommand = reCalculateCommand.Where(x => employeeSettingIds.Contains(x.EmployeeId)).ToList();
+
+        var selectedEmployeesIds = reCalculateCommand.Select(x => x.EmployeeId).ToList();
+
+        var notSelectedEmployeeSettings = employeeSettings.Where(x => !selectedEmployeesIds.Contains(x.EmployeeId));
+
+        using var transaction = new TransactionScope();
+
+        entity.EditSimpleAndOverwriteOnEmployee(command.Name, selectedEmployeesIds, groupSettingsShifts, command.WorkshopShiftStatus,
             command.IrregularShift, breakTime, isChanged, command.FridayWork, command.HolidayWork, rotatingShift);
+        if (reCalculateCommand.Count > 0)
+        {
+            var result = _rollCallApplication.RecalculateValues(workshopSettings.WorkshopId, reCalculateCommand);
+
+            if (result.IsSuccedded == false)
+            {
+                return result;
+            }
+        }
+
+        foreach (var notSelectedEmployeeSetting in notSelectedEmployeeSettings)
+        {
+            notSelectedEmployeeSetting.UpdateIsShiftChange();
+        }
 
         _customizeWorkshopGroupSettingsRepository.SaveChanges();
+
+        transaction.Complete();
         return op.Succcedded();
     }
     public OperationResult EditSimpleRollCallEmployeeSetting(EditCustomizeEmployeeSettings command,
@@ -1552,7 +1593,40 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
     {
         return _customizeWorkshopGroupSettingsRepository.HasAnyEmployeeWithoutGroup(workshopId);
     }
+    public OperationResult<List<long>> ValidateReCalculateValueForGroupEdit(List<ReCalculateRollCallValues> commands,
+        long workshopId)
+    {
+        var operationResult = new OperationResult<List<long>>();
+        bool isSuccess = true;
+        List<long> employeeIdsHasCheckout = [];
+        foreach (var command in commands)
+        {
+            var fromDateGr = command.FromDate.ToGeorgianDateTime();
+            if (_checkoutRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractEnd))
+            {
+                isSuccess = false;
+                employeeIdsHasCheckout.Add(command.EmployeeId);
+            }
 
+            if (_customizeCheckoutRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractEnd))
+            {
+                isSuccess = false;
+                employeeIdsHasCheckout.Add(command.EmployeeId);
+            }
+
+            if (_customizeCheckoutTempRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractEnd))
+            {
+                isSuccess = false;
+                employeeIdsHasCheckout.Add(command.EmployeeId);
+            }
+        }
+
+        employeeIdsHasCheckout = employeeIdsHasCheckout.Distinct().ToList();
+        return isSuccess ?
+            operationResult.Succcedded(employeeIdsHasCheckout)
+            :
+            operationResult.Failed("پرسنل هایی دارای فیش هستند لطفا نسبت به تعیین تکلیف این ها اقدام نمایید", employeeIdsHasCheckout);
+    }
     public bool CheckEmployeeShiftHasChanged(EditCustomizeEmployeeSettings command)
     {
         return _customizeWorkshopEmployeeSettingsRepository.CheckEmployeeShiftHasChanged(command);

CompanyManagment.Application/EmployeeAplication.cs

@@ -30,6 +30,7 @@ using Company.Domain.CustomizeWorkshopGroupSettingsAgg;
 using Company.Domain.LeftWorkAgg;
 using CompanyManagment.App.Contracts.Employee.DTO;
 using Company.Domain.EmployeeAuthorizeTempAgg;
+using Company.Domain.LeftWorkInsuranceAgg;
 
 namespace CompanyManagment.Application;
 
@@ -59,8 +60,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
     private readonly IEmployeeClientTempRepository _employeeClientTempRepository;
     private readonly ICustomizeWorkshopGroupSettingsRepository _customizeWorkshopGroupSettingsRepository;
     private readonly IEmployeeAuthorizeTempRepository _employeeAuthorizeTempRepository;
+    private readonly ILeftWorkInsuranceRepository _leftWorkInsuranceRepository ;
 
-    public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context, IWorkshopRepository workShopRepository, IWebHostEnvironment webHostEnvironment, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, IRollCallEmployeeRepository rollCallEmployeeRepository, ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication, IEmployeeDocumentsApplication employeeDocumentsApplication, IEmployeeDocumentsRepository employeeDocumentsRepository, IEmployeeBankInformationApplication employeeBankInformationApplication, ILeftWorkTempRepository leftWorkTempRepository, IUidService uidService, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository, IPersonnelCodeRepository personnelCodeRepository, IEmployeeClientTempRepository employeeClientTempRepository, ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository, ILeftWorkRepository leftWorkRepository, IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository) : base(context)
+    public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context, IWorkshopRepository workShopRepository, IWebHostEnvironment webHostEnvironment, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, IRollCallEmployeeRepository rollCallEmployeeRepository, ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication, IEmployeeDocumentsApplication employeeDocumentsApplication, IEmployeeDocumentsRepository employeeDocumentsRepository, IEmployeeBankInformationApplication employeeBankInformationApplication, ILeftWorkTempRepository leftWorkTempRepository, IUidService uidService, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository, IPersonnelCodeRepository personnelCodeRepository, IEmployeeClientTempRepository employeeClientTempRepository, ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository, ILeftWorkRepository leftWorkRepository, IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository, ILeftWorkInsuranceRepository leftWorkInsuranceRepository) : base(context)
     {
         _context = context;
         _WorkShopRepository = workShopRepository;
@@ -77,6 +79,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         _employeeClientTempRepository = employeeClientTempRepository;
         _leftWorkRepository = leftWorkRepository;
         _employeeAuthorizeTempRepository = employeeAuthorizeTempRepository;
+        _leftWorkInsuranceRepository = leftWorkInsuranceRepository;
         _EmployeeRepository = employeeRepository;
     }
 
@@ -1009,7 +1012,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         var startLeftWork = command.StartLeftWork.ToGeorgianDateTime();
 
         var leftWorkViewModel = _leftWorkRepository.GetLastLeftWorkByEmployeeIdAndWorkshopId(command.WorkshopId, employee.id);
-        PersonnelCodeDomain personnelCode = null;
+       
+
+		PersonnelCodeDomain personnelCode = null;
         if (leftWorkViewModel != null)
         {
             if (leftWorkViewModel.HasLeft == false && leftWorkViewModel.LeftWorkDate > DateTime.Now)
@@ -1024,10 +1029,16 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         }
         else
         {
-            var lastPersonnelCodeByWorkshop = _personnelCodeRepository.GetLastPersonnelCodeByWorkshop(command.WorkshopId);
+	        var insuranceLeftWork =
+		        _leftWorkInsuranceRepository.GetLastLeftWorkByEmployeeIdAndWorkshopId(command.WorkshopId, employee.id);
+	        if (insuranceLeftWork == null)
+	        {
+		        var lastPersonnelCodeByWorkshop =
+			        _personnelCodeRepository.GetLastPersonnelCodeByWorkshop(command.WorkshopId);
 
-            personnelCode = new PersonnelCodeDomain(command.WorkshopId,
-                employee.id, lastPersonnelCodeByWorkshop + 1);
+		        personnelCode = new PersonnelCodeDomain(command.WorkshopId,
+			        employee.id, lastPersonnelCodeByWorkshop + 1);
+	        }
         }
 
         var leftWorkTemp = LeftWorkTemp.CreateStartWork(command.WorkshopId, employee.id, startLeftWork, command.JobId);

CompanyManagment.Application/InsuranceJobApplication.cs

@@ -19,6 +19,21 @@ public class InsuranceJobApplication: IInsuranceJobApplication
         _insuranceJobItemRepositpry = insuranceJobItemRepositpry;
     }
 
+    public List<(long id, string date)> GetOldYersInsuranceItemIds()
+    {
+        return _insuranceJobRepositpry.GetOldYersInsuranceItemIds();
+    }
+
+    public OperationResult CopyFromLastYear(CopyFromLastYearViewModel command)
+    {
+        return _insuranceJobRepositpry.CopyFromLastYear(command);
+    }
+
+    public OperationResult RecoveryOldData1403()
+    {
+        return _insuranceJobRepositpry.RecoveryOldData1403();
+    }
+
     public OperationResult Create(CreateInsuranceJob command)
     {
         var opration = new OperationResult();
@@ -32,6 +47,10 @@ public class InsuranceJobApplication: IInsuranceJobApplication
         if (_insuranceJobRepositpry.Exists(x => x.InsuranceJobTitle == command.InsuranceJobTitle))
             return opration.Failed("عنوان صنف و درجه تکراری است");
 
+   
+        if (command.InsuranceJobItemId == 0)
+            return opration.Failed("بازه را انتخاب کنید");
+
         //if (_insuranceJobRepositpry.Exists(x => x.EconomicCode == command.EconomicCode))
         //    return opration.Failed("کد اقتصادی تکراری است");
 
@@ -116,9 +135,9 @@ public class InsuranceJobApplication: IInsuranceJobApplication
             return opration.Failed("ویرایش با خطا مواجه شد.");
         }
     }
-    public EditInsuranceJob GetDetails(long id)
+    public EditInsuranceJob GetDetails(long id, string year, string month)
     {
-        return _insuranceJobRepositpry.GetDetails(id);
+        return _insuranceJobRepositpry.GetDetails(id, year,month);
     }
 
     public List<InsuranceJobViewModel> GetInsurancJob()

CompanyManagment.Application/InsuranceListApplication.cs

@@ -292,12 +292,12 @@ public class InsuranceListApplication: IInsuranceListApplication
         var consumableItems = new YearlysalaryItemViewModel();
         if (yearSalaryObj != null)
         {
-            yearlysalaryItem = _yearlySalaryItemApplication.GetItemsByYearlySalaryId(yearSalaryObj.Id)
-                .Where(x => x.ItemName == "مزد روزانه").FirstOrDefault();
-            housingAllowance = _yearlySalaryItemApplication.GetItemsByYearlySalaryId(yearSalaryObj.Id)
-                .Where(x => x.ItemName == "کمک هزینه مسکن").FirstOrDefault();
-            consumableItems = _yearlySalaryItemApplication.GetItemsByYearlySalaryId(yearSalaryObj.Id)
-                .Where(x => x.ItemName == "کمک هزینه اقلام").FirstOrDefault();
+            yearlysalaryItem = _yearlySalaryItemApplication
+                .GetItemsByYearlySalaryId(yearSalaryObj.Id).FirstOrDefault(x => x.ItemName == "مزد روزانه");
+            housingAllowance = _yearlySalaryItemApplication
+                .GetItemsByYearlySalaryId(yearSalaryObj.Id).FirstOrDefault(x => x.ItemName == "کمک هزینه مسکن");
+            consumableItems = _yearlySalaryItemApplication
+                .GetItemsByYearlySalaryId(yearSalaryObj.Id).FirstOrDefault(x => x.ItemName == "کمک هزینه اقلام");
         }
 
         foreach (var item in insuranceListDetails.EmployeeDetailsForInsuranceList)
@@ -341,6 +341,10 @@ public class InsuranceListApplication: IInsuranceListApplication
         insuranceListDetails.AllInsuredShare = insuranceListDetails.InsuredShare +
                                                insuranceListDetails.EmployerShare +
                                                insuranceListDetails.UnEmploymentInsurance;
+
+        insuranceListDetails.LeftWorkEmployees =
+            _leftWorkInsuranceRepository.GetEmployeesWithContractExitOnly(insuranceListDetails.WorkshopId);
+
         return insuranceListDetails;
     }
 
@@ -415,7 +419,7 @@ public class InsuranceListApplication: IInsuranceListApplication
             {
                 var dateOfBirth = employee.DateOfBirthGr.ToFarsi();
                 var dateOfIssue = employee.DateOfIssueGr.ToFarsi();
-                var leftDate = employee.LeftWorkDateGr != null ? employee.LeftWorkDateGr.Value.AddDays(-1) : new DateTime();
+                var leftDate = employee.LeftWorkDateGr?.AddDays(-1) ?? new DateTime();
 
                 bool isManager = employee.JobId is 10 or 16 or 17 or 18 or 3498;
 
@@ -452,9 +456,22 @@ public class InsuranceListApplication: IInsuranceListApplication
                 var leftWorkFa = workingDays.hasLeftWorkInMonth ? employee.LeftWorkDateGr.ToFarsi(): "";
                 var startWorkFa = employee.StartWorkDateGr.ToFarsi();
                 //به دست آوردن دستمزد روزانه با توجه به اینکه کارگاه مشاغل مقطوع است یا خیر
-                var dailyWage = searchModel.FixedSalary ?
-					Convert.ToDouble(GetDailyWageFixedSalary(searchModel.Year, workshopId, employee.EmployeeId, startDateGr, endDateGr, employee.JobId, searchModel.Population, searchModel.InsuranceJobId)) 
-					: ComputeDailyWage(yearlysaleries.DayliWage, employee.EmployeeId, workshopId, searchModel.Year);
+
+                double dailyWage = 0;
+                if (searchModel.FixedSalary)
+                {
+                    var res = GetDailyWageFixedSalary(searchModel.Year, workshopId, employee.EmployeeId, startDateGr,
+                        endDateGr, employee.JobId, searchModel.Population, searchModel.InsuranceJobId);
+                    dailyWage = res ?? 0;
+                      
+                }
+                else
+                {
+                    var res = ComputeDailyWage(yearlysaleries.DayliWage, employee.EmployeeId, workshopId, searchModel.Year);
+                    dailyWage = res;
+                }
+                 
+                 
                 //بدست آوردن پایه سنوات
                 var baseYears = _insuranceListRepositpry.GetEmployeeInsuranceBaseYear(employee.EmployeeId, workshopId,
                     workingDays.countWorkingDays, startDateGr, endDateGr,workingDays.startWork, workingDays.endWork, workingDays.hasLeftWorkInMonth);
@@ -511,7 +528,7 @@ public class InsuranceListApplication: IInsuranceListApplication
                     .FirstOrDefault(e => e.EmployeeId == employee.EmployeeId);
                 //مزیای عیر مشمول لیست قبل
                 var benefitsIncludedNonContinuous =
-                    employeeListData != null ? employeeListData.BenefitsIncludedNonContinuous : 0;
+                    employeeListData?.BenefitsIncludedNonContinuous ?? 0;
                 if (workshop.InsuranceCheckoutFamilyAllowance && employeeHasCheckout && !isManager)
                 {
 
@@ -619,7 +636,7 @@ public class InsuranceListApplication: IInsuranceListApplication
 
 
                 };
-	        });
+	        }).ToList();
             Console.WriteLine("New Compute : " + watch.Elapsed);
 	        watch.Stop();
 
@@ -1661,94 +1678,140 @@ public class InsuranceListApplication: IInsuranceListApplication
 
     private double? GetDailyWageFixedSalary(string year, long workshopId,long employeeId,DateTime? startDateGr, DateTime? endDateGr, long jobId, string population, long? insuranceJobId)
     {
+       
         double? result = 0;
+        string month = $"{startDateGr.ToFarsi()}".Substring(5, 2);
         //اگر مشاغل مقطوع بود و شغلش کارفرما بود 
         // در جدول لیست بیمه قبلی چک شود
-        if (jobId == 10) //کارفرما
+        try
         {
-            InsuranceListSearchModel searchModel = new InsuranceListSearchModel();
-            var workshop = _workShopRepository.GetDetails(workshopId);
-            if (workshop.FixedSalary)
-               
+            if (workshopId == 318 && year == "1403")
             {
+                double percent = 0;
+                switch (jobId)
+                {
+                    case 39:
+                        percent = 1.75;
+                        return 4180000;
+                        break;
+                    case 466:
+                        percent = 1.6;
+                        return 3822000;
+                        break;
+                    case 1192 or 398 or 8:
+                        percent = 1.5;
+                        return 3583000;
+                        break;
+                }
+
+                //var dateSaleryviewModel = new DateSalarySearchModel();
+                //dateSaleryviewModel.StartDateGr = startDateGr;
+                //dateSaleryviewModel.EndDateGr = endDateGr;
+                //var _dateSalary = _dateSalaryRepository.GetDateSalaryViewModel(dateSaleryviewModel);
+                //// && _dateSalary.Id >0
+                //if (_dateSalary != null)
+                //{
+                //    var dateSaleryItemviewModel = new DateSalaryItemSearchModel();
+                //    dateSaleryItemviewModel.DateSalaryId = _dateSalary.Id;
+                //    dateSaleryItemviewModel.Percent = percent;
+                //    var dateSalaryItem = _dateSalaryItemRepository.Search(dateSaleryItemviewModel);
+                //    if (dateSalaryItem != null)
+                //        result = dateSalaryItem[0].Salary;
+                //}
+            }
+            if (jobId == 10) //کارفرما
+            {
+                InsuranceListSearchModel searchModel = new InsuranceListSearchModel();
+                var workshop = _workShopRepository.GetDetails(workshopId);
+                if (workshop.FixedSalary)
+
+                {
                     var inJob = _insuranceJobItemRepository
-                        .GetInsuranceJobItemByInsuranceJobId((long)workshop.InsuranceJobId);
+                        .GetInsuranceJobItemByInsuranceJobId((long)workshop.InsuranceJobId,year, month);
                     if (workshop.Population == "MoreThan500")
                     {
                         var max = inJob.MaxBy(x => x.PercentageMoreThan);
-                             var dateSaleryviewModel = new DateSalarySearchModel();
-                             dateSaleryviewModel.StartDateGr = startDateGr;
-                             dateSaleryviewModel.EndDateGr = endDateGr;
-                             var _dateSalary = _dateSalaryRepository.GetDateSalaryViewModel(dateSaleryviewModel);
-                             if (_dateSalary != null)
-                             {
-                                 var dateSaleryItemviewModel = new DateSalaryItemSearchModel();
-                                 dateSaleryItemviewModel.DateSalaryId = _dateSalary.Id;
-                                 dateSaleryItemviewModel.Percent = max.PercentageMoreThan;
-                                 var dateSalaryItem = _dateSalaryItemRepository.Search(dateSaleryItemviewModel);
-                                 if (dateSalaryItem != null)
-                                     result = dateSalaryItem[0].Salary;
-                             }
+                        var dateSaleryviewModel = new DateSalarySearchModel();
+                        dateSaleryviewModel.StartDateGr = startDateGr;
+                        dateSaleryviewModel.EndDateGr = endDateGr;
+                        var _dateSalary = _dateSalaryRepository.GetDateSalaryViewModel(dateSaleryviewModel);
+                        if (_dateSalary != null)
+                        {
+                            var dateSaleryItemviewModel = new DateSalaryItemSearchModel();
+                            dateSaleryItemviewModel.DateSalaryId = _dateSalary.Id;
+                            dateSaleryItemviewModel.Percent = max.PercentageMoreThan;
+                            var dateSalaryItem = _dateSalaryItemRepository.Search(dateSaleryItemviewModel);
+                            if (dateSalaryItem != null)
+                                result = dateSalaryItem[0].Salary;
+                        }
                     }
                     else
                     {
-                            var max = inJob.MaxBy(x => x.PercentageLessThan);
-                            var dateSaleryviewModel = new DateSalarySearchModel();
-                            dateSaleryviewModel.StartDateGr = startDateGr;
-                            dateSaleryviewModel.EndDateGr = endDateGr;
-                            var _dateSalary = _dateSalaryRepository.GetDateSalaryViewModel(dateSaleryviewModel);
-                            if (_dateSalary != null)
-                            {
-                                var dateSaleryItemviewModel = new DateSalaryItemSearchModel();
-                                dateSaleryItemviewModel.DateSalaryId = _dateSalary.Id;
-                                dateSaleryItemviewModel.Percent = max.PercentageLessThan;
-                                var dateSalaryItem = _dateSalaryItemRepository.Search(dateSaleryItemviewModel);
-                                if (dateSalaryItem != null)
-                                    result = dateSalaryItem[0].Salary;
-                            }
+                        var max = inJob.MaxBy(x => x.PercentageLessThan);
+                        var dateSaleryviewModel = new DateSalarySearchModel();
+                        dateSaleryviewModel.StartDateGr = startDateGr;
+                        dateSaleryviewModel.EndDateGr = endDateGr;
+                        var _dateSalary = _dateSalaryRepository.GetDateSalaryViewModel(dateSaleryviewModel);
+                        if (_dateSalary != null)
+                        {
+                            var dateSaleryItemviewModel = new DateSalaryItemSearchModel();
+                            dateSaleryItemviewModel.DateSalaryId = _dateSalary.Id;
+                            dateSaleryItemviewModel.Percent = max.PercentageLessThan;
+                            var dateSalaryItem = _dateSalaryItemRepository.Search(dateSaleryItemviewModel);
+                            if (dateSalaryItem != null)
+                                result = dateSalaryItem[0].Salary;
+                        }
                     }
-                   
 
-                
+
+
+                }
+                //var insuransList = _insuranceListRepositpry.GetInsuranceListByWorkshopIdAndYear(workshopId, year);
+                //var employeeInsurancListData = _employeeInsurancListDataRepository.GetEmployeeInsurancListDataByEmployeeIdAndInsuranceListId(employeeId, insuransList.Id);
+                //if (employeeInsurancListData != null )
+                //{
+                //    result = employeeInsurancListData.DailyWage;
+                //}
             }
-            //var insuransList = _insuranceListRepositpry.GetInsuranceListByWorkshopIdAndYear(workshopId, year);
-            //var employeeInsurancListData = _employeeInsurancListDataRepository.GetEmployeeInsurancListDataByEmployeeIdAndInsuranceListId(employeeId, insuransList.Id);
-            //if (employeeInsurancListData != null )
-            //{
-            //    result = employeeInsurancListData.DailyWage;
-            //}
-        }
-        else
-        {
+            else
+            {
 
             var searchModel = new InsuranceJobItemSearchModel();
             searchModel.InsuranceJobId = (long)insuranceJobId;
-            var JobItem = _insuranceJobItemRepository.GetInsuranceJobItemByInsuranceJobIdForFixedSalary((long)insuranceJobId, jobId);
+            var JobItem = _insuranceJobItemRepository.GetInsuranceJobItemByInsuranceJobIdForFixedSalary((long)insuranceJobId, jobId, year, month);
 
-            if (JobItem != null && JobItem.Id != 0)
-            {
-                double percent = 0;
-                if (population == "MoreThan500")
-                    percent = JobItem.PercentageMoreThan;
-                else if (population == "LessThan500")
-                    percent = JobItem.PercentageLessThan;
-
-                var dateSaleryviewModel = new DateSalarySearchModel();
-                dateSaleryviewModel.StartDateGr = startDateGr;
-                dateSaleryviewModel.EndDateGr = endDateGr;
-                var _dateSalary = _dateSalaryRepository.GetDateSalaryViewModel(dateSaleryviewModel);
-                // && _dateSalary.Id >0
-                if (_dateSalary != null)
+                if (JobItem != null && JobItem.Id != 0)
                 {
-                    var dateSaleryItemviewModel = new DateSalaryItemSearchModel();
-                    dateSaleryItemviewModel.DateSalaryId = _dateSalary.Id;
-                    dateSaleryItemviewModel.Percent = percent;
-                    var dateSalaryItem = _dateSalaryItemRepository.Search(dateSaleryItemviewModel);
-                    if (dateSalaryItem != null)
-                        result = dateSalaryItem[0].Salary;
+                    double percent = 0;
+                    if (population == "MoreThan500")
+                        percent = JobItem.PercentageMoreThan;
+                    else if (population == "LessThan500")
+                        percent = JobItem.PercentageLessThan;
+
+                    var dateSaleryviewModel = new DateSalarySearchModel();
+                    dateSaleryviewModel.StartDateGr = startDateGr;
+                    dateSaleryviewModel.EndDateGr = endDateGr;
+                    var _dateSalary = _dateSalaryRepository.GetDateSalaryViewModel(dateSaleryviewModel);
+                    // && _dateSalary.Id >0
+                    if (_dateSalary != null)
+                    {
+                        var dateSaleryItemviewModel = new DateSalaryItemSearchModel();
+                        dateSaleryItemviewModel.DateSalaryId = _dateSalary.Id;
+                        dateSaleryItemviewModel.Percent = percent;
+                        var dateSalaryItem = _dateSalaryItemRepository.Search(dateSaleryItemviewModel);
+                        if (dateSalaryItem != null)
+                            result = dateSalaryItem[0].Salary;
+                    }
                 }
+
+              
             }
         }
+        catch (Exception)
+        {
+
+            result = 0;
+        }
         return result;
     }
 

CompanyManagment.Application/LeftWorkApplication.cs

@@ -211,6 +211,14 @@ public class LeftWorkApplication : ILeftWorkApplication
         return _leftWorkRepository.search(searchModel);
     }
 
+    public List<LeftWorkViewModel> SearchCreateContract(LeftWorkSearchModel searchModel)
+    {
+
+        return _leftWorkRepository.SearchCreateContract(searchModel);
+    }
+
+ 
+
     public async Task<List<LeftWorkViewModel>> searchAsync(LeftWorkSearchModel searchModel)
     {
         var res = search(searchModel);

CompanyManagment.Application/LoanApplication.cs

@@ -1,21 +1,15 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
-using System.Reflection.Metadata.Ecma335;
 using System.Threading.Tasks;
 using System.Transactions;
 using _0_Framework.Application;
-using Company.Domain.CheckoutAgg;
 using Company.Domain.CustomizeCheckoutAgg;
 using Company.Domain.CustomizeCheckoutTempAgg;
 using Company.Domain.LoanAgg;
 using Company.Domain.LoanAgg.Entities;
 using CompanyManagment.App.Contracts.CustomizeCheckout;
 using CompanyManagment.App.Contracts.Loan;
-using Hangfire.States;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Microsoft.Extensions.Configuration.UserSecrets;
 
 namespace CompanyManagment.Application;
 
@@ -27,14 +21,16 @@ public class LoanApplication : ILoanApplication
     private readonly ICustomizeCheckoutTempRepository _customizeCheckoutTempRepository;
     private readonly ICustomizeCheckoutApplication _customizeCheckoutApplication;
     private readonly ICustomizeCheckoutTempApplication _customizeCheckoutTempApplication;
+    private readonly ICustomizeCheckoutRepository _checkoutRepository;
 
-    public LoanApplication(ILoanRepository loanRepository, ICustomizeCheckoutRepository customizeCheckoutRepository, ICustomizeCheckoutTempRepository customizeCheckoutTempRepository, IAuthHelper authHelper, ICustomizeCheckoutApplication customizeCheckoutApplication, ICustomizeCheckoutTempApplication customizeCheckoutTempApplication)
+    public LoanApplication(ILoanRepository loanRepository, ICustomizeCheckoutRepository customizeCheckoutRepository, ICustomizeCheckoutTempRepository customizeCheckoutTempRepository, IAuthHelper authHelper, ICustomizeCheckoutApplication customizeCheckoutApplication, ICustomizeCheckoutTempApplication customizeCheckoutTempApplication, ICustomizeCheckoutRepository checkoutRepository)
     {
         _loanRepository = loanRepository;
         _customizeCheckoutRepository = customizeCheckoutRepository;
         _authHelper = authHelper;
         _customizeCheckoutApplication = customizeCheckoutApplication;
         _customizeCheckoutTempApplication = customizeCheckoutTempApplication;
+        _checkoutRepository = checkoutRepository;
         _customizeCheckoutTempRepository = customizeCheckoutTempRepository;
     }
 
@@ -90,7 +86,7 @@ public class LoanApplication : ILoanApplication
         }
         #endregion
 
-        var (userId, userType,_) = _authHelper.GetUserTypeWithId();
+        var (userId, userType, _) = _authHelper.GetUserTypeWithId();
         using var transaction = new TransactionScope();
         foreach (var employeeId in command.EmployeeIds)
         {
@@ -307,6 +303,14 @@ public class LoanApplication : ILoanApplication
             return op.Failed("این پرسنل در این تاریخ دارای فیش حقوقی است");
         }
 
+
+        if (_checkoutRepository.Exists(x =>
+                entity.EmployeeId == x.EmployeeId && x.WorkshopId == entity.WorkshopId &&
+                (x.ContractStart >= entity.StartInstallmentPayment && x.ContractStart <= lastInstallment)))
+        {
+            return op.Failed("پرسنل در بازه اقساط خود دارای فیش رسمی است");
+        }
+
         if (_customizeCheckoutTempRepository.Exists(x =>
                 entity.EmployeeId == x.EmployeeId && x.WorkshopId == entity.WorkshopId &&
                 (x.ContractStart >= entity.StartInstallmentPayment && x.ContractStart <= lastInstallment)))
@@ -325,6 +329,33 @@ public class LoanApplication : ILoanApplication
     {
         OperationResult op = new OperationResult();
         var loans = _loanRepository.GetBy(ids);
+        foreach (var entity in loans)
+        {
+            var lastInstallment = entity.LoanInstallments.MaxBy(x => x.InstallmentDate).InstallmentDate;
+
+            if (_customizeCheckoutRepository.Exists(x =>
+            entity.EmployeeId == x.EmployeeId && x.WorkshopId == entity.WorkshopId &&
+                    (x.ContractStart >= entity.StartInstallmentPayment && x.ContractStart <= lastInstallment)))
+            {
+                return op.Failed("این پرسنل در این تاریخ دارای فیش حقوقی است");
+            }
+
+
+            if (_checkoutRepository.Exists(x =>
+            entity.EmployeeId == x.EmployeeId && x.WorkshopId == entity.WorkshopId &&
+                    (x.ContractStart >= entity.StartInstallmentPayment && x.ContractStart <= lastInstallment)))
+            {
+                return op.Failed("پرسنل در بازه اقساط خود دارای فیش رسمی است");
+            }
+
+            if (_customizeCheckoutTempRepository.Exists(x =>
+            entity.EmployeeId == x.EmployeeId && x.WorkshopId == entity.WorkshopId &&
+                    (x.ContractStart >= entity.StartInstallmentPayment && x.ContractStart <= lastInstallment)))
+            {
+                return op.Failed("پرسنل در بازه اقساط خود دارای فیش غیررسمی است");
+            }
+
+        }
 
         _loanRepository.RemoveRange(loans);
         _loanRepository.SaveChanges();

CompanyManagment.Application/RollCallApplication.cs

@@ -827,7 +827,7 @@ public class RollCallApplication : IRollCallApplication
                     rollCall.SetEndDateTime(rollCall.EndDate!.Value, _rollCallDomainService);
                 }
             }
-
+            _rollCallRepository.SaveChanges();
 
             return operationResult.Succcedded();
         }

CompanyManagment.Application/RollCallEmployeeApplication.cs

@@ -17,204 +17,206 @@ namespace CompanyManagment.Application;
 
 public class RollCallEmployeeApplication : IRollCallEmployeeApplication
 {
-    private readonly IRollCallEmployeeRepository _rollCallEmployeeRepository;
-    private readonly IRollCallEmployeeStatusApplication _rollCallEmployeeStatusApplication;
-    private readonly IEmployeeRepository _employeeRepository;
-    private readonly ILeftWorkRepository _leftWorkRepository;
-    private readonly IRollCallEmployeeStatusRepository _rollCallEmployeeStatusRepository;
-    private readonly IWebHostEnvironment _webHostEnvironment;
-    public RollCallEmployeeApplication(IRollCallEmployeeRepository rollCallEmployeeRepository, IEmployeeRepository employeeRepository, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, ILeftWorkRepository leftWorkRepository, IRollCallEmployeeStatusRepository rollCallEmployeeStatusRepository, IWebHostEnvironment webHostEnvironment)
-    {
-        _rollCallEmployeeRepository = rollCallEmployeeRepository;
-        _employeeRepository = employeeRepository;
-        _rollCallEmployeeStatusApplication = rollCallEmployeeStatusApplication;
-        _leftWorkRepository = leftWorkRepository;
-        _rollCallEmployeeStatusRepository = rollCallEmployeeStatusRepository;
-        _webHostEnvironment = webHostEnvironment;
-    }
+	private readonly IRollCallEmployeeRepository _rollCallEmployeeRepository;
+	private readonly IRollCallEmployeeStatusApplication _rollCallEmployeeStatusApplication;
+	private readonly IEmployeeRepository _employeeRepository;
+	private readonly ILeftWorkRepository _leftWorkRepository;
+	private readonly IRollCallEmployeeStatusRepository _rollCallEmployeeStatusRepository;
+	private readonly IWebHostEnvironment _webHostEnvironment;
+	public RollCallEmployeeApplication(IRollCallEmployeeRepository rollCallEmployeeRepository, IEmployeeRepository employeeRepository, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, ILeftWorkRepository leftWorkRepository, IRollCallEmployeeStatusRepository rollCallEmployeeStatusRepository, IWebHostEnvironment webHostEnvironment)
+	{
+		_rollCallEmployeeRepository = rollCallEmployeeRepository;
+		_employeeRepository = employeeRepository;
+		_rollCallEmployeeStatusApplication = rollCallEmployeeStatusApplication;
+		_leftWorkRepository = leftWorkRepository;
+		_rollCallEmployeeStatusRepository = rollCallEmployeeStatusRepository;
+		_webHostEnvironment = webHostEnvironment;
+	}
 
-    public OperationResult Create(CreateRollCallEmployee command)
-    {
-        var opreation = new OperationResult();
+	public OperationResult Create(CreateRollCallEmployee command)
+	{
+		var opreation = new OperationResult();
 
-        if (_rollCallEmployeeRepository.Exists(x =>
-                x.EmployeeId == command.EmployeeId && x.WorkshopId == command.EmployeeId))
-            return opreation.Succcedded();
-        var fullname = _employeeRepository.GetDetails(command.EmployeeId);
-        if (fullname == null)
-            return opreation.Failed("پرسنل یافت نشد");
+		if (_rollCallEmployeeRepository.Exists(x =>
+				x.EmployeeId == command.EmployeeId && x.WorkshopId == command.EmployeeId))
+			return opreation.Succcedded();
+		var fullname = _employeeRepository.GetDetails(command.EmployeeId);
+		if (fullname == null)
+			return opreation.Failed("پرسنل یافت نشد");
 		var create = new RollCallEmployee(command.WorkshopId, command.EmployeeId, fullname.FName, fullname.LName);
 		_rollCallEmployeeRepository.Create(create);
 
-        if (command.HasUploadedImage == "true")
-            create.HasImage();
+		if (command.HasUploadedImage == "true")
+			create.HasImage();
 
-        _rollCallEmployeeRepository.SaveChanges();
-        return opreation.Succcedded(create.id);
+		_rollCallEmployeeRepository.SaveChanges();
+		return opreation.Succcedded(create.id);
 
-    }
+	}
 
-    public OperationResult Active(long id)
-    {
-        var opreation = new OperationResult();
+	public OperationResult Active(long id)
+	{
+		var opreation = new OperationResult();
 
-        var emp = _rollCallEmployeeRepository.Get(id);
+		var emp = _rollCallEmployeeRepository.Get(id);
 
-        if (emp == null)
-            return opreation.Failed("پرسنل یافت نشد");
+		if (emp == null)
+			return opreation.Failed("پرسنل یافت نشد");
 
-        if (!_leftWorkRepository.Exists(x => x.EmployeeId == emp.EmployeeId && x.WorkshopId == emp.WorkshopId &&
-                                             x.StartWorkDate <= DateTime.Now && x.LeftWorkDate > DateTime.Now))
-            return opreation.Failed("کارمند شروع به کار ندارد");
+		if (!_leftWorkRepository.Exists(x => x.EmployeeId == emp.EmployeeId && x.WorkshopId == emp.WorkshopId &&
+											 x.StartWorkDate <= DateTime.Now && x.LeftWorkDate > DateTime.Now))
+			return opreation.Failed("کارمند شروع به کار ندارد");
 
-        if (emp.HasUploadedImage == "false")
-            return opreation.Failed("لطفا ابتدا عکس پرسنل را آپلود کنید");
+		if (emp.HasUploadedImage == "false")
+			return opreation.Failed("لطفا ابتدا عکس پرسنل را آپلود کنید");
 
-        using var transaction = new TransactionScope();
+		using var transaction = new TransactionScope();
 
 		emp.Active();
 
-        var operation2 = _rollCallEmployeeStatusApplication.Create(new CreateRollCallEmployeeStatus() { RollCallEmployeeId = id });
-        if (operation2.IsSuccedded == false)
-	        return operation2;
-        
+		var operation2 = _rollCallEmployeeStatusApplication.Create(new CreateRollCallEmployeeStatus() { RollCallEmployeeId = id });
+		if (operation2.IsSuccedded == false)
+			return operation2;
+
 		_rollCallEmployeeRepository.SaveChanges();
 		transaction.Complete();
 
 		return operation2;
-    }
+	}
 
-    public OperationResult DeActive(long id)
-    {
-        var opreation = new OperationResult();
-        var emp = _rollCallEmployeeRepository.GetWithRollCallStatus(id);
-        if (emp == null)
-            return opreation.Failed("پرسنل یافت نشد");
-        var lastStatus = emp.EmployeesStatus.MaxBy(x => x.StartDate);
-        emp.DeActive();
-        _rollCallEmployeeRepository.SaveChanges();
-        _rollCallEmployeeStatusApplication.Deactivate(lastStatus.id);
-        return opreation.Succcedded();
-    }
+	public OperationResult DeActive(long id)
+	{
+		var opreation = new OperationResult();
+		var emp = _rollCallEmployeeRepository.GetWithRollCallStatus(id);
+		if (emp == null)
+			return opreation.Failed("پرسنل یافت نشد");
+		var lastStatus = emp.EmployeesStatus.MaxBy(x => x.StartDate);
+		emp.DeActive();
+		_rollCallEmployeeRepository.SaveChanges();
+		_rollCallEmployeeStatusApplication.Deactivate(lastStatus.id);
+		return opreation.Succcedded();
+	}
 
-    public OperationResult UploadedImage(long Employeeid, long WorkshopId)
-    {
-        var opreation = new OperationResult();
-        var emp = _rollCallEmployeeRepository.GetByEmployeeIdAndWorkshopId(Employeeid, WorkshopId);
-        if (emp == null)
-            return opreation.Failed("پرسنل یافت نشد");
+	public OperationResult UploadedImage(long Employeeid, long WorkshopId)
+	{
+		var opreation = new OperationResult();
+		var emp = _rollCallEmployeeRepository.GetByEmployeeIdAndWorkshopId(Employeeid, WorkshopId);
+		if (emp == null)
+			return opreation.Failed("پرسنل یافت نشد");
 
-        var rollCall = _rollCallEmployeeRepository.Get(emp.Id);
-        rollCall.HasImage();
-        _rollCallEmployeeRepository.SaveChanges();
-        var path = Path.Combine(_webHostEnvironment.ContentRootPath, "Faces", WorkshopId.ToString(), Employeeid.ToString());
-        var thumbnailPath = Path.Combine(path, "Thumbnail.jpg");
-        try
-        {
-            var thumbnail = Tools.ResizeImage(Path.Combine(path, "1.jpg"), 150, 150);
-            System.IO.File.WriteAllBytes(thumbnailPath, Convert.FromBase64String(thumbnail));
-        }
-        catch
-        {
-            // ignored
-        }
+		var rollCall = _rollCallEmployeeRepository.Get(emp.Id);
+		rollCall.HasImage();
+		_rollCallEmployeeRepository.SaveChanges();
+		var path = Path.Combine(_webHostEnvironment.ContentRootPath, "Faces", WorkshopId.ToString(), Employeeid.ToString());
+		var thumbnailPath = Path.Combine(path, "Thumbnail.jpg");
+		try
+		{
+			var thumbnail = Tools.ResizeImage(Path.Combine(path, "1.jpg"), 150, 150);
+			System.IO.File.WriteAllBytes(thumbnailPath, Convert.FromBase64String(thumbnail));
+		}
+		catch
+		{
+			// ignored
+		}
 
-        return opreation.Succcedded();
-    }
+		return opreation.Succcedded();
+	}
 
 
-    public List<RollCallEmployeeViewModel> GetByWorkshopId(long workshopId)
-    {
-        return _rollCallEmployeeRepository.GetByWorkshopId(workshopId);
-    }
+	public List<RollCallEmployeeViewModel> GetByWorkshopId(long workshopId)
+	{
+		return _rollCallEmployeeRepository.GetByWorkshopId(workshopId);
+	}
 
-    public EditRollCallEmployee GetDetails(long id)
-    {
-        return _rollCallEmployeeRepository.GetDetails(id);
-    }
+	public EditRollCallEmployee GetDetails(long id)
+	{
+		return _rollCallEmployeeRepository.GetDetails(id);
+	}
 
-    public RollCallEmployeeViewModel GetByEmployeeIdAndWorkshopId(long employeeId, long workshopId)
-    {
-        return _rollCallEmployeeRepository.GetByEmployeeIdAndWorkshopId(employeeId, workshopId);
-    }
+	public RollCallEmployeeViewModel GetByEmployeeIdAndWorkshopId(long employeeId, long workshopId)
+	{
+		return _rollCallEmployeeRepository.GetByEmployeeIdAndWorkshopId(employeeId, workshopId);
+	}
 
-    public List<RollCallEmployeeViewModel> GetPersonnelRollCallListPaginate(RollCallEmployeeSearchModel command)
-    {
+	public List<RollCallEmployeeViewModel> GetPersonnelRollCallListPaginate(RollCallEmployeeSearchModel command)
+	{
 		return _rollCallEmployeeRepository.GetPersonnelRollCallListPaginate(command);
 	}
 
-    public int activedPerson(long workshopId)
-    {
-        return _rollCallEmployeeRepository.activedPerson(workshopId);
-    }
+	public int activedPerson(long workshopId)
+	{
+		return _rollCallEmployeeRepository.activedPerson(workshopId);
+	}
 
-    #region Pooya
-    public List<RollCallEmployeeViewModel> GetRollCallEmployeesByWorkshopId(long workshopId)
-    {
-        return _rollCallEmployeeRepository.GetRollCallEmployeesByWorkshopId(workshopId);
-    }
-    public List<RollCallEmployeeViewModel> GetActivePersonnelByWorkshopId(long workshopId)
-    {
-        return _rollCallEmployeeRepository.GetActivePersonnelByWorkshopId(workshopId);
-    }
+	#region Pooya
+	public List<RollCallEmployeeViewModel> GetRollCallEmployeesByWorkshopId(long workshopId)
+	{
+		return _rollCallEmployeeRepository.GetRollCallEmployeesByWorkshopId(workshopId);
+	}
+	public List<RollCallEmployeeViewModel> GetActivePersonnelByWorkshopId(long workshopId)
+	{
+		return _rollCallEmployeeRepository.GetActivePersonnelByWorkshopId(workshopId);
+	}
 
 
-    public bool IsEmployeeRollCallActive(long employeeId, long workshopId)
-    {
-        RollCallEmployeeViewModel rollCallEmployee = _rollCallEmployeeRepository.GetByEmployeeIdAndWorkshopId(employeeId, workshopId);
-        if (rollCallEmployee == null || rollCallEmployee.IsActiveString != "true" || rollCallEmployee.HasUploadedImage != "true")
-            return false;
-        var now = DateTime.Now;
-        return _rollCallEmployeeStatusRepository.Exists(x => x.RollCallEmployeeId == rollCallEmployee.Id && x.StartDate < now && x.EndDate > now);
-
-       
-
-    }
-
-    public List<RollCallEmployeeViewModel> GetEmployeeRollCalls(long workshopId)
-    {
-        return _rollCallEmployeeRepository.GetEmployeeRollCalls(workshopId);
-    }
-
-    public (int activeEmployees, int deActiveEmployees) GetActiveAndDeActiveRollCallEmployees(long workshopId)
-    {
-        return _rollCallEmployeeRepository.GetActiveAndDeActiveRollCallEmployees(workshopId);
-    }
-
-    public List<RollCallEmployeeViewModel> GetPersonnelRollCallListAll(long workshopId)
-    {
-        return _rollCallEmployeeRepository.GetPersonnelRollCallListAll(workshopId);
-    }
-
-    public bool HasEmployees(long workshopId)
-    {
-        return _rollCallEmployeeRepository.HasEmployees(workshopId);
-    }
-
-    public OperationResult ChangeEmployeeRollCallName(long rollCallEmployeeId, string fName, string lName)
-    {
-        OperationResult result = new();
-        if (string.IsNullOrWhiteSpace(lName) || string.IsNullOrWhiteSpace(fName))
-            return result.Failed("نام و نام خانوادگی نمی توانند خالی باشند");
-        fName = fName.Trim();
-        lName = lName.Trim();
-        var fullName = $"{fName} {lName}";
-        var entity = _rollCallEmployeeRepository.Get(rollCallEmployeeId);
+	public bool IsEmployeeRollCallActive(long employeeId, long workshopId)
+	{
+		RollCallEmployeeViewModel rollCallEmployee = _rollCallEmployeeRepository.GetByEmployeeIdAndWorkshopId(employeeId, workshopId);
+		if (rollCallEmployee == null || rollCallEmployee.IsActiveString != "true" || rollCallEmployee.HasUploadedImage != "true")
+			return false;
+		var now = DateTime.Now;
+		return _rollCallEmployeeStatusRepository.Exists(x => x.RollCallEmployeeId == rollCallEmployee.Id && x.StartDate < now && x.EndDate > now);
 
 
-        if (entity == null)
-            return result.Failed(ApplicationMessages.RecordNotFound);
 
-        if (_rollCallEmployeeRepository.Exists(x => x.WorkshopId == entity.WorkshopId && x.EmployeeFullName == fullName && x.id != rollCallEmployeeId))
-            return result.Failed("نام و نام خانوادگی کارمند نمی تواند با نام و نام خانوادگی کارمند دیگری در آن کارگاه یکسان باشد");
+	}
 
-        if (entity.IsActiveString != "true")
-            return result.Failed("امکان تغییر نام برای کارمند غیر فعال وجود ندارد");
+	public List<RollCallEmployeeViewModel> GetEmployeeRollCalls(long workshopId)
+	{
+		return _rollCallEmployeeRepository.GetEmployeeRollCalls(workshopId);
+	}
+
+	public (int activeEmployees, int deActiveEmployees) GetActiveAndDeActiveRollCallEmployees(long workshopId)
+	{
+		return _rollCallEmployeeRepository.GetActiveAndDeActiveRollCallEmployees(workshopId);
+	}
+
+	public List<RollCallEmployeeViewModel> GetPersonnelRollCallListAll(long workshopId)
+	{
+		return _rollCallEmployeeRepository.GetPersonnelRollCallListAll(workshopId);
+	}
+
+	public bool HasEmployees(long workshopId)
+	{
+		return _rollCallEmployeeRepository.HasEmployees(workshopId);
+	}
+
+	
+
+	public OperationResult ChangeEmployeeRollCallName(long rollCallEmployeeId, string fName, string lName)
+	{
+		OperationResult result = new();
+		if (string.IsNullOrWhiteSpace(lName) || string.IsNullOrWhiteSpace(fName))
+			return result.Failed("نام و نام خانوادگی نمی توانند خالی باشند");
+		fName = fName.Trim();
+		lName = lName.Trim();
+		var fullName = $"{fName} {lName}";
+		var entity = _rollCallEmployeeRepository.Get(rollCallEmployeeId);
 
 
-        entity.ChangeName(fName, lName);
-        _rollCallEmployeeRepository.SaveChanges();
-        return result.Succcedded();
-    }
+		if (entity == null)
+			return result.Failed(ApplicationMessages.RecordNotFound);
+
+		if (_rollCallEmployeeRepository.Exists(x => x.WorkshopId == entity.WorkshopId && x.EmployeeFullName == fullName && x.id != rollCallEmployeeId))
+			return result.Failed("نام و نام خانوادگی کارمند نمی تواند با نام و نام خانوادگی کارمند دیگری در آن کارگاه یکسان باشد");
+
+		if (entity.IsActiveString != "true")
+			return result.Failed("امکان تغییر نام برای کارمند غیر فعال وجود ندارد");
+
+
+		entity.ChangeName(fName, lName);
+		_rollCallEmployeeRepository.SaveChanges();
+		return result.Succcedded();
+	}
 	#endregion
 }

CompanyManagment.Application/RollCallEmployeeStatusApplication.cs

@@ -89,60 +89,9 @@ namespace CompanyManagment.Application
 		}
 
 		public bool HasRollCallRecord(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd)
-		{
-            //موقت
-            // دادمهرگستر 11 *
-            //585 کاشی گالری سرامیس (بابک ابراهیمی ) 
-            //آموزشگاه ملل 604  *
-            //کاریابی ملل 605 *
-            //368 پیتزا امیر آماده سازی
-            //367 پیتزا امیر رستوران
-            //286 مرکز توان بخشی رسالت *
-			//610 بیمارستان پارس - رازقی طعام
-            DateTime start1404 = new DateTime(2025, 03, 21);
-            bool skipRollCallByWorkshopId = false;
-            if (contractStart < start1404)
-            {
-                skipRollCallByWorkshopId = workshopId is 11 or 585 or 604 or 605 or 368 or 367 or 286;
-            }
-            else
-            {
-                skipRollCallByWorkshopId = workshopId is  368 or 367 or 585 or 610;
-            }
-
-
-
-
-			//#if DEBUG
-			//            skipRollCallByWorkshopId = workshopId is 11 or 585 or 604 or 605 or 368 or 367;
-			//#endif
-			if (skipRollCallByWorkshopId)
-				return false;
-
-
-			// 42550 مصطفی مقدس نژاد فومنی
-			bool skipRollCallByEmployeeId = employeeId is 42550;
-			if (skipRollCallByEmployeeId)
-				return false;
-			
-            //9211 محسا تازه
-            if (employeeId == 9211 && contractStart >= start1404)
-                return false;
-
-			var service = _rollCallServiceRepository.GetAllServiceByWorkshopId(workshopId);
-
-			if (!service.Any(x => x.StartService.Date <= contractStart.Date && x.EndService.Date >= contractEnd.Date))
-				return false;
-			var rollCallEmployee =
-				_rollCallEmployeeRepository.GetByEmployeeIdAndWorkshopId(employeeId, workshopId);
-
-			if (rollCallEmployee == null)
-				return false;
-
-			return _employeeRollCallStatusRepository.Exists(x => x.RollCallEmployeeId == rollCallEmployee.Id &&
-																 x.StartDate.Date <= contractStart.Date &&
-																 x.EndDate.Date >= contractEnd.Date);
-		}
+        {
+            return _rollCallEmployeeRepository.HasRollCallRecord(employeeId, workshopId, contractStart, contractEnd);
+        }
 
 		public List<RollCallEmployeeStatusViewModel> GetActiveByWorkshopIdInDate(long workshopId, DateTime startDateGr, DateTime endDateGr)
 		{
@@ -185,5 +134,38 @@ namespace CompanyManagment.Application
         {
             return _employeeRollCallStatusRepository.GetAll();
         }
-    }
+
+        public void SyncRollCallEmployeeWithLeftWork(long rollCallEmployeeId)
+        {
+	        var rollCallEmployee = _rollCallEmployeeRepository.GetWithRollCallStatus(rollCallEmployeeId);
+	        if (rollCallEmployee == null)
+		        return;
+
+	        var rollCallStatus = rollCallEmployee.EmployeesStatus.MaxBy(x => x.StartDate);
+
+	        if (rollCallStatus == null)
+				return;
+
+			var today = DateTime.Today;
+
+	        var firstDayOfMonth = today.FindFirstDayOfMonthGr();
+
+	        
+
+	        var employeeId = rollCallEmployee.EmployeeId;
+	        var workshopId = rollCallEmployee.WorkshopId;
+
+	        var leftWork = _leftWorkRepository.GetLastLeftWorkByEmployeeIdAndWorkshopId(workshopId, employeeId);
+
+	        if (leftWork == null)
+		        return;
+
+	        var startWork = leftWork.StartWorkDate;
+
+	        rollCallStatus.Edit(startWork < firstDayOfMonth ? firstDayOfMonth : startWork, rollCallStatus.EndDate);
+
+	        _employeeRollCallStatusRepository.SaveChanges();
+
+		}
+	}
 }

CompanyManagment.Application/SalaryAidApplication.cs

@@ -27,16 +27,18 @@ public class SalaryAidApplication : ISalaryAidApplication
     private readonly IAuthHelper _authHelper;
     private readonly ICustomizeCheckoutApplication _customizeCheckoutApplication;
     private readonly ICustomizeCheckoutTempApplication _customizeCheckoutTempApplication;
+    private readonly ICheckoutRepository _checkoutRepository;
 
 
     public SalaryAidApplication(ISalaryAidRepository salaryAidRepository, ICustomizeCheckoutRepository customizeCheckoutRepository,
-        IEmployeeRepository employeeRepository, ICustomizeCheckoutTempRepository customizeCheckoutTempRepository, IAuthHelper authHelper, ICustomizeCheckoutApplication customizeCheckoutApplication, ICustomizeCheckoutTempApplication customizeCheckoutTempApplication)
+        IEmployeeRepository employeeRepository, ICustomizeCheckoutTempRepository customizeCheckoutTempRepository, IAuthHelper authHelper, ICustomizeCheckoutApplication customizeCheckoutApplication, ICustomizeCheckoutTempApplication customizeCheckoutTempApplication, ICheckoutRepository checkoutRepository)
     {
         _salaryAidRepository = salaryAidRepository;
         _customizeCheckoutRepository = customizeCheckoutRepository;
         _authHelper = authHelper;
         _customizeCheckoutApplication = customizeCheckoutApplication;
         _customizeCheckoutTempApplication = customizeCheckoutTempApplication;
+        _checkoutRepository = checkoutRepository;
         _employeeRepository = employeeRepository;
         _customizeCheckoutTempRepository = customizeCheckoutTempRepository;
     }
@@ -95,18 +97,18 @@ public class SalaryAidApplication : ISalaryAidApplication
         }
 
         var existsCheckouts = _customizeCheckoutRepository.ValidateExistsCheckouts(calculationDateGr,
-	        calculationDateGr, command.WorkshopId, command.EmployeeIds);
+            calculationDateGr, command.WorkshopId, command.EmployeeIds);
 
-        //if (existsCheckouts.Checkout)
-        //    return op.Failed("شما نمیتوانید برای پرسنلی در تاریخی که برای فیش حقوقی رسمی صادر شده است مساعده ای دهید");
+        if (existsCheckouts.Checkout)
+            return op.Failed("شما نمیتوانید برای پرسنلی در تاریخی که برای فیش حقوقی رسمی صادر شده است مساعده ای دهید");
 
 
-        var (userId, userType,_) = _authHelper.GetUserTypeWithId();
+        var (userId, userType, _) = _authHelper.GetUserTypeWithId();
         using var transaction = new TransactionScope();
         foreach (var employeeId in command.EmployeeIds)
         {
 
-            var entity = new SalaryAid(employeeId, command.WorkshopId, command.Amount.MoneyToDouble(), startDate,userId,userType,command.CalculationMonth,command.CalculationYear);
+            var entity = new SalaryAid(employeeId, command.WorkshopId, command.Amount.MoneyToDouble(), startDate, userId, userType, command.CalculationMonth, command.CalculationYear);
             _salaryAidRepository.Create(entity);
             _salaryAidRepository.SaveChanges();
             if (existsCheckouts.CustomizeCheckout)
@@ -186,7 +188,7 @@ public class SalaryAidApplication : ISalaryAidApplication
             var prevCheckouts = _customizeCheckoutRepository.ValidateExistsCheckouts(calculationDateGr,
                 oneMonthAgoGr, entity.WorkshopId, [entity.EmployeeId]);
 
-            if (prevCheckouts.CustomizeCheckout  || prevCheckouts.CustomizeCheckoutTemp)
+            if (prevCheckouts.CustomizeCheckout || prevCheckouts.CustomizeCheckoutTemp)
             {
                 return op.Failed("شما نمیتوانید در تاریخ قبل از یک ماه گذشته که فیش صادر شده باشد مساعده ای دهید");
             }
@@ -194,16 +196,16 @@ public class SalaryAidApplication : ISalaryAidApplication
 
 
         var existsCheckouts = _customizeCheckoutRepository.ValidateExistsCheckouts(calculationDateGr,
-	        calculationDateGr, entity.WorkshopId, [entity.EmployeeId]);
+            calculationDateGr, entity.WorkshopId, [entity.EmployeeId]);
 
-        //if (existsCheckouts.Checkout)
-        //    return op.Failed("شما نمیتوانید برای پرسنلی در تاریخی که برای فیش حقوقی رسمی صادر شده است مساعده ای دهید");
+        if (existsCheckouts.Checkout)
+            return op.Failed("شما نمیتوانید برای پرسنلی در تاریخی که برای فیش حقوقی رسمی صادر شده است مساعده ای دهید");
 
 
         using var transaction = new TransactionScope();
-        var (userId, userType,_) = _authHelper.GetUserTypeWithId();
+        var (userId, userType, _) = _authHelper.GetUserTypeWithId();
 
-		entity.Edit(Tools.MoneyToDouble(command.Amount),startDate,userId,userType,command.CalculationMonth,command.CalculationYear);
+        entity.Edit(Tools.MoneyToDouble(command.Amount), startDate, userId, userType, command.CalculationMonth, command.CalculationYear);
         _salaryAidRepository.SaveChanges();
 
         if (existsCheckouts.CustomizeCheckout)
@@ -270,6 +272,12 @@ public class SalaryAidApplication : ISalaryAidApplication
             return op.Failed("این پرسنل در این تاریخ دارای فیش حقوقی موقت است");
         }
 
+        if (_checkoutRepository.Exists(x => x.WorkshopId == entity.WorkshopId && entity.EmployeeId == x.EmployeeId &&
+                                            x.ContractStart <= entity.CalculationDate && x.ContractEnd >= entity.CalculationDate))
+        {
+            return op.Failed("این پرسنل در این تاریخ دارای فیش حقوقی رسمی است");
+        }
+
         _salaryAidRepository.Remove(entity);
         _salaryAidRepository.SaveChanges();
         return op.Succcedded();
@@ -325,14 +333,18 @@ public class SalaryAidApplication : ISalaryAidApplication
             }
 
             var existsCheckouts = _customizeCheckoutRepository.ValidateExistsCheckouts(calculationDateGr,
-	            calculationDateGr, command.WorkshopId, command.EmployeeIds);
+                calculationDateGr, command.WorkshopId, command.EmployeeIds);
+
+
+            if (existsCheckouts.Checkout)
+                return op.Failed("شما نمیتوانید برای پرسنلی در تاریخی که برای فیش حقوقی رسمی صادر شده است مساعده ای دهید");
 
             var month = Convert.ToInt32(command.CalculationMonth);
             var year = Convert.ToInt32(command.CalculationYear);
 
 
 
-            var (userId, userType,_) = _authHelper.GetUserTypeWithId();
+            var (userId, userType, _) = _authHelper.GetUserTypeWithId();
 
             foreach (var employeeId in command.EmployeeIds)
             {
@@ -343,8 +355,8 @@ public class SalaryAidApplication : ISalaryAidApplication
                     id = employee.id;
                 }
 
-				var entity = new SalaryAid(id, command.WorkshopId, command.Amount.MoneyToDouble(), startDate, userId, userType, command.CalculationMonth, command.CalculationYear);
-				_salaryAidRepository.Create(entity);
+                var entity = new SalaryAid(id, command.WorkshopId, command.Amount.MoneyToDouble(), startDate, userId, userType, command.CalculationMonth, command.CalculationYear);
+                _salaryAidRepository.Create(entity);
                 _salaryAidRepository.SaveChanges();
 
                 if (existsCheckouts.CustomizeCheckout)

CompanyManagment.EFCore/Mapping/CheckoutMapping.cs

@@ -1,4 +1,6 @@
-using Company.Domain.CheckoutAgg;
+using System;
+using _0_Framework.Application;
+using Company.Domain.CheckoutAgg;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
@@ -52,5 +54,24 @@ class CheckoutMapping : IEntityTypeConfiguration<Checkout>
             .WithMany(x => x.Checkouts)
             .HasForeignKey(x => x.WorkshopId);
 
+        builder.OwnsMany(x => x.LoanInstallments, installments =>
+        {
+            installments.Property(x => x.AmountForMonth).HasMaxLength(25);
+            installments.Property(x => x.IsActive).HasConversion(
+                v => v.ToString(),
+                v => (IsActive)Enum.Parse(typeof(IsActive), v)).HasMaxLength(5);
+            installments.Property(x => x.Year).HasMaxLength(4);
+            installments.Property(x => x.Month).HasMaxLength(2);
+            installments.Property(x => x.LoanRemaining).HasMaxLength(25);
+            installments.Property(x => x.LoanAmount).HasMaxLength(30);
+
+        });
+
+        builder.OwnsMany(x => x.SalaryAids, salaryAid =>
+        {
+            salaryAid.Property(x => x.SalaryAidDateTimeFa).HasMaxLength(15);
+            salaryAid.Property(x => x.Amount).HasMaxLength(25);
+            salaryAid.Property(x => x.CalculationDateTimeFa).HasMaxLength(15);
+        });
     }
 }

CompanyManagment.EFCore/Mapping/InsuranceJobeItemMapping.cs

@@ -11,6 +11,9 @@ public class InsuranceJobeItemMapping : IEntityTypeConfiguration<InsuranceJobIte
         builder.ToTable("InsuranceJobItems");
         builder.HasKey(x => x.id);
 
+        builder.Property(x => x.StartDate).IsRequired(false);
+        builder.Property(x => x.EndDate).IsRequired(false);
+
         builder.HasOne(x => x.InsuranceJob)
             .WithMany(x => x.InsuranceJobItemList)
             .HasForeignKey(x => x.InsuranceJobId);

CompanyManagment.EFCore/Migrations/20250423104557_add calculationDate to salaryAid.cs

@@ -0,0 +1,23 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addcalculationDatetosalaryAid : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+           
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+          
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/20250423111927_add calculationDate to customize checkout salaryAid.cs

@@ -0,0 +1,23 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addcalculationDatetocustomizecheckoutsalaryAid : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+           
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+           
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/20250423132557_add salaryAid and loan to checkout.cs

@@ -0,0 +1,74 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addsalaryAidandloantocheckout : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "CheckoutLoanInstallment",
+                columns: table => new
+                {
+                    Checkoutid = table.Column<long>(type: "bigint", nullable: false),
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    AmountForMonth = table.Column<string>(type: "nvarchar(25)", maxLength: 25, nullable: true),
+                    Month = table.Column<string>(type: "nvarchar(2)", maxLength: 2, nullable: true),
+                    Year = table.Column<string>(type: "nvarchar(4)", maxLength: 4, nullable: true),
+                    LoanRemaining = table.Column<string>(type: "nvarchar(25)", maxLength: 25, nullable: true),
+                    IsActive = table.Column<string>(type: "nvarchar(5)", maxLength: 5, nullable: false),
+                    LoanAmount = table.Column<string>(type: "nvarchar(30)", maxLength: 30, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CheckoutLoanInstallment", x => new { x.Checkoutid, x.Id });
+                    table.ForeignKey(
+                        name: "FK_CheckoutLoanInstallment_Checkouts_Checkoutid",
+                        column: x => x.Checkoutid,
+                        principalTable: "Checkouts",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "CheckoutSalaryAid",
+                columns: table => new
+                {
+                    Checkoutid = table.Column<long>(type: "bigint", nullable: false),
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    Amount = table.Column<string>(type: "nvarchar(25)", maxLength: 25, nullable: true),
+                    SalaryAidDateTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    SalaryAidDateTimeFa = table.Column<string>(type: "nvarchar(15)", maxLength: 15, nullable: true),
+                    CalculationDateTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CalculationDateTimeFa = table.Column<string>(type: "nvarchar(15)", maxLength: 15, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CheckoutSalaryAid", x => new { x.Checkoutid, x.Id });
+                    table.ForeignKey(
+                        name: "FK_CheckoutSalaryAid_Checkouts_Checkoutid",
+                        column: x => x.Checkoutid,
+                        principalTable: "Checkouts",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "CheckoutLoanInstallment");
+
+            migrationBuilder.DropTable(
+                name: "CheckoutSalaryAid");
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/20250512140344_add entity Id to Checkout ValueObjects.cs

@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addentityIdtoCheckoutValueObjects : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<long>(
+                name: "EntityId",
+                table: "CheckoutSalaryAid",
+                type: "bigint",
+                nullable: false,
+                defaultValue: 0L);
+
+            migrationBuilder.AddColumn<long>(
+                name: "EntityId",
+                table: "CheckoutLoanInstallment",
+                type: "bigint",
+                nullable: false,
+                defaultValue: 0L);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "EntityId",
+                table: "CheckoutSalaryAid");
+
+            migrationBuilder.DropColumn(
+                name: "EntityId",
+                table: "CheckoutLoanInstallment");
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/20250517165553_add startEndToInsuranceJobItems.cs

@@ -0,0 +1,39 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addstartEndToInsuranceJobItems : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "EndDate",
+                table: "InsuranceJobItems",
+                type: "datetime2",
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "StartDate",
+                table: "InsuranceJobItems",
+                type: "datetime2",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "EndDate",
+                table: "InsuranceJobItems");
+
+            migrationBuilder.DropColumn(
+                name: "StartDate",
+                table: "InsuranceJobItems");
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs

@@ -3249,6 +3249,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
                     b.Property<long>("InsuranceJobId")
                         .HasColumnType("bigint");
 
@@ -3264,6 +3267,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<double>("SalaryMoreThan")
                         .HasColumnType("float");
 
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime2");
+
                     b.HasKey("id");
 
                     b.HasIndex("InsuranceJobId");
@@ -6103,6 +6109,97 @@ namespace CompanyManagment.EFCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.OwnsMany("Company.Domain.CheckoutAgg.ValueObjects.CheckoutLoanInstallment", "LoanInstallments", b1 =>
+                        {
+                            b1.Property<long>("Checkoutid")
+                                .HasColumnType("bigint");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("int");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("AmountForMonth")
+                                .HasMaxLength(25)
+                                .HasColumnType("nvarchar(25)");
+
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<string>("IsActive")
+                                .IsRequired()
+                                .HasMaxLength(5)
+                                .HasColumnType("nvarchar(5)");
+
+                            b1.Property<string>("LoanAmount")
+                                .HasMaxLength(30)
+                                .HasColumnType("nvarchar(30)");
+
+                            b1.Property<string>("LoanRemaining")
+                                .HasMaxLength(25)
+                                .HasColumnType("nvarchar(25)");
+
+                            b1.Property<string>("Month")
+                                .HasMaxLength(2)
+                                .HasColumnType("nvarchar(2)");
+
+                            b1.Property<string>("Year")
+                                .HasMaxLength(4)
+                                .HasColumnType("nvarchar(4)");
+
+                            b1.HasKey("Checkoutid", "Id");
+
+                            b1.ToTable("CheckoutLoanInstallment");
+
+                            b1.WithOwner()
+                                .HasForeignKey("Checkoutid");
+                        });
+
+                    b.OwnsMany("Company.Domain.CheckoutAgg.ValueObjects.CheckoutSalaryAid", "SalaryAids", b1 =>
+                        {
+                            b1.Property<long>("Checkoutid")
+                                .HasColumnType("bigint");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("int");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("Amount")
+                                .HasMaxLength(25)
+                                .HasColumnType("nvarchar(25)");
+
+                            b1.Property<DateTime>("CalculationDateTime")
+                                .HasColumnType("datetime2");
+
+                            b1.Property<string>("CalculationDateTimeFa")
+                                .HasMaxLength(15)
+                                .HasColumnType("nvarchar(15)");
+
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<DateTime>("SalaryAidDateTime")
+                                .HasColumnType("datetime2");
+
+                            b1.Property<string>("SalaryAidDateTimeFa")
+                                .HasMaxLength(15)
+                                .HasColumnType("nvarchar(15)");
+
+                            b1.HasKey("Checkoutid", "Id");
+
+                            b1.ToTable("CheckoutSalaryAid");
+
+                            b1.WithOwner()
+                                .HasForeignKey("Checkoutid");
+                        });
+
+                    b.Navigation("LoanInstallments");
+
+                    b.Navigation("SalaryAids");
+
                     b.Navigation("Workshop");
                 });
 

CompanyManagment.EFCore/Repository/AdminMonthlyOverviewRepository.cs

@@ -10,265 +10,340 @@ using AccountMangement.Infrastructure.EFCore;
 using Company.Domain.AdminMonthlyOverviewAgg;
 using CompanyManagment.App.Contracts.AdminMonthlyOverview;
 using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
 using Microsoft.EntityFrameworkCore;
+using Tools = _0_Framework_b.Application.Tools;
 
 namespace CompanyManagment.EFCore.Repository;
 
 public class AdminMonthlyOverviewRepository : RepositoryBase<long, AdminMonthlyOverview>, IAdminMonthlyOverviewRepository
 {
-    private readonly CompanyContext _companyContext;
-    private readonly AccountContext _accountContext;
-    public AdminMonthlyOverviewRepository(CompanyContext companyContext, AccountContext accountContext) : base(companyContext)
-    {
-        _companyContext = companyContext;
-        _accountContext = accountContext;
-    }
+	private readonly CompanyContext _companyContext;
+	private readonly AccountContext _accountContext;
+	public AdminMonthlyOverviewRepository(CompanyContext companyContext, AccountContext accountContext) : base(companyContext)
+	{
+		_companyContext = companyContext;
+		_accountContext = accountContext;
+	}
 
-    public async Task<List<AdminMonthlyOverviewListViewModel>> GetWorkshopStatus(AdminMonthlyOverviewSearchModel searchModel)
-    {
-       
-        var year = searchModel.Year;
-        var month = searchModel.Month;
-        var accountId = searchModel.AdminAccountId;
-        // اگر تبدیل تاریخ به میلادی موفق نبود، لیست خالی برگردان
-        if ($"{year:0000}/{month:00}/01".TryToGeorgianDateTime(out var targetDate) == false)
-            return [];
+	public async Task<List<AdminMonthlyOverviewListViewModel>> GetWorkshopStatus(AdminMonthlyOverviewSearchModel searchModel)
+	{
 
-        // دریافت اطلاعات ادمین
-        var adminAccount = await _accountContext.Accounts.FirstOrDefaultAsync(x => x.id == searchModel.AdminAccountId);
-
-        // اگر ادمین پیدا نشد، لیست خالی برگردان
-        if (adminAccount == null)
-            return [];
-
-        // دریافت طرف حساب های معتبر برای تاریخ مورد نظر
-        var contractingPartyIds = _companyContext.InstitutionContractSet.AsNoTracking()
-            .Where(c => c.ContractStartGr <= targetDate && c.ContractEndGr >= targetDate && c.IsActiveString == "true")
-            .Select(c => c.ContractingPartyId);
-
-        // دریافت کارگاه‌های مرتبط با اکانت
-        var accountWorkshopIds = _companyContext.WorkshopAccounts
-            .AsNoTracking()
-            .Where(w => w.AccountId == accountId)
-            .Select(w => w.WorkshopId);
-
-        // دریافت کارگاه‌های مربوط به طرف حساب و اکانت
-        // Replace the selected code with the following to return a list of anonymous objects containing both workshop and contractingParty
-
-         
+		var year = searchModel.Year;
+		var month = searchModel.Month;
+		var accountId = searchModel.AdminAccountId;
+		// اگر تبدیل تاریخ به میلادی موفق نبود، لیست خالی برگردان
+		if ($"{year:0000}/{month:00}/01".TryToGeorgianDateTime(out var targetStartDate) == false)
+			return [];
+		var targetEndDate = Tools.FindeEndOfMonth(targetStartDate.ToFarsi()).ToGeorgianDateTime();
 
 
 
-        var workshopsWithContractingParty =await _companyContext.Workshops
-            .AsNoTracking()
-            .Where(w => accountWorkshopIds.Contains(w.id))
-            .Include(w => w.WorkshopEmployers)
-            .ThenInclude(we => we.Employer)
-            .ThenInclude(e => e.ContractingParty).AsSplitQuery().
-            Where(w => w.WorkshopEmployers.Any(we =>
-                we.Employer != null &&
-                contractingPartyIds.Contains(we.Employer.ContractingPartyId)))
-            .Select(w => new
-            {
-                Workshop = w,
-                ContractingParty = w.WorkshopEmployers
-                    .Where(we => we.Employer != null && contractingPartyIds.Contains(we.Employer.ContractingPartyId))
-                    .Select(we => we.Employer.ContractingParty)
-                    .FirstOrDefault()
-            })
-            .ToListAsync();
+		_ = $"{year:0000}/{month:00}/01".ToGeorgianDateTime().AddMonthsFa(1, out var nextFirstMonth);
+		var nextEndMonth = Tools.FindeEndOfMonth(nextFirstMonth.ToFarsi()).ToGeorgianDateTime();
 
-        var workshopIds = workshopsWithContractingParty.Select(x => x.Workshop.id).ToList();
 
-        // پیدا کردن کارگاه‌هایی که قبلاً برای این ماه/سال AdminMonthlyOverview دارند
-        var adminMonthlyOverviewWorkshopIds = await _companyContext.AdminMonthlyOverviews
-            .AsNoTracking()
-            .Where(x => workshopIds.Contains(x.WorkshopId) && x.Month == month && x.Year == year)
-            .Select(x => x.WorkshopId)
-            .ToListAsync();
+		// دریافت اطلاعات ادمین
+		var adminAccount = await _accountContext.Accounts.FirstOrDefaultAsync(x => x.id == searchModel.AdminAccountId);
 
-        // پیدا کردن کارگاه‌هایی که نیاز به ایجاد AdminMonthlyOverview جدید دارند
-        var notExistAdminMonthlyReviewsWorkshopIds = workshopIds
-            .Except(adminMonthlyOverviewWorkshopIds)
-            .ToList();
+		// اگر ادمین پیدا نشد، لیست خالی برگردان
+		if (adminAccount == null)
+			return [];
 
-       
-        // ایجاد رکوردهای AdminMonthlyOverview که وجود ندارند
-        if (notExistAdminMonthlyReviewsWorkshopIds.Any())
-            await CreateRangeAdminMonthlyOverview(notExistAdminMonthlyReviewsWorkshopIds, month, year);
+		// دریافت طرف حساب های معتبر برای تاریخ مورد نظر
+		var contractingPartyIds = _companyContext.InstitutionContractSet.AsNoTracking()
+			.Where(c => c.ContractStartGr <= targetEndDate && c.ContractEndGr >= targetStartDate)
+			.Select(c => c.ContractingPartyId);
 
-        // به‌روزرسانی وضعیت‌ها
-        await UpdateAdminMonthlyOverviewStatus(year, month, workshopIds);
+		// دریافت کارگاه‌های مرتبط با اکانت
 
-        if (searchModel.ActivationStatus != IsActive.None)
-        {
-            var isBlock = searchModel.ActivationStatus == IsActive.True ? "true" : "false";
-
-            workshopsWithContractingParty = workshopsWithContractingParty
-                .Where(x => x.ContractingParty?.IsBlock == isBlock).ToList();
-
-            workshopIds = workshopsWithContractingParty.Select(x => x.Workshop.id).ToList();
-        }
-
-        // دریافت همه AdminMonthlyOverview برای این کارگاه‌ها/ماه/سال
-        var adminMonthlyOverviewsQuery = _companyContext.AdminMonthlyOverviews
-            .Where(x => workshopIds.Contains(x.WorkshopId) && x.Month == month && x.Year == year);
-
-        if (searchModel.WorkshopId > 0)
-        {
-            adminMonthlyOverviewsQuery = adminMonthlyOverviewsQuery.Where(x => x.WorkshopId == searchModel.WorkshopId);
-        }
-
-        if (searchModel.EmployerId > 0)
-        {
-            var searchWorkshopId = workshopsWithContractingParty.Where(x => x.Workshop.WorkshopEmployers.Any(e => e.EmployerId == searchModel.EmployerId)).Select(x => x.Workshop.id).ToList();
-            adminMonthlyOverviewsQuery = adminMonthlyOverviewsQuery.Where(x => searchWorkshopId.Contains(x.WorkshopId));
-        }
+		var workshopAccounts = _companyContext.WorkshopAccounts
+				.AsNoTracking()
+				.Where(w => w.AccountId == accountId)
+				.Select(w => w.WorkshopId).ToList();
 
 
 
-        var adminMonthlyOverviewsList = await adminMonthlyOverviewsQuery.ToListAsync();
-        var employeeCounts = _companyContext.LeftWorkList.Where(x =>
-                x.StartWorkDate < targetDate && x.LeftWorkDate > targetDate && workshopIds.Contains(x.WorkshopId))
-            .GroupBy(x => x.WorkshopId).Select(x => new { EmployeeCounts = x.Count(), WorkshopId = x.Key }).ToList();
-
-        var adminMonthlyOverviewList = adminMonthlyOverviewsList.Select(x =>
-        {
-            var employeeCount = employeeCounts.FirstOrDefault(e => e.WorkshopId == x.WorkshopId);
-            var workshopWithContractingParty =
-                workshopsWithContractingParty.FirstOrDefault(w => w.Workshop.id == x.WorkshopId);
-
-            var workshop = workshopWithContractingParty?.Workshop;
-            var contractingParty = workshopWithContractingParty?.ContractingParty;
-            var employer = workshop?.WorkshopEmployers.FirstOrDefault()?.Employer;
-            return new AdminMonthlyOverviewListViewModel
-            {
-                WorkshopId = x.WorkshopId,
-                Status = x.Status,
-                Id = x.id,
-                WorkshopName = workshop?.WorkshopFullName ?? "",
-                WorkshopArchiveCode = workshop?.ArchiveCode ?? "",
-                Address = workshop?.Address ?? "",
-                City = workshop?.City ?? "",
-                Province = workshop?.State ?? "",
-                EmployerName = employer?.FullName ?? "",
-                EmployerPhoneNumber = employer?.Phone ?? "",
-                AdminFullName = adminAccount.Fullname,
-                EmployeeCount = employeeCount?.EmployeeCounts ?? 0,
-                AgentPhoneNumber = "",
-                IsBlock = contractingParty?.IsBlock == "true"
-            };
-        }).OrderBy(x => x.IsBlock).ToList();
-      
-
-        return adminMonthlyOverviewList;
-    }
-
-    public async Task<AdminMonthlyOverViewCounterVm> GetCounter(int year, int month, long accountId)
-    {
-        var searchModel = new AdminMonthlyOverviewSearchModel()
-        {
-            AdminAccountId = accountId,
-            Month = month,
-            Year = year
-        };
-        var list = await GetWorkshopStatus(searchModel);
-
-        var allCount = list.Count;
-        var archivedCount = list.Count(x => x.Status == AdminMonthlyOverviewStatus.Archived);
-        var createDocCount = list.Count(x => x.Status == AdminMonthlyOverviewStatus.CreateDocuments);
-        var visitCompleteCount = list.Count(x => x.Status == AdminMonthlyOverviewStatus.VisitCompleted);
-        var visitInProgressCount = list.Count(x => x.Status == AdminMonthlyOverviewStatus.VisitInProgress);
-        var visitPendingCount = list.Count(x => x.Status == AdminMonthlyOverviewStatus.VisitPending);
-
-        return new AdminMonthlyOverViewCounterVm
-        {
-            All = allCount,
-            Archived = archivedCount,
-            VisitPending = visitPendingCount,
-            VisitInProgress = visitInProgressCount,
-            VisitCompleted = visitCompleteCount,
-            CreateDocument = createDocCount
-
-        };
-
-    }
-
-    private async Task UpdateAdminMonthlyOverviewStatus(int year, int month, List<long> workshopIds)
-    {
-        var targetDate = $"{year:0000}/{month:00}/01".ToGeorgianDateTime();
-        _ = $"{year:0000}/{month:00}/01".ToGeorgianDateTime().AddMonthsFa(1, out var nextMonth);
+		var workshopsHasLeftWorkEmployees = _companyContext.LeftWorkList.Where(x =>
+			 ((x.StartWorkDate <= targetEndDate && x.LeftWorkDate.AddDays(-1) >= targetStartDate)
+			 || (x.StartWorkDate <= nextEndMonth && x.LeftWorkDate.AddDays(-1) >= nextFirstMonth)) && workshopAccounts.Contains(x.WorkshopId)).Select(x => x.WorkshopId);
 
 
-        var workingEmployeeIds = (await _companyContext.LeftWorkList.AsNoTracking()
-            .Where(x => workshopIds.Contains(x.WorkshopId) && x.StartWorkDate <= targetDate && x.LeftWorkDate >= targetDate)
-            .Select(x => new { x.WorkshopId, x.EmployeeId })
-            .ToListAsync()).Distinct();
 
-        var contractSet = (await _companyContext.Contracts.AsNoTracking()
-            .Where(x => x.ContarctStart <= nextMonth && x.ContractEnd >= nextMonth)
-            .Select(x => new { x.WorkshopIds, x.EmployeeId })
-            .ToListAsync())
-            .Select(x => (x.WorkshopIds, x.EmployeeId))
-            .ToHashSet();
 
-        var checkoutSet = (await _companyContext.CheckoutSet.AsNoTracking()
-            .Where(x => x.ContractStart <= targetDate && x.ContractEnd >= targetDate)
-            .Select(x => new { x.WorkshopId, x.EmployeeId })
-            .ToListAsync())
-            .Select(x => (x.WorkshopId, x.EmployeeId))
-            .ToHashSet();
+		// دریافت کارگاه‌های مربوط به طرف حساب و اکانت
+		// Replace the selected code with the following to return a list of anonymous objects containing both workshop and contractingParty
+		var workshopsWithContractingParty = await _companyContext.Workshops
+			.AsNoTracking()
+			.Where(w => workshopsHasLeftWorkEmployees.Contains(w.id) && w.IsActive)
+			.Include(w => w.WorkshopEmployers)
+			.ThenInclude(we => we.Employer)
+			.ThenInclude(e => e.ContractingParty).AsSplitQuery().
+			Where(w => w.WorkshopEmployers.Any(we =>
+				we.Employer != null &&
+				contractingPartyIds.Contains(we.Employer.ContractingPartyId)))
+			.Select(w => new
+			{
+				Workshop = w,
+				ContractingParty = w.WorkshopEmployers
+					.Where(we => we.Employer != null && contractingPartyIds.Contains(we.Employer.ContractingPartyId))
+					.Select(we => we.Employer.ContractingParty)
+					.FirstOrDefault()
+			})
+			.ToListAsync();
 
-        var grouped = workingEmployeeIds.GroupBy(x => x.WorkshopId).ToList();
 
-        var workshopsWithFullContracts = grouped
-            .Where(g => g.All(emp => contractSet.Contains((emp.WorkshopId, emp.EmployeeId))))
-            .Select(g => g.Key)
-            .ToList();
+		var workshopIds = workshopsWithContractingParty.Select(x => x.Workshop.id).ToList();
 
-        var workshopsWithFullCheckout = grouped
-            .Where(g => g.All(emp => checkoutSet.Contains((emp.WorkshopId, emp.EmployeeId))))
-            .Select(g => g.Key)
-            .ToList();
 
-        var fullyCoveredWorkshops = workshopsWithFullContracts.Intersect(workshopsWithFullCheckout).ToList();
+		// پیدا کردن کارگاه‌هایی که قبلاً برای این ماه/سال AdminMonthlyOverview دارند
+		var adminMonthlyOverviewWorkshopIds = await _companyContext.AdminMonthlyOverviews
+			.AsNoTracking()
+			.Where(x => workshopIds.Contains(x.WorkshopId) && x.Month == month && x.Year == year)
+			.Select(x => x.WorkshopId)
+			.ToListAsync();
 
-        var notFullyCoveredWorkshops = grouped
-            .Where(g => g.Any(emp =>
-                !contractSet.Contains((emp.WorkshopId, emp.EmployeeId)) ||
-                !checkoutSet.Contains((emp.WorkshopId, emp.EmployeeId))))
-            .Select(g => g.Key)
-            .ToList();
+		// پیدا کردن کارگاه‌هایی که نیاز به ایجاد AdminMonthlyOverview جدید دارند
+		var notExistAdminMonthlyReviewsWorkshopIds = workshopIds
+			.Except(adminMonthlyOverviewWorkshopIds)
+			.ToList();
 
-        var adminMonthlyOverviews = _companyContext.AdminMonthlyOverviews
-            .Where(x => x.Month == month && x.Year == year);
 
-        var adminMonthlyOverviewsWithFullContracts = await adminMonthlyOverviews
-            .Where(x => fullyCoveredWorkshops.Contains(x.WorkshopId) && x.Status == AdminMonthlyOverviewStatus.CreateDocuments)
-            .ToListAsync();
 
-        var adminMonthlyOverviewsWithNotFullContracts = await adminMonthlyOverviews
-            .Where(x => notFullyCoveredWorkshops.Contains(x.WorkshopId) && x.Status != AdminMonthlyOverviewStatus.CreateDocuments)
-            .ToListAsync();
+		// ایجاد رکوردهای AdminMonthlyOverview که وجود ندارند
+		if (notExistAdminMonthlyReviewsWorkshopIds.Any())
+			await CreateRangeAdminMonthlyOverview(notExistAdminMonthlyReviewsWorkshopIds, month, year);
 
-        foreach (var adminMonthlyOverview in adminMonthlyOverviewsWithFullContracts)
-            adminMonthlyOverview.SetStatus(AdminMonthlyOverviewStatus.VisitPending);
+		// به‌روزرسانی وضعیت‌ها
+		await UpdateAdminMonthlyOverviewStatus(year, month, workshopIds, targetStartDate,targetEndDate, nextFirstMonth,nextEndMonth);
 
-        foreach (var adminMonthlyOverview in adminMonthlyOverviewsWithNotFullContracts)
-            adminMonthlyOverview.SetStatus(AdminMonthlyOverviewStatus.CreateDocuments);
+		if (searchModel.ActivationStatus != IsActive.None)
+		{
+			var isBlock = searchModel.ActivationStatus == IsActive.True ? "false" : "true";
 
-        await _companyContext.SaveChangesAsync();
-    }
+			workshopsWithContractingParty = workshopsWithContractingParty
+				.Where(x => x.ContractingParty?.IsBlock == isBlock).ToList();
 
-    private async Task CreateRangeAdminMonthlyOverview(List<long> workshopIds, int month, int year)
-    {
-        foreach (var workshopId in workshopIds)
-        {
-            var adminMonthlyOverview =
-                new AdminMonthlyOverview(workshopId, month, year, AdminMonthlyOverviewStatus.CreateDocuments);
-            await _companyContext.AddAsync(adminMonthlyOverview);
-        }
+			workshopIds = workshopsWithContractingParty.Select(x => x.Workshop.id).ToList();
+		}
 
-        await _companyContext.SaveChangesAsync();
-    }
+		// دریافت همه AdminMonthlyOverview برای این کارگاه‌ها/ماه/سال
+		var adminMonthlyOverviewsQuery = _companyContext.AdminMonthlyOverviews
+			.Where(x => workshopIds.Contains(x.WorkshopId) && x.Month == month && x.Year == year);
+
+		if (searchModel.WorkshopId > 0)
+		{
+			adminMonthlyOverviewsQuery = adminMonthlyOverviewsQuery.Where(x => x.WorkshopId == searchModel.WorkshopId);
+		}
+
+		if (searchModel.EmployerId > 0)
+		{
+			var searchWorkshopId = workshopsWithContractingParty.Where(x => x.Workshop.WorkshopEmployers.Any(e => e.EmployerId == searchModel.EmployerId)).Select(x => x.Workshop.id).ToList();
+			adminMonthlyOverviewsQuery = adminMonthlyOverviewsQuery.Where(x => searchWorkshopId.Contains(x.WorkshopId));
+		}
+
+		var employeeCheckoutCounts = _companyContext.LeftWorkList.Where(x =>
+				x.StartWorkDate <= targetStartDate && x.LeftWorkDate.AddDays(-1) >= targetStartDate && workshopIds.Contains(x.WorkshopId))
+			.GroupBy(x => x.WorkshopId).Select(x => new { EmployeeCounts = x.Count(), WorkshopId = x.Key }).ToList();
+
+		var employeeContractCounts = _companyContext.LeftWorkList.Where(x =>
+				x.StartWorkDate <= nextFirstMonth && x.LeftWorkDate.AddDays(-1) >= nextFirstMonth && workshopIds.Contains(x.WorkshopId))
+			.GroupBy(x => x.WorkshopId).Select(x => new { EmployeeCounts = x.Count(), WorkshopId = x.Key }).ToList();
+
+		var adminMonthlyOverviewsList = await adminMonthlyOverviewsQuery.ToListAsync();
+
+		var now = DateTime.Today;
+		//پرسنل ادمین اجرایی
+		var operatorAdminAccounts = _accountContext.AccountLeftWorks
+			.Where(x => workshopIds.Contains(x.WorkshopId) && x.StartWorkGr <= now && x.LeftWorkGr >= now &&
+						x.RoleId == 5).Select(x => new { x.WorkshopId, x.AccountId })
+			.Join(_accountContext.Accounts,
+				x => x.AccountId,
+				account => account.id, (x, account) => new
+				{
+					x.WorkshopId,
+					account.Fullname
+				}).ToList();
+
+
+
+
+
+
+		var adminMonthlyOverviewList = adminMonthlyOverviewsList.Select(x =>
+		{
+			var employeeCheckoutCount = employeeCheckoutCounts.FirstOrDefault(e => e.WorkshopId == x.WorkshopId);
+			var employeeContractCount = employeeContractCounts.FirstOrDefault(e => e.WorkshopId == x.WorkshopId);
+			var workshopWithContractingParty =
+				workshopsWithContractingParty.FirstOrDefault(w => w.Workshop.id == x.WorkshopId);
+
+			var operatorAccount = operatorAdminAccounts.FirstOrDefault(o => o.WorkshopId == x.WorkshopId);
+
+			var workshop = workshopWithContractingParty?.Workshop;
+			var contractingParty = workshopWithContractingParty?.ContractingParty;
+			var employer = workshop?.WorkshopEmployers.FirstOrDefault()?.Employer;
+			return new AdminMonthlyOverviewListViewModel
+			{
+				WorkshopId = x.WorkshopId,
+				Status = x.Status,
+				Id = x.id,
+				WorkshopName = workshop?.WorkshopFullName ?? "",
+				WorkshopArchiveCode = workshop?.ArchiveCode ?? "",
+				WorkshopArchiveCodeInt = workshop?.ArchiveCode.ExtractIntNumbers() ?? 0,
+				Address = workshop?.Address ?? "",
+				City = workshop?.City ?? "",
+				Province = workshop?.State ?? "",
+				EmployerName = employer?.FullName ?? "",
+				EmployerPhoneNumber = employer?.Phone ?? "",
+				AdminFullName = operatorAccount?.Fullname ?? "",
+				CheckoutEmployeeCount = employeeCheckoutCount?.EmployeeCounts ?? 0,
+				ContractEmployeeCount = employeeContractCount?.EmployeeCounts ?? 0,
+				AgentPhoneNumber = "",
+				IsBlock = contractingParty?.IsBlock == "true"
+			};
+		}).OrderBy(x => x.IsBlock).ThenBy(x => x.WorkshopArchiveCodeInt).ToList();
+
+
+		return adminMonthlyOverviewList;
+	}
+
+	public async Task<AdminMonthlyOverViewCounterVm> GetCounter(int year, int month, long accountId)
+	{
+		var searchModel = new AdminMonthlyOverviewSearchModel()
+		{
+			AdminAccountId = accountId,
+			Month = month,
+			Year = year
+		};
+		var list = await GetWorkshopStatus(searchModel);
+
+		var allCount = list.Count;
+		var archivedCount = list.Count(x => x.Status == AdminMonthlyOverviewStatus.Archived);
+		var createDocCount = list.Count(x => x.Status == AdminMonthlyOverviewStatus.CreateDocuments);
+		var visitCompleteCount = list.Count(x => x.Status == AdminMonthlyOverviewStatus.VisitCompleted);
+		var visitInProgressCount = list.Count(x => x.Status == AdminMonthlyOverviewStatus.VisitInProgress);
+		var visitPendingCount = list.Count(x => x.Status == AdminMonthlyOverviewStatus.VisitPending);
+
+		return new AdminMonthlyOverViewCounterVm
+		{
+			All = allCount,
+			Archived = archivedCount,
+			VisitPending = visitPendingCount,
+			VisitInProgress = visitInProgressCount,
+			VisitCompleted = visitCompleteCount,
+			CreateDocument = createDocCount
+
+		};
+
+	}
+
+	private async Task UpdateAdminMonthlyOverviewStatus(int year, int month, List<long> workshopIds, DateTime targetStartDate,DateTime targetEndDate, DateTime nextStartMonth,DateTime nextEndMonth)
+	{
+		var vipGroup = _companyContext.CustomizeWorkshopEmployeeSettings.Where(x => x.CustomizeWorkshopGroupSettingId == 117)
+			.Select(x => x.EmployeeId)
+			.Except([5976]).ToList();
+
+		var workingCheckoutEmployeeIds = _companyContext.LeftWorkList.AsNoTracking()
+			.Join(
+				_companyContext.Contracts.AsNoTracking(),
+				leftWork => new { leftWork.EmployeeId, WorkshopId = leftWork.WorkshopId },
+				contract => new { contract.EmployeeId, WorkshopId = contract.WorkshopIds },
+				(leftWork, contract) => new { leftWork, contract }
+			)
+			.Where(x =>
+				workshopIds.Contains(x.leftWork.WorkshopId) &&
+				x.leftWork.StartWorkDate <= targetEndDate &&
+				x.leftWork.LeftWorkDate.AddDays(-1) >= targetStartDate &&
+				x.contract.ContarctStart <= targetEndDate &&
+				x.contract.ContractEnd >= targetStartDate &&
+				!vipGroup.Contains(x.leftWork.EmployeeId) &&
+				!_companyContext.EmployeeClientTemps
+					.Any(temp => temp.EmployeeId == x.leftWork.EmployeeId && temp.WorkshopId == x.leftWork.WorkshopId)
+			)
+			.Select(x => new { x.leftWork.WorkshopId, x.leftWork.EmployeeId });
+
+		var workingContractEmployeeIds = _companyContext.LeftWorkList.AsNoTracking()
+			.Where(x => workshopIds.Contains(x.WorkshopId) && x.StartWorkDate <= nextEndMonth && x.LeftWorkDate.AddDays(-1) >= nextStartMonth &&
+						!vipGroup.Contains(x.EmployeeId) &&
+						!_companyContext.EmployeeClientTemps
+							.Any(temp => temp.EmployeeId == x.EmployeeId && temp.WorkshopId == x.WorkshopId)
+			).Select(x => new { x.WorkshopId, x.EmployeeId });
+
+		var contractSet = (await _companyContext.Contracts.AsNoTracking()
+			.Where(x => x.ContarctStart <= nextEndMonth && x.ContractEnd >= nextStartMonth && workshopIds.Contains(x.WorkshopIds))
+			.Select(x => new { x.WorkshopIds, x.EmployeeId })
+			.ToListAsync())
+			.Select(x => (x.WorkshopIds, x.EmployeeId))
+			.ToHashSet();
+
+		var checkoutSet = (await _companyContext.CheckoutSet.AsNoTracking()
+			.Where(x => x.ContractStart <= targetEndDate && x.ContractEnd >= targetStartDate && workshopIds.Contains(x.WorkshopId))
+			.Select(x => new { x.WorkshopId, x.EmployeeId })
+			.ToListAsync())
+			.Select(x => (x.WorkshopId, x.EmployeeId))
+			.ToHashSet();
+
+		var workingCheckoutGrouping = workingCheckoutEmployeeIds.GroupBy(x => x.WorkshopId).ToList();
+
+		var workingContractGrouping = workingContractEmployeeIds.GroupBy(x => x.WorkshopId).Select(x => new
+		{
+			WorkshopId = x.Key,
+			Data = x.ToList()
+		}).ToList();
+
+		var workshopsWithFullContracts = workingContractGrouping
+			.Where(g => g.Data.All(emp => contractSet.Contains((emp.WorkshopId, emp.EmployeeId))))
+			.Select(g => g.WorkshopId)
+			.ToList();
+
+		var list = workingContractEmployeeIds.ToList().Where(x=>!contractSet.Any(a=>a.EmployeeId== x.EmployeeId&&a.WorkshopIds == x.WorkshopId)).ToList();
+
+		var workshopsWithFullCheckout = workingCheckoutGrouping
+			.Where(g => g.All(emp => checkoutSet.Contains((emp.WorkshopId, emp.EmployeeId))))
+			.Select(g => g.Key)
+			.ToList();
+
+
+		var fullyCoveredWorkshops = workshopsWithFullContracts.Intersect(workshopsWithFullCheckout).ToList();
+
+		//var notFullyCoveredWorkshops = groupedCheckout
+		//    .Where(g => g.Any(emp =>
+		//        !contractSet.Contains((emp.WorkshopId, emp.EmployeeId)) ||
+		//        !checkoutSet.Contains((emp.WorkshopId, emp.EmployeeId))))
+		//    .Select(g => g.Key)
+		//    .ToList();
+
+		var notFullyCoveredWorkshops = workshopIds.Except(fullyCoveredWorkshops);
+
+		var adminMonthlyOverviews = _companyContext.AdminMonthlyOverviews
+			.Where(x => x.Month == month && x.Year == year);
+
+		var adminMonthlyOverviewsWithFullContracts = await adminMonthlyOverviews
+			.Where(x => fullyCoveredWorkshops.Contains(x.WorkshopId) && x.Status == AdminMonthlyOverviewStatus.CreateDocuments)
+			.ToListAsync();
+
+		var adminMonthlyOverviewsWithNotFullContracts = await adminMonthlyOverviews
+			.Where(x => notFullyCoveredWorkshops.Contains(x.WorkshopId) && x.Status != AdminMonthlyOverviewStatus.CreateDocuments)
+			.ToListAsync();
+
+		foreach (var adminMonthlyOverview in adminMonthlyOverviewsWithFullContracts)
+			adminMonthlyOverview.SetStatus(AdminMonthlyOverviewStatus.VisitPending);
+
+		foreach (var adminMonthlyOverview in adminMonthlyOverviewsWithNotFullContracts)
+			adminMonthlyOverview.SetStatus(AdminMonthlyOverviewStatus.CreateDocuments);
+
+		await _companyContext.SaveChangesAsync();
+	}
+
+	private async Task CreateRangeAdminMonthlyOverview(List<long> workshopIds, int month, int year)
+	{
+		foreach (var workshopId in workshopIds)
+		{
+			var adminMonthlyOverview =
+				new AdminMonthlyOverview(workshopId, month, year, AdminMonthlyOverviewStatus.CreateDocuments);
+			await _companyContext.AddAsync(adminMonthlyOverview);
+		}
+
+		await _companyContext.SaveChangesAsync();
+	}
 }

CompanyManagment.EFCore/Repository/CustomizeCheckoutRepository.cs

@@ -395,7 +395,7 @@ namespace CompanyManagment.EFCore.Repository
             }
 
 
-            if (searchModel.Year > 0 && searchModel.Month > 0 && searchModel.Month < 12)
+            if (searchModel.Year > 0 && searchModel.Month > 0 && searchModel.Month < 13)
             {
                 var queryStartDate = $"{searchModel.Year:0000}/{searchModel.Month:00}/01".ToGeorgianDateTime();
                 queryStartDate.FindFirstDayOfNextMonth(out var queryEndDate);

CompanyManagment.EFCore/Repository/CustomizeWorkshopEmployeeSettingsRepository.cs

@@ -196,6 +196,11 @@ public class CustomizeWorkshopEmployeeSettingsRepository(CompanyContext companyC
             return true;
         }
 
+        if (command.BreakTime.BreakTimeValue != employeeSettings.BreakTime.BreakTimeValue || command.BreakTime.HasBreakTimeValue != employeeSettings.BreakTime.HasBreakTimeValue)
+        {
+            return true;
+        }
+
         switch (employeeSettings.WorkshopShiftStatus)
         {
             case WorkshopShiftStatus.Irregular:

CompanyManagment.EFCore/Repository/DateSalaryRepository.cs

@@ -43,6 +43,9 @@ public class DateSalaryRepository : RepositoryBase<long, DateSalary>, IDateSalar
             Year = x.Year,
             StartDateFa = x.StartDateFa,
             EndDateFa = x.EndDateFa,
+            StartDateGr = x.StartDateGr,
+            EndDateGr = x.EndDateGr
+            
         });
         var list = query.OrderByDescending(x => x.Id).ToList();
 
@@ -51,7 +54,7 @@ public class DateSalaryRepository : RepositoryBase<long, DateSalary>, IDateSalar
 
         if (!string.IsNullOrWhiteSpace(searchModel.Month))
             list = list.Where(x => x.Year == searchModel.Month).OrderByDescending(x => x.Year).ToList();
-        return list;
+        return list.OrderByDescending(x=>x.StartDateGr).ToList();
     }
     public DateSalaryViewModel GetDateSalaryViewModel(DateSalarySearchModel searchModel)
     {
@@ -106,7 +109,7 @@ public class DateSalaryRepository : RepositoryBase<long, DateSalary>, IDateSalar
                 var dateSalary = Get(command.Id);
                 dateSalary.Edit(command.StartDateFa, command.EndDateFa);
                 SaveChanges();
-                command.DateSalaryItems = command.DateSalaryItems.Where(x => x.Salary > 0).ToList();
+                //command.DateSalaryItems = command.DateSalaryItems.Where(x => x.Salary > 0).ToList();
                 foreach (var item in command.DateSalaryItems)
                 {
                     if (item.Id == 0)

CompanyManagment.EFCore/Repository/EmployeeDocumentsRepository.cs

@@ -1173,7 +1173,17 @@ public class EmployeeDocumentsRepository : RepositoryBase<long, EmployeeDocument
                     //RequiredDocuments = requiredDocs
                 };
             }).ToList();
-
+        result.ForEach(x =>
+        {
+            x.EmployeePicture.PicturePath = GetThumbnailPathFromFilePath(x.EmployeePicture.PicturePath);
+            x.IdCardPage1.PicturePath = GetThumbnailPathFromFilePath(x.IdCardPage1.PicturePath);
+            x.IdCardPage2.PicturePath = GetThumbnailPathFromFilePath(x.IdCardPage2.PicturePath);
+            x.IdCardPage3.PicturePath = GetThumbnailPathFromFilePath(x.IdCardPage3.PicturePath);
+            x.IdCardPage4.PicturePath = GetThumbnailPathFromFilePath(x.IdCardPage4.PicturePath);
+            x.NationalCardFront.PicturePath = GetThumbnailPathFromFilePath(x.NationalCardFront.PicturePath);
+            x.NationalCardRear.PicturePath = GetThumbnailPathFromFilePath(x.NationalCardRear.PicturePath);
+            x.MilitaryServiceCard.PicturePath = GetThumbnailPathFromFilePath(x.MilitaryServiceCard.PicturePath);
+		});
         return result;
 
     }
@@ -1194,7 +1204,7 @@ public class EmployeeDocumentsRepository : RepositoryBase<long, EmployeeDocument
             .GroupBy(x => x.WorkshopId).Select(x => new WorkshopWithEmployeeDocumentsViewModel()
             {
                 WorkshopId = x.Key,
-                WorkshopFullName = x.FirstOrDefault().Workshop.WorkshopName,
+                WorkshopFullName = x.FirstOrDefault().Workshop.WorkshopFullName,
                 EmployeesWithoutDocumentCount = x.Count()
             });
 
@@ -1301,7 +1311,19 @@ public class EmployeeDocumentsRepository : RepositoryBase<long, EmployeeDocument
                 };
             }).ToList();
 
-        return result;
+        result.ForEach(x =>
+        {
+	        x.EmployeePicture.PicturePath = GetThumbnailPathFromFilePath(x.EmployeePicture.PicturePath);
+	        x.IdCardPage1.PicturePath = GetThumbnailPathFromFilePath(x.IdCardPage1.PicturePath);
+	        x.IdCardPage2.PicturePath = GetThumbnailPathFromFilePath(x.IdCardPage2.PicturePath);
+	        x.IdCardPage3.PicturePath = GetThumbnailPathFromFilePath(x.IdCardPage3.PicturePath);
+	        x.IdCardPage4.PicturePath = GetThumbnailPathFromFilePath(x.IdCardPage4.PicturePath);
+	        x.NationalCardFront.PicturePath = GetThumbnailPathFromFilePath(x.NationalCardFront.PicturePath);
+	        x.NationalCardRear.PicturePath = GetThumbnailPathFromFilePath(x.NationalCardRear.PicturePath);
+	        x.MilitaryServiceCard.PicturePath = GetThumbnailPathFromFilePath(x.MilitaryServiceCard.PicturePath);
+        });
+
+		return result;
     }
 
     public async Task<List<WorkshopWithEmployeeDocumentsViewModel>> GetClientRejectedDocumentWorkshopsForAdmin(List<long> workshops, long roleId)
@@ -1463,9 +1485,19 @@ public class EmployeeDocumentsRepository : RepositoryBase<long, EmployeeDocument
                     //RequiredDocuments = requiredDocs
                 };
             }).ToList();
+        result.ForEach(x =>
+        {
+	        x.EmployeePicture.PicturePath = GetThumbnailPathFromFilePath(x.EmployeePicture.PicturePath);
+	        x.IdCardPage1.PicturePath = GetThumbnailPathFromFilePath(x.IdCardPage1.PicturePath);
+	        x.IdCardPage2.PicturePath = GetThumbnailPathFromFilePath(x.IdCardPage2.PicturePath);
+	        x.IdCardPage3.PicturePath = GetThumbnailPathFromFilePath(x.IdCardPage3.PicturePath);
+	        x.IdCardPage4.PicturePath = GetThumbnailPathFromFilePath(x.IdCardPage4.PicturePath);
+	        x.NationalCardFront.PicturePath = GetThumbnailPathFromFilePath(x.NationalCardFront.PicturePath);
+	        x.NationalCardRear.PicturePath = GetThumbnailPathFromFilePath(x.NationalCardRear.PicturePath);
+	        x.MilitaryServiceCard.PicturePath = GetThumbnailPathFromFilePath(x.MilitaryServiceCard.PicturePath);
+        });
 
-
-        return result;
+		return result;
     }
 
     public async Task<List<EmployeeDocumentsViewModel>> GetClientRejectedDocumentForClient(long workshopId, long accountId)
@@ -1568,8 +1600,18 @@ public class EmployeeDocumentsRepository : RepositoryBase<long, EmployeeDocument
                     //RequiredDocuments = requiredDocs
                 };
             }).ToList();
-
-        return result;
+        result.ForEach(x =>
+        {
+	        x.EmployeePicture.PicturePath = GetThumbnailPathFromFilePath(x.EmployeePicture.PicturePath);
+	        x.IdCardPage1.PicturePath = GetThumbnailPathFromFilePath(x.IdCardPage1.PicturePath);
+	        x.IdCardPage2.PicturePath = GetThumbnailPathFromFilePath(x.IdCardPage2.PicturePath);
+	        x.IdCardPage3.PicturePath = GetThumbnailPathFromFilePath(x.IdCardPage3.PicturePath);
+	        x.IdCardPage4.PicturePath = GetThumbnailPathFromFilePath(x.IdCardPage4.PicturePath);
+	        x.NationalCardFront.PicturePath = GetThumbnailPathFromFilePath(x.NationalCardFront.PicturePath);
+	        x.NationalCardRear.PicturePath = GetThumbnailPathFromFilePath(x.NationalCardRear.PicturePath);
+	        x.MilitaryServiceCard.PicturePath = GetThumbnailPathFromFilePath(x.MilitaryServiceCard.PicturePath);
+        });
+		return result;
     }
 
     //ToDo آپلود مدارک و افزودن پرسنل
@@ -1646,8 +1688,12 @@ public class EmployeeDocumentsRepository : RepositoryBase<long, EmployeeDocument
         };
     }
 
+    private static string GetThumbnailPathFromFilePath(string filePath)
+    {
+	    return string.IsNullOrWhiteSpace(filePath) ? string.Empty : Path.Combine(Path.GetDirectoryName(filePath)!, Path.GetFileNameWithoutExtension(filePath) + $"-thumbnail{Path.GetExtension(filePath)}");
+    }
 
-    private static EmployeeDocumentItemViewModel GetByLabelAndLoadMedia(List<EmployeeDocumentItemViewModel> items,
+	private static EmployeeDocumentItemViewModel GetByLabelAndLoadMedia(List<EmployeeDocumentItemViewModel> items,
         List<MediaViewModel> medias, DocumentItemLabel label)
     {
         if (items == null || items.Count == 0)

CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs

@@ -397,7 +397,9 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             TypeOfContract = x.TypeOfContract,
             Signature = x.Signature,
             ExpireColor = ExpColor(x.ContractEndGr, x.SearchAmount,
-                x.IsActiveString),
+                x.IsActiveString).result,
+            IsExpier = ExpColor(x.ContractEndGr, x.SearchAmount,
+                x.IsActiveString).isExpier,
             BalanceDouble = TotalBalance(x.ContractingPartyId).TotalBalanceDbl,
             BalanceStr = TotalBalance(x.ContractingPartyId).TotalBalanceStr,
             EmployerViewModels = x.EmployerViewModels,
@@ -441,6 +443,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             TypeOfContract = x.TypeOfContract,
             Signature = x.Signature,
             ExpireColor = x.ExpireColor,
+            IsExpier = x.IsExpier,
             BalanceDouble = x.BalanceDouble,
             BalanceStr = x.BalanceStr,
             EmployerViewModels = x.EmployerViewModels,
@@ -458,7 +461,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
         }).OrderBy(x => x.WorkshopCount != "0" && string.IsNullOrWhiteSpace(x.ExpireColor))
             .ThenBy(x => x.WorkshopCount == "0" && string.IsNullOrWhiteSpace(x.ExpireColor))
-            .ThenBy(x => x.ExpireColor == "red")
+            .ThenBy(x => x.IsExpier == "true")
             .ThenBy(x => x.ExpireColor == "purple")
             .ThenBy(x => x.ExpireColor == "black").ToList();
         Console.WriteLine("test >>>  " + timer.Elapsed);
@@ -577,7 +580,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         return res;
     }
 
-    public string ExpColor(DateTime contractEndGr, double contractAmount,
+    public (string result, string isExpier) ExpColor(DateTime contractEndGr, double contractAmount,
         string isActiveString)
     {
         var now = DateTime.Now;
@@ -585,16 +588,35 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         var endFa = nowFa.FindeEndOfMonth();
         var endThisMontGr = endFa.ToGeorgianDateTime();
         string result = "";
-
+        string isExpier = "false";
         if (contractEndGr < now)
+        {
             result = "black";
+            isExpier = "true";
+        }
+
         if (contractEndGr >= now && contractEndGr <= endThisMontGr)
+        {
             result = "red";
+            isExpier = "true";
+        }
+
         if (contractAmount == 0)
+        {
             result = "purple";
+            if ((contractEndGr >= now && contractEndGr <= endThisMontGr) || (contractEndGr < now))
+            {
+                isExpier = "true";
+            }
+        }
+
         if (isActiveString == "blue")
+        {
             result = "blue";
-        return result;
+            isExpier = "false";
+        }
+            
+        return (result, isExpier);
     }
 
 

CompanyManagment.EFCore/Repository/InsuranceJobItemRepository.cs

@@ -6,8 +6,10 @@ using _0_Framework.InfraStructure;
 
 using Company.Domain.InsuranceJobAndJobsAgg;
 using Company.Domain.InsuranceJobItemAgg;
+using CompanyManagment.App.Contracts.DateSalaryItem;
 using CompanyManagment.App.Contracts.InsuranceJobItem;
 using CompanyManagment.App.Contracts.Job;
+using Microsoft.EntityFrameworkCore;
 
 namespace CompanyManagment.EFCore.Repository;
 
@@ -22,8 +24,8 @@ public class InsuranceJobItemRepository : RepositoryBase<long, InsuranceJobItem>
     public void CreateInsuranceJobItem(InsuranceJobItemViewModel model)
     {
 
-        InsuranceJobItem incuranceJobItemObj = new InsuranceJobItem(model.PercentageLessThan, model.SalaeyLessThan,
-            model.PercentageMoreThan, model.SalaryMoreThan, model.InsuranceJobId);
+        InsuranceJobItem incuranceJobItemObj = new InsuranceJobItem(0, 0,
+            0, 0, model.InsuranceJobId, model.StartDate,model.EndDate);
         _context.InsuranceJobItems.Add(incuranceJobItemObj);
         _context.SaveChanges();
         List<InsuranceJobAndJobs> insuranceJobAndJobsList = new List<InsuranceJobAndJobs>();
@@ -44,7 +46,7 @@ public class InsuranceJobItemRepository : RepositoryBase<long, InsuranceJobItem>
         throw new NotImplementedException();
     }
 
-    public List<InsuranceJobItemViewModel> GetInsuranceJobItemByInsuranceJobId(long Id)
+    public List<InsuranceJobItemViewModel> GetInsuranceJobItemByInsuranceJobId(long Id, string year, string month)
     {
 
         //var list = _context.InsuranceJobItems.Where(x => x.InsuranceJobId == Id).ToList().Select(x=>new InsuranceJobItemViewModel()
@@ -91,21 +93,37 @@ public class InsuranceJobItemRepository : RepositoryBase<long, InsuranceJobItem>
 
         //    list.Add(obj);
         //}
-
-        var insuranceJobItems = _context.InsuranceJobItems.Where(x => x.InsuranceJobId == Id).ToList();
+        var searcheDate = ($"{year}/{month}/01").ToGeorgianDateTime();
+        var insuranceJobItems = _context.InsuranceJobItems.Where(i => i.InsuranceJobId == Id && i.StartDate <= searcheDate && i.EndDate >= searcheDate).ToList();
         var list = new List<InsuranceJobItemViewModel>();
+        var usedParcentsInDateSalaryItems = _context.DateSalaries
+            .Where(x => x.StartDateGr <= searcheDate && x.EndDateGr >= searcheDate)
+            .Include(x => x.DateSalaryItemList)
+            .SelectMany(x => x.DateSalaryItemList)
+            .ToList();
 
         foreach (var item in insuranceJobItems)
         {
+            double lessThan = usedParcentsInDateSalaryItems.Any(x => x.Percent == item.PercentageLessThan && x.Salary > 0)
+                ? usedParcentsInDateSalaryItems.FirstOrDefault(x => x.Percent == item.PercentageLessThan).Salary
+                : 0;
+
+            double moreThan = usedParcentsInDateSalaryItems.Any(x => x.Percent == item.PercentageMoreThan && x.Salary > 0)
+                ? usedParcentsInDateSalaryItems.FirstOrDefault(x => x.Percent == item.PercentageMoreThan).Salary
+                : 0;
             var obj = new InsuranceJobItemViewModel();
             obj.Id = item.id;
             obj.PercentageLessThan = item.PercentageLessThan;
+            obj.IsPercentageLessThanUse = lessThan > 0 ;
             obj.PercentageMoreThan = item.PercentageMoreThan;
+            obj.IsPercentageMoreThanUse = moreThan > 0;
             obj.SalaeyLessThan = item.SalaeyLessThan;
             obj.SalaryMoreThan = item.SalaryMoreThan;
-            obj.SalaeyLessThanString = item.SalaryMoreThan.ToMoney();
-            obj.SalaryMoreThanString = item.SalaryMoreThan.ToMoney();
+            obj.SalaeyLessThanString = lessThan > 0 ? lessThan.ToMoney() : "0";
+            obj.SalaryMoreThanString = moreThan > 0 ? moreThan.ToMoney() : "0";
             obj.InsuranceJobId = item.InsuranceJobId;
+            obj.StartDate = item.StartDate;
+            obj.EndDate = item.EndDate;
             obj.JobIds = _context.InsuranceJobAndJobsSet.Where(p => p.InsuranceJobItemId == item.id)
                 .Select(p => p.JobId).ToList();
             obj.JobList = _context.Jobs.Where(x => obj.JobIds.Contains(x.id)).ToList().Select(x =>
@@ -122,10 +140,11 @@ public class InsuranceJobItemRepository : RepositoryBase<long, InsuranceJobItem>
     }
 
 
-    public InsuranceJobItemViewModel GetInsuranceJobItemByInsuranceJobIdForFixedSalary(long insuranceJobId, long jobId)
+    public InsuranceJobItemViewModel GetInsuranceJobItemByInsuranceJobIdForFixedSalary(long insuranceJobId, long jobId, string year, string month)
     {
+        var searcheDate = ($"{year}/{month}/01").ToGeorgianDateTime();
         var insuranceJobItemViewModel = new InsuranceJobItemViewModel();
-        var insuranceJobItems = _context.InsuranceJobItems.Where(x => x.InsuranceJobId == insuranceJobId).ToList();
+        var insuranceJobItems = _context.InsuranceJobItems.Where(i => i.InsuranceJobId == insuranceJobId && i.StartDate <= searcheDate && i.EndDate >= searcheDate).ToList();
         var insuranceJobItemIds = insuranceJobItems.Select(x => x.id).ToList();
         var jobAndJob = _context.InsuranceJobAndJobsSet
             .Where(x => insuranceJobItemIds.Contains(x.InsuranceJobItemId) && x.JobId == jobId).FirstOrDefault();
@@ -146,6 +165,17 @@ public class InsuranceJobItemRepository : RepositoryBase<long, InsuranceJobItem>
         return insuranceJobItemViewModel;
     }
 
+    public (List<string> workshopList, bool hasAnyWorkshop) GetWorkshopUsedThisInsuranceJob(long insuranceJobId)
+    {
+        var workshops = _context.Workshops.Where(x => x.InsuranceJobId == insuranceJobId);
+        if (!workshops.Any())
+        {
+            return (new List<string>(), false);
+        }
+
+        return (workshops.Select(x => x.WorkshopFullName).ToList(), true);
+    }
+
     public List<InsuranceJobItemViewModel> Search(InsuranceJobItemSearchModel searchModel)
     {
         throw new NotImplementedException();

CompanyManagment.EFCore/Repository/InsuranceJobRepository.cs

@@ -3,11 +3,17 @@ using System.Collections.Generic;
 using System.Linq;
 using _0_Framework.Application;
 using _0_Framework.InfraStructure;
+using Company.Domain.DateSalaryAgg;
+using Company.Domain.DateSalaryItemAgg;
 using Company.Domain.InsuranceJobAndJobsAgg;
 using Company.Domain.InsuranceJobItemAgg;
 using Company.Domain.InsurancJobAgg;
 using Company.Domain.PercentageAgg;
 using CompanyManagment.App.Contracts.InsuranceJob;
+using CompanyManagment.App.Contracts.InsuranceJobItem;
+using CompanyManagment.App.Contracts.Percentage;
+using Microsoft.EntityFrameworkCore;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
 
 
 namespace CompanyManagment.EFCore.Repository;
@@ -15,16 +21,21 @@ namespace CompanyManagment.EFCore.Repository;
 public class InsuranceJobRepository : RepositoryBase<long, InsuranceJob>, IInsuranceJobRepositpry
 {
     private readonly CompanyContext _context;
+    private readonly TestDbContext _testDbContext;
     private readonly IInsuranceJobItemRepositpry _insuranceJobItemRepositpry;
     private readonly IPercentageRepository _percentageRepository;
-    public InsuranceJobRepository(CompanyContext context, IInsuranceJobItemRepositpry insuranceJobItemRepositpry , IPercentageRepository percentageRepository) : base(context)
+    private readonly IDateSalaryItemRepository _dateSalaryItemRepository;
+    
+    public InsuranceJobRepository(CompanyContext context, IInsuranceJobItemRepositpry insuranceJobItemRepositpry, IPercentageRepository percentageRepository, TestDbContext testDbContext, IDateSalaryItemRepository dateSalaryItemRepository) : base(context)
     {
         _context = context;
         _insuranceJobItemRepositpry = insuranceJobItemRepositpry;
         _percentageRepository = percentageRepository;
+        _testDbContext = testDbContext;
+        _dateSalaryItemRepository = dateSalaryItemRepository;
     }
 
-    public EditInsuranceJob GetDetails(long id)
+    public EditInsuranceJob GetDetails(long id, string year, string month)
     {
         var insuranceJob = new EditInsuranceJob();
         var details = Get(id);
@@ -32,7 +43,13 @@ public class InsuranceJobRepository : RepositoryBase<long, InsuranceJob>, IInsur
         insuranceJob.Year = details.Year;
         insuranceJob.EconomicCode = details.EconomicCode;
         insuranceJob.InsuranceJobTitle = details.InsuranceJobTitle;
-        insuranceJob.InsuranceJobItems = _insuranceJobItemRepositpry.GetInsuranceJobItemByInsuranceJobId(id);
+        insuranceJob.InsuranceJobItems = _insuranceJobItemRepositpry.GetInsuranceJobItemByInsuranceJobId(id, year, month);
+        var workshopsUsedThis  = _insuranceJobItemRepositpry.GetWorkshopUsedThisInsuranceJob(id);
+        var item = insuranceJob.InsuranceJobItems.FirstOrDefault();
+        insuranceJob.StartDateFa = item != null ? $"{item.StartDate.ToFarsi()}" : "-";
+        insuranceJob.EndDateFa = item != null ? $"{item.EndDate.ToFarsi()}" : "-";
+        insuranceJob.WorkshopList = workshopsUsedThis.workshopList;
+        insuranceJob.HasAnyWorkshop = workshopsUsedThis.hasAnyWorkshop;
         return insuranceJob;
     }
 
@@ -49,16 +66,33 @@ public class InsuranceJobRepository : RepositoryBase<long, InsuranceJob>, IInsur
 
     public List<InsuranceJobViewModel> Search(InsuranceJobSearchModel searchModel)
     {
-        var query = _context.InsuranceJobs.Select(x => new InsuranceJobViewModel
-        {
-            Id = x.id,
-            InsuranceJobTitle = x.InsuranceJobTitle,
-            EconomicCode = x.EconomicCode
-        });
+
+        string now = Tools.ToFarsi(DateTime.Now);
+        string year = now.Substring(0, 4);
+        string month = now.Substring(5, 2);
+        if (!string.IsNullOrWhiteSpace(searchModel.Year))
+            year = searchModel.Year;
+        if (!string.IsNullOrWhiteSpace(searchModel.Month))
+            month = searchModel.Month;
+
+
+        var searcheDate = ($"{year}/{month}/01").ToGeorgianDateTime();
+        var query = _context.InsuranceJobs
+            .Include(x => x.InsuranceJobItemList).Where(x => x.InsuranceJobItemList.Any(i => i.StartDate <= searcheDate && i.EndDate >= searcheDate))
+            .Select(x => new InsuranceJobViewModel
+            {
+                Id = x.id,
+                InsuranceJobTitle = x.InsuranceJobTitle,
+                EconomicCode = x.EconomicCode,
+                Year = year,
+                Month = month,
+                
+
+            });
 
         if (!string.IsNullOrWhiteSpace(searchModel.EconomicCode))
-            query = query.Where(x => x.EconomicCode.Contains(searchModel.EconomicCode));    
-            
+            query = query.Where(x => x.EconomicCode.Contains(searchModel.EconomicCode));
+
         if (!string.IsNullOrWhiteSpace(searchModel.InsuranceJobTitle))
             query = query.Where(x => x.InsuranceJobTitle.Contains(searchModel.InsuranceJobTitle));
 
@@ -67,7 +101,21 @@ public class InsuranceJobRepository : RepositoryBase<long, InsuranceJob>, IInsur
 
     public OperationResult CreateInsuranceJob(CreateInsuranceJob command)
     {
-        OperationResult result = new OperationResult();
+        OperationResult result = new OperationResult(); 
+        var insuranceJobItemObj = _insuranceJobItemRepositpry.Get(command.InsuranceJobItemId);
+        if (insuranceJobItemObj == null)
+            return result.Failed("آیتم شغلی انتخاب شده وجود ندارد");
+
+        List<double> percentaegJoin = new List<double>();
+        var percentageLessThan = command.InsuranceJobItems.Select(x => x.PercentageLessThan).ToList();
+        var percentageMoreThan = command.InsuranceJobItems.Select(x => x.PercentageMoreThan).ToList();
+        if (percentageMoreThan != null)
+        {
+            percentaegJoin = percentageLessThan
+                .Concat(percentageMoreThan)
+                .Distinct()
+                .ToList();
+        }
         using (var transaction = _context.Database.BeginTransaction())
         {
             try
@@ -80,6 +128,8 @@ public class InsuranceJobRepository : RepositoryBase<long, InsuranceJob>, IInsur
                     item.PercentageLessThan = item.PercentageLessThan;
                     item.PercentageMoreThan = item.PercentageMoreThan;
                     item.InsuranceJobId = insuranceJobObj.id;
+                    item.StartDate = insuranceJobItemObj.StartDate;
+                    item.EndDate = insuranceJobItemObj.EndDate;
                     _insuranceJobItemRepositpry.CreateInsuranceJobItem(item);
 
                     if (!_percentageRepository.Exists(x => x.Percent == item.PercentageLessThan))
@@ -93,16 +143,39 @@ public class InsuranceJobRepository : RepositoryBase<long, InsuranceJob>, IInsur
                         var percentage2 = new Percentage(item.PercentageMoreThan);
                         _percentageRepository.Create(percentage2);
                     }
-                       
+
                     _percentageRepository.SaveChanges();
                 }
+
+                var dateSalary = _context.DateSalaries.FirstOrDefault(x =>
+                    x.StartDateGr == insuranceJobItemObj.StartDate && x.EndDateGr == insuranceJobItemObj.EndDate);
+                var percentages = _context.Percentages.Select(x => new { x.id, x.Percent }).ToList();
+                var dateSalaryItemList = new List<DateSalaryItem>();
+                foreach (var percent in percentaegJoin)
+                {
+                    var percentageId = percentages.FirstOrDefault(x => x.Percent == percent);
+                    if (percentageId != null)
+                    {
+
+                        var dateSalaryItem = new DateSalaryItem(percent, percentageId.id, 0, dateSalary.id);
+                        dateSalaryItemList.Add(dateSalaryItem);
+                    }
+
+
+                }
+
+                if (dateSalaryItemList.Count > 0)
+                {
+                    _context.DateSalaryItems.AddRange(dateSalaryItemList);
+                    _context.SaveChanges();
+                }
                 // SaveChanges();
                 transaction.Commit();
                 result.IsSuccedded = true;
                 result.Message = "ثبت اطلاعات با موفقیت انجام شد";
             }
             catch (Exception ex)
-            { 
+            {
                 transaction.Rollback();
                 result.Failed("ثبت اطلاعات با خطا مواجه شد");
             }
@@ -110,19 +183,240 @@ public class InsuranceJobRepository : RepositoryBase<long, InsuranceJob>, IInsur
         return result;
     }
 
-    public OperationResult Remove(long id)
+    public List<(long id, string date)> GetOldYersInsuranceItemIds()
     {
+        var res = _context.InsuranceJobItems.Where(x=>x.StartDate != null && x.EndDate != null)
+             .GroupBy(x => x.StartDate)
+             .Select(g => g.First())
+            .ToList().Select(x => new InsuranceJobItemViewModel()
+             {
+                 Id = x.id,
+                 StartDate = x.StartDate,
+                 EndDate = x.EndDate,
+
+
+             }).OrderByDescending(x=>x.StartDate);
+
+        return res.Select(x => (x.Id, $"{(x.StartDate.HasValue ? x.StartDate.Value.ToFarsi() : "نامشخص")} - {(x.EndDate.HasValue ? x.EndDate.Value.ToFarsi() : "نامشخص")}")).ToList();
+
+    }
+
+    public OperationResult CopyFromLastYear(CopyFromLastYearViewModel command)
+    {
+        var op = new OperationResult();
+        if (command.InsuranceJobItemId == 0)
+            return op.Failed("بازه را انتخاب کنید");
+        DateTime startDateGr = new DateTime();
+        DateTime endDateGr = new DateTime();
+        try
+        {
+            startDateGr = command.StartDate.ToGeorgianDateTime();
+            endDateGr = command.EndDate.ToGeorgianDateTime();
+
+        }
+        catch (Exception e)
+        {
+            return op.Failed("تاریخ به درستی وارد نشده است");
+
+        }
+
+
+        var chekExist = _insuranceJobItemRepositpry.Exists(x => x.StartDate < endDateGr && x.EndDate > startDateGr);
+        if (chekExist)
+            return op.Failed("بازه تاریخ وارد شده با بازه های قبلی تداخل دارد");
+
+        var insuranceJobItemObj = _insuranceJobItemRepositpry.Get(command.InsuranceJobItemId);
+        if (insuranceJobItemObj == null)
+            return op.Failed("آیتم شغلی انتخاب شده وجود ندارد");
+        var insuranceJobItemList = _context.InsuranceJobItems
+            .Include(jobs => jobs.InsuranceJobAndJobs)
+            .Where(x => x.StartDate == insuranceJobItemObj.StartDate).Select(x => new InsuranceJobItemViewModel()
+            {
+                PercentageLessThan = x.PercentageLessThan,
+                PercentageMoreThan = x.PercentageMoreThan,
+                InsuranceJobId = x.InsuranceJobId,
+                StartDate = startDateGr,
+                EndDate = endDateGr,
+                JobIds = x.InsuranceJobAndJobs.Select(j => j.JobId).ToList()
+            }).ToList();
+
+        if (!insuranceJobItemList.Any())
+            return op.Failed("خطا");
+        List<double> percentaegJoin = new List<double>();
+        var percentageLessThan = insuranceJobItemList.Select(x => x.PercentageLessThan).ToList();
+        var percentageMoreThan = insuranceJobItemList.Select(x => x.PercentageMoreThan).ToList();
+        if (percentageMoreThan != null)
+        {
+            percentaegJoin = percentageLessThan
+                .Concat(percentageMoreThan)
+                .Distinct()
+                .ToList();
+        }
+
+        using (var transaction = _context.Database.BeginTransaction())
+        {
+            try
+            {
+           
+                foreach (var item in insuranceJobItemList)
+                {
+
+                    _insuranceJobItemRepositpry.CreateInsuranceJobItem(item);
+
+                  
+                    if (!_percentageRepository.Exists(x => x.Percent == item.PercentageLessThan))
+                    {
+                        var percentage = new Percentage(item.PercentageLessThan);
+                        _percentageRepository.Create(percentage);
+                    }
+
+                    if (!_percentageRepository.Exists(x => x.Percent == item.PercentageMoreThan))
+                    {
+                        var percentage2 = new Percentage(item.PercentageMoreThan);
+                        _percentageRepository.Create(percentage2);
+                    }
+
+                    _percentageRepository.SaveChanges();
+                }
+
+                var dateSalary = new DateSalary(command.StartDate, command.EndDate);
+                _context.DateSalaries.Add(dateSalary);
+                _context.SaveChanges();
+                var percentages = _context.Percentages.Select(x=> new{x.id, x.Percent}).ToList();
+                var dateSalaryItemList = new List<DateSalaryItem>();
+                foreach (var percent in percentaegJoin)
+                {
+                    var percentageId = percentages.FirstOrDefault(x => x.Percent == percent);
+                    if (percentageId != null)
+                    {
+                       
+                        var dateSalaryItem = new DateSalaryItem(percent, percentageId.id, 0, dateSalary.id);
+                        dateSalaryItemList.Add(dateSalaryItem);
+                    }
+                   
+
+                }
+
+                if (dateSalaryItemList.Count > 0)
+                {
+                    _context.DateSalaryItems.AddRange(dateSalaryItemList);
+                    _context.SaveChanges();
+                }
+                   
+          
+               
+                // SaveChanges();
+                transaction.Commit();
+                op.IsSuccedded = true;
+                op.Message = "ثبت اطلاعات با موفقیت انجام شد";
+                return op;
+            }
+            catch (Exception ex)
+            {
+                transaction.Rollback();
+                return op.Failed("ثبت اطلاعات با خطا مواجه شد");
+            }
+        }
+
+    }
+
+    public OperationResult RecoveryOldData1403()
+    {
+
         OperationResult result = new OperationResult();
         using (var transaction = _context.Database.BeginTransaction())
         {
             try
             {
-                var insuranceJobItems = _context.InsuranceJobItems.Where(x=>x.InsuranceJobId==id).ToList();
+                var res = _testDbContext.InsuranceJobItems.Include(x => x.InsuranceJobAndJobs).ToList();
+                foreach (var item in res)
+                {
+                    var createItem = new InsuranceJobItem(item.PercentageLessThan, 0, item.PercentageMoreThan, 0,
+                        item.InsuranceJobId, item.StartDate, item.EndDate);
+                    _context.InsuranceJobItems.Add(createItem);
+                    _context.SaveChanges();
+                    Console.WriteLine(createItem.InsuranceJobId + " " + createItem.PercentageLessThan);
+                    List<InsuranceJobAndJobs> insuranceJobAndJobsList = new List<InsuranceJobAndJobs>();
+                    foreach (var jobItem in item.InsuranceJobAndJobs)
+                    {
+                        var insuranceJobAndJobsObj = new InsuranceJobAndJobs();
+                        insuranceJobAndJobsObj.JobId = jobItem.JobId;
+                        insuranceJobAndJobsObj.InsuranceJobItemId = createItem.id;
+                        insuranceJobAndJobsList.Add(insuranceJobAndJobsObj);
+                    }
+                    _context.InsuranceJobAndJobsSet.AddRange(insuranceJobAndJobsList);
+                    _context.SaveChanges();
+
+
+                    if (!_percentageRepository.Exists(x => x.Percent == item.PercentageLessThan))
+                    {
+                        var percentage = new Percentage(item.PercentageLessThan);
+                        _percentageRepository.Create(percentage);
+                    }
+
+                    if (!_percentageRepository.Exists(x => x.Percent == item.PercentageMoreThan))
+                    {
+                        var percentage2 = new Percentage(item.PercentageMoreThan);
+                        _percentageRepository.Create(percentage2);
+                    }
+
+                    _percentageRepository.SaveChanges();
+
+                }
+
+                transaction.Commit();
+                result.IsSuccedded = true;
+                result.Message = "حذف اطلاعات با موفقیت انجام شد";
+            }
+            catch (Exception ex)
+            {
+                transaction.Rollback();
+                result.Failed("ثبت اطلاعات با خطا مواجه شد");
+            }
+        }
+
+        return result;
+
+
+    }
+    public OperationResult Remove(long id)
+    {
+        OperationResult result = new OperationResult();
+        var insuranceJobItems = _context.InsuranceJobItems.Where(x => x.InsuranceJobId == id).ToList();
+        var start = insuranceJobItems.FirstOrDefault()!.StartDate;
+        var end = insuranceJobItems.FirstOrDefault()!.StartDate;
+        var usedParcentsInDateSalaryItems = _context.DateSalaries
+            .Where(x => x.StartDateGr == start && x.EndDateGr >= end)
+            .Include(x => x.DateSalaryItemList)
+            .SelectMany(x => x.DateSalaryItemList)
+            .ToList();
+        var itemsLessThan = insuranceJobItems.Select(x => x.PercentageLessThan).ToList();
+        var itemsMoreThan = insuranceJobItems.Select(x => x.PercentageMoreThan).ToList();
+        bool lessThan = usedParcentsInDateSalaryItems.Any(x => itemsLessThan.Contains(x.Percent) && x.Salary > 0);
+        bool moreThan = usedParcentsInDateSalaryItems.Any(x => itemsMoreThan.Contains(x.Percent) && x.Salary > 0);
+        if (lessThan || moreThan)
+            return result.Failed("درصد های این صنف دارای مبلغ می باشند");
+
+        var percentaegJoin = itemsLessThan
+            .Concat(itemsMoreThan)
+            .Distinct()
+            .ToList();
+        using (var transaction = _context.Database.BeginTransaction())
+        {
+            try
+            {
+                
                 _context.InsuranceJobItems.RemoveRange(insuranceJobItems);
 
                 var insuranceJobObj = Get(id);
                 _context.InsuranceJobs.Remove(insuranceJobObj);
 
+
+
+                var toBeRemove = usedParcentsInDateSalaryItems.Where(x => percentaegJoin.Contains(x.Percent)).Select(x=>x.id);
+                var dateSalaryItemToBeRemovde = _context.DateSalaryItems.Where(x => toBeRemove.Contains(x.id));
+                _context.DateSalaryItems.RemoveRange(dateSalaryItemToBeRemovde);
+
                 _context.SaveChanges();
                 transaction.Commit();
                 result.IsSuccedded = true;
@@ -147,33 +441,54 @@ public class InsuranceJobRepository : RepositoryBase<long, InsuranceJob>, IInsur
             {
                 var insuranceJob = Get(command.Id);
                 insuranceJob.Edit(command.InsuranceJobTitle, command.YearlySalaryId, command.EconomicCode, command.Year);
-                   
-                var insuranceJobItemsIds = _context.InsuranceJobItems.Where(x => x.InsuranceJobId == command.Id).Select(x=>x.id).ToList();
-                //List<long> deleteIds = new List<long>();
+                var searcheDate = ($"{command.Year}/{command.Month}/01").ToGeorgianDateTime();
+                var insuranceJobItems = _context.InsuranceJobItems
+                    .Include(x=>x.InsuranceJobAndJobs)
+                    .Where(i => i.InsuranceJobId == command.Id && i.StartDate <= searcheDate && i.EndDate >= searcheDate);
+  
+                DateTime? startDate = insuranceJobItems.Select(x => x.StartDate).FirstOrDefault();
+                DateTime? endDate = insuranceJobItems.Select(x => x.EndDate).FirstOrDefault();
+                var insuranceJobItemsIds = insuranceJobItems.Select(x => x.id).ToList();
 
+                var usedParcentsInDateSalaryItems = _context.DateSalaries
+                    .Where(x => x.StartDateGr <= searcheDate && x.EndDateGr >= searcheDate)
+                    .Include(x => x.DateSalaryItemList)
+                    .SelectMany(x => x.DateSalaryItemList)
+                    .ToList();
+                //var editedJobItems = command.InsuranceJobItems.Where(x => x.Id != 0).ToList();
+                //var newAdedJobItems = command.InsuranceJobItems.Where(x => x.Id == 0).ToList();
+
+                //foreach (var item in insuranceJobItems)
+                //{
+
+                //}
                 foreach (var item in command.InsuranceJobItems)
                 {
-                    long deleteId = insuranceJobItemsIds.Where(x => x==item.Id).FirstOrDefault();
-                    if (deleteId !=0)
-                    { insuranceJobItemsIds.Remove(deleteId);}
+                    long deleteId = insuranceJobItemsIds.Where(x => x == item.Id).FirstOrDefault();
+                    if (deleteId != 0)
+                    {
+                        insuranceJobItemsIds.Remove(deleteId);
+                    }
 
                     if (item.Id == 0)
                     {
                         item.PercentageLessThan = item.PercentageLessThan;
                         item.PercentageMoreThan = item.PercentageMoreThan;
                         item.InsuranceJobId = command.Id;
+                        item.StartDate = startDate;
+                        item.EndDate = endDate;
                         _insuranceJobItemRepositpry.CreateInsuranceJobItem(item);
                     }
                     else
                     {
                         var insuranceJobItem = _insuranceJobItemRepositpry.Get(item.Id);
-                        insuranceJobItem.Edit(item.PercentageLessThan, item.SalaeyLessThan, item.PercentageMoreThan, item.SalaryMoreThan, command.Id);
+                        insuranceJobItem.Edit(item.PercentageLessThan, item.SalaeyLessThan, item.PercentageMoreThan, item.SalaryMoreThan, command.Id, startDate, endDate);
 
                         #region JobAndJob
 
-                        var jobAndJobList = _context.InsuranceJobAndJobsSet .Where(x => x.InsuranceJobItemId == item.Id).ToList();
+                        var jobAndJobList = _context.InsuranceJobAndJobsSet.Where(x => x.InsuranceJobItemId == item.Id).ToList();
                         _context.InsuranceJobAndJobsSet.RemoveRange(jobAndJobList);
-                        List <InsuranceJobAndJobs> insuranceJobAndJobsList = new List<InsuranceJobAndJobs>();
+                        List<InsuranceJobAndJobs> insuranceJobAndJobsList = new List<InsuranceJobAndJobs>();
                         foreach (var item2 in item.JobIds)
                         {
                             var insuranceJobAndJobsObj = new InsuranceJobAndJobs();
@@ -186,25 +501,59 @@ public class InsuranceJobRepository : RepositoryBase<long, InsuranceJob>, IInsur
                     }
 
                     #region Percentage
+                    var percentage = new Percentage(item.PercentageLessThan);
                     if (!_percentageRepository.Exists(x => x.Percent == item.PercentageLessThan))
                     {
-                        var percentage = new Percentage(item.PercentageLessThan);
+                        
                         _percentageRepository.Create(percentage);
                     }
+                    var percentage2 = new Percentage(item.PercentageMoreThan);
                     if (!_percentageRepository.Exists(x => x.Percent == item.PercentageMoreThan))
                     {
-                        var percentage2 = new Percentage(item.PercentageMoreThan);
+                      
                         _percentageRepository.Create(percentage2);
                     }
-                    _percentageRepository.SaveChanges();  
+                    _percentageRepository.SaveChanges();
+                    #endregion
+
+
+                    #region DateSalaryItems
+
+                    var checkExitLeesThan = usedParcentsInDateSalaryItems.Any(x => x.Percent == item.PercentageLessThan);
+                    if (!checkExitLeesThan && usedParcentsInDateSalaryItems.Any())
+                    {
+                
+                        if(percentage.id == 0)
+                            percentage.id = _percentageRepository.Search(new PercentageSearchModel(){Percent = item.PercentageLessThan }).FirstOrDefault()!.Id;
+                            
+                        var dateSalaryId =usedParcentsInDateSalaryItems.FirstOrDefault()!.DateSalaryId;
+                        var dateSalaryItem = new DateSalaryItem(item.PercentageLessThan, percentage.id, 0, dateSalaryId);
+                       _dateSalaryItemRepository.Create(dateSalaryItem);
+                      
+                    }
+
+                    var checkExitMoreThan = usedParcentsInDateSalaryItems.Any(x => x.Percent == item.PercentageMoreThan);
+                    if (!checkExitMoreThan && usedParcentsInDateSalaryItems.Any())
+                    {
+                        if (percentage2.id == 0)
+                            percentage2.id = _percentageRepository.Search(new PercentageSearchModel() { Percent = item.PercentageMoreThan }).FirstOrDefault()!.Id;
+
+                        var dateSalaryId = usedParcentsInDateSalaryItems.FirstOrDefault()!.DateSalaryId;
+                        var dateSalaryItem = new DateSalaryItem(item.PercentageMoreThan, percentage2.id, 0, dateSalaryId);
+                        _dateSalaryItemRepository.Create(dateSalaryItem);
+
+                    }
+
+                    _dateSalaryItemRepository.SaveChanges();
+
                     #endregion
                 }
-               
+
                 #region removeJobItems
                 var deleteList = _context.InsuranceJobItems.Where(x => insuranceJobItemsIds.Contains(x.id)).ToList();
                 _context.InsuranceJobItems.RemoveRange(deleteList);
                 #endregion
-               
+
 
                 _context.SaveChanges();
                 transaction.Commit();

CompanyManagment.EFCore/Repository/LeaveRepository.cs

@@ -410,8 +410,7 @@ public class LeaveRepository : RepositoryBase<long, Leave>, ILeaveRepository
         //                (startLeav >= x.ContractStart && endLeav <= x.ContractEnd) ||
         //                (startLeav < x.ContractStart && endLeav <= x.ContractEnd && endLeav >= x.ContractStart) ||
         //                (startLeav < x.ContractStart && endLeav > x.ContractEnd)).ToList();
-        var checkoutExist = _context.CheckoutSet.Where(x => x.WorkshopId == workshopId && x.EmployeeId == employeeId)
-            .Where(x => startLeav <= x.ContractEnd).ToList();
+        var checkoutExist = _context.CheckoutSet.Where(x => x.WorkshopId == workshopId && x.EmployeeId == employeeId && startLeav <= x.ContractEnd).ToList();
         if (checkoutExist.Count > 0)
         {
             res.HasChekout = true;

CompanyManagment.EFCore/Repository/LeftWorkInsuranceRepository.cs

@@ -8,6 +8,7 @@ using Company.Domain.InsuranceListAgg;
 using Company.Domain.LeftWorkInsuranceAgg;
 using Company.Domain.PersonnelCodeAgg;
 using CompanyManagment.App.Contracts.InsuranceList;
+using CompanyManagment.App.Contracts.LeftWork;
 using CompanyManagment.App.Contracts.LeftWorkInsurance;
 using CompanyManagment.App.Contracts.PersonnleCode;
 using Microsoft.EntityFrameworkCore;
@@ -25,15 +26,15 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
     public EditLeftWorkInsurance GetDetails(long id)
     {
         return _context.LeftWorkInsuranceList.Select(x => new EditLeftWorkInsurance()
-            {
-                Id = x.id,
-                LeftWorkDate = x.LeftWorkDate != null ? x.LeftWorkDate.ToFarsi() : "",
-                StartWorkDate = x.StartWorkDate.ToFarsi(),
-                EmployeeFullName = x.EmployeeFullName,
-                WorkshopName = x.WorkshopName,
-                WorkshopId = x.WorkshopId,
-                EmployeeId = x.EmployeeId
-            })
+        {
+            Id = x.id,
+            LeftWorkDate = x.LeftWorkDate != null ? x.LeftWorkDate.ToFarsi() : "",
+            StartWorkDate = x.StartWorkDate.ToFarsi(),
+            EmployeeFullName = x.EmployeeFullName,
+            WorkshopName = x.WorkshopName,
+            WorkshopId = x.WorkshopId,
+            EmployeeId = x.EmployeeId
+        })
             .FirstOrDefault(x => x.Id == id);
     }
 
@@ -89,7 +90,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
             EmployeeId = x.EmployeeId,
             JobId = x.JobId,
 
-        }).Where(x=>x.WorkshopId == workshopId);
+        }).Where(x => x.WorkshopId == workshopId);
         return query.ToList();
     }
 
@@ -108,10 +109,10 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
         foreach (var item in query)
         {
             var jobObj = _context.Jobs.Where(x => x.id == item.JobId).FirstOrDefault();
-            var insuranceListIds = _context.EmployeeInsurancListDataSet.Where(x => x.EmployeeId == searchModel.EmployeeId && (x.StartWorkDate == item.StartWorkDate ||x.LeftWorkDate==item.LeftWorkDate))
-                .Select(x=>x.InsuranceListId).ToList();
-            var hasInsuranceList = _context.InsuranceListSet.Any(x => insuranceListIds.Contains(x.id) && x.WorkshopId==item.WorkshopId);
-               
+            var insuranceListIds = _context.EmployeeInsurancListDataSet.Where(x => x.EmployeeId == searchModel.EmployeeId && (x.StartWorkDate == item.StartWorkDate || x.LeftWorkDate == item.LeftWorkDate))
+                .Select(x => x.InsuranceListId).ToList();
+            var hasInsuranceList = _context.InsuranceListSet.Any(x => insuranceListIds.Contains(x.id) && x.WorkshopId == item.WorkshopId);
+
             list.Add(new LeftWorkInsuranceViewModel()
             {
                 Id = item.id,
@@ -125,7 +126,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                 EmployeeId = item.EmployeeId,
                 JobId = item.JobId,
                 IncludeStatus = item.IncludeStatus,
-                JobName = jobObj!=null?jobObj.JobName:string.Empty,
+                JobName = jobObj != null ? jobObj.JobName : string.Empty,
                 JobCode = jobObj != null ? jobObj.JobCode : string.Empty,
                 HasInsuranceList = hasInsuranceList,
             });
@@ -142,14 +143,14 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
     {
         var op = new OperationResult();
 
-        var item = _context.LeftWorkInsuranceList.FirstOrDefault(x=>x.id==id);
-        if(item !=null)
+        var item = _context.LeftWorkInsuranceList.FirstOrDefault(x => x.id == id);
+        if (item != null)
             _context.LeftWorkInsuranceList.Remove(item);
-           
+
         _context.SaveChanges();
         return op.Succcedded();
     }
-    public OperationResult  RemoveAllLeftWorkInsurance(long workshopId, long employeeId)
+    public OperationResult RemoveAllLeftWorkInsurance(long workshopId, long employeeId)
     {
         var op = new OperationResult();
 
@@ -161,8 +162,8 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                 var insuranceList = _context.InsuranceListSet.Where(x => x.WorkshopId == workshopId).ToList();
                 foreach (var item in insuranceList)
                 {
-                    hasInsurance =_context.EmployeeInsurancListDataSet.Any(x => x.EmployeeId == employeeId && x.InsuranceListId==item.id);
-                    if(hasInsurance)
+                    hasInsurance = _context.EmployeeInsurancListDataSet.Any(x => x.EmployeeId == employeeId && x.InsuranceListId == item.id);
+                    if (hasInsurance)
                         break;
                 }
                 //tempChange
@@ -174,7 +175,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                 if (list != null && list.Count > 0)
                     _context.LeftWorkInsuranceList.RemoveRange(list);
 
-                bool hasLeftWork = _context.LeftWorkList.Any(x => x.EmployeeId == employeeId && x.WorkshopId==workshopId);
+                bool hasLeftWork = _context.LeftWorkList.Any(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId);
                 if (!hasLeftWork)
                 {
                     var personelCodeList = _context.PersonnelCodeSet.Where(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId).ToList();
@@ -186,8 +187,8 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                 string Message = "";
 
                 if (hasLeftWork)
-                {  
-                    op.Message="حذف با موفقیت انجام شد." + "<br/>" + "<span class='text-warning'>" +"کد پرسنلی این شخص در این کارگاه به دلیل استفاده در ترک کار قرارداد قابل حذف نمی باشد.  " + "</span>";
+                {
+                    op.Message = "حذف با موفقیت انجام شد." + "<br/>" + "<span class='text-warning'>" + "کد پرسنلی این شخص در این کارگاه به دلیل استفاده در ترک کار قرارداد قابل حذف نمی باشد.  " + "</span>";
                     op.IsSuccedded = true;
                 }
                 else
@@ -231,7 +232,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
 
     public List<LeftWorkInsuranceViewModel> SearchForCreateInsuranceList(EmployeeForCreateInsuranceListSearchModel searchModel)
     {
-        List <LeftWorkInsuranceViewModel> listLeftWorkInsurance = new List<LeftWorkInsuranceViewModel>();
+        List<LeftWorkInsuranceViewModel> listLeftWorkInsurance = new List<LeftWorkInsuranceViewModel>();
         // IQueryable<LeftWorkInsuranceViewModel> query;
 
         //if (searchModel.WorkshopIds != null && searchModel.WorkshopIds.Count > 0)
@@ -286,7 +287,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                 leftWorkInsurance.EmployeeId = item.EmployeeId;
                 leftWorkInsurance.IncludeStatus = item.IncludeStatus;
                 leftWorkInsurance.JobId = item.JobId;
-                leftWorkInsurance.JobName = job!=null?job.JobName:string.Empty;
+                leftWorkInsurance.JobName = job != null ? job.JobName : string.Empty;
                 leftWorkInsurance.JobCode = job != null ? job.JobCode : string.Empty;
                 listLeftWorkInsurance.Add(leftWorkInsurance);
             }
@@ -319,7 +320,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
     public LeftWorkInsuranceViewModel GetLeftPersonelByWorkshopIdAndEmployeeId(long workshopId, long employeeId)
     {
         var leftWorkInsurance = new LeftWorkInsuranceViewModel();
-        var leftWorkInsuranceObj = _context.LeftWorkInsuranceList.Where(x=>x.EmployeeId==employeeId && x.WorkshopId==workshopId).OrderByDescending(x=>x.id).FirstOrDefault();
+        var leftWorkInsuranceObj = _context.LeftWorkInsuranceList.Where(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId).OrderByDescending(x => x.id).FirstOrDefault();
 
         if (leftWorkInsuranceObj != null)
         {
@@ -327,7 +328,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
             leftWorkInsurance.LeftWorkDateGr = leftWorkInsuranceObj.LeftWorkDate;
             leftWorkInsurance.StartWorkDateGr = leftWorkInsuranceObj.StartWorkDate;
 
-            if(leftWorkInsuranceObj.LeftWorkDate!=null)
+            if (leftWorkInsuranceObj.LeftWorkDate != null)
                 leftWorkInsurance.LeftWorkDate = leftWorkInsuranceObj.LeftWorkDate.ToFarsi();
 
             leftWorkInsurance.StartWorkDate = leftWorkInsuranceObj.StartWorkDate.ToFarsi();
@@ -361,7 +362,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                     var personelcode = command.PersonnelCodeList.Where(x => x.EmployeeId == command.EmployeeId && x.WorkshopId == command.WorkshopId).FirstOrDefault();
                     if (personelcode != null)
                     {
-                        if(_context.PersonnelCodeSet.Any(x=> x.WorkshopId == command.WorkshopId && x.PersonnelCode == personelcode.PersonnelCode))
+                        if (_context.PersonnelCodeSet.Any(x => x.WorkshopId == command.WorkshopId && x.PersonnelCode == personelcode.PersonnelCode))
                         {
                             op.Failed(" کد پرسنلی در کارگاه " + command.WorkshopName + " تکراری می باشد. ");
                         }
@@ -370,7 +371,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                         {
                             return op.Failed(" کد پرسنلی در کارگاه " + command.WorkshopName + "نامعتبر است.");
                         }
-                        _context.PersonnelCodeSet.Add(new PersonnelCodeDomain(command.WorkshopId,  command.EmployeeId, personelcode.PersonnelCode));
+                        _context.PersonnelCodeSet.Add(new PersonnelCodeDomain(command.WorkshopId, command.EmployeeId, personelcode.PersonnelCode));
                     }
                 }
                 #endregion
@@ -453,11 +454,11 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
 
                         foreach (var removeItem in leftworkInsuranceList)
                         {
-                            if(!item.LeftworkInsuranceViewModels.Any(x=>x.Id==removeItem.id))
+                            if (!item.LeftworkInsuranceViewModels.Any(x => x.Id == removeItem.id))
                                 removeList.Add(removeItem);
                         }
                         foreach (var item2 in item.LeftworkInsuranceViewModels)
-                        {   
+                        {
                             DateTime? left = null;
                             if (!string.IsNullOrWhiteSpace(item2.LeftWorkDate))
                                 left = item2.LeftWorkDate.ToGeorgianDateTime();
@@ -469,7 +470,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                                 var check = _context.LeftWorkInsuranceList.Any(x =>
                                     x.EmployeeId == item2.EmployeeId && x.WorkshopId == item2.WorkshopId &&
                                     x.StartWorkDate == start);
-                         
+
                                 if (!check)
                                 {
 
@@ -477,11 +478,11 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                                         employeeFullName, item2.WorkshopName, item2.JobId, item2.IncludeStatus);
                                     Create(leftworkInsuranceObj);
                                 }
-                              
+
                             }
                             else
                             {
-                                var leftworkInsurance = _context.LeftWorkInsuranceList.Where(x => x.id==item2.Id)?.FirstOrDefault();
+                                var leftworkInsurance = _context.LeftWorkInsuranceList.Where(x => x.id == item2.Id)?.FirstOrDefault();
                                 leftworkInsurance.Edit(left, start, item2.WorkshopId, item2.EmployeeId, item2.JobId, item2.IncludeStatus);
                             }
                         }
@@ -508,13 +509,13 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
 
     public OperationResult CheckDeleteLeftWorkInsurance(long workshopId, long employeeId, DateTime date, int type)
     {
-            
+
         var op = new OperationResult();
         bool hasInsurance = false;
         var insuranceList = _context.InsuranceListSet.Where(x => x.WorkshopId == workshopId).ToList();
         foreach (var item in insuranceList)
         {
-            if(type == 1)
+            if (type == 1)
                 hasInsurance = _context.EmployeeInsurancListDataSet.Any(x => x.EmployeeId == employeeId && x.InsuranceListId == item.id && x.StartWorkDate.Date >= date.Date && item.ConfirmSentlist);
             else
                 hasInsurance = _context.EmployeeInsurancListDataSet.Any(x => x.EmployeeId == employeeId && x.InsuranceListId == item.id && (x.LeftWorkDate != null && ((DateTime)x.LeftWorkDate).Date == date.Date));
@@ -555,7 +556,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
 
         insuranceList = _context.InsuranceListSet.Where(x => x.Year == year && x.Month == month && x.WorkshopId == workshopId).ToList();
         if (insuranceList != null && insuranceList.Count > 0)
-        { 
+        {
             foreach (var item in insuranceList)
             {
                 if (type == 1)
@@ -587,7 +588,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                     }
                 }
 
-                   
+
             }
         }
 
@@ -658,7 +659,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
             {
                 string resulDate = month.ToFarsiMonthByNumber() + " " + year;
                 //tempChange
-               // return op.Failed("در صورت تمایل به ثبت  تاریخ ترک کار به کار این پرسنل می بایست لیست تنظیمی بیمه "+ resulDate + " را حذف نمایید.");
+                // return op.Failed("در صورت تمایل به ثبت  تاریخ ترک کار به کار این پرسنل می بایست لیست تنظیمی بیمه "+ resulDate + " را حذف نمایید.");
             }
         }
 
@@ -670,7 +671,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
     {
         var lefts = _context.LeftWorkInsuranceList
             .Where(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId && x.StartWorkDate < startDate)
-            .OrderBy(x=>x.StartWorkDate)
+            .OrderBy(x => x.StartWorkDate)
             .ToList();
         if (lefts.Count > 0)
         {
@@ -689,74 +690,116 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                 }
             }
 
-            var sum = totalDays.Sum(x=>x);
+            var sum = totalDays.Sum(x => x);
             return (sum / 365);
         }
         else
         {
             return 0;
         }
-      
+
     }
 
     #region Insurance
 
     public List<EmployeeDetailsForInsuranceListViewModel> GetEmployeeInsuranceLeftWorksAndInformation(long workshopId, DateTime startDate, DateTime endDate)
     {
-	    if (workshopId == 0)
-		    return [];
-	    var query = _context.LeftWorkInsuranceList.Include(x => x.Employee)
-		    .Where(x => x.WorkshopId == workshopId)
-		    .Where(x =>
-			    ((x.LeftWorkDate != null && x.LeftWorkDate != DateTime.MinValue) &&
-			     ((DateTime)x.LeftWorkDate >= startDate &&
-			      (DateTime)x.LeftWorkDate <= endDate)) ||
-			    ((x.LeftWorkDate != null && x.LeftWorkDate != DateTime.MinValue) &&
-			     (DateTime)x.LeftWorkDate >= endDate) ||
-			    (x.LeftWorkDate == null || x.LeftWorkDate == DateTime.MinValue))
-		    .Where(x => x.StartWorkDate <= endDate)
-		    .Join(_context.Jobs,
-			    left => left.JobId,
-			    job => job.id,
-			    (left, job) => new { left, job })
-		    .GroupJoin(_context.InsuranceEmployeeInformationSet.AsSplitQuery(),
-			    result => result.left.EmployeeId,
-			    employeeInfo => employeeInfo.EmployeeId,
-			    (result, employeeInfo) => new
-			    {
-				    result.left,
-				    result.job,
-				    employeeInfo
-			    })
-		    .SelectMany(x => x.employeeInfo.DefaultIfEmpty(), (x, employeeInfo) => new { x, employeeInfo })
-		    .Select(result => new EmployeeDetailsForInsuranceListViewModel
-		    {
-			    StartWorkDateGr = result.x.left.StartWorkDate,
-			    LeftWorkDateGr = result.x.left.LeftWorkDate,
-			    IncludeStatus = result.x.left.IncludeStatus,
-			    JobId = result.x.left.JobId,
-			    JobName = result.x.job != null ? result.x.job.JobName : string.Empty,
-			    JobCode = result.x.job != null ? result.x.job.JobCode : string.Empty,
-			    InsuranceEmployeeInformationId = result.employeeInfo != null ? result.employeeInfo.id : 0,
-			    EmployeeId = result.x.left.EmployeeId,
-                
-			    //اطلاعات هویتی
-			    FName = result.employeeInfo != null ? result.employeeInfo.FName : result.x.left.Employee.FName,
-			    LName = result.employeeInfo != null ? result.employeeInfo.LName : result.x.left.Employee.LName,
-			    FatherName = result.employeeInfo != null ? result.employeeInfo.FatherName : result.x.left.Employee.FatherName,
-			    DateOfBirthGr = result.employeeInfo != null ? result.employeeInfo.DateOfBirth : result.x.left.Employee.DateOfBirth,
-				DateOfIssueGr = result.employeeInfo != null ? result.employeeInfo.DateOfIssue : result.x.left.Employee.DateOfIssue,
-				PlaceOfIssue = result.employeeInfo != null ? result.employeeInfo.PlaceOfIssue : result.x.left.Employee.PlaceOfIssue,
-				IdNumber = result.employeeInfo != null ? result.employeeInfo.IdNumber : result.x.left.Employee.IdNumber,
-				Gender = result.employeeInfo != null ? result.employeeInfo.Gender : result.x.left.Employee.Gender,
-				NationalCode  = result.x.left.Employee.NationalCode,
-				Nationality   = result.x.left.Employee.Nationality,
-				InsuranceCode = result.x.left.Employee.InsuranceCode,
-				MaritalStatus = result.x.left.Employee.MaritalStatus,
-                IsMaritalStatusSet = !string.IsNullOrWhiteSpace(result.x.left.Employee.MaritalStatus)
-			}).ToList();
+        if (workshopId == 0)
+            return [];
+        var query = _context.LeftWorkInsuranceList.Include(x => x.Employee)
+            .Where(x => x.WorkshopId == workshopId)
+            .Where(x =>
+                ((x.LeftWorkDate != null && x.LeftWorkDate != DateTime.MinValue) &&
+                 ((DateTime)x.LeftWorkDate >= startDate &&
+                  (DateTime)x.LeftWorkDate <= endDate)) ||
+                ((x.LeftWorkDate != null && x.LeftWorkDate != DateTime.MinValue) &&
+                 (DateTime)x.LeftWorkDate >= endDate) ||
+                (x.LeftWorkDate == null || x.LeftWorkDate == DateTime.MinValue))
+            .Where(x => x.StartWorkDate <= endDate)
+            .Join(_context.Jobs,
+                left => left.JobId,
+                job => job.id,
+                (left, job) => new { left, job })
+            .GroupJoin(_context.InsuranceEmployeeInformationSet.AsSplitQuery(),
+                result => result.left.EmployeeId,
+                employeeInfo => employeeInfo.EmployeeId,
+                (result, employeeInfo) => new
+                {
+                    result.left,
+                    result.job,
+                    employeeInfo
+                })
+            .SelectMany(x => x.employeeInfo.DefaultIfEmpty(), (x, employeeInfo) => new { x, employeeInfo })
+            .Select(result => new EmployeeDetailsForInsuranceListViewModel
+            {
+                StartWorkDateGr = result.x.left.StartWorkDate,
+                LeftWorkDateGr = result.x.left.LeftWorkDate,
+                IncludeStatus = result.x.left.IncludeStatus,
+                JobId = result.x.left.JobId,
+                JobName = result.x.job != null ? result.x.job.JobName : string.Empty,
+                JobCode = result.x.job != null ? result.x.job.JobCode : string.Empty,
+                InsuranceEmployeeInformationId = result.employeeInfo != null ? result.employeeInfo.id : 0,
+                EmployeeId = result.x.left.EmployeeId,
 
-		return query;
+                //اطلاعات هویتی
+                FName = result.employeeInfo != null ? result.employeeInfo.FName : result.x.left.Employee.FName,
+                LName = result.employeeInfo != null ? result.employeeInfo.LName : result.x.left.Employee.LName,
+                FatherName = result.employeeInfo != null ? result.employeeInfo.FatherName : result.x.left.Employee.FatherName,
+                DateOfBirthGr = result.employeeInfo != null ? result.employeeInfo.DateOfBirth : result.x.left.Employee.DateOfBirth,
+                DateOfIssueGr = result.employeeInfo != null ? result.employeeInfo.DateOfIssue : result.x.left.Employee.DateOfIssue,
+                PlaceOfIssue = result.employeeInfo != null ? result.employeeInfo.PlaceOfIssue : result.x.left.Employee.PlaceOfIssue,
+                IdNumber = result.employeeInfo != null ? result.employeeInfo.IdNumber : result.x.left.Employee.IdNumber,
+                Gender = result.employeeInfo != null ? result.employeeInfo.Gender : result.x.left.Employee.Gender,
+                NationalCode = result.x.left.Employee.NationalCode,
+                Nationality = result.x.left.Employee.Nationality,
+                InsuranceCode = result.x.left.Employee.InsuranceCode,
+                MaritalStatus = result.x.left.Employee.MaritalStatus,
+                IsMaritalStatusSet = !string.IsNullOrWhiteSpace(result.x.left.Employee.MaritalStatus)
+            }).ToList();
+
+        return query;
+    }
+
+    #endregion
+
+    #region Mahan
+
+    public List<LeftWorkViewModel> GetEmployeesWithContractExitOnly(long workshopId)
+    {
+        var leftWorkedEmployees = _context.LeftWorkList
+            .Where(x => x.WorkshopId == workshopId)
+            .GroupBy(x => x.EmployeeId)
+            .Select(x => new
+            {
+                EmployeeId = x.Key,
+                x.OrderByDescending(s => s.StartWorkDate).FirstOrDefault().LeftWorkDate
+            }).Where(x => x.LeftWorkDate != new DateTime(2121, 3, 21))
+            .ToList();
+
+        var leftWorkEmployeeIds = leftWorkedEmployees.Select(x => x.EmployeeId);
+
+        var insuranceLeftWorkWithContractExitOnly = _context.LeftWorkInsuranceList.Where(x =>
+                x.WorkshopId == workshopId && leftWorkEmployeeIds.Contains(x.EmployeeId) && x.LeftWorkDate == null).ToList()
+            .Select(x =>
+            {
+                var employee = leftWorkedEmployees.First(l => l.EmployeeId == x.EmployeeId);
+                return new LeftWorkViewModel()
+                {
+                    WorkshopId = x.WorkshopId,
+                    EmployeeId = x.EmployeeId,
+                    EmployeeFullName = x.EmployeeFullName,
+                    LeftWorkDate = employee.LeftWorkDate.ToFarsi(),
+                    LeftWorkDateGr = employee.LeftWorkDate
+                };
+            });
+
+        return insuranceLeftWorkWithContractExitOnly.ToList();
+    }
+
+    public LeftWorkInsurance GetLastLeftWorkByEmployeeIdAndWorkshopId(long workshopId, long employeeId)
+    {
+	    return _context.LeftWorkInsuranceList.Where(x => x.WorkshopId == workshopId && x.EmployeeId == employeeId)
+		    .OrderByDescending(x => x.StartWorkDate).FirstOrDefault();
     }
 
     #endregion

CompanyManagment.EFCore/Repository/LeftWorkRepository.cs

@@ -173,7 +173,7 @@ public class LeftWorkRepository : RepositoryBase<long, LeftWork>, ILeftWorkRepos
         }
 
 
-
+        _context.SaveChanges();
         return op.Succcedded();
     }
 
@@ -649,6 +649,42 @@ public class LeftWorkRepository : RepositoryBase<long, LeftWork>, ILeftWorkRepos
         return leftWork;
     }
 
+    public List<LeftWorkViewModel> SearchCreateContract(LeftWorkSearchModel searchModel)
+    {
+        var vipGroup = _context.CustomizeWorkshopEmployeeSettings.Where(x => x.CustomizeWorkshopGroupSettingId == 117)
+            .Select(x => x.EmployeeId)
+            .Except([5976]).ToList();
+        var clientTemps = _context.EmployeeClientTemps.Where(x => x.WorkshopId == searchModel.WorkshopId)
+	        .Select(x => x.EmployeeId);
+
+		var query = _context.LeftWorkList.Select(x => new LeftWorkViewModel()
+        {
+            Id = x.id,
+            LeftWorkDate = x.LeftWorkDate.ToFarsi(),
+            StartWorkDate = x.StartWorkDate.ToFarsi(),
+            LeftWorkDateGr = x.LeftWorkDate,
+            StartWorkDateGr = x.StartWorkDate,
+            EmployeeFullName = x.EmployeeFullName,
+            WorkshopName = x.WorkshopName,
+            WorkshopId = x.WorkshopId,
+            EmployeeId = x.EmployeeId,
+            AddBonusesPay = x.AddBonusesPay,
+            AddYearsPay = x.AddYearsPay,
+            AddLeavePay = x.AddLeavePay,
+            JobId = x.JobId,
+            JobName = _context.Jobs.FirstOrDefault(j => j.id == x.JobId).JobName
+
+
+        }).Where(x=> !vipGroup.Contains(x.EmployeeId) && !clientTemps.Contains(x.EmployeeId));
+        if (searchModel.WorkshopId != 0 && searchModel.EmployeeId != 0)
+            query = query.Where(x => x.WorkshopId == searchModel.WorkshopId && x.EmployeeId == searchModel.EmployeeId);
+        if (searchModel.EmployeeId != 0 && searchModel.WorkshopId == 0)
+            query = query.Where(x => x.EmployeeId == searchModel.EmployeeId);
+        if (searchModel.WorkshopId != 0 && searchModel.EmployeeId == 0)
+            query = query.Where(x => x.WorkshopId == searchModel.WorkshopId);
+        return query.OrderByDescending(x => x.StartWorkDateGr).ToList();
+    }
+
     private bool HasActiveRollCallStatus(long workshopId, long employeeId)
     {
         var now = DateTime.Today;