set leftWork

0_Framework/0_Framework.csproj

@@ -14,9 +14,7 @@
     <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
     <PackageReference Include="PersianTools.Core" Version="2.0.4" />
     <PackageReference Include="System.Drawing.Common" Version="9.0.0" />
-    <PackageReference Include="MD.PersianDateTime.Standard" Version="2.5.0" />
+    
-
-
   </ItemGroup>
 
 </Project>

0_Framework/Application/AuthHelper.cs

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

0_Framework/Application/IAuthHelper.cs

@@ -23,5 +23,5 @@ public interface IAuthHelper
 	long CurrentSubAccountId();
     string GetWorkshopSlug();
     string GetWorkshopName();
-    (long Id, UserType userType, long roleId) GetUserTypeWithId();
+    (long Id, UserType userType) GetUserTypeWithId();
 }

0_Framework/Application/IsActive.cs

@@ -4,5 +4,5 @@ public enum IsActive
 {
 	False,
 	True,
-    None
+   
 }

0_Framework/Application/OperationResult.cs

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

0_Framework/Application/Sms/ISmsService.cs

@@ -9,24 +9,10 @@ public interface ISmsService
     void Send(string number, string message);
     bool VerifySend(string number, string message);
     bool LoginSend(string number, string message);
-    /// <summary>
-    /// ارسال کد به کلاینت برای تکمیل فرایند ثبت نام
-    /// </summary>
-    /// <param name="number"></param>
-    /// <param name="code"></param>
-    /// <returns></returns>
-    Task<SentSmsViewModel> SendVerifyCodeToClient(string number, string code);
     bool SendAccountsInfo(string number,string fullName, string userName);
     Task<ApiResultViewModel> GetByMessageId(int messId);
     Task<List<ApiResultViewModel>> GetApiResult(string startDate, string endDate);
     string DeliveryStatus(byte? dv);
     string DeliveryColorStatus(byte? dv);
     string UnixTimeStampToDateTime(int? unixTimeStamp);
-
-    #region Mahan
-
-    Task<double> GetCreditAmount();
-
-    #endregion
-
 }

0_Framework/Application/Sms/SentSmsViewModel.cs

@@ -1,32 +0,0 @@
-namespace _0_Framework.Application;
-
-public class SentSmsViewModel
-{
-    public SentSmsViewModel()
-    {
-        IsSuccedded = false;
-    }
-
-    public bool IsSuccedded { get; set; }
-    public string Message { get; set; }
-    public byte StatusCode { get; set; }
-    public int MessageId { get; set; }
-
-    public SentSmsViewModel Succedded(byte statusCode, string message, int messageId)
-    {
-        IsSuccedded = true;
-        Message = message;
-        StatusCode = statusCode;
-        MessageId = messageId;
-        return this;
-    }
-
-    public SentSmsViewModel Failed(byte statusCode, string message, int messageId)
-    {
-        IsSuccedded = false;
-        Message = message;
-        StatusCode = statusCode;
-        MessageId = messageId;
-        return this;
-    }
-}

0_Framework/Application/Sms/SmsService.cs

@@ -9,7 +9,6 @@ using IPE.SmsIrClient;
 using IPE.SmsIrClient.Models.Requests;
 using IPE.SmsIrClient.Models.Results;
 using Microsoft.Extensions.Configuration;
-using static System.Runtime.InteropServices.JavaScript.JSType;
 
 
 namespace _0_Framework.Application.Sms;
@@ -17,14 +16,10 @@ namespace _0_Framework.Application.Sms;
 public class SmsService : ISmsService
 {
     private readonly IConfiguration _configuration;
-    public SmsIr SmsIr { get; set; }
-
 
     public SmsService(IConfiguration configuration)
     {
         _configuration = configuration;
-        SmsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
-
     }
 
     public void Send(string number, string message)
@@ -115,31 +110,6 @@ public class SmsService : ISmsService
         }
     }
 
-    public async Task<SentSmsViewModel> SendVerifyCodeToClient(string number, string code)
-    {
-        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
-        var result = new SentSmsViewModel();
-        //var bulkSendResult =  smsIr.BulkSendAsync(95007079000006, "your text message", new string[] { "9120000000" });
-
-        var sendResult = await smsIr.VerifySendAsync(number, 768382, new VerifySendParameter[] { new VerifySendParameter("VerificationCode", code) });
-        Thread.Sleep(2000);
-
-        if (sendResult.Message == "موفق")
-        {
-            var status = sendResult.Status;
-            var message = sendResult.Message;
-            var messaeId = sendResult.Data.MessageId;
-            return result.Succedded(status, message, messaeId);
-        }
-        else
-        {
-            var status = sendResult.Status;
-            var message = sendResult.Message;
-            var messaeId = sendResult.Data.MessageId;
-            return result.Failed(status, message, messaeId);
-        }
-    }
-
     public bool SendAccountsInfo(string number, string fullName, string userName)
     {
 
@@ -315,23 +285,4 @@ public class SmsService : ISmsService
         //var tokenService = new Token();
         //return tokenService.GetToken("x-api-key", "Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
     }
-
-    #region Mahan
-
-    public async Task<double> GetCreditAmount()
-    {
-        try
-        {
-            var credit = await SmsIr.GetCreditAsync();
-            return (double)credit.Data;
-        }
-        catch
-        {
-            return -1;
-        }
-       
-    }
-
-
-    #endregion
 }

0_Framework/Application/StaticWorkshopAccounts.cs

@@ -14,24 +14,14 @@ public static class StaticWorkshopAccounts
     /// </summary>
     public static List<long> SelectedAccountsRoleIds = [3, 5, 7, 8];
 
-    /// <summary>
-    /// لیستی آی دی نقش هایی که دردسترسی به تب افزودن پرسنل و مدارک کلاینت دارند
-    /// 3 : قرارداد ارشد
-    /// 5 : قرارداد ساده
-    /// 19 : برنامه نویسان
-    /// 1 : مدیر سیستم 
-    /// </summary>
-    public static List<long> EmployeeDocumentWorkFlowRoleIds = [1,3, 5, 19];
-
     /// <summary>
     /// لیست اکانتهایی که به همه کارگاه ها باید دسترسی داشته باشند
     /// 2 - صادق فرخی
     /// 3 - میلاد مصباح
     /// 380 - افروز نظری
     /// 381 - مهدی قربانی
-    /// 392 - عمار حسن دوست
     /// </summary>
-    public static List<long> StaticAccountIds = [2, 3, 380, 381, 392];
+    public static List<long> StaticAccountIds = [2, 3, 380, 381];
 
     /// <summary>
     /// این تاریخ در جدول اکانت لفت ورک به این معنیست

0_Framework/Application/SubAccountPermissionHelper.cs

@@ -385,27 +385,11 @@
         /// </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 کارپوشه
@@ -760,22 +744,6 @@
             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

@@ -52,81 +52,81 @@ public static class Tools
     /// <param name="endDate"></param>
     /// <param name="employeeId"></param>
     /// <returns></returns>
-    public static (int countWorkingDays, DateTime startWork, DateTime endWork, bool hasStartWorkInMonth, bool hasLeftWorkInMonth) GetEmployeeInsuranceWorkingDays(DateTime startWork, DateTime? leftWork, DateTime startDate,
+    public static (int countWorkingDays,DateTime startWork,DateTime endWork,bool hasStartWorkInMonth,bool hasLeftWorkInMonth) GetEmployeeInsuranceWorkingDays(DateTime startWork,DateTime? leftWork,DateTime startDate,
-        DateTime endDate, long employeeId)
+	    DateTime endDate,long employeeId)
     {
-        DateTime start = startDate;
+	    DateTime start = startDate;
         DateTime end = endDate;
         bool startWorkInMonth = false;
         bool endWorkInMonth = false;
-
+    
         //اگر شروع بکار پرسنل در ماه مشخص شده لیست بیمه بود
         if (startWork >= startDate)
         {
-            start = startWork;
+	        start = startWork;
-            startWorkInMonth = true;
+	        startWorkInMonth = true;
         }
 
-        if (leftWork == null)
+        if(leftWork == null)
             leftWork = DateTime.MinValue;
         //اگر ترک کار پرسنل در ماه مشخص شده لیست بیمه بود
         if (leftWork != DateTime.MinValue && leftWork.Value < endDate)
         {
-            end = leftWork.Value;
+	        end = leftWork.Value;
             endWorkInMonth = true;
         }
 
-        int countDays = (int)(end - start).TotalDays + 1;
+        int countDays = (int)(end - start).TotalDays +1;
 
 
         //روزهای کارکرد پرسنل با آی دی های زیر دستی تعریف شد
         switch (employeeId)
         {
 
-            //case 3812://ثابت- کسری حاجی پور
+	        //case 3812://ثابت- کسری حاجی پور
-            //    countWorkingDays = 15;
+	        //    countWorkingDays = 15;
-            //    break;
+	        //    break;
-            case 40463://ثابت
+	        case 40463://ثابت
-                countDays = 10;
+		        countDays = 10;
-                break;
+		        break;
-            case 40469://ثابت
+	        case 40469://ثابت
-                countDays = 7;
+		        countDays = 7;
-                break;
+		        break;
-            //case 9950://ثابت
+	        //case 9950://ثابت
-            // countDays = 15;
+		       // countDays = 15;
-            //break;
+		        //break;
-            case 9640://ثابت
+	        case 9640://ثابت
-                countDays = 15;
+		        countDays = 15;
-                break;
+		        break;
-            case 40998://ثابت
+	        case 40998://ثابت
-                countDays = 15;
+		        countDays = 15;
-                break;
+		        break;
-            case 6219://ثابت
+	        case 6219://ثابت
-                countDays = 15;
+		        countDays = 15;
-                break;
+		        break;
-                //case 7897://ثابت
+		        //case 7897://ثابت
-                //    countWorkingDays = 15;
+		        //    countWorkingDays = 15;
         }
 
 
-        return (countDays, start, end, startWorkInMonth, endWorkInMonth);
+		return (countDays,start,end,startWorkInMonth,endWorkInMonth);
     }
-    /// <summary>
+	/// <summary>
-    /// محاسبه سن 
+	/// محاسبه سن 
-    /// </summary>
+	/// </summary>
-    /// <param name="startDate"></param>
+	/// <param name="startDate"></param>
-    /// <param name="endDate"></param>
+	/// <param name="endDate"></param>
-    /// <returns></returns>
+	/// <returns></returns>
-    public static (int yearCount, int monthCount, int dayCount) GetAge(DateTime startDate, DateTime endDate)
+	public static (int yearCount, int monthCount, int dayCount) GetAge(DateTime startDate, DateTime endDate)
     {
-
+  
         var startFa = startDate.ToFarsi();
         int startYear = Convert.ToInt32(startFa.Substring(0, 4));
         int startMonth = Convert.ToInt32(startFa.Substring(5, 2));
         int startDay = Convert.ToInt32(startFa.Substring(8, 2));
         var start = new PersianDateTime(startYear, startMonth, startDay);
 
-
+     
         var endFa = endDate.ToFarsi();
         int endYear = Convert.ToInt32(endFa.Substring(0, 4));
         int endMonth = Convert.ToInt32(endFa.Substring(5, 2));
@@ -141,7 +141,7 @@ public static class Tools
         if (firstYearCounter > end)
         {
             start = start.AddYears(-1);
-
+          
             var endMonthCounter = new PersianDateTime(end.Year, end.Month, start.Day);
 
             for (var monthCounter = start; monthCounter <= end; monthCounter = monthCounter.AddMonths(1))
@@ -193,7 +193,7 @@ public static class Tools
                 if (yearCouner.Year == end.Year)
                 {
 
-                    var endMonthCounter = new PersianDateTime(end.Year, end.Month, (yearCouner.Day > end.Day ? end.Day : yearCouner.Day));
+                    var endMonthCounter = new PersianDateTime(end.Year, end.Month, (yearCouner.Day > end.Day ? end.Day :  yearCouner.Day));
 
                     if (yearCouner.Day <= end.Day)
                     {
@@ -244,7 +244,7 @@ public static class Tools
 
         Console.ResetColor();
         Console.WriteLine($"old: [{years} year] ، [{months} month] ، [{days} day]");
-        return (years, months, days);
+        return (years,months,days);
     }
 
     public static string ToFarsi(this DateTime? date)
@@ -397,9 +397,9 @@ public static class Tools
 
     public static DateTime ToGeorgianDateTime(this string persianDate)
     {
+        persianDate = persianDate.ToEnglishNumber();
         try
         {
-            persianDate = persianDate.ToEnglishNumber();
             var year = Convert.ToInt32(persianDate.Substring(0, 4));
             var month = Convert.ToInt32(persianDate.Substring(5, 2));
             var day = Convert.ToInt32(persianDate.Substring(8, 2));
@@ -458,30 +458,25 @@ public static class Tools
     public static double MoneyToDouble(this string myMoney)
     {
         string bb = string.Empty;
-        bool isNegative = false;
 
         for (int x = 0; x < myMoney.Length; x++)
         {
             if (char.IsDigit(myMoney[x]))
-            {
                 bb += myMoney[x];
-            }
-            else if (myMoney[x] == '-' && bb.Length == 0)
-            {
-                // اگر علامت منفی قبل از اولین عدد آمد، در نظر بگیر
-                isNegative = true;
-            }
         }
 
         if (bb.Length > 0)
         {
             double res = double.Parse(bb);
-            return isNegative ? -res : res;
+            return res;
         }
         else
         {
             return 0;
         }
+
+
+
     }
     public static string ToFileName(this DateTime date)
     {
@@ -603,90 +598,90 @@ public static class Tools
     /// <returns></returns>
     public static int YearTotalDays(this string date)
     {
-        int y2 = 366;
+        int y2 = 365;
         var year = Convert.ToInt32(date.Substring(0, 4));
 
 
         switch (year)
         {
             case 1346:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1350:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1354:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1358:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1362:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1366:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1370:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1375:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1379:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1383:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1387:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1391:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1395:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1399:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1403:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1408:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1412:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1416:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1420:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1424:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1428:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1432:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1436:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1441:
-                y2 = 367;
+                y2 = 366;
                 break;
             case 1445:
-                y2 = 367;
+                y2 = 366;
                 break;
 
             default:
-                y2 = 366;
+                y2 = 365;
                 break;
 
         }
@@ -889,39 +884,30 @@ public static class Tools
         string result = "";
         switch (value)
         {
-            case "1":
             case "01":
                 result = "فروردین";
                 break;
-            case "2":
             case "02":
                 result = "اردیبهشت";
                 break;
-            case "3":
             case "03":
                 result = "خرداد";
                 break;
-            case "4":
             case "04":
                 result = "تیر";
                 break;
-            case "5":
             case "05":
                 result = "مرداد";
                 break;
-            case "6":
             case "06":
                 result = "شهریور";
                 break;
-            case "7":
             case "07":
                 result = "مهر";
                 break;
-            case "8":
             case "08":
                 result = "آبان";
                 break;
-            case "9":
             case "09":
                 result = "آذر";
                 break;
@@ -1281,16 +1267,16 @@ public static class Tools
             var part5 = parts[5].Substring(0, 2);
 
 
-            try
+			try
             {
                 PersianCalendar pc = new PersianCalendar();
-                dateTime = pc.ToDateTime(int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3]), int.Parse(parts[4]), int.Parse(part5), 0, 0, 0);
+                 dateTime = pc.ToDateTime(int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3]), int.Parse(parts[4]), int.Parse(part5), 0, 0, 0);
-
+             
             }
             catch (Exception e)
             {
 
-
+               
             }
 
         }
@@ -1398,8 +1384,8 @@ public static class Tools
     }
     public static DateTime FindFirstDayOfMonthGr(this DateTime date)
     {
-        var pc = new PersianCalendar();
+	    var pc = new PersianCalendar();
-        return ($"{pc.GetYear(date)}/{pc.GetMonth(date):00}/01").ToGeorgianDateTime();
+	    return ($"{pc.GetYear(date)}/{pc.GetMonth(date):00}/01").ToGeorgianDateTime();
     }
     #region Mahan
 
@@ -1417,8 +1403,6 @@ public static class Tools
 
             if (@char == char.Parse("ي"))
                 res += "ی";
-            else if (@char == char.Parse("ك"))
-                res += "ک";
             else
                 res += @char;
         }
@@ -1604,19 +1588,19 @@ public static class Tools
 
     public static TimeOnly CalculateOffset(ICollection<CustomizeSifts> shiftDetailsRegularShifts)
     {
-        if (!shiftDetailsRegularShifts.Any())
+	    if (!shiftDetailsRegularShifts.Any())
-        {
+	    {
-            return TimeOnly.MinValue;
+		    return TimeOnly.MinValue;
-        }
+	    }
-        var date = new DateOnly();
+	    var date = new DateOnly();
-        var firstStartShift = new DateTime(date, shiftDetailsRegularShifts.MinBy(x => x.Placement).StartTime);
+	    var firstStartShift = new DateTime(date, shiftDetailsRegularShifts.MinBy(x => x.Placement).StartTime);
-        var lastEndShift = new DateTime(date, shiftDetailsRegularShifts.MaxBy(x => x.Placement).EndTime);
+	    var lastEndShift = new DateTime(date, shiftDetailsRegularShifts.MaxBy(x => x.Placement).EndTime);
-        if (lastEndShift > firstStartShift)
+	    if (lastEndShift > firstStartShift)
-            firstStartShift = firstStartShift.AddDays(1);
+		    firstStartShift = firstStartShift.AddDays(1);
-        var offSet = (firstStartShift - lastEndShift).Divide(2);
+	    var offSet = (firstStartShift - lastEndShift).Divide(2);
-        return TimeOnly.FromDateTime(lastEndShift.Add(offSet));
+	    return TimeOnly.FromDateTime(lastEndShift.Add(offSet));
     }
-    public static DateTime GetNextDayOfWeek(this DateTime date, DayOfWeek dayOfWeek)
+	public static DateTime GetNextDayOfWeek(this DateTime date, DayOfWeek dayOfWeek)
     {
         int numberOfNextDayOfWeek = ((int)dayOfWeek - (int)date.DayOfWeek + 7) % 7;
         return date.AddDays(numberOfNextDayOfWeek == 0 ? 7 : numberOfNextDayOfWeek);
@@ -1696,10 +1680,6 @@ public static class Tools
 
     }
 
-
-
-
-
     #endregion
 
     #region Pooya
@@ -1792,75 +1772,75 @@ public static class Tools
     public static string ToFarsiHoursAndMinutes(int hours, int minutes, string emptyValue = "")
     {
 
-        string message = emptyValue;
+	    string message = emptyValue;
-        if (hours > 0 && minutes > 0)
+	    if (hours > 0 && minutes > 0)
-        {
+	    {
 
-            message = hours + " " + "ساعت و" + " " + minutes + " " + "دقیقه";
+		    message = hours + " " + "ساعت و" + " " + minutes + " " + "دقیقه";
-        }
+	    }
-        else if (hours > 0 && minutes == 0)
+	    else if (hours > 0 && minutes == 0)
-        {
+	    {
 
-            message = hours + " " + "ساعت ";
+		    message = hours + " " + "ساعت ";
-        }
+	    }
-        else if (hours == 0 && minutes > 0)
+	    else if (hours == 0 && minutes > 0)
-        {
+	    {
 
-            message = minutes + " " + "دقیقه";
+		    message = minutes + " " + "دقیقه";
-        }
+	    }
 
-        return message;
+	    return message;
     }
-    public static string ToFarsiHoursAndMinutes(this TimeSpan timeSpan, string emptyValue = "")
+	public static string ToFarsiHoursAndMinutes(this TimeSpan timeSpan, string emptyValue = "")
     {
-        var hours = (int)timeSpan.TotalHours;
+	    var hours = (int)timeSpan.TotalHours;
-        var minutes = timeSpan.Minutes;
+	    var minutes = timeSpan.Minutes;
-        string message = emptyValue;
+	    string message = emptyValue;
-        if (hours > 0 && minutes > 0)
+	    if (hours > 0 && minutes > 0)
-        {
+	    {
 
-            message = hours + " " + "ساعت و" + " " + minutes + " " + "دقیقه";
+		    message = hours + " " + "ساعت و" + " " + minutes + " " + "دقیقه";
-        }
+	    }
-        else if (hours > 0 && minutes == 0)
+	    else if (hours > 0 && minutes == 0)
-        {
+	    {
 
-            message = hours + " " + "ساعت ";
+		    message = hours + " " + "ساعت ";
-        }
+	    }
-        else if (hours == 0 && minutes > 0)
+	    else if (hours == 0 && minutes > 0)
-        {
+	    {
 
-            message = minutes + " " + "دقیقه";
+		    message = minutes + " " + "دقیقه";
-        }
+	    }
 
-        return message;
+	    return message;
     }
-    public static string ToFarsiDaysAndHoursAndMinutes(this TimeSpan timeSpan, string emptyValue = "")
+	public static string ToFarsiDaysAndHoursAndMinutes(this TimeSpan timeSpan, string emptyValue = "")
-    {
+	{
-        var hours = (int)timeSpan.TotalHours;
+		var hours = (int)timeSpan.TotalHours;
-        var minutes = timeSpan.Minutes;
+		var minutes = timeSpan.Minutes;
-        var days = hours / 24;
+		var days = hours / 24;
-        hours = hours % 24;
+		hours = hours % 24;
-        string message = "";
+		string message = "";
 
-        if (days > 0)
+		if (days > 0)
-            message += days + " " + "روز";
+			message += days + " " + "روز";
-        if (hours > 0)
+		if (hours > 0)
-            if (message == "")
+			if (message == "")
-                message += hours + " " + "ساعت";
+				message += hours + " " + "ساعت";
-            else
+			else
-                message += " و " + hours + " " + "ساعت";
+				message += " و " + hours + " " + "ساعت";
-        if (minutes > 0)
+		if (minutes > 0)
-            if (message == "")
+			if (message == "")
-                message += minutes + " " + "دقیقه";
+				message += minutes + " " + "دقیقه";
-            else
+			else
-                message += " و " + minutes + " " + "دقیقه";
+				message += " و " + minutes + " " + "دقیقه";
 
-        if (message == "")
+		if (message == "")
-            message = emptyValue;
+			message = emptyValue;
-        return message;
+		return message;
-    }
+	}
 
-    public static bool ArePropertiesEqual<T>(this T obj1, T obj2)
+	public static bool ArePropertiesEqual<T>(this T obj1, T obj2)
     {
         // If either object is null, they can't be equal
         if (obj1 == null || obj2 == null)
@@ -1893,44 +1873,5 @@ public static class Tools
         return true;
     }
 
-    #endregion
-
-    #region Davoodi
-
-    public static List<string> GetDaysBetweenDateGeorgian(DateTime startDate, DateTime? endDate)
-    {
-        var days = new List<string>();
-
-        if (endDate == null)
-            endDate = DateTime.Now;
-
-        var persianStartDate = new MD.PersianDateTime.Standard.PersianDateTime(startDate);
-        var persianEndDate = new MD.PersianDateTime.Standard.PersianDateTime(endDate);
-
-
-        while (persianEndDate - persianStartDate >= TimeSpan.FromDays(0))
-        {
-            days.Add(persianStartDate.ToShortDateString());
-            persianStartDate = persianStartDate.AddDays(1);
-        }
-
-        return days;
-    }
-
-    public static int GetWorkingDaysDifference(DateTime? fromDate, DateTime? toDate)
-    {
-        //var workingDays = PersianDateExtensions.GetWorkingDays(new PersianDateTime(fromDate.ToFarsi()), new PersianDateTime(toDate.ToFarsi()), true);
-        var workingDays = PersianDateExtensions.GetWorkingDays((DateTime)fromDate, (DateTime)toDate, true);
-
-
-        if (fromDate > toDate)
-            workingDays *= -1;
-
-
-        return workingDays;
-    }
-
-
-
     #endregion
 }

0_Framework/Application/UID/UidService.cs

@@ -32,22 +32,20 @@ public class UidService : IUidService
         var json = JsonConvert.SerializeObject(request);
         var contentType = new StringContent(json, Encoding.UTF8, "application/json");
 
-       var requestResult = await _httpClient.PostAsync("person/v2", contentType);
         try
         {
+            var requestResult = await _httpClient.PostAsync("person/v2", contentType);
             if (!requestResult.IsSuccessStatusCode)
                 return null;
             var responseResult = await requestResult.Content.ReadFromJsonAsync<PersonalInfoResponse>();
-            if (responseResult.BasicInformation != null)
+            responseResult.BasicInformation.FirstName = responseResult.BasicInformation.FirstName.ToPersian();
-            {
+            responseResult.BasicInformation.LastName = responseResult.BasicInformation.LastName.ToPersian();
-                responseResult.BasicInformation.FirstName = responseResult.BasicInformation.FirstName?.ToPersian();
+            responseResult.BasicInformation.FatherName = responseResult.BasicInformation.FatherName.ToPersian();
-                responseResult.BasicInformation.LastName = responseResult.BasicInformation.LastName?.ToPersian();
+
-                responseResult.BasicInformation.FatherName = responseResult.BasicInformation.FatherName?.ToPersian();
-            }
 
             return responseResult;
         }
-        catch 
+        catch (Exception)
         {
 
             return null;
@@ -65,12 +63,19 @@ public class UidService : IUidService
         };
         var json = JsonConvert.SerializeObject(request);
         var contentType = new StringContent(json, Encoding.UTF8, "application/json");
+        try
+        {
+            var requestResult = await _httpClient.PostAsync("mobile/owner/v2", contentType);
+            if (!requestResult.IsSuccessStatusCode)
+                return null;
 
-        var requestResult = await _httpClient.PostAsync("mobile/owner/v2", contentType);
+            var responseResult = await requestResult.Content.ReadFromJsonAsync<MatchMobileWithNationalCodeResponse>();
-        if (!requestResult.IsSuccessStatusCode)
+            return responseResult;
+        }
+        catch (Exception e)
+        {
             return null;
+        }
 
-        var responseResult = await requestResult.Content.ReadFromJsonAsync<MatchMobileWithNationalCodeResponse>();
-        return responseResult;
     }
 }

0_Framework/Application/UserType.cs

@@ -8,8 +8,7 @@ namespace _0_Framework.Application
         Client,
         SubAccount,
         Camera,
-        Admin,
+        Admin
-        System
     }
 
 }

0_Framework/Domain/CustomizeCheckoutShared/Base/BaseCustomizeEntity.cs

@@ -1,6 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
 using Microsoft.EntityFrameworkCore.Design.Internal;
@@ -14,7 +12,8 @@ public class BaseCustomizeEntity : EntityBase
     }
     public BaseCustomizeEntity(FridayPay fridayPay, OverTimePay overTimePay,
         BaseYearsPay baseYearsPay, BonusesPay bonusesPay, NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
-        FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, BreakTime breakTime,int leavePermittedDays,List<WeeklyOffDay> weeklyOffDays)
+        FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
+        FridayWork fridayWork, HolidayWork holidayWork, BreakTime breakTime,int leavePermittedDays)
     {
 
         FridayPay = fridayPay;
@@ -30,10 +29,10 @@ public class BaseCustomizeEntity : EntityBase
         FineAbsenceDeduction = fineAbsenceDeduction;
         LateToWork = lateToWork;
         EarlyExit = earlyExit;
+        FridayWork = fridayWork;
         HolidayWork = holidayWork;
         BreakTime = breakTime;
         LeavePermittedDays = leavePermittedDays;
-        WeeklyOffDays = weeklyOffDays.Select(x=> new WeeklyOffDay(x.DayOfWeek)).ToList();
     }
 
     /// <summary>
@@ -118,28 +117,4 @@ public class BaseCustomizeEntity : EntityBase
 
 
 	public BreakTime BreakTime { get; protected set; }
-
-	public List<WeeklyOffDay> WeeklyOffDays { get; set; }
-
-	public void FridayWorkToWeeklyDayOfWeek()
-	{
-		if (FridayWork == FridayWork.Default && !WeeklyOffDays.Any(x => x.DayOfWeek == DayOfWeek.Friday))
-		{
-            WeeklyOffDays.Add(new WeeklyOffDay(DayOfWeek.Friday));
-		}
-            
-
-	}
-}
-
-public class WeeklyOffDay
-{
-	public WeeklyOffDay(DayOfWeek dayOfWeek)
-	{
-		DayOfWeek = dayOfWeek;
-	}
-
-	public long Id { get; set; }
-	public DayOfWeek DayOfWeek { get; set; }
-	public long ParentId { get; set; }
 }

AccountManagement.Application.Contracts/Account/AccountSelectListViewModel.cs

@@ -1,9 +0,0 @@
-namespace AccountManagement.Application.Contracts.Account;
-
-public class AccountSelectListViewModel
-{
-    public long Id { get; set; }
-    public string Name { get; set; }
-
-    public long RoleId { get; set; }
-}

AccountManagement.Application.Contracts/Account/IAccountApplication.cs

@@ -41,8 +41,6 @@ public interface IAccountApplication
     List<AccountViewModel> GetAccountsByPositionId(long positionId);
 
     List<AccountViewModel> GetAccountEqualToLowerPositionValue();
-    Task<List<AccountSelectListViewModel>> GetAdminSelectList();
-
     OperationResult ReLogin();
 
     #endregion
@@ -57,11 +55,4 @@ public interface IAccountApplication
 	#endregion
 
 	OperationResult DirectCameraLogin(long cameraAccountId);
-
-    /// <summary>
-    /// چک میکند که آیا اکانتی با این نام کاربری وجود دارد یا نه
-    /// </summary>
-    /// <param name="userName"></param>
-    /// <returns></returns>
-    public bool CheckExistClientAccount(string userName);
 }

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

AccountManagement.Application.Contracts/Task/CreateTask.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using IPE.SmsIrClient.Models.Results;
 using Microsoft.AspNetCore.Http;
 
 namespace AccountManagement.Application.Contracts.Task;
@@ -20,9 +19,9 @@ public class CreateTask
     #region Task Schedule
 
     public string ScheduleCount { get; set; }
-    public TaskScheduleType ScheduleType { get; set; }
+    public string ScheduleType{ get; set; }
     public bool HasSchedule { get; set; }
-    public TaskScheduleUnitType ScheduleUnitType { get; set; }
+    public string ScheduleUnitType { get; set; }
     public string ScheduleUnitNumber { get; set; }
     public long TaskScheduleId { get; set; }
     
@@ -31,18 +30,4 @@ public class CreateTask
 
 
 
-}
-
-public enum TaskScheduleType
-{
-    Limited,
-    Unlimited
-}
-
-public enum TaskScheduleUnitType
-{
-    Day,
-    Week,
-    Month,
-    Year
 }

AccountManagement.Application.Contracts/Task/EditTask.cs

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

AccountManagement.Application.Contracts/Task/ITaskApplication.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using _0_Framework.Application;
 using AccountManagement.Application.Contracts.Assign;
 using AccountManagement.Application.Contracts.TaskMessage;
@@ -25,13 +24,6 @@ public interface ITaskApplication
     List<TaskViewModel> GetSentTasks(TaskSearchModel searchModel);
     List<TaskViewModel> GetTasksHaveTicket(TaskSearchModel searchModel);
 
-    /// <summary>
-    /// لیست تسک های دوره ای ایجاد شده توسط کاربر
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    List<TaskViewModel> GetTaskScheduleList(TaskSearchModel searchModel);
-
     // گرفتن مهلت برای یک وظیفه
     OperationResult CreateRequestTime(CreateTaskTimeRequest command);
     List<TaskViewModel> GetRequestTaskHasTicket(TaskSearchModel searchModel);
@@ -54,10 +46,10 @@ public interface ITaskApplication
     OperationResult CreateTaskByPosition(CreateTask command, List<long> positionIds);
     List<TaskViewModel> GetRequestedTasks(TaskSearchModel searchModel);
     List<TaskViewModel> AllRequestedTasks(TaskSearchModel searchModel);
-    Task<int> GetRequestedTasksCount();
+    int GetRequestedTasksCount();
 
-    Task<int> TasksHaveTicketCounts(long userId);
+    int TasksHaveTicketCounts(long userId);
-    Task<int> TasksHaveTicketRequestsCount(long userId);
+    int TasksHaveTicketRequestsCount(long userId);
 
     List<TaskMessageViewModel> GetTaskMessages(long assignId);
 
@@ -71,14 +63,16 @@ public interface ITaskApplication
 
     List<AssignViewModel> GetAssignsByTaskId(long taskId);
 
-    Task<int> RequestedAndOverdueTasksCount(long userId);
+    int RequestedAndOverdueTasksCount(long userId);
 
-    ///  <summary>
+    /// <summary>
-    /// تعداد تسک های شخصی و دریافتی برای امروز و یا عقب افتاده
+    ///تعداد تسک های شخصی و دریافتی برای امروز و یا عقب افتاده
-    ///  </summary>
+    /// </summary>
-    ///  <param name="userId"></param>
+    /// <param name="userId"></param>
-    ///  <returns></returns>
+    /// <returns></returns>
-    Task<int> OverdueTasksCount(long userId);
+    int OverdueTasksCount(long userId);
 
 
-}
+    //متد انتقال داده از تسک به ارجاعی ها
+    //OperationResult MoveDataFRomTaskToAssign();
+}

AccountManagement.Application.Contracts/Task/TaskViewModel.cs

@@ -48,10 +48,7 @@ public class TaskViewModel
     public bool CanDelete { get; set; }
     public bool CanAssign { get; set; }
     public bool CanCheckRequests { get; set; }
-    public bool HasRequest { get; set; }
     public AssignViewModel AssignedReceiverViewModel { get; set; }
 
-    public TaskScheduleType ScheduleType { get; set; }
+
-    public TaskScheduleUnitType ScheduleUnitType { get; set; }
-    public long TaskScheduleId { get; set; }
 }

AccountManagement.Application.Contracts/TaskSchedule/ITaskScheduleApplication.cs

@@ -1,6 +1,4 @@
-using System;
+using _0_Framework.Application;
-using System.Threading.Tasks;
-using _0_Framework.Application;
 using AccountManagement.Application.Contracts.Task;
 
 namespace AccountManagement.Application.Contracts.TaskSchedule;
@@ -8,8 +6,7 @@ namespace AccountManagement.Application.Contracts.TaskSchedule;
 public interface ITaskScheduleApplication
 {
     OperationResult Create(CreateTask command);
+    OperationResult CreateLimitedTasks(CreateTask command);
+    OperationResult CreateUnlimitedTasks(CreateTask command);
 
-    Task<TaskScheduleDetailsViewModel> GetDetails(long id);
-
-    OperationResult Remove(long taskScheduleId);
 }

AccountManagement.Application.Contracts/TaskSchedule/TaskScheduleDetailsViewModel.cs

@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using AccountManagement.Application.Contracts.Media;
-using AccountManagement.Application.Contracts.Task;
-
-namespace AccountManagement.Application.Contracts.TaskSchedule;
-
-public class TaskScheduleDetailsViewModel
-{
-    public string SenderName { get; set; }
-    public List<string> AssignedName { get; set; }
-    public TaskScheduleType TaskScheduleType { get; set; }
-    public TaskScheduleUnitType TaskScheduleUnitType { get; set; }
-    public string UnitNumber { get; set; }
-    public string CreationDateFa { get; set; }
-    public string ContractingPartyName { get; set; }
-    public string Title { get; set; }
-    public string Description { get; set; }
-    public string Count { get; set; }
-    public string FirstEndTaskDate { get; set; }
-    public List<MediaViewModel> Medias { get; set; }
-
-}

AccountManagement.Application/AccountApplication.cs

@@ -308,7 +308,7 @@ public class AccountApplication : IAccountApplication
 			{
 				Slug = _passwordHasher.SlugHasher(x.WorkshopId),
 				Name = x.WorkshopName,
-				PersonnelCount = x.PersonnelCount,
+				PersonnelCount = 0,
 				Id = x.WorkshopId
 			}).ToList();
 
@@ -549,8 +549,7 @@ public class AccountApplication : IAccountApplication
 		return operation.Succcedded(2);
     }
 
-  
+	public AccountLeftWorkViewModel WorkshopList(long accountId)
-    public AccountLeftWorkViewModel WorkshopList(long accountId)
     {
         string fullname = this._accountRepository.GetById(accountId).Fullname;
         List<WorkshopAccountlistViewModel> source =_accountLeftworkRepository.WorkshopList(accountId);
@@ -627,10 +626,7 @@ public class AccountApplication : IAccountApplication
 
     }
 
-    public async Task<List<AccountSelectListViewModel>> GetAdminSelectList()
+
-    {
-        return await _accountRepository.GetAdminSelectList();
-    }
 
     #endregion
     #region Pooya
@@ -789,10 +785,4 @@ public class AccountApplication : IAccountApplication
     //}
     #endregion
 
-
-    public bool CheckExistClientAccount(string userName)
-    {
-        return _accountRepository.CheckExistClientAccount(userName);
-    }
-
 }

AccountManagement.Application/SubAccountApplication.cs

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

@@ -16,7 +16,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 
 
 namespace AccountManagement.Application;
@@ -509,11 +508,6 @@ public class TaskApplication : ITaskApplication
         return _taskRepository.GetTasksHaveTicket(searchModel);
     }
 
-    public List<TaskViewModel> GetTaskScheduleList(TaskSearchModel searchModel)
-    {
-        return _taskRepository.GetTaskScheduleList(searchModel);
-    }
-
     //ساخت درخواست مهلت
     public OperationResult CreateRequestTime(CreateTaskTimeRequest command)
     {
@@ -595,9 +589,6 @@ public class TaskApplication : ITaskApplication
         {
             return operation.Failed("تاریخی برای درخواست وظیفه ثبت نشده است");
         }
-
-     
-        
         assign.AcceptTimeRequest();
         message = string.IsNullOrWhiteSpace(message) ? "درخواست شما مورد تایید قرار گرفت" : message;
         var messageEntity = new TaskMessage(message, "تایید درخواست مهلت", assign.id);
@@ -622,7 +613,6 @@ public class TaskApplication : ITaskApplication
         {
             return operation.Failed("چنین وظیفه ای درخواستی برای مهلت ندارد");
         }
-
         assign.RejectTimeRequest();
         if (assign.EndTaskDate.Date <= DateTime.Now.Date)
         {
@@ -875,14 +865,14 @@ public class TaskApplication : ITaskApplication
         return _taskRepository.AllRequestedTasks(searchModel);
     }
 
-    public async Task<int> TasksHaveTicketCounts(long userId)
+    public int TasksHaveTicketCounts(long userId)
     {
-        return await _taskRepository.TasksHaveTicketCounts(userId);
+        return _taskRepository.TasksHaveTicketCounts(userId);
     }
 
-    public async Task<int> TasksHaveTicketRequestsCount(long userId)
+    public int TasksHaveTicketRequestsCount(long userId)
     {
-        return await _taskRepository.TasksHaveTicketRequestsCount(userId);
+        return _taskRepository.TasksHaveTicketRequestsCount(userId);
     }
 
 
@@ -891,9 +881,9 @@ public class TaskApplication : ITaskApplication
         return _taskMessageRepository.GetTaskMessages(assignId);
     }
 
-    public async Task<int> GetRequestedTasksCount()
+    public int GetRequestedTasksCount()
     {
-        return await _taskRepository.GetRequestedTasksCount();
+        return _taskRepository.GetRequestedTasksCount();
     }
 
     public OperationResult ChangeRequestTimeAndAccept(string time, long taskId, long assignedId, string message)
@@ -1017,15 +1007,15 @@ public class TaskApplication : ITaskApplication
         return _assignRepository.GetAssignsByTaskId(taskId);
     }
 
-    public async Task<int> RequestedAndOverdueTasksCount(long userId)
+    public int RequestedAndOverdueTasksCount(long userId)
     {
-        return await _taskRepository.RequestedAndOverdueTasksCount(userId);
+        return _taskRepository.RequestedAndOverdueTasksCount(userId);
 
     }
 
-    public async Task<int> OverdueTasksCount(long userId)
+    public int OverdueTasksCount(long userId)
     {
-        return await _taskRepository.OverdueTasksCount(userId);
+        return _taskRepository.OverdueTasksCount(userId);
     }
 
     //public OperationResult MoveDataFRomTaskToAssign()

AccountManagement.Application/TaskScheduleApplication.cs

@@ -4,355 +4,222 @@ using AccountManagement.Application.Contracts.TaskSchedule;
 using AccountManagement.Domain.TaskScheduleAgg;
 using System;
 using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Transactions;
-using AccountManagement.Domain.TaskAgg;
 using Company.Domain.HolidayItemAgg;
 
 namespace AccountManagement.Application;
 
 public class TaskScheduleApplication : ITaskScheduleApplication
 {
-    private readonly ITaskApplication _taskApplication;
+	private readonly ITaskApplication _taskApplication;
-    private readonly ITaskScheduleRepository _taskScheduleRepository;
+	private readonly ITaskScheduleRepository _taskScheduleRepository;
-    private readonly IHolidayItemRepository _holidayItemRepository;
+	private readonly IHolidayItemRepository _holidayItemRepository;
-    private readonly ITaskRepository _taskRepository;
-    public TaskScheduleApplication(ITaskApplication taskApplication, ITaskScheduleRepository taskScheduleRepository, IHolidayItemRepository holidayItemRepository, ITaskRepository taskRepository)
-    {
-        _taskApplication = taskApplication;
-        _taskScheduleRepository = taskScheduleRepository;
-        _holidayItemRepository = holidayItemRepository;
-        _taskRepository = taskRepository;
-    }
 
-    public OperationResult Create(CreateTask command)
+	public TaskScheduleApplication(ITaskApplication taskApplication, ITaskScheduleRepository taskScheduleRepository, IHolidayItemRepository holidayItemRepository)
-    {
+	{
-        OperationResult operation = new OperationResult();
+		_taskApplication = taskApplication;
+		_taskScheduleRepository = taskScheduleRepository;
+		_holidayItemRepository = holidayItemRepository;
+	}
+
+	public OperationResult Create(CreateTask command)
+	{
+		OperationResult operation = new OperationResult();
 
 
-        if (command.HasSchedule)
+		if (command.HasSchedule)
-        {
+		{
-            switch (command.ScheduleType)
+			switch (command.ScheduleType)
-            {
+			{
-                case TaskScheduleType.Limited:
+				case "limited":
-                    if (Convert.ToInt32(command.ScheduleCount) > 60)
+					if (Convert.ToInt32(command.ScheduleCount) > 60)
-                    {
+					{
-                        return operation.Failed("تعداد وارد شده بیشتر از حد مجاز است");
+						return operation.Failed("تعداد وارد شده بیشتر از حد مجاز است");
-                    }
+					}
-                    return CreateLimitedTasks(command);
+					return CreateLimitedTasks(command);
-                    break;
+					break;
 
-                case TaskScheduleType.Unlimited:
+				case "unlimited":
-                    return CreateUnlimitedTasks(command);
+					return CreateUnlimitedTasks(command);
-                    break;
+					break;
 
-                default:
+				default:
-                    return operation.Failed("نوع وظیفه محول شده مشخص نمیباشد");
+					return operation.Failed("خطای سیستمی!");
 
-            }
+			}
-        }
+		}
-        else
+		else
-        {
+		{
-            return operation.Failed("این تسک بصورت دوره ای نمیباشد");
+			return operation.Failed("این تسک بصورت زمان بندی شده نمیباشد");
-        }
+		}
-    }
+	}
 
-    public async Task<TaskScheduleDetailsViewModel> GetDetails(long id)
+	public OperationResult CreateLimitedTasks(CreateTask command)
-    {
+	{
-        return await _taskScheduleRepository.GetDetails(id);
+		OperationResult operation = new OperationResult();
-    }
+		if (Convert.ToInt32(command.ScheduleCount) < 1 || string.IsNullOrWhiteSpace(command.ScheduleCount))
+		{
+			return operation.Failed("تعداد وارد شده باید بیشتر از 2 باشد");
+		}
 
-    public OperationResult Remove(long taskScheduleId)
+		switch (command.ScheduleUnitType)
-    {
+		{
-        var op = new OperationResult();
+			case "year":
-        var taskSchedule = _taskScheduleRepository.Get(taskScheduleId);
+				if (Convert.ToInt32(command.ScheduleCount) != 1)
-        if (taskSchedule == null)
+				{
-            return op.Failed("وظیفه مورد نظر یافت نشد");
+					return operation.Failed("دوره نمیتواند بیشتر از 1 سال باشد");
-        var tasks = _taskRepository.GetTasksByTaskScheduleId(taskScheduleId);
+				}
-        var assigns = tasks.SelectMany(x => x.Assigns);
+				break;
-        if (assigns.Any(x => x.IsCanceledRequest || x.IsDone || x.IsCancel || x.TimeRequest || x.AcceptedTimeRequest > 0))
+			case "month":
-        {
+				if (Convert.ToInt32(command.ScheduleCount) > 12)
-            taskSchedule.DeActive();
+				{
+					return operation.Failed("بازه وارد شده نا معتبر است");
+				}
+				break;
+			case "week":
+				if (command.ScheduleUnitNumber != "first" && command.ScheduleUnitNumber != "last")
+				{
+					return operation.Failed("بازه وارد شده نا معتبر است");
+				}
+				break;
+			case "day":
+				if (Convert.ToInt32(command.ScheduleUnitNumber) > 29)
+				{
+					return operation.Failed("بازه وارد شده نا معتبر است");
+				}
+				break;
+			default:
+				return operation.Failed("نوع بازه مشخص نمیباشد");
+				break;
 
-            var removableTask = tasks.Where(x=>x.Assigns.All(a=>a.IsDone==false && a.IsCancel == false)).ToList();
+		}
-            _taskRepository.RemoveRange(removableTask);
+		try
-            
+		{
-        }
+			DateTime previousDateRaw = command.EndTaskDate.ToEndDayOfGeorgianDateTime();
-        else
+			DateTime previousDateEdited = command.EndTaskDate.ToEndDayOfGeorgianDateTime();
-        {
-            _taskScheduleRepository.Remove(taskSchedule);
-            _taskRepository.RemoveRange(tasks);
-        }
-        _taskRepository.SaveChanges();
-        return op.Succcedded();
-    }
 
-    private OperationResult CreateLimitedTasks(CreateTask command)
+			int count = Convert.ToInt32(command.ScheduleCount);
-    {
+			bool isInt = int.TryParse(command.ScheduleUnitNumber, out int unitNumber);
-        OperationResult operation = new OperationResult();
+			string kindOfWeekUnit = isInt ? "" : command.ScheduleUnitNumber;
-        if (Convert.ToInt32(command.ScheduleCount) < 1 || string.IsNullOrWhiteSpace(command.ScheduleCount))
+			var taskSchedule = new TaskSchedule(command.ScheduleCount, command.ScheduleType, command.ScheduleUnitType,
-        {
+				command.ScheduleUnitNumber, previousDateEdited);
-            return operation.Failed("تعداد وارد شده باید بیشتر از 2 باشد");
+			_taskScheduleRepository.Create(taskSchedule);
-        }
+			_taskScheduleRepository.SaveChanges();
-        if (string.IsNullOrWhiteSpace(command.ScheduleUnitNumber))
+			command.TaskScheduleId = taskSchedule.id;
-        {
-            return operation.Failed("لطفا تعداد بازه خود را مشخص کنید");
-        }
 
-        switch (command.ScheduleUnitType)
+			switch (command.ScheduleUnitType)
-        {
+			{
-            case TaskScheduleUnitType.Year:
+				case "year":
-                if (Convert.ToInt32(command.ScheduleCount) != 1)
+					for (int i = 1; i <= count; i++)
-                {
+					{
-                    return operation.Failed("دوره نمیتواند بیشتر از 1 سال باشد");
+						command.EndTaskDate = previousDateEdited.ToFarsi();
-                }
+						operation = _taskApplication.CreateTask(command);
-                break;
+						taskSchedule.SetLastEndTaskDate(previousDateEdited);
-            case TaskScheduleUnitType.Month:
 
-                if (Convert.ToInt32(command.ScheduleUnitNumber) is > 12 or < 1)
+						bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
-                {
+						while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
-                    return operation.Failed("بازه وارد شده نا معتبر است");
+						{
-                }
+							previousDateEdited = previousDateRaw.AddDays(1);
+							isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
 
-                if (Convert.ToInt32(command.ScheduleCount) is > 60 or < 1)
+						}
-                {
+						previousDateRaw = previousDateRaw.AddYears(unitNumber);
-                    return operation.Failed("تعداد دفعات وارد شده نامعتبر است");
+						previousDateEdited = previousDateRaw;
-                }
-                break;
-            case TaskScheduleUnitType.Week:
-                if (command.ScheduleUnitNumber != "first" && command.ScheduleUnitNumber != "last")
-                {
-                    return operation.Failed("بازه وارد شده نا معتبر است");
-                }
-                break;
-            case TaskScheduleUnitType.Day:
-                if (Convert.ToInt32(command.ScheduleUnitNumber) is > 29 or < 1)
-                {
-                    return operation.Failed("بازه وارد شده نا معتبر است");
-                }
-                break;
-            default:
-                return operation.Failed("نوع بازه مشخص نمیباشد");
-                break;
 
-        }
+					}
-        try
+					break;
-        {
-            //using var transaction = new TransactionScope();
-            DateTime previousDateRaw = command.EndTaskDate.ToEndDayOfGeorgianDateTime();
-            DateTime previousDateEdited = command.EndTaskDate.ToEndDayOfGeorgianDateTime();
-            var day = Convert.ToInt32(command.EndTaskDate.Substring(8, 2));
-            var month = Convert.ToInt32(command.EndTaskDate.Substring(5, 2));
-            var year = Convert.ToInt32(command.EndTaskDate.Substring(0, 4));
 
-            int count = Convert.ToInt32(command.ScheduleCount);
+				case "month":
-            bool isInt = int.TryParse(command.ScheduleUnitNumber, out int unitNumber);
+					for (int i = 1; i <= count; i++)
-            string kindOfWeekUnit = isInt ? "" : command.ScheduleUnitNumber;
+					{
-            var taskSchedule = new TaskSchedule(command.ScheduleCount, command.ScheduleType, command.ScheduleUnitType,
+						command.EndTaskDate = previousDateEdited.ToFarsi();
-                command.ScheduleUnitNumber, previousDateEdited);
+						operation = _taskApplication.CreateTask(command);
-            _taskScheduleRepository.Create(taskSchedule);
+						taskSchedule.SetLastEndTaskDate(previousDateEdited);
-            _taskScheduleRepository.SaveChanges();
+						bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
-            command.TaskScheduleId = taskSchedule.id;
+						while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
+						{
+							previousDateEdited = previousDateRaw.AddDays(1);
+							isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
 
-            switch (command.ScheduleUnitType)
+						}
-            {
+						previousDateRaw = previousDateRaw.AddMonths(unitNumber);
-                case TaskScheduleUnitType.Year:
+						previousDateEdited = previousDateRaw;
-                    for (int i = 1; i <= count; i++)
-                    {
-                        command.EndTaskDate = previousDateEdited.ToFarsi();
-                        operation = _taskApplication.CreateTask(command);
-                        taskSchedule.SetLastEndTaskDate(previousDateEdited);
 
-                        bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
+					}
-                        while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
+					break;
-                        {
-                            previousDateEdited = previousDateRaw.AddDays(1);
-                            isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
-                        }
-                        previousDateRaw = previousDateRaw.AddYears(unitNumber);
-                        previousDateEdited = previousDateRaw;
-                    }
-                    break;
 
-                case TaskScheduleUnitType.Month:
+				case "week":
-                    bool endOfMonth = day == 31;
+					for (int i = 1; i <= count; i++)
+					{
+						if (string.IsNullOrWhiteSpace(kindOfWeekUnit))
+						{
+							throw new InvalidDataException();
+						}
 
-                    if (endOfMonth)
+						command.EndTaskDate = kindOfWeekUnit switch
-                    {
+						{
-                        for (int i = 1; i <= count; i++)
+							"first" => previousDateRaw.GetNextDayOfWeek(DayOfWeek.Saturday).ToFarsi(),
-                        {
+							"last" => previousDateRaw.GetNextDayOfWeek(DayOfWeek.Thursday).ToFarsi(),
-                            command.EndTaskDate = previousDateEdited.ToFarsi();
+							_ => throw new InvalidDataException()
-                            operation = _taskApplication.CreateTask(command);
+						};
-                            taskSchedule.SetLastEndTaskDate(previousDateEdited);
+						operation = _taskApplication.CreateTask(command);
-                            if (month >= 12)
+						taskSchedule.SetLastEndTaskDate(previousDateEdited);
-                            {
+						bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
-                                var extra = month - 12;
+						while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
-                                year++;
+						{
-                                month = extra + unitNumber;
+							previousDateEdited = previousDateRaw.AddDays(1);
-                            }
+							isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
-                            else
-                            {
-                                month = unitNumber + month;
-                            }
-                            previousDateRaw = $"{year:0000}/{month:00}/01".FindeEndOfMonth().ToGeorgianDateTime();
-                            bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
-                            while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
-                            {
-                                previousDateEdited = previousDateRaw.AddDays(1);
-                                isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
 
-                            }
+						}
+						previousDateRaw = command.EndTaskDate.ToGeorgianDateTime();
+						previousDateEdited = previousDateRaw;
 
 
+					}
+					break;
 
-                            previousDateEdited = previousDateRaw;
+				case "day":
 
-                        }
+					for (int i = 1; i <= count; i++)
-                    }
+					{
-                    else
+						command.EndTaskDate = previousDateEdited.ToFarsi();
-                    {
+						operation = _taskApplication.CreateTask(command);
-                        for (int i = 1; i < count; i++)
+						taskSchedule.SetLastEndTaskDate(previousDateEdited);
-                        {
+						previousDateRaw = previousDateRaw.AddDays(unitNumber);
-                            command.EndTaskDate = previousDateEdited.ToFarsi();
+						bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
-                            operation = _taskApplication.CreateTask(command);
+						while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
-                            taskSchedule.SetLastEndTaskDate(previousDateEdited);
+						{
-                            var endDay = 0;
+							previousDateEdited = previousDateRaw.AddDays(1);
+							isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
 
-                            if (month >= 12)
+						}
-                            {
-                                var extra = month - 12;
-                                year++;
-                                month = extra + unitNumber;
 
-                            }
+						previousDateEdited = previousDateRaw;
-                            else
+					}
-                            {
+					break;
-                                month = unitNumber + month;
-                            }
 
-                            if (day == 30)
+			}
-                            {
+			_taskScheduleRepository.SaveChanges();
-                                if (month == 12)
+			operation = operation.Succcedded();
-                                {
+			return operation;
-                                    var lastYearDay = Convert.ToInt32($"{year:0000}/{month:00}/1".FindeEndOfMonth()
+		}
-                                        .Substring(8, 2));
+		catch (Exception e)
-                                    endDay = lastYearDay == 30 ? lastYearDay : 29;
+		{
-                                }
+			return operation.Failed(e.ToString());
+		}
+	}
 
-                            }
+	public OperationResult CreateUnlimitedTasks(CreateTask command)
+	{
+		var operation = _taskApplication.CreateTask(command);
+		if (!operation.IsSuccedded)
+			return operation;
+		var lastDate = command.EndTaskDate.ToGeorgianDateTime();
+		var taskSchedule = new TaskSchedule(command.ScheduleCount, command.ScheduleType, command.ScheduleUnitType,
+			command.ScheduleUnitNumber, lastDate);
+		_taskScheduleRepository.Create(taskSchedule);
+		_taskScheduleRepository.SaveChanges();
+		return operation.Succcedded();
 
-                            previousDateEdited = endDay == 0
+	}
-                                ? $"{year:0000}/{month:00}/{day:00}".ToGeorgianDateTime()
-                                : $"{year:0000}/{month:00}/{endDay:00}".ToGeorgianDateTime();
-                        }
-
-
-                        //for (int i = 1; i <= count; i++)
-                        //{
-                        //    command.EndTaskDate = previousDateEdited.ToFarsi();
-                        //    operation = _taskApplication.CreateTask(command);
-                        //    taskSchedule.SetLastEndTaskDate(previousDateEdited);
-                        //    previousDateRaw = $"{year:0000}/{month:00}/01".FindeEndOfMonth().ToGeorgianDateTime();
-                        //    bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
-                        //    while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
-                        //    {
-                        //        previousDateEdited = previousDateRaw.AddDays(1);
-                        //        isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
-
-                        //    }
-                        //    previousDateEdited = previousDateRaw;
-
-                        //}
-                    }
-
-                    break;
-
-                case TaskScheduleUnitType.Week:
-                    for (int i = 1; i <= count; i++)
-                    {
-                        if (string.IsNullOrWhiteSpace(kindOfWeekUnit))
-                        {
-                            throw new InvalidDataException();
-                        }
-
-                        command.EndTaskDate = kindOfWeekUnit switch
-                        {
-                            "first" => previousDateRaw.GetNextDayOfWeek(DayOfWeek.Saturday).ToFarsi(),
-                            "last" => previousDateRaw.GetNextDayOfWeek(DayOfWeek.Thursday).ToFarsi(),
-                            _ => throw new InvalidDataException()
-                        };
-                        operation = _taskApplication.CreateTask(command);
-                        taskSchedule.SetLastEndTaskDate(previousDateEdited);
-                        bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
-                        while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
-                        {
-                            previousDateEdited = previousDateRaw.AddDays(1);
-                            isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
-
-                        }
-                        previousDateRaw = command.EndTaskDate.ToGeorgianDateTime();
-                        previousDateEdited = previousDateRaw;
-
-
-                    }
-                    break;
-
-                case TaskScheduleUnitType.Day:
-
-                    for (int i = 1; i <= count; i++)
-                    {
-                        command.EndTaskDate = previousDateEdited.ToFarsi();
-                        operation = _taskApplication.CreateTask(command);
-                        taskSchedule.SetLastEndTaskDate(previousDateEdited);
-                        previousDateRaw = previousDateRaw.AddDays(unitNumber);
-                        bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
-                        while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
-                        {
-                            previousDateEdited = previousDateRaw.AddDays(1);
-                            isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
-
-                        }
-
-                        previousDateEdited = previousDateRaw;
-                    }
-                    break;
-
-            }
-            _taskScheduleRepository.SaveChanges();
-            //transaction.Complete();
-            operation = operation.Succcedded();
-            return operation;
-        }
-        catch (Exception e)
-        {
-            return operation.Failed(e.ToString());
-        }
-    }
-
-    private OperationResult CreateUnlimitedTasks(CreateTask command)
-    {
-        using var transaction = new TransactionScope();
-
-        var lastDate = command.EndTaskDate.ToGeorgianDateTime();
-
-        var taskSchedule = new TaskSchedule(command.ScheduleCount, command.ScheduleType, command.ScheduleUnitType,
-            command.ScheduleUnitNumber, lastDate);
-
-        _taskScheduleRepository.Create(taskSchedule);
-        _taskScheduleRepository.SaveChanges();
-
-        command.TaskScheduleId = taskSchedule.id;
-
-        var operation = _taskApplication.CreateTask(command);
-        if (!operation.IsSuccedded)
-            return operation;
-
-
-        _taskScheduleRepository.SaveChanges();
-        transaction.Complete();
-        return operation.Succcedded();
-
-    }
 
 }

AccountManagement.Application/TaskSubjectApplication.cs

@@ -1,9 +1,7 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using _0_Framework.Application;
 using AccountManagement.Application.Contracts.TaskSubject;
 using AccountManagement.Domain.TaskSubjectAgg;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
 
 namespace AccountManagement.Application;
 

AccountManagement.Configuration/AccountManagementBootstrapper.cs

@@ -7,7 +7,6 @@ using AccountManagement.Application.Contracts.Role;
 using AccountManagement.Application.Contracts.SubAccount;
 using AccountManagement.Application.Contracts.SubAccountPermissionSubtitle;
 using AccountManagement.Application.Contracts.Task;
-using AccountManagement.Application.Contracts.TaskSchedule;
 using AccountManagement.Application.Contracts.TaskSubject;
 using AccountManagement.Application.Contracts.Ticket;
 using AccountManagement.Application.Contracts.TicketAccessAccount;
@@ -26,7 +25,6 @@ using AccountManagement.Domain.SubAccountPermissionSubtitle4Agg;
 using AccountManagement.Domain.SubAccountRoleAgg;
 using AccountManagement.Domain.TaskAgg;
 using AccountManagement.Domain.TaskMessageAgg;
-using AccountManagement.Domain.TaskScheduleAgg;
 using AccountManagement.Domain.TaskSubjectAgg;
 using AccountManagement.Domain.TicketAccessAccountAgg;
 using AccountManagement.Domain.TicketAgg;
@@ -64,8 +62,6 @@ namespace AccountManagement.Configuration
             services.AddScoped<ITaskRepository, TaskRepository>();
             services.AddTransient<ITaskApplication, TaskApplication>();
 
-            services.AddTransient<ITaskScheduleApplication, TaskScheduleApplication>();
-            services.AddTransient<ITaskScheduleRepository, TaskScheduleRepository>();
 
             services.AddTransient<ITaskSubjectRepository, TaskSubjectRepository>();
             services.AddTransient<ITaskSubjectApplication, TaskSubjectApplication>();

AccountManagement.Domain/AccountAgg/IAccountRepository.cs

@@ -27,21 +27,12 @@ namespace AccountManagement.Domain.AccountAgg
         List<AccountViewModel> GetAccountEqualToLowerPositionValue();
         AccountViewModel GetAccountViewModel(long id);
         List<AccountViewModel> GetAccountsDeactivePositionValue(long Positionid);
-        Task<List<AccountSelectListViewModel>> GetAdminSelectList();
-
         #endregion
 
         List<AccountViewModel> GetAdminAccountsNew();
 
         List<AccountViewModel> GetAccountsToEditWorkshop(long workshopId);
 
-        /// <summary>
-        /// چک میکند که اکانتی با این ام کاربری وجود دارد یا نه
-        /// </summary>
-        /// <param name="userName"></param>
-        /// <returns></returns>
-        public bool CheckExistClientAccount(string userName);
-
     }
 
 }

AccountManagement.Domain/AssignAgg/Assign.cs

@@ -8,7 +8,7 @@ namespace AccountManagement.Domain.AssignAgg;
 
 public class Assign : EntityBase
 {
-    public Assign(long taskId, long assignerId, long assignedId, int assignerPositionValue, string assignedName, int assignedPositionValue, DateTime endTaskDate, bool firstTimeCreation=false)
+    public Assign(long taskId, long assignerId, long assignedId, int assignerPositionValue, string assignedName, int assignedPositionValue, DateTime endTaskDate, bool firstTimeCreation = false)
     {
         TaskId = taskId;
         AssignerId = assignerId;
@@ -18,7 +18,7 @@ public class Assign : EntityBase
         AssignedPositionValue = assignedPositionValue;
         EndTaskDate = endTaskDate;
         FirstTimeCreation = firstTimeCreation;
-    }
+	}
 
 	//آیدی شخص ارسال کننده
 	public long TaskId { get; private set; }
@@ -52,9 +52,7 @@ public class Assign : EntityBase
 
     public string? DoneDescription { get; private set; }
     public bool IsCanceledRequest { get; private set; }
-
     public bool FirstTimeCreation { get; private set; }
-
 	public Tasks Task { get; set; }
     public List<TaskMessage> TaskMessageList { get; set; }
 
@@ -71,16 +69,14 @@ public class Assign : EntityBase
 
 	public void AcceptTimeRequest()
 	{
-        ClearRequests();
+		TimeRequest = false;
-        TimeRequest = false;
 		AcceptedTimeRequest++;
-        EndTaskDate = RequestDate < DateTime.Today ? DateTime.Today : RequestDate.Value;
+		EndTaskDate = RequestDate.Value;
 
-    }
+	}
 	public void RejectTimeRequest()
 	{
-        ClearRequests();
+		TimeRequest = false;
-        TimeRequest = false;
 		TimeRequestDescription = null;
 		RequestDate = null;
 	}
@@ -94,36 +90,31 @@ public class Assign : EntityBase
 	}
 	public void AcceptCancelRequest()
 	{
-        ClearRequests();
+		IsCanceledRequest = false;
-        IsCanceledRequest = false;
 		IsCancel = true;
 
 
 	}
 	public void RejectCancel()
 	{
-        ClearRequests();
+		CancelDescription = null;
-        CancelDescription = null;
 		IsCanceledRequest = false;
 	}
 
 	public void CompleteRequest(string? doneDescription)
 	{
-        ClearRequests();
+		DoneDescription = doneDescription;
-        DoneDescription = doneDescription;
 		IsDoneRequest = true;
 	}
 
 	public void RejectCompleteRequest()
 	{
-        ClearRequests();
+		IsDoneRequest = false;
-        IsDoneRequest = false;
 		DoneDescription = null;
 	}
 	public void Completed()
 	{
-        ClearRequests();
+		IsDoneRequest = false;
-        IsDoneRequest = false;
 		IsDone = true;
 	}
 
@@ -135,13 +126,6 @@ public class Assign : EntityBase
 		TimeRequest = false;
 	}
 
-    public void ClearRequests()
-    {
-        IsDoneRequest = false;
-        IsCanceledRequest = false;
-        TimeRequest = false;
-    }
-
 	public void InsertNewData(DateTime endTaskDate,bool timeRequest,int acceptedTimeRequest,DateTime? requestDate, string timeRequestDescription, bool isCanceledRequest,
 		bool isCancel,string cancelDescription,bool isDone,bool isDoneRequest,string? doneDescription)
 	{

AccountManagement.Domain/SubAccountAgg/ISubAccountRepository.cs

@@ -2,7 +2,6 @@
 using _0_Framework.Domain;
 using AccountManagement.Application.Contracts.SubAccount;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 
 namespace AccountManagement.Domain.SubAccountAgg
 {
@@ -14,6 +13,5 @@ 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,21 +13,17 @@ 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, List<long> workshopIds)
+        public SubAccountRole(string title, List<int> permissions, long accountId)
         {
             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;
@@ -36,12 +32,10 @@ namespace AccountManagement.Domain.SubAccountRoleAgg
         {
             RolePermissions.AddRange(permissionIds.Select(x => new SubAccountRolePermission(x, id)));
         }
-        public void Edit(string title, List<int> permissions,List<long> workshopIds)
+        public void Edit(string title, List<int> permissions)
         {
             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

@@ -1,16 +0,0 @@
-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/TaskAgg/ITaskRepository.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using AccountManagement.Application.Contracts.Task;
@@ -89,22 +88,11 @@ public interface ITaskRepository:IRepository<long,Tasks>
     /// <returns></returns>
     List<TaskViewModel> GetTasksHaveTicket(TaskSearchModel searchModel);
 
-
-
-
-    /// <summary>
-    /// لیست تسک های دوره ای ایجاد شده توسط کاربر
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    List<TaskViewModel> GetTaskScheduleList(TaskSearchModel searchModel);
-
-
     /// <summary>
     /// تعداد تسک های درخواستی. بدون تیکت
     /// </summary>
     /// <returns></returns>
-    Task<int> GetRequestedTasksCount();
+    int GetRequestedTasksCount();
 
     /// <summary>
     /// گرفتن جزئیات درخواست وظیفه 
@@ -126,38 +114,39 @@ public interface ITaskRepository:IRepository<long,Tasks>
     /// <returns></returns>
     bool HasOverdueTasks(long userId);
 
-    ///  <summary>
+    /// <summary>
-    /// مجوع تعداد تسک های عقب افتاده و درخواستی
+    ///مجوع تعداد تسک های عقب افتاده و درخواستی
-    ///  </summary>
+    /// </summary>
-    ///  <param name="userId"></param>
+    /// <param name="userId"></param>
-    ///  <returns></returns>
+    /// <returns></returns>
-    Task<int> RequestedAndOverdueTasksCount(long userId);
+    int RequestedAndOverdueTasksCount(long userId);
 
     /// <summary>
     /// تعداد تسک های دارای تیکت
     /// </summary>
     /// <param name="userId"></param>
     /// <returns></returns>
-    Task<int> TasksHaveTicketCounts(long userId);
+    int TasksHaveTicketCounts(long userId);
 
     /// <summary>
     /// تعداد درخواست های تسک های دارا تیکت
     /// </summary>
     /// <param name="userId"></param>
     /// <returns></returns>
-    Task<int> TasksHaveTicketRequestsCount(long userId);
+    int TasksHaveTicketRequestsCount(long userId);
 
-    ///  <summary>
+    /// <summary>
-    /// تعداد تسک های شخصی و دریافتی برای امروز و یا عقب افتاده
+    ///تعداد تسک های شخصی و دریافتی برای امروز و یا عقب افتاده
-    ///  </summary>
+    /// </summary>
-    ///  <param name="userId"></param>
+    /// <param name="userId"></param>
-    ///  <returns></returns>
+    /// <returns></returns>
-    Task<int> OverdueTasksCount(long userId);
+    int OverdueTasksCount(long userId);
 
 
     // گرفتن پیام های مربوط به هر تسک
 
-    List<Tasks> GetTasksByTaskScheduleId(long taskScheduleId);
 
-    void RemoveRange(IEnumerable<Tasks>  tasks);
+
+    //OperationResult MoveDataFRomTaskToAssign();
+
 }

AccountManagement.Domain/TaskScheduleAgg/ITaskScheduleRepository.cs

@@ -1,11 +1,8 @@
-using System.Threading.Tasks;
+using _0_Framework.Domain;
-using _0_Framework.Domain;
-using AccountManagement.Application.Contracts.TaskSchedule;
 
 namespace AccountManagement.Domain.TaskScheduleAgg;
 
-public interface ITaskScheduleRepository : IRepository<long, TaskSchedule>
+public interface ITaskScheduleRepository:IRepository<long,TaskSchedule>
 {
-    Task<TaskScheduleDetailsViewModel> GetDetails(long id);
+    
-    void Remove(TaskSchedule entity);
 }

AccountManagement.Domain/TaskScheduleAgg/TaskSchedule.cs

@@ -1,38 +1,29 @@
 using System;
 using System.Collections.Generic;
-using _0_Framework.Application;
 using _0_Framework.Domain;
-using AccountManagement.Application.Contracts.Task;
 using AccountManagement.Domain.TaskAgg;
 
 namespace AccountManagement.Domain.TaskScheduleAgg;
 
 public class TaskSchedule:EntityBase
 {
-    public TaskSchedule(string count, TaskScheduleType type, TaskScheduleUnitType unitType, string unitNumber, DateTime lastEndTaskDate)
+    public TaskSchedule(string count, string type, string unitType, string unitNumber, DateTime lastEndTaskDate)
     {
         Count = count;
         Type = type;
         UnitType = unitType;
         UnitNumber = unitNumber;
         LastEndTaskDate = lastEndTaskDate;
-        IsActive = IsActive.True;
     }
     public string Count { get; private set; }
-    public TaskScheduleType Type { get; private set; }
+    public string Type { get; private set; }
-    public TaskScheduleUnitType UnitType { get; private set; }
+    public string UnitType { get; private set; }
     public string UnitNumber { get; private set; }
     public DateTime LastEndTaskDate { get; private set; }
-    public IsActive IsActive { get; private set; }
     public List<Tasks> TasksList { get; set; }
 
     public void SetLastEndTaskDate(DateTime lastEndTaskDate)
     {
         LastEndTaskDate = lastEndTaskDate;
     }
-
-    public void DeActive()
-    {
-	    IsActive = IsActive.False;
-    }
 }

AccountMangement.Infrastructure.EFCore/AccountContext.cs

@@ -27,7 +27,6 @@ using AccountManagement.Domain.SubAccountPermissionSubtitle3Agg;
 using AccountManagement.Domain.SubAccountPermissionSubtitle4Agg;
 using AccountManagement.Domain.SubAccountRoleAgg;
 using AccountMangement.Infrastructure.EFCore.Seed;
-using AccountManagement.Domain.TaskScheduleAgg;
 
 namespace AccountMangement.Infrastructure.EFCore
 {
@@ -58,9 +57,6 @@ namespace AccountMangement.Infrastructure.EFCore
 
         public DbSet<TicketAccessAccount> TicketAccessAccounts { get; set; }
 
-        public DbSet<TaskSchedule> TaskSchedules { get; set; }
-
-
         #endregion
 
         #region Pooya

AccountMangement.Infrastructure.EFCore/Mappings/SubAccountRoleMapping.cs

@@ -21,10 +21,6 @@ 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/Mappings/TaskScheduleMapping.cs

@@ -12,10 +12,9 @@ public class TaskScheduleMapping : IEntityTypeConfiguration<TaskSchedule>
         builder.HasKey(x => x.id);
 
         builder.Property(x => x.Count).HasMaxLength(10);
-        builder.Property(x => x.Type).HasConversion<string>().HasMaxLength(12);
+        builder.Property(x => x.Type).HasMaxLength(12);
         builder.Property(x => x.UnitNumber).HasMaxLength(10);
-        builder.Property(x => x.UnitType).HasConversion<string>().HasMaxLength(10);
+        builder.Property(x => x.UnitType).HasMaxLength(10);
-        builder.Property(x => x.IsActive).HasConversion<string>().HasMaxLength(5);
 
         builder.HasMany(x => x.TasksList).WithOne(x => x.TaskSchedule)
                                                                                 .HasForeignKey(x => x.TaskScheduleId);

AccountMangement.Infrastructure.EFCore/Migrations/20250407150638_add TaskSchedule.cs

@@ -1,74 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace AccountMangement.Infrastructure.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addTaskSchedule : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<string>(
-                name: "UnitType",
-                table: "TaskSchedules",
-                type: "nvarchar(10)",
-                maxLength: 10,
-                nullable: false,
-                defaultValue: "",
-                oldClrType: typeof(string),
-                oldType: "nvarchar(10)",
-                oldMaxLength: 10,
-                oldNullable: true);
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Type",
-                table: "TaskSchedules",
-                type: "nvarchar(12)",
-                maxLength: 12,
-                nullable: false,
-                defaultValue: "",
-                oldClrType: typeof(string),
-                oldType: "nvarchar(12)",
-                oldMaxLength: 12,
-                oldNullable: true);
-
-            migrationBuilder.AddColumn<string>(
-                name: "IsCanceled",
-                table: "TaskSchedules",
-                type: "nvarchar(5)",
-                maxLength: 5,
-                nullable: false,
-                defaultValue: "");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "IsCanceled",
-                table: "TaskSchedules");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "UnitType",
-                table: "TaskSchedules",
-                type: "nvarchar(10)",
-                maxLength: 10,
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "nvarchar(10)",
-                oldMaxLength: 10);
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Type",
-                table: "TaskSchedules",
-                type: "nvarchar(12)",
-                maxLength: 12,
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "nvarchar(12)",
-                oldMaxLength: 12);
-        }
-    }
-}

AccountMangement.Infrastructure.EFCore/Migrations/20250416121822_taskSchedule rename isActive.cs

@@ -1,28 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace AccountMangement.Infrastructure.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class taskSchedulerenameisActive : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.RenameColumn(
-                name: "IsCanceled",
-                table: "TaskSchedules",
-                newName: "IsActive");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.RenameColumn(
-                name: "IsActive",
-                table: "TaskSchedules",
-                newName: "IsCanceled");
-        }
-    }
-}

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

@@ -1,43 +0,0 @@
-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

@@ -759,16 +759,10 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("IsActive")
-                        .IsRequired()
-                        .HasMaxLength(5)
-                        .HasColumnType("nvarchar(5)");
-
                     b.Property<DateTime>("LastEndTaskDate")
                         .HasColumnType("datetime2");
 
                     b.Property<string>("Type")
-                        .IsRequired()
                         .HasMaxLength(12)
                         .HasColumnType("nvarchar(12)");
 
@@ -777,7 +771,6 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations
                         .HasColumnType("nvarchar(10)");
 
                     b.Property<string>("UnitType")
-                        .IsRequired()
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
 
@@ -1078,33 +1071,6 @@ 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")
@@ -1132,8 +1098,6 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations
                         });
 
                     b.Navigation("RolePermissions");
-
-                    b.Navigation("RoleWorkshops");
                 });
 
             modelBuilder.Entity("AccountManagement.Domain.TaskAgg.Tasks", b =>

AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs

@@ -312,17 +312,6 @@ public class AccountRepository : RepositoryBase<long, Account>, IAccountReposito
                 IsActiveString = x.IsActive ? "true" : "false",
             }).ToList();
     }
-
-    public async Task<List<AccountSelectListViewModel>> GetAdminSelectList()
-    {
-        return await _context.Accounts.Where(x => x.AdminAreaPermission == "true").Select(x => new AccountSelectListViewModel()
-        {
-            Id = x.id,
-            Name = x.Fullname,
-            RoleId = x.RoleId
-        }).ToListAsync();
-    }
-
     //public List<AccountViewModel> GetAdminAccounts()
     //{
     // return _context.Accounts.Where(x=>x.AdminAreaPermission == "true" && x.IsActiveString == "true").Select(x => new AccountViewModel()
@@ -343,9 +332,4 @@ public class AccountRepository : RepositoryBase<long, Account>, IAccountReposito
 
     #endregion
 
-
-    public bool CheckExistClientAccount(string userName)
-    {
-        return _context.Accounts.Any(x => x.Username == userName);
-    }
 }

AccountMangement.Infrastructure.EFCore/Repository/SubAccountRepository.cs

@@ -77,10 +77,5 @@ 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

@@ -4,7 +4,6 @@ using _0_Framework.InfraStructure;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using System.Linq;
-using System.Threading.Tasks;
 using _0_Framework.Application;
 using AccountManagement.Application.Contracts.Account;
 using AccountManagement.Application.Contracts.Assign;
@@ -47,6 +46,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
 
     public EditTask GetDetails(long TaskId)
     {
+        var task = Get(TaskId);
 
         var userId = _authHelper.CurrentAccountId();
 
@@ -94,8 +94,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                         Fullname = a.Fullname,
                         Id = a.id,
 
-                    }).FirstOrDefault(),
+                    }).FirstOrDefault()
-                TaskScheduleId = x.TaskScheduleId ?? 0
 
             }).FirstOrDefault();
 
@@ -106,26 +105,13 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         {
             res.EndTaskDate = _accountContext.Assigns.First(a => a.TaskId == res.Id && a.AssignedId == userId)
                 .EndTaskDate.ToFarsi();
-            var userAssign = res.AssignViewModels.First(x => x.AssignedId == userId);
+
 
             res.AssignViewModels = res.AssignViewModels.Where(x => x.AssignedId == userId).ToList();
-            res.IsDone = userAssign.IsDone;
+            res.IsDone = res.AssignViewModels.First(x => x.AssignedId == userId).IsDone;
-            res.IsCancel = userAssign.IsCancel;
+            res.IsCancel = res.AssignViewModels.First(x => x.AssignedId == userId).IsCancel;
-            res.HasRequest = userAssign.IsCanceledRequest || userAssign.TimeRequest ||
-                             userAssign.IsDoneRequest;
         }
 
-        if (res.TaskScheduleId > 0)
-        {
-            var taskSchedule = _accountContext.TaskSchedules.FirstOrDefault(x => x.id == res.TaskScheduleId);
-
-            res.ScheduleUnitType = taskSchedule.UnitType;
-            res.ScheduleType = taskSchedule.Type;
-            res.ScheduleCount = taskSchedule.Count;
-            res.ScheduleUnitNumber = taskSchedule.UnitNumber;
-        }
-
-
         //_accountContext.Tasks.Where(x => x.id == TaskId).Select(x => new EditTask()
         //{
         //    EndTaskDate = x.EndTaskDate.ToFarsi(),
@@ -162,6 +148,8 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         Remove(task);
     }
 
+
+
     public List<TaskViewModel> GetRequestedTasks(TaskSearchModel searchModel)
     {
         var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
@@ -900,7 +888,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),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -980,7 +968,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                 .ThenInclude(x => x.Media)
                 .Where(x =>
                     x.Task.IsActiveString == "true" && (x.AssignerId == accountId && x.AssignedId != accountId) && (!x.IsCanceledRequest && !x.TimeRequest && !x.IsDoneRequest) && x.Task.TicketId == null &&
-                    x.Task.SenderId == accountId && x.Task.TaskScheduleId == null)
+                    x.Task.SenderId == accountId)
                 .Select(x =>
                     new TaskViewModel()
                     {
@@ -1229,7 +1217,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),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -1788,7 +1776,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),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -1851,313 +1839,10 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         return final;
     }
 
-    public List<TaskViewModel> GetTaskScheduleList(TaskSearchModel searchModel)
+
+
+    public string SetTasksColors(DateTime date, bool isCancel)
     {
-        var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
-        var positionValue = int.Parse(_contextAccessor.HttpContext.User.FindFirst("PositionValue").Value);
-        var emptyAcc = new AccountViewModel()
-        {
-            Fullname = "-",
-            PositionValue = 0
-        };
-
-        var raw = _accountContext.Assigns.Include(x => x.Task).ThenInclude(x => x.TaskMedias)
-            .ThenInclude(x => x.Media)
-            .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);
-        if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
-        {
-            raw = raw.Where(x =>
-                (x.Task.Description != null && x.Task.Description.Contains(searchModel.GeneralSearch))
-                || x.Task.ContractingPartyName.Contains(searchModel.GeneralSearch)
-                || x.Task.Title.Contains(searchModel.GeneralSearch));
-        }
-
-
-
-
-        var query = raw.GroupBy(x => x.Task.TaskScheduleId).Select(x =>
-             new TaskViewModel()
-             {
-                 AssignedId = x.First().AssignedId,
-                 AssignerId = x.First().AssignerId,
-                 CreateDate = x.First().Task.CreationDate.ToFarsi(),
-                 EndTaskDateFA = x.First().EndTaskDate.ToFarsi(),
-                 IsDone = x.First().IsDone,
-                 EndTaskDateGE = x.First().EndTaskDate,
-                 Name = x.First().Task.Title,
-                 RequestCancel = x.First().IsCanceledRequest,
-                 RequestTime = x.First().TimeRequest,
-                 Id = x.First().Task.id,
-                 CreateTaskDateGE = x.First().Task.CreationDate,
-                 IsCancel = x.First().IsCancel,
-                 AcceptedTimeRequest = x.First().AcceptedTimeRequest,
-                 IsCancelRequest = x.First().IsCanceledRequest,
-                 ContractingPartyName = x.First().Task.ContractingPartyName,
-                 MediaCount = _accountContext.TaskMedias.Count(m => m.TaskId == x.First().Task.id),
-                 Description = x.First().Task.Description,
-                 IsDoneRequest = x.First().IsDoneRequest,
-                 ScheduleType = x.First().Task.TaskSchedule.Type,
-                 ScheduleUnitType = x.First().Task.TaskSchedule.UnitType,
-                 TaskScheduleId = (long)x.First().Task.TaskScheduleId
-
-             }
-        );
-
-        if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
-        {
-            query = query.Where(x =>
-                (x.Description != null && x.Description.Contains(searchModel.GeneralSearch))
-                || x.ContractingPartyName.Contains(searchModel.GeneralSearch)
-                || x.Name.Contains(searchModel.GeneralSearch));
-        }
-
-        var res = query.Select(x => new TaskViewModel()
-        {
-            Sender = _accountContext.Accounts.Include(a => a.Position).Select(a => new AccountViewModel()
-            {
-                PositionValue = a.Position.PositionValue,
-                Id = a.id,
-                Fullname = a.Fullname,
-            }).FirstOrDefault(a => a.Id == x.AssignerId),
-
-            SelfName = _accountContext.Accounts.FirstOrDefault(a => a.id == accountId).Fullname,
-
-            Assigned = _accountContext.Assigns.Where(a => a.TaskId == x.Id)
-                .Where(a => a.AssignedPositionValue >= positionValue).Select(a => a.AssignedId)
-                .ToList(),
-            CreateDate = x.CreateDate,
-            EndTaskDateFA = x.EndTaskDateFA,
-            IsDone = x.IsDone,
-            EndTaskDateGE = x.EndTaskDateGE,
-            Name = x.Name,
-            RequestCancel = x.RequestCancel,
-            RequestTime = x.RequestTime,
-            Id = x.Id,
-            CreateTaskDateGE = x.CreateTaskDateGE,
-            IsCancel = x.IsCancel,
-            AcceptedTimeRequest = x.AcceptedTimeRequest,
-            IsCancelRequest = x.IsCancelRequest,
-            ContractingPartyName = x.ContractingPartyName,
-            MediaCount = x.MediaCount,
-            Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest,
-            ScheduleType = x.ScheduleType,
-            ScheduleUnitType = x.ScheduleUnitType,
-            TaskScheduleId = x.TaskScheduleId
-        });
-        if (!string.IsNullOrWhiteSpace(searchModel.StartDate) && !string.IsNullOrWhiteSpace(searchModel.EndDate))
-        {
-            var start = searchModel.StartDate.ToGeorgianDateTime();
-            var end = searchModel.EndDate.ToGeorgianDateTime();
-            res = res.Where(x =>
-                ((start > x.CreateTaskDateGE && x.CreateTaskDateGE < end) &&
-
-                 (end > x.EndTaskDateGE && x.EndTaskDateGE > start))
-                || ((start < x.CreateTaskDateGE && x.CreateTaskDateGE < end) &&
-
-                    (end < x.EndTaskDateGE && x.EndTaskDateGE > start))
-                || ((start < x.CreateTaskDateGE && x.CreateTaskDateGE < end) &&
-
-                    (end > x.EndTaskDateGE && x.EndTaskDateGE > start))
-                || ((start > x.CreateTaskDateGE && x.CreateTaskDateGE < end) &&
-
-                    (end < x.EndTaskDateGE && x.EndTaskDateGE > end)));
-        }
-
-        if (!string.IsNullOrWhiteSpace(searchModel.IsDoneRequest))
-        {
-            bool isDoneReq = bool.Parse(searchModel.IsDoneRequest);
-            res = res.Where(x => x.IsDoneRequest == isDoneReq);
-        }
-
-        if (!string.IsNullOrWhiteSpace(searchModel.IsDone))
-        {
-            bool isDone = bool.Parse(searchModel.IsDone);
-            res = res.Where(x => x.IsDone == isDone);
-        }
-
-        if (!string.IsNullOrWhiteSpace(searchModel.IsCanceled))
-        {
-            bool isCancel = bool.Parse(searchModel.IsCanceled);
-            res = res.Where(x => x.IsCancel == isCancel);
-        }
-
-        if (!string.IsNullOrWhiteSpace(searchModel.IsTimeRequest))
-        {
-            bool isTimeRequest = bool.Parse(searchModel.IsTimeRequest);
-            res = res.Where(x => x.RequestTime == isTimeRequest);
-        }
-
-        if (!string.IsNullOrWhiteSpace(searchModel.TimeRequestAccepted))
-        {
-            res = res.Where(x => x.AcceptedTimeRequest > 0);
-        }
-
-        if (!string.IsNullOrWhiteSpace(searchModel.IsCancelRequest))
-        {
-            bool isCancelReq = bool.Parse(searchModel.IsCancelRequest);
-            res = res.Where(x => x.IsCancelRequest == isCancelReq);
-
-        }
-
-
-
-        var result = res.AsEnumerable();
-
-
-        if (searchModel.AccountId > 0)
-        {
-            result = result.Where(x =>
-                x.Sender.Id == searchModel.AccountId || x.Assigned.Contains(searchModel.AccountId));
-        }
-
-
-        var orderResult = result.OrderByDescending(x => x.IsCancel ? 0 : 1).ThenBy(x => x.IsDone ? 1 : 0)
-            .ThenBy(x => x.EndTaskDateGE);
-
-
-        var final = orderResult.Skip(searchModel.PageIndex).Take(30).ToList();
-
-        final = final.Select(x => new TaskViewModel()
-        {
-            AssignViewModels = _accountContext.Accounts.Include(x => x.Position)
-                .Where(a => x.Assigned.Contains(a.id) && accountId != a.id)
-                .Select(a => new AssignViewModel()
-                {
-                    AssignedName = a.Fullname,
-                    AssignedPositionValue = a.Position.PositionValue
-                }).ToList(),
-            Sender = x.Sender,
-            SelfAssigner = x.Sender.Id == accountId ? true : false,
-            Assigned = x.Assigned,
-            SelfAssigned = x.Assigned.Any(a => a == accountId) ? true : false,
-            CreateDate = x.CreateDate,
-            EndTaskDateFA = x.EndTaskDateFA,
-            IsDone = x.IsDone,
-            EndTaskDateGE = x.EndTaskDateGE,
-            Name = x.Name,
-            RequestCancel = x.RequestCancel,
-            RequestTime = x.RequestTime,
-            Id = x.Id,
-            CreateTaskDateGE = x.CreateTaskDateGE,
-            IsCancel = x.IsCancel,
-            AcceptedTimeRequest = x.AcceptedTimeRequest,
-            IsCancelRequest = x.IsCancelRequest,
-            ContractingPartyName = x.ContractingPartyName,
-            MediaCount = x.MediaCount,
-            SelfName = x.SelfName,
-            Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest,
-            ScheduleType = x.ScheduleType,
-            ScheduleUnitType = x.ScheduleUnitType,
-            TaskScheduleId = x.TaskScheduleId
-
-
-        }).ToList();
-
-
-        final = final.Select(x => new TaskViewModel()
-        {
-
-            AssignList = x.AssignViewModels.GroupBy(a => a.AssignedPositionValue).Select(a => new AssignList()
-            {
-                AssignViewModels = a.ToList(),
-                PosValue = a.Key
-            }).ToList(),
-            Sender = x.Sender,
-            Assigned = x.Assigned,
-            CreateDate = x.CreateDate,
-            EndTaskDateFA = x.EndTaskDateFA,
-            IsDone = x.IsDone,
-            EndTaskDateGE = x.EndTaskDateGE,
-            Name = x.Name,
-            RequestCancel = x.RequestCancel,
-            RequestTime = x.RequestTime,
-            Id = x.Id,
-            CreateTaskDateGE = x.CreateTaskDateGE,
-            IsCancel = x.IsCancel,
-            AcceptedTimeRequest = x.AcceptedTimeRequest,
-            IsCancelRequest = x.IsCancelRequest,
-            ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
-            MediaCount = x.MediaCount,
-            HasAttachment = x.MediaCount > 0,
-            SelfName = x.SelfName,
-            SelfAssigned = x.SelfAssigned,
-            SelfAssigner = x.SelfAssigner,
-            Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest,
-            AssignViewModels = x.AssignViewModels,
-            ScheduleType = x.ScheduleType,
-            ScheduleUnitType = x.ScheduleUnitType,
-            TaskScheduleId = x.TaskScheduleId
-
-        }).ToList();
-
-        final = final.Select(x => new TaskViewModel()
-        {
-
-            AssignList = !(x.SelfAssigned || x.SelfAssigner)
-                ? AddAssign(x.AssignList, x.Sender)
-                : x.AssignList,
-            Sender = !(x.SelfAssigned || x.SelfAssigner)
-                ? new AccountViewModel()
-                {
-                    PositionValue = 0,
-                    Fullname = "-"
-                }
-                : x.Sender,
-            Assigned = x.Assigned,
-            CreateDate = x.CreateDate,
-            EndTaskDateFA = x.EndTaskDateFA,
-            IsDone = x.IsDone,
-            EndTaskDateGE = x.EndTaskDateGE,
-            Name = x.Name,
-            RequestCancel = x.RequestCancel,
-            RequestTime = x.RequestTime,
-            Id = x.Id,
-            CreateTaskDateGE = x.CreateTaskDateGE,
-            IsCancel = x.IsCancel,
-            AcceptedTimeRequest = x.AcceptedTimeRequest,
-            IsCancelRequest = x.IsCancelRequest,
-            ContractingPartyName = x.ContractingPartyName,
-            Color = x.Color,
-            MediaCount = x.MediaCount,
-            HasAttachment = x.HasAttachment,
-            SelfName = !(x.SelfAssigned || x.SelfAssigner) ? "-" : x.SelfName,
-            EndTaskTime = $"{x.EndTaskDateGE.Hour}:{x.EndTaskDateGE.Minute}:{x.EndTaskDateGE.Second}" != "23:59:59"
-                ? $"{x.EndTaskDateGE.Hour}:{x.EndTaskDateGE.Minute}"
-                : "",
-            Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest,
-            CanAssign = _positionRepository.GetLastPositionValue() != positionValue,
-            CanDelete = x.Sender.Id == accountId,
-            CanEdit = x.Sender.Id == accountId && !(_accountContext.Assigns.Any(a => a.TaskId == x.Id && (a.AcceptedTimeRequest > 0 || a.IsCanceledRequest
-                || a.IsDoneRequest || a.TimeRequest || a.IsCancel || a.IsDone))),
-            Assigner = x.Sender.Id == accountId ? emptyAcc.Fullname : x.Sender.Fullname,
-            AssignedReceiverViewModel = x.AssignViewModels.Any()
-                ? x.AssignViewModels.MinBy(a => a.AssignedPositionValue)
-                : new()
-                {
-                    AssignedName = "-",
-                    AssignedPositionValue = 0
-                },
-            ScheduleType = x.ScheduleType,
-            ScheduleUnitType = x.ScheduleUnitType,
-            TaskScheduleId = x.TaskScheduleId
-
-        }).ToList();
-        return final;
-    }
-
-    public string SetTasksColors(DateTime date, bool isCancel,bool hasRequest)
-    {
-        if (hasRequest)
-            return "red";
-
         if (isCancel)
         {
             //return "brown";
@@ -2203,23 +1888,23 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
 
     }
 
-    public async Task<int> GetRequestedTasksCount()
+    public int GetRequestedTasksCount()
     {
         var positionValue = int.Parse(_contextAccessor.HttpContext.User.FindFirst("PositionValue").Value);
         var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
         if (positionValue == 1)
         {
-            return await _accountContext.Assigns.Include(x => x.Task).Where(x =>
+            return _accountContext.Assigns.Include(x => x.Task).Where(x =>
                     !x.IsDone && x.Task.IsActiveString == "true" && !x.IsCancel &&
                     (x.IsCanceledRequest || x.TimeRequest || x.IsDoneRequest) && (accountId == x.Task.SenderId) && x.Task.TicketId == null).GroupBy(x => x.TaskId)
-                .Select(x => x.First()).CountAsync();
+                .Select(x => x.First()).Count();
         }
         else
         {
-            return await _accountContext.Assigns.Include(x => x.Task).Where(x =>
+            return _accountContext.Assigns.Include(x => x.Task).Where(x =>
                     !x.IsDone && x.Task.IsActiveString == "true" && !x.IsCancel &&
                     (x.IsCanceledRequest || x.TimeRequest || x.IsDoneRequest) && (accountId == x.Task.SenderId) && x.Task.TicketId == null).GroupBy(x => x.TaskId)
-                .Select(x => x.First()).CountAsync();
+                .Select(x => x.First()).Count();
         }
     }
 
@@ -2316,7 +2001,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
 
     }
 
-    public async Task<int> RequestedAndOverdueTasksCount(long userId)
+    public int RequestedAndOverdueTasksCount(long userId)
     {
         var account = _accountRepository.GetIncludePositions(userId);
         if (account.Position == null)
@@ -2324,7 +2009,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
 
         DateTime now = DateTime.Now;
 
-        var overdueTasksCount = await OverdueTasksCount(userId);
+        var overdueTasksCount = OverdueTasksCount(userId);
 
 
         //overdueTasksCount = _accountContext.Tasks.Include(x =>
@@ -2333,10 +2018,10 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         //	                      !x.Assigns.Any(a => a.TimeRequest)
         //	                      && x.Assigns.Any(a => a.AssignedId == userId) &&
         //	                      (x.Assigns.First(a => a.AssignedId == userId).EndTaskDate.Date <= DateTime.Now.Date));
-        var overdueRequestsCount = await GetRequestedTasksCount();
+        var overdueRequestsCount = GetRequestedTasksCount();
 
-        var ticketRequested = await TasksHaveTicketRequestsCount(userId);
+        var ticketRequested = TasksHaveTicketRequestsCount(userId);
-        var overdueTicket = await TasksHaveTicketCounts(userId);
+        var overdueTicket = TasksHaveTicketCounts(userId);
 
         return overdueTasksCount + overdueRequestsCount + ticketRequested + overdueTicket;
     }
@@ -2351,7 +2036,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         return overdueRequestsCount;
     }
 
-    public async Task<int> OverdueTasksCount(long userId)
+    public int OverdueTasksCount(long userId)
     {
         var account = _accountRepository.GetIncludePositions(userId);
 
@@ -2363,12 +2048,12 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         int overdueTasksCount;
         if (positionValue == 1)
         {
-            overdueTasksCount = await _accountContext.Assigns.Include(x => x.Task).Where(x => x.AssignedId == userId &&
+            overdueTasksCount = _accountContext.Assigns.Include(x => x.Task).Where(x => x.AssignedId == userId &&
                     x.AssignerId == userId && x.Task.Assigns.Count == 1 &&
                     !x.IsCancel && !x.IsCanceledRequest &&
                     !x.IsDone && !x.TimeRequest && !x.IsDoneRequest && x.EndTaskDate.Date <= DateTime.Now.Date &&
                     x.Task.IsActiveString == "true" && x.Task.TicketId == null)
-                .GroupBy(x => x.TaskId).Select(x => x.First()).CountAsync();
+                .GroupBy(x => x.TaskId).Select(x => x.First()).Count();
 
             //overdueTasksCount = _accountContext.Tasks.Include(x =>
             //	x.Assigns).Count(x => !x.Assigns.Any(a => a.IsCancel) && !x.Assigns.Any(a => a.IsCanceledRequest) &&
@@ -2380,49 +2065,43 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         }
         else
         {
-            overdueTasksCount = await _accountContext.Assigns.Include(x => x.Task).Where(x => x.AssignedId == userId &&
+            overdueTasksCount = _accountContext.Assigns.Include(x => x.Task).Where(x => x.AssignedId == userId &&
                     !x.IsCancel && !x.IsCanceledRequest &&
                     !x.IsDone && !x.TimeRequest && !x.IsDoneRequest && x.EndTaskDate.Date <= DateTime.Now.Date &&
                     x.Task.IsActiveString == "true" && x.Task.TicketId == null)
-                .GroupBy(x => x.TaskId).Select(x => x.First()).CountAsync();
+                .GroupBy(x => x.TaskId).Select(x => x.First()).Count();
             ;
         }
 
         return overdueTasksCount;
     }
 
-    public List<Tasks> GetTasksByTaskScheduleId(long taskScheduleId)
+    public int TasksHaveTicketCounts(long userId)
     {
-        return _accountContext.Tasks.Include(x => x.Assigns).Where(x => x.TaskScheduleId != null && x.TaskScheduleId == taskScheduleId).ToList();
+        return _accountContext.Assigns.Include(x => x.Task).Where(x =>
-    }
-
-
-    public async Task<int> TasksHaveTicketCounts(long userId)
-    {
-        return await _accountContext.Assigns.Include(x => x.Task).Where(x =>
             !x.IsDone && x.Task.IsActiveString == "true" && !x.IsCancel &&
             !x.IsCanceledRequest && !x.IsDoneRequest &&
             !x.TimeRequest && (x.AssignerId == userId || x.AssignedId == userId) &&
-            (x.Task.TicketId != null && x.Task.TicketId > 0)).GroupBy(x => x.TaskId).CountAsync();
+            (x.Task.TicketId != null && x.Task.TicketId > 0)).GroupBy(x => x.TaskId).Count();
     }
 
-    public async Task<int> TasksHaveTicketRequestsCount(long userId)
+    public int TasksHaveTicketRequestsCount(long userId)
     {
         var positionValue = int.Parse(_contextAccessor.HttpContext.User.FindFirst("PositionValue").Value);
         var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
         if (positionValue == 1)
         {
-            return await _accountContext.Assigns.Include(x => x.Task).Where(x =>
+            return _accountContext.Assigns.Include(x => x.Task).Where(x =>
                     !x.IsDone && x.Task.IsActiveString == "true" && !x.IsCancel &&
                     (x.IsCanceledRequest || x.TimeRequest || x.IsDoneRequest) && (accountId == x.Task.SenderId) && x.Task.TicketId != null && x.Task.TicketId > 0).GroupBy(x => x.TaskId)
-                .Select(x => x.First()).CountAsync();
+                .Select(x => x.First()).Count();
         }
         else
         {
-            return await _accountContext.Assigns.Include(x => x.Task).Where(x =>
+            return _accountContext.Assigns.Include(x => x.Task).Where(x =>
                     !x.IsDone && x.Task.IsActiveString == "true" && !x.IsCancel &&
                     (x.IsCanceledRequest || x.TimeRequest || x.IsDoneRequest) && (accountId == x.Task.SenderId) && x.Task.TicketId != null && x.Task.TicketId > 0).GroupBy(x => x.TaskId)
-                .Select(x => x.First()).CountAsync();
+                .Select(x => x.First()).Count();
         }
     }
 
@@ -2661,7 +2340,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),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -2725,7 +2404,6 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
     {
         var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
         var positionValue = int.Parse(_contextAccessor.HttpContext.User.FindFirst("PositionValue").Value);
-        var today = DateTime.Today;
         var emptyAcc = new AccountViewModel()
         {
             Fullname = "-",
@@ -2735,7 +2413,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.IsDoneRequest && !x.IsCanceledRequest);
+                x.Task.IsActiveString == "true" && x.AssignedId == accountId && (!x.IsCanceledRequest && !x.TimeRequest && !x.IsDoneRequest) && x.Task.TicketId == null);
         if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
         {
             raw = raw.Where(x =>
@@ -2768,7 +2446,6 @@ 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))
         {
@@ -2807,8 +2484,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             ContractingPartyName = x.ContractingPartyName,
             MediaCount = x.MediaCount,
             Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest,
+            IsDoneRequest = x.IsDoneRequest
-            HasRequest = x.IsCancelRequest || x.RequestTime || x.IsDoneRequest
         });
         if (!string.IsNullOrWhiteSpace(searchModel.StartDate) && !string.IsNullOrWhiteSpace(searchModel.EndDate))
         {
@@ -2877,10 +2553,8 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         }
 
 
-        var orderResult = result.OrderBy(x => x.IsDone || x.IsCancel)
+        var orderResult = result.OrderByDescending(x => x.IsCancel ? 0 : 1).ThenBy(x => x.IsDone ? 1 : 0)
-            .ThenByDescending(x => x.EndTaskDateGE <= today.AddDays(1) && !x.RequestTime)
+            .ThenBy(x => x.EndTaskDateGE);
-            .ThenByDescending(x => x.RequestTime)
-            .ThenBy(x => x.EndTaskDateGE); // مرتب‌سازی داخلی بر اساس تاریخ
 
 
         var final = orderResult.Skip(searchModel.PageIndex).Take(30).ToList();
@@ -2914,7 +2588,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             MediaCount = x.MediaCount,
             SelfName = x.SelfName,
             Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest,
+            IsDoneRequest = x.IsDoneRequest
 
         }).ToList();
 
@@ -2942,7 +2616,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.RequestTime),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -3001,8 +2675,6 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                     AssignedName = "-",
                     AssignedPositionValue = 0
                 },
-            HasRequest = x.IsCancelRequest || x.RequestTime || x.IsDoneRequest
-
         }).ToList();
         return final;
     }

AccountMangement.Infrastructure.EFCore/Repository/TaskScheduleRepository.cs

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

Company.Domain/AdminMonthlyOverviewAgg/AdminMonthlyOverview.cs

@@ -1,55 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.AdminMonthlyOverview;
-using Microsoft.AspNetCore.JsonPatch.Operations;
-
-namespace Company.Domain.AdminMonthlyOverviewAgg;
-
-public class AdminMonthlyOverview:EntityBase
-{
-    public AdminMonthlyOverview(long workshopId, int month, int year, AdminMonthlyOverviewStatus status)
-    {
-        WorkshopId = workshopId;
-        Month = month;
-        Year = year;
-        Status = status;
-    }
-
-    public long WorkshopId { get; set; }
-    public int Month { get; set; }
-    public int Year { get; set; }
-    public AdminMonthlyOverviewStatus Status { get; set; }
-
-    public void Next()
-    {
-        var maxValue = Enum.GetValues(typeof(AdminMonthlyOverviewStatus))
-            .Cast<AdminMonthlyOverviewStatus>()
-            .Max();
-
-        if (Status >= maxValue)
-        {
-            throw new InvalidDataException("تغییر وضعیت وارد شده نامعتبر است");
-        }
-        Status += 1;
-    }
-
-    public void Back()
-    {
-        var minValue = Enum.GetValues(typeof(AdminMonthlyOverviewStatus))
-            .Cast<AdminMonthlyOverviewStatus>()
-            .Min();
-
-        if (Status <= minValue)
-        {
-            throw new InvalidDataException("تغییر وضعیت وارد شده نامعتبر است");
-        }
-        Status -= 1;
-    }
-
-    public void SetStatus(AdminMonthlyOverviewStatus status)
-    {
-        Status = status;
-    }
-}

Company.Domain/AdminMonthlyOverviewAgg/IAdminMonthlyOverviewRepository.cs

@@ -1,12 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.AdminMonthlyOverview;
-
-namespace Company.Domain.AdminMonthlyOverviewAgg;
-
-public interface IAdminMonthlyOverviewRepository:IRepository<long, AdminMonthlyOverview>
-{
-    Task<List<AdminMonthlyOverviewListViewModel>> GetWorkshopStatus(AdminMonthlyOverviewSearchModel searchModel);
-    Task<AdminMonthlyOverViewCounterVm> GetCounter(int year, int month, long accountId);
-}

Company.Domain/CheckoutAgg/Checkout.cs

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

Company.Domain/CheckoutAgg/ICheckoutRepository.cs

@@ -10,36 +10,9 @@ namespace Company.Domain.CheckoutAgg;
 
 public interface ICheckoutRepository : IRepository<long, Checkout>
 {
-    /// <summary>
-    /// چک میکند که آیا پرسنل در سال و ماه درخواستی در این کارگاه فیش حقوقی دارد یا خیر
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <param name="employeId"></param>
-    /// <param name="سال به صورت رشته عددی"></param>
-    /// <param name="ماه بصورت رشته عددی"></param>
-    /// <returns></returns>
-    (bool hasChekout, double FamilyAlloance, double OverTimePay) HasCheckout(long workshopId, long employeId,
-        string year, string month);
     EditCheckout GetDetails(long id);
 
-    Task CreateCkeckout(Checkout command);
+    void CreateCkeckout(Checkout command);
-    /// <summary>
-    /// لود لیست اولیه جهت ایجاد فیش حقوقی
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <param name="employeeId"></param>
-    /// <param name="year"></param>
-    /// <param name="month"></param>
-    /// <param name="contractStart"></param>
-    /// <param name="contractEnd"></param>
-    /// <returns></returns>
-    /// <exception cref="NotImplementedException"></exception>
-    Task<CreateCheckoutListViewModel> GetContractResultToCreateCheckout(long workshopId, long employeeId, string year,
-        string month,
-        string contractStart, string contractEnd);
-    //void CreateCkeckout(Checkout command);
-
-
 
     Task<List<CheckoutViewModel>> Search(CheckoutSearchModel searchModel);
 

Company.Domain/CheckoutAgg/ValueObjects/CheckoutLoanInstallment.cs

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

Company.Domain/CheckoutAgg/ValueObjects/CheckoutSalaryAid.cs

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

Company.Domain/Company.Domain.csproj

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

Company.Domain/CustomizeCheckoutAgg/CustomizeCheckout.cs

@@ -1,13 +1,11 @@
-using System;
+using _0_Framework.Application;
-using System.Collections.Generic;
-using System.Linq;
-using _0_Framework.Application;
 using _0_Framework.Domain;
-using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
-using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
 using Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 using Company.Domain.EmployeeAgg;
 using Company.Domain.WorkshopAgg;
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Authentication.Cookies;
 
 
 namespace Company.Domain.CustomizeCheckoutAgg;
@@ -17,7 +15,8 @@ namespace Company.Domain.CustomizeCheckoutAgg;
 public class CustomizeCheckout : EntityBase
 {
     private CustomizeCheckout()
-    { }
+    {
+    }
     public CustomizeCheckout(DateTime contractStart, DateTime contractEnd, long employeeId, string employeeFName,
         string employeeLName, DateTime employeeDateOfBirth,
         string employeeNationalCode, string workshopFullName, long workshopId, long? contractId,
@@ -31,9 +30,7 @@ public class CustomizeCheckout : EntityBase
         double totalPayment, string contractNo, ICollection<CustomizeCheckoutFine> checkoutFines,
         ICollection<CustomizeCheckoutLoanInstallments> customizeCheckoutLoanInstallments,
         ICollection<CustomizeCheckoutSalaryAid> customizeCheckoutSalaryAids,
-        ICollection<CustomizeCheckoutReward> customizeCheckoutRewards, TimeSpan lateToWorkValue, double settingSalary,
+        ICollection<CustomizeCheckoutReward> customizeCheckoutRewards, TimeSpan lateToWorkValue)
-        double dailyWage, WorkshopShiftStatus shiftStatus, IrregularShift irregularShift,
-        ICollection<CustomizeRotatingShift> customizeRotatingShifts, ICollection<CustomizeCheckoutRegularShift> employeeSettingsShifts)
     {
         YearInt = Convert.ToInt32(contractStart.ToFarsi().Substring(0, 4));
         MonthInt = Convert.ToInt32(contractStart.ToFarsi().Substring(5, 2));
@@ -77,12 +74,6 @@ public class CustomizeCheckout : EntityBase
         WorkshopFullName = workshopFullName;
 
         LateToWorkValue = lateToWorkValue;
-        SettingSalary = settingSalary;
-        DailyWage = dailyWage;
-        ShiftStatus = shiftStatus;
-        IrregularShift = irregularShift;
-        CustomizeRotatingShifts = customizeRotatingShifts;
-        RegularShifts = employeeSettingsShifts;
     }
 
 
@@ -258,18 +249,6 @@ public class CustomizeCheckout : EntityBase
     /// </summary>
     public double TotalPayment { get; private set; }
 
-    /// <summary>
-    /// مزد روزانه
-    /// </summary>
-    public double DailyWage { get; private set; }
-
-    /// <summary>
-    /// حقوق تعیین شده
-    /// </summary>
-    public double SettingSalary { get; private set; }
-
-    public WorkshopShiftStatus ShiftStatus { get; set; }
-
 
     #region Values
 
@@ -287,12 +266,6 @@ public class CustomizeCheckout : EntityBase
     public ICollection<CustomizeCheckoutSalaryAid> CustomizeCheckoutSalaryAids { get; set; }
     public ICollection<CustomizeCheckoutReward> CustomizeCheckoutRewards { get; set; }
 
-    public IrregularShift IrregularShift { get; set; }
-    public ICollection<CustomizeRotatingShift> CustomizeRotatingShifts { get; set; }
-    public ICollection<CustomizeCheckoutRegularShift> RegularShifts { get; set; }
-
-
-
     #endregion
 
     #region Relations
@@ -302,78 +275,4 @@ public class CustomizeCheckout : EntityBase
 
     #endregion
 
-    public void SetValueObjects(ICollection<CustomizeCheckoutFine> checkoutFines,
-        ICollection<CustomizeCheckoutLoanInstallments> customizeCheckoutLoanInstallments,
-        ICollection<CustomizeCheckoutSalaryAid> customizeCheckoutSalaryAids,
-        ICollection<CustomizeCheckoutReward> customizeCheckoutRewards)
-    {
-        CheckoutFines = checkoutFines;
-        CustomizeCheckoutLoanInstallments = customizeCheckoutLoanInstallments;
-        CustomizeCheckoutSalaryAids = customizeCheckoutSalaryAids;
-        CustomizeCheckoutRewards = customizeCheckoutRewards;
-    }
-
-    public void SetRewards(ICollection<CustomizeCheckoutReward> rewards)
-    {
-        var previousTotalAmount = CustomizeCheckoutRewards.Sum(x => x.Amount.MoneyToDouble());
-        var newTotalAmount = rewards.Sum(x => x.Amount.MoneyToDouble());
-        RewardPay = newTotalAmount;
-        IncreaseTotalPayment(previousTotalAmount, newTotalAmount);
-        RecalculateTotalClaims(previousTotalAmount, newTotalAmount);
-        CustomizeCheckoutRewards = rewards;
-    }
-
-    public void SetSalaryAids(ICollection<CustomizeCheckoutSalaryAid> salaryAids)
-    {
-        var previousTotalAmount = CustomizeCheckoutSalaryAids.Sum(x => x.Amount.MoneyToDouble());
-        var newTotalAmount = salaryAids.Sum(x => x.Amount.MoneyToDouble());
-        SalaryAidDeduction = newTotalAmount;
-        ReduceTotalPayment(previousTotalAmount, newTotalAmount);
-        RecalculateTotalDeduction(previousTotalAmount, newTotalAmount);
-        CustomizeCheckoutSalaryAids = salaryAids;
-    }
-
-    public void SetFines(ICollection<CustomizeCheckoutFine> fines)
-    {
-        var previousTotalAmount = CheckoutFines.Sum(x => x.Amount.MoneyToDouble());
-        var newTotalAmount = fines.Sum(x => x.Amount.MoneyToDouble());
-        FineDeduction = newTotalAmount;
-        ReduceTotalPayment(previousTotalAmount, newTotalAmount);
-        RecalculateTotalDeduction(previousTotalAmount, newTotalAmount);
-        CheckoutFines = fines;
-    }
-
-    public void SetLoanInstallment(ICollection<CustomizeCheckoutLoanInstallments> installments)
-    {
-        var previousTotalAmount = CustomizeCheckoutLoanInstallments.Sum(x => x.AmountForMonth.MoneyToDouble());
-        var newTotalAmount = installments.Sum(x => x.AmountForMonth.MoneyToDouble());
-        InstallmentDeduction = newTotalAmount;
-        ReduceTotalPayment(previousTotalAmount, newTotalAmount);
-        RecalculateTotalDeduction(previousTotalAmount, newTotalAmount);
-        CustomizeCheckoutLoanInstallments = installments;
-    }
-
-
-    private void RecalculateTotalClaims(double previousTotalAmount, double newTotalAmount)
-    {
-        TotalClaims = (TotalClaims.MoneyToDouble() - previousTotalAmount + newTotalAmount).ToMoney();
-    }
-
-
-    private void RecalculateTotalDeduction(double previousTotalAmount, double newTotalAmount)
-    {
-        TotalDeductions = (TotalDeductions.MoneyToDouble() - previousTotalAmount + newTotalAmount).ToMoney();
-    }
-
-    private void ReduceTotalPayment(double previousAmount, double newAmount)
-    {
-        TotalPayment = TotalPayment + previousAmount - newAmount;
-    }
-    private void IncreaseTotalPayment(double previousAmount, double newAmount)
-    {
-        TotalPayment = TotalPayment - previousAmount + newAmount;
-    }
-
-
-
 }

Company.Domain/CustomizeCheckoutAgg/ICustomizeCheckoutRepository.cs

@@ -3,7 +3,6 @@ using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.CustomizeCheckout;
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace Company.Domain.CustomizeCheckoutAgg
 {
@@ -15,12 +14,5 @@ namespace Company.Domain.CustomizeCheckoutAgg
         void RemoveEmployeeCustomizeCheckoutInDates(long workshopId, long employeeId, DateTime startOfMonth, DateTime endOfMonth);
         IEnumerable<CustomizeCheckout> GetRange(long workshopId, List<long> ids);
         void RemoveRange(IEnumerable<CustomizeCheckout> entities);
-        List<CustomizeCheckout> GetByWorkshopIdEmployeeIdInDates(long workshopId, long employeeId, DateTime startDate, DateTime endDate);
-
-        Task<CustomizeCheckout> GetByWorkshopIdEmployeeIdMonthYear(long workshopId, long employeeId, int year,
-            int month);
-
-        (bool Checkout, bool CustomizeCheckout, bool CustomizeCheckoutTemp) ValidateExistsCheckouts(
-            DateTime startDate, DateTime endDate, long workshopId, List<long> employeeId);
     }
 }

Company.Domain/CustomizeCheckoutAgg/ValueObjects/CustomizeCheckoutFine.cs

@@ -5,7 +5,7 @@ namespace Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 
 public record CustomizeCheckoutFine
 {
-    public CustomizeCheckoutFine(string title, string amount, string fineDateFa, DateTime fineDateGr, IsActive isActive, DateTime creationDate, long entityId)
+    public CustomizeCheckoutFine(string title, string amount, string fineDateFa, DateTime fineDateGr, IsActive isActive, DateTime creationDate)
     {
         Title = title;
         Amount = amount;
@@ -13,7 +13,6 @@ public record CustomizeCheckoutFine
         FineDateGr = fineDateGr;
         IsActive = isActive;
         CreationDate = creationDate;
-        EntityId = entityId;
     }
 
     public string Title { get; private set; }
@@ -22,5 +21,4 @@ public record CustomizeCheckoutFine
     public DateTime FineDateGr { get; private set; }
     public IsActive IsActive { get; private set; }
     public DateTime CreationDate { get; private set; }
-    public long EntityId { get; set; }
 }

Company.Domain/CustomizeCheckoutAgg/ValueObjects/CustomizeCheckoutLoanInstallments.cs

@@ -5,7 +5,7 @@ namespace Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 
 public class CustomizeCheckoutLoanInstallments
 {
-    public CustomizeCheckoutLoanInstallments(string amountForMonth, string month, string year, IsActive isActive, string loanRemaining, string loanAmount, long entityId)
+    public CustomizeCheckoutLoanInstallments(string amountForMonth, string month, string year, IsActive isActive, string loanRemaining, string loanAmount)
     {
         AmountForMonth = amountForMonth;
         Month = month;
@@ -13,16 +13,12 @@ public class CustomizeCheckoutLoanInstallments
         IsActive = isActive;
         LoanRemaining = loanRemaining;
         LoanAmount = loanAmount;
-        EntityId = entityId;
     }
 
     public string AmountForMonth { get; private set; }
     public string Month { get; private set; }
     public string Year { get; private set; }
     public string LoanRemaining { get; set; }
-    public IsActive IsActive { get; private set; }
     public string LoanAmount { get; set; }
-    public long EntityId { get; set; }
+    public IsActive IsActive { get; private set; }
-
-
 }

Company.Domain/CustomizeCheckoutAgg/ValueObjects/CustomizeCheckoutRegularShift.cs

@@ -1,12 +0,0 @@
-using System;
-using _0_Framework.Domain.CustomizeCheckoutShared.Base;
-using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
-
-namespace Company.Domain.CustomizeCheckoutAgg.ValueObjects;
-
-public class CustomizeCheckoutRegularShift:CustomizeSifts
-{
-    public CustomizeCheckoutRegularShift(TimeOnly startTime, TimeOnly endTime, ShiftPlacement placement) : base(startTime, endTime, placement)
-    {
-    }
-}

Company.Domain/CustomizeCheckoutAgg/ValueObjects/CustomizeCheckoutReward.cs

@@ -5,7 +5,7 @@ namespace Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 
 public class CustomizeCheckoutReward
 {
-    public CustomizeCheckoutReward(string amount, string description, DateTime grantDate, string grantDateFa, IsActive isActive, string title, long entityId)
+    public CustomizeCheckoutReward(string amount, string description, DateTime grantDate, string grantDateFa, IsActive isActive, string title)
     {
         Amount = amount;
         Description = description;
@@ -13,7 +13,6 @@ public class CustomizeCheckoutReward
         GrantDateFa = grantDateFa;
         IsActive = isActive;
         Title = title;
-        EntityId = entityId;
     }
 
     /// <summary>
@@ -40,7 +39,5 @@ public class CustomizeCheckoutReward
 
 
     public IsActive IsActive { get; private set; }
-    public long EntityId { get; set; }
-
 
 }

Company.Domain/CustomizeCheckoutAgg/ValueObjects/CustomizeCheckoutSalaryAid.cs

@@ -4,23 +4,14 @@ namespace Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 
 public class CustomizeCheckoutSalaryAid
 {
-    public CustomizeCheckoutSalaryAid(string amount, DateTime salaryAidDateTime, string salaryAidDateTimeFa,DateTime calculationDateTime,string calculationDateTimeFa, long entityId)
+    public CustomizeCheckoutSalaryAid(string amount, DateTime salaryAidDateTime, string salaryAidDateTimeFa)
     {
         Amount = amount;
         SalaryAidDateTime = salaryAidDateTime;
         SalaryAidDateTimeFa = salaryAidDateTimeFa;
-        CalculationDateTime = calculationDateTime;
-        CalculationDateTimeFa = calculationDateTimeFa;
-        EntityId = entityId;
     }
 
     public string Amount { get; private set; }
     public DateTime SalaryAidDateTime { get; private set; }
     public string SalaryAidDateTimeFa { get; private set; }
-
-    public DateTime CalculationDateTime { get; private set; }
-    public string CalculationDateTimeFa { get; private set; }
-
-    public long EntityId { get; set; }
-
 }

Company.Domain/CustomizeCheckoutTempAgg/CustomizeCheckoutTemp.cs

@@ -6,9 +6,6 @@ using Company.Domain.WorkshopAgg;
 using System;
 using System.Collections.Generic;
 using Company.Domain.CustomizeCheckoutTempAgg.ValueObjects;
-using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
-using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
-using System.Linq;
 
 
 namespace Company.Domain.CustomizeCheckoutTempAgg;
@@ -21,23 +18,15 @@ public class CustomizeCheckoutTemp : EntityBase
     {
         LateToWorkValue = lateToWorkValue;
     }
-	public CustomizeCheckoutTemp(DateTime contractStart, DateTime contractEnd, long employeeId, string employeeFName,
+	public CustomizeCheckoutTemp(DateTime contractStart, DateTime contractEnd, long employeeId, string employeeFName, string employeeLName, DateTime employeeDateOfBirth,
-		string employeeLName, DateTime employeeDateOfBirth,
 		string employeeNationalCode, string workshopFullName, long workshopId, long? contractId,
-		double monthlySalary, double fridayPay, double overTimePay, double baseYearsPay, double bonusesPay,
+		double monthlySalary, double fridayPay, double overTimePay, double baseYearsPay, double bonusesPay, double nightWorkPay,
-		double nightWorkPay,
+		double marriedAllowance, double shiftPay, double familyAllowance, double leavePay, double insuranceDeduction, double fineAbsenceDeduction,
-		double marriedAllowance, double shiftPay, double familyAllowance, double leavePay, double insuranceDeduction,
+		double lateToWorkDeduction, double earlyExitDeduction, double rewardPay, double salaryAidDeduction, double installmentDeduction,
-		double fineAbsenceDeduction,
+		double fineDeduction, double taxDeduction, string sumOfWorkingDays, string totalClaims, string totalDeductions, double totalPayment, string contractNo, 
-		double lateToWorkDeduction, double earlyExitDeduction, double rewardPay, double salaryAidDeduction,
+        ICollection<CustomizeCheckoutTempFine> checkoutFines, ICollection<CustomizeCheckoutTempLoanInstallments> customizeCheckoutLoanInstallments, 
-		double installmentDeduction,
+        ICollection<CustomizeCheckoutTempSalaryAid> customizeCheckoutSalaryAids, ICollection<CustomizeCheckoutTempReward> customizeCheckoutRewards,
-		double fineDeduction, double taxDeduction, string sumOfWorkingDays, string totalClaims, string totalDeductions,
+        TimeSpan lateToWorkValue)
-		double totalPayment, string contractNo,
-		ICollection<CustomizeCheckoutTempFine> checkoutFines,
-		ICollection<CustomizeCheckoutTempLoanInstallments> customizeCheckoutLoanInstallments,
-		ICollection<CustomizeCheckoutTempSalaryAid> customizeCheckoutSalaryAids,
-		ICollection<CustomizeCheckoutTempReward> customizeCheckoutRewards,
-		TimeSpan lateToWorkValue, double settingSalary, double dailyWage, WorkshopShiftStatus shiftStatus, IrregularShift irregularShift,
-        ICollection<CustomizeRotatingShift> customizeRotatingShifts, ICollection<CustomizeCheckoutRegularShift> employeeSettingsShifts)
 	{
 		YearInt = Convert.ToInt32(contractStart.ToFarsi().Substring(0, 4));
 		MonthInt = Convert.ToInt32(contractStart.ToFarsi().Substring(5, 2));
@@ -81,13 +70,7 @@ public class CustomizeCheckoutTemp : EntityBase
 		WorkshopFullName = workshopFullName;
 
         LateToWorkValue = lateToWorkValue;
-        SettingSalary = settingSalary;
+	}
-        DailyWage = dailyWage;
-        ShiftStatus = shiftStatus;
-        IrregularShift = irregularShift;
-        CustomizeRotatingShifts = customizeRotatingShifts;
-        RegularShifts = employeeSettingsShifts;
-    }
 
 	#region Getters
 	/// <summary>
@@ -120,10 +103,6 @@ public class CustomizeCheckoutTemp : EntityBase
     public ICollection<CustomizeCheckoutTempSalaryAid> CustomizeCheckoutSalaryAids { get; set; }
     public ICollection<CustomizeCheckoutTempReward> CustomizeCheckoutRewards { get; set; }
 
-    public IrregularShift IrregularShift { get; set; }
-    public ICollection<CustomizeRotatingShift> CustomizeRotatingShifts { get; set; }
-    public ICollection<CustomizeCheckoutRegularShift> RegularShifts { get; set; }
-
 
     #endregion
 
@@ -275,22 +254,10 @@ public class CustomizeCheckoutTemp : EntityBase
 	/// </summary>
 	public double TotalPayment { get; private set; }
 
-	/// <summary>
-	/// مزد روزانه
-	/// </summary>
-	public double DailyWage { get; private set; }
 
-	/// <summary>
+    #region Values
-	/// حقوق تعیین شده
-	/// </summary>
-	public double SettingSalary { get; private set; }
-	public WorkshopShiftStatus ShiftStatus { get; set; }
 
-
+    public TimeSpan LateToWorkValue { get; private set; }
-
-	#region Values
-
-	public TimeSpan LateToWorkValue { get; private set; }
 
 
     #endregion
@@ -304,77 +271,6 @@ public class CustomizeCheckoutTemp : EntityBase
     public Workshop Workshop { get; set; }
 	public Employee Employee { get; set; }
 
-    #endregion
+	#endregion
 
-    public void SetValueObjects(ICollection<CustomizeCheckoutTempFine> checkoutFines,
-        ICollection<CustomizeCheckoutTempLoanInstallments> customizeCheckoutLoanInstallments,
-        ICollection<CustomizeCheckoutTempSalaryAid> customizeCheckoutSalaryAids,
-        ICollection<CustomizeCheckoutTempReward> customizeCheckoutRewards)
-    {
-        CheckoutFines = checkoutFines;
-        CustomizeCheckoutLoanInstallments = customizeCheckoutLoanInstallments;
-        CustomizeCheckoutSalaryAids = customizeCheckoutSalaryAids;
-        CustomizeCheckoutRewards = customizeCheckoutRewards;
-    }
-
-    public void SetRewards(ICollection<CustomizeCheckoutTempReward> rewards)
-    {
-        var previousTotalAmount = CustomizeCheckoutRewards.Sum(x => x.Amount.MoneyToDouble());
-        var newTotalAmount = rewards.Sum(x => x.Amount.MoneyToDouble());
-        RewardPay = newTotalAmount;
-        IncreaseTotalPayment(previousTotalAmount,newTotalAmount);
-       RecalculateTotalClaims(previousTotalAmount, newTotalAmount);
-        CustomizeCheckoutRewards = rewards;
-    }
-
-    public void SetSalaryAids(ICollection<CustomizeCheckoutTempSalaryAid> salaryAids)
-    {
-        var previousTotalAmount = CustomizeCheckoutSalaryAids.Sum(x => x.Amount.MoneyToDouble());
-        var newTotalAmount = salaryAids.Sum(x => x.Amount.MoneyToDouble());
-        SalaryAidDeduction = newTotalAmount;
-        ReduceTotalPayment(previousTotalAmount,newTotalAmount);
-        RecalculateTotalDeduction(previousTotalAmount, newTotalAmount);
-        CustomizeCheckoutSalaryAids = salaryAids;
-    }
-
-    public void SetFines(ICollection<CustomizeCheckoutTempFine> fines)
-    {
-        var previousTotalAmount = CheckoutFines.Sum(x => x.Amount.MoneyToDouble());
-        var newTotalAmount = fines.Sum(x => x.Amount.MoneyToDouble());
-        FineDeduction = newTotalAmount;
-        ReduceTotalPayment(previousTotalAmount,newTotalAmount);
-        RecalculateTotalDeduction(previousTotalAmount, newTotalAmount);
-        CheckoutFines = fines;
-    }
-
-    public void SetLoanInstallment(ICollection<CustomizeCheckoutTempLoanInstallments> installments)
-    {
-        var previousTotalAmount = CustomizeCheckoutLoanInstallments.Sum(x => x.AmountForMonth.MoneyToDouble());
-        var newTotalAmount = installments.Sum(x => x.AmountForMonth.MoneyToDouble());
-        InstallmentDeduction = newTotalAmount;
-        ReduceTotalPayment(previousTotalAmount,newTotalAmount);
-        RecalculateTotalDeduction(previousTotalAmount, newTotalAmount);
-        CustomizeCheckoutLoanInstallments = installments;
-    }
-
-
-    private void RecalculateTotalClaims(double previousTotalAmount, double newTotalAmount)
-    {
-        TotalClaims = (TotalClaims.MoneyToDouble() - previousTotalAmount + newTotalAmount).ToMoney();
-    }
-
-
-    private void RecalculateTotalDeduction(double previousTotalAmount, double newTotalAmount)
-    {
-        TotalDeductions = (TotalDeductions.MoneyToDouble() - previousTotalAmount + newTotalAmount).ToMoney();
-    }
-
-    private void ReduceTotalPayment(double previousAmount, double newAmount)
-    {
-        TotalPayment = TotalPayment + previousAmount - newAmount;
-    }
-	private void IncreaseTotalPayment(double previousAmount, double newAmount)
-    {
-        TotalPayment = TotalPayment - previousAmount + newAmount;
-    }
 }

Company.Domain/CustomizeCheckoutTempAgg/ICustomizeCheckoutTempRepository.cs

@@ -4,7 +4,6 @@ using Company.Domain.CustomizeCheckoutAgg;
 using CompanyManagment.App.Contracts.CustomizeCheckout;
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace Company.Domain.CustomizeCheckoutTempAgg
 {
@@ -20,7 +19,5 @@ namespace Company.Domain.CustomizeCheckoutTempAgg
 
         IEnumerable<CustomizeCheckoutTemp> GetRange(long workshopId, List<long> ids);
         void RemoveRange(IEnumerable<CustomizeCheckoutTemp> entities);
-        List<CustomizeCheckoutTemp> GetByWorkshopIdEmployeeIdInDates(long workshopId, long employeeId, DateTime startDate, DateTime endDate);
-        Task<CustomizeCheckoutTemp> GetByWorkshopIdEmployeeIdInDate(long workshopId, long employeeId, DateTime inDate);
     }
 }

Company.Domain/CustomizeCheckoutTempAgg/ValueObjects/CustomizeCheckoutSalaryAid.cs

@@ -4,23 +4,14 @@ namespace Company.Domain.CustomizeCheckoutTempAgg.ValueObjects;
 
 public class CustomizeCheckoutTempSalaryAid
 {
-    public CustomizeCheckoutTempSalaryAid(string amount, DateTime salaryAidDateTime, string salaryAidDateTimeFa,
+    public CustomizeCheckoutTempSalaryAid(string amount, DateTime salaryAidDateTime, string salaryAidDateTimeFa)
-        DateTime calculationDateTime, string calculationDateTimeFa, long entityId)
     {
         Amount = amount;
         SalaryAidDateTime = salaryAidDateTime;
         SalaryAidDateTimeFa = salaryAidDateTimeFa;
-        CalculationDateTime = calculationDateTime;
-        CalculationDateTimeFa = calculationDateTimeFa;
-        EntityId = entityId;
     }
 
     public string Amount { get; private set; }
     public DateTime SalaryAidDateTime { get; private set; }
     public string SalaryAidDateTimeFa { get; private set; }
-
-    public DateTime CalculationDateTime { get; private set; }
-    public string CalculationDateTimeFa { get; private set; }
-    public long EntityId { get; set; }
-
 }

Company.Domain/CustomizeCheckoutTempAgg/ValueObjects/CustomizeCheckoutTempFine.cs

@@ -6,7 +6,7 @@ namespace Company.Domain.CustomizeCheckoutTempAgg.ValueObjects;
 
 public record CustomizeCheckoutTempFine
 {
-    public CustomizeCheckoutTempFine(string title, string amount, string fineDateFa, DateTime fineDateGr, IsActive isActive, DateTime creationDate, long entityId)
+    public CustomizeCheckoutTempFine(string title, string amount, string fineDateFa, DateTime fineDateGr, IsActive isActive, DateTime creationDate)
     {
         Title = title;
         Amount = amount;
@@ -14,7 +14,7 @@ public record CustomizeCheckoutTempFine
         FineDateGr = fineDateGr;
         IsActive = isActive;
         CreationDate = creationDate;
-        EntityId = entityId;
+
     }
     public string Title { get; private set; }
     public string Amount { get; private set; }
@@ -22,6 +22,4 @@ public record CustomizeCheckoutTempFine
     public DateTime FineDateGr { get; private set; }
     public IsActive IsActive { get; private set; }
     public DateTime CreationDate { get; private set; }
-    public long EntityId { get; set; }
-
 }

Company.Domain/CustomizeCheckoutTempAgg/ValueObjects/CustomizeCheckoutTempLoanInstallments.cs

@@ -4,7 +4,7 @@ namespace Company.Domain.CustomizeCheckoutTempAgg.ValueObjects;
 
 public class CustomizeCheckoutTempLoanInstallments
 {
-    public CustomizeCheckoutTempLoanInstallments(string amountForMonth, string month, string year, IsActive isActive, string loanRemaining, string loanAmount, long entityId)
+    public CustomizeCheckoutTempLoanInstallments(string amountForMonth, string month, string year, IsActive isActive, string loanRemaining, string loanAmount)
     {
         AmountForMonth = amountForMonth;
         Month = month;
@@ -12,7 +12,6 @@ public class CustomizeCheckoutTempLoanInstallments
         IsActive = isActive;
         LoanRemaining = loanRemaining;
         LoanAmount = loanAmount;
-        EntityId = entityId;
     }
 
     public string AmountForMonth { get; private set; }
@@ -21,7 +20,5 @@ public class CustomizeCheckoutTempLoanInstallments
     public IsActive IsActive { get; private set; }
     public string LoanRemaining { get; set; }
     public string LoanAmount { get; set; }
-    public long EntityId { get; set; }
-
 
 }

Company.Domain/CustomizeCheckoutTempAgg/ValueObjects/CustomizeCheckoutTempReward.cs

@@ -5,7 +5,7 @@ namespace Company.Domain.CustomizeCheckoutTempAgg.ValueObjects;
 
 public class CustomizeCheckoutTempReward
 {
-    public CustomizeCheckoutTempReward(string amount, string description, DateTime grantDate, string grantDateFa, IsActive isActive, string title, long entityId)
+    public CustomizeCheckoutTempReward(string amount, string description, DateTime grantDate, string grantDateFa, IsActive isActive, string title)
     {
         Amount = amount;
         Description = description;
@@ -13,7 +13,6 @@ public class CustomizeCheckoutTempReward
         GrantDateFa = grantDateFa;
         IsActive = isActive;
         Title = title;
-        EntityId = entityId;
     }
 
     /// <summary>
@@ -38,6 +37,4 @@ public class CustomizeCheckoutTempReward
 
     public IsActive IsActive { get; private set; }
     public string Title { get; set; }
-    public long EntityId { get; set; }
-
 }

Company.Domain/CustomizeWorkshopEmployeeSettingsAgg/Entities/CustomizeWorkshopEmployeeSettings.cs

@@ -27,13 +27,12 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
         FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, long employeeId,
         long workshopId, double salary, long customizeWorkshopGroupSettingId,
         ICollection<CustomizeWorkshopEmployeeSettingsShift> customizeWorkshopEmployeeSettingsShifts,
-        HolidayWork holidayWork, IrregularShift irregularShift, WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime,
+        FridayWork fridayWork,
-        int leavePermittedDays, ICollection<CustomizeRotatingShift> rotatingShifts
+        HolidayWork holidayWork, IrregularShift irregularShift, WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime, int leavePermittedDays, ICollection<CustomizeRotatingShift> rotatingShifts) :
-        , List<WeeklyOffDay> weeklyOffDays) :
         base(fridayPay, overTimePay,
         baseYearsPay, bonusesPay, nightWorkPay,
         marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
-        earlyExit, holidayWork, breakTime, leavePermittedDays,weeklyOffDays)
+        earlyExit, fridayWork, holidayWork, breakTime, leavePermittedDays)
     {
         CustomizeWorkshopGroupSettingId = customizeWorkshopGroupSettingId;
         IsSettingChanged = false;
@@ -83,6 +82,7 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
     /// <param name="fineAbsenceDeduction">جریمه غیبت</param>
     /// <param name="lateToWork">تاخیر در ورود</param>
     /// <param name="earlyExit">تعجیل درخروج</param>
+    /// <param name="fridayWork">آیا در روز های جمعه موظف به کار است</param>
     /// <param name="holidayWork">آیا در تعطیلات رسمی موظف به کار است</param>
     /// <param name="workshopIrregularShifts">نوع شیفت کاری </param>
     /// <param name="workshopShiftStatus">آیا شیفت منظم است یا نا منظم</param>
@@ -91,7 +91,7 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
         NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
         FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
         FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
-        HolidayWork holidayWork, IrregularShift irregularShift, bool isSettingChange, int leavePermittedDays)
+        FridayWork fridayWork, HolidayWork holidayWork, IrregularShift irregularShift, bool isSettingChange, int leavePermittedDays)
     {
         SetValueObjects(fridayPay, overTimePay, baseYearsPay, bonusesPay
             , nightWorkPay, marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction,
@@ -99,6 +99,7 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
 
         Salary = salary;
         IsSettingChanged = isSettingChange;
+        FridayWork = fridayWork;
         HolidayWork = holidayWork;
         LeavePermittedDays = leavePermittedDays;
     }
@@ -111,8 +112,8 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
     public void SimpleEdit(
         ICollection<CustomizeWorkshopEmployeeSettingsShift> employeeSettingsShift,
         IrregularShift irregularShift,
-        WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime, bool isShiftChange,HolidayWork holidayWork,
+        WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime, bool isShiftChange, FridayWork fridayWork, HolidayWork holidayWork,
-        ICollection<CustomizeRotatingShift> rotatingShifts,List<WeeklyOffDay> weeklyOffDays)
+        ICollection<CustomizeRotatingShift> rotatingShifts)
     {
         BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
         IsShiftChanged = isShiftChange;
@@ -125,8 +126,9 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
             : new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
 
         CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
+
+        FridayWork = fridayWork;
         HolidayWork = holidayWork;
-        WeeklyOffDays = weeklyOffDays;
     }
 
 
@@ -211,62 +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;
-        if (groupSetting == null)
-            return;
-        bool isShiftChange;
 
 
-        if (WorkshopShiftStatus == WorkshopShiftStatus.Regular)
-        {
-
-
-
-            if (CustomizeWorkshopEmployeeSettingsShifts.All(x => groupSetting.CustomizeWorkshopGroupSettingsShifts.Any(y => x.Equals(y)))
-                && WorkshopShiftStatus == groupSetting.WorkshopShiftStatus && FridayWork == groupSetting.FridayWork &&
-                HolidayWork == groupSetting.HolidayWork && BreakTime == groupSetting.BreakTime)
-            {
-                isShiftChange = false;
-            }
-
-            else
-            {
-                isShiftChange = true;
-            }
-        }
-        else if (WorkshopShiftStatus == WorkshopShiftStatus.Irregular)
-        {
-            if (WorkshopShiftStatus == groupSetting.WorkshopShiftStatus && BreakTime == groupSetting.BreakTime &&
-                IrregularShift == groupSetting.IrregularShift && FridayWork == groupSetting.FridayWork &&
-                HolidayWork == groupSetting.HolidayWork)
-            {
-                isShiftChange = false;
-            }
-            else
-            {
-                isShiftChange = true;
-            }
-        }
-        else
-        {
-            if (CustomizeRotatingShifts.All(x => groupSetting.CustomizeRotatingShifts.Any(y => x.Equals(y)))
-                && WorkshopShiftStatus == groupSetting.WorkshopShiftStatus && FridayWork == groupSetting.FridayWork &&
-                HolidayWork == groupSetting.HolidayWork && BreakTime == groupSetting.BreakTime)
-            {
-                isShiftChange = false;
-            }
-
-            else
-            {
-                isShiftChange = true;
-            }
-
-        }
-
-        IsShiftChanged = isShiftChange;
-    }
-
-   
 }

Company.Domain/CustomizeWorkshopEmployeeSettingsAgg/ICustomizeWorkshopEmployeeSettingsRepository.cs

@@ -15,5 +15,4 @@ public interface ICustomizeWorkshopEmployeeSettingsRepository : IRepository<long
     List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingNotInMainGroup(long entityWorkshopId);
     void RemoveByWorkshopIdAndEmployeeId(long workshopId, long employeeId);
 
-    bool CheckEmployeeShiftHasChanged(EditCustomizeEmployeeSettings command);
 }

Company.Domain/CustomizeWorkshopGroupSettingsAgg/Entities/CustomizeWorkshopGroupSettings.cs

@@ -27,12 +27,11 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
          FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay,
         BonusesPay bonusesPay, NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
         FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
-        FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
+        FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, FridayWork fridayWork,
-        HolidayWork holidayWork, BreakTime breakTime, WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, int leavePermittedDays,
+        HolidayWork holidayWork, BreakTime breakTime, WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, int leavePermittedDays, ICollection<CustomizeRotatingShift> rotatingShifts) :
-        ICollection<CustomizeRotatingShift> rotatingShifts, List<WeeklyOffDay> weeklyOffDays) :
         base(fridayPay, overTimePay, baseYearsPay, bonusesPay, nightWorkPay,
         marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
-        earlyExit, holidayWork, breakTime, leavePermittedDays,weeklyOffDays)
+        earlyExit, fridayWork, holidayWork, breakTime, leavePermittedDays)
     {
         GroupName = groupName;
         Salary = salary;
@@ -77,7 +76,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
         LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
         LateToWork lateToWork, EarlyExit earlyExit,
-        ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
+        ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts, FridayWork fridayWork,
         HolidayWork holidayWork, IrregularShift irregularShift, ICollection<CustomizeRotatingShift> rotatingShifts,
         WorkshopShiftStatus workshopShiftStatus, long customizeWorkshopSettingId, BreakTime breakTime, int leavePermittedDays)
     {
@@ -97,6 +96,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         FineAbsenceDeduction = fineAbsenceDeduction;
         LateToWork = lateToWork;
         EarlyExit = earlyExit;
+        FridayWork = fridayWork;
         HolidayWork = holidayWork;
         LeavePermittedDays = leavePermittedDays;
         CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
@@ -123,7 +123,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
         NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
         LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
-        LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
+        LateToWork lateToWork, EarlyExit earlyExit, FridayWork fridayWork, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
     {
         GroupName = groupName;
         Salary = salary;
@@ -140,6 +140,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         FineAbsenceDeduction = fineAbsenceDeduction;
         LateToWork = lateToWork;
         EarlyExit = earlyExit;
+        FridayWork = fridayWork;
         HolidayWork = holidayWork;
         IsSettingChange = isSettingChange;
         LeavePermittedDays = leavePermittedDays;
@@ -153,7 +154,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         {
             item.EditEmployees(Salary, FridayPay, OverTimePay, BaseYearsPay, BonusesPay
                 , NightWorkPay, MarriedAllowance, ShiftPay, FamilyAllowance, LeavePay, InsuranceDeduction, FineAbsenceDeduction,
-                LateToWork, EarlyExit, HolidayWork, IrregularShift, false, leavePermittedDays);
+                LateToWork, EarlyExit, FridayWork, HolidayWork, IrregularShift, false, leavePermittedDays);
         }
     }
     public void EditAndOverwriteOnAllEmployees(string groupName, double salary,
@@ -161,13 +162,14 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
         NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
         LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
-        LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
+        LateToWork lateToWork, EarlyExit earlyExit, FridayWork fridayWork, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
     {
         SetValueObjects(fridayPay, overTimePay, baseYearsPay, bonusesPay
             , nightWorkPay, marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction,
             lateToWork, earlyExit);
         GroupName = groupName;
         Salary = salary;
+        FridayWork = fridayWork;
         HolidayWork = holidayWork;
         IsSettingChange = isSettingChange;
         LeavePermittedDays = leavePermittedDays;
@@ -180,7 +182,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         {
             item.EditEmployees(Salary, FridayPay, OverTimePay, BaseYearsPay, BonusesPay
                 , NightWorkPay, MarriedAllowance, ShiftPay, FamilyAllowance, LeavePay, InsuranceDeduction, FineAbsenceDeduction,
-                LateToWork, EarlyExit, HolidayWork, IrregularShift, false, leavePermittedDays);
+                LateToWork, EarlyExit, FridayWork, HolidayWork, IrregularShift, false, leavePermittedDays);
         }
     }
 
@@ -193,7 +195,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
 
     public void EditSimpleAndOverwriteOnEmployee(string groupName, IEnumerable<long> employeeIds,
         ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts, WorkshopShiftStatus workshopShiftStatus,
-        IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange, HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts, List<WeeklyOffDay> weeklyOffDays)
+        IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange, FridayWork fridayWork, HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts)
     {
         GroupName = groupName;
         CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
@@ -207,11 +209,9 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
 
         BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
         IsShiftChange = isShiftChange;
-
+        FridayWork = fridayWork;
         HolidayWork = holidayWork;
 
-        WeeklyOffDays = weeklyOffDays;
-
         //var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
         // .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
         if (isShiftChange)
@@ -219,7 +219,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
 
         }
 
-        var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
+        var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.id));
 
         foreach (var item in permittedToOverWrite)
         {
@@ -227,15 +227,15 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
                 .ToList();
             item.SimpleEdit(customizeWorkshopGroupSettingsShifts
                 .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList(),
-                IrregularShift, WorkshopShiftStatus, BreakTime, false, HolidayWork, newRotatingShifts,WeeklyOffDays.ToList());
+                IrregularShift, WorkshopShiftStatus, BreakTime, false, FridayWork, HolidayWork, newRotatingShifts);
         }
 
     }
 
     public void EditSimpleAndOverwriteOnAllEmployees(string groupName,
         ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
-        WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange, 
+        WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange,
-        HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts ,List<WeeklyOffDay> weeklyOffDays)
+        FridayWork fridayWork, HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts)
     {
         GroupName = groupName;
         CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
@@ -251,8 +251,8 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
         IsShiftChange = isShiftChange;
         HolidayWork = holidayWork;
+        FridayWork = fridayWork;
 
-        WeeklyOffDays = weeklyOffDays;
         //var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
         // .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
 
@@ -262,7 +262,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
                 .ToList();
             item.SimpleEdit(customizeWorkshopGroupSettingsShifts
                 .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList(),
-                irregularShift, workshopShiftStatus, breakTime, false, HolidayWork, newRotatingShifts,WeeklyOffDays.ToList());
+                irregularShift, workshopShiftStatus, breakTime, false, FridayWork, HolidayWork, newRotatingShifts);
         }
 
     }
@@ -298,14 +298,13 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         IrregularShift irregularShift = new(IrregularShift.StartTime, IrregularShift.EndTime,
             IrregularShift.WorkshopIrregularShifts);
         BreakTime breakTime = new(BreakTime.HasBreakTimeValue, BreakTime.BreakTimeValue);
-        List<WeeklyOffDay> weeklyOffDays = WeeklyOffDays.Select(x => new WeeklyOffDay(x.DayOfWeek)).ToList();
 
         var rotatingShift = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime)).ToList();
 
         var customizeWorkshopEmployeeSettings = new CustomizeWorkshopEmployeeSettings(fridayPay, overTimePay, baseYearsPay, bonusesPay, nightWorkPay,
             marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
-            earlyExit, employeeId, workshopId, Salary, id, shifts, HolidayWork, irregularShift,
+            earlyExit, employeeId, workshopId, Salary, id, shifts, FridayWork, HolidayWork, irregularShift,
-            WorkshopShiftStatus, breakTime, LeavePermittedDays, rotatingShift, weeklyOffDays);
+            WorkshopShiftStatus, breakTime, LeavePermittedDays, rotatingShift);
 
         CustomizeWorkshopEmployeeSettingsCollection.Add(customizeWorkshopEmployeeSettings);
     }

Company.Domain/CustomizeWorkshopSettingsAgg/Entities/CustomizeWorkshopSettings.cs

@@ -17,7 +17,7 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 
 	public CustomizeWorkshopSettings(long workshopId,
 		ICollection<CustomizeWorkshopSettingsShift> customizeWorkshopSettingsShifts, int leavePermittedDays,
-		WorkshopShiftStatus workshopShiftStatus,HolidayWork holidayWork, List<WeeklyOffDay> weeklyOffDays)
+		WorkshopShiftStatus workshopShiftStatus,FridayWork fridayWork,HolidayWork holidayWork)
 	{
 		FridayPay = new FridayPay(FridayPayType.None, 0);
 		OverTimePay = new OverTimePay(OverTimePayType.None, 0);
@@ -38,10 +38,11 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 		OverTimeThresholdMinute = 0;
 		Currency = Currency.Rial;
 		MaxMonthDays = MaxMonthDays.Default;
+		FridayWork = fridayWork;
+		HolidayWork = holidayWork;
 		BonusesPaysInEndOfMonth = BonusesPaysInEndOfYear.EndOfYear;
 		WorkshopShiftStatus = workshopShiftStatus;
-		WeeklyOffDays = weeklyOffDays;
+
-		HolidayWork = holidayWork;
 		if (workshopShiftStatus == WorkshopShiftStatus.Irregular)
 			return;
 
@@ -91,7 +92,8 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 	public void Edit(FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay,
 		NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
 		FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
-		FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, BonusesPaysInEndOfYear bonusesPaysInEndOfYear,
+		FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
+		FridayWork fridayWork, HolidayWork holidayWork, BonusesPaysInEndOfYear bonusesPaysInEndOfYear,
 		int leavePermittedDays, BaseYearsPayInEndOfYear baseYearsPayInEndOfYear, int overTimeThresholdMinute)
 	{
 		FridayPay = fridayPay;
@@ -107,6 +109,7 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 		FineAbsenceDeduction = fineAbsenceDeduction;
 		LateToWork = lateToWork;
 		EarlyExit = earlyExit;
+		FridayWork = fridayWork;
 		HolidayWork = holidayWork;
 		BonusesPaysInEndOfMonth = bonusesPaysInEndOfYear;
 		LeavePermittedDays = leavePermittedDays;
@@ -124,18 +127,19 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 	}
 
 	public void ChangeWorkshopShifts(ICollection<CustomizeWorkshopSettingsShift> customizeWorkshopSettingsShifts,
-        WorkshopShiftStatus workshopShiftStatus,HolidayWork holidayWork, List<WeeklyOffDay> weeklyOffDays)
+        WorkshopShiftStatus workshopShiftStatus,FridayWork fridayWork,HolidayWork holidayWork)
 	{
 		WorkshopShiftStatus = workshopShiftStatus;
         HolidayWork = holidayWork;
+        FridayWork = fridayWork;
 		CustomizeWorkshopSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopSettingsShifts : new List<CustomizeWorkshopSettingsShift>();
-		WeeklyOffDays = weeklyOffDays;
-
 		if (workshopShiftStatus == WorkshopShiftStatus.Regular)
 		{
 			var date = new DateOnly();
 			var firstStartShift = new DateTime(date, CustomizeWorkshopSettingsShifts.MinBy(x => x.Placement).StartTime);
 			var lastEndShift = new DateTime(date, CustomizeWorkshopSettingsShifts.MaxBy(x => x.Placement).EndTime);
+         
+          
             if (lastEndShift > firstStartShift)
                 firstStartShift = firstStartShift.AddDays(1);
             var offSet = (firstStartShift - lastEndShift).Divide(2);

Company.Domain/EmployeeAgg/Employee.cs

@@ -20,14 +20,14 @@ public class Employee : EntityBase
 {
     public Employee(string fName, string lName, string fatherName,
         DateTime dateOfBirth, DateTime dateOfIssue, string placeOfIssue,
-        string nationalCode, string idNumber, string gender, string nationality, string idNumberSerial , string idNumberSeri ,
+        string nationalCode, string idNumber, string gender, string nationality,
         string phone = null, string address = null, string state = null, string city = null,
         string maritalStatus = null, string militaryService = null, string levelOfEducation = null, string fieldOfStudy = null,
         string bankCardNumber = null, string bankBranch = null, string insuranceCode = null, string insuranceHistoryByYear = null,
         string insuranceHistoryByMonth = null, string numberOfChildren = null, string officePhone = null,
         string mclsUserName = null, string mclsPassword = null,
         string eserviceUserName = null, string eservicePassword = null,
-        string taxOfficeUserName = null, string taxOfficepassword = null, string sanaUserName = null, string sanaPassword = null )
+        string taxOfficeUserName = null, string taxOfficepassword = null, string sanaUserName = null, string sanaPassword = null)
     {
         FName = fName;
         LName = lName;
@@ -146,15 +146,6 @@ public class Employee : EntityBase
     /// آیا پرسنل احراز هویت شده است
     /// </summary>
     public bool IsAuthorized { get; set; }
-    /// <summary>
-    /// سریال شناسنامه
-    /// </summary>
-    public string IdNumberSerial { get; set; }
-
-    /// <summary>
-    /// سری شناسنامه
-    /// </summary>
-    public string IdNumberSeri { get; set; }
 
     #endregion
 
@@ -243,39 +234,5 @@ public class Employee : EntityBase
         IsAuthorized = true;
     }
 
-    public void EditAuthorizeEmployee(DateTime dateOfIssue, string placeOfIssue,
-        string phone, string address, string state, string citi,
-        string maritalStatus, string militaryService, string levelOfEducation, string fieldOfStudy,
-        string bankCardNumber, string bankBranch, string insuranceCode, string insuranceHistoryByYear,
-        string insuranceHistoryByMonth, string numberOfChildren, string officePhone,
-        string mclsUserName, string mclsPassword, string eserviceUserName, string eservicePassword, string taxOfficeUserName, string taxOfficepassword, string sanaUserName, string sanaPassword)
-    {
-        DateOfIssue = dateOfIssue;
-        PlaceOfIssue = placeOfIssue;
-        Phone = phone;
-        Address = address;
-        State = state;
-        City = citi;
-        MaritalStatus = maritalStatus;
-        MilitaryService = militaryService;
-        LevelOfEducation = levelOfEducation;
-        FieldOfStudy = fieldOfStudy;
-        BankCardNumber = bankCardNumber;
-        BankBranch = bankBranch;
-        InsuranceCode = insuranceCode;
-        InsuranceHistoryByYear = insuranceHistoryByYear;
-        InsuranceHistoryByMonth = insuranceHistoryByMonth;
-        NumberOfChildren = numberOfChildren;
-        OfficePhone = OfficePhone;
-        MclsUserName = mclsUserName;
-        MclsPassword = mclsPassword;
-        EserviceUserName = eserviceUserName;
-        EservicePassword = eservicePassword;
-        TaxOfficeUserName = taxOfficeUserName;
-        TaxOfficepassword = taxOfficepassword;
-        SanaUserName = sanaUserName;
-        SanaPassword = sanaPassword;
-    }
-
     #endregion
 }

Company.Domain/EmployeeAgg/IEmployeeRepository.cs

@@ -54,7 +54,6 @@ public interface IEmployeeRepository : IRepository<long, Employee>
 
     Employee GetIgnoreQueryFilter(long id);
 
-    Task<List<EmployeeSelectListViewModel>> WorkedEmployeesInWorkshopSelectList(long workshopId);
 
 
     #endregion

Company.Domain/EmployeeAuthorizeTempAgg/EmployeeAuthorizeTemp.cs

@@ -1,44 +0,0 @@
-using System;
-using _0_Framework.Application;
-using _0_Framework.Domain;
-
-namespace Company.Domain.EmployeeAuthorizeTempAgg;
-
-public class EmployeeAuthorizeTemp:EntityBase
-{
-    public EmployeeAuthorizeTemp(Gender gender, string fName, string lName, string fatherName, DateTime birthDate, string nationalCode, string idNumber, string idNumberSerial, string idNumberSeri)
-    {
-        Gender = gender;
-        FName = fName;
-        LName = lName;
-        FatherName = fatherName;
-        BirthDate = birthDate;
-        NationalCode = nationalCode;
-        IdNumber = idNumber;
-        IdNumberSerial = idNumberSerial;
-        IdNumberSeri = idNumberSeri;
-    }
-
-    public Gender Gender { get; private set; }
-    public string FName { get; private set; }
-    public string LName { get; private set; }
-    public string FatherName { get; private set; }
-    public DateTime BirthDate { get; private set; }
-    /// <summary>
-    /// کدملی
-    /// </summary>
-    public string NationalCode { get; set; }
-    /// <summary>
-    /// شماره شناسنامه
-    /// </summary>
-    public string IdNumber { get; set; }
-    /// <summary>
-    /// سریال شناسنامه
-    /// </summary>
-    public string IdNumberSerial { get; set; }
-    /// <summary>
-    /// سری شناسنامه
-    /// </summary>
-    public string IdNumberSeri { get; set; }
-
-}

Company.Domain/EmployeeAuthorizeTempAgg/IEmployeeAuthorizeTempRepository.cs

@@ -1,10 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using _0_Framework.Domain;
-
-namespace Company.Domain.EmployeeAuthorizeTempAgg;
-
-public interface IEmployeeAuthorizeTempRepository:IRepository<long,EmployeeAuthorizeTemp>
-{
-    Task<EmployeeAuthorizeTemp> GetByNationalCode(string nationalCode);
-}

Company.Domain/EmployeeClientTempAgg/IEmployeeClientTempRepository.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
+using _0_Framework.Domain;
-using System.Threading.Tasks;
-using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.EmployeeClientTemp;
 
 namespace Company.Domain.EmployeeClientTempAgg;
@@ -10,5 +8,4 @@ public interface IEmployeeClientTempRepository : IRepository<long, EmployeeClien
     EmployeeClientTemp GetByEmployeeIdAndWorkshopId(long employeeId, long commandWorkshopId);
     EmployeeClientTempGetDetailsViewModel GetDetails(long employeeId, long workshopId);
     void Remove(EmployeeClientTemp entity);
-    Task<List<EmployeeClientTempViewModel>> GetByEmployeeId(long employeeId);
 }

Company.Domain/EmployeeComputeOptionsAgg/IEmployeeComputeOptionsRepository.cs

@@ -5,7 +5,6 @@ using System.Text;
 using System.Threading.Tasks;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.EmployeeComputeOptions;
-using CompanyManagment.App.Contracts.Workshop;
 
 namespace Company.Domain.EmployeeComputeOptionsAgg
 {
@@ -15,7 +14,5 @@ namespace Company.Domain.EmployeeComputeOptionsAgg
         EmployeeComputeOptionsViewModel GetEmployeeOptions(long workshopId, long employeeId);
 
         List<EmployeeComputeOptionsViewModel> GetAllByWorkshopId(long workshopId);
-
-        List<WorkshopViewModel> TestBonusesBugWorkshops();
     }
 }

Company.Domain/EmployeeDocumentItemAgg/EmployeeDocumentItem.cs

@@ -7,105 +7,100 @@ using System.Collections.Generic;
 using _0_Framework.Application;
 using Microsoft.AspNetCore.JsonPatch.Operations;
 
-namespace Company.Domain.EmployeeDocumentItemAgg;
+namespace Company.Domain.EmployeeDocumentItemAgg
-
-public class EmployeeDocumentItem : EntityBase
 {
-    private EmployeeDocumentItem() { }
+    public class EmployeeDocumentItem : EntityBase
-    public long WorkshopId { get; private set; }
-    public long EmployeeId { get; private set; }
-
-    public long UploaderId { get; private set; }
-    public UserType UploaderType { get; private set; }
-    public long UploaderRoleId { get; set; }
-
-
-    public long ReviewedById { get; private set; }
-    public string RejectionReason { get; private set; }
-    public DocumentStatus DocumentStatus { get; private set; }
-    public long MediaId { get; private set; }
-
-    public DateTime? ConfirmationDateTime { get; private set; }
-    public DocumentItemLabel DocumentLabel { get; private set; }
-
-    public long EmployeeDocumentId { get; private set; }
-    public virtual EmployeeDocuments EmployeeDocuments { get; private set; }
-
-    public long? EmployeeDocumentsAdminViewId { get; private set; }
-    public EmployeeDocumentsAdminSelection EmployeeDocumentsAdminSelection { get; private set; }
-
-    public List<EmployeeDocumentItemLog> ItemLogs { get; private set; }
-
-
-    public EmployeeDocumentItem(long workshopId, long employeeId, long mediaId, long employeeDocumentId, DocumentItemLabel documentLabel, long uploaderId,
-        UserType uploaderType, long roleId, DocumentStatus documentStatus = DocumentStatus.Unsubmitted)
     {
-        MediaId = mediaId;
+
-        UploaderId = uploaderId;
+	    public long WorkshopId { get; private set; }
-        UploaderType = uploaderType;
+	    public long EmployeeId { get; private set; }
-        UploaderRoleId = uploaderType == UserType.Admin ? roleId : -1;
+
-        EmployeeId = employeeId;
+        public long UploaderId { get; private set; }
-        WorkshopId = workshopId;
+        public UserType UploaderType { get; private set; }
-        DocumentStatus = documentStatus;
+
-        if (documentStatus == DocumentStatus.Confirmed)
+
+        public long ReviewedById { get; private set; }
+        public string RejectionReason { get; private set; }
+        public DocumentStatus DocumentStatus { get; private set; }
+        public long MediaId { get; private set; }
+
+        public DateTime? ConfirmationDateTime { get; private set; }
+        public DocumentItemLabel DocumentLabel { get; private set; }
+
+        public long EmployeeDocumentId { get; private set; }
+        public virtual EmployeeDocuments EmployeeDocuments { get; private set; }
+
+        public long? EmployeeDocumentsAdminViewId { get; private set; }
+        public EmployeeDocumentsAdminSelection EmployeeDocumentsAdminSelection { get; private set; }
+
+        public List<EmployeeDocumentItemLog> ItemLogs { get; private set; }
+
+
+        public EmployeeDocumentItem(long workshopId,long employeeId, long mediaId, long employeeDocumentId, DocumentItemLabel documentLabel, long uploaderId,
+	        UserType uploaderType, DocumentStatus documentStatus = DocumentStatus.Unsubmitted)
+        {
+            MediaId = mediaId;
+            UploaderId = uploaderId;
+            UploaderType = uploaderType;
+            EmployeeId = employeeId;
+            WorkshopId = workshopId;
+            DocumentStatus = documentStatus;
+            if (documentStatus == DocumentStatus.Confirmed)
+                ConfirmationDateTime = DateTime.Now;
+            DocumentLabel = documentLabel;
+            EmployeeDocumentId = employeeDocumentId;
+            ItemLogs =
+            [
+	            new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.CreatedNewItem, uploaderId, uploaderType)
+            ];
+        }
+
+
+        public void Confirm(long operatorId, UserType userType)
+        {
+            ReviewedById = operatorId;
+            DocumentStatus = DocumentStatus.Confirmed;
             ConfirmationDateTime = DateTime.Now;
-        DocumentLabel = documentLabel;
+            ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.ConfirmedItem, operatorId, userType));
-        EmployeeDocumentId = employeeDocumentId;
+        }
-        ItemLogs =
+
-        [
+        public void Reject(long operatorId, string rejectionReason, UserType userType)
-            new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.CreatedNewItem, uploaderId, uploaderType)
+        {
-        ];
+            RejectionReason = rejectionReason;
+            DocumentStatus = DocumentStatus.Rejected;
+            EmployeeDocuments.UpdateHasRejectedItems();
+            ReviewedById = operatorId;
+            ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.RejectedItem, operatorId, userType, rejectionReason));
+        }
+
+        public void Delete(long operatorId, UserType operatorType)
+        {
+            DocumentStatus = DocumentStatus.Deleted;
+            ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.DeletedItem, operatorId, operatorType));
+        }
+
+        public void AdminSelect(long adminViewId)
+        {
+            EmployeeDocumentsAdminViewId = adminViewId;
+        }
+
+        public void AdminDeselect()
+        {
+            EmployeeDocumentsAdminViewId = 0;
+        }
+        public void SubmitByClient(long operatorId,UserType operatorType)
+        {
+            DocumentStatus = DocumentStatus.SubmittedByClient;
+            ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.SubmittedItems, operatorId, operatorType));
+            EmployeeDocuments.UpdateHasRejectedItems();
+        }
+
+        public void SubmitByAdmin(long operatorId, UserType operatorType)
+        {
+            DocumentStatus = DocumentStatus.SubmittedByAdmin;
+            ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.SubmittedItems, operatorId, operatorType));
+            EmployeeDocuments.UpdateHasRejectedItems();
+        }
     }
 
-
+}
-    public void Confirm(long operatorId, UserType userType)
-    {
-        ReviewedById = operatorId;
-        DocumentStatus = DocumentStatus.Confirmed;
-        ConfirmationDateTime = DateTime.Now;
-        ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.ConfirmedItem, operatorId, userType));
-    }
-
-    public void Reject(long operatorId, string rejectionReason, UserType userType)
-    {
-        RejectionReason = rejectionReason;
-        DocumentStatus = DocumentStatus.Rejected;
-        EmployeeDocuments.UpdateHasRejectedItems();
-        ReviewedById = operatorId;
-        ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.RejectedItem, operatorId, userType, rejectionReason));
-    }
-
-    public void Delete(long operatorId, UserType operatorType)
-    {
-        DocumentStatus = DocumentStatus.Deleted;
-        ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.DeletedItem, operatorId, operatorType));
-    }
-
-    public void AdminSelect(long adminViewId)
-    {
-        EmployeeDocumentsAdminViewId = adminViewId;
-    }
-
-    public void AdminDeselect()
-    {
-        EmployeeDocumentsAdminViewId = 0;
-    }
-    public void SubmitByClient(long operatorId, UserType operatorType)
-    {
-        DocumentStatus = DocumentStatus.SubmittedByClient;
-        ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.SubmittedItems, operatorId, operatorType));
-        EmployeeDocuments.UpdateHasRejectedItems();
-    }
-
-    public void SubmitByAdmin(long operatorId, UserType operatorType)
-    {
-        DocumentStatus = DocumentStatus.SubmittedByAdmin;
-        ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.SubmittedItems, operatorId, operatorType));
-        EmployeeDocuments.UpdateHasRejectedItems();
-    }
-
-    public void SetRoleId(long roleId)
-    {
-        UploaderRoleId = roleId;
-    }
-}

Company.Domain/EmployeeDocumentsAgg/EmployeeDocumentRequiredItems.cs

@@ -9,12 +9,12 @@ namespace Company.Domain.EmployeeDocumentsAgg
         {
             List<DocumentItemLabel> requiredDocuments =
             [
-                DocumentItemLabel.IdCardPage1,/* DocumentItemLabel.IdCardPage2, DocumentItemLabel.IdCardPage3, DocumentItemLabel.NationalCardRear,*/
+                DocumentItemLabel.IdCardPage1, DocumentItemLabel.IdCardPage2, DocumentItemLabel.IdCardPage3, DocumentItemLabel.NationalCardRear,
-                DocumentItemLabel.NationalCardFront,/*DocumentItemLabel.EmployeePicture*/
+                DocumentItemLabel.NationalCardFront,DocumentItemLabel.EmployeePicture
             ];
 
-            //if (gender == "مرد")
+            if (gender == "مرد")
-            //    requiredDocuments.Add(DocumentItemLabel.MilitaryServiceCard);
+                requiredDocuments.Add(DocumentItemLabel.MilitaryServiceCard);
 
             return requiredDocuments;
         }

Company.Domain/EmployeeDocumentsAgg/IEmployeeDocumentsRepository.cs

@@ -9,7 +9,7 @@ using CompanyManagment.App.Contracts.Workshop;
 namespace Company.Domain.EmployeeDocumentsAgg
 {
     public interface IEmployeeDocumentsRepository : IRepository<long, EmployeeDocuments>
-    {
+    { 
         EmployeeDocuments GetByEmployeeIdWorkshopId(long employeeId, long workshopId);
         EmployeeDocumentsViewModel GetViewModelByEmployeeIdWorkshopId(long employeeId, long workshopId);
         List<EmployeeDocumentsViewModel> SearchForClient(SearchEmployeeDocuments cmd);
@@ -30,76 +30,5 @@ namespace Company.Domain.EmployeeDocumentsAgg
         Task<int> GetAdminWorkFlowCountForNewEmployees(List<long> workshopIds);
         Task<int> GetAdminWorkFlowCountForSubmittedAndRejectedDocuments(List<long> workshopIds);
         List<EmployeeDocumentsViewModel> GetDocumentsAwaitingReviewByWorkshopIdForCheckerWorkFlow(long workshopId);
-
-        #region Mahan
-        /// <summary>
-        /// کارگاهی که افزودن پرسنل کرده اند. بر اساس نقش فیلتر میشوند
-        /// </summary>
-        /// <param name="workshops"></param>
-        /// <param name="roleId"></param>
-        /// <returns></returns>
-        Task<ICollection<WorkshopWithEmployeeDocumentsViewModel>> GetWorkshopDocumentCreatedEmployeeForAdmin(
-            List<long> workshops, long roleId);
-
-        /// <summary>
-        ///کارگاه های مدارک های برگشت خورده براساس دسترسی افراد و نقششان. یک مدرک برگشت خورده به تمامی کسانی که به آن کارگاه دسترسی دارند و تمامی کسانی که هم نقش آپلود کننده بوده اند نمایش داده میشود
-        /// </summary>
-        /// <param name="workshops"></param>
-        /// <param name="roleId"></param>
-        /// <returns></returns>
-        Task<ICollection<WorkshopWithEmployeeDocumentsViewModel>> GetWorkshopDocumentRejectedForAdmin(
-            List<long> workshops, long roleId);
-
-        /// <summary>
-        /// مدارک های برگشت خورده براساس دسترسی افراد و نقششان. یک مدرک برگشت خورده به تمامی کسانی که به آن کارگاه دسترسی دارند و تمامی کسانی که هم نقش آپلود کننده بوده اند نمایش داده میشود
-        /// </summary>
-        /// <param name="workshopId"></param>
-        /// <param name="roleId"></param>
-        /// <returns></returns>
-        Task<List<EmployeeDocumentsViewModel>> GetRejectedItemsByWorkshopIdAndRoleForAdminWorkFlow(long workshopId,
-            long roleId);
-
-        /// <summary>
-        /// کارگاه هایی که افزودن پرسنل کرده اند و مدارک آنها ناقص است
-        /// </summary>
-        /// <param name="workshops"></param>
-        /// <param name="roleId"></param>
-        /// <returns></returns>
-        Task<List<WorkshopWithEmployeeDocumentsViewModel>> GetCreatedEmployeesWorkshopDocumentForAdmin(
-            List<long> workshops,long roleId);
-
-        /// <summary>
-        /// پرسنلی که افزوده شده اند در کارگاه و آپلود مدارک آنها ناقص است
-        /// </summary>
-        /// <param name="workshopId"></param>
-        /// <returns></returns>
-        Task<List<EmployeeDocumentsViewModel>> GetCreatedEmployeesDocumentByWorkshopIdForAdmin(long workshopId);
-
-        /// <summary>
-        /// لیست کارگاه هایی که مدارک آپلود شده توسط کلاینت برگشت خورده است در کارپوشه ادمین
-        /// </summary>
-        /// <param name="workshops"></param>
-        /// <param name="roleId"></param>
-        /// <returns></returns>
-        Task<List<WorkshopWithEmployeeDocumentsViewModel>> GetClientRejectedDocumentWorkshopsForAdmin(
-            List<long> workshops, long roleId);
-
-        /// <summary>
-        ///  مدارک های آپلود شده توسط کلاینت در کارگاه که برگشت خورده اند در کارپوشه ادمین
-        /// </summary>
-        /// <param name="workshopId"></param>
-        /// <returns></returns>
-        Task<List<EmployeeDocumentsViewModel>> GetClientRejectedDocumentByWorkshopIdForAdmin(long workshopId);
-
-        /// <summary>
-        /// مدارک های برگشت خورده برای کلاینت
-        /// </summary>
-        /// <param name="workshopId"></param>
-        /// <param name="accountId"></param>
-        /// <returns></returns>
-        Task<List<EmployeeDocumentsViewModel>> GetClientRejectedDocumentForClient(long workshopId, long accountId);
-
-        #endregion
-
     }
 }

Company.Domain/EmployeeInsurancListDataAgg/EmployeeInsurancListData.cs

@@ -12,7 +12,7 @@ public class EmployeeInsurancListData : EntityBase
 {
     public EmployeeInsurancListData(long insuranceListId, long employeeId, int workingDays, double dailyWage, double monthlySalary,
         double monthlyBenefits, double monthlyBenefitsIncluded, double benefitsIncludedContinuous, double benefitsIncludedNonContinuous,
-        double insuranceShare, DateTime startWorkDate, DateTime? leftWorkDate, long jobId,bool includeStatus, double baseYears, double marriedAllowance, double overTimePay, double familyAllowance)
+        double insuranceShare, DateTime startWorkDate, DateTime? leftWorkDate, long jobId,bool includeStatus, double baseYears, double marriedAllowance)
     {
         InsuranceListId = insuranceListId;
         EmployeeId = employeeId;
@@ -30,8 +30,6 @@ public class EmployeeInsurancListData : EntityBase
         IncludeStatus = includeStatus;
         BaseYears = baseYears;
         MarriedAllowance = marriedAllowance;
-        OverTimePay = overTimePay;
-        FamilyAllowance = familyAllowance;
         DailyWagePlusBaseYears = dailyWage + baseYears;
     }
 
@@ -112,20 +110,10 @@ public class EmployeeInsurancListData : EntityBase
     /// </summary>
     public double MarriedAllowance { get; private set; }
 
-    /// <summary>
-    /// اضافه کار فیش حقوقی
-    /// </summary>
-    public double OverTimePay { get; private set; }
-
-    /// <summary>
-    /// حق اولاد فیش حقوقی
-    /// </summary>
-    public double FamilyAllowance { get; private set; }
-
 
     public void Edit(int workingDays, double dailyWage, double monthlySalary, double monthlyBenefits, double monthlyBenefitsIncluded, 
         double benefitsIncludedContinuous, double benefitsIncludedNonContinuous, double insuranceShare, DateTime startWorkDate,
-        DateTime? leftWorkDate, long jobId, bool includeStatus, double baseYears, double marriedAllowance, double overTimePay, double familyAllowance)
+        DateTime? leftWorkDate, long jobId, bool includeStatus, double baseYears, double marriedAllowance)
     {
             
         WorkingDays = workingDays;
@@ -142,8 +130,6 @@ public class EmployeeInsurancListData : EntityBase
         IncludeStatus= includeStatus;
         BaseYears = baseYears;
         MarriedAllowance = marriedAllowance;
-        OverTimePay = overTimePay;
-        FamilyAllowance = familyAllowance;
         DailyWagePlusBaseYears = dailyWage + baseYears;
     }
 

Company.Domain/File1/IFileRepository.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using _0_Framework_b.Domain;
 using CompanyManagment.App.Contracts.Employee;
 using CompanyManagment.App.Contracts.Employer;
@@ -17,17 +16,4 @@ public interface IFileRepository : IRepository<long, File1>
     string GetEmployerFullNameById(long id);
     List<EmployeeViewModel> GetAllEmploees();
     List<EmployerViewModel> GetAllEmployers();
-
-    #region Mahan
-
-
-    Task<List<FileExcelViewModel>> GetExcelDetails();
-    Task<List<FileListViewModel>> GetList(GetFileSearchModel searchModel);
-    #endregion
-
-    Task<List<string>> GetAllArchiveNo();
-    Task<List<string>> GetAllClassFiles();
-    Task<List<EmployeeSelectListViewModel>> GetClientAndLitigation();
-    Task<EditEmployee> GetClientDetails(long fileId);
-
 }

Company.Domain/FileAlert/IFileAlertRepository.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using _0_Framework_b.Domain;
 using CompanyManagment.App.Contracts.FileAlert;
 
@@ -11,5 +10,4 @@ public interface IFileAlertRepository : IRepository<long, FileAlert>
     FileAlertViewModel GetDetails(long id);
     void Remove(long id);
     List<EditFileAlert> Search(FileAlertSearchModel searchModel);
-    Task<List<FileAlertViewModel>> GetFileAlerts(FileAlertSearchModel searchModel);
 }

Company.Domain/FineAgg/Fine.cs

@@ -6,11 +6,7 @@ namespace Company.Domain.FineAgg;
 
 public class Fine:EntityBase
 {
-    private Fine()
+    public Fine(long employeeId, long workshopId, string title, double amount,DateTime fineDate)
-    {
-	    
-    }
-    public Fine(long employeeId, long workshopId, string title, double amount,DateTime fineDate, long createdByAccountId, UserType createdByUserType)
     {
         EmployeeId = employeeId;
         WorkshopId = workshopId;
@@ -19,9 +15,6 @@ public class Fine:EntityBase
         IsActive = IsActive.True;
         FineDate = fineDate;
 
-        CreatedByUserType = createdByUserType;
-        CreatedByAccountId = createdByAccountId;
-
     }
 
     public long EmployeeId { get; private set; }
@@ -31,23 +24,7 @@ public class Fine:EntityBase
     public IsActive IsActive { get; private set; }
     public DateTime FineDate { get; private set; }
 
-
+    public void DeActive()
-    /// <summary>
-    /// شخصی که جریمه را ساخته است
-    /// </summary>
-    public long CreatedByAccountId { get; private set; }
-    public UserType CreatedByUserType { get; private set; }
-
-
-    /// <summary>
-    /// شخصی که جریمه را ویرایش کرده است
-    /// </summary>
-    public long LastModifiedByAccountId { get; private set; }
-    public UserType LastModifiedByUserType { get; private set; }
-
-
-
-	public void DeActive()
     {
         IsActive = IsActive.False;
     }
@@ -57,15 +34,14 @@ public class Fine:EntityBase
         IsActive = IsActive.True;
     }
 
-    public void Edit(long employeeId, long workshopId, string title, double amount,DateTime fineDate, long modifiedByAccountId, UserType modifiedByUserType)
+    public void Edit(long employeeId, long workshopId, string title, double amount,DateTime fineDate)
     {
         EmployeeId = employeeId;
         WorkshopId = workshopId;
         Title = title;
         Amount = amount;
         FineDate = fineDate;
-        LastModifiedByAccountId = modifiedByAccountId;
+
-        LastModifiedByUserType = modifiedByUserType;
     }
 
 }

Company.Domain/FineAgg/IFineRepository.cs

@@ -12,14 +12,4 @@ public interface IFineRepository : IRepository<long, Fine>
 	void Remove(Fine entity);
 	void RemoveRange(IEnumerable<Fine> entityEnumerable);
 
-
-	#region Pooya
-
-	/// <summary>
-	/// گروهبندی بر اساس ماه هنگام جستجو با انتخاب کارمند
-	/// </summary>
-	FinesGroupedViewModel GetSearchListAsGrouped(FineSearchViewModel searchModel);
-
-	#endregion
-
 }

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

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

Company.Domain/InstitutionPlanAgg/IPlanPercentageRepository.cs

@@ -1,29 +0,0 @@
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.InstitutionPlan;
-using CompanyManagment.App.Contracts.TemporaryClientRegistration;
-using System.Collections.Generic;
-
-namespace Company.Domain.InstitutionPlanAgg;
-
-public interface IPlanPercentageRepository : IRepository<long, PlanPercentage>
-{
-    EditInstitutionPlanPercentage GetById(long id);
-
-    EditInstitutionPlanPercentage GetByFirst();
-
-    /// <summary>
-    /// دریافت لیست 30 تایی مبالغ سرویس ها به ازای هر نفر
-    /// </summary>
-    /// <param name="pageIndex"></param>
-    /// <param name="countPeron"></param>
-    /// <returns></returns>
-    List<InstitutionPlanViewModel> GetInstitutionPlanList(int pageIndex, int countPeron);
-
-    /// <summary>
-    /// دریافت مبالغ سرویس ها برای هر کارگاه
-    /// بر اساس تعداد پرسنل کارگاه
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    InstitutionPlanViewModel GetInstitutionPlanForWorkshop(WorkshopTempViewModel command);
-}

Company.Domain/InstitutionPlanAgg/PlanPercentage.cs

@@ -1,65 +0,0 @@
-using _0_Framework.Domain;
-
-namespace Company.Domain.InstitutionPlanAgg;
-
-public class PlanPercentage : EntityBaseWithoutCreationDate
-{
-    public PlanPercentage(int contractAndCheckoutPercent, int insurancePercent, int rollCallPercent, int customizeCheckoutPercent, int contractAndCheckoutInPersonPercent, int insuranceInPersonPercent)
-    {
-        ContractAndCheckoutPercent = contractAndCheckoutPercent;
-        InsurancePercent = insurancePercent;
-        RollCallPercent = rollCallPercent;
-        CustomizeCheckoutPercent = customizeCheckoutPercent;
-        ContractAndCheckoutInPersonPercent = contractAndCheckoutInPersonPercent;
-        InsuranceInPersonPercent = insuranceInPersonPercent;
-    }
-
-    /// <summary>
-    /// قرارداد و تصفیه
-    /// درصد از مزد روزانه
-    /// </summary>
-    public int ContractAndCheckoutPercent { get; private set; }
-
-    /// <summary>
-    /// بیمه
-    /// درصد از مزد روزانه
-    /// </summary>
-    public int InsurancePercent { get; private set; }
-
-    /// <summary>
-    /// حضورغباب
-    /// درصد از مزد روزانه
-    /// </summary>
-    public int RollCallPercent { get; private set; }
-
-    /// <summary>
-    /// فیش غیر رسمی
-    /// درصد از مزد روزانه
-    /// </summary>
-    public int CustomizeCheckoutPercent { get; private set; }
-
-    /// <summary>
-    /// خدمات حضوری قرداد و تصفیه
-    /// درصد از مزد روزانه
-    /// </summary>
-    public int ContractAndCheckoutInPersonPercent { get; private set; }
-
-    /// <summary>
-    /// خدمات حضوری بیمه
-    /// درصد از مزد روزانه
-    /// </summary>
-    public int InsuranceInPersonPercent { get; private set; }
-
-
-    public void Edit(int contractAndCheckoutPercent, int insurancePercent, int rollCallPercent, int customizeCheckoutPercent, int contractAndCheckoutInPersonPercent, int insuranceInPersonPercent)
-    {
-        ContractAndCheckoutPercent = contractAndCheckoutPercent;
-        InsurancePercent = insurancePercent;
-        RollCallPercent = rollCallPercent;
-        CustomizeCheckoutPercent = customizeCheckoutPercent;
-        ContractAndCheckoutInPersonPercent = contractAndCheckoutInPersonPercent;
-        InsuranceInPersonPercent = insuranceInPersonPercent;
-    }
-
-
-}

Company.Domain/InsurancJobAgg/IInsuranceJobRepositpry.cs

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

Company.Domain/InsuranceJobItemAgg/IInsuranceJobItemRepositpry.cs

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

Company.Domain/InsuranceJobItemAgg/InsuranceJobItem.cs

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

Company.Domain/LeaveAgg/Leave.cs

@@ -8,7 +8,7 @@ public class Leave: EntityBase
 {
     public Leave(DateTime startLeave, DateTime endLeave,
         string leaveHourses, long workshopId, long employeeId,
-        string paidLeaveType, string leaveType, string employeeFullName, string workshopName, bool isAccepted, string decription, int year, int month, TimeSpan shiftDuration, bool hasShiftDuration)
+        string paidLeaveType, string leaveType, string employeeFullName, string workshopName, bool isAccepted, string decription, int year, int month)
     {
         StartLeave = startLeave;
         EndLeave = endLeave;
@@ -23,8 +23,6 @@ public class Leave: EntityBase
         Decription = decription;
         Year = year;
         Month = month;
-        ShiftDuration = shiftDuration;
-        HasShiftDuration = hasShiftDuration;
     }
 
     public DateTime StartLeave { get; private set; }
@@ -40,13 +38,9 @@ public class Leave: EntityBase
     public string Decription { get; private set; }
     public int Year { get; private set; }
     public int Month { get; private set; }
-
-    public TimeSpan ShiftDuration { get; private set; }
-    public bool HasShiftDuration { get; private set; }
-
     public void Edit(DateTime startLeave, DateTime endLeave,
         string leaveHourses, long workshopId, long employeeId,
-        string paidLeaveType, string leaveType, string employeeFullName, string workshopName, bool isAccepted, string decription, int year, int month,bool hasShiftDuration,TimeSpan shiftDuration)
+        string paidLeaveType, string leaveType, string employeeFullName, string workshopName, bool isAccepted, string decription, int year, int month)
     {
         StartLeave = startLeave;
         EndLeave = endLeave;
@@ -61,7 +55,5 @@ public class Leave: EntityBase
         Decription = decription;
         Year = year;
         Month = month;
-        ShiftDuration = shiftDuration;
-        HasShiftDuration = hasShiftDuration;
     }
 }

Company.Domain/LeftWorkAgg/ILeftWorkRepository.cs

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