add goverment list calculation

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/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

0_Framework/Application/Tools.cs

@@ -41,23 +41,6 @@ public static class Tools
         return Regex.IsMatch(mobileNo, "^((09))(\\d{9})$");
     }
 
-    /// <summary>
-    /// تاریخ شروع و تعداد ماه را میگیرد و تاریخ پایان قراردا را بر میگرداند
-    /// </summary>
-    /// <param name="startDate"></param>
-    /// <param name="monthPlus"></param>
-    /// <returns></returns>
-    public static (DateTime endDateGr, string endDateFa) FindEndOfContract(string startDate, string monthPlus)
-    {
-
-        int startYear = Convert.ToInt32(startDate.Substring(0, 4));
-        int startMonth = Convert.ToInt32(startDate.Substring(5, 2));
-        int startDay = Convert.ToInt32(startDate.Substring(8, 2));
-        var start = new PersianDateTime(startYear, startMonth, startDay);
-        var end = (start.AddMonths(Convert.ToInt32(monthPlus))).AddDays(-1);
-        return ($"{end}".ToGeorgianDateTime(), $"{end}");
-
-    }
 
     /// <summary>
     /// دریافت روزهای کارکرد پرسنل در لیست بیمه ماه مشخص شده

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/Media/IMediaApplication.cs

@@ -4,12 +4,13 @@ using System.Collections.Generic;
 
 namespace AccountManagement.Application.Contracts.Media
 {
-	public interface IMediaApplication
-	{
-		MediaViewModel Get(long id);
-		OperationResult UploadFile(IFormFile file, string fileLabel, string relativePath, int maximumFileLength, List<string> allowedExtensions);
-		OperationResult MoveFile(long mediaId, string newRelativePath);
-		OperationResult DeleteFile(long mediaId);
-		List<MediaViewModel> GetRange(IEnumerable<long> select);
-	}
-}
+    public interface IMediaApplication
+    {
+        MediaViewModel Get(long id);
+        OperationResult UploadFile(IFormFile file, string fileLabel, string relativePath, int maximumFileLength,
+            List<string> allowedExtensions, string category);
+        OperationResult MoveFile(long mediaId, string newRelativePath);
+        OperationResult DeleteFile(long mediaId);
+        List<MediaViewModel> GetRange(IEnumerable<long> select);
+    }
+}

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/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/MediaApplication.cs

@@ -9,147 +9,113 @@ using Microsoft.AspNetCore.Http;
 
 namespace AccountManagement.Application
 {
-	public class MediaApplication:IMediaApplication
-	{
+    public class MediaApplication : IMediaApplication
+    {
 
 
-		private const string _basePath = "Medias";
-		private readonly IMediaRepository _mediaRepository;
+        private const string _basePath = "Medias";
+        private readonly IMediaRepository _mediaRepository;
 
-		public MediaApplication(IMediaRepository mediaRepository)
-		{
-			_mediaRepository = mediaRepository;
-		}
+        public MediaApplication(IMediaRepository mediaRepository)
+        {
+            _mediaRepository = mediaRepository;
+        }
 
 
-		/// <summary>
-		/// دریافت فایل و نوشتن آن در مسیر داده شده، و ثبت مدیا
-		/// </summary>
-		/// <param name="file">فایل</param>
-		/// <param name="fileLabel">برچسب فایل که در نام فایل ظاهر می شود</param>
-		/// <param name="relativePath">مسیر فایل</param>
-		/// <param name="allowedExtensions">[.png,.jpg,.jpeg] پسوند های مجاز مثلا </param>
-		/// <param name="maximumFileLength">حداکثر حجم فایل به مگابایت</param>
-		/// <returns></returns>
-		public OperationResult UploadFile(IFormFile file, string fileLabel, string relativePath,int maximumFileLength,List<string> allowedExtensions)
-		{
-			OperationResult op = new();
-			var path = Path.Combine(_basePath, relativePath);
-			var fileExtension = Path.GetExtension(file.FileName);
-
-			if (file == null || file.Length == 0)
-				return op.Failed("خطای سیستمی");
-
-			if (file.Length > (maximumFileLength * 1024 * 1024))
-				return op.Failed($"حجم فایل نمی تواند بیشتر از " +
-				                 $"{maximumFileLength}" +
-				                 $"مگابایت باشد");
-
-			if (!allowedExtensions.Contains(fileExtension.ToLower()))
-			{
-				var operationMessage = ":فرمت فایل باید یکی از موارد زیر باشد";
-				operationMessage += "\n";
-				operationMessage += string.Join(" ", allowedExtensions);
-				return op.Failed(operationMessage);
-			}
+        /// <summary>
+        /// دریافت فایل و نوشتن آن در مسیر داده شده، و ثبت مدیا
+        /// </summary>
+        /// <param name="file">فایل</param>
+        /// <param name="fileLabel">برچسب فایل که در نام فایل ظاهر می شود</param>
+        /// <param name="relativePath">مسیر فایل</param>
+        /// <param name="maximumFileLength">حداکثر حجم فایل به مگابایت</param>
+        /// <param name="allowedExtensions">[.png,.jpg,.jpeg] پسوند های مجاز مثلا </param>
+        /// <param name="category"></param>
+        /// <returns></returns>
+        public OperationResult UploadFile(IFormFile file, string fileLabel, string relativePath, int maximumFileLength,
+            List<string> allowedExtensions, string category)
+        {
+            return _mediaRepository.UploadFile(file, fileLabel, relativePath, maximumFileLength, allowedExtensions, category);
+        }
 
 
-			Directory.CreateDirectory(path);
+        /// <summary>
+        /// حذف فایل
+        /// </summary>
+        public OperationResult DeleteFile(long mediaId)
+        {
+            OperationResult op = new();
+            var media = _mediaRepository.Get(mediaId);
+            if (media == null)
+                return op.Failed("رکورد مورد نظر یافت نشد");
+            try
+            {
+                if (File.Exists(media.Path))
+                    File.Delete(media.Path);
+                else
+                    return op.Failed("فایل یافت نشد");
+            }
+            catch
+            {
+                return op.Failed("خطایی در حذف فایل رخ داده است");
+            }
 
-			var extension = Path.GetExtension(file.FileName);
+            _mediaRepository.Remove(media.id);
+            _mediaRepository.SaveChanges();
+            return op.Succcedded();
+        }
 
-			var uniqueFileName = $"{fileLabel}-{DateTime.Now.Ticks}{extension}";
-			var filePath = Path.Combine(path, uniqueFileName);
-			using (var fileStream = new FileStream(filePath, FileMode.CreateNew))
-			{
-				file.CopyTo(fileStream);
-			}
-			var mediaEntity = new Media(filePath, extension, "فایل", "EmployeeDocuments");
-			_mediaRepository.Create(mediaEntity);
-			_mediaRepository.SaveChanges();
+        /// <summary>
+        /// جابجا کردن فایل 
+        /// </summary>
+        public OperationResult MoveFile(long mediaId, string newRelativePath)
+        {
+            OperationResult op = new();
+            var media = _mediaRepository.Get(mediaId);
+            var oldPath = media.Path;
+            var path = Path.Combine(_basePath, newRelativePath);
+            Directory.CreateDirectory(path);
 
-			return op.Succcedded(mediaEntity.id);
+            string filepath = Path.Combine(path, Path.GetFileName(oldPath));
+            try
+            {
+                File.Move(oldPath, filepath);
+            }
+            catch
+            {
+                return op.Failed("در جابجایی فایل خطایی رخ داده است");
+            }
 
-		}
+            media.Edit(filepath, media.Type, media.Category);
+            _mediaRepository.SaveChanges();
+            return op.Succcedded();
+        }
 
+        public MediaViewModel Get(long id)
+        {
+            var media = _mediaRepository.Get(id);
+            if (media == null)
+                return new();
+            return new MediaViewModel()
+            {
+                Category = media.Category,
+                Path = media.Path,
+                Id = media.id,
+                Type = media.Type
+            };
+        }
 
-		/// <summary>
-		/// حذف فایل
-		/// </summary>
-		public OperationResult DeleteFile(long mediaId)
-		{
-			OperationResult op = new();
-			var media = _mediaRepository.Get(mediaId);
-			if (media == null)
-				return op.Failed("رکورد مورد نظر یافت نشد");
-			try
-			{
-				if (File.Exists(media.Path))
-					File.Delete(media.Path);
-				else
-					return op.Failed("فایل یافت نشد");
-			}
-			catch
-			{
-				return op.Failed("خطایی در حذف فایل رخ داده است");
-			}
+        public List<MediaViewModel> GetRange(IEnumerable<long> ids)
+        {
+            var medias = _mediaRepository.GetRange(ids);
+            return medias.Select(x => new MediaViewModel()
+            {
+                Category = x.Category,
+                Path = x.Path,
+                Id = x.id,
+                Type = x.Type,
+            }).ToList();
+        }
 
-			_mediaRepository.Remove(media.id);
-			_mediaRepository.SaveChanges();
-			return op.Succcedded();
-		}
-
-		/// <summary>
-		/// جابجا کردن فایل 
-		/// </summary>
-		public OperationResult MoveFile(long mediaId, string newRelativePath)
-		{
-			OperationResult op = new();
-			var media = _mediaRepository.Get(mediaId);
-			var oldPath = media.Path;
-			var path = Path.Combine(_basePath, newRelativePath);
-			Directory.CreateDirectory(path);
-
-			string filepath = Path.Combine(path, Path.GetFileName(oldPath));
-			try
-			{
-				File.Move(oldPath, filepath);
-			}
-			catch
-			{
-				return op.Failed("در جابجایی فایل خطایی رخ داده است");
-			}
-
-			media.Edit(filepath, media.Type, media.Category);
-			_mediaRepository.SaveChanges();
-			return op.Succcedded();
-		}
-
-		public MediaViewModel Get(long id)
-		{
-			var media = _mediaRepository.Get(id);
-			if (media == null)
-				return new();
-			return new MediaViewModel()
-			{
-				Category = media.Category,
-				Path = media.Path,
-				Id = media.id,
-				Type = media.Type
-			};
-		}
-
-		public List<MediaViewModel> GetRange(IEnumerable<long> ids)
-		{
-			var medias = _mediaRepository.GetRange(ids);
-			return medias.Select(x=>new MediaViewModel()
-			{
-				Category = x.Category,
-				Path = x.Path,
-				Id = x.id,
-				Type = x.Type,
-			}).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/MediaAgg/IMediaRepository.cs

@@ -1,12 +1,15 @@
 using System.Collections.Generic;
+using _0_Framework.Application;
 using _0_Framework.Domain;
 using AccountManagement.Application.Contracts.Media;
+using Microsoft.AspNetCore.Http;
 
 
 namespace AccountManagement.Domain.MediaAgg;
 
-public interface IMediaRepository:IRepository<long,Media>
+public interface IMediaRepository : IRepository<long, Media>
 {
+    public string BasePath { get; protected set; }
     void CreateMediaWithTaskMedia(long taskId, long mediaId);
     List<MediaViewModel> GetMediaByTaskId(long taskId);
     void Remove(long id);
@@ -23,4 +26,6 @@ public interface IMediaRepository:IRepository<long,Media>
 
     #endregion
 
+    OperationResult UploadFile(IFormFile file, string fileLabel, string relativePath, int maximumFileLength,
+        List<string> allowedExtensions, string category);
 }

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/MediaRepository.cs

@@ -1,5 +1,8 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using AccountManagement.Application.Contracts.Media;
 using AccountManagement.Domain.AdminResponseMediaAgg;
@@ -7,27 +10,35 @@ using AccountManagement.Domain.ClientResponseMediaAgg;
 using AccountManagement.Domain.MediaAgg;
 using AccountManagement.Domain.TaskMediaAgg;
 using AccountManagement.Domain.TicketMediasAgg;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 
 namespace AccountMangement.Infrastructure.EFCore.Repository;
 
-public class MediaRepository:RepositoryBase<long,Media>,IMediaRepository
+public class MediaRepository : RepositoryBase<long, Media>, IMediaRepository
 {
+    private const string _basePath = "Storage/Medias";
+    public string BasePath { get; set; }
+
+
     private readonly AccountContext _accountContext;
-    public MediaRepository( AccountContext taskManagerContext) : base(taskManagerContext)
+    public MediaRepository(AccountContext taskManagerContext, IWebHostEnvironment webHostEnvironment) : base(taskManagerContext)
     {
         _accountContext = taskManagerContext;
+        BasePath = webHostEnvironment.ContentRootPath + "/Storage";
     }
     //ساخت جدول واسط بین مدیا و نسک
     //نکته: این متد ذخیره انجام نمیدهد
+
     public void CreateMediaWithTaskMedia(long taskId, long mediaId)
     {
-        var Taskmedias = new TaskMedia(taskId,mediaId);
+        var Taskmedias = new TaskMedia(taskId, mediaId);
         _accountContext.Add(Taskmedias);
     }
     public void Remove(long id)
     {
-	    var media = Get(id);
+        var media = Get(id);
         Remove(media);
     }
 
@@ -77,6 +88,48 @@ public class MediaRepository:RepositoryBase<long,Media>,IMediaRepository
     {
         return _accountContext.Medias.Where(x => mediaIds.Contains(x.id)).ToList();
     }
+
+    public OperationResult UploadFile(IFormFile file, string fileLabel, string relativePath, int maximumFileLength,
+        List<string> allowedExtensions, string category)
+    {
+        OperationResult op = new();
+        var path = Path.Combine(_basePath, relativePath);
+        var fileExtension = Path.GetExtension(file.FileName);
+
+        if (file == null || file.Length == 0)
+            return op.Failed("خطای سیستمی");
+
+        if (file.Length > (maximumFileLength * 1024 * 1024))
+            return op.Failed($"حجم فایل نمی تواند بیشتر از " +
+                             $"{maximumFileLength}" +
+                             $"مگابایت باشد");
+
+        if (!allowedExtensions.Contains(fileExtension.ToLower()))
+        {
+            var operationMessage = ":فرمت فایل باید یکی از موارد زیر باشد";
+            operationMessage += "\n";
+            operationMessage += string.Join(" ", allowedExtensions);
+            return op.Failed(operationMessage);
+        }
+
+
+        Directory.CreateDirectory(path);
+
+        var extension = Path.GetExtension(file.FileName);
+
+        var uniqueFileName = $"{fileLabel}-{DateTime.Now.Ticks}{extension}";
+        var filePath = Path.Combine(path, uniqueFileName);
+        using (var fileStream = new FileStream(filePath, FileMode.CreateNew))
+        {
+            file.CopyTo(fileStream);
+        }
+        var mediaEntity = new Media(filePath, extension, "فایل", category);
+        Create(mediaEntity);
+        SaveChanges();
+
+        return op.Succcedded(mediaEntity.id);
+
+    }
 }
 
 #endregion

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

@@ -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, false),
+            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 =>
@@ -2153,7 +2153,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         return final;
     }
 
-    public string SetTasksColors(DateTime date, bool isCancel, bool hasRequest)
+    public string SetTasksColors(DateTime date, bool isCancel,bool hasRequest)
     {
         if (hasRequest)
             return "red";
@@ -2735,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.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 =>
@@ -2768,7 +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))
         {
@@ -2878,8 +2878,8 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
 
 
         var orderResult = result.OrderBy(x => x.IsDone || x.IsCancel)
-            .ThenByDescending(x => x.EndTaskDateGE <= today.AddDays(1) && !x.HasRequest)
-            .ThenByDescending(x => x.HasRequest)
+            .ThenByDescending(x => x.EndTaskDateGE <= today.AddDays(1) && !x.RequestTime)
+            .ThenByDescending(x => x.RequestTime)
             .ThenBy(x => x.EndTaskDateGE); // مرتب‌سازی داخلی بر اساس تاریخ
 
 
@@ -2915,7 +2915,6 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             SelfName = x.SelfName,
             Description = x.Description,
             IsDoneRequest = x.IsDoneRequest,
-            HasRequest = x.IsDoneRequest || x.RequestTime || x.IsCancelRequest
 
         }).ToList();
 
@@ -2943,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, x.HasRequest),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel,x.RequestTime),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -3003,6 +3002,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                     AssignedPositionValue = 0
                 },
             HasRequest = x.IsCancelRequest || x.RequestTime || x.IsDoneRequest
+
         }).ToList();
         return final;
     }

Company.Domain/CheckoutAgg/ICheckoutRepository.cs

@@ -23,6 +23,23 @@ public interface ICheckoutRepository : IRepository<long, Checkout>
     EditCheckout GetDetails(long id);
 
     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/ContactUsAgg/ContactUs.cs

@@ -1,26 +0,0 @@
-using _0_Framework.Domain;
-
-namespace Company.Domain.ContactUsAgg;
-
-public class ContactUs:EntityBase
-{
-    public ContactUs(string firstName, string lastName, string email, string phoneNumber, string title, string message)
-    {
-        FirstName = firstName.Trim();
-        LastName = lastName.Trim();
-        Email = email;
-        PhoneNumber = phoneNumber;
-        Title = title;
-        Message = message;
-        FullName = FirstName + " " + LastName;
-    }
-
-    public string FirstName { get; private set; }
-    public string LastName { get; private set; }
-    public string Email { get; private set; }
-    public string PhoneNumber { get; private set; }
-    public string Title { get; private set; }   
-    public string Message { get; private set; }
-    public string FullName { get; private set; }
-    
-}

Company.Domain/ContactUsAgg/IContactUsRepository.cs

@@ -1,8 +0,0 @@
-using _0_Framework.Domain;
-
-namespace Company.Domain.ContactUsAgg;
-
-public interface IContactUsRepository : IRepository<long, ContactUs>
-{
-
-}

Company.Domain/CustomizeWorkshopEmployeeSettingsAgg/Entities/CustomizeWorkshopEmployeeSettings.cs

@@ -213,7 +213,6 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
             earlyExit.EarlyExitTimeFines.Select(x => new EarlyExitTimeFine(x.Minute, x.FineMoney))
                 .ToList(), earlyExit.Value);
     }
-
     public void UpdateIsShiftChange()
     {
         var groupSetting = CustomizeWorkshopGroupSettings;
@@ -270,10 +269,4 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
 
         IsShiftChanged = isShiftChange;
     }
-
-
-    public void SetSalary(double salary)
-    {
-        Salary = salary;
-    }
 }

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/InsuranceListAgg/IInsuranceListRepository.cs

@@ -60,4 +60,13 @@ public interface IInsuranceListRepository:IRepository<long, InsuranceList>
     #region client
     List<InsuranceListViewModel> SearchForClient(InsuranceListSearchModel searchModel);
     #endregion
-}
+
+    #region Mahan
+    Task<InsuranceListConfirmOperation> GetInsuranceOperationDetails(long id);
+
+    Task<InsuranceListTabsCountViewModel> GetTabCounts(long accountId,int month,int year);
+
+    #endregion
+}
+
+

Company.Domain/InsuranceListAgg/InsuranceList.cs

@@ -4,7 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using _0_Framework.Domain;
+using Company.Domain.InsuranceListAgg.ValueObjects;
 using Company.Domain.InsuranceWorkshopAgg;
+using CompanyManagment.App.Contracts.InsuranceList.Enums;
 
 namespace Company.Domain.InsuranceListAgg;
 
@@ -151,6 +153,21 @@ public class InsuranceList : EntityBase
     /// </summary>
     public double SumOfMarriedAllowance { get; private set; }
 
+    #region Mahan
+    /// <summary>
+    /// بازرسی
+    /// </summary>
+    public InsuranceListInspection Inspection { get; set; }  =new (InsuranceListInspectionType.None,DateTime.MinValue, 0);
+    /// <summary>
+    /// بدهی
+    /// </summary>
+    public InsuranceListDebt Debt { get; set; } = new(InsuranceListDebtType.None, DateTime.MinValue, 0, 0);
+    /// <summary>
+    /// تاییدیه کارفرما
+    /// </summary>
+    public InsuranceListEmployerApproval EmployerApproval { get; set; } = new(InsuranceListEmployerApprovalStatus.None, string.Empty);
+    #endregion
+
     public List<InsuranceListWorkshop> InsuranceListWorkshops { get; set; }
 
     public void Edit(int sumOfEmployees, int sumOfWorkingDays, double sumOfSalaries, double sumOfBenefitsIncluded, double included, 
@@ -174,4 +191,22 @@ public class InsuranceList : EntityBase
         SumOfDailyWagePlusBaseYears = sumOfDailyWage + sumOfBaseYears;
     }
 
-}
+
+    public void SetDebt(InsuranceListDebt debt)
+    {
+        Debt = debt;
+    }
+    public void SetInspection(InsuranceListInspection inspection)
+    {
+        Inspection = inspection;
+    }
+    public void SetEmployerApproval(InsuranceListEmployerApproval employerApproval)
+    {
+        EmployerApproval = employerApproval;
+    }
+    public void SetConfirmSentlist(bool confirmSentlist)
+    {
+        ConfirmSentlist = confirmSentlist;
+    }
+
+}

Company.Domain/InsuranceListAgg/ValueObjects/InsuranceListDebt.cs

@@ -0,0 +1,31 @@
+using System;
+using CompanyManagment.App.Contracts.InsuranceList.Enums;
+
+namespace Company.Domain.InsuranceListAgg.ValueObjects;
+
+public class InsuranceListDebt
+{
+    public InsuranceListDebt(InsuranceListDebtType type, DateTime debtDate, double amount, long mediaId)
+    {
+        Type = type;
+        if (type == InsuranceListDebtType.None)
+        {
+            DebtDate = DateTime.MinValue;
+            Amount = 0;
+            MediaId = 0;
+        }
+        else
+        {
+            DebtDate = debtDate;
+            Amount = amount;
+            MediaId = mediaId;
+            IsDone = true;
+        }
+    }
+
+    public InsuranceListDebtType Type { get; set; }
+    public DateTime DebtDate { get; set; }
+    public double Amount { get; set; }
+    public long MediaId { get; set; }
+    public bool IsDone { get; set; }
+}

Company.Domain/InsuranceListAgg/ValueObjects/InsuranceListEmployerApproval.cs

@@ -0,0 +1,26 @@
+using System.Security.Cryptography;
+using CompanyManagment.App.Contracts.InsuranceList.Enums;
+
+namespace Company.Domain.InsuranceListAgg.ValueObjects;
+
+public class InsuranceListEmployerApproval
+{
+    public InsuranceListEmployerApproval(InsuranceListEmployerApprovalStatus status, string description)
+    {
+        Status = status;
+        if (status == InsuranceListEmployerApprovalStatus.None)
+        {
+            Description = string.Empty;
+        }
+        else
+        {
+            
+            Description = description;
+            IsDone = true;
+        }
+    }
+
+    public InsuranceListEmployerApprovalStatus Status { get; set; }
+    public string Description { get; set; }
+    public bool IsDone { get; set; }
+}

Company.Domain/InsuranceListAgg/ValueObjects/InsuranceListInspection.cs

@@ -0,0 +1,29 @@
+using System;
+using CompanyManagment.App.Contracts.InsuranceList.Enums;
+
+namespace Company.Domain.InsuranceListAgg.ValueObjects;
+
+public class InsuranceListInspection
+{
+    public InsuranceListInspection(InsuranceListInspectionType type, DateTime lastInspectionDateTime, long mediaId)
+    {
+        Type = type;
+        if (type == InsuranceListInspectionType.None)
+        {
+            LastInspectionDateTime = DateTime.MinValue;
+            MediaId = 0;
+        }
+        else
+        {
+            LastInspectionDateTime = lastInspectionDateTime;
+            MediaId = mediaId;
+            IsDone = true;
+        }
+    }
+
+    public InsuranceListInspectionType Type { get; set; }
+    public DateTime LastInspectionDateTime { get; set; }
+    public long MediaId { get; set; }
+    public bool IsDone { get; set; }
+
+}

Company.Domain/LeftWorkInsuranceAgg/ILeftWorkInsuranceRepository.cs

@@ -52,5 +52,8 @@ public interface ILeftWorkInsuranceRepository : IRepository<long, LeftWorkInsura
     /// <returns></returns>
     List<LeftWorkViewModel> GetEmployeesWithContractExitOnly(long workshopId);
 
+    LeftWorkInsurance GetLastLeftWorkByEmployeeIdAndWorkshopId(long workshopId, long employeeId);
+
     #endregion
+
 }

Company.Domain/RollCallAgg/IRollCallMandatoryRepository.cs

@@ -16,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);
 
@@ -26,12 +38,6 @@ public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
     List<LateToWorkEarlyExistSpannig> LateToWorkEarlyExit(List<GroupedRollCalls> groupedRollCall,
         ICollection<CustomizeWorkshopEmployeeSettingsShift> shiftSettings, List<LeaveViewModel> leavList);
 
-    List<LoanInstallmentViewModel> LoanInstallmentForCheckout(long employeeId, long workshopId, DateTime contractStart,
-        DateTime contractEnd);
-
-    List<SalaryAidViewModel> SalaryAidsForCheckout(long employeeId, long workshopId, DateTime checkoutStart,
-        DateTime checkoutEnd);
-
     /// <summary>
     /// گزارش نوبت کاری حضور غیاب
     /// </summary>
@@ -41,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);

Company.Domain/SalaryAidAgg/SalaryAid.cs

@@ -23,6 +23,7 @@ public class SalaryAid : EntityBase
         CalculationMonth = calculationMonth;
         CalculationYear = calculationYear;
     }
+
     public long EmployeeId { get; private set; }
     public long WorkshopId { get; private set; }
     public double Amount { get; private set; }

Company.Domain/TemporaryClientRegistrationAgg/IWorkshopTempRepository.cs

@@ -14,7 +14,5 @@ public interface IWorkshopTempRepository : IRepository<long, WorkshopTemp>
     /// <returns></returns>
     Task<List<WorkshopTempViewModel>> GetWorkshopTemp(long contractingPartyTemp);
 
-    System.Threading.Tasks.Task RemoveWorkshopTemps(List<long> workshopTempIds);
-
 
 }

Company.Domain/TemporaryClientRegistrationAgg/InstitutionContractTemp.cs

@@ -34,14 +34,12 @@ public class InstitutionContractTemp : EntityBase
     /// بصورت یکجا
     /// -
     /// بصئورت ماهیانه
-    /// OneTime
     /// </summary>
     public string PaymentModel { get; private set; }
 
     /// <summary>
     /// مدت قرارداد
     /// چند ماهه؟
-    /// "12"
     /// </summary>
     public string PeriodModel { get; private set; }
 

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

@@ -132,6 +132,8 @@ public class CheckoutViewModel
     /// مدت مرخصی استحقاقی
     /// </summary>
     public string TotalPaidLeave { get; set; }
+
+    public TimeSpan TotalHourlyLeave { 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/ContactUs/IContactUsApplication.cs

@@ -1,18 +0,0 @@
-using _0_Framework.Application;
-
-namespace CompanyManagment.App.Contracts.ContactUs;
-
-public interface IContactUsApplication
-{
-    OperationResult Create(CreateContactUs command);
-}
-
-public class CreateContactUs
-{
-    public string FirstName { get; set; }
-    public string LastName { get; set; }
-    public string Email { get; set; }
-    public string PhoneNumber { get; set; }
-    public string Title { get; set; }
-    public string Message { get; set; }
-}

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CustomizeWorkshopGroupSettingsViewModel.cs

@@ -8,7 +8,6 @@ public class CustomizeWorkshopGroupSettingsViewModel
 {
 	public long Id { get; set; }
 	public double Salary { get; set; }
-	public string SalaryStr { get; set; }
     public string GroupName { get; set; }
     public bool MainGroup { get; set; }
     public List<CustomizeWorkshopShiftViewModel> RollCallWorkshopShifts { get; set; }
@@ -19,5 +18,4 @@ public class CustomizeWorkshopGroupSettingsViewModel
     public BreakTime BreakTime { get; set; }
     public FridayWork FridayWork { get; set; }
     public HolidayWork HolidayWork { get; set; }
-    public int LeavePermitted { get; set; }
 }

CompanyManagment.App.Contracts/Employee/CreateEmployeeByClient.cs

@@ -28,10 +28,6 @@ public class CreateEmployeeByClient
     public List<AddEmployeeDocumentItem> EmployeeDocumentItems { get; set; }
     public bool HasEmployeeDocument { get; set; }
     public bool HasRollCallService { get; set; }
-    public bool HasCustomizeCheckoutService { 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/InsuranceList/EditInsuranceList.cs

@@ -14,9 +14,6 @@ public class EditInsuranceList:CreateInsuranceList
     public bool FixedSalary { get; set; }
     public string Population { get; set; }
     public long? InsuranceJobId { get; set; }
-
-    /// <summary>
-    /// پرسنل هایی که قرارداد ترک کار کرده اند ولی ترک کار بیمه ندارند
-    /// </summary>
     public List<LeftWorkViewModel> LeftWorkEmployees { get; set; }
+
 }

CompanyManagment.App.Contracts/InsuranceList/EmployeeDetailsForInsuranceListViewModel.cs

@@ -298,4 +298,6 @@ public class EmployeeDetailsForInsuranceListViewModel
     ///// DSK_SPOUSE
     ///// </summary>
     //public double SumOfMarriedAllowance { get; set; }
+    public string Month { get; set; }
+    public string Year { get; set; }
 }

CompanyManagment.App.Contracts/InsuranceList/Enums/InsuranceListDebtType.cs

@@ -0,0 +1,8 @@
+namespace CompanyManagment.App.Contracts.InsuranceList.Enums;
+
+public enum InsuranceListDebtType
+{
+    None,
+    Old,
+    New
+}

CompanyManagment.App.Contracts/InsuranceList/Enums/InsuranceListEmployerApprovalStatus.cs

@@ -0,0 +1,14 @@
+namespace CompanyManagment.App.Contracts.InsuranceList.Enums;
+
+public enum InsuranceListEmployerApprovalStatus
+{
+    None,
+    /// <summary>
+    /// تاییدیه شفاهی (اذنی)
+    /// </summary>
+    VerbalApproval,
+    /// <summary>
+    /// تاییدیه کاغذی
+    /// </summary>
+    WrittenApproval
+}

CompanyManagment.App.Contracts/InsuranceList/Enums/InsuranceListInspectionType.cs

@@ -0,0 +1,8 @@
+namespace CompanyManagment.App.Contracts.InsuranceList.Enums;
+
+public enum InsuranceListInspectionType
+{
+    None,
+    Old,
+    New
+}

CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs

@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.InsuranceList;
+using Microsoft.AspNetCore.Http;
 
 namespace CompanyManagment.App.Contracts.InsuranceList;
 
@@ -17,9 +18,9 @@ public interface IInsuranceListApplication
     MainEmployeeDetailsViewModel SearchEmployeeForCreateInsuranceList(EmployeeForCreateInsuranceListSearchModel searchModel);
 
     double MarriedAllowance(string maritalStatus, long jobId, bool includedStatus,
-	    int countWorkingDays, double marriedAlowance, int endMonthCurrentDay);
+        int countWorkingDays, double marriedAlowance, int endMonthCurrentDay);
 
-	OperationResult CreateEmployeeDetailsInfo(EmployeeDetailsForInsuranceListViewModel command);
+    OperationResult CreateEmployeeDetailsInfo(EmployeeDetailsForInsuranceListViewModel command);
     OperationResult EditEmployeeDetailsInfo(EmployeeDetailsForInsuranceListViewModel command);
     OperationResult Remove(long id);
     EditInsuranceList GetDetailsForEdit(long id);
@@ -34,4 +35,16 @@ public interface IInsuranceListApplication
     //farokhiChanges
     (double basic, int totalYear) BasicYear(long employeeId, long worshopId, DateTime startDate);
     double GetMonthlyBaseYear(double dayliBase, int countWorkingDays);
+
+    #region Mahan
+    /// <summary>
+    /// مراحل اجرایی برای تکمیل و ارسال لیست بیمه
+    /// </summary>
+    /// <returns></returns>
+    Task<OperationResult> ConfirmInsuranceOperation(InsuranceListConfirmOperation command);
+    Task<InsuranceListConfirmOperation> GetInsuranceOperationDetails(long id);
+
+    Task<InsuranceListTabsCountViewModel> GetTabCounts(long accountId, int month, int year);
+
+    #endregion
 }

CompanyManagment.App.Contracts/InsuranceList/InsuranceListConfirmOperation.cs

@@ -0,0 +1,48 @@
+using CompanyManagment.App.Contracts.InsuranceList.Enums;
+using Microsoft.AspNetCore.Http;
+
+namespace CompanyManagment.App.Contracts.InsuranceList;
+
+public class InsuranceListConfirmOperation
+{
+    public long InsuranceListId { get; set; }
+    /// <summary>
+    /// بازرسی
+    /// </summary>
+    public CreateInsuranceListInspection Inspection { get; set; }
+    /// <summary>
+    /// بدهی
+    /// </summary>
+    public CreateInsuranceListDebt Debt { get; set; }
+    /// <summary>
+    /// تاییدیه کارفرما
+    /// </summary>
+    public CreateInsuranceListApproval Approval { get; set; }
+    public bool ConfirmSentList { get; set; }
+}
+public class CreateInsuranceListApproval
+{
+    public InsuranceListEmployerApprovalStatus ApprovalStatus { get; set; }
+    public string Description { get; set; }
+}
+
+public class CreateInsuranceListDebt
+{
+    public InsuranceListDebtType Type { get; set; }
+    public string DebtDate { get; set; }
+    public string Amount { get; set; }
+    public IFormFile DebtFile { get; set; }
+    public long DebtFileMediaId { get; set; }
+    public string FilePath { get; set; }
+}
+
+public class CreateInsuranceListInspection
+{
+    public InsuranceListInspectionType Type { get; set; }
+    public string LastInspectionDate { get; set; }
+    public IFormFile InspectionFile { get; set; }
+    public long InspectionFileMediaId { get; set; }
+    public string FilePath { get; set; }
+
+
+}

CompanyManagment.App.Contracts/InsuranceList/InsuranceListSearchModel.cs

@@ -25,4 +25,29 @@ public class InsuranceListSearchModel
     public int PageIndex { get; set; }
 
     public bool SearchAll { get; set; }
+
+    public InsuranceListSearchStatus Status { get; set; }
+}
+
+public enum InsuranceListSearchStatus
+{
+    /// <summary>
+    /// انجام نشده
+    /// </summary>
+    NotStarted = 0,
+
+    /// <summary>
+    /// در حال انجام امور
+    /// </summary>
+    InProgress = 1,
+
+    /// <summary>
+    /// آماده ارسال لیست
+    /// </summary>
+    ReadyToSendList = 2,
+
+    /// <summary>
+    /// انجام بیمه
+    /// </summary>
+    Done = 3
 }

CompanyManagment.App.Contracts/InsuranceList/InsuranceListTabsCountViewModel.cs

@@ -0,0 +1,24 @@
+namespace CompanyManagment.App.Contracts.InsuranceList;
+
+public class InsuranceListTabsCountViewModel
+{
+    /// <summary>
+    /// انجام نشده
+    /// </summary>
+    public int NotStarted { get; set; }
+
+    /// <summary>
+    /// در حال انجام امور
+    /// </summary>
+    public int InProgress { get; set; }
+
+    /// <summary>
+    /// آماده ارسال لیست
+    /// </summary>
+    public int ReadyToSendList { get; set; }
+
+    /// <summary>
+    /// انجام بیمه
+    /// </summary>
+    public int Done { get; set; }
+}

CompanyManagment.App.Contracts/InsuranceList/InsuranceListViewModel.cs

@@ -27,4 +27,11 @@ public class InsuranceListViewModel
     public long WorkShopId { get; set; }
     public string IsBlockCantracingParty { get; set; }
     public long EmployerId { get; set; }
+
+    /// <summary>وضعیت بازرسی</summary>
+    public bool InspectionDone { get; set; }
+    /// <summary>وضعیت بدهی</summary>
+    public bool DebtDone { get; set; }
+    /// <summary>وضعیت تاییدیه کارفرما</summary>
+    public bool EmployerApproved { 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/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/TemporaryClientRegistration/ITemporaryClientRegistrationApplication.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.InstitutionPlan;
@@ -39,7 +38,7 @@ public interface ITemporaryClientRegistrationApplication
     /// </summary>
     /// <param name="command"></param>
     /// <returns></returns>
-    Task<OperationResult> CreateOrUpdateWorkshopTemp(List<WorkshopTempViewModel> command, long contractingPartyTempId);
+    Task<OperationResult> CreateOrUpdateWorkshopTemp(List<WorkshopTempViewModel> command);
 
     /// <summary>
     /// دریافت جمع کل خدمات برای یک کارگاه
@@ -56,14 +55,14 @@ public interface ITemporaryClientRegistrationApplication
     /// <param name="paymentModel"></param>
     /// <returns></returns>
     Task<ReviewAndPaymentViewModel> GetTotalPaymentAndWorkshopList(long contractingPartyTempId,
-        string periodModel = "12", string paymentModel = "OneTime", string contractStartType = "currentMonth");
+        string periodModel = "12", string paymentModel = "OneTime");
 
     /// <summary>
     /// ایجاد یا ویرایش قرارداد موقت
     /// </summary>
     /// <param name="contractingPartyTempId"></param>
     /// <returns></returns>
-    Task<OperationResult> CreateOrUpdateInstitutionContractTemp(long contractingPartyTempId, string periodModel, string paymentModel, double totalPayment, double valueAddedTax, DateTime contractStart);
+    Task<OperationResult> CreateOrUpdateInstitutionContractTemp(long contractingPartyTempId, string periodModel, string paymentModel, double totalPayment, double valueAddedTax);
 
     /// <summary>
     /// دریافت کد برای کلاینت

CompanyManagment.App.Contracts/TemporaryClientRegistration/MonthlyInstallment.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CompanyManagment.App.Contracts.TemporaryClientRegistration;
-
-public class MonthlyInstallment
-{
-    /// <summary>
-    /// مبلغ قسط ماهانه
-    /// </summary>
-    public string InstallmentAmountStr { get; set; }
-
-    /// <summary>
-    /// تاریخ قسط ماهانه
-    /// </summary>
-    public string InstalmentDate { get; set; }
-
-    /// <summary>
-    /// شمارنده قسط
-    /// </summary>
-    public string InstallmentCounter{ get; set; }
-}

CompanyManagment.App.Contracts/TemporaryClientRegistration/ReviewAndPaymentViewModel.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace CompanyManagment.App.Contracts.TemporaryClientRegistration;
 
@@ -24,54 +23,28 @@ public class ReviewAndPaymentViewModel
     /// مبلغ پرداخت بدون مالیات
     /// Double
     /// </summary>
-    public double OneTimeWithoutTaxPaymentDouble { get; set; }
+    public double WithoutTaxPaymentDouble { get; set; }
 
     /// <summary>
     /// مبلغ پرداخت بدون مالیات
     /// string
     /// </summary>
-    public string OneTimeWithoutTaxPaymentStr { get; set; }
+    public string WithoutTaxPaymentStr { get; set; }
 
 
     /// <summary>
     /// مبلغ پرداخت کامل
     /// Double
     /// </summary>
-    public double OneTimeTotalPaymentDouble { get; set; }
+    public double TotalPaymentDouble { get; set; }
 
     /// <summary>
     /// مبلغ پرداخت کامل
     /// string
     /// </summary>
-    public string OneTimeTotalPaymentStr { get; set; }
+    public string TotalPaymentStr { get; set; }
 
 
-
-    /// <summary>
-    /// مبلغ پرداخت بدون مالیات
-    /// Double
-    /// </summary>
-    public double MonthlyWithoutTaxPaymentDouble { get; set; }
-
-    /// <summary>
-    /// مبلغ پرداخت بدون مالیات
-    /// string
-    /// </summary>
-    public string MonthlyWithoutTaxPaymentStr { get; set; }
-
-
-    /// <summary>
-    /// مبلغ پرداخت کامل
-    /// Double
-    /// </summary>
-    public double MonthlyTotalPaymentDouble { get; set; }
-
-    /// <summary>
-    /// مبلغ پرداخت کامل
-    /// string
-    /// </summary>
-    public string MonthlyTotalPaymentStr { get; set; }
-
     /// <summary>
     /// مالیات بر ارزش افزوده
     /// Double
@@ -110,52 +83,4 @@ public class ReviewAndPaymentViewModel
     /// آی دی طرف حساب
     /// </summary>
     public long ContractingPartTempId { get; set; }
-
-    /// <summary>
-    /// لیست اقساط ماهیانه
-    /// </summary>
-    public List<MonthlyInstallment> MonthlyInstallments { get; set; }
-
-
-    /// <summary>
-    /// تاریخ شروع قرارداد در اول ماه جاری
-    /// -
-    /// شمسی
-    /// </summary>
-    public string ContractStartCurrentMonthFa { get; set; }
-
-    /// <summary>
-    /// تاریخ شروع قرارداد در اول ماه جاری
-    /// -
-    /// میلادی
-    /// </summary>
-    public DateTime ContractStartCurrentMonthGr { get; set; }
-
-    /// <summary>
-    /// تاریخ شروع قرارداد در اول ماه بعد
-    /// -
-    /// شمسی
-    /// </summary>
-    public string ContractStartNextMonthFa{ get; set; }
-
-    /// <summary>
-    /// تاریخ شروع قرارداد در اول ماه بعد
-    /// -
-    /// میلادی
-    /// </summary>
-    public DateTime ContractStartNextMonthGr { get; set; }
-
-    /// <summary>
-    /// تاریخ پایان قرارداد
-    /// -
-    /// میلادی
-    /// </summary>
-    public DateTime ContractEndGr { get; set; }
-
-    /// <summary>
-    /// تاریخ پایان قرارداد
-    /// -
-    /// شمسی
-    /// </summary>
-    public string ContractEndFa { 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.App.Contracts/YearlySalary/IYearlySalaryApplication.cs

@@ -25,4 +25,5 @@ public interface IYearlySalaryApplication
     InsuranceYearlySalaryModel GetInsuranceItems(DateTime startDate, DateTime endDate, string year);
 
     #endregion
+
 }

CompanyManagment.Application/AndroidApkVersionApplication.cs

@@ -48,9 +48,9 @@ public class AndroidApkVersionApplication : IAndroidApkVersionApplication
 
         Directory.CreateDirectory(path);
 
-        var apk = new ApkReader.ApkReader().Read(file.OpenReadStream());
+        //var apk = new ApkReader.ApkReader().Read(file.OpenReadStream());
 
-        string uniqueFileName = $"{Path.GetFileNameWithoutExtension(file.FileName)}.v{apk.VersionName}{Path.GetExtension(file.FileName)}";
+        string uniqueFileName = $"{Path.GetFileNameWithoutExtension(file.FileName)}{Path.GetExtension(file.FileName)}";
 
 
         string filepath = Path.Combine(path, uniqueFileName);
@@ -60,7 +60,7 @@ public class AndroidApkVersionApplication : IAndroidApkVersionApplication
             await file.CopyToAsync(stream);
         }
 
-        var entity = new AndroidApkVersion(apk.VersionName, apk.VersionCode, IsActive.True, filepath);
+        var entity = new AndroidApkVersion("0", "0", IsActive.True, filepath);
         _androidApkVersionRepository.Create(entity);
         _androidApkVersionRepository.SaveChanges();
         return op.Succcedded();

CompanyManagment.Application/BankApplication.cs

@@ -55,7 +55,7 @@ namespace CompanyManagment.Application
 			if(command.BankLogoPictureFile  != null && command.BankLogoPictureFile.Length >0 )
 			{
 				var uploadResult = _mediaApplication.UploadFile(command.BankLogoPictureFile, command.BankName,
-					_basePath, 10, [".jpg", ".jpeg", ".png",".svg"]);
+					_basePath, 10, [".jpg", ".jpeg", ".png",".svg"], "Bank");
 				if (uploadResult.IsSuccedded == false)
 					return uploadResult;
 				mediaId = uploadResult.SendId;
@@ -81,7 +81,7 @@ namespace CompanyManagment.Application
 			if (command.BankLogoPictureFile != null && command.BankLogoPictureFile.Length > 0)
 			{
 				var uploadResult = _mediaApplication.UploadFile(command.BankLogoPictureFile, command.BankName,
-					_basePath, 10, [".jpg", ".jpeg", ".png",".svg"]);
+					_basePath, 10, [".jpg", ".jpeg", ".png",".svg"], "Bank");
 				if (uploadResult.IsSuccedded == false)
 					return uploadResult;
 				_mediaApplication.DeleteFile(entity.BankLogoMediaId);

CompanyManagment.Application/CheckoutApplication.cs

@@ -19,483 +19,505 @@ namespace CompanyManagment.Application;
 
 public class CheckoutApplication : ICheckoutApplication
 {
-    private readonly ICheckoutRepository _checkoutRepository;
-    private readonly IYearlySalaryRepository _yearlySalaryRepository;
-    private readonly ILeftWorkRepository _leftWorkRepository;
-    private readonly IEmployerRepository _employerRepository;
-    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, IRollCallMandatoryRepository rollCallMandatoryRepository)
-    {
-        _checkoutRepository = checkoutRepository;
-        _yearlySalaryRepository = yearlySalaryRepository;
-        _leftWorkRepository = leftWorkRepository;
-        _employerRepository = employerRepository;
-        _contractingPartyApp = contractingPartyApp;
-        _leaveApplication = leaveApplication;
-        _mandatoryHoursApplication = mandatoryHoursApplication;
-        _rollCallMandatoryRepository = rollCallMandatoryRepository;
-    }
-
-    [SuppressMessage("ReSharper.DPA", "DPA0007: Large number of DB records", MessageId = "count: 241")]
-    public void Create(CreateCheckout command)
-    {
-        var operation = new OperationResult();
-        var syear = Convert.ToInt32(command.ContractStart.Substring(0, 4));
-        var smonth = Convert.ToInt32(command.ContractStart.Substring(5, 2));
-        string month = string.Empty;
-        switch (smonth)
-        {
-            case 1:
-                month = "فروردین";
-                break;
-            case 2:
-                month = "اردیبهشت";
-                break;
-            case 3:
-                month = "خرداد";
-                break;
-            case 4:
-                month = "تیر";
-                break;
-            case 5:
-                month = "مرداد";
-                break;
-            case 6:
-                month = "شهریور";
-                break;
-            case 7:
-                month = "مهر";
-                break;
-            case 8:
-                month = "آبان";
-                break;
-            case 9:
-                month = "آذر";
-                break;
-            case 10:
-                month = "دی";
-                break;
-            case 11:
-                month = "بهمن";
-                break;
-            case 12:
-                month = "اسفند";
-                break;
-        }
-        var year = syear.ToString();
-
-        #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;
-        //		}
-
-        //	}
-        //}
-
-        #endregion
-
-        var dayliWage = command.DayliWage.MoneyToDouble();
-        // کمک هزینه اقلام
-        var consumableItem = command.ConsumableItems.MoneyToDouble();
-        //حق اولاد
-        var familyAllowance = command.FamilyAllowance.MoneyToDouble();
-        //کمک هزینه مسکن
-        var housingAllowance = command.HousingAllowance.MoneyToDouble();
-        //حق تاهل
-        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);
-        //دستمزد ماهانه
-        var monthlyWage = MontlyYearsBunos.MontlyWage;
-        //سنوات
-        var years = command.YearsPay;
-        //عیدی و پاداش
-        var bunos = command.BonusesPay;
-        //پایه سنوات
-        var bacicYears = MontlyYearsBunos.BasicYears;
-        var sumOfWorkingDays = MontlyYearsBunos.SumOfWorkingDay;
-        if (command.friday > 0)
-        {
-            var fridayPercent = dayliWage * 40 / 100;
-            //فوق العاده جمعه کاری
-            command.FridayPay = fridayPercent * command.friday;
-        }
-        //حق بیمه سهم کارگر
-        var insuranceDeduction = (monthlyWage + bacicYears + consumableItem + housingAllowance + marriedAllowance) * 7 / 100;
-
-        if (command.OvertimePay > 0 && command.AbsenceDeduction > 0)
-        {
-            if (command.AbsenceDeduction >= command.OvertimePay)
-            {
-                command.AbsenceDeduction = command.AbsenceDeduction - command.OvertimePay;
-                command.OvertimePay = 0;
-            }
-            else
-            {
-                command.OvertimePay = command.OvertimePay - command.AbsenceDeduction;
-                command.AbsenceDeduction = 0;
-            }
-
-        }
-        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 + command.InstallmentDeduction + command.SalaryAidDeduction;
-        var totalDeductions = totalDeductionDouble.ToMoney();
-        var totalPayment = totalClaimsDouble - totalDeductionDouble;
-
-        if (_checkoutRepository.Exists(x =>
-                x.Month == command.Month && x.Year == command.Year && x.ContractNo == command.ContractNo))
-        {
-            operation.Failed("امکان ثبت رکورد تکراری وجود ندارد");
-        }
-        else
-        {
-            if (string.IsNullOrWhiteSpace(command.Signature))
-            {
-                command.Signature = "0";
-            }
-
-
-
-            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, 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);
-            //employeeFullName.Value = command.EmployeeFullName;
-            //var fathersName = new SqlParameter("@FathersName", SqlDbType.NVarChar, 20);
-            //fathersName.Value = command.EmployeeFullName;
-
-        }
-
-
-    }
-
-    public OperationResult Edit(EditCheckout command)
-    {
-        throw new NotImplementedException();
-    }
-
-    public EditCheckout GetDetails(long id)
-    {
-        return _checkoutRepository.GetDetails(id);
-    }
-
-    public async Task<List<CheckoutViewModel>> Search(CheckoutSearchModel searchModel)
-    {
-        var result = new List<CheckoutViewModel>();
-        var query = await _checkoutRepository.SearchForMainCheckout(searchModel);
-        query = query.Select(x => new CheckoutViewModel()
-        {
-            Id = x.Id,
-            EmployeeFullName = x.EmployeeFullName,
-            ContractStart = x.ContractStart,
-            ContractEnd = x.ContractEnd,
-            ContractStartGr = x.ContractStartGr,
-            ContractEndGr = x.ContractEndGr,
-            PersonnelCode = x.PersonnelCode,
-            PersonnelCodeInt = x.PersonnelCodeInt,
-            ArchiveCode = x.ArchiveCode,
-            SumOfWorkingDays = x.SumOfWorkingDays,
-            WorkshopName = x.WorkshopName,
-            Month = x.Month,
-            Year = x.Year,
-            ContractNo = x.ContractNo,
-            ContractId = x.ContractId,
-            WorkshopId = x.WorkshopId,
-            EmployeeId = x.EmployeeId,
-            IsActiveString = x.IsActiveString,
-            Signature = x.Signature,
-            CreationDate = x.CreationDate,
-            EmployerName = _employerRepository.GetEmployerByWorkshopId(x.WorkshopId).FirstOrDefault()?.EmployerFullName,
-            IsBlockCantracingParty = _employerRepository.GetEmployerByWorkshopId(x.WorkshopId).FirstOrDefault()?.IsBlockContractingParty,
-        }).ToList();
-        //foreach (var items in query)
-        //{
-        //    var s = _employerRepository.GetEmployerByWorkshopId(items.WorkshopId);
-        //    if (s != null)
-        //    {
-        //        items.EmployerName = s.FirstOrDefault().EmployerFullName;
-        //    }
-        //    result.Add(items);
-        //    //var employeId = _context.WorkshopEmployers?.Where(x => x.WorkshopId == items.WorkshopId)
-        //    //        .Select(x => x.EmployerId).FirstOrDefault();
-        //    //var employerName = _context.Employers?.FirstOrDefault(x => x.id == employeId).FullName;
-        //    // = employerName;
-
-        //}
-
-        return query;
-
-    }
-
-    public List<CheckoutViewModel> SimpleSearch(CheckoutSearchModel searchModel)
-    {
-        return _checkoutRepository.SimpleSearch(searchModel);
-    }
-
-    public List<CheckoutViewModel> PrintAll(List<long> id)
-    {
-        var result = _checkoutRepository.PrintAll(id);
-        var oneRecord = result.FirstOrDefault();
-        if (oneRecord == null)
-            return new();
-        result.ForEach(x =>
-        {
-
-
-            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;
-    }
-
-    public CheckoutViewModel PrintOne(long id)
-    {
-        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)
-        {
-            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;
-    }
-
-    public CheckoutLeavePrintViewModel LeavePrint(long id)
-    {
-        return _checkoutRepository.PrintLeave(id);
-    }
-
-    public OperationResult Sign(long id)
-    {
-        var opration = new OperationResult();
-        var contract = _checkoutRepository.Get(id);
-        if (contract == null)
-            return opration.Failed("رکورد مورد نظر یافت نشد");
-
-        contract.Sign();
-
-
-        _checkoutRepository.SaveChanges();
-        opration.IsSuccedded = true;
-        return opration.Succcedded();
-    }
-
-    public OperationResult UnSign(long id)
-    {
-        var opration = new OperationResult();
-        var contract = _checkoutRepository.Get(id);
-        if (contract == null)
-            return opration.Failed("رکورد مورد نظر یافت نشد");
-
-        contract.UnSign();
-
-
-        _checkoutRepository.SaveChanges();
-        opration.IsSuccedded = true;
-        return opration.Succcedded();
-    }
-
-    public OperationResult Active(long id)
-    {
-        var opration = new OperationResult();
-        var contract = _checkoutRepository.Get(id);
-        if (contract == null)
-            return opration.Failed("رکورد مورد نظر یافت نشد");
-
-        contract.Active();
-
-        _checkoutRepository.SaveChanges();
-        return opration.Succcedded();
-    }
-
-    public OperationResult DeActive(long id)
-    {
-        var opration = new OperationResult();
-        var contract = _checkoutRepository.Get(id);
-        if (contract == null)
-            return opration.Failed("رکورد مورد نظر یافت نشد");
-
-        contract.DeActive();
-
-
-        _checkoutRepository.SaveChanges();
-
-        return opration.Succcedded();
-    }
-
-    public OperationResult RemoveCheckout(long id)
-    {
-        return _checkoutRepository.RemoveCheckout(id);
-    }
-
-    public OperationResult CustomSet(long id, double rewardPay, double salaryAidDeduction)
-    {
-        var opration = new OperationResult();
-        var checkout = _checkoutRepository.Get(id);
-        var totalClaimsDouble = checkout.TotalClaims.MoneyToDouble();
-        var totalDeductionsDouble = checkout.TotalDeductions.MoneyToDouble();
-        totalClaimsDouble = (double)(totalClaimsDouble - checkout.RewardPay);
-        totalDeductionsDouble = totalDeductionsDouble - checkout.SalaryAidDeduction;
-
-        var totalClaims = totalClaimsDouble + rewardPay;
-        var totalDeductions = totalDeductionsDouble + salaryAidDeduction;
-
-
-
-        var totalClaimsString = totalClaims.ToMoney();
-        var totalDeductionsString = totalDeductions.ToMoney();
-        var totalPayment = totalClaims - totalDeductions;
-
-        checkout.CustomSet(rewardPay, salaryAidDeduction, totalClaimsString, totalDeductionsString, totalPayment);
-
-        _checkoutRepository.SaveChanges();
-        opration.IsSuccedded = true;
-        return opration.Succcedded();
-    }
-
-    #region Client
-
-    public List<CheckoutViewModel> SearchForClient(CheckoutSearchModel searchModel)
-    {
-        return _checkoutRepository.SearchForClient(searchModel);
-    }
-
-    #endregion
-    #region NewChangeByHeydari
-    public List<long> CheckHasSignature(List<long> ids)
-    {
-        return _checkoutRepository.CheckHasSignature(ids);
-    }
-    public OperationResult DeleteAllCheckouts(List<long> ids)
-    {
-        return _checkoutRepository.DeleteAllCheckouts(ids);
-    }
-    public OperationResult DeleteCheckout(long id)
-    {
-        return _checkoutRepository.DeleteCheckout(id);
-    }
-    public async Task<List<CheckoutViewModel>> SearchForMainCheckout(CheckoutSearchModel searchModel)
-    {
-        return await _checkoutRepository.SearchForMainCheckout(searchModel);
-    }
-    #endregion
-    #region Pooya
-
-
-    public List<(long EmployeeId, DateTime CheckoutStart, DateTime CheckoutEnd)> GetLastCheckoutsByWorkshopIdForWorkFlow(long workshopId, DateTime start, DateTime end)
-    {
-        return _checkoutRepository.GetLastCheckoutsByWorkshopIdForWorkFlow(workshopId, start, end);
-    }
+	private readonly ICheckoutRepository _checkoutRepository;
+	private readonly IYearlySalaryRepository _yearlySalaryRepository;
+	private readonly ILeftWorkRepository _leftWorkRepository;
+	private readonly IEmployerRepository _employerRepository;
+	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, IRollCallMandatoryRepository rollCallMandatoryRepository)
+	{
+		_checkoutRepository = checkoutRepository;
+		_yearlySalaryRepository = yearlySalaryRepository;
+		_leftWorkRepository = leftWorkRepository;
+		_employerRepository = employerRepository;
+		_contractingPartyApp = contractingPartyApp;
+		_leaveApplication = leaveApplication;
+		_mandatoryHoursApplication = mandatoryHoursApplication;
+		_rollCallMandatoryRepository = rollCallMandatoryRepository;
+	}
+
+	[SuppressMessage("ReSharper.DPA", "DPA0007: Large number of DB records", MessageId = "count: 241")]
+	public void Create(CreateCheckout command)
+	{
+		var operation = new OperationResult();
+		var syear = Convert.ToInt32(command.ContractStart.Substring(0, 4));
+		var smonth = Convert.ToInt32(command.ContractStart.Substring(5, 2));
+		string month = string.Empty;
+		switch (smonth)
+		{
+			case 1:
+				month = "فروردین";
+				break;
+			case 2:
+				month = "اردیبهشت";
+				break;
+			case 3:
+				month = "خرداد";
+				break;
+			case 4:
+				month = "تیر";
+				break;
+			case 5:
+				month = "مرداد";
+				break;
+			case 6:
+				month = "شهریور";
+				break;
+			case 7:
+				month = "مهر";
+				break;
+			case 8:
+				month = "آبان";
+				break;
+			case 9:
+				month = "آذر";
+				break;
+			case 10:
+				month = "دی";
+				break;
+			case 11:
+				month = "بهمن";
+				break;
+			case 12:
+				month = "اسفند";
+				break;
+		}
+		var year = syear.ToString();
+
+		#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;
+		//		}
+
+		//	}
+		//}
+
+		#endregion
+
+		var dayliWage = command.DayliWage.MoneyToDouble();
+		// کمک هزینه اقلام
+		var consumableItem = command.ConsumableItems.MoneyToDouble();
+		//حق اولاد
+		var familyAllowance = command.FamilyAllowance.MoneyToDouble();
+		//کمک هزینه مسکن
+		var housingAllowance = command.HousingAllowance.MoneyToDouble();
+		//حق تاهل
+		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);
+		//دستمزد ماهانه
+		var monthlyWage = MontlyYearsBunos.MontlyWage;
+		//سنوات
+		var years = command.YearsPay;
+		//عیدی و پاداش
+		var bunos = command.BonusesPay;
+		//پایه سنوات
+		var bacicYears = MontlyYearsBunos.BasicYears;
+		var sumOfWorkingDays = MontlyYearsBunos.SumOfWorkingDay;
+		if (command.friday > 0)
+		{
+			var fridayPercent = dayliWage * 40 / 100;
+			//فوق العاده جمعه کاری
+			command.FridayPay = fridayPercent * command.friday;
+		}
+		//حق بیمه سهم کارگر
+		var insuranceDeduction = (monthlyWage + bacicYears + consumableItem + housingAllowance + marriedAllowance) * 7 / 100;
+
+		if (command.OvertimePay > 0 && command.AbsenceDeduction > 0)
+		{
+			if (command.AbsenceDeduction >= command.OvertimePay)
+			{
+				command.AbsenceDeduction = command.AbsenceDeduction - command.OvertimePay;
+				command.OvertimePay = 0;
+			}
+			else
+			{
+				command.OvertimePay = command.OvertimePay - command.AbsenceDeduction;
+				command.AbsenceDeduction = 0;
+			}
+
+		}
+		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 + command.InstallmentDeduction + command.SalaryAidDeduction;
+		var totalDeductions = totalDeductionDouble.ToMoney();
+		var totalPayment = totalClaimsDouble - totalDeductionDouble;
+
+		if (_checkoutRepository.Exists(x =>
+				x.Month == command.Month && x.Year == command.Year && x.ContractNo == command.ContractNo))
+		{
+			operation.Failed("امکان ثبت رکورد تکراری وجود ندارد");
+		}
+		else
+		{
+			if (string.IsNullOrWhiteSpace(command.Signature))
+			{
+				command.Signature = "0";
+			}
+
+
+
+			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, 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);
+			//employeeFullName.Value = command.EmployeeFullName;
+			//var fathersName = new SqlParameter("@FathersName", SqlDbType.NVarChar, 20);
+			//fathersName.Value = command.EmployeeFullName;
+
+		}
+
+
+	}
+
+	public OperationResult Edit(EditCheckout command)
+	{
+		throw new NotImplementedException();
+	}
+
+	public EditCheckout GetDetails(long id)
+	{
+		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);
+		query = query.Select(x => new CheckoutViewModel()
+		{
+			Id = x.Id,
+			EmployeeFullName = x.EmployeeFullName,
+			ContractStart = x.ContractStart,
+			ContractEnd = x.ContractEnd,
+			ContractStartGr = x.ContractStartGr,
+			ContractEndGr = x.ContractEndGr,
+			PersonnelCode = x.PersonnelCode,
+			PersonnelCodeInt = x.PersonnelCodeInt,
+			ArchiveCode = x.ArchiveCode,
+			SumOfWorkingDays = x.SumOfWorkingDays,
+			WorkshopName = x.WorkshopName,
+			Month = x.Month,
+			Year = x.Year,
+			ContractNo = x.ContractNo,
+			ContractId = x.ContractId,
+			WorkshopId = x.WorkshopId,
+			EmployeeId = x.EmployeeId,
+			IsActiveString = x.IsActiveString,
+			Signature = x.Signature,
+			CreationDate = x.CreationDate,
+			EmployerName = _employerRepository.GetEmployerByWorkshopId(x.WorkshopId).FirstOrDefault()?.EmployerFullName,
+			IsBlockCantracingParty = _employerRepository.GetEmployerByWorkshopId(x.WorkshopId).FirstOrDefault()?.IsBlockContractingParty,
+		}).ToList();
+		//foreach (var items in query)
+		//{
+		//    var s = _employerRepository.GetEmployerByWorkshopId(items.WorkshopId);
+		//    if (s != null)
+		//    {
+		//        items.EmployerName = s.FirstOrDefault().EmployerFullName;
+		//    }
+		//    result.Add(items);
+		//    //var employeId = _context.WorkshopEmployers?.Where(x => x.WorkshopId == items.WorkshopId)
+		//    //        .Select(x => x.EmployerId).FirstOrDefault();
+		//    //var employerName = _context.Employers?.FirstOrDefault(x => x.id == employeId).FullName;
+		//    // = employerName;
+
+		//}
+
+		return query;
+
+	}
+
+	public List<CheckoutViewModel> SimpleSearch(CheckoutSearchModel searchModel)
+	{
+		return _checkoutRepository.SimpleSearch(searchModel);
+	}
+
+	public List<CheckoutViewModel> PrintAll(List<long> id)
+	{
+		var result = _checkoutRepository.PrintAll(id);
+		var oneRecord = result.FirstOrDefault();
+		if (oneRecord == null)
+			return new();
+		result.ForEach(x =>
+		{
+
+
+			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));
+			TimeSpan totalPresent = totalWorking + totalBreakTime;
+
+			if (x.HasRollCall)
+			{
+				totalWorking = new TimeSpan(x.MonthlyRollCall.Sum(x => x.TotalhourseSpan.Ticks)) - x.TotalHourlyLeave;
+				totalBreakTime = new TimeSpan(x.MonthlyRollCall.Sum(x => x.BreakTimeTimeSpan.Ticks));
+				totalPresent = totalWorking + totalBreakTime ;
+			}
+			else
+			{
+				totalBreakTime = new TimeSpan(x.MonthlyRollCall.Sum(x => x.BreakTimeTimeSpan.Ticks));
+				totalPresent = new TimeSpan(x.MonthlyRollCall.Sum(x => x.TotalhourseSpan.Ticks));
+				totalWorking = totalPresent - 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;
+	}
+
+	public CheckoutViewModel PrintOne(long id)
+	{
+		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;
+		TimeSpan totalHoursLeave;
+		if (result.HasRollCall)
+		{
+			totalWorking = new TimeSpan(result.MonthlyRollCall.Sum(x => x.TotalhourseSpan.Ticks)) - result.TotalHourlyLeave;
+			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;
+	}
+
+	public CheckoutLeavePrintViewModel LeavePrint(long id)
+	{
+		return _checkoutRepository.PrintLeave(id);
+	}
+
+	public OperationResult Sign(long id)
+	{
+		var opration = new OperationResult();
+		var contract = _checkoutRepository.Get(id);
+		if (contract == null)
+			return opration.Failed("رکورد مورد نظر یافت نشد");
+
+		contract.Sign();
+
+
+		_checkoutRepository.SaveChanges();
+		opration.IsSuccedded = true;
+		return opration.Succcedded();
+	}
+
+	public OperationResult UnSign(long id)
+	{
+		var opration = new OperationResult();
+		var contract = _checkoutRepository.Get(id);
+		if (contract == null)
+			return opration.Failed("رکورد مورد نظر یافت نشد");
+
+		contract.UnSign();
+
+
+		_checkoutRepository.SaveChanges();
+		opration.IsSuccedded = true;
+		return opration.Succcedded();
+	}
+
+	public OperationResult Active(long id)
+	{
+		var opration = new OperationResult();
+		var contract = _checkoutRepository.Get(id);
+		if (contract == null)
+			return opration.Failed("رکورد مورد نظر یافت نشد");
+
+		contract.Active();
+
+		_checkoutRepository.SaveChanges();
+		return opration.Succcedded();
+	}
+
+	public OperationResult DeActive(long id)
+	{
+		var opration = new OperationResult();
+		var contract = _checkoutRepository.Get(id);
+		if (contract == null)
+			return opration.Failed("رکورد مورد نظر یافت نشد");
+
+		contract.DeActive();
+
+
+		_checkoutRepository.SaveChanges();
+
+		return opration.Succcedded();
+	}
+
+	public OperationResult RemoveCheckout(long id)
+	{
+		return _checkoutRepository.RemoveCheckout(id);
+	}
+
+	public OperationResult CustomSet(long id, double rewardPay, double salaryAidDeduction)
+	{
+		var opration = new OperationResult();
+		var checkout = _checkoutRepository.Get(id);
+		var totalClaimsDouble = checkout.TotalClaims.MoneyToDouble();
+		var totalDeductionsDouble = checkout.TotalDeductions.MoneyToDouble();
+		totalClaimsDouble = (double)(totalClaimsDouble - checkout.RewardPay);
+		totalDeductionsDouble = totalDeductionsDouble - checkout.SalaryAidDeduction;
+
+		var totalClaims = totalClaimsDouble + rewardPay;
+		var totalDeductions = totalDeductionsDouble + salaryAidDeduction;
+
+
+
+		var totalClaimsString = totalClaims.ToMoney();
+		var totalDeductionsString = totalDeductions.ToMoney();
+		var totalPayment = totalClaims - totalDeductions;
+
+		checkout.CustomSet(rewardPay, salaryAidDeduction, totalClaimsString, totalDeductionsString, totalPayment);
+
+		_checkoutRepository.SaveChanges();
+		opration.IsSuccedded = true;
+		return opration.Succcedded();
+	}
+
+	#region Client
+
+	public List<CheckoutViewModel> SearchForClient(CheckoutSearchModel searchModel)
+	{
+		return _checkoutRepository.SearchForClient(searchModel);
+	}
+
+	#endregion
+	#region NewChangeByHeydari
+	public List<long> CheckHasSignature(List<long> ids)
+	{
+		return _checkoutRepository.CheckHasSignature(ids);
+	}
+	public OperationResult DeleteAllCheckouts(List<long> ids)
+	{
+		return _checkoutRepository.DeleteAllCheckouts(ids);
+	}
+	public OperationResult DeleteCheckout(long id)
+	{
+		return _checkoutRepository.DeleteCheckout(id);
+	}
+	public async Task<List<CheckoutViewModel>> SearchForMainCheckout(CheckoutSearchModel searchModel)
+	{
+		return await _checkoutRepository.SearchForMainCheckout(searchModel);
+	}
+	#endregion
+	#region Pooya
+
+
+	public List<(long EmployeeId, DateTime CheckoutStart, DateTime CheckoutEnd)> GetLastCheckoutsByWorkshopIdForWorkFlow(long workshopId, DateTime start, DateTime end)
+	{
+		return _checkoutRepository.GetLastCheckoutsByWorkshopIdForWorkFlow(workshopId, start, end);
+	}
 
-    #endregion
+	#endregion
 }

CompanyManagment.Application/ContactUsApplication.cs

@@ -1,70 +0,0 @@
-using System.Text.RegularExpressions;
-using _0_Framework.Application;
-using Company.Domain.ContactUsAgg;
-using CompanyManagment.App.Contracts.ContactUs;
-
-namespace CompanyManagment.Application;
-
-public class ContactUsApplication : IContactUsApplication
-{
-    private readonly IContactUsRepository _contactUsRepository;
-
-    public ContactUsApplication(IContactUsRepository contactUsRepository)
-    {
-        _contactUsRepository = contactUsRepository;
-    }
-
-    public OperationResult Create(CreateContactUs command)
-    {
-        var op = new OperationResult();
-        if (string.IsNullOrWhiteSpace(command.FirstName))
-        {
-            return op.Failed("لطفا نام خود را وارد کنید");
-        }
-
-        if (string.IsNullOrWhiteSpace(command.LastName))
-        {
-            return op.Failed("لطفا نام خانوادگی خود را وارد کنید");
-        }
-
-        if (string.IsNullOrWhiteSpace(command.Email))
-        {
-            return op.Failed("لطفا ایمیل خود را وارد کنید");
-        }
-
-        if (string.IsNullOrWhiteSpace(command.PhoneNumber))
-        {
-            return op.Failed("لطفا شماره تماس خود را وارد کنید");
-        }
-
-        if (!Regex.IsMatch(command.PhoneNumber, @"^(\+98|0)?9\d{9}$"))
-        {
-            return op.Failed("شماره تماس وارد شده نامعتبر است");
-        }
-
-        if (!Regex.IsMatch(command.Email, @"^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$"))
-        {
-            return op.Failed("ایمیل وارد شده نامعتبر است");
-        }
-
-        if (string.IsNullOrWhiteSpace(command.Title))
-        {
-            return op.Failed("لطفا عنوان پیغام خود را وارد کنید");
-        }
-
-        if (string.IsNullOrWhiteSpace(command.Message))
-        {
-            return op.Failed("لطفا پیغام خود را وارد کنید");
-        }
-
-        var entity = new ContactUs(command.FirstName, command.LastName, command.Email, command.PhoneNumber,
-            command.Title, command.Message);
-
-        _contactUsRepository.Create(entity);
-
-        _contactUsRepository.SaveChanges();
-
-        return op.Succcedded();
-
-    }
-}

CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs

@@ -19,13 +19,12 @@ using System.IO;
 using System.Linq;
 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.App.Contracts.RollCall;
-using Hangfire.States;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-using Microsoft.EntityFrameworkCore.Query;
+using CompanyManagment.EFCore.Repository;
 
 
 namespace CompanyManagment.Application;
@@ -373,10 +372,10 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
         }
 
         if (customizeWorkshopGroupSettings.MainGroup)
-		{
-			var createDefaultEmployee = CreateEmployeeSettings(command);
-			return createDefaultEmployee;
-		}
+        {
+            var createDefaultEmployee = CreateEmployeeSettings(command);
+            return createDefaultEmployee;
+        }
 
 
         List<CustomizeWorkshopEmployeeSettingsShift> shiftCollection = new List<CustomizeWorkshopEmployeeSettingsShift>();
@@ -558,13 +557,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 
         _customizeWorkshopEmployeeSettingsRepository.Create(entity);
 
-		entity.SimpleEdit(shiftCollection, command.IrregularShift, command.WorkshopShiftStatus, command.BreakTime, isChanged, command.FridayWork, command.HolidayWork, rotatingShift);
-        var employeeSalary = command.Salary?.MoneyToDouble() ?? 0;
-
-        if (employeeSalary > 0)
-        {
-            entity.SetSalary(employeeSalary);
-        }
+        entity.SimpleEdit(shiftCollection, command.IrregularShift, command.WorkshopShiftStatus, command.BreakTime, isChanged, command.FridayWork, command.HolidayWork, rotatingShift);
 
         _customizeWorkshopGroupSettingsRepository.SaveChanges();
         return op.Succcedded();
@@ -688,7 +681,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
         return op.Succcedded();
     }
     public OperationResult EditSimpleRollCallGroupSetting(EditCustomizeWorkshopGroupSettings command,
-        List<ReCalculateRollCallValues> reCalculateCommand)
+       List<ReCalculateRollCallValues> reCalculateCommand)
     {
         OperationResult op = new();
 
@@ -719,15 +712,15 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
         {
 
             groupSettingsShifts = command.ShiftViewModel.Select(x =>
-                {
-                    if (!TimeOnly.TryParseExact(x.StartTime, "HH:mm", out TimeOnly start))
-                        throw new InvalidDataException();
-                    if (!TimeOnly.TryParseExact(x.EndTime, "HH:mm", out TimeOnly end))
-                        throw new InvalidDataException();
+            {
+                if (!TimeOnly.TryParseExact(x.StartTime, "HH:mm", out TimeOnly start))
+                    throw new InvalidDataException();
+                if (!TimeOnly.TryParseExact(x.EndTime, "HH:mm", out TimeOnly end))
+                    throw new InvalidDataException();
 
-                    return new CustomizeWorkshopGroupSettingsShift(start, end, x.Placement);
+                return new CustomizeWorkshopGroupSettingsShift(start, end, x.Placement);
 
-                }).ToList();
+            }).ToList();
 
             if (groupSettingsShifts.All(x => workshopSettings.CustomizeWorkshopSettingsShifts.Any(y => x.Equals(y)))
                 && command.WorkshopShiftStatus == workshopSettings.WorkshopShiftStatus && command.FridayWork == workshopSettings.FridayWork &&
@@ -1596,6 +1589,10 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
         return _customizeWorkshopGroupSettingsRepository.GetEmployeesGroupSettingsByEmployeeId(employeeId, workshopId);
     }
 
+    public bool HasAnyEmployeeWithoutGroup(long workshopId)
+    {
+        return _customizeWorkshopGroupSettingsRepository.HasAnyEmployeeWithoutGroup(workshopId);
+    }
     public OperationResult<List<long>> ValidateReCalculateValueForGroupEdit(List<ReCalculateRollCallValues> commands,
         long workshopId)
     {
@@ -1626,16 +1623,10 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 
         employeeIdsHasCheckout = employeeIdsHasCheckout.Distinct().ToList();
         return isSuccess ?
-            operationResult.Succcedded(employeeIdsHasCheckout) 
+            operationResult.Succcedded(employeeIdsHasCheckout)
             :
             operationResult.Failed("پرسنل هایی دارای فیش هستند لطفا نسبت به تعیین تکلیف این ها اقدام نمایید", employeeIdsHasCheckout);
     }
-
-    public bool HasAnyEmployeeWithoutGroup(long workshopId)
-    {
-        return _customizeWorkshopGroupSettingsRepository.HasAnyEmployeeWithoutGroup(workshopId);
-    }
-
     public bool CheckEmployeeShiftHasChanged(EditCustomizeEmployeeSettings command)
     {
         return _customizeWorkshopEmployeeSettingsRepository.CheckEmployeeShiftHasChanged(command);

CompanyManagment.Application/EmployeeAplication.cs

@@ -1,38 +1,36 @@
-using _0_Framework.Application;
+using System;
+using System.IO;
+using System.Collections.Generic;
 using _0_Framework.InfraStructure;
 using Company.Domain.EmployeeAgg;
-using Company.Domain.LeftWorkAgg;
-using Company.Domain.WorkshopAgg;
 using CompanyManagment.App.Contracts.Employee;
-using CompanyManagment.App.Contracts.EmployeeInsuranceRecord;
 using CompanyManagment.EFCore;
-using System;
-using System.Collections.Generic;
+using _0_Framework.Application;
+using CompanyManagment.App.Contracts.EmployeeInsuranceRecord;
+using Company.Domain.EmployeeInsuranceRecordAgg;
+using Company.Domain.WorkshopAgg;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Transactions;
-using Company.Domain.EmployeeClientTempAgg;
 using Company.Domain.PersonnelCodeAgg;
-using EmployeeInsuranceRecord = Company.Domain.EmployeeInsuranceRecordAgg.EmployeeInsuranceRecord;
-using Microsoft.AspNetCore.Hosting;
-using System.IO;
-using _0_Framework.Application.UID;
-using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg;
-using Company.Domain.CustomizeWorkshopGroupSettingsAgg;
-using Company.Domain.EmployeeDocumentsAgg;
-using Company.Domain.LeftWorkTempAgg;
-using Company.Domain.RollCallEmployeeAgg;
 using CompanyManagment.App.Contracts.CustomizeWorkshopSettings;
 using CompanyManagment.App.Contracts.EmployeeBankInformation;
 using CompanyManagment.App.Contracts.EmployeeDocuments;
 using CompanyManagment.App.Contracts.RollCallEmployeeStatus;
-using RollCallEmployee = Company.Domain.RollCallEmployeeAgg.RollCallEmployee;
-using CompanyManagment.App.Contracts.Employee.DTO;
+using Microsoft.AspNetCore.Hosting;
+using System.IO;
+using System.Transactions;
+using Company.Domain.EmployeeClientTempAgg;
+using Company.Domain.LeftWorkTempAgg;
 using CompanyManagment.App.Contracts.LeftWorkTemp;
-using System.Reflection;
+using _0_Framework.Application.UID;
+using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg;
+using Company.Domain.EmployeeDocumentsAgg;
+using Company.Domain.RollCallEmployeeAgg;
+using Company.Domain.CustomizeWorkshopGroupSettingsAgg;
+using Company.Domain.LeftWorkAgg;
+using CompanyManagment.App.Contracts.Employee.DTO;
 using Company.Domain.EmployeeAuthorizeTempAgg;
-using Company.Domain.RollCallServiceAgg;
-using Microsoft.Extensions.Configuration;
+using Company.Domain.LeftWorkInsuranceAgg;
 
 namespace CompanyManagment.Application;
 
@@ -40,9 +38,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 {
     private readonly IEmployeeRepository _EmployeeRepository;
     private readonly IWorkshopRepository _WorkShopRepository;
-    private readonly ILeftWorkRepository _leftWorkRepository;
-    private readonly IPersonnelCodeRepository _personnelCodeRepository;
-    private readonly IEmployeeClientTempRepository _employeeClientTempRepository;
     private readonly CompanyContext _context;
     public bool nationalCodValid = false;
     public bool idnumberIsOk = true;
@@ -60,25 +55,17 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
     private readonly ILeftWorkTempRepository _leftWorkTempRepository;
     private readonly IUidService _uidService;
     private readonly ICustomizeWorkshopEmployeeSettingsRepository _customizeWorkshopEmployeeSettingsRepository;
+    private readonly ILeftWorkRepository _leftWorkRepository;
+    private readonly IPersonnelCodeRepository _personnelCodeRepository;
+    private readonly IEmployeeClientTempRepository _employeeClientTempRepository;
+    private readonly ICustomizeWorkshopGroupSettingsRepository _customizeWorkshopGroupSettingsRepository;
     private readonly IEmployeeAuthorizeTempRepository _employeeAuthorizeTempRepository;
-    private readonly IRollCallServiceRepository _rollCallServiceRepository;
+    private readonly ILeftWorkInsuranceRepository _leftWorkInsuranceRepository ;
 
-    public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context, IWorkshopRepository workShopRepository,
-        ILeftWorkRepository leftWorkRepository, IPersonnelCodeRepository personnelCodeRepository,
-        IEmployeeClientTempRepository employeeClientTempRepository, IWebHostEnvironment webHostEnvironment,
-        IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, IRollCallEmployeeRepository rollCallEmployeeRepository,
-        ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository,
-        ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication, IEmployeeDocumentsApplication employeeDocumentsApplication,
-        IEmployeeBankInformationApplication employeeBankInformationApplication, ILeftWorkTempRepository leftWorkTempRepository,
-        IUidService uidService, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository,
-        IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository, IRollCallServiceRepository rollCallServiceRepository) : 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;
-        _EmployeeRepository = employeeRepository;
-        this._leftWorkRepository = leftWorkRepository;
-        _personnelCodeRepository = personnelCodeRepository;
-        _employeeClientTempRepository = employeeClientTempRepository;
         _webHostEnvironment = webHostEnvironment;
         _rollCallEmployeeStatusApplication = rollCallEmployeeStatusApplication;
         _rollCallEmployeeRepository = rollCallEmployeeRepository;
@@ -88,15 +75,19 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         _leftWorkTempRepository = leftWorkTempRepository;
         _uidService = uidService;
         _customizeWorkshopEmployeeSettingsRepository = customizeWorkshopEmployeeSettingsRepository;
+        _personnelCodeRepository = personnelCodeRepository;
+        _employeeClientTempRepository = employeeClientTempRepository;
+        _leftWorkRepository = leftWorkRepository;
         _employeeAuthorizeTempRepository = employeeAuthorizeTempRepository;
-        _rollCallServiceRepository = rollCallServiceRepository;
+        _leftWorkInsuranceRepository = leftWorkInsuranceRepository;
+        _EmployeeRepository = employeeRepository;
     }
 
     public OperationResult Create(CreateEmployee command)
     {
         var opration = new OperationResult();
         if (_EmployeeRepository.Exists(x =>
-                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.NationalCode != null))
+                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.NationalCode != null && x.IsActiveString == "true"))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
 
         //if (_EmployeeRepository.Exists(x => x.IdNumber == command.IdNumber && x.IdNumber !=null))
@@ -114,7 +105,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         //}
 
-
+       
 
         if (command.Address != null && command.State == null)
         {
@@ -153,8 +144,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 {
                     case "0000000000":
                     case "1111111111":
-                    case "2222222222":
-                    case "3333333333":
+                    case "22222222222":
+                    case "33333333333":
                     case "4444444444":
                     case "5555555555":
                     case "6666666666":
@@ -206,9 +197,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 return opration.Failed("کد ملی وارد شده تکراری است");
             }
         }
+                
 
-
-
+           
         string initial = "1300/10/11";
         var dateOfBirth = command.DateOfBirth != null ? command.DateOfBirth.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
         var dateOfIssue = command.DateOfIssue != null ? command.DateOfIssue.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
@@ -233,10 +224,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         return opration.Succcedded(employeeData.id);
 
-
+          
     }
 
-
     public OperationResult Edit(EditEmployee command)
     {
         var opration = new OperationResult();
@@ -245,11 +235,11 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             return opration.Failed("رکورد مورد نظر یافت نشد");
 
         if (_EmployeeRepository.Exists(x =>
-                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.id != command.Id))
+                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.id != command.Id && x.IsActiveString == "true"))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
         //if (_EmployeeRepository.Exists(x => x.IdNumber == command.IdNumber && x.IdNumber != null && x.id != command.Id))
         //    return opration.Failed("شماره شناسنامه وارد شده تکراری است");
-
+           
         if (command.Address != null && command.State == null)
         {
             StatCity = false;
@@ -287,8 +277,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 {
                     case "0000000000":
                     case "1111111111":
-                    case "2222222222":
-                    case "3333333333":
+                    case "22222222222":
+                    case "33333333333":
                     case "4444444444":
                     case "5555555555":
                     case "6666666666":
@@ -341,7 +331,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             }
         }
 
-
+            
         string initial = "1300/10/11";
         var dateOfBirth = command.DateOfBirth != null ? command.DateOfBirth.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
         var dateOfIssue = command.DateOfIssue != null ? command.DateOfIssue.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
@@ -349,7 +339,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             dateOfIssue,
             command.PlaceOfIssue, command.NationalCode, command.IdNumber, command.Gender, command.Nationality,
             command.Phone, command.Address,
-            command.State, command.City, command.MaritalStatus, command.MilitaryService, command.LevelOfEducation,
+            command.State,command.City, command.MaritalStatus, command.MilitaryService, command.LevelOfEducation,
             command.FieldOfStudy, command.BankCardNumber,
             command.BankBranch, command.InsuranceCode, command.InsuranceHistoryByYear,
             command.InsuranceHistoryByMonth, command.NumberOfChildren, command.OfficePhone
@@ -362,7 +352,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         return opration.Succcedded();
 
-
+         
     }
 
     public EditEmployee GetDetails(long id)
@@ -370,11 +360,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         return _EmployeeRepository.GetDetails(id);
     }
 
-    public EditEmployee GetDetailsIgnoreQueryFilter(long id)
-    {
-        return _EmployeeRepository.GetDetails(id);
-    }
-
     public OperationResult Active(long id)
     {
         var opration = new OperationResult();
@@ -413,8 +398,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
     public async Task<List<EmployeeViewModel>> Search(EmployeeSearchModel searchModel)
     {
-        var res = await _EmployeeRepository.Search(searchModel);
-
+        var res=await _EmployeeRepository.Search(searchModel);
+     
         foreach (var item in res)
         {
             var children = _context.EmployeeChildrenSet.Count(x => x.EmployeeId == item.Id);
@@ -705,8 +690,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 {
                     case "0000000000":
                     case "1111111111":
-                    case "2222222222":
-                    case "3333333333":
+                    case "22222222222":
+                    case "33333333333":
                     case "4444444444":
                     case "5555555555":
                     case "6666666666":
@@ -835,8 +820,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 {
                     case "0000000000":
                     case "1111111111":
-                    case "2222222222":
-                    case "3333333333":
+                    case "22222222222":
+                    case "33333333333":
                     case "4444444444":
                     case "5555555555":
                     case "6666666666":
@@ -916,17 +901,11 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         return res;
     }
-
     #endregion
 
+
     #region Pooya
 
-
-    public List<EmployeeViewModel> GetWorkingEmployeesByWorkshopId(long workshopId)
-    {
-        return _EmployeeRepository.GetWorkingEmployeesByWorkshopId(workshopId);
-    }
-
     public EmployeeViewModel GetEmployeeByNationalCodeIfHasActiveLeftWork(string nationalCode, List<long> workshopIds)
     {
         if (nationalCode.NationalCodeValid() != "valid")
@@ -934,6 +913,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         var workshopEmployeesWithLeftWork = _EmployeeRepository.GetWorkingEmployeesByWorkshopIdsAndNationalCodeAndDate(workshopIds, nationalCode, DateTime.Now.Date);
         return workshopEmployeesWithLeftWork.FirstOrDefault();
     }
+
     public EmployeeViewModel GetEmployeeByNationalCodeIfHasLeftWork(string nationalCode, List<long> workshopIds)
     {
         if (nationalCode.NationalCodeValid() != "valid")
@@ -941,8 +921,11 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         var workshopEmployeesWithLeftWork = _EmployeeRepository.GetWorkedEmployeesByWorkshopIdsAndNationalCodeAndDate(workshopIds, nationalCode, DateTime.Now.Date);
         return workshopEmployeesWithLeftWork.FirstOrDefault();
     }
+    public List<EmployeeViewModel> GetWorkingEmployeesByWorkshopId(long workshopId)
+    {
+        return _EmployeeRepository.GetWorkingEmployeesByWorkshopId(workshopId);
 
-
+    }
 
     public List<EmployeeViewModel> GetRangeByIds(IEnumerable<long> employeeIds)
     {
@@ -978,7 +961,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         }).ToList();
     }
 
-
     #endregion
 
     #region Mahan
@@ -1030,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)
@@ -1045,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);
@@ -1062,7 +1052,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             _personnelCodeRepository.SaveChanges();
         }
 
-        var rollCallService = _rollCallServiceRepository.GetActiveServiceByWorkshopId(command.WorkshopId);
 
         if (string.IsNullOrWhiteSpace(command.RollCallUploadEmployeePicture?.Picture1) == false &&
             string.IsNullOrWhiteSpace(command.RollCallUploadEmployeePicture?.Picture2) == false)
@@ -1072,14 +1061,14 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 Directory.CreateDirectory(directoryPath);
 
             var filePath1 = Path.Combine(directoryPath) + $@"\1.jpg";
-
-            CreateImageFromBase64(command.RollCallUploadEmployeePicture.Picture1, filePath1);
-
+         
+                CreateImageFromBase64(command.RollCallUploadEmployeePicture.Picture1, filePath1);
+            
 
             var filePath2 = Path.Combine(directoryPath) + $@"\2.jpg";
-
-            CreateImageFromBase64(command.RollCallUploadEmployeePicture.Picture2, filePath2);
-
+            
+                CreateImageFromBase64(command.RollCallUploadEmployeePicture.Picture2, filePath2);
+            
 
 
             var rollCallEmployee =
@@ -1112,16 +1101,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
             if (command.CreateCustomizeEmployeeSettings.GroupId > 0)
             {
-                if (rollCallService?.HasCustomizeCheckoutService == "true")
-                {
-                    var employeeSalary = command.CreateCustomizeEmployeeSettings.Salary?.MoneyToDouble() ?? 0;
-
-                    if (employeeSalary < 1)
-                    {
-                        return op.Failed("لطفا حقوق پرسنل را وارد کنید");
-                    }
-
-                }
                 if (_customizeWorkshopEmployeeSettingsRepository
                     .Exists(x => x.WorkshopId == workshop.Id && x.EmployeeId == employee.id))
                 {
@@ -1149,16 +1128,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         }
         else if (command.CreateCustomizeEmployeeSettings.GroupId > 0)
         {
-            if (rollCallService?.HasCustomizeCheckoutService == "true")
-            {
-                var employeeSalary = command.CreateCustomizeEmployeeSettings.Salary?.MoneyToDouble() ?? 0;
-
-                if (employeeSalary < 1)
-                {
-                    return op.Failed("لطفا حقوق پرسنل را وارد کنید");
-                }
-
-            }
             if (_customizeWorkshopEmployeeSettingsRepository
                 .Exists(x => x.WorkshopId == workshop.Id && x.EmployeeId == employee.id))
             {
@@ -1252,7 +1221,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         byte[] bytes = Convert.FromBase64String(subBase64);
         System.IO.File.WriteAllBytes(filePath, bytes);
     }
-
     public async Task<OperationResult<EmployeeByNationalCodeInWorkshopViewModel>>
         ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(string nationalCode, string birthDate, long workshopId)
     {
@@ -1542,9 +1510,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         {
             employee.EditAuthorizeEmployee(employee.DateOfIssue, employee.PlaceOfIssue,
                 employee.Phone, employee.Address, employee.State, employee.City, command.MaritalStatus,
-                command.MilitaryService, employee.LevelOfEducation, employee.FieldOfStudy,
+                command.MilitaryService, employee.LevelOfEducation, employee.FieldOfStudy, 
                 employee.BankCardNumber, employee.BankBranch, employee.InsuranceCode,
-                employee.InsuranceHistoryByYear, employee.InsuranceHistoryByMonth, employee.NumberOfChildren,
+                employee.InsuranceHistoryByYear, employee.InsuranceHistoryByMonth, employee.NumberOfChildren, 
                 employee.OfficePhone, employee.MclsUserName, employee.MclsPassword,
                 employee.EserviceUserName, employee.EservicePassword, employee.TaxOfficeUserName,
                 employee.TaxOfficepassword, employee.SanaUserName, employee.SanaPassword);
@@ -1658,5 +1626,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
     }
 
+
     #endregion
 }

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/TemporaryClientRegistrationApplication.cs

@@ -67,7 +67,7 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
             return op.Failed("شماره همراه نا معتبر است");
 
 
-
+    
         #endregion
 
 
@@ -141,8 +141,6 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
             result.FName = createTemp.FName;
             result.LName = createTemp.LName;
             result.DateOfBirthFa = dateOfBirth;
-            result.FatherName = createTemp.FatherName;
-            result.IdNumberSerial = createTemp.IdNumberSerial;
             result.IdNumber = idNumber;
 
             return op.Succcedded(result);
@@ -190,7 +188,7 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
     /// </summary>
     /// <param name="command"></param>
     /// <returns></returns>
-    public async Task<OperationResult> CreateOrUpdateWorkshopTemp(List<WorkshopTempViewModel> command, long contractingPartyTempId)
+    public async Task<OperationResult> CreateOrUpdateWorkshopTemp(List<WorkshopTempViewModel> command)
     {
         var op = new OperationResult();
         var updateWorkshopList = command.Where(x => x.Id > 0).ToList();
@@ -198,17 +196,10 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
 
         if (updateWorkshopList.Count == 0 && createNewWorkshopList.Count == 0)
             return op.Failed("هیچ مجموعه ای ایجاد نشده است");
-        var oldWorkshops = await _workshopTempRepository.GetWorkshopTemp(contractingPartyTempId);
 
         #region Update
         if (updateWorkshopList.Count > 0)
         {
-            var updateListIds = updateWorkshopList.Select(x => x.Id).ToList();
-            var oldWorkshopsIds = oldWorkshops.Select(x => x.Id).ToList();
-            var exceptWorkshops = oldWorkshopsIds.Except(updateListIds).ToList();
-            if (exceptWorkshops.Any())
-                await _workshopTempRepository.RemoveWorkshopTemps(exceptWorkshops);
-
 
             foreach (var workshop in updateWorkshopList)
             {
@@ -221,7 +212,6 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
                     workshop.RollCall == false && workshop.Insurance == false)
                     op.Failed($"برای مجموعه {workshop.WorkshopName} هیچ سرویسی انتخاب نشده است");
                 var existWorkshops = _workshopTempRepository.Get(workshop.Id);
-
                 if (existWorkshops != null)
                 {
                     if (workshop.ContractAndCheckout)
@@ -266,8 +256,6 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
                         if (workshop.CustomizeCheckout)
                             await _workshopServicesTempRepository.CreateAsync(
                                 new WorkshopServicesTemp("CustomizeCheckout", workshop.CountPerson, workshop.Id));
-
-                        await _workshopServicesTempRepository.SaveChangesAsync();
                     }
 
                 }
@@ -336,8 +324,6 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
                     if (workshop.CustomizeCheckout)
                         await _workshopServicesTempRepository.CreateAsync(
                             new WorkshopServicesTemp("CustomizeCheckout", workshop.CountPerson, createNewWorkshopTemp.id));
-
-                    await _workshopServicesTempRepository.SaveChangesAsync();
                 }
 
             }
@@ -366,9 +352,8 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
     /// </summary>
     /// <param name="contractingPartyTempId"></param>
     /// <returns></returns>
-    public async Task<ReviewAndPaymentViewModel> GetTotalPaymentAndWorkshopList(long contractingPartyTempId, string periodModel = "12", string paymentModel = "OneTime", string contractStartType = "currentMonth")
+    public async Task<ReviewAndPaymentViewModel> GetTotalPaymentAndWorkshopList(long contractingPartyTempId, string periodModel = "12", string paymentModel = "OneTime")
     {
-
         //دریافت کارگاه ها
         var workshops = await _workshopTempRepository.GetWorkshopTemp(contractingPartyTempId);
 
@@ -395,10 +380,9 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
             _ => 12,
         };
         //رند کردن مبالغ کارگاه ها
-        var roundAmount = (((Convert.ToInt64(totalPayment1MonthDouble))) / 1000000) * 1000000;
-        double roundAmount2 = roundAmount;
+        var roundAmount = (int)(totalPayment1MonthDouble / 1000000) * 1000000;
         //بدست آوردن جمع کل مبالغ کارگاه بر اساس مدت قراداد
-        result.SumOfWorkshopsPaymentDouble = months * roundAmount2;
+        result.SumOfWorkshopsPaymentDouble = roundAmount * months;
         result.SumOfWorkshopsPaymentPaymentStr = result.SumOfWorkshopsPaymentDouble.ToMoney();
 
 
@@ -410,112 +394,31 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
         //مالیات
         result.ValueAddedTaxDouble = tenPercent;
         result.ValueAddedTaxSt = tenPercent.ToMoney();
-        //پرداخت یکجا
-        #region OneTimePaymentResult
-
-        double discountOneTimePeyment = result.SumOfWorkshopsPaymentDouble - tenPercent;
-
-
-        //مبلغ بدون مالیات و با تخفیف
-        result.OneTimeWithoutTaxPaymentDouble = discountOneTimePeyment;
-        result.OneTimeWithoutTaxPaymentStr = discountOneTimePeyment.ToMoney();
-
-        //مبلغ با مالیات
-        result.OneTimeTotalPaymentDouble = discountOneTimePeyment + tenPercent;
-        result.OneTimeTotalPaymentStr = result.OneTimeTotalPaymentDouble.ToMoney();
-
-        #endregion
-
-        //پرداخت ماهیانه
-        #region MonthlyPaymentResult
-
-        //مبلغ بدون مالیات
-        result.MonthlyWithoutTaxPaymentDouble = result.SumOfWorkshopsPaymentDouble;
-        result.MonthlyWithoutTaxPaymentStr = result.SumOfWorkshopsPaymentDouble.ToMoney();
-
-        // مبلغ با مالیات
-        result.MonthlyTotalPaymentDouble = result.SumOfWorkshopsPaymentDouble + tenPercent;
-        result.MonthlyTotalPaymentStr = result.MonthlyTotalPaymentDouble.ToMoney();
-        var installmentList = new List<MonthlyInstallment>();
-
-        var startDate = (DateTime.Now).ToFarsi();
-        result.ContractStartCurrentMonthFa = $"{startDate.Substring(0, 8)}01";
-        result.ContractStartCurrentMonthGr = result.ContractStartCurrentMonthFa.ToGeorgianDateTime();
-        startDate = result.ContractStartCurrentMonthFa;
-
-        result.ContractStartNextMonthGr = ((startDate.FindeEndOfMonth()).ToGeorgianDateTime()).AddDays(1);
-        result.ContractStartNextMonthFa = result.ContractStartNextMonthGr.ToFarsi();
-
-        if (contractStartType == "nextMonth")
-            startDate = result.ContractStartNextMonthFa;
-
-
-
-        var findeEnd = Tools.FindEndOfContract(startDate, periodModel);
-        var contractEndDate = findeEnd.endDateGr;
-        result.ContractEndGr = contractEndDate;
-        result.ContractEndFa = contractEndDate.ToFarsi();
-
-        if (periodModel == "1")
+        if (paymentModel == "OneTime")//تخفیف 10 درصدی درصورت پرداخت یکجا
         {
 
-            installmentList.Add(new MonthlyInstallment()
-            {
-                InstallmentAmountStr = result.MonthlyTotalPaymentStr,
-                InstallmentCounter = "سررسید پرداخت اول",
-                InstalmentDate = (DateTime.Now).ToFarsi()
+            double discountOneTimePeyment = result.SumOfWorkshopsPaymentDouble - tenPercent;
+            
 
-            });
-            result.MonthlyInstallments = installmentList;
+            //مبلغ بدون مالیات و با تخفیف
+            result.WithoutTaxPaymentDouble = discountOneTimePeyment;
+            result.WithoutTaxPaymentStr = discountOneTimePeyment.ToMoney();
+
+            //مبلغ با مالیات
+            result.TotalPaymentDouble = discountOneTimePeyment + tenPercent;
+            result.TotalPaymentStr = result.TotalPaymentDouble.ToMoney();
         }
         else
         {
-            int instalmentCount = Convert.ToInt32(periodModel);
-            var instalmentAmount = result.MonthlyTotalPaymentDouble / instalmentCount;
-            var findEndOfMonth = startDate.FindeEndOfMonth();
-            for (int i = 1; i <= instalmentCount; i++)
-            {
-                if (i == 1)
-                {
-                    startDate = (DateTime.Now).ToFarsi();
-
-                }
-                else if (i > 1)
-                {
-                    var currentMonthStart = ((findEndOfMonth.ToGeorgianDateTime()).AddDays(1)).ToFarsi();
-                    startDate = currentMonthStart.FindeEndOfMonth();
-                    findEndOfMonth = startDate;
-                }
-
-                installmentList.Add(new MonthlyInstallment()
-                {
-                    InstallmentAmountStr = instalmentAmount.ToMoney(),
-                    InstallmentCounter = i switch
-                    {
-                        1 => "سررسید پرداخت اول",
-                        2 => "سررسید پرداخت دوم",
-                        3 => "سررسید پرداخت سوم",
-                        4 => "سررسید پرداخت چهارم",
-                        5 => "سررسید پرداخت پنجم",
-                        6 => "سررسید پرداخت ششم",
-                        7 => "سررسید پرداخت هفتم",
-                        8 => "سررسید پرداخت هشتم",
-                        9 => "سررسید پرداخت نهم",
-                        10 => "سررسید پرداخت دهم",
-                        11 => "سررسید پرداخت یازدهم",
-                        12 => "سررسید پرداخت دوازدهم",
-                        _ => "سررسید پرداخت دوازدهم",
-                    },
-                    InstalmentDate = startDate
-
-                });
-            }
+            //مبلغ بدون مالیات
+            result.WithoutTaxPaymentDouble = result.SumOfWorkshopsPaymentDouble;
+            result.WithoutTaxPaymentStr = result.SumOfWorkshopsPaymentDouble.ToMoney();
 
+            // مبلغ با مالیات
+            result.TotalPaymentDouble = result.SumOfWorkshopsPaymentDouble + tenPercent;
+            result.TotalPaymentStr = result.TotalPaymentDouble.ToMoney();
         }
 
-        #endregion
-
-        result.MonthlyInstallments = installmentList;
         result.ContractingPartTempId = contractingPartyTempId;
 
         return result;
@@ -527,21 +430,19 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
     /// </summary>
     /// <param name="contractingPartyTempId"></param>
     /// <returns></returns>
-    public async Task<OperationResult> CreateOrUpdateInstitutionContractTemp(long contractingPartyTempId, string periodModel, string paymentModel, double totalPayment, double valueAddedTax, DateTime contractStart)
+    public async Task<OperationResult> CreateOrUpdateInstitutionContractTemp(long contractingPartyTempId, string periodModel, string paymentModel, double totalPayment, double valueAddedTax)
     {
 
         var op = new OperationResult();
         var institutionContractTemp = await
             _institutionContractTempRepository.GetInstitutionContractTemp(0, contractingPartyTempId);
-        var contractStartDate = contractStart;
-        string contractStartFa = contractStart.ToFarsi();
-        var findeEnd = Tools.FindEndOfContract(contractStartFa, periodModel);
-        var contractEndDate = findeEnd.endDateGr;
+
         if (institutionContractTemp == null)
         {
             var periodModelInt = Convert.ToInt32(periodModel);
-
-            var create = new InstitutionContractTemp(contractingPartyTempId, paymentModel, periodModel, totalPayment, contractStartDate, contractEndDate, "official", valueAddedTax, "", "BeforeSendVerifyCode", 0, null, null);
+            var contractstart = DateTime.Now;
+            var contractEnd = DateTime.Now.AddMonths(periodModelInt);
+            var create = new InstitutionContractTemp(contractingPartyTempId,paymentModel,periodModel,totalPayment,contractstart,contractEnd,"official", valueAddedTax,"", "BeforeSendVerifyCode", 0,null,null);
             _institutionContractTempRepository.Create(create);
             _institutionContractTempRepository.SaveChanges();
             return op.Succcedded();
@@ -550,20 +451,20 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
         {
             if (institutionContractTemp.VerifyCodeEndTime != null)
             {
-                var spaning = (DateTime.Now - institutionContractTemp.VerifyCodeEndTime.Value);
+                var spaning = (institutionContractTemp.VerifyCodeEndTime.Value - DateTime.Now);
                 if (institutionContractTemp.RegistrationStatus == "VerifyCodeSent" && spaning > new TimeSpan(0, 0, 0) && spaning < new TimeSpan(0, 1, 0))
                     return op.Failed("شما به تازگی پیامک دریافت نموده اید دو دقیقه صبر کنید و دوباره تلاش کنید");
             }
-
+  
             if (institutionContractTemp.RegistrationStatus == "Completed")
                 return op.Failed("شما قبلا ثبت نام خود را تکمیل نموده اید");
-
+          
 
             var periodModelInt = Convert.ToInt32(periodModel);
             var contractstart = DateTime.Now;
             var contractEnd = DateTime.Now.AddMonths(periodModelInt);
             var update = _institutionContractTempRepository.Get(institutionContractTemp.Id);
-            update.Edit(contractingPartyTempId, paymentModel, periodModel, totalPayment, contractStartDate, contractEndDate, "official", valueAddedTax, "", "BeforeSendVerifyCode", 0, null, null);
+            update.Edit(contractingPartyTempId, paymentModel, periodModel, totalPayment, contractstart, contractEnd, "official", valueAddedTax, "", "BeforeSendVerifyCode", 0, null, null);
             _institutionContractTempRepository.SaveChanges();
             return op.Succcedded();
         }
@@ -582,14 +483,14 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
     {
 
         var op = new OperationResult();
-        var institutionContractTemp = await
+        var institutionContractTemp = await 
             _institutionContractTempRepository.GetInstitutionContractTemp(0, contractingPartyTempId);
         if (institutionContractTemp == null)
-            return op.Failed("خطا");
+            return op.Failed("خظا");
 
         var update = _institutionContractTempRepository.Get(institutionContractTemp.Id);
 
-
+        
 
 
         if (institutionContractTemp.RegistrationStatus == "BeforeSendVerifyCode")
@@ -615,29 +516,26 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
                 return op.Succcedded(1, "کد برای شما پیامک شد");
             }
 
-
+           
         }
 
         if (institutionContractTemp.RegistrationStatus == "VerifyCodeSent")
 
         {
-
-            if (DateTime.Now < institutionContractTemp.VerifyCodeEndTime.Value)
-                return op.Failed("کد دریافت شده را وارد کنید");
-            var spaning = (DateTime.Now - institutionContractTemp.VerifyCodeEndTime.Value);
-            if ((spaning > new TimeSpan(0, 0, 0) && spaning < new TimeSpan(0, 1, 0)))
+            var spaning = (institutionContractTemp.VerifyCodeEndTime.Value - DateTime.Now);
+            if ((spaning >  new TimeSpan(0, 0, 0) && spaning < new TimeSpan(0, 1, 0)))
                 return op.Failed("شما به تازگی پیامک دریافت نموده اید دو دقیقه صبر کنید و دوباره تلاش کنید");
 
-            if ((spaning > new TimeSpan(0, 1, 0)))
+            if ((spaning > new TimeSpan(0, 0, 0) && spaning > new TimeSpan(0, 1, 0)))
             {
                 //ساخت کد شش رقمی
                 Random generator = new Random();
                 String code = generator.Next(1, 1000000).ToString("D6");
                 //ارسال اس ام اس
                 var getContractingPaty = _contractingPartyTempRepository.GetByContractingPartyTempId(contractingPartyTempId);
-                var sendResult = await _smsService.SendVerifyCodeToClient(getContractingPaty.Phone, code);
+                var sendResult =await _smsService.SendVerifyCodeToClient(getContractingPaty.Phone, code);
 
-                if (!sendResult.IsSuccedded)
+                if(!sendResult.IsSuccedded)
                     return op.Failed($"{sendResult.Message}");
 
 
@@ -646,16 +544,16 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
                 //ذخیره تاریخ ارسال و مهلت پایان
                 //ذخیره آیدی پیامک
                 //تغییر وضعیت به ارسال شده
-
+              
                 if (update != null)
                 {
-                    update.Update(code, "VerifyCodeSent", sendResult.MessageId, DateTime.Now, DateTime.Now.AddMinutes(2));
+                    update.Update(code, "VerifyCodeSent",sendResult.MessageId, DateTime.Now, DateTime.Now.AddMinutes(2));
                     _institutionContractTempRepository.SaveChanges();
                     return op.Succcedded(1, "کد برای شما پیامک شد");
                 }
+               
 
-
-
+              
             }
 
         }
@@ -682,25 +580,25 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
             _institutionContractTempRepository.GetInstitutionContractTemp(0, contractingPartyTempId);
         if (institutionContractTemp == null)
             return op.Failed("خظا");
-        if (institutionContractTemp.RegistrationStatus != "VerifyCodeSent")
+        if(institutionContractTemp.RegistrationStatus != "VerifyCodeSent")
             return op.Failed("خطا");
 
-        if (institutionContractTemp.VerifyCodeEndTime < DateTime.Now)
+        if(institutionContractTemp.VerifyCodeEndTime < DateTime.Now)
             return op.Failed("کد شما منقضی شده است");
 
-        if (institutionContractTemp.SendVerifyCodeTime < DateTime.Now && institutionContractTemp.VerifyCodeEndTime >= DateTime.Now)
+        if(institutionContractTemp.SendVerifyCodeTime < DateTime.Now && institutionContractTemp.VerifyCodeEndTime >= DateTime.Now)
         {
             if (institutionContractTemp.VerifyCode == verifyCode)
             {
 
-
+               
                 return op.Succcedded();
             }
             else
             {
                 return op.Failed("کد وارد شده صحیح نیست");
             }
-
+              
         }
 
 

CompanyManagment.Application/YearlySalaryApplication.cs

@@ -160,7 +160,7 @@ public class YearlySalaryApplication : IYearlySalaryApplication
     public InsuranceYearlySalaryModel GetInsuranceItems(DateTime startDate, DateTime endDate, string year)
     {
         return _yearlySalaryRepository.GetInsuranceItems(startDate, endDate, year);
-    } 
+    }
 
     #endregion
 }

CompanyManagment.EFCore/CompanyContext.cs

@@ -9,7 +9,6 @@ using Company.Domain.CheckoutAgg;
 using Company.Domain.ClassifiedSalaryAgg;
 using Company.Domain.ClientEmployeeWorkshopAgg;
 using Company.Domain.Contact2Agg;
-using Company.Domain.ContactUsAgg;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.ContractAgg;
 using Company.Domain.ContractingPartyAccountAgg;
@@ -176,8 +175,6 @@ public class CompanyContext : DbContext
 
     public DbSet<EmployeeClientTemp> EmployeeClientTemps { get; set; }
     public DbSet<LeftWorkTemp> LeftWorkTemps { get; set; }
-    public DbSet<ContactUs> ContactUs { get; set; }
-
 
     public DbSet<EmployeeAuthorizeTemp> EmployeeAuthorizeTemps { get; set; }
     public DbSet<AdminMonthlyOverview> AdminMonthlyOverviews { get; set; }

CompanyManagment.EFCore/Mapping/ContactUsMapping.cs

@@ -1,20 +0,0 @@
-using Company.Domain.ContactUsAgg;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-
-namespace CompanyManagment.EFCore.Mapping;
-
-public class ContactUsMapping:IEntityTypeConfiguration<ContactUs>
-{
-    public void Configure(EntityTypeBuilder<ContactUs> builder)
-    {
-        builder.HasKey(x => x.id);
-        builder.Property(x => x.FullName).HasMaxLength(200);
-        builder.Property(x => x.Title).HasMaxLength(200);
-        builder.Property(x => x.Email).HasMaxLength(200);
-        builder.Property(x => x.FirstName).HasMaxLength(100);
-        builder.Property(x => x.LastName).HasMaxLength(100);
-        builder.Property(x => x.Message).HasMaxLength(500);
-        builder.Property(x => x.PhoneNumber).HasMaxLength(20);
-    }
-}

CompanyManagment.EFCore/Mapping/InsuranceListMapping.cs

@@ -13,5 +13,32 @@ public class InsuranceListMapping : IEntityTypeConfiguration<InsuranceList>
 
         builder.Property(x => x.Year).HasMaxLength(4);
         builder.Property(x => x.Month).HasMaxLength(2);
+
+        builder.ComplexProperty(x => x.Inspection, inspection =>
+        {
+            inspection.IsRequired();
+            inspection.Property(x => x.Type).HasConversion<string>().HasMaxLength(50);
+            inspection.Property(x => x.LastInspectionDateTime);
+            inspection.Property(x => x.MediaId);
+        });
+
+        builder.ComplexProperty(x => x.Debt, debt =>
+        {
+            debt.IsRequired();
+            debt.Property(x => x.Type).HasConversion<string>().HasMaxLength(50);
+            debt.Property(x => x.DebtDate);
+            debt.Property(x => x.Amount);
+            debt.Property(x => x.MediaId);
+        });
+
+        builder.ComplexProperty(x => x.EmployerApproval, approval =>
+        {
+            approval.IsRequired();
+            approval.Property(x => x.Status).HasConversion<string>().HasMaxLength(50);
+            approval.Property(x => x.Description).HasMaxLength(500);
+        });
+
+        //builder.HasMany(x => x.EmployerSignatures)
+        //    .WithOne(x => x.InsuranceList).HasForeignKey(x => x.InsuranceListId);
     }
 }

CompanyManagment.EFCore/Mapping/PersonalContractingpartyMapping.cs

@@ -39,7 +39,7 @@ public class PersonalContractingpartyMapping : IEntityTypeConfiguration<Personal
         builder.Property(x => x.IdNumberSerial).HasMaxLength(15);
         builder.Property(x => x.FatherName).HasMaxLength(20);
         builder.Property(x => x.DateOfBirth).IsRequired(false);
-        builder.Property(x => x.Gender).HasConversion(
+                builder.Property(x => x.Gender).HasConversion(
             v => v.ToString(),
             v => string.IsNullOrWhiteSpace(v) ? Gender.None : (Gender)Enum.Parse(typeof(Gender), v)).HasMaxLength(6);
 

CompanyManagment.EFCore/Migrations/20250423184716_add contact us .cs

@@ -1,42 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addcontactus : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "ContactUs",
-                columns: table => new
-                {
-                    id = table.Column<long>(type: "bigint", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    FirstName = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
-                    LastName = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
-                    Email = table.Column<string>(type: "nvarchar(200)", maxLength: 200, nullable: true),
-                    PhoneNumber = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: true),
-                    Title = table.Column<string>(type: "nvarchar(200)", maxLength: 200, nullable: true),
-                    Message = table.Column<string>(type: "nvarchar(500)", maxLength: 500, nullable: true),
-                    FullName = table.Column<string>(type: "nvarchar(200)", maxLength: 200, nullable: true),
-                    CreationDate = table.Column<DateTime>(type: "datetime2", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ContactUs", x => x.id);
-                });
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "ContactUs");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20250427155240_add salaryAid calculation date.cs

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

CompanyManagment.EFCore/Migrations/20250427160638_add salaryAid calculation date to customize checkouts.cs

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

CompanyManagment.EFCore/Migrations/20250521125646_add inspection-debt-approval to insurance list.Designer.cs

@@ -1,5 +1,6 @@
 // <auto-generated />
 using System;
+using System.Collections.Generic;
 using CompanyManagment.EFCore;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -12,8 +13,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace CompanyManagment.EFCore.Migrations
 {
     [DbContext(typeof(CompanyContext))]
-    [Migration("20250427160638_add salaryAid calculation date to customize checkouts")]
-    partial class addsalaryAidcalculationdatetocustomizecheckouts
+    [Migration("20250521125646_add inspection-debt-approval to insurance list")]
+    partial class addinspectiondebtapprovaltoinsurancelist
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -1498,6 +1499,14 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(20)
                         .HasColumnType("nvarchar(20)");
 
+                    b.Property<string>("IdNumberSeri")
+                        .HasMaxLength(25)
+                        .HasColumnType("nvarchar(25)");
+
+                    b.Property<string>("IdNumberSerial")
+                        .HasMaxLength(25)
+                        .HasColumnType("nvarchar(25)");
+
                     b.Property<string>("InsuranceCode")
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
@@ -1594,6 +1603,62 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("Employees", (string)null);
                 });
 
+            modelBuilder.Entity("Company.Domain.EmployeeAuthorizeTempAgg.EmployeeAuthorizeTemp", b =>
+                {
+                    b.Property<long>("id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
+
+                    b.Property<DateTime>("BirthDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("FName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("FatherName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasMaxLength(15)
+                        .HasColumnType("nvarchar(15)");
+
+                    b.Property<string>("IdNumber")
+                        .HasMaxLength(15)
+                        .HasColumnType("nvarchar(15)");
+
+                    b.Property<string>("IdNumberSeri")
+                        .HasMaxLength(25)
+                        .HasColumnType("nvarchar(25)");
+
+                    b.Property<string>("IdNumberSerial")
+                        .HasMaxLength(25)
+                        .HasColumnType("nvarchar(25)");
+
+                    b.Property<string>("LName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("NationalCode")
+                        .HasMaxLength(15)
+                        .HasColumnType("nvarchar(15)");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("NationalCode")
+                        .IsUnique()
+                        .HasFilter("[NationalCode] IS NOT NULL");
+
+                    b.ToTable("EmployeeAuthorizeTemps", (string)null);
+                });
+
             modelBuilder.Entity("Company.Domain.EmployeeBankInformationAgg.EmployeeBankInformation", b =>
                 {
                     b.Property<long>("id")
@@ -1782,6 +1847,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("UploaderId")
                         .HasColumnType("bigint");
 
+                    b.Property<long>("UploaderRoleId")
+                        .HasColumnType("bigint");
+
                     b.Property<string>("UploaderType")
                         .IsRequired()
                         .HasMaxLength(20)
@@ -1893,6 +1961,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("EmployeeId")
                         .HasColumnType("bigint");
 
+                    b.Property<double>("FamilyAllowance")
+                        .HasColumnType("float");
+
                     b.Property<bool>("IncludeStatus")
                         .HasColumnType("bit");
 
@@ -1920,6 +1991,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<double>("MonthlySalary")
                         .HasColumnType("float");
 
+                    b.Property<double>("OverTimePay")
+                        .HasColumnType("float");
+
                     b.Property<DateTime>("StartWorkDate")
                         .HasColumnType("datetime2");
 
@@ -3149,6 +3223,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
                     b.Property<long>("InsuranceJobId")
                         .HasColumnType("bigint");
 
@@ -3164,6 +3241,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<double>("SalaryMoreThan")
                         .HasColumnType("float");
 
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime2");
+
                     b.HasKey("id");
 
                     b.HasIndex("InsuranceJobId");
@@ -3244,6 +3324,55 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(4)
                         .HasColumnType("nvarchar(4)");
 
+                    b.ComplexProperty<Dictionary<string, object>>("Debt", "Company.Domain.InsuranceListAgg.InsuranceList.Debt#InsuranceListDebt", b1 =>
+                        {
+                            b1.IsRequired();
+
+                            b1.Property<double>("Amount")
+                                .HasColumnType("float");
+
+                            b1.Property<DateTime>("DebtDate")
+                                .HasColumnType("datetime2");
+
+                            b1.Property<long>("MediaId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<string>("Type")
+                                .IsRequired()
+                                .HasMaxLength(50)
+                                .HasColumnType("nvarchar(50)");
+                        });
+
+                    b.ComplexProperty<Dictionary<string, object>>("EmployerApproval", "Company.Domain.InsuranceListAgg.InsuranceList.EmployerApproval#InsuranceListEmployerApproval", b1 =>
+                        {
+                            b1.IsRequired();
+
+                            b1.Property<string>("Description")
+                                .HasMaxLength(500)
+                                .HasColumnType("nvarchar(500)");
+
+                            b1.Property<string>("Status")
+                                .IsRequired()
+                                .HasMaxLength(50)
+                                .HasColumnType("nvarchar(50)");
+                        });
+
+                    b.ComplexProperty<Dictionary<string, object>>("Inspection", "Company.Domain.InsuranceListAgg.InsuranceList.Inspection#InsuranceListInspection", b1 =>
+                        {
+                            b1.IsRequired();
+
+                            b1.Property<DateTime>("LastInspectionDateTime")
+                                .HasColumnType("datetime2");
+
+                            b1.Property<long>("MediaId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<string>("Type")
+                                .IsRequired()
+                                .HasMaxLength(50)
+                                .HasColumnType("nvarchar(50)");
+                        });
+
                     b.HasKey("id");
 
                     b.ToTable("InsuranceLists", (string)null);
@@ -4640,7 +4769,7 @@ namespace CompanyManagment.EFCore.Migrations
 
                     b.HasKey("id");
 
-                    b.HasIndex("AccountId");
+                    b.HasIndex("WorkshopId");
 
                     b.ToTable("RollCallServices", (string)null);
                 });
@@ -4659,6 +4788,12 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CalculationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<int>("CalculationMonth")
+                        .HasColumnType("int");
+
+                    b.Property<int>("CalculationYear")
+                        .HasColumnType("int");
+
                     b.Property<long>("CreatedByAccountId")
                         .HasColumnType("bigint");
 
@@ -5485,6 +5620,12 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(5)
                         .HasColumnType("nvarchar(5)");
 
+                    b.Property<bool>("InsuranceCheckoutFamilyAllowance")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("InsuranceCheckoutOvertime")
+                        .HasColumnType("bit");
+
                     b.Property<string>("InsuranceCode")
                         .HasMaxLength(100)
                         .HasColumnType("nvarchar(100)");
@@ -6228,6 +6369,9 @@ namespace CompanyManagment.EFCore.Migrations
                             b1.Property<DateTime>("CreationDate")
                                 .HasColumnType("datetime2");
 
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
                             b1.Property<string>("FineDateFa")
                                 .HasMaxLength(12)
                                 .HasColumnType("nvarchar(12)");
@@ -6267,6 +6411,9 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasMaxLength(25)
                                 .HasColumnType("nvarchar(25)");
 
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
                             b1.Property<string>("IsActive")
                                 .IsRequired()
                                 .HasMaxLength(5)
@@ -6314,6 +6461,9 @@ namespace CompanyManagment.EFCore.Migrations
                             b1.Property<string>("Description")
                                 .HasColumnType("ntext");
 
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
                             b1.Property<DateTime>("GrantDate")
                                 .HasColumnType("datetime2");
 
@@ -6360,6 +6510,9 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasMaxLength(15)
                                 .HasColumnType("nvarchar(15)");
 
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
                             b1.Property<DateTime>("SalaryAidDateTime")
                                 .HasColumnType("datetime2");
 
@@ -6510,6 +6663,9 @@ namespace CompanyManagment.EFCore.Migrations
                             b1.Property<DateTime>("CreationDate")
                                 .HasColumnType("datetime2");
 
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
                             b1.Property<string>("FineDateFa")
                                 .HasMaxLength(12)
                                 .HasColumnType("nvarchar(12)");
@@ -6549,6 +6705,9 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasMaxLength(25)
                                 .HasColumnType("nvarchar(25)");
 
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
                             b1.Property<string>("IsActive")
                                 .IsRequired()
                                 .HasMaxLength(5)
@@ -6596,6 +6755,9 @@ namespace CompanyManagment.EFCore.Migrations
                             b1.Property<string>("Description")
                                 .HasColumnType("ntext");
 
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
                             b1.Property<DateTime>("GrantDate")
                                 .HasColumnType("datetime2");
 
@@ -6642,6 +6804,9 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasMaxLength(15)
                                 .HasColumnType("nvarchar(15)");
 
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
                             b1.Property<DateTime>("SalaryAidDateTime")
                                 .HasColumnType("datetime2");
 
@@ -8923,7 +9088,7 @@ namespace CompanyManagment.EFCore.Migrations
                 {
                     b.HasOne("Company.Domain.WorkshopAgg.Workshop", "Workshop")
                         .WithMany("RollCallServicesList")
-                        .HasForeignKey("AccountId")
+                        .HasForeignKey("WorkshopId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 

CompanyManagment.EFCore/Migrations/20250521125646_add inspection-debt-approval to insurance list.cs

@@ -0,0 +1,121 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addinspectiondebtapprovaltoinsurancelist : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<double>(
+                name: "Debt_Amount",
+                table: "InsuranceLists",
+                type: "float",
+                nullable: false,
+                defaultValue: 0.0);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "Debt_DebtDate",
+                table: "InsuranceLists",
+                type: "datetime2",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<long>(
+                name: "Debt_MediaId",
+                table: "InsuranceLists",
+                type: "bigint",
+                nullable: false,
+                defaultValue: 0L);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Debt_Type",
+                table: "InsuranceLists",
+                type: "nvarchar(50)",
+                maxLength: 50,
+                nullable: false,
+                defaultValue: "None");
+
+            migrationBuilder.AddColumn<string>(
+                name: "EmployerApproval_Description",
+                table: "InsuranceLists",
+                type: "nvarchar(500)",
+                maxLength: 500,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "EmployerApproval_Status",
+                table: "InsuranceLists",
+                type: "nvarchar(50)",
+                maxLength: 50,
+                nullable: false,
+                defaultValue: "None");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "Inspection_LastInspectionDateTime",
+                table: "InsuranceLists",
+                type: "datetime2",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<long>(
+                name: "Inspection_MediaId",
+                table: "InsuranceLists",
+                type: "bigint",
+                nullable: false,
+                defaultValue: 0L);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Inspection_Type",
+                table: "InsuranceLists",
+                type: "nvarchar(50)",
+                maxLength: 50,
+                nullable: false,
+                defaultValue: "None");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Debt_Amount",
+                table: "InsuranceLists");
+
+            migrationBuilder.DropColumn(
+                name: "Debt_DebtDate",
+                table: "InsuranceLists");
+
+            migrationBuilder.DropColumn(
+                name: "Debt_MediaId",
+                table: "InsuranceLists");
+
+            migrationBuilder.DropColumn(
+                name: "Debt_Type",
+                table: "InsuranceLists");
+
+            migrationBuilder.DropColumn(
+                name: "EmployerApproval_Description",
+                table: "InsuranceLists");
+
+            migrationBuilder.DropColumn(
+                name: "EmployerApproval_Status",
+                table: "InsuranceLists");
+
+            migrationBuilder.DropColumn(
+                name: "Inspection_LastInspectionDateTime",
+                table: "InsuranceLists");
+
+            migrationBuilder.DropColumn(
+                name: "Inspection_MediaId",
+                table: "InsuranceLists");
+
+            migrationBuilder.DropColumn(
+                name: "Inspection_Type",
+                table: "InsuranceLists");
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/20250602185437_insurance operation list.Designer.cs

@@ -1,5 +1,6 @@
 // <auto-generated />
 using System;
+using System.Collections.Generic;
 using CompanyManagment.EFCore;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -12,8 +13,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace CompanyManagment.EFCore.Migrations
 {
     [DbContext(typeof(CompanyContext))]
-    [Migration("20250423184716_add contact us ")]
-    partial class addcontactus
+    [Migration("20250602185437_insurance operation list")]
+    partial class insuranceoperationlist
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -25,6 +26,36 @@ namespace CompanyManagment.EFCore.Migrations
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
 
+            modelBuilder.Entity("Company.Domain.AdminMonthlyOverviewAgg.AdminMonthlyOverview", b =>
+                {
+                    b.Property<long>("id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("Month")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(155)
+                        .HasColumnType("nvarchar(155)");
+
+                    b.Property<long>("WorkshopId")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("Year")
+                        .HasColumnType("int");
+
+                    b.HasKey("id");
+
+                    b.ToTable("AdminMonthlyOverviews");
+                });
+
             modelBuilder.Entity("Company.Domain.AndroidApkVersionAgg.AndroidApkVersion", b =>
                 {
                     b.Property<long>("id")
@@ -532,50 +563,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("TextManager_Contact", (string)null);
                 });
 
-            modelBuilder.Entity("Company.Domain.ContactUsAgg.ContactUs", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<DateTime>("CreationDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("Email")
-                        .HasMaxLength(200)
-                        .HasColumnType("nvarchar(200)");
-
-                    b.Property<string>("FirstName")
-                        .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
-
-                    b.Property<string>("FullName")
-                        .HasMaxLength(200)
-                        .HasColumnType("nvarchar(200)");
-
-                    b.Property<string>("LastName")
-                        .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
-
-                    b.Property<string>("Message")
-                        .HasMaxLength(500)
-                        .HasColumnType("nvarchar(500)");
-
-                    b.Property<string>("PhoneNumber")
-                        .HasMaxLength(20)
-                        .HasColumnType("nvarchar(20)");
-
-                    b.Property<string>("Title")
-                        .HasMaxLength(200)
-                        .HasColumnType("nvarchar(200)");
-
-                    b.HasKey("id");
-
-                    b.ToTable("ContactUs");
-                });
-
             modelBuilder.Entity("Company.Domain.ContarctingPartyAgg.PersonalContractingParty", b =>
                 {
                     b.Property<long>("id")
@@ -1542,6 +1529,14 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(20)
                         .HasColumnType("nvarchar(20)");
 
+                    b.Property<string>("IdNumberSeri")
+                        .HasMaxLength(25)
+                        .HasColumnType("nvarchar(25)");
+
+                    b.Property<string>("IdNumberSerial")
+                        .HasMaxLength(25)
+                        .HasColumnType("nvarchar(25)");
+
                     b.Property<string>("InsuranceCode")
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
@@ -1638,6 +1633,62 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("Employees", (string)null);
                 });
 
+            modelBuilder.Entity("Company.Domain.EmployeeAuthorizeTempAgg.EmployeeAuthorizeTemp", b =>
+                {
+                    b.Property<long>("id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
+
+                    b.Property<DateTime>("BirthDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("FName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("FatherName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasMaxLength(15)
+                        .HasColumnType("nvarchar(15)");
+
+                    b.Property<string>("IdNumber")
+                        .HasMaxLength(15)
+                        .HasColumnType("nvarchar(15)");
+
+                    b.Property<string>("IdNumberSeri")
+                        .HasMaxLength(25)
+                        .HasColumnType("nvarchar(25)");
+
+                    b.Property<string>("IdNumberSerial")
+                        .HasMaxLength(25)
+                        .HasColumnType("nvarchar(25)");
+
+                    b.Property<string>("LName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("NationalCode")
+                        .HasMaxLength(15)
+                        .HasColumnType("nvarchar(15)");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("NationalCode")
+                        .IsUnique()
+                        .HasFilter("[NationalCode] IS NOT NULL");
+
+                    b.ToTable("EmployeeAuthorizeTemps", (string)null);
+                });
+
             modelBuilder.Entity("Company.Domain.EmployeeBankInformationAgg.EmployeeBankInformation", b =>
                 {
                     b.Property<long>("id")
@@ -1826,6 +1877,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("UploaderId")
                         .HasColumnType("bigint");
 
+                    b.Property<long>("UploaderRoleId")
+                        .HasColumnType("bigint");
+
                     b.Property<string>("UploaderType")
                         .IsRequired()
                         .HasMaxLength(20)
@@ -1937,6 +1991,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("EmployeeId")
                         .HasColumnType("bigint");
 
+                    b.Property<double>("FamilyAllowance")
+                        .HasColumnType("float");
+
                     b.Property<bool>("IncludeStatus")
                         .HasColumnType("bit");
 
@@ -1964,6 +2021,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<double>("MonthlySalary")
                         .HasColumnType("float");
 
+                    b.Property<double>("OverTimePay")
+                        .HasColumnType("float");
+
                     b.Property<DateTime>("StartWorkDate")
                         .HasColumnType("datetime2");
 
@@ -2844,7 +2904,8 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasColumnType("int");
 
                     b.Property<string>("HasValueAddedTax")
-                        .HasColumnType("nvarchar(max)");
+                        .HasMaxLength(10)
+                        .HasColumnType("nvarchar(10)");
 
                     b.Property<string>("IsActiveString")
                         .HasMaxLength(5)
@@ -3192,6 +3253,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
                     b.Property<long>("InsuranceJobId")
                         .HasColumnType("bigint");
 
@@ -3207,6 +3271,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<double>("SalaryMoreThan")
                         .HasColumnType("float");
 
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime2");
+
                     b.HasKey("id");
 
                     b.HasIndex("InsuranceJobId");
@@ -3287,6 +3354,64 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(4)
                         .HasColumnType("nvarchar(4)");
 
+                    b.ComplexProperty<Dictionary<string, object>>("Debt", "Company.Domain.InsuranceListAgg.InsuranceList.Debt#InsuranceListDebt", b1 =>
+                        {
+                            b1.IsRequired();
+
+                            b1.Property<double>("Amount")
+                                .HasColumnType("float");
+
+                            b1.Property<DateTime>("DebtDate")
+                                .HasColumnType("datetime2");
+
+                            b1.Property<bool>("IsDone")
+                                .HasColumnType("bit");
+
+                            b1.Property<long>("MediaId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<string>("Type")
+                                .IsRequired()
+                                .HasMaxLength(50)
+                                .HasColumnType("nvarchar(50)");
+                        });
+
+                    b.ComplexProperty<Dictionary<string, object>>("EmployerApproval", "Company.Domain.InsuranceListAgg.InsuranceList.EmployerApproval#InsuranceListEmployerApproval", b1 =>
+                        {
+                            b1.IsRequired();
+
+                            b1.Property<string>("Description")
+                                .HasMaxLength(500)
+                                .HasColumnType("nvarchar(500)");
+
+                            b1.Property<bool>("IsDone")
+                                .HasColumnType("bit");
+
+                            b1.Property<string>("Status")
+                                .IsRequired()
+                                .HasMaxLength(50)
+                                .HasColumnType("nvarchar(50)");
+                        });
+
+                    b.ComplexProperty<Dictionary<string, object>>("Inspection", "Company.Domain.InsuranceListAgg.InsuranceList.Inspection#InsuranceListInspection", b1 =>
+                        {
+                            b1.IsRequired();
+
+                            b1.Property<bool>("IsDone")
+                                .HasColumnType("bit");
+
+                            b1.Property<DateTime>("LastInspectionDateTime")
+                                .HasColumnType("datetime2");
+
+                            b1.Property<long>("MediaId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<string>("Type")
+                                .IsRequired()
+                                .HasMaxLength(50)
+                                .HasColumnType("nvarchar(50)");
+                        });
+
                     b.HasKey("id");
 
                     b.ToTable("InsuranceLists", (string)null);
@@ -4683,7 +4808,7 @@ namespace CompanyManagment.EFCore.Migrations
 
                     b.HasKey("id");
 
-                    b.HasIndex("AccountId");
+                    b.HasIndex("WorkshopId");
 
                     b.ToTable("RollCallServices", (string)null);
                 });
@@ -4699,6 +4824,15 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<double>("Amount")
                         .HasColumnType("float");
 
+                    b.Property<DateTime>("CalculationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("CalculationMonth")
+                        .HasColumnType("int");
+
+                    b.Property<int>("CalculationYear")
+                        .HasColumnType("int");
+
                     b.Property<long>("CreatedByAccountId")
                         .HasColumnType("bigint");
 
@@ -5525,6 +5659,12 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(5)
                         .HasColumnType("nvarchar(5)");
 
+                    b.Property<bool>("InsuranceCheckoutFamilyAllowance")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("InsuranceCheckoutOvertime")
+                        .HasColumnType("bit");
+
                     b.Property<string>("InsuranceCode")
                         .HasMaxLength(100)
                         .HasColumnType("nvarchar(100)");
@@ -6031,6 +6171,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");
                 });
 
@@ -6268,6 +6499,9 @@ namespace CompanyManagment.EFCore.Migrations
                             b1.Property<DateTime>("CreationDate")
                                 .HasColumnType("datetime2");
 
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
                             b1.Property<string>("FineDateFa")
                                 .HasMaxLength(12)
                                 .HasColumnType("nvarchar(12)");
@@ -6307,6 +6541,9 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasMaxLength(25)
                                 .HasColumnType("nvarchar(25)");
 
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
                             b1.Property<string>("IsActive")
                                 .IsRequired()
                                 .HasMaxLength(5)
@@ -6354,6 +6591,9 @@ namespace CompanyManagment.EFCore.Migrations
                             b1.Property<string>("Description")
                                 .HasColumnType("ntext");
 
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
                             b1.Property<DateTime>("GrantDate")
                                 .HasColumnType("datetime2");
 
@@ -6393,6 +6633,16 @@ namespace CompanyManagment.EFCore.Migrations
                                 .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");
 
@@ -6543,6 +6793,9 @@ namespace CompanyManagment.EFCore.Migrations
                             b1.Property<DateTime>("CreationDate")
                                 .HasColumnType("datetime2");
 
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
                             b1.Property<string>("FineDateFa")
                                 .HasMaxLength(12)
                                 .HasColumnType("nvarchar(12)");
@@ -6582,6 +6835,9 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasMaxLength(25)
                                 .HasColumnType("nvarchar(25)");
 
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
                             b1.Property<string>("IsActive")
                                 .IsRequired()
                                 .HasMaxLength(5)
@@ -6629,6 +6885,9 @@ namespace CompanyManagment.EFCore.Migrations
                             b1.Property<string>("Description")
                                 .HasColumnType("ntext");
 
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
                             b1.Property<DateTime>("GrantDate")
                                 .HasColumnType("datetime2");
 
@@ -6668,6 +6927,16 @@ namespace CompanyManagment.EFCore.Migrations
                                 .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");
 
@@ -8949,7 +9218,7 @@ namespace CompanyManagment.EFCore.Migrations
                 {
                     b.HasOne("Company.Domain.WorkshopAgg.Workshop", "Workshop")
                         .WithMany("RollCallServicesList")
-                        .HasForeignKey("AccountId")
+                        .HasForeignKey("WorkshopId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 

CompanyManagment.EFCore/Migrations/20250602185437_insurance operation list.cs

@@ -0,0 +1,51 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class insuranceoperationlist : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "Debt_IsDone",
+                table: "InsuranceLists",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "EmployerApproval_IsDone",
+                table: "InsuranceLists",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "Inspection_IsDone",
+                table: "InsuranceLists",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Debt_IsDone",
+                table: "InsuranceLists");
+
+            migrationBuilder.DropColumn(
+                name: "EmployerApproval_IsDone",
+                table: "InsuranceLists");
+
+            migrationBuilder.DropColumn(
+                name: "Inspection_IsDone",
+                table: "InsuranceLists");
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs

@@ -1,5 +1,6 @@
 // <auto-generated />
 using System;
+using System.Collections.Generic;
 using CompanyManagment.EFCore;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -559,50 +560,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("TextManager_Contact", (string)null);
                 });
 
-            modelBuilder.Entity("Company.Domain.ContactUsAgg.ContactUs", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<DateTime>("CreationDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("Email")
-                        .HasMaxLength(200)
-                        .HasColumnType("nvarchar(200)");
-
-                    b.Property<string>("FirstName")
-                        .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
-
-                    b.Property<string>("FullName")
-                        .HasMaxLength(200)
-                        .HasColumnType("nvarchar(200)");
-
-                    b.Property<string>("LastName")
-                        .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
-
-                    b.Property<string>("Message")
-                        .HasMaxLength(500)
-                        .HasColumnType("nvarchar(500)");
-
-                    b.Property<string>("PhoneNumber")
-                        .HasMaxLength(20)
-                        .HasColumnType("nvarchar(20)");
-
-                    b.Property<string>("Title")
-                        .HasMaxLength(200)
-                        .HasColumnType("nvarchar(200)");
-
-                    b.HasKey("id");
-
-                    b.ToTable("ContactUs");
-                });
-
             modelBuilder.Entity("Company.Domain.ContarctingPartyAgg.PersonalContractingParty", b =>
                 {
                     b.Property<long>("id")
@@ -3394,6 +3351,64 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(4)
                         .HasColumnType("nvarchar(4)");
 
+                    b.ComplexProperty<Dictionary<string, object>>("Debt", "Company.Domain.InsuranceListAgg.InsuranceList.Debt#InsuranceListDebt", b1 =>
+                        {
+                            b1.IsRequired();
+
+                            b1.Property<double>("Amount")
+                                .HasColumnType("float");
+
+                            b1.Property<DateTime>("DebtDate")
+                                .HasColumnType("datetime2");
+
+                            b1.Property<bool>("IsDone")
+                                .HasColumnType("bit");
+
+                            b1.Property<long>("MediaId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<string>("Type")
+                                .IsRequired()
+                                .HasMaxLength(50)
+                                .HasColumnType("nvarchar(50)");
+                        });
+
+                    b.ComplexProperty<Dictionary<string, object>>("EmployerApproval", "Company.Domain.InsuranceListAgg.InsuranceList.EmployerApproval#InsuranceListEmployerApproval", b1 =>
+                        {
+                            b1.IsRequired();
+
+                            b1.Property<string>("Description")
+                                .HasMaxLength(500)
+                                .HasColumnType("nvarchar(500)");
+
+                            b1.Property<bool>("IsDone")
+                                .HasColumnType("bit");
+
+                            b1.Property<string>("Status")
+                                .IsRequired()
+                                .HasMaxLength(50)
+                                .HasColumnType("nvarchar(50)");
+                        });
+
+                    b.ComplexProperty<Dictionary<string, object>>("Inspection", "Company.Domain.InsuranceListAgg.InsuranceList.Inspection#InsuranceListInspection", b1 =>
+                        {
+                            b1.IsRequired();
+
+                            b1.Property<bool>("IsDone")
+                                .HasColumnType("bit");
+
+                            b1.Property<DateTime>("LastInspectionDateTime")
+                                .HasColumnType("datetime2");
+
+                            b1.Property<long>("MediaId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<string>("Type")
+                                .IsRequired()
+                                .HasMaxLength(50)
+                                .HasColumnType("nvarchar(50)");
+                        });
+
                     b.HasKey("id");
 
                     b.ToTable("InsuranceLists", (string)null);

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/CheckoutRepository.cs

@@ -1,18 +1,22 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
+using System.Reflection.Metadata.Ecma335;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using Company.Domain.CheckoutAgg;
 using Company.Domain.LeftWorkAgg;
 using Company.Domain.RollCallAgg;
+using Company.Domain.RollCallEmployeeAgg;
 using CompanyManagment.App.Contracts.Checkout;
 using CompanyManagment.App.Contracts.Contract;
 using CompanyManagment.App.Contracts.Employee;
 using CompanyManagment.App.Contracts.HolidayItem;
+using CompanyManagment.App.Contracts.InsuranceList;
 using CompanyManagment.App.Contracts.Leave;
 using CompanyManagment.App.Contracts.LeftWork;
 using CompanyManagment.App.Contracts.Loan;
@@ -21,6 +25,7 @@ using CompanyManagment.App.Contracts.SalaryAid;
 using CompanyManagment.App.Contracts.WorkingHours;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;
 using CompanyManagment.App.Contracts.Workshop;
+using CompanyManagment.EFCore.Migrations;
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
@@ -41,8 +46,9 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
     private readonly ILeftWorkRepository _leftWorkRepository;
     private readonly IRollCallRepository _rollCallRepository;
     private readonly IRollCallMandatoryRepository _rollCallMandatoryRepository;
+    private readonly IRollCallEmployeeRepository _rollCallEmployeeRepository;
 
-    public CheckoutRepository(IAuthHelper authHelper, CompanyContext context, IConfiguration configuration, ILeftWorkRepository leftWorkRepository, IWorkingHoursTempApplication workingHoursTempApplication, IRollCallRepository rollCallRepository, IRollCallMandatoryRepository rollCallMandatoryRepository) : base(context)
+    public CheckoutRepository(IAuthHelper authHelper, CompanyContext context, IConfiguration configuration, ILeftWorkRepository leftWorkRepository, IWorkingHoursTempApplication workingHoursTempApplication, IRollCallRepository rollCallRepository, IRollCallMandatoryRepository rollCallMandatoryRepository, IRollCallEmployeeRepository rollCallEmployeeRepository) : base(context)
     {
 
         _authHelper = authHelper;
@@ -52,6 +58,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
         _workingHoursTempApplication = workingHoursTempApplication;
         _rollCallRepository = rollCallRepository;
         _rollCallMandatoryRepository = rollCallMandatoryRepository;
+        _rollCallEmployeeRepository = rollCallEmployeeRepository;
     }
 
     /// <summary>
@@ -123,6 +130,361 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
             .FirstOrDefault(x => x.Id == 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>
+    public async Task<CreateCheckoutListViewModel> GetContractResultToCreateCheckout(long workshopId, long employeeId, string year, string month, string contractStart,
+        string contractEnd)
+    {
+        DateTime startSreach;
+        DateTime endSearch;
+
+        if (!string.IsNullOrWhiteSpace(contractStart) && !string.IsNullOrWhiteSpace(contractEnd))
+        {
+            startSreach = contractStart.ToGeorgianDateTime();
+            endSearch = contractEnd.ToGeorgianDateTime();
+        }
+        else
+        {
+
+            if (month == "0" && year == "0")
+            {
+                DateTime now = DateTime.Now;
+                string startStr = $"{now.ToFarsi().Substring(0, 8)}01";
+                startSreach = startStr.ToGeorgianDateTime();
+                endSearch = (startStr.FindeEndOfMonth()).ToGeorgianDateTime();
+            }
+            else if (month == "0" && year != "0")
+            {
+                DateTime now = DateTime.Now;
+
+                string startStr = $"{year}/{now.ToFarsi().Substring(5, 2)}/01";
+                startSreach = startStr.ToGeorgianDateTime();
+                endSearch = (startStr.FindeEndOfMonth()).ToGeorgianDateTime();
+            }
+            else if (month != "0" && year == "0")
+            {
+                DateTime now = DateTime.Now;
+
+                string startStr = $"{now.ToFarsi().Substring(0, 4)}/{month}/01";
+                startSreach = startStr.ToGeorgianDateTime();
+                endSearch = (startStr.FindeEndOfMonth()).ToGeorgianDateTime();
+            }
+            else
+            {
+                string startStr = $"{year}/{month}/01";
+                startSreach = startStr.ToGeorgianDateTime();
+                endSearch = (startStr.FindeEndOfMonth()).ToGeorgianDateTime();
+            }
+
+        }
+        var timer = new Stopwatch();
+        timer.Start();
+
+        var contracts = _context.Contracts.AsSplitQuery()
+            .Where(x => x.WorkshopIds == workshopId && x.IsActiveString == "true" && startSreach < x.ContractEnd &&
+                        endSearch > x.ContarctStart)
+            .Join(_context.Workshops.AsSplitQuery(),
+                contract => contract.WorkshopIds,
+                workshop => workshop.id,
+                (contract, workshop) => new { contract, workshop })
+            .Join(_context.Employees.AsSplitQuery(),
+                contractWorkshop => contractWorkshop.contract.EmployeeId,
+                employee => employee.id,
+                (contractWorkshop, employee) => new { contractWorkshop, employee })
+            .Join(_context.LeftWorkList.AsSplitQuery().Where(l => l.WorkshopId == workshopId && l.StartWorkDate < endSearch && l.LeftWorkDate > startSreach),
+                contractWorkshopEmployee => contractWorkshopEmployee.contractWorkshop.contract.EmployeeId,
+                leftwork => leftwork.EmployeeId,
+                (contractWorkshopEmployee, leftwork) => new { contractWorkshopEmployee, leftwork })
+            .Join(_context.PersonnelCodeSet.AsSplitQuery().Where(p => p.WorkshopId == workshopId),
+                contractWorkshopEmployeeleftWork => contractWorkshopEmployeeleftWork.contractWorkshopEmployee
+                    .contractWorkshop.contract.EmployeeId,
+                personnelCode => personnelCode.EmployeeId,
+                (contractWorkshopEmployeeleftWork, personnelCode) =>
+                    new { contractWorkshopEmployeeleftWork, personnelCode })
+
+            .GroupJoin(_context.CheckoutSet.AsSplitQuery(),
+                contractWorkshopEmployeeleftWorkPersonnelCode => contractWorkshopEmployeeleftWorkPersonnelCode
+                    .contractWorkshopEmployeeleftWork.contractWorkshopEmployee.contractWorkshop.contract.id,
+                checkout => checkout.ContractId,
+                (contractWorkshopEmployeeleftWorkPersonnelCode, checkout) =>
+                    new { contractWorkshopEmployeeleftWorkPersonnelCode, checkout })
+            .ToList();
+        Console.WriteLine("query : " + timer.Elapsed);
+        timer.Reset();
+        timer.Start();
+        if (employeeId > 0)
+            contracts = contracts.Where(x =>
+                x.contractWorkshopEmployeeleftWorkPersonnelCode.contractWorkshopEmployeeleftWork
+                    .contractWorkshopEmployee.contractWorkshop.contract.EmployeeId == employeeId).ToList();
+        var finalResult = contracts.Select(result =>
+        {
+            var now = DateTime.Now;
+            DateTime currentStart = ($"{DateTime.Now.ToFarsi().Substring(0, 8)}01").ToGeorgianDateTime();
+            DateTime currentEnd = ($"{DateTime.Now.ToFarsi().FindeEndOfMonth()}").ToGeorgianDateTime();
+            var chekoutCreated = result.checkout.FirstOrDefault(x => x.ContractStart < endSearch && x.ContractEnd > startSreach && x.IsActiveString == "true");
+
+            if (chekoutCreated != null)
+            {
+               
+                return new CreateCheckoutListViewModel
+                {
+                    Id = chekoutCreated.ContractId,
+
+                    EmployeeId = chekoutCreated.EmployeeId,
+                    ContractNo = chekoutCreated.ContractNo,
+                    WorkshopName = chekoutCreated.WorkshopName,
+                    EmployeeName = chekoutCreated.EmployeeFullName,
+                    ContractStart = chekoutCreated.ContractStart.ToFarsi(),
+                    ContractEnd = chekoutCreated.ContractEnd.ToFarsi(),
+                    PersonnelCode = Convert.ToInt64(chekoutCreated.PersonnelCode),
+                    LaterThanEnd = false,
+                    Extension = false,
+                    Description = "دارای فیش حقوقی",
+                    HasCheckout = true
+                };
+            }
+            var employeeJoin = result.contractWorkshopEmployeeleftWorkPersonnelCode.contractWorkshopEmployeeleftWork
+                .contractWorkshopEmployee.employee.id;
+
+            bool hasRollCall =
+                _rollCallEmployeeRepository.HasRollCallRecord(employeeJoin, workshopId, startSreach, endSearch);
+
+            var leftWork = result.contractWorkshopEmployeeleftWorkPersonnelCode.contractWorkshopEmployeeleftWork
+                .leftwork;
+
+            bool extension = true;
+            bool laterThanEnd = false;
+            string description = "";
+            string leftWorkDate="";
+            string contractStart = "";
+            string contractEnd = "";
+
+            var contractStartGr = result.contractWorkshopEmployeeleftWorkPersonnelCode.contractWorkshopEmployeeleftWork
+                .contractWorkshopEmployee.contractWorkshop.contract.ContarctStart;
+            var contractEndGr = result.contractWorkshopEmployeeleftWorkPersonnelCode.contractWorkshopEmployeeleftWork
+                .contractWorkshopEmployee.contractWorkshop.contract.ContractEnd;
+            #region HasRollCall
+
+            if (hasRollCall)
+            {
+        
+                // اگر ترک کار کرده بود
+                // اگر ترک کارش در بازه انتخاب شده بود
+                if (leftWork.HasLeft && leftWork.LeftWorkDate > startSreach && leftWork.LeftWorkDate <= endSearch)
+                {
+                    //اگر بازه انتخاب شده در تاریخ جاری بود
+                    if (startSreach == currentStart && endSearch == currentEnd)
+                    {
+                        //اگر ترک کارش قبل یا مساوی تاریخ جاری بود
+                        if (leftWork.LeftWorkDate <= now)
+                        {
+                            //مجاز به ایجاد تصفیه
+                            extension = true;
+                            leftWorkDate = leftWork.LeftWorkDate.ToFarsi();
+                            contractStart = leftWork.StartWorkDate > startSreach
+                                ? leftWork.StartWorkDate.ToFarsi()
+                                : startSreach.ToFarsi();
+                            contractEnd = leftWork.LeftWorkDate.AddDays(-1).ToFarsi();
+
+                        }
+                        else
+                        {
+                            // مجاز نیست
+                            extension = false;
+                            description = "بعد از تاریخ ترک کار می توانید فیش صادر کنید";
+                            leftWorkDate = leftWork.LeftWorkDate.ToFarsi();
+                            contractStart = leftWork.StartWorkDate > startSreach
+                                ? leftWork.StartWorkDate.ToFarsi()
+                                : startSreach.ToFarsi();
+                            contractEnd = leftWork.LeftWorkDate.AddDays(-1).ToFarsi();
+
+                        }
+                    }
+                    else if (endSearch < currentStart)
+                    {
+                        extension = true;
+                        leftWorkDate = leftWork.LeftWorkDate.ToFarsi();
+                        contractStart = leftWork.StartWorkDate > startSreach
+                            ? leftWork.StartWorkDate.ToFarsi()
+                            : startSreach.ToFarsi();
+                        contractEnd = leftWork.LeftWorkDate.AddDays(-1).ToFarsi();
+                    }
+                    else if (startSreach > currentEnd)
+                    {
+                        // مجاز نیست
+                        extension = false;
+                        description = "بعد از تاریخ ترک کار می توانید فیش صادر کنید";
+                        leftWorkDate = leftWork.LeftWorkDate.ToFarsi();
+                        contractStart = leftWork.StartWorkDate > startSreach
+                            ? leftWork.StartWorkDate.ToFarsi()
+                            : startSreach.ToFarsi();
+                        contractEnd = leftWork.LeftWorkDate.AddDays(-1).ToFarsi();
+                    }
+
+                }
+                else if (leftWork.HasLeft && leftWork.LeftWorkDate <= startSreach)
+                {
+                    // مجاز نیست
+                    extension = false;
+                    description = "به دلیل ترک کار پیش از تاریخ انتخاب شده مجاز به ایجاد فیش نمی باشید";
+                    leftWorkDate = leftWork.LeftWorkDate.ToFarsi();
+
+                }
+                else if (!leftWork.HasLeft && startSreach == currentStart)
+                {
+                    // مجاز نیست
+                    extension = false;
+                    description = "به دلیل داشتن حضورغیاب تا پایان ماه مجاز به ایجاد فیش نمی باشید";
+                    contractStart = leftWork.StartWorkDate > startSreach
+                        ? leftWork.StartWorkDate.ToFarsi()
+                        : startSreach.ToFarsi();
+                    contractEnd = endSearch.ToFarsi();
+
+                }
+                else if (!leftWork.HasLeft && startSreach < currentStart)
+                {
+
+                    
+
+                    if (contractStartGr <= startSreach && contractStartGr > endSearch)
+                    {
+                        laterThanEnd = true;
+                        extension = true;
+                        contractStart = startSreach.ToFarsi();
+                        contractEnd = endSearch.ToFarsi();
+                    }
+                    else
+                    {
+                        laterThanEnd = false;
+                        extension = true;
+                        contractStart = leftWork.StartWorkDate > startSreach
+                            ? leftWork.StartWorkDate.ToFarsi()
+                            : startSreach.ToFarsi();
+                        contractEnd = (leftWork.LeftWorkDate > startSreach && leftWork.LeftWorkDate <= endSearch) ? leftWork.LeftWorkDate.AddDays(-1).ToFarsi() : endSearch.ToFarsi();
+
+                    }
+
+                }
+
+            }
+
+            #endregion
+
+            #region Static
+
+            if (!hasRollCall)
+            {
+                if (leftWork.HasLeft)
+                {
+                    if (leftWork.LeftWorkDate > startSreach && leftWork.LeftWorkDate <= endSearch)
+                    {
+                        extension = true;
+                        contractStart = leftWork.StartWorkDate > startSreach
+                            ? leftWork.StartWorkDate.ToFarsi()
+                            : startSreach.ToFarsi();
+                        contractEnd = leftWork.LeftWorkDate.AddDays(-1).ToFarsi();
+                        leftWorkDate = leftWork.LeftWorkDate.ToFarsi();
+                    }
+                    else if (leftWork.LeftWorkDate <= startSreach)
+                    {
+                        // مجاز نیست
+                        extension = false;
+                        description = "به دلیل ترک کار پیش از تاریخ انتخاب شده مجاز به ایجاد فیش نمی باشید";
+                        leftWorkDate = leftWork.LeftWorkDate.ToFarsi();
+                    }
+                    else if(leftWork.LeftWorkDate > endSearch)
+                    {
+                        extension = true;
+
+                        if (contractStartGr <= startSreach && contractStartGr > endSearch)
+                        {
+                            laterThanEnd = true;
+
+                            contractStart = startSreach.ToFarsi();
+                            contractEnd = endSearch.ToFarsi();
+                        }
+                        else
+                        {
+                            contractStart = leftWork.StartWorkDate > startSreach
+                                ? leftWork.StartWorkDate.ToFarsi()
+                                : startSreach.ToFarsi();
+                            contractEnd = endSearch.ToFarsi();
+                        }
+                    }
+                }
+                else
+                {
+                    extension = true;
+               
+                    if (contractStartGr <= startSreach && contractStartGr > endSearch)
+                    {
+                        laterThanEnd = true;
+
+                        contractStart = startSreach.ToFarsi();
+                        contractEnd = endSearch.ToFarsi();
+                    }
+                    else
+                    {
+                        contractStart = leftWork.StartWorkDate > startSreach
+                            ? leftWork.StartWorkDate.ToFarsi()
+                            : startSreach.ToFarsi();
+                        contractEnd = endSearch.ToFarsi();
+                    }
+                }
+          
+            }
+
+            #endregion
+
+
+
+            return new CreateCheckoutListViewModel
+            {
+                Id = result.contractWorkshopEmployeeleftWorkPersonnelCode.contractWorkshopEmployeeleftWork
+                    .contractWorkshopEmployee.contractWorkshop.contract.id,
+
+                EmployeeId = result.contractWorkshopEmployeeleftWorkPersonnelCode.contractWorkshopEmployeeleftWork
+                    .contractWorkshopEmployee.employee.id,
+                ContractNo = result.contractWorkshopEmployeeleftWorkPersonnelCode.contractWorkshopEmployeeleftWork
+                    .contractWorkshopEmployee.contractWorkshop.contract.ContractNo,
+                //EmployerName = result.contract.EmployerName,
+                WorkshopName = result.contractWorkshopEmployeeleftWorkPersonnelCode.contractWorkshopEmployeeleftWork
+                    .contractWorkshopEmployee.contractWorkshop.workshop.WorkshopFullName,
+                EmployeeName = result.contractWorkshopEmployeeleftWorkPersonnelCode.contractWorkshopEmployeeleftWork
+                    .contractWorkshopEmployee.employee.FullName,
+
+                PersonnelCode = result.contractWorkshopEmployeeleftWorkPersonnelCode.personnelCode.PersonnelCode,
+                //PersonnelCodeInt = Convert.ToInt32(result.contract.PersonnelCode),
+                LaterThanEnd = laterThanEnd,
+                Extension = extension,
+                Description = description,
+                ContractStart = contractStart,
+                ContractEnd = contractEnd,
+                LeftWorkDate = leftWorkDate
+            };
+
+        }).OrderByDescending(x=>x.Extension).ToList();
+
+
+
+
+        Console.WriteLine("process : " + timer.Elapsed);
+
+        return new CreateCheckoutListViewModel()
+        {
+            CreateCheckoutList = finalResult
+        };
+    }
+
     public async Task CreateCkeckout(Checkout command)
     {
 
@@ -696,8 +1058,8 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
             });
 
             var totalPaidLeaveTimeSpans = hourlyPaidLeaveTimeSpans.Concat(dailyPaidLeaveTimeSpans);
-
-            ch.TotalPaidLeave = new TimeSpan(totalPaidLeaveTimeSpans.Sum(x => x.Ticks)).ToFarsiDaysAndHoursAndMinutes("-");
+            ch.TotalHourlyLeave = new TimeSpan(hourlyPaidLeaveTimeSpans.Sum(x => x.Ticks));
+			ch.TotalPaidLeave = new TimeSpan(totalPaidLeaveTimeSpans.Sum(x => x.Ticks)).ToFarsiDaysAndHoursAndMinutes("-");
 
 
 
@@ -1025,7 +1387,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
 
         ch.TotalSickLeave = new TimeSpan(sickLeaveTimeSpans.Sum(x => x.Ticks)).ToFarsiDaysAndHoursAndMinutes("-");
 
-        var hourlyPaidLeaveTimeSpans = hourlyPaidLeave.Select(x => TimeOnly.Parse(x.LeaveHourses).ToTimeSpan());
+        var hourlyPaidLeaveTimeSpans = hourlyPaidLeave.Select(x => TimeOnly.Parse(x.LeaveHourses).ToTimeSpan()).ToList();
 
         var dailyPaidLeaveTimeSpans = dailyPaidLeave.Select(x =>
         {
@@ -1035,7 +1397,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
         });
 
         var totalPaidLeaveTimeSpans = hourlyPaidLeaveTimeSpans.Concat(dailyPaidLeaveTimeSpans);
-
+        ch.TotalHourlyLeave = new TimeSpan(hourlyPaidLeaveTimeSpans.Sum(x => x.Ticks));
         ch.TotalPaidLeave = new TimeSpan(totalPaidLeaveTimeSpans.Sum(x => x.Ticks)).ToFarsiDaysAndHoursAndMinutes("-");
 
 
@@ -1146,14 +1508,20 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
 
             var firstRollCall = orderedRollcalls.FirstOrDefault();
             var secondRollCall = orderedRollcalls.Skip(1).FirstOrDefault();
+            DateTime? secondRCEndDate = null;
+            DateTime? firstRCEndDate = null;
+
+            if (firstRollCall != null)
+                firstRCEndDate = firstRollCall.ShiftEndWithoutRest ?? firstRollCall.EndDate;
+            if (secondRollCall != null)
+                secondRCEndDate = secondRollCall.ShiftEndWithoutRest ?? secondRollCall.EndDate;
+
 
-            var firstRCEndDate = firstRollCall.ShiftEndWithoutRest ?? firstRollCall.EndDate;
-            var secondRCEndDate = secondRollCall.ShiftEndWithoutRest ?? secondRollCall.EndDate;
 
             return new CheckoutDailyRollCallViewModel()
             {
                 StartDate1 = firstRollCall?.StartDate?.ToString("HH:mm") ?? "",
-                EndDate1 =firstRCEndDate?.ToString("HH:mm") ?? "",
+                EndDate1 = firstRCEndDate?.ToString("HH:mm") ?? "",
 
                 StartDate2 = secondRollCall?.StartDate?.ToString("HH:mm") ?? "",
                 EndDate2 = secondRCEndDate?.ToString("HH:mm") ?? "",

CompanyManagment.EFCore/Repository/ContactUsRepository.cs

@@ -1,14 +0,0 @@
-using _0_Framework.InfraStructure;
-using Company.Domain.ContactUsAgg;
-using Microsoft.EntityFrameworkCore;
-
-namespace CompanyManagment.EFCore.Repository;
-
-public class ContactUsRepository:RepositoryBase<long,ContactUs>,IContactUsRepository
-{
-    private readonly CompanyContext _companyContext;
-    public ContactUsRepository(CompanyContext companyContext) : base(companyContext)
-    {
-        _companyContext = companyContext;
-    }
-}

CompanyManagment.EFCore/Repository/CustomizeWorkshopSettingsRepository.cs

@@ -8,351 +8,364 @@ using CompanyManagment.App.Contracts.CustomizeWorkshopSettings.ValueObjectsViewM
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 
-namespace CompanyManagment.EFCore.Repository
+namespace CompanyManagment.EFCore.Repository;
+
+public class CustomizeWorkshopSettingsRepository(CompanyContext companyContext, IAuthHelper authHelper, IEmployeeRepository employeeRepository)
+    : RepositoryBase<long, CustomizeWorkshopSettings>(companyContext), ICustomizeWorkshopSettingsRepository
 {
-    public class CustomizeWorkshopSettingsRepository(CompanyContext companyContext, IAuthHelper authHelper, IEmployeeRepository employeeRepository)
-        : RepositoryBase<long, CustomizeWorkshopSettings>(companyContext), ICustomizeWorkshopSettingsRepository
+    private readonly CompanyContext _companyContext = companyContext;
+    private readonly IAuthHelper _authHelper = authHelper;
+    private readonly IEmployeeRepository _employeeRepository = employeeRepository;
+
+    public CustomizeWorkshopSettingsViewModel GetWorkshopSettingsByWorkshopId(long workshopId, AuthViewModel auth)
     {
-        private readonly CompanyContext _companyContext = companyContext;
-        private readonly IAuthHelper _authHelper = authHelper;
-        private readonly IEmployeeRepository _employeeRepository = employeeRepository;
+        var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().Where(x => x.WorkshopId == workshopId)
+            .Include(x => x.CustomizeWorkshopGroupSettingsCollection)
+            .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection).AsSplitQuery()
+            .FirstOrDefault();
+        if (entity == null)
+            return new();
 
-        public CustomizeWorkshopSettingsViewModel GetWorkshopSettingsByWorkshopId(long workshopId, AuthViewModel auth)
+        var employeeIds = entity.CustomizeWorkshopGroupSettingsCollection
+            .SelectMany(x => x.CustomizeWorkshopEmployeeSettingsCollection)
+            .Select(y => y.EmployeeId)
+            .ToList();
+        var employees = _employeeRepository.GetBy(employeeIds);
+        return new CustomizeWorkshopSettingsViewModel()
         {
-            var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().Where(x => x.WorkshopId == workshopId)
-                .Include(x => x.CustomizeWorkshopGroupSettingsCollection)
-                .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection).AsSplitQuery()
-                .FirstOrDefault();
-            if (entity == null)
-                return new();
-
-            var employeeIds = entity.CustomizeWorkshopGroupSettingsCollection
-                .SelectMany(x => x.CustomizeWorkshopEmployeeSettingsCollection)
-                .Select(y => y.EmployeeId)
-                .ToList();
-            var employees = _employeeRepository.GetBy(employeeIds);
-            return new CustomizeWorkshopSettingsViewModel()
-            {
-                Id = entity.id,
-                Name = auth.WorkshopList.FirstOrDefault(w => w.Id == entity.WorkshopId)?.Name,
-                GroupSettings = entity.CustomizeWorkshopGroupSettingsCollection.Where(x => !x.MainGroup).Select(x =>
-                    new CustomizeWorkshopGroupSettingsViewModel()
-                    {
-                        Id = x.id,
-                        GroupName = x.GroupName,
-                        WorkshopShiftStatus = x.WorkshopShiftStatus,
-                        IrregularShift = x.IrregularShift,
-                        Salary = x.Salary,
-                        RollCallWorkshopShifts = x.CustomizeWorkshopGroupSettingsShifts.Select(s =>
-                            new CustomizeWorkshopShiftViewModel()
-                            {
-                                EndTime = s.EndTime.ToString("HH:mm"),
-                                Placement = s.Placement,
-                                StartTime = s.StartTime.ToString("HH:mm")
-
-                            }).ToList(),
-                        MainGroup = x.MainGroup,
-                        CustomizeRotatingShiftsViewModels = x.CustomizeRotatingShifts.
-	                        Select(r=>new CustomizeRotatingShiftsViewModel(){StartTime = r.StartTime.ToString("HH:mm"), EndTime = r.EndTime.ToString("HH:mm")}).ToList()
-                    }).ToList(),
-
-            };
-        }
-        public CustomizeWorkshopSettingsViewModel GetWorkshopSettingsByWorkshopIdForAdmin(long workshopId)
-        {
-            var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().Where(x => x.WorkshopId == workshopId)
-                .Include(x => x.CustomizeWorkshopGroupSettingsCollection)
-                .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection).AsSplitQuery()
-                .FirstOrDefault();
-            if (entity == null)
-                return new();
-
-            return new CustomizeWorkshopSettingsViewModel()
-            {
-                Id = entity.id,
-                Offset = entity.EndTimeOffSet,
-                GroupSettings = entity.CustomizeWorkshopGroupSettingsCollection.Where(x => !x.MainGroup).Select(x =>
-                    new CustomizeWorkshopGroupSettingsViewModel()
-                    {
-                        Id = x.id,
-                        GroupName = x.GroupName,
-                        RollCallWorkshopEmployeesSettings = x.CustomizeWorkshopEmployeeSettingsCollection.Select(y =>
-                        {
-                            var employee = _employeeRepository.Get(y.EmployeeId);
-                            return new CustomizeWorkshopEmployeeSettingsViewModel()
-                            {
-                                Id = y.id,
-                                EmployeeId = y.EmployeeId,
-                                IsSettingChanged = y.IsSettingChanged,
-                                IsShiftChanged = y.IsShiftChanged,
-                                Name = $"{employee?.FName} {employee?.LName}",
-                                RollCallWorkshopShifts = y.CustomizeWorkshopEmployeeSettingsShifts.Select(s =>
-                                    new CustomizeWorkshopShiftViewModel()
-                                    {
-                                        EndTime = s.EndTime.ToString("HH:mm"),
-                                        Placement = s.Placement,
-                                        StartTime = s.StartTime.ToString("HH:mm")
-                                    }).ToList(),
-                                Salary = y.Salary,
-                                CustomizeRotatingShiftsViewModels = y.CustomizeRotatingShifts.Select(r => new CustomizeRotatingShiftsViewModel
-                                {
-                                    StartTime = r.StartTime.ToString("HH:mm"),
-                                    EndTime = r.EndTime.ToString("HH:mm")
-                                }).ToList(),
-                                LeavePermittedDays = y.LeavePermittedDays,
-                                IrregularShift = y.IrregularShift,
-                                WorkshopShiftStatus = y.WorkshopShiftStatus
-                            };
-                        }).ToList(),
-                        Salary = x.Salary,
-                        RollCallWorkshopShifts = x.CustomizeWorkshopGroupSettingsShifts.Select(s =>
-                            new CustomizeWorkshopShiftViewModel()
-                            {
-                                EndTime = s.EndTime.ToString("HH:mm"),
-                                Placement = s.Placement,
-                                StartTime = s.StartTime.ToString("HH:mm")
-
-                            }).ToList(),
-                        MainGroup = x.MainGroup,
-                        WorkshopShiftStatus = x.WorkshopShiftStatus,
-                        CustomizeRotatingShiftsViewModels = x.CustomizeRotatingShifts.Select(r=>new CustomizeRotatingShiftsViewModel
-                        {
-                            StartTime = r.StartTime.ToString("HH:mm"),
-                            EndTime = r.EndTime.ToString("HH:mm")
-                        }).ToList(),
-                        IrregularShift = x.IrregularShift
-
-
-
-                    }).ToList(),
-            };
-        }
-
-
-        public EditCustomizeWorkshopSettings GetWorkshopSettingsDetails(long workshopId)
-        {
-
-            var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().FirstOrDefault(x => x.WorkshopId == workshopId);
-            if (entity == null)
-                return new();
-            var viewModel = new EditCustomizeWorkshopSettings()
-            {
-                FridayWork = entity.FridayWork,
-                FridayPay = new() { FridayPayType = entity.FridayPay.FridayPayType, Value = entity.FridayPay.Value },
-                LateToWork = new()
-                {
-                    LateToWorkTimeFinesVewModels = entity.LateToWork.LateToWorkTimeFines.Select(x =>
-                        new LateToWorkTimeFineVewModel() { FineMoney = x.FineMoney, Minute = x.Minute }).ToList(),
-                    Value = entity.LateToWork.Value,
-                    LateToWorkType = entity.LateToWork.LateToWorkType
-                },
-                HolidayWork = entity.HolidayWork,
-                FineAbsenceDeduction = new()
-                {
-                    Value = entity.FineAbsenceDeduction.Value,
-                    FineAbsenceDayOfWeekViewModels = entity.FineAbsenceDeduction.FineAbsenceDayOfWeekCollection
-                        .Select(x => new FineAbsenceDayOfWeekViewModel() { DayOfWeek = x.DayOfWeek }).ToList(),
-                    FineAbsenceDeductionType = entity.FineAbsenceDeduction.FineAbsenceDeductionType
-                },
-                EarlyExit = new()
-                {
-                    EarlyExitTimeFinesViewModels = entity.EarlyExit.EarlyExitTimeFines.Select(x =>
-                        new EarlyExitTimeFineViewModel() { FineMoney = x.FineMoney, Minute = x.Minute }).ToList(),
-                    Value = entity.EarlyExit.Value,
-                    EarlyExitType = entity.EarlyExit.EarlyExitType
-                },
-                BonusesPay = new()
-                {
-                    Value = entity.BonusesPay.Value,
-                    BonusesPayType = entity.BonusesPay.BonusesPayType,
-                    PaymentType = entity.BonusesPay.PaymentType
-                },
-                ShiftPay = new()
-                {
-                    Value = entity.ShiftPay.Value,
-                    ShiftPayType = entity.ShiftPay.ShiftPayType,
-                    ShiftType = entity.ShiftPay.ShiftType
-                },
-                InsuranceDeduction = new()
-                {
-                    Value = entity.InsuranceDeduction.Value,
-                    InsuranceDeductionType = entity.InsuranceDeduction.InsuranceDeductionType
-                },
-                OverTimePay = new()
-                { OverTimePayType = entity.OverTimePay.OverTimePayType, Value = entity.OverTimePay.Value },
-                BaseYearsPay = new()
-                {
-                    BaseYearsPayType = entity.BaseYearsPay.BaseYearsPayType,
-                    Value = entity.BaseYearsPay.Value,
-                    PaymentType = entity.BaseYearsPay.PaymentType
-                },
-                NightWorkPay = new()
-                { NightWorkingType = entity.NightWorkPay.NightWorkingType, Value = entity.NightWorkPay.Value },
-                LeavePay = new()
-                {
-                    Value = entity.LeavePay.Value,
-                    LeavePayType = entity.LeavePay.LeavePayType
-                },
-                MarriedAllowance = new()
-                {
-                    Value = entity.MarriedAllowance.Value,
-                    MarriedAllowanceType = entity.MarriedAllowance.MarriedAllowanceType
-                },
-                FamilyAllowance = new()
-                {
-                    FamilyAllowanceType = entity.FamilyAllowance.FamilyAllowanceType,
-                    Value = entity.FamilyAllowance.Value
-                },
-                Currency = entity.Currency,
-                MaxMonthDays = entity.MaxMonthDays,
-                Id = entity.id,
-                ShiftsList = entity.CustomizeWorkshopSettingsShifts.Select(x => new CustomizeWorkshopShiftViewModel()
-                { EndTime = x.EndTime.ToString("HH:mm"), Placement = x.Placement, StartTime = x.StartTime.ToString("HH:mm") }).ToList(),
-                BonusesPaysInEndOfMonth = entity.BonusesPaysInEndOfMonth,
-                LeavePermittedDays = entity.LeavePermittedDays,
-                BaseYearsPayInEndOfYear = entity.BaseYearsPayInEndOfYear,
-                WorkshopId = entity.WorkshopId,
-                WorkshopShiftStatus = entity.WorkshopShiftStatus
-
-            };
-            return viewModel;
-
-        }
-
-        public CustomizeWorkshopSettings GetBy(long workshopId)
-        {
-            return _companyContext.CustomizeWorkshopSettings.FirstOrDefault(x => x.WorkshopId == workshopId);
-        }
-
-        public EditCustomizeWorkshopSettings GetSimpleWorkshopSettings(long workshopId)
-        {
-            var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().FirstOrDefault(x => x.WorkshopId == workshopId);
-            if (entity == null)
-            {
-                return new();
-            }
-
-            return new()
-            {
-                ShiftsList = entity.CustomizeWorkshopSettingsShifts.Select(x => new CustomizeWorkshopShiftViewModel()
-                {
-                    EndTime = x.EndTime.ToString("HH:mm"),
-                    StartTime = x.StartTime.ToString("HH:mm"),
-                    Placement = x.Placement
-                }).ToList(),
-                Id = entity.id,
-                WorkshopId = entity.WorkshopId,
-                WorkshopShiftStatus = entity.WorkshopShiftStatus,
-                FridayWork = entity.FridayWork,
-                HolidayWork = entity.HolidayWork
-
-            };
-        }
-
-        public List<ChangedGroupedViewModel> GetShiftChangesGroupAndEmployees(long customizeWorkshopSettingsId)
-        {
-
-
-            var result = from groupSetting in _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery()
-                         where groupSetting.IsShiftChange // Filter parent tables where isChange is true
-                         join employeeSettings in _companyContext.CustomizeWorkshopEmployeeSettings on groupSetting.id equals employeeSettings.CustomizeWorkshopGroupSettingId
-                         where employeeSettings.IsShiftChanged// Filter child tables where isChange is true
-                         join employee in _companyContext.Employees on employeeSettings.EmployeeId equals employee.id
-                         group new { employee.FullName, groupSetting.GroupName } by groupSetting.id into grouped
-                         select new ChangedGroupedViewModel
-                         {
-                             GroupName = grouped.First().GroupName,
-                             EmployeeName = grouped.Select(e => e.FullName).ToList()
-                         };
-
-            return result.ToList();
-
-        }
-
-        public CustomizeWorkshopSettingsViewModel GetWorkshopIncludeGroupsByWorkshopId(long workshopId)
-        {
-            var customizeWorkshopSettings = _companyContext.CustomizeWorkshopSettings
-                .AsNoTracking().AsSplitQuery().Where(x => x.WorkshopId == workshopId)
-                .Include(x => x.CustomizeWorkshopGroupSettingsCollection)
-                .Select(x => new CustomizeWorkshopSettingsViewModel()
+            Id = entity.id,
+            Name = auth.WorkshopList.FirstOrDefault(w => w.Id == entity.WorkshopId)?.Name,
+            GroupSettings = entity.CustomizeWorkshopGroupSettingsCollection.Where(x => !x.MainGroup).Select(x =>
+                new CustomizeWorkshopGroupSettingsViewModel()
                 {
                     Id = x.id,
-                    WorkshopShiftStatus = x.WorkshopShiftStatus,
-                    GroupSettings = x.CustomizeWorkshopGroupSettingsCollection.Select(g =>
-                        new CustomizeWorkshopGroupSettingsViewModel()
+                    GroupName = x.GroupName,
+                    RollCallWorkshopEmployeesSettings = x.CustomizeWorkshopEmployeeSettingsCollection.Select(y =>
+                    {
+                        var employee = employees.First(e => e.Id == y.EmployeeId);
+                        return new CustomizeWorkshopEmployeeSettingsViewModel()
                         {
-                            Id = g.id,
-                            IrregularShift = g.IrregularShift,
-                            WorkshopShiftStatus = g.WorkshopShiftStatus,
-                            GroupName = g.GroupName,
-                            MainGroup = g.MainGroup,
-                            Salary = g.Salary,
-                            SalaryStr = g.Salary.ToMoney(),
-                            LeavePermitted = g.LeavePermittedDays,
-                            RollCallWorkshopShifts = g.CustomizeWorkshopGroupSettingsShifts.Select(s =>
+                            Id = y.id,
+                            EmployeeId = y.EmployeeId,
+                            IsSettingChanged = y.IsSettingChanged,
+                            IsShiftChanged = y.IsShiftChanged,
+                            Name = $"{employee}",
+                            RollCallWorkshopShifts = y.CustomizeWorkshopEmployeeSettingsShifts.Select(s =>
                                 new CustomizeWorkshopShiftViewModel()
                                 {
-                                    StartTime = s.StartTime.ToString("HH:mm"),
                                     EndTime = s.EndTime.ToString("HH:mm"),
                                     Placement = s.Placement,
+                                    StartTime = s.StartTime.ToString("HH:mm")
                                 }).ToList(),
-                            BreakTime = g.BreakTime,
-                            HolidayWork = g.HolidayWork,
-                            FridayWork = g.FridayWork,
-                            CustomizeRotatingShiftsViewModels = g.CustomizeRotatingShifts.Select(r=>new CustomizeRotatingShiftsViewModel()
-                            {
-                                EndTime = r.EndTime.ToString("HH:mm"),
-                                StartTime= r.StartTime.ToString("HH:mm")
-                            }).ToList()
-                            
-                        }).ToList(),
+                            Salary = y.Salary,
 
-
-                }).FirstOrDefault();
-
-            return customizeWorkshopSettings;
-        }
-
-        public CustomizeWorkshopEmployeeSettingsViewModel GetEmployeeSettingsByWorkshopIdEmployeeId(long workshopId, long employeeId)
-        {
-            var employee = _companyContext.CustomizeWorkshopSettings
-                .AsSplitQuery().Include(x => x.CustomizeWorkshopGroupSettingsCollection)
-                .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection)
-                .FirstOrDefault(x => x.WorkshopId == workshopId)?.CustomizeWorkshopGroupSettingsCollection.SelectMany(x => x.CustomizeWorkshopEmployeeSettingsCollection)
-                .FirstOrDefault(x => x.EmployeeId == employeeId);
-
-            if (employee == null)
-                return new();
-
-            var employeeName = _companyContext.Employees.Select(x => new { x.FullName, x.id })
-                .FirstOrDefault(x => x.id == employee.EmployeeId);
-            return new CustomizeWorkshopEmployeeSettingsViewModel()
-            {
-                Id = employee.id,
-                EmployeeId = employee.EmployeeId,
-                IsSettingChanged = employee.IsSettingChanged,
-                IsShiftChanged = employee.IsShiftChanged,
-                Name = employeeName?.FullName,
-                RollCallWorkshopShifts = employee.CustomizeWorkshopEmployeeSettingsShifts.Select(x =>
-                    new CustomizeWorkshopShiftViewModel()
-                    {
-                        EndTime = x.EndTime.ToString("HH:mm"),
-                        Placement = x.Placement,
-                        StartTime = x.StartTime.ToString("HH:mm")
+                        };
                     }).ToList(),
-                Salary = employee.Salary
-            };
+                    WorkshopShiftStatus = x.WorkshopShiftStatus,
+                    IrregularShift = x.IrregularShift,
+                    Salary = x.Salary,
+                    RollCallWorkshopShifts = x.CustomizeWorkshopGroupSettingsShifts.Select(s =>
+                        new CustomizeWorkshopShiftViewModel()
+                        {
+                            EndTime = s.EndTime.ToString("HH:mm"),
+                            Placement = s.Placement,
+                            StartTime = s.StartTime.ToString("HH:mm")
+
+                        }).ToList(),
+                    MainGroup = x.MainGroup,
+                    CustomizeRotatingShiftsViewModels = x.CustomizeRotatingShifts.
+                        Select(r=>new CustomizeRotatingShiftsViewModel(){StartTime = r.StartTime.ToString("HH:mm"), EndTime = r.EndTime.ToString("HH:mm")}).ToList()
+                }).ToList(),
+
+        };
+    }
+    public CustomizeWorkshopSettingsViewModel GetWorkshopSettingsByWorkshopIdForAdmin(long workshopId)
+    {
+        var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().Where(x => x.WorkshopId == workshopId)
+            .Include(x => x.CustomizeWorkshopGroupSettingsCollection)
+            .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection).AsSplitQuery()
+            .FirstOrDefault();
+        if (entity == null)
+            return new();
+
+        return new CustomizeWorkshopSettingsViewModel()
+        {
+            Id = entity.id,
+            Offset = entity.EndTimeOffSet,
+            GroupSettings = entity.CustomizeWorkshopGroupSettingsCollection.Where(x => !x.MainGroup).Select(x =>
+                new CustomizeWorkshopGroupSettingsViewModel()
+                {
+                    Id = x.id,
+                    GroupName = x.GroupName,
+                    RollCallWorkshopEmployeesSettings = x.CustomizeWorkshopEmployeeSettingsCollection.Select(y =>
+                    {
+                        var employee = _employeeRepository.Get(y.EmployeeId);
+                        return new CustomizeWorkshopEmployeeSettingsViewModel()
+                        {
+                            Id = y.id,
+                            EmployeeId = y.EmployeeId,
+                            IsSettingChanged = y.IsSettingChanged,
+                            IsShiftChanged = y.IsShiftChanged,
+                            Name = $"{employee?.FName} {employee?.LName}",
+                            RollCallWorkshopShifts = y.CustomizeWorkshopEmployeeSettingsShifts.Select(s =>
+                                new CustomizeWorkshopShiftViewModel()
+                                {
+                                    EndTime = s.EndTime.ToString("HH:mm"),
+                                    Placement = s.Placement,
+                                    StartTime = s.StartTime.ToString("HH:mm")
+                                }).ToList(),
+                            Salary = y.Salary,
+                            CustomizeRotatingShiftsViewModels = y.CustomizeRotatingShifts.Select(r => new CustomizeRotatingShiftsViewModel
+                            {
+                                StartTime = r.StartTime.ToString("HH:mm"),
+                                EndTime = r.EndTime.ToString("HH:mm")
+                            }).ToList(),
+                            LeavePermittedDays = y.LeavePermittedDays,
+                            IrregularShift = y.IrregularShift,
+                            WorkshopShiftStatus = y.WorkshopShiftStatus
+                        };
+                    }).ToList(),
+                    Salary = x.Salary,
+                    RollCallWorkshopShifts = x.CustomizeWorkshopGroupSettingsShifts.Select(s =>
+                        new CustomizeWorkshopShiftViewModel()
+                        {
+                            EndTime = s.EndTime.ToString("HH:mm"),
+                            Placement = s.Placement,
+                            StartTime = s.StartTime.ToString("HH:mm")
+
+                        }).ToList(),
+                    MainGroup = x.MainGroup,
+                    WorkshopShiftStatus = x.WorkshopShiftStatus,
+                    CustomizeRotatingShiftsViewModels = x.CustomizeRotatingShifts.Select(r => new CustomizeRotatingShiftsViewModel
+                    {
+                        StartTime = r.StartTime.ToString("HH:mm"),
+                        EndTime = r.EndTime.ToString("HH:mm")
+                    }).ToList(),
+                    IrregularShift = x.IrregularShift
+
+
+
+                }).ToList(),
+        };
+    }
+
+
+    public EditCustomizeWorkshopSettings GetWorkshopSettingsDetails(long workshopId)
+    {
+
+        var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().FirstOrDefault(x => x.WorkshopId == workshopId);
+        if (entity == null)
+            return new();
+        var viewModel = new EditCustomizeWorkshopSettings()
+        {
+            FridayWork = entity.FridayWork,
+            FridayPay = new() { FridayPayType = entity.FridayPay.FridayPayType, Value = entity.FridayPay.Value },
+            LateToWork = new()
+            {
+                LateToWorkTimeFinesVewModels = entity.LateToWork.LateToWorkTimeFines.Select(x =>
+                    new LateToWorkTimeFineVewModel() { FineMoney = x.FineMoney, Minute = x.Minute }).ToList(),
+                Value = entity.LateToWork.Value,
+                LateToWorkType = entity.LateToWork.LateToWorkType
+            },
+            HolidayWork = entity.HolidayWork,
+            FineAbsenceDeduction = new()
+            {
+                Value = entity.FineAbsenceDeduction.Value,
+                FineAbsenceDayOfWeekViewModels = entity.FineAbsenceDeduction.FineAbsenceDayOfWeekCollection
+                    .Select(x => new FineAbsenceDayOfWeekViewModel() { DayOfWeek = x.DayOfWeek }).ToList(),
+                FineAbsenceDeductionType = entity.FineAbsenceDeduction.FineAbsenceDeductionType
+            },
+            EarlyExit = new()
+            {
+                EarlyExitTimeFinesViewModels = entity.EarlyExit.EarlyExitTimeFines.Select(x =>
+                    new EarlyExitTimeFineViewModel() { FineMoney = x.FineMoney, Minute = x.Minute }).ToList(),
+                Value = entity.EarlyExit.Value,
+                EarlyExitType = entity.EarlyExit.EarlyExitType
+            },
+            BonusesPay = new()
+            {
+                Value = entity.BonusesPay.Value,
+                BonusesPayType = entity.BonusesPay.BonusesPayType,
+                PaymentType = entity.BonusesPay.PaymentType
+            },
+            ShiftPay = new()
+            {
+                Value = entity.ShiftPay.Value,
+                ShiftPayType = entity.ShiftPay.ShiftPayType,
+                ShiftType = entity.ShiftPay.ShiftType
+            },
+            InsuranceDeduction = new()
+            {
+                Value = entity.InsuranceDeduction.Value,
+                InsuranceDeductionType = entity.InsuranceDeduction.InsuranceDeductionType
+            },
+            OverTimePay = new()
+                { OverTimePayType = entity.OverTimePay.OverTimePayType, Value = entity.OverTimePay.Value },
+            BaseYearsPay = new()
+            {
+                BaseYearsPayType = entity.BaseYearsPay.BaseYearsPayType,
+                Value = entity.BaseYearsPay.Value,
+                PaymentType = entity.BaseYearsPay.PaymentType
+            },
+            NightWorkPay = new()
+                { NightWorkingType = entity.NightWorkPay.NightWorkingType, Value = entity.NightWorkPay.Value },
+            LeavePay = new()
+            {
+                Value = entity.LeavePay.Value,
+                LeavePayType = entity.LeavePay.LeavePayType
+            },
+            MarriedAllowance = new()
+            {
+                Value = entity.MarriedAllowance.Value,
+                MarriedAllowanceType = entity.MarriedAllowance.MarriedAllowanceType
+            },
+            FamilyAllowance = new()
+            {
+                FamilyAllowanceType = entity.FamilyAllowance.FamilyAllowanceType,
+                Value = entity.FamilyAllowance.Value
+            },
+            Currency = entity.Currency,
+            MaxMonthDays = entity.MaxMonthDays,
+            Id = entity.id,
+            ShiftsList = entity.CustomizeWorkshopSettingsShifts.Select(x => new CustomizeWorkshopShiftViewModel()
+                { EndTime = x.EndTime.ToString("HH:mm"), Placement = x.Placement, StartTime = x.StartTime.ToString("HH:mm") }).ToList(),
+            BonusesPaysInEndOfMonth = entity.BonusesPaysInEndOfMonth,
+            LeavePermittedDays = entity.LeavePermittedDays,
+            BaseYearsPayInEndOfYear = entity.BaseYearsPayInEndOfYear,
+            WorkshopId = entity.WorkshopId,
+            WorkshopShiftStatus = entity.WorkshopShiftStatus
+
+        };
+        return viewModel;
+
+    }
+
+
+    public EditCustomizeWorkshopSettings GetSimpleWorkshopSettings(long workshopId)
+    {
+        var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().FirstOrDefault(x => x.WorkshopId == workshopId);
+        if (entity == null)
+        {
+            return new();
         }
 
-        #region Pooya
-        public List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingsWithMonthlySalary(long workshopId)
+        return new()
         {
-            var query = _companyContext.CustomizeWorkshopGroupSettings.Where(x => x.MainGroup == false).Include(x => x)
-                .Include(x => x.CustomizeWorkshopEmployeeSettingsCollection).Where(x => x.CustomizeWorkshopEmployeeSettingsCollection.Any(y =>
+            ShiftsList = entity.CustomizeWorkshopSettingsShifts.Select(x => new CustomizeWorkshopShiftViewModel()
+            {
+                EndTime = x.EndTime.ToString("HH:mm"),
+                StartTime = x.StartTime.ToString("HH:mm"),
+                Placement = x.Placement
+            }).ToList(),
+            Id = entity.id,
+            WorkshopId = entity.WorkshopId,
+            WorkshopShiftStatus = entity.WorkshopShiftStatus,
+            FridayWork = entity.FridayWork,
+            HolidayWork = entity.HolidayWork
+
+        };
+    }
+
+    public List<ChangedGroupedViewModel> GetShiftChangesGroupAndEmployees(long customizeWorkshopSettingsId)
+    {
+
+
+        var result = from groupSetting in _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery()
+            where groupSetting.IsShiftChange // Filter parent tables where isChange is true
+            join employeeSettings in _companyContext.CustomizeWorkshopEmployeeSettings on groupSetting.id equals employeeSettings.CustomizeWorkshopGroupSettingId
+            where employeeSettings.IsShiftChanged// Filter child tables where isChange is true
+            join employee in _companyContext.Employees on employeeSettings.EmployeeId equals employee.id
+            group new { employee.FullName, groupSetting.GroupName } by groupSetting.id into grouped
+            select new ChangedGroupedViewModel
+            {
+                GroupName = grouped.First().GroupName,
+                EmployeeName = grouped.Select(e => e.FullName).ToList()
+            };
+
+        return result.ToList();
+
+    }
+
+    public CustomizeWorkshopSettingsViewModel GetWorkshopIncludeGroupsByWorkshopId(long workshopId)
+    {
+        var customizeWorkshopSettings = _companyContext.CustomizeWorkshopSettings
+            .AsNoTracking().AsSplitQuery().Where(x => x.WorkshopId == workshopId)
+            .Include(x => x.CustomizeWorkshopGroupSettingsCollection)
+            .Select(x => new CustomizeWorkshopSettingsViewModel()
+            {
+                Id = x.id,
+                WorkshopShiftStatus = x.WorkshopShiftStatus,
+                GroupSettings = x.CustomizeWorkshopGroupSettingsCollection.Select(g =>
+                    new CustomizeWorkshopGroupSettingsViewModel()
+                    {
+                        Id = g.id,
+                        IrregularShift = g.IrregularShift,
+                        WorkshopShiftStatus = g.WorkshopShiftStatus,
+                        GroupName = g.GroupName,
+                        MainGroup = g.MainGroup,
+                        RollCallWorkshopShifts = g.CustomizeWorkshopGroupSettingsShifts.Select(s =>
+                            new CustomizeWorkshopShiftViewModel()
+                            {
+                                StartTime = s.StartTime.ToString("HH:mm"),
+                                EndTime = s.EndTime.ToString("HH:mm"),
+                                Placement = s.Placement,
+                            }).ToList(),
+                        BreakTime = g.BreakTime,
+                        HolidayWork = g.HolidayWork,
+                        FridayWork = g.FridayWork,
+                        CustomizeRotatingShiftsViewModels = g.CustomizeRotatingShifts.Select(r => new CustomizeRotatingShiftsViewModel()
+                        {
+                            EndTime = r.EndTime.ToString("HH:mm"),
+                            StartTime = r.StartTime.ToString("HH:mm")
+                        }).ToList()
+
+                    }).ToList(),
+
+
+            }).FirstOrDefault();
+
+        return customizeWorkshopSettings;
+    }
+
+    public CustomizeWorkshopEmployeeSettingsViewModel GetEmployeeSettingsByWorkshopIdEmployeeId(long workshopId, long employeeId)
+    {
+        var employee = _companyContext.CustomizeWorkshopSettings
+            .AsSplitQuery().Include(x => x.CustomizeWorkshopGroupSettingsCollection)
+            .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection)
+            .FirstOrDefault(x => x.WorkshopId == workshopId)?.CustomizeWorkshopGroupSettingsCollection.SelectMany(x => x.CustomizeWorkshopEmployeeSettingsCollection)
+            .FirstOrDefault(x => x.EmployeeId == employeeId);
+
+        if (employee == null)
+            return new();
+
+        var employeeName = _companyContext.Employees.Select(x => new { x.FullName, x.id })
+            .FirstOrDefault(x => x.id == employee.EmployeeId);
+        return new CustomizeWorkshopEmployeeSettingsViewModel()
+        {
+            Id = employee.id,
+            EmployeeId = employee.EmployeeId,
+            IsSettingChanged = employee.IsSettingChanged,
+            IsShiftChanged = employee.IsShiftChanged,
+            Name = employeeName?.FullName,
+            RollCallWorkshopShifts = employee.CustomizeWorkshopEmployeeSettingsShifts.Select(x =>
+                new CustomizeWorkshopShiftViewModel()
+                {
+                    EndTime = x.EndTime.ToString("HH:mm"),
+                    Placement = x.Placement,
+                    StartTime = x.StartTime.ToString("HH:mm")
+                }).ToList(),
+            Salary = employee.Salary
+        };
+    }
+
+    #region Pooya
+    public List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingsWithMonthlySalary(long workshopId)
+    {
+        var query = _companyContext.CustomizeWorkshopGroupSettings.Where(x => x.MainGroup == false).Include(x => x)
+            .Include(x => x.CustomizeWorkshopEmployeeSettingsCollection).Where(x => x.CustomizeWorkshopEmployeeSettingsCollection.Any(y =>
                 y.WorkshopId == workshopId)).SelectMany(x => x.CustomizeWorkshopEmployeeSettingsCollection)
-                .Where(x => x.Salary > 0).Select(x =>
+            .Where(x => x.Salary > 0).Select(x =>
                 new CustomizeWorkshopEmployeeSettingsViewModel()
                 {
                     WorkshopShiftStatus = x.WorkshopShiftStatus,
@@ -361,26 +374,31 @@ namespace CompanyManagment.EFCore.Repository
                     EmployeeId = x.EmployeeId,
                     BreakTime = x.BreakTime
                 });
-            return query.ToList();
-        }
-
-        public List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingsByWorkshopId(long workshopId)
-        {
-            return _companyContext.CustomizeWorkshopSettings.AsNoTracking().Where(x => x.WorkshopId == workshopId).Include(x => x.CustomizeWorkshopGroupSettingsCollection)
-                .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection).SelectMany(x => x.CustomizeWorkshopGroupSettingsCollection
-                .SelectMany(y => y.CustomizeWorkshopEmployeeSettingsCollection))
-                .Select(x => new CustomizeWorkshopEmployeeSettingsViewModel
-                {
-                    BreakTime = x.BreakTime,
-                    IsShiftChanged = x.IsShiftChanged,
-                    IsSettingChanged = x.IsSettingChanged,
-                    EmployeeId = x.EmployeeId,
-                    Id = x.id,
-                    Salary = x.Salary,
-                    GroupSettingsId = x.CustomizeWorkshopGroupSettingId
-                }).ToList();
-        }
-
-        #endregion
+        return query.ToList();
     }
+
+    public List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingsByWorkshopId(long workshopId)
+    {
+        return _companyContext.CustomizeWorkshopSettings.AsNoTracking().Where(x => x.WorkshopId == workshopId).Include(x => x.CustomizeWorkshopGroupSettingsCollection)
+            .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection).SelectMany(x => x.CustomizeWorkshopGroupSettingsCollection
+                .SelectMany(y => y.CustomizeWorkshopEmployeeSettingsCollection))
+            .Select(x => new CustomizeWorkshopEmployeeSettingsViewModel
+            {
+                BreakTime = x.BreakTime,
+                IsShiftChanged = x.IsShiftChanged,
+                IsSettingChanged = x.IsSettingChanged,
+                EmployeeId = x.EmployeeId,
+                Id = x.id,
+                Salary = x.Salary,
+                GroupSettingsId = x.CustomizeWorkshopGroupSettingId
+            }).ToList();
+    }
+
+    public CustomizeWorkshopSettings GetBy(long workshopId)
+    {
+        return _companyContext.CustomizeWorkshopSettings.AsSplitQuery()
+            .FirstOrDefault(x => x.WorkshopId == workshopId);
+    }
+
+    #endregion
 }

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);
     }