fix: update absence terminology to 'عدم حضور' across multiple files

# Conflicts:
#	Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
#	CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
#	CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs

.github/workflows/dotnet-developPublish.yml

@@ -0,0 +1,48 @@
+name: Deploy Development ASP.NET Core App to IIS
+
+on:
+  push:
+    branches:
+      - Main
+
+env:
+  DOTNET_ENVIRONMENT: Development
+
+jobs:
+  build-and-deploy:
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Setup .NET SDK
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '8.0.x' # یا نسخه پروژه‌ت
+
+    - name: Restore dependencies
+      run: dotnet restore
+
+    - name: Build
+      run: dotnet build --configuration Release 
+
+    - name: Publish
+      run: dotnet publish --configuration Release --output ./publish /p:EnvironmentName=Development --no-build
+
+    - name: Deploy to IIS via Web Deploy
+      shell: powershell
+      run: |
+        $publishFolder = Resolve-Path ./publish
+        & "C:\Program Files\IIS\Microsoft Web Deploy V3\msdeploy.exe" `
+          -verb:sync `
+          -source:contentPath="$publishFolder" `
+          -dest:contentPath="dadmehrg",computerName="https://171.22.24.15:8172/msdeploy.axd?site=dadmehrg",userName="Administrator",password="R2rNpdnetP3j>q5b18",authType="Basic" `
+          -allowUntrusted `
+          -enableRule:AppOffline
+
+
+      env:
+        SERVER_HOST: your-server-ip-or-domain
+        DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+        DEPLOY_PASSWORD: ${{ secrets.DEPLOY_PASSWORD }}

.gitignore

@@ -361,4 +361,4 @@ MigrationBackup/
 
 # # Fody - auto-generated XML schema
 # FodyWeavers.xsd
-
+.idea

0_Framework/0_Framework.csproj

@@ -14,7 +14,26 @@
     <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" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="7.2.0" />
+
+
+
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="Application\UID\UidService.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="Application\AuthorizedPerson\AuthorizedPersonApplication.cs" />
+    <Compile Remove="Application\AuthorizedPerson\IAuthorizedPersonApplication.cs" />
+    <Compile Remove="Domain\AuthorizedPersonAgg\IAuthorizedPersonRepository.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Domain\AuthorizedPersonAgg\" />
+    <Folder Include="InfraStructure\AuthorizedPerson\" />
   </ItemGroup>
 
 </Project>

0_Framework/Application/AppSettingConfiguration.cs

@@ -0,0 +1,8 @@
+namespace _0_Framework.Application;
+
+public class AppSettingConfiguration
+{
+    public string Domain { get; set; }
+    public string ClientDomain =>"client"+Domain;
+    public string AdminDomain =>"admin"+Domain;
+}

0_Framework/Application/AuthHelper.cs

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

0_Framework/Application/AuthViewModel.cs

@@ -20,6 +20,7 @@ public class AuthViewModel
 
     public int? PositionValue { get; set; }
     public string WorkshopSlug { get; set; }
+    public long WorkshopId { get; set; }
     public string WorkshopName { get; set; }
 	public List<WorkshopClaim> WorkshopList { get; set; }
 

0_Framework/Application/Enums/ActivationStatus.cs

@@ -0,0 +1,8 @@
+namespace _0_Framework.Application.Enums;
+
+public enum ActivationStatus
+{
+    None = 0,
+    Active = 1,
+    DeActive = 2
+}

0_Framework/Application/Enums/LegalType.cs

@@ -0,0 +1,8 @@
+namespace _0_Framework.Application.Enums;
+
+public enum LegalType
+{
+    None = 0,
+    Real = 1,
+    Legal = 2
+}

0_Framework/Application/IAuthHelper.cs

@@ -17,11 +17,12 @@ public interface IAuthHelper
 
 	#region Vafa
 
-	void UpdateWorkshopSlugClaim(string workshopSlug, string workshopName);
+	void UpdateWorkshopSlugClaim(string workshopSlug, string workshopName, long workshopId);
 
 	#endregion
 	long CurrentSubAccountId();
     string GetWorkshopSlug();
     string GetWorkshopName();
-    (long Id, UserType userType) GetUserTypeWithId();
+    long GetWorkshopId();
+    (long Id, UserType userType, long roleId) GetUserTypeWithId();
 }

0_Framework/Application/IsActive.cs

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

0_Framework/Application/OperationResult.cs

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

0_Framework/Application/PagedResult.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace _0_Framework.Application;
+
+
+public class PagedResult<T> where T : class
+{
+    public int TotalCount  { get; set; }
+    public List<T> List { get; set; }
+}
+public class PagedResult<T,TMeta>:PagedResult<T> where T : class
+{
+    public TMeta? Meta { get; set; }
+}

0_Framework/Application/PaginationRequest.cs

@@ -0,0 +1,7 @@
+namespace _0_Framework.Application;
+
+public class PaginationRequest
+{
+    public int PageIndex { get; set; } = 1;
+    public int PageSize { get; set; } = 30;
+}

0_Framework/Application/PaymentGateway/AqayePardakhtPaymentGateway.cs

@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Json;
+using System.Security.Policy;
+using System.Security.Principal;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Options;
+
+namespace _0_Framework.Application.PaymentGateway;
+
+public class AqayePardakhtPaymentGateway:IPaymentGateway
+{
+    private static string _pin = "86EAF2C4D052F7D8759F";
+    private const string AccountNumber = "AP.1042276242";
+    private const string EncryptedKey = "130D2@D2923";
+
+    private readonly HttpClient _httpClient;
+
+    public AqayePardakhtPaymentGateway(IHttpClientFactory httpClientFactory,IOptions<AppSettingConfiguration> appSetting)
+    {
+        _httpClient = httpClientFactory.CreateClient();
+         
+        if (appSetting.Value.Domain == ".dadmehrg.ir")
+        {
+            _pin = "7349F84E81AB584862D9";
+        }
+
+    }
+
+    public async Task<PaymentGatewayResponse> Create(CreatePaymentGatewayRequest command,CancellationToken cancellationToken =default)
+    {
+        var response = await _httpClient.PostAsJsonAsync("https://panel.aqayepardakht.ir/api/v2/create", new
+        {
+            pin = _pin,
+            amount = command.Amount,
+            callback = command.CallBackUrl,
+            card_number = command.CardNumber,
+            invoice_id = command.InvoiceId,
+            mobile = command.Mobile,    
+            email = command.Email??"",
+            description = command.Description,
+        }, cancellationToken: cancellationToken);
+        var resStr = await response.Content.ReadAsStringAsync(cancellationToken);
+        var result = await response.Content.ReadFromJsonAsync<PaymentGatewayResponse>(cancellationToken: cancellationToken);
+        return result;
+    }
+
+    public string GetStartPayUrl(string transactionId) =>
+        $"https://panel.aqayepardakht.ir/startpay/{transactionId}";
+
+    public async Task<PaymentGatewayResponse> Verify(VerifyPaymentGateWayRequest command, CancellationToken cancellationToken = default)
+    {
+        var response = await _httpClient.PostAsJsonAsync("https://panel.aqayepardakht.ir/api/v2/verify", new
+        {
+            pin = _pin,
+            amount = command.Amount,
+            transid = command.TransactionId,
+        }, cancellationToken: cancellationToken);
+
+        var result = await response.Content.ReadFromJsonAsync<PaymentGatewayResponse>(cancellationToken: cancellationToken);
+        return result;
+    }
+
+    public async Task<PaymentGatewayResponse> CreateSandBox(CreatePaymentGatewayRequest command, CancellationToken cancellationToken = default)
+    {
+        var response = await _httpClient.PostAsJsonAsync("https://panel.aqayepardakht.ir/api/v2/create", new
+        {
+            pin = "sandbox",
+            amount = command.Amount,
+            callback = command.CallBackUrl,
+            card_number = command.Amount,
+            invoice_id = command.InvoiceId,
+            mobile = command.Mobile,
+            email = command.Email,
+            description = command.Email,
+        }, cancellationToken: cancellationToken);
+
+        var result = await response.Content.ReadFromJsonAsync<PaymentGatewayResponse>(cancellationToken: cancellationToken);
+        return result;
+    }
+
+    public string GetStartPaySandBoxUrl(string transactionId) =>
+        $"https://panel.aqayepardakht.ir/startpay/sandbox/{transactionId}";
+
+    public async Task<WalletAmountResponse> GetWalletAmount(CancellationToken cancellationToken)
+    {
+        var response =await _httpClient.PostAsJsonAsync("https://panel.aqayepardakht.ir/api/v2/getmoney", new
+        {
+            account=AccountNumber,
+            code = EncryptedKey
+        }, cancellationToken: cancellationToken);
+        var jsonString = await response.Content.ReadAsStringAsync(cancellationToken);
+        var result = await response.Content.ReadFromJsonAsync<WalletAmountResponse>(cancellationToken);
+        return result;
+    }
+}

0_Framework/Application/PaymentGateway/IPaymentGateway.cs

@@ -0,0 +1,62 @@
+using Microsoft.AspNetCore.Server.HttpSys;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json.Serialization;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace _0_Framework.Application.PaymentGateway;
+
+public interface IPaymentGateway
+{
+    Task<PaymentGatewayResponse> Create(CreatePaymentGatewayRequest command, CancellationToken cancellationToken =default);
+
+    string GetStartPayUrl(string transactionId);
+    Task<PaymentGatewayResponse> Verify(VerifyPaymentGateWayRequest command, CancellationToken cancellationToken=default);
+    Task<PaymentGatewayResponse> CreateSandBox(CreatePaymentGatewayRequest command, CancellationToken cancellationToken=default);
+    string GetStartPaySandBoxUrl(string transactionId);
+    Task<WalletAmountResponse> GetWalletAmount(CancellationToken cancellationToken);
+
+}
+public class PaymentGatewayResponse
+{
+    [JsonPropertyName("status")]
+    public string Status { get; set; }  
+
+    [JsonPropertyName("code")]
+    public int? ErrorCode { get; set; }
+
+    [JsonPropertyName("transid")]
+    public string TransactionId { get; set; }
+
+    public bool IsSuccess => Status == "success";
+}
+
+public class WalletAmountResponse
+{
+    [JsonPropertyName("status")]
+    public string Status { get; set; }
+    [JsonPropertyName("money")]
+    public double Amount { get; set; }
+    [JsonPropertyName("code")]
+    public int Code { get; set; }
+}
+
+public class CreatePaymentGatewayRequest
+{
+    public double Amount { get; set; }
+    public string CallBackUrl { get; set; }
+    public string InvoiceId { get; set; }
+    public string CardNumber { get; set; }
+    public string Mobile { get; set; }
+    public string Email { get; set; }
+    public string Description { get; set; }
+}
+
+public class VerifyPaymentGateWayRequest
+{
+    public string TransactionId { get; set; }
+    public double Amount { get; set; }
+}

0_Framework/Application/SelectListViewModel.cs

@@ -0,0 +1,7 @@
+namespace _0_Framework.Application;
+
+public class SelectListViewModel
+{
+    public long Id { get; set; }
+    public string Text { get; set; }
+}

0_Framework/Application/Sms/ISmsService.cs

@@ -9,10 +9,28 @@ 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();
+    
+    public Task<bool> SendInstitutionVerificationLink(string number,string fullName, Guid institutionId);
+    
+    public Task<bool> SendInstitutionVerificationCode(string number, string code);
+
+    #endregion
+
 }

0_Framework/Application/Sms/OtpResultViewModel.cs

@@ -0,0 +1,7 @@
+namespace _0_Framework.Application.Sms;
+
+public class OtpResultViewModel
+{
+    public int ExpireTimeSec { get; set; }
+    public int ReSendTimeSec { get; set; }
+}

0_Framework/Application/Sms/SentSmsViewModel.cs

@@ -0,0 +1,32 @@
+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,6 +9,7 @@ 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;
@@ -16,10 +17,14 @@ 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)
@@ -110,6 +115,31 @@ 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)
     {
 
@@ -174,8 +204,7 @@ public class SmsService : ISmsService
 	    int pageSize = 100; // max: 100
 	    SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
 		var response = await smsIr.GetArchivedReportAsync(pageNumber, pageSize, unixTimestamp, unixTimestamp2);
-
-
+        
         MessageReportResult[] messages = response.Data;
 	    foreach (var message in messages)
 	    {
@@ -285,4 +314,44 @@ 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;
+        }
+       
+    }
+    public async Task<bool> SendInstitutionVerificationLink(string number,string fullName, Guid institutionId)
+    {
+       var guidStr=institutionId.ToString();
+       var firstPart = guidStr.Substring(0, 15);
+       var secondPart = guidStr.Substring(15);
+        var verificationSendResult =await SmsIr.VerifySendAsync(number, 527519, new VerifySendParameter[]
+        {
+            new("FULLNAME", fullName),
+            new("CODE1",firstPart),
+            new("CODE2",secondPart)
+        });
+        return verificationSendResult.Status == 0;
+    }
+
+    public async Task<bool> SendInstitutionVerificationCode(string number, string code)
+    {
+        var verificationSendResult =await  SmsIr.VerifySendAsync(number, 965348, new VerifySendParameter[]
+        {
+            new("VERIFYCODE", code)
+        });
+        return verificationSendResult.Status == 0;
+    }
+
+    #endregion
 }

0_Framework/Application/StaticWorkshopAccounts.cs

@@ -14,14 +14,25 @@ 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 - عمار حسن دوست
+    /// 20 - سمیرا الهی نیا
     /// </summary>
-    public static List<long> StaticAccountIds = [2, 3, 380, 381];
+    public static List<long> StaticAccountIds = [2, 3, 380, 381, 392, 20];
 
     /// <summary>
     /// این تاریخ در جدول اکانت لفت ورک به این معنیست

0_Framework/Application/SubAccountPermissionHelper.cs

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

0_Framework/Application/Tools.cs

@@ -41,6 +41,23 @@ public static class Tools
         return Regex.IsMatch(mobileNo, "^((09))(\\d{9})$");
     }
 
+    /// <summary>
+    /// تاریخ شروع و تعداد ماه را میگیرد و تاریخ پایان قراردا را بر میگرداند
+    /// </summary>
+    /// <param name="startDate"></param>
+    /// <param name="monthPlus"></param>
+    /// <returns></returns>
+    public static (DateTime endDateGr, string endDateFa) FindEndOfContract(string startDate, string monthPlus)
+    {
+
+        int startYear = Convert.ToInt32(startDate.Substring(0, 4));
+        int startMonth = Convert.ToInt32(startDate.Substring(5, 2));
+        int startDay = Convert.ToInt32(startDate.Substring(8, 2));
+        var start = new PersianDateTime(startYear, startMonth, startDay);
+        var end = (start.AddMonths(Convert.ToInt32(monthPlus))).AddDays(-1);
+        return ($"{end}".ToGeorgianDateTime(), $"{end}");
+
+    }
 
     /// <summary>
     /// دریافت روزهای کارکرد پرسنل در لیست بیمه ماه مشخص شده
@@ -52,81 +69,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,
-	    DateTime endDate,long employeeId)
+    public static (int countWorkingDays, DateTime startWork, DateTime endWork, bool hasStartWorkInMonth, bool hasLeftWorkInMonth) GetEmployeeInsuranceWorkingDays(DateTime startWork, DateTime? leftWork, DateTime startDate,
+        DateTime endDate, long employeeId)
     {
-	    DateTime start = startDate;
+        DateTime start = startDate;
         DateTime end = endDate;
         bool startWorkInMonth = false;
         bool endWorkInMonth = false;
-    
+
         //اگر شروع بکار پرسنل در ماه مشخص شده لیست بیمه بود
         if (startWork >= startDate)
         {
-	        start = startWork;
-	        startWorkInMonth = true;
+            start = startWork;
+            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://ثابت- کسری حاجی پور
-	        //    countWorkingDays = 15;
-	        //    break;
-	        case 40463://ثابت
-		        countDays = 10;
-		        break;
-	        case 40469://ثابت
-		        countDays = 7;
-		        break;
-	        //case 9950://ثابت
-		       // countDays = 15;
-		        //break;
-	        case 9640://ثابت
-		        countDays = 15;
-		        break;
-	        case 40998://ثابت
-		        countDays = 15;
-		        break;
-	        case 6219://ثابت
-		        countDays = 15;
-		        break;
-		        //case 7897://ثابت
-		        //    countWorkingDays = 15;
+            //case 3812://ثابت- کسری حاجی پور
+            //    countWorkingDays = 15;
+            //    break;
+            case 40463://ثابت
+                countDays = 10;
+                break;
+            case 40469://ثابت
+                countDays = 7;
+                break;
+            //case 9950://ثابت
+            // countDays = 15;
+            //break;
+            case 9640://ثابت
+                countDays = 15;
+                break;
+            case 40998://ثابت
+                countDays = 15;
+                break;
+            case 6219://ثابت
+                countDays = 15;
+                break;
+                //case 7897://ثابت
+                //    countWorkingDays = 15;
         }
 
 
-		return (countDays,start,end,startWorkInMonth,endWorkInMonth);
+        return (countDays, start, end, startWorkInMonth, endWorkInMonth);
     }
-	/// <summary>
-	/// محاسبه سن 
-	/// </summary>
-	/// <param name="startDate"></param>
-	/// <param name="endDate"></param>
-	/// <returns></returns>
-	public static (int yearCount, int monthCount, int dayCount) GetAge(DateTime startDate, DateTime endDate)
+    /// <summary>
+    /// محاسبه سن 
+    /// </summary>
+    /// <param name="startDate"></param>
+    /// <param name="endDate"></param>
+    /// <returns></returns>
+    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 +158,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 +210,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 +261,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 +414,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,25 +475,46 @@ 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++)
+        try
         {
-            if (char.IsDigit(myMoney[x]))
-                bb += myMoney[x];
-        }
+            if (!string.IsNullOrWhiteSpace(myMoney))
+            {
+                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 res;
+                if (bb.Length > 0)
+                {
+                    double res = double.Parse(bb);
+                    return isNegative ? -res : res;
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+            else
+            {
+                return 0;
+            }
+            
         }
-        else
+        catch (Exception)
         {
+
             return 0;
         }
-
-
-
     }
     public static string ToFileName(this DateTime date)
     {
@@ -598,90 +636,90 @@ public static class Tools
     /// <returns></returns>
     public static int YearTotalDays(this string date)
     {
-        int y2 = 365;
+        int y2 = 366;
         var year = Convert.ToInt32(date.Substring(0, 4));
 
 
         switch (year)
         {
             case 1346:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1350:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1354:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1358:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1362:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1366:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1370:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1375:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1379:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1383:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1387:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1391:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1395:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1399:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1403:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1408:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1412:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1416:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1420:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1424:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1428:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1432:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1436:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1441:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1445:
-                y2 = 366;
+                y2 = 367;
                 break;
 
             default:
-                y2 = 365;
+                y2 = 366;
                 break;
 
         }
@@ -875,7 +913,15 @@ public static class Tools
             }
         }
 
-        numbers = Convert.ToInt32(num);
+        try
+        {
+            numbers = Convert.ToInt32(num);
+        }
+        catch (Exception e)
+        {
+            return 0;
+        }
+     
         return numbers;
     }
     public static string ToFarsiMonthByNumber(this string value)
@@ -884,30 +930,39 @@ 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;
@@ -1267,16 +1322,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)
             {
 
-               
+
             }
 
         }
@@ -1382,14 +1437,89 @@ public static class Tools
             return false;
         return true;
     }
+
+    /// <summary>
+    /// چک میکند که در دو شیفت استاتیک تداخل زمانی وجود دارد یا خیر
+    /// چک میکند که آیا ساعات وارد شده ولید هستند یا خیر
+    /// </summary>
+    /// <param name="start1"></param>
+    /// <param name="end1"></param>
+    /// <param name="start2"></param>
+    /// <param name="end2"></param>
+    /// <returns></returns>
+    public static bool InterferenceTime(string start1, string end1, string start2, string end2)
+    {
+        if (!CheckValidHm(start1))
+            return true;
+
+        if (!CheckValidHm(end1))
+            return true;
+
+        if (!CheckValidHm(start2))
+            return true;
+
+        if (!CheckValidHm(end2))
+            return true;
+
+        //اگه دو شیفت نبود
+        if (string.IsNullOrWhiteSpace(start1) || string.IsNullOrWhiteSpace(start2))
+            return false;
+
+
+        try
+        {
+            var start1Gr = Convert.ToDateTime(start1);
+            var end1Gr = Convert.ToDateTime(end1);
+
+            if (end1Gr < start1Gr)
+                end1Gr = end1Gr.AddDays(1);
+
+            var start2Gr = Convert.ToDateTime(start2);
+            var end2Gr = Convert.ToDateTime(end2);
+
+
+            start2Gr = new DateTime(end1Gr.Year, end1Gr.Month, end1Gr.Day, start2Gr.Hour, start2Gr.Minute,
+                start2Gr.Second);
+
+
+            end2Gr = new DateTime(end1Gr.Year, end1Gr.Month, end1Gr.Day, end2Gr.Hour, end2Gr.Minute,
+                end2Gr.Second);
+            if (end2Gr < start2Gr)
+                end2Gr = end2Gr.AddDays(1);
+
+            var diff = (end1Gr - start1Gr).Add((end2Gr - start2Gr));
+            if (diff > new TimeSpan(24,0,0))
+                return true;
+
+            if (start2Gr <= end1Gr)
+                return true;
+
+            return false;
+        }
+        catch (Exception)
+        {
+
+            return true;
+        }
+
+        
+    }
     public static DateTime FindFirstDayOfMonthGr(this DateTime date)
     {
-	    var pc = new PersianCalendar();
-	    return ($"{pc.GetYear(date)}/{pc.GetMonth(date):00}/01").ToGeorgianDateTime();
+        var pc = new PersianCalendar();
+        return ($"{pc.GetYear(date)}/{pc.GetMonth(date):00}/01").ToGeorgianDateTime();
     }
     #region Mahan
 
 
+    public static bool IsvalidIban(this string iban)
+    {
+        return Regex.IsMatch(iban, @"^IR[0-9]{24}$");
+    }
+    public static bool IsValidCardNumber(this string cardNumber)
+    {
+        return Regex.IsMatch(cardNumber, @"^[0-9]{16}$");
+    }
     /// <summary>
     /// این متد حروف عربی را به فارسی در میاورد. مثال: علي را به علی تبدیل میکند
     /// </summary>
@@ -1403,6 +1533,8 @@ public static class Tools
 
             if (@char == char.Parse("ي"))
                 res += "ی";
+            else if (@char == char.Parse("ك"))
+                res += "ک";
             else
                 res += @char;
         }
@@ -1588,19 +1720,19 @@ public static class Tools
 
     public static TimeOnly CalculateOffset(ICollection<CustomizeSifts> shiftDetailsRegularShifts)
     {
-	    if (!shiftDetailsRegularShifts.Any())
-	    {
-		    return TimeOnly.MinValue;
-	    }
-	    var date = new DateOnly();
-	    var firstStartShift = new DateTime(date, shiftDetailsRegularShifts.MinBy(x => x.Placement).StartTime);
-	    var lastEndShift = new DateTime(date, shiftDetailsRegularShifts.MaxBy(x => x.Placement).EndTime);
-	    if (lastEndShift > firstStartShift)
-		    firstStartShift = firstStartShift.AddDays(1);
-	    var offSet = (firstStartShift - lastEndShift).Divide(2);
-	    return TimeOnly.FromDateTime(lastEndShift.Add(offSet));
+        if (!shiftDetailsRegularShifts.Any())
+        {
+            return TimeOnly.MinValue;
+        }
+        var date = new DateOnly();
+        var firstStartShift = new DateTime(date, shiftDetailsRegularShifts.MinBy(x => x.Placement).StartTime);
+        var lastEndShift = new DateTime(date, shiftDetailsRegularShifts.MaxBy(x => x.Placement).EndTime);
+        if (lastEndShift > firstStartShift)
+            firstStartShift = firstStartShift.AddDays(1);
+        var offSet = (firstStartShift - lastEndShift).Divide(2);
+        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);
@@ -1680,6 +1812,10 @@ public static class Tools
 
     }
 
+
+
+
+
     #endregion
 
     #region Pooya
@@ -1772,75 +1908,75 @@ public static class Tools
     public static string ToFarsiHoursAndMinutes(int hours, int minutes, string emptyValue = "")
     {
 
-	    string message = emptyValue;
-	    if (hours > 0 && minutes > 0)
-	    {
+        string message = emptyValue;
+        if (hours > 0 && minutes > 0)
+        {
 
-		    message = hours + " " + "ساعت و" + " " + minutes + " " + "دقیقه";
-	    }
-	    else if (hours > 0 && minutes == 0)
-	    {
+            message = hours + " " + "ساعت و" + " " + minutes + " " + "دقیقه";
+        }
+        else if (hours > 0 && minutes == 0)
+        {
 
-		    message = hours + " " + "ساعت ";
-	    }
-	    else if (hours == 0 && minutes > 0)
-	    {
+            message = hours + " " + "ساعت ";
+        }
+        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 minutes = timeSpan.Minutes;
-	    string message = emptyValue;
-	    if (hours > 0 && minutes > 0)
-	    {
+        var hours = (int)timeSpan.TotalHours;
+        var minutes = timeSpan.Minutes;
+        string message = emptyValue;
+        if (hours > 0 && minutes > 0)
+        {
 
-		    message = hours + " " + "ساعت و" + " " + minutes + " " + "دقیقه";
-	    }
-	    else if (hours > 0 && minutes == 0)
-	    {
+            message = hours + " " + "ساعت و" + " " + minutes + " " + "دقیقه";
+        }
+        else if (hours > 0 && minutes == 0)
+        {
 
-		    message = hours + " " + "ساعت ";
-	    }
-	    else if (hours == 0 && minutes > 0)
-	    {
+            message = hours + " " + "ساعت ";
+        }
+        else if (hours == 0 && minutes > 0)
+        {
 
-		    message = minutes + " " + "دقیقه";
-	    }
+            message = minutes + " " + "دقیقه";
+        }
 
-	    return message;
+        return message;
     }
-	public static string ToFarsiDaysAndHoursAndMinutes(this TimeSpan timeSpan, string emptyValue = "")
-	{
-		var hours = (int)timeSpan.TotalHours;
-		var minutes = timeSpan.Minutes;
-		var days = hours / 24;
-		hours = hours % 24;
-		string message = "";
+    public static string ToFarsiDaysAndHoursAndMinutes(this TimeSpan timeSpan, string emptyValue = "")
+    {
+        var hours = (int)timeSpan.TotalHours;
+        var minutes = timeSpan.Minutes;
+        var days = hours / 24;
+        hours = hours % 24;
+        string message = "";
 
-		if (days > 0)
-			message += days + " " + "روز";
-		if (hours > 0)
-			if (message == "")
-				message += hours + " " + "ساعت";
-			else
-				message += " و " + hours + " " + "ساعت";
-		if (minutes > 0)
-			if (message == "")
-				message += minutes + " " + "دقیقه";
-			else
-				message += " و " + minutes + " " + "دقیقه";
+        if (days > 0)
+            message += days + " " + "روز";
+        if (hours > 0)
+            if (message == "")
+                message += hours + " " + "ساعت";
+            else
+                message += " و " + hours + " " + "ساعت";
+        if (minutes > 0)
+            if (message == "")
+                message += minutes + " " + "دقیقه";
+            else
+                message += " و " + minutes + " " + "دقیقه";
 
-		if (message == "")
-			message = emptyValue;
-		return message;
-	}
+        if (message == "")
+            message = emptyValue;
+        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)
@@ -1873,5 +2009,44 @@ 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/IUidService.cs

@@ -38,7 +38,7 @@ public class UidBasicInformation
     {
         "GENDER_MALE" => Application.Gender.Male,
         "GENDER_FEMALE" => Application.Gender.Female,
-        _ => throw new ArgumentOutOfRangeException()
+        _ => Application.Gender.None
     };
 }
 public record IdentificationInformation(string NationalId, string BirthDate, string ShenasnameSeri, string ShenasnameSerial, string ShenasnamehNumber);
@@ -110,6 +110,53 @@ public interface IUidService
 {
     Task<PersonalInfoResponse> GetPersonalInfo(string nationalCode , string birthDate);
     Task<MatchMobileWithNationalCodeResponse> IsMachPhoneWithNationalCode(string nationalCode , string phoneNumber);
+    Task<IbanInquiryResponse> IbanInquiry (string iban);
+    Task<AccountToIbanResponse> AccountToIban(string accountNumber, UidBanks bank);
+    Task<CardToNumberResponse> CardToIban(string cardNumber);
+}
+
+public class CardToNumberResponse:UidBaseResponse
+{
+    public string Iban { get; set; }
+    public string CardNumber { get; set; }
+}
+
+public class AccountToIbanResponse:UidBaseResponse
+{
+    public string Iban { get; set; }
+}
+
+public class IbanInquiryResponse:UidBaseResponse
+{
+    public IbanInquiryAccountBasicInformation AccountBasicInformation { get; set; }
+    [JsonProperty("owners")]
+    public List<IbanInquiryOwner> Owners { get; set; }
+}
+
+public class IbanInquiryAccountBasicInformation
+{
+    public string Iban { get; set; }
+    public string AccountNumber { get; set; }
+    public IbanInquiryBankInformation BankInformation { get; set; }
+    public string AccountStatus { get; set; }
+
+}
+
+public class IbanInquiryBankInformation
+{
+    public string BankName { get; set; }
+}
+
+public class IbanInquiryOwner
+{
+    [JsonProperty("firstName")]
+    public string FirstName { get; set; }
+    [JsonProperty("lastName")]
+    public string LastName { get; set; }
+    [JsonProperty("nationalIdentifier")]
+    public string NationalIdentifier { get; set; }
+    [JsonProperty("customerType")]
+    public string CustomerType { get; set; }
 }
 
 public class MatchMobileWithNationalCodeResponse
@@ -118,4 +165,7 @@ public class MatchMobileWithNationalCodeResponse
 
     public ResponseContext ResponseContext { get; set; }
 }
-
+public class UidBaseResponse
+{
+    public ResponseContext ResponseContext { get; set; }
+}

0_Framework/Application/UID/UidBanks.cs

@@ -0,0 +1,117 @@
+using System.ComponentModel;
+
+namespace _0_Framework.Application.UID;
+
+public enum UidBanks
+{
+    [Description("بانک دی")]
+    BANK_DEY = 66,
+    
+    [Description("بانک سپه")]
+    BANK_SEPAH = 15,
+    
+    [Description("بانک شهر")]
+    BANK_SHAHR = 61,
+    
+    [Description("بانک ملت")]
+    BANK_MELAT = 12,
+    
+    [Description("بانک ملی")]
+    BANK_MELLI = 17,
+    
+    [Description("بانک رفاه کارگران")]
+    BANK_REFAH = 13,
+    
+    [Description("بانک سینا")]
+    BANK_SINA = 59,
+    
+    [Description("بانک مسکن")]
+    BANK_MASKAN = 14,
+    
+    [Description("بانک آینده")]
+    BANK_AYANDEH = 62,
+    
+    [Description("بانک انصار")]
+    BANK_ANSAR = 63,
+    
+    [Description("بانک تجارت")]
+    BANK_TEJARAT = 18,
+    
+    [Description("بانک رسالت")]
+    BANK_RESALAT = 70,
+    
+    [Description("بانک سامان")]
+    BANK_SAMAN = 56,
+    
+    [Description("بانک مرکزی")]
+    BANK_MARKAZI = 10,
+    
+    [Description("بانک سرمایه")]
+    BANK_SARMAYEH = 58,
+    
+    [Description("بانک صادرات")]
+    BANK_SADERAT = 19,
+    
+    [Description("بانک قوامین")]
+    BANK_GHAVAMIN = 52,
+    
+    [Description("بانک پارسیان")]
+    BANK_PARSIAN = 54,
+    
+    [Description("بانک کشاورزی")]
+    BANK_KESHAVARZI = 16,
+    
+    [Description("بانک گردشگری")]
+    BANK_GARDESHGARI = 64,
+    
+    [Description("پست بانک")]
+    BANK_POST_BANK = 21,
+    
+    [Description("بانک پاسارگاد")]
+    BANK_PASARGAD = 57,
+    
+    [Description("بانک کارآفرین")]
+    BANK_KARAFARIN = 53,
+    
+    [Description("بانک خاورمیانه")]
+    BANK_KHAVARMIANEH = 78,
+    
+    [Description("بانک ایران زمین")]
+    BANK_IRAN_ZAMIN = 69,
+    
+    [Description("بانک مهر اقتصاد")]
+    BANK_MEHR_EQTESAD = 79,
+    
+    [Description("بانک صنعت و معدن")]
+    BANK_SANAT_MADAN = 11,
+    
+    [Description("بانک اقتصاد نوین")]
+    BANK_EGHTESAD_NOVIN = 55,
+    
+    [Description("بانک توسعه تعاون")]
+    BANK_TOSSE_TAAVON = 22,
+    
+    [Description("بانک توسعه صادرات")]
+    BANK_TOSSE_SADERAT = 20,
+    
+    [Description("بانک ایران و ونزوئلا")]
+    BANK_IRAN_VENEZUELA = 95,
+    
+    [Description("بانک حکمت ایرانیان")]
+    BANK_HEKMAT_IRANIAN = 65,
+    
+    [Description("بانک قرض الحسنه مهر")]
+    BANK_GHARZOLHASANEH_MEHR = 60,
+    
+    [Description("موسسه مالی و اعتباری ملل")]
+    BANK_MOASSASE_MELLAL = 75,
+    
+    [Description("موسسه مالی و اعتباری نور")]
+    BANK_MOASSASE_NOOR = 80,
+    
+    [Description("موسسه مالی و اعتباری کوثر")]
+    BANK_MOASSASE_KOSAR = 73,
+    
+    [Description("موسسه مالی و اعتباری توسعه")]
+    BANK_MOASSASE_TOSSE = 51
+}

0_Framework/Application/UID/UidBanksExtension.cs

@@ -0,0 +1,27 @@
+using System;
+using System.ComponentModel;
+using System.Reflection;
+
+namespace _0_Framework.Application.UID
+{
+    public static class UidBanksExtension
+    {
+        /// <summary>
+        /// دریافت نام فارسی بانک
+        /// </summary>
+        /// <param name="bank">بانک</param>
+        /// <returns>نام فارسی بانک</returns>
+        public static string GetPersianName(this UidBanks bank)
+        {
+            var fieldInfo = bank.GetType().GetField(bank.ToString());
+            
+            if (fieldInfo == null) 
+                return string.Empty;
+            
+            var attribute = (DescriptionAttribute)Attribute.GetCustomAttribute(
+                fieldInfo, typeof(DescriptionAttribute));
+            
+            return attribute?.Description ?? bank.ToString();
+        }
+    }
+}

0_Framework/Application/UID/UidService.cs

@@ -1,81 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-
-namespace _0_Framework.Application.UID;
-
-public class UidService : IUidService
-{
-    private readonly HttpClient _httpClient;
-    private const string BaseUrl= "https://json-api.uid.ir/api/inquiry/";
-
-    public UidService()
-    {
-        _httpClient = new HttpClient()
-        {
-            BaseAddress = new Uri(BaseUrl)
-        };
-    }
-
-    public async Task<PersonalInfoResponse> GetPersonalInfo(string nationalCode, string birthDate)
-    {
-        var request = new PersonalInfoRequest
-        {
-            BirthDate = birthDate ,
-            NationalId = nationalCode,
-            RequestContext = new UidRequestContext()
-        };
-        var json = JsonConvert.SerializeObject(request);
-        var contentType = new StringContent(json, Encoding.UTF8, "application/json");
-
-        try
-        {
-            var requestResult = await _httpClient.PostAsync("person/v2", contentType);
-            if (!requestResult.IsSuccessStatusCode)
-                return null;
-            var responseResult = await requestResult.Content.ReadFromJsonAsync<PersonalInfoResponse>();
-            responseResult.BasicInformation.FirstName = responseResult.BasicInformation.FirstName.ToPersian();
-            responseResult.BasicInformation.LastName = responseResult.BasicInformation.LastName.ToPersian();
-            responseResult.BasicInformation.FatherName = responseResult.BasicInformation.FatherName.ToPersian();
-
-
-            return responseResult;
-        }
-        catch (Exception)
-        {
-
-            return null;
-        }
-    }
-
-
-    public async Task<MatchMobileWithNationalCodeResponse> IsMachPhoneWithNationalCode(string nationalCode, string phoneNumber)
-    {
-        var request = new PersonalInfoRequest
-        {
-            MobileNumber = phoneNumber,
-            NationalId = nationalCode,
-            RequestContext = new UidRequestContext()
-        };
-        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 responseResult = await requestResult.Content.ReadFromJsonAsync<MatchMobileWithNationalCodeResponse>();
-            return responseResult;
-        }
-        catch (Exception e)
-        {
-            return null;
-        }
-
-    }
-}

0_Framework/Application/UserType.cs

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

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

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
 using Microsoft.EntityFrameworkCore.Design.Internal;
@@ -12,8 +14,7 @@ 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,
-        FridayWork fridayWork, HolidayWork holidayWork, BreakTime breakTime,int leavePermittedDays)
+        FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, BreakTime breakTime,int leavePermittedDays,List<WeeklyOffDay> weeklyOffDays)
     {
 
         FridayPay = fridayPay;
@@ -29,10 +30,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>
@@ -117,4 +118,28 @@ 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; }
 }

0_Framework/Domain/IRepository.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore.Storage;
 
 namespace _0_Framework.Domain;
 
@@ -17,4 +18,6 @@ public interface IRepository<TKey, T> where  T:class
     bool Exists(Expression<Func<T, bool>> expression);
     void SaveChanges();
     Task SaveChangesAsync();
+	Task<IDbContextTransaction> BeginTransactionAsync();
+    
 }

0_Framework/Exceptions/BadRequestException.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace _0_Framework.Exceptions;
 
@@ -14,5 +15,13 @@ public class BadRequestException:Exception
         Details = details;
     }
 
+    public BadRequestException(string message,  Dictionary<string, object?> extra) :
+        base(message)
+    {
+        Extra = extra;
+    }
+
     public string Details { get; }
+    public  Dictionary<string,object> Extra { get; set; }
+    
 }

0_Framework/Exceptions/Handler/CustomExceptionHandler.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Diagnostics;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+
+
+namespace _0_Framework.Exceptions.Handler;
+
+public class CustomExceptionHandler : IExceptionHandler
+{
+    private readonly ILogger<CustomExceptionHandler> _logger;
+
+    public CustomExceptionHandler(ILogger<CustomExceptionHandler> logger)
+    {
+        _logger = logger;
+    }
+
+    public async ValueTask<bool> TryHandleAsync(HttpContext context, Exception exception, CancellationToken cancellationToken)
+    {
+        _logger.LogError(
+            "Error Message: {exceptionMessage}, Time of occurrence {time}",
+            exception.Message, DateTime.UtcNow);
+
+        (string Detail, string Title, int StatusCode, Dictionary<string, object>? Extra) details = exception switch
+        {
+            InternalServerException =>
+            (
+                exception.Message,
+                exception.GetType().Name,
+                context.Response.StatusCode = StatusCodes.Status500InternalServerError,
+                null
+            ),
+            BadRequestException bre =>
+            (
+                exception.Message,
+                exception.GetType().Name,
+                context.Response.StatusCode = StatusCodes.Status400BadRequest,
+                bre.Extra
+            ),
+            NotFoundException =>
+            (
+                exception.Message,
+                exception.GetType().Name,
+                context.Response.StatusCode = StatusCodes.Status404NotFound,
+                null
+            ),
+            UnAuthorizeException =>
+            (
+                exception.Message,
+                exception.GetType().Name,
+                context.Response.StatusCode = StatusCodes.Status401Unauthorized,
+                null
+            ),
+            _ =>
+            (
+                exception.Message,
+                exception.GetType().Name,
+                context.Response.StatusCode = StatusCodes.Status500InternalServerError,
+                null
+            )
+        };
+
+        var problemDetails = new ProblemDetails
+        {
+            Title = details.Title,
+            Detail = details.Detail,
+            Status = details.StatusCode,
+            Instance = context.Request.Path,
+            Extensions = details.Extra ?? new Dictionary<string, object>()
+        };
+        
+
+        
+        problemDetails.Extensions.Add("traceId", context.TraceIdentifier);
+
+        await context.Response.WriteAsJsonAsync(problemDetails, cancellationToken: cancellationToken);
+
+        return true;
+    }
+}

0_Framework/Exceptions/UnAuthorizeException.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace _0_Framework.Exceptions;
+
+public class UnAuthorizeException:Exception
+{
+    public UnAuthorizeException(string message) : base(message)
+    {
+    }
+}

0_Framework/InfraStructure/Mongo/MongoDbConfig.cs

@@ -0,0 +1,8 @@
+namespace _0_Framework.InfraStructure.Mongo;
+
+public class MongoDbConfig
+{
+    public string ConnectionString { get; set; } = null!;
+
+    public string DatabaseName { get; set; } = null!;
+}

0_Framework/InfraStructure/QueryableExtensions.cs

@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace _0_Framework.InfraStructure;
+
+public static class QueryableExtensions
+{
+    public static IQueryable<T> ApplyPagination<T>(this IQueryable<T> query, int page, int pageSize = 30)
+    {
+        if (page <= 0) page = 1;
+        if (pageSize <= 0) pageSize = 10;
+
+        return query.Skip((page - 1) * pageSize).Take(pageSize);
+    }
+    public static IEnumerable<T> ApplyPagination<T>(this IEnumerable<T> source, int page, int pageSize = 30)
+    {
+        if (page <= 0) page = 1;
+        if (pageSize <= 0) pageSize = 10;
+
+        return source.Skip((page - 1) * pageSize).Take(pageSize);
+    }
+}

0_Framework/InfraStructure/RepositoryBase.cs

@@ -6,6 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using _0_Framework.Domain;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Storage;
 
 namespace _0_Framework.InfraStructure
 {
@@ -70,5 +71,10 @@ namespace _0_Framework.InfraStructure
         {
             await _context.SaveChangesAsync();
         }
+
+        public async Task<IDbContextTransaction> BeginTransactionAsync()
+        {
+            return await _context.Database.BeginTransactionAsync();
+        }
     }
 }

AccountManagement.Application.Contracts/Account/AccountSelectListViewModel.cs

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

AccountManagement.Application.Contracts/Media/IMediaApplication.cs

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

AccountManagement.Application.Contracts/SubAccount/CreateSubAccount.cs

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

AccountManagement.Application.Contracts/SubAccount/CreateSubAccountRole.cs

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

AccountManagement.Application.Contracts/SubAccount/EditSubAccount.cs

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

AccountManagement.Application.Contracts/SubAccount/SubAccountRoleViewModel.cs

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

AccountManagement.Application.Contracts/Task/CreateTask.cs

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

AccountManagement.Application.Contracts/Task/EditTask.cs

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

AccountManagement.Application.Contracts/Task/TaskViewModel.cs

@@ -48,7 +48,10 @@ 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,4 +1,6 @@
-using _0_Framework.Application;
+using System;
+using System.Threading.Tasks;
+using _0_Framework.Application;
 using AccountManagement.Application.Contracts.Task;
 
 namespace AccountManagement.Application.Contracts.TaskSchedule;
@@ -6,7 +8,8 @@ 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

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

@@ -259,7 +259,8 @@ public class AccountApplication : IAccountApplication
 					var workshop = workshopList.First();
 					authViewModel.WorkshopName = workshop.Name;
 					authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
-				}
+                    authViewModel.WorkshopId = workshop.Id;
+                }
 			}
 
             _authHelper.Signin(authViewModel);
@@ -308,7 +309,7 @@ public class AccountApplication : IAccountApplication
 			{
 				Slug = _passwordHasher.SlugHasher(x.WorkshopId),
 				Name = x.WorkshopName,
-				PersonnelCount = 0,
+				PersonnelCount = x.PersonnelCount,
 				Id = x.WorkshopId
 			}).ToList();
 
@@ -317,6 +318,7 @@ public class AccountApplication : IAccountApplication
 				var workshop = workshopList.First();
 				authViewModel.WorkshopName = workshop.WorkshopName;
 				authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.WorkshopId);
+                authViewModel.WorkshopId = workshop.WorkshopId;
 			}
 			_authHelper.Signin(authViewModel);
 			idAutoriz = 2;
@@ -368,6 +370,7 @@ public class AccountApplication : IAccountApplication
 				var workshop = workshopList.First();
 				authViewModel.WorkshopName = workshop.Name;
 				authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
+                authViewModel.WorkshopId = workshop.Id;
 			}
 		}
 
@@ -515,6 +518,7 @@ public class AccountApplication : IAccountApplication
 			var workshop = authViewModel.WorkshopList.First();
 			authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
 			authViewModel.WorkshopName = workshop.Name;
+            authViewModel.WorkshopId = workshop.Id;
 		}
 		_authHelper.Signin(authViewModel);
         return operation.Succcedded(2);
@@ -549,7 +553,8 @@ 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);
@@ -626,7 +631,10 @@ public class AccountApplication : IAccountApplication
 
     }
 
-
+    public async Task<List<AccountSelectListViewModel>> GetAdminSelectList()
+    {
+        return await _accountRepository.GetAdminSelectList();
+    }
 
     #endregion
     #region Pooya
@@ -785,4 +793,14 @@ public class AccountApplication : IAccountApplication
     //}
     #endregion
 
+
+    public bool CheckExistClientAccount(string userName)
+    {
+        return _accountRepository.CheckExistClientAccount(userName);
+    }
+
+    public List<AccountViewModel> GetAdminAccountsNew()
+    {
+        return _accountRepository.GetAdminAccountsNew();
+    }
 }

AccountManagement.Application/MediaApplication.cs

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

AccountManagement.Application/SubAccountApplication.cs

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

AccountManagement.Application/TaskApplication.cs

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

AccountManagement.Application/TaskScheduleApplication.cs

@@ -4,222 +4,355 @@ 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 ITaskScheduleRepository _taskScheduleRepository;
-	private readonly IHolidayItemRepository _holidayItemRepository;
+    private readonly ITaskApplication _taskApplication;
+    private readonly ITaskScheduleRepository _taskScheduleRepository;
+    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 TaskScheduleApplication(ITaskApplication taskApplication, ITaskScheduleRepository taskScheduleRepository, IHolidayItemRepository holidayItemRepository)
-	{
-		_taskApplication = taskApplication;
-		_taskScheduleRepository = taskScheduleRepository;
-		_holidayItemRepository = holidayItemRepository;
-	}
-
-	public OperationResult Create(CreateTask command)
-	{
-		OperationResult operation = new OperationResult();
+    public OperationResult Create(CreateTask command)
+    {
+        OperationResult operation = new OperationResult();
 
 
-		if (command.HasSchedule)
-		{
-			switch (command.ScheduleType)
-			{
-				case "limited":
-					if (Convert.ToInt32(command.ScheduleCount) > 60)
-					{
-						return operation.Failed("تعداد وارد شده بیشتر از حد مجاز است");
-					}
-					return CreateLimitedTasks(command);
-					break;
+        if (command.HasSchedule)
+        {
+            switch (command.ScheduleType)
+            {
+                case TaskScheduleType.Limited:
+                    if (Convert.ToInt32(command.ScheduleCount) > 60)
+                    {
+                        return operation.Failed("تعداد وارد شده بیشتر از حد مجاز است");
+                    }
+                    return CreateLimitedTasks(command);
+                    break;
 
-				case "unlimited":
-					return CreateUnlimitedTasks(command);
-					break;
+                case TaskScheduleType.Unlimited:
+                    return CreateUnlimitedTasks(command);
+                    break;
 
-				default:
-					return operation.Failed("خطای سیستمی!");
+                default:
+                    return operation.Failed("نوع وظیفه محول شده مشخص نمیباشد");
 
-			}
-		}
-		else
-		{
-			return operation.Failed("این تسک بصورت زمان بندی شده نمیباشد");
-		}
-	}
+            }
+        }
+        else
+        {
+            return operation.Failed("این تسک بصورت دوره ای نمیباشد");
+        }
+    }
 
-	public OperationResult CreateLimitedTasks(CreateTask command)
-	{
-		OperationResult operation = new OperationResult();
-		if (Convert.ToInt32(command.ScheduleCount) < 1 || string.IsNullOrWhiteSpace(command.ScheduleCount))
-		{
-			return operation.Failed("تعداد وارد شده باید بیشتر از 2 باشد");
-		}
+    public async Task<TaskScheduleDetailsViewModel> GetDetails(long id)
+    {
+        return await _taskScheduleRepository.GetDetails(id);
+    }
 
-		switch (command.ScheduleUnitType)
-		{
-			case "year":
-				if (Convert.ToInt32(command.ScheduleCount) != 1)
-				{
-					return operation.Failed("دوره نمیتواند بیشتر از 1 سال باشد");
-				}
-				break;
-			case "month":
-				if (Convert.ToInt32(command.ScheduleCount) > 12)
-				{
-					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;
+    public OperationResult Remove(long taskScheduleId)
+    {
+        var op = new OperationResult();
+        var taskSchedule = _taskScheduleRepository.Get(taskScheduleId);
+        if (taskSchedule == null)
+            return op.Failed("وظیفه مورد نظر یافت نشد");
+        var tasks = _taskRepository.GetTasksByTaskScheduleId(taskScheduleId);
+        var assigns = tasks.SelectMany(x => x.Assigns);
+        if (assigns.Any(x => x.IsCanceledRequest || x.IsDone || x.IsCancel || x.TimeRequest || x.AcceptedTimeRequest > 0))
+        {
+            taskSchedule.DeActive();
 
-		}
-		try
-		{
-			DateTime previousDateRaw = command.EndTaskDate.ToEndDayOfGeorgianDateTime();
-			DateTime previousDateEdited = command.EndTaskDate.ToEndDayOfGeorgianDateTime();
+            var removableTask = tasks.Where(x=>x.Assigns.All(a=>a.IsDone==false && a.IsCancel == false)).ToList();
+            _taskRepository.RemoveRange(removableTask);
+            
+        }
+        else
+        {
+            _taskScheduleRepository.Remove(taskSchedule);
+            _taskRepository.RemoveRange(tasks);
+        }
+        _taskRepository.SaveChanges();
+        return op.Succcedded();
+    }
 
-			int count = Convert.ToInt32(command.ScheduleCount);
-			bool isInt = int.TryParse(command.ScheduleUnitNumber, out int unitNumber);
-			string kindOfWeekUnit = isInt ? "" : command.ScheduleUnitNumber;
-			var taskSchedule = new TaskSchedule(command.ScheduleCount, command.ScheduleType, command.ScheduleUnitType,
-				command.ScheduleUnitNumber, previousDateEdited);
-			_taskScheduleRepository.Create(taskSchedule);
-			_taskScheduleRepository.SaveChanges();
-			command.TaskScheduleId = taskSchedule.id;
+    private OperationResult CreateLimitedTasks(CreateTask command)
+    {
+        OperationResult operation = new OperationResult();
+        if (Convert.ToInt32(command.ScheduleCount) < 1 || string.IsNullOrWhiteSpace(command.ScheduleCount))
+        {
+            return operation.Failed("تعداد وارد شده باید بیشتر از 2 باشد");
+        }
+        if (string.IsNullOrWhiteSpace(command.ScheduleUnitNumber))
+        {
+            return operation.Failed("لطفا تعداد بازه خود را مشخص کنید");
+        }
 
-			switch (command.ScheduleUnitType)
-			{
-				case "year":
-					for (int i = 1; i <= count; i++)
-					{
-						command.EndTaskDate = previousDateEdited.ToFarsi();
-						operation = _taskApplication.CreateTask(command);
-						taskSchedule.SetLastEndTaskDate(previousDateEdited);
+        switch (command.ScheduleUnitType)
+        {
+            case TaskScheduleUnitType.Year:
+                if (Convert.ToInt32(command.ScheduleCount) != 1)
+                {
+                    return operation.Failed("دوره نمیتواند بیشتر از 1 سال باشد");
+                }
+                break;
+            case TaskScheduleUnitType.Month:
 
-						bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
-						while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
-						{
-							previousDateEdited = previousDateRaw.AddDays(1);
-							isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
+                if (Convert.ToInt32(command.ScheduleUnitNumber) is > 12 or < 1)
+                {
+                    return operation.Failed("بازه وارد شده نا معتبر است");
+                }
 
-						}
-						previousDateRaw = previousDateRaw.AddYears(unitNumber);
-						previousDateEdited = previousDateRaw;
+                if (Convert.ToInt32(command.ScheduleCount) is > 60 or < 1)
+                {
+                    return operation.Failed("تعداد دفعات وارد شده نامعتبر است");
+                }
+                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;
 
-					}
-					break;
+        }
+        try
+        {
+            //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));
 
-				case "month":
-					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)
-						{
-							previousDateEdited = previousDateRaw.AddDays(1);
-							isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
+            int count = Convert.ToInt32(command.ScheduleCount);
+            bool isInt = int.TryParse(command.ScheduleUnitNumber, out int unitNumber);
+            string kindOfWeekUnit = isInt ? "" : command.ScheduleUnitNumber;
+            var taskSchedule = new TaskSchedule(command.ScheduleCount, command.ScheduleType, command.ScheduleUnitType,
+                command.ScheduleUnitNumber, previousDateEdited);
+            _taskScheduleRepository.Create(taskSchedule);
+            _taskScheduleRepository.SaveChanges();
+            command.TaskScheduleId = taskSchedule.id;
 
-						}
-						previousDateRaw = previousDateRaw.AddMonths(unitNumber);
-						previousDateEdited = previousDateRaw;
+            switch (command.ScheduleUnitType)
+            {
+                case TaskScheduleUnitType.Year:
+                    for (int i = 1; i <= count; i++)
+                    {
+                        command.EndTaskDate = previousDateEdited.ToFarsi();
+                        operation = _taskApplication.CreateTask(command);
+                        taskSchedule.SetLastEndTaskDate(previousDateEdited);
 
-					}
-					break;
+                        bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
+                        while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
+                        {
+                            previousDateEdited = previousDateRaw.AddDays(1);
+                            isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
+                        }
+                        previousDateRaw = previousDateRaw.AddYears(unitNumber);
+                        previousDateEdited = previousDateRaw;
+                    }
+                    break;
 
-				case "week":
-					for (int i = 1; i <= count; i++)
-					{
-						if (string.IsNullOrWhiteSpace(kindOfWeekUnit))
-						{
-							throw new InvalidDataException();
-						}
+                case TaskScheduleUnitType.Month:
+                    bool endOfMonth = day == 31;
 
-						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);
+                    if (endOfMonth)
+                    {
+                        for (int i = 1; i <= count; i++)
+                        {
+                            command.EndTaskDate = previousDateEdited.ToFarsi();
+                            operation = _taskApplication.CreateTask(command);
+                            taskSchedule.SetLastEndTaskDate(previousDateEdited);
+                            if (month >= 12)
+                            {
+                                var extra = month - 12;
+                                year++;
+                                month = extra + unitNumber;
+                            }
+                            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;
 
-				case "day":
+                            previousDateEdited = previousDateRaw;
 
-					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);
+                        }
+                    }
+                    else
+                    {
+                        for (int i = 1; i < count; i++)
+                        {
+                            command.EndTaskDate = previousDateEdited.ToFarsi();
+                            operation = _taskApplication.CreateTask(command);
+                            taskSchedule.SetLastEndTaskDate(previousDateEdited);
+                            var endDay = 0;
 
-						}
+                            if (month >= 12)
+                            {
+                                var extra = month - 12;
+                                year++;
+                                month = extra + unitNumber;
 
-						previousDateEdited = previousDateRaw;
-					}
-					break;
+                            }
+                            else
+                            {
+                                month = unitNumber + month;
+                            }
 
-			}
-			_taskScheduleRepository.SaveChanges();
-			operation = operation.Succcedded();
-			return operation;
-		}
-		catch (Exception e)
-		{
-			return operation.Failed(e.ToString());
-		}
-	}
+                            if (day == 30)
+                            {
+                                if (month == 12)
+                                {
+                                    var lastYearDay = Convert.ToInt32($"{year:0000}/{month:00}/1".FindeEndOfMonth()
+                                        .Substring(8, 2));
+                                    endDay = lastYearDay == 30 ? lastYearDay : 29;
+                                }
 
-	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,7 +1,9 @@
-using System.Collections.Generic;
+using System;
+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,6 +7,7 @@ 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;
@@ -25,6 +26,7 @@ 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;
@@ -62,6 +64,8 @@ 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,12 +27,21 @@ 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

@@ -2,13 +2,14 @@
 using AccountManagement.Domain.TaskAgg;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using AccountManagement.Domain.TaskMessageAgg;
 
 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 +19,7 @@ public class Assign : EntityBase
         AssignedPositionValue = assignedPositionValue;
         EndTaskDate = endTaskDate;
         FirstTimeCreation = firstTimeCreation;
-	}
+    }
 
 	//آیدی شخص ارسال کننده
 	public long TaskId { get; private set; }
@@ -52,7 +53,9 @@ 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; }
 
@@ -69,14 +72,16 @@ public class Assign : EntityBase
 
 	public void AcceptTimeRequest()
 	{
-		TimeRequest = false;
+        ClearRequests();
+        TimeRequest = false;
 		AcceptedTimeRequest++;
-		EndTaskDate = RequestDate.Value;
+        EndTaskDate = RequestDate < DateTime.Today ? DateTime.Today : RequestDate.Value;
 
-	}
+    }
 	public void RejectTimeRequest()
 	{
-		TimeRequest = false;
+        ClearRequests();
+        TimeRequest = false;
 		TimeRequestDescription = null;
 		RequestDate = null;
 	}
@@ -90,31 +95,36 @@ public class Assign : EntityBase
 	}
 	public void AcceptCancelRequest()
 	{
-		IsCanceledRequest = false;
+        ClearRequests();
+        IsCanceledRequest = false;
 		IsCancel = true;
 
 
 	}
 	public void RejectCancel()
 	{
-		CancelDescription = null;
+        ClearRequests();
+        CancelDescription = null;
 		IsCanceledRequest = false;
 	}
 
 	public void CompleteRequest(string? doneDescription)
 	{
-		DoneDescription = doneDescription;
+        ClearRequests();
+        DoneDescription = doneDescription;
 		IsDoneRequest = true;
 	}
 
 	public void RejectCompleteRequest()
 	{
-		IsDoneRequest = false;
+        ClearRequests();
+        IsDoneRequest = false;
 		DoneDescription = null;
 	}
 	public void Completed()
 	{
-		IsDoneRequest = false;
+        ClearRequests();
+        IsDoneRequest = false;
 		IsDone = true;
 	}
 
@@ -126,6 +136,13 @@ public class Assign : EntityBase
 		TimeRequest = false;
 	}
 
+    public void ClearRequests()
+    {
+        IsDoneRequest = false;
+        IsCanceledRequest = false;
+        TimeRequest = false;
+    }
+
 	public void InsertNewData(DateTime endTaskDate,bool timeRequest,int acceptedTimeRequest,DateTime? requestDate, string timeRequestDescription, bool isCanceledRequest,
 		bool isCancel,string cancelDescription,bool isDone,bool isDoneRequest,string? doneDescription)
 	{
@@ -142,4 +159,24 @@ public class Assign : EntityBase
 		IsDoneRequest=isDoneRequest;
 		DoneDescription=doneDescription;
 	}
+
+	public void ChangeAssignedId(long assignedId)
+	{
+		AssignedId = assignedId;
+	}
+
+	public void SetAssignerId(long assignerId)
+	{
+		AssignerId = assignerId;
+	}
+
+	public void ChangeSender(long senderId)
+	{
+		Task.SetSender(senderId);
+		var taskMessageItemsEnumerable =TaskMessageList.SelectMany(m => m.TaskMessageItemsList);
+		foreach (var taskMessageItems in taskMessageItemsEnumerable)
+		{
+			taskMessageItems.SetSenderId(senderId);
+		}
+	}
 }

AccountManagement.Domain/MediaAgg/IMediaRepository.cs

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

AccountManagement.Domain/SubAccountAgg/ISubAccountRepository.cs

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

AccountManagement.Domain/SubAccountRoleAgg/SubAccountRole.cs

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

AccountManagement.Domain/SubAccountRoleAgg/SubAccountRoleWorkshop.cs

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

AccountManagement.Domain/TaskAgg/ITaskRepository.cs

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

AccountManagement.Domain/TaskAgg/Tasks.cs

@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Security.AccessControl;
 using _0_Framework.Domain;
 using AccountManagement.Domain.AssignAgg;
 using AccountManagement.Domain.TaskMediaAgg;
 using AccountManagement.Domain.TaskScheduleAgg;
+using OfficeOpenXml.Style;
 
 namespace AccountManagement.Domain.TaskAgg;
 
@@ -80,4 +82,40 @@ public class Tasks : EntityBase
         TaskScheduleId = taskScheduleId;
     }
 
+    public void ChangeSender(long senderId)
+    {
+	    var prevSender = SenderId;
+
+	    var assigners = Assigns.Where(x => x.AssignerId == prevSender).ToList();
+
+	    foreach (var assigner in assigners)
+	    {
+		    assigner.SetAssignerId(senderId);
+	    }
+
+	    var senderMessageItem = Assigns
+		    .SelectMany(x=>x.TaskMessageList
+		    .SelectMany(m=>m.TaskMessageItemsList)).Where(x=>x.SenderAccountId == prevSender).ToList();
+
+	    var receiverMessageItem = Assigns.SelectMany(x=>x.TaskMessageList
+		    .SelectMany(m=>m.TaskMessageItemsList)).Where(x=>x.ReceiverAccountId == prevSender).ToList();
+
+
+	    SenderId = senderId;
+
+	    foreach (var taskMessageItems in senderMessageItem)
+	    {
+		    taskMessageItems.SetSenderId(senderId);
+	    }
+	    foreach (var taskMessageItems in receiverMessageItem)
+	    {
+		    taskMessageItems.SetReceiver(senderId);
+	    }
+
+	}
+
+    public void SetSender(long senderId)
+    {
+	    SenderId = senderId;
+    }
 }

AccountManagement.Domain/TaskMessageItemsAgg/TaskMessageItems.cs

@@ -19,4 +19,13 @@ public class TaskMessageItems:EntityBase
     public TaskMessage TaskMessage { get; set; }
 
 
+    public void SetSenderId(long senderId)
+    {
+	    SenderAccountId = senderId;
+    }
+
+    public void SetReceiver(long receiverId)
+    {
+	    ReceiverAccountId = receiverId;
+    }
 }

AccountManagement.Domain/TaskScheduleAgg/ITaskScheduleRepository.cs

@@ -1,8 +1,11 @@
-using _0_Framework.Domain;
+using System.Threading.Tasks;
+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,29 +1,38 @@
 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, string type, string unitType, string unitNumber, DateTime lastEndTaskDate)
+    public TaskSchedule(string count, TaskScheduleType type, TaskScheduleUnitType 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 string Type { get; private set; }
-    public string UnitType { get; private set; }
+    public TaskScheduleType Type { get; private set; }
+    public TaskScheduleUnitType 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,6 +27,7 @@ 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
 {
@@ -57,6 +58,9 @@ 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,6 +21,10 @@ namespace AccountMangement.Infrastructure.EFCore.Mappings
                 opt.WithOwner(x => x.SubAccountRole);
             });
 
+            builder.OwnsMany(x => x.RoleWorkshops, roleWorkshop =>
+            {
+	            roleWorkshop.WithOwner(x => x.SubAccountRole).HasForeignKey(x => x.SubAccountId);
+            });
         }
     }
 }

AccountMangement.Infrastructure.EFCore/Mappings/TaskScheduleMapping.cs

@@ -12,9 +12,10 @@ public class TaskScheduleMapping : IEntityTypeConfiguration<TaskSchedule>
         builder.HasKey(x => x.id);
 
         builder.Property(x => x.Count).HasMaxLength(10);
-        builder.Property(x => x.Type).HasMaxLength(12);
+        builder.Property(x => x.Type).HasConversion<string>().HasMaxLength(12);
         builder.Property(x => x.UnitNumber).HasMaxLength(10);
-        builder.Property(x => x.UnitType).HasMaxLength(10);
+        builder.Property(x => x.UnitType).HasConversion<string>().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

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

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

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

AccountMangement.Infrastructure.EFCore/Migrations/AccountContextModelSnapshot.cs

@@ -759,10 +759,16 @@ 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)");
 
@@ -771,6 +777,7 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations
                         .HasColumnType("nvarchar(10)");
 
                     b.Property<string>("UnitType")
+                        .IsRequired()
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
 
@@ -1071,6 +1078,33 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations
 
             modelBuilder.Entity("AccountManagement.Domain.SubAccountRoleAgg.SubAccountRole", b =>
                 {
+                    b.OwnsMany("AccountManagement.Domain.SubAccountRoleAgg.SubAccountRoleWorkshop", "RoleWorkshops", b1 =>
+                        {
+                            b1.Property<long>("SubAccountId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<long>("id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("bigint");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("id"));
+
+                            b1.Property<DateTime>("CreationDate")
+                                .HasColumnType("datetime2");
+
+                            b1.Property<long>("WorkshopId")
+                                .HasColumnType("bigint");
+
+                            b1.HasKey("SubAccountId", "id");
+
+                            b1.ToTable("SubAccountRoleWorkshop");
+
+                            b1.WithOwner("SubAccountRole")
+                                .HasForeignKey("SubAccountId");
+
+                            b1.Navigation("SubAccountRole");
+                        });
+
                     b.OwnsMany("AccountManagement.Domain.SubAccountRoleAgg.SubAccountRolePermission", "RolePermissions", b1 =>
                         {
                             b1.Property<long>("id")
@@ -1098,6 +1132,8 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations
                         });
 
                     b.Navigation("RolePermissions");
+
+                    b.Navigation("RoleWorkshops");
                 });
 
             modelBuilder.Entity("AccountManagement.Domain.TaskAgg.Tasks", b =>

AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs

@@ -312,6 +312,17 @@ 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()
@@ -332,4 +343,9 @@ 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/MediaRepository.cs

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

AccountMangement.Infrastructure.EFCore/Repository/SubAccountRepository.cs

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

AccountMangement.Infrastructure.EFCore/Repository/TaskRepository.cs

@@ -4,6 +4,7 @@ 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;
@@ -46,7 +47,6 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
 
     public EditTask GetDetails(long TaskId)
     {
-        var task = Get(TaskId);
 
         var userId = _authHelper.CurrentAccountId();
 
@@ -94,7 +94,8 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                         Fullname = a.Fullname,
                         Id = a.id,
 
-                    }).FirstOrDefault()
+                    }).FirstOrDefault(),
+                TaskScheduleId = x.TaskScheduleId ?? 0
 
             }).FirstOrDefault();
 
@@ -105,13 +106,26 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         {
             res.EndTaskDate = _accountContext.Assigns.First(a => a.TaskId == res.Id && a.AssignedId == userId)
                 .EndTaskDate.ToFarsi();
-
+            var userAssign = res.AssignViewModels.First(x => x.AssignedId == userId);
 
             res.AssignViewModels = res.AssignViewModels.Where(x => x.AssignedId == userId).ToList();
-            res.IsDone = res.AssignViewModels.First(x => x.AssignedId == userId).IsDone;
-            res.IsCancel = res.AssignViewModels.First(x => x.AssignedId == userId).IsCancel;
+            res.IsDone = userAssign.IsDone;
+            res.IsCancel = userAssign.IsCancel;
+            res.HasRequest = userAssign.IsCanceledRequest || userAssign.TimeRequest ||
+                             userAssign.IsDoneRequest;
         }
 
+        if (res.TaskScheduleId > 0)
+        {
+            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(),
@@ -148,8 +162,6 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         Remove(task);
     }
 
-
-
     public List<TaskViewModel> GetRequestedTasks(TaskSearchModel searchModel)
     {
         var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
@@ -888,7 +900,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             AcceptedTimeRequest = x.AcceptedTimeRequest,
             IsCancelRequest = x.IsCancelRequest,
             ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel,false),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -968,7 +980,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.SenderId == accountId && x.Task.TaskScheduleId == null)
                 .Select(x =>
                     new TaskViewModel()
                     {
@@ -1217,7 +1229,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             AcceptedTimeRequest = x.AcceptedTimeRequest,
             IsCancelRequest = x.IsCancelRequest,
             ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -1776,7 +1788,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             AcceptedTimeRequest = x.AcceptedTimeRequest,
             IsCancelRequest = x.IsCancelRequest,
             ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -1839,10 +1851,313 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         return final;
     }
 
-
-
-    public string SetTasksColors(DateTime date, bool isCancel)
+    public List<TaskViewModel> GetTaskScheduleList(TaskSearchModel searchModel)
     {
+        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";
@@ -1888,23 +2203,23 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
 
     }
 
-    public int GetRequestedTasksCount()
+    public async Task<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 _accountContext.Assigns.Include(x => x.Task).Where(x =>
+            return await _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()).Count();
+                .Select(x => x.First()).CountAsync();
         }
         else
         {
-            return _accountContext.Assigns.Include(x => x.Task).Where(x =>
+            return await _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()).Count();
+                .Select(x => x.First()).CountAsync();
         }
     }
 
@@ -2001,7 +2316,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
 
     }
 
-    public int RequestedAndOverdueTasksCount(long userId)
+    public async Task<int> RequestedAndOverdueTasksCount(long userId)
     {
         var account = _accountRepository.GetIncludePositions(userId);
         if (account.Position == null)
@@ -2009,7 +2324,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
 
         DateTime now = DateTime.Now;
 
-        var overdueTasksCount = OverdueTasksCount(userId);
+        var overdueTasksCount = await OverdueTasksCount(userId);
 
 
         //overdueTasksCount = _accountContext.Tasks.Include(x =>
@@ -2018,10 +2333,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 = GetRequestedTasksCount();
+        var overdueRequestsCount = await GetRequestedTasksCount();
 
-        var ticketRequested = TasksHaveTicketRequestsCount(userId);
-        var overdueTicket = TasksHaveTicketCounts(userId);
+        var ticketRequested = await TasksHaveTicketRequestsCount(userId);
+        var overdueTicket = await TasksHaveTicketCounts(userId);
 
         return overdueTasksCount + overdueRequestsCount + ticketRequested + overdueTicket;
     }
@@ -2036,7 +2351,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         return overdueRequestsCount;
     }
 
-    public int OverdueTasksCount(long userId)
+    public async Task<int> OverdueTasksCount(long userId)
     {
         var account = _accountRepository.GetIncludePositions(userId);
 
@@ -2048,12 +2363,12 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         int overdueTasksCount;
         if (positionValue == 1)
         {
-            overdueTasksCount = _accountContext.Assigns.Include(x => x.Task).Where(x => x.AssignedId == userId &&
+            overdueTasksCount = await _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()).Count();
+                .GroupBy(x => x.TaskId).Select(x => x.First()).CountAsync();
 
             //overdueTasksCount = _accountContext.Tasks.Include(x =>
             //	x.Assigns).Count(x => !x.Assigns.Any(a => a.IsCancel) && !x.Assigns.Any(a => a.IsCanceledRequest) &&
@@ -2065,43 +2380,49 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         }
         else
         {
-            overdueTasksCount = _accountContext.Assigns.Include(x => x.Task).Where(x => x.AssignedId == userId &&
+            overdueTasksCount = await _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()).Count();
+                .GroupBy(x => x.TaskId).Select(x => x.First()).CountAsync();
             ;
         }
 
         return overdueTasksCount;
     }
 
-    public int TasksHaveTicketCounts(long userId)
+    public List<Tasks> GetTasksByTaskScheduleId(long taskScheduleId)
     {
-        return _accountContext.Assigns.Include(x => x.Task).Where(x =>
+        return _accountContext.Tasks.Include(x => x.Assigns).Where(x => x.TaskScheduleId != null && x.TaskScheduleId == taskScheduleId).ToList();
+    }
+
+
+    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).Count();
+            (x.Task.TicketId != null && x.Task.TicketId > 0)).GroupBy(x => x.TaskId).CountAsync();
     }
 
-    public int TasksHaveTicketRequestsCount(long userId)
+    public async Task<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 _accountContext.Assigns.Include(x => x.Task).Where(x =>
+            return await _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()).Count();
+                .Select(x => x.First()).CountAsync();
         }
         else
         {
-            return _accountContext.Assigns.Include(x => x.Task).Where(x =>
+            return await _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()).Count();
+                .Select(x => x.First()).CountAsync();
         }
     }
 
@@ -2340,7 +2661,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             AcceptedTimeRequest = x.AcceptedTimeRequest,
             IsCancelRequest = x.IsCancelRequest,
             ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -2404,6 +2725,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
     {
         var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
         var positionValue = int.Parse(_contextAccessor.HttpContext.User.FindFirst("PositionValue").Value);
+        var today = DateTime.Today;
         var emptyAcc = new AccountViewModel()
         {
             Fullname = "-",
@@ -2413,7 +2735,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         var raw = _accountContext.Assigns.Include(x => x.Task).ThenInclude(x => x.TaskMedias)
             .ThenInclude(x => x.Media)
             .Where(x =>
-                x.Task.IsActiveString == "true" && x.AssignedId == accountId && (!x.IsCanceledRequest && !x.TimeRequest && !x.IsDoneRequest) && x.Task.TicketId == null);
+                x.Task.IsActiveString == "true" && x.AssignedId == accountId  && x.Task.TicketId == null &&!x.IsDoneRequest && !x.IsCanceledRequest);
         if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
         {
             raw = raw.Where(x =>
@@ -2446,6 +2768,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                 MediaCount = _accountContext.TaskMedias.Count(m => m.TaskId == x.Task.id),
                 Description = x.Task.Description,
                 IsDoneRequest = x.IsDoneRequest,
+                
             });
         if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
         {
@@ -2484,7 +2807,8 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             ContractingPartyName = x.ContractingPartyName,
             MediaCount = x.MediaCount,
             Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest
+            IsDoneRequest = x.IsDoneRequest,
+            HasRequest = x.IsCancelRequest || x.RequestTime || x.IsDoneRequest
         });
         if (!string.IsNullOrWhiteSpace(searchModel.StartDate) && !string.IsNullOrWhiteSpace(searchModel.EndDate))
         {
@@ -2553,8 +2877,10 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         }
 
 
-        var orderResult = result.OrderByDescending(x => x.IsCancel ? 0 : 1).ThenBy(x => x.IsDone ? 1 : 0)
-            .ThenBy(x => x.EndTaskDateGE);
+        var orderResult = result.OrderBy(x => x.IsDone || x.IsCancel)
+            .ThenByDescending(x => x.EndTaskDateGE <= today.AddDays(1) && !x.RequestTime)
+            .ThenByDescending(x => x.RequestTime)
+            .ThenBy(x => x.EndTaskDateGE); // مرتب‌سازی داخلی بر اساس تاریخ
 
 
         var final = orderResult.Skip(searchModel.PageIndex).Take(30).ToList();
@@ -2588,7 +2914,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             MediaCount = x.MediaCount,
             SelfName = x.SelfName,
             Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest
+            IsDoneRequest = x.IsDoneRequest,
 
         }).ToList();
 
@@ -2616,7 +2942,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             AcceptedTimeRequest = x.AcceptedTimeRequest,
             IsCancelRequest = x.IsCancelRequest,
             ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel,x.RequestTime),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -2675,6 +3001,8 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                     AssignedName = "-",
                     AssignedPositionValue = 0
                 },
+            HasRequest = x.IsCancelRequest || x.RequestTime || x.IsDoneRequest
+
         }).ToList();
         return final;
     }

AccountMangement.Infrastructure.EFCore/Repository/TaskScheduleRepository.cs

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

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

@@ -0,0 +1,12 @@
+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/AuthorizedBankDetailsAgg/AuthorizedBankDetails.cs

@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+using _0_Framework_b.Domain;
+
+namespace Company.Domain.AuthorizedBankDetailsAgg
+{
+    public class AuthorizedBankDetails : EntityBase
+    {
+        private AuthorizedBankDetails() 
+        {
+            OwnersList = new List<AuthorizedBankDetailsOwner>();
+        }
+
+        public AuthorizedBankDetails(string cardNumber, string accountNumber, string ban, string bankName, List<AuthorizedBankDetailsOwner> ownersList)
+        {
+            CardNumber = cardNumber;
+            AccountNumber = accountNumber;
+            IBan = ban;
+            BankName = bankName;
+            OwnersList = ownersList ?? new List<AuthorizedBankDetailsOwner>();
+        }
+
+        public string CardNumber { get; private set; }
+        public string AccountNumber { get; private set; }
+        public string IBan { get; private set; }
+        public string BankName { get; private set; }
+        public List<AuthorizedBankDetailsOwner> OwnersList { get; private set; }
+    }
+
+    public class AuthorizedBankDetailsOwner // Value Object - not inheriting from EntityBase
+    {
+        private AuthorizedBankDetailsOwner() { }
+
+        public AuthorizedBankDetailsOwner(string fName, string lName, string nationalIdentifier, string customerType)
+        {
+            FName = fName;
+            LName = lName;
+            NationalIdentifier = nationalIdentifier;
+            CustomerType = customerType;
+        }
+        
+        public string FName { get; private set; }
+        public string LName { get; private set; }
+        public string NationalIdentifier { get; private set; }
+        public string CustomerType { get; private set; }
+    }
+}

Company.Domain/AuthorizedBankDetailsAgg/IAuthorizedBankDetailsRepository.cs

@@ -0,0 +1,13 @@
+using _0_Framework_b.Domain;
+using System.Collections.Generic;
+using Company.Application.Contracts.AuthorizedBankDetails;
+
+namespace Company.Domain.AuthorizedBankDetailsAgg
+{
+    public interface IAuthorizedBankDetailsRepository : IRepository<long, AuthorizedBankDetails>
+    {
+        EditAuthorizedBankDetails GetDetails(long id);
+        List<AuthorizedBankDetailsViewModel> Search(AuthorizedBankDetailsSearchModel searchModel);
+        AuthorizedBankDetailsViewModel GetByIban(string iban);
+    }
+}

Company.Domain/AuthorizedPersonAgg/AuthorizedPerson.cs

@@ -0,0 +1,51 @@
+using System;
+using _0_Framework.Domain;
+
+namespace Company.Domain.AuthorizedPersonAgg;
+
+public class AuthorizedPerson : EntityBase
+{
+    public string NationalCode { get; private set; }
+    public string FirstName { get; private set; }
+    public string LastName { get; private set; }
+    public string FatherName { get; private set; }
+    public string BirthDate { get; private set; }
+    public string Gender { get; private set; }
+    public string DeathStatus { get; private set; }
+    public string ShenasnameSeri { get; private set; }
+    public string ShenasnameSerial { get; private set; }
+    public string ShenasnamehNumber { get; private set; }
+    public bool IsVerified { get; private set; }
+    public DateTime? VerificationDate { get; private set; }
+
+    public AuthorizedPerson(string nationalCode, string firstName, string lastName, string fatherName, 
+        string birthDate, string gender, string deathStatus, string shenasnameSeri, 
+        string shenasnameSerial, string shenasnamehNumber)
+    {
+        NationalCode = nationalCode;
+        FirstName = firstName;
+        LastName = lastName;
+        FatherName = fatherName;
+        BirthDate = birthDate;
+        Gender = gender;
+        DeathStatus = deathStatus;
+        ShenasnameSeri = shenasnameSeri;
+        ShenasnameSerial = shenasnameSerial;
+        ShenasnamehNumber = shenasnamehNumber;
+        IsVerified = true;
+        VerificationDate = DateTime.Now;
+    }
+
+    public void UpdatePersonalInfo(string firstName, string lastName, string fatherName, 
+        string gender, string deathStatus)
+    {
+        FirstName = firstName;
+        LastName = lastName;
+        FatherName = fatherName;
+        Gender = gender;
+        DeathStatus = deathStatus;
+        VerificationDate = DateTime.Now;
+    }
+
+    protected AuthorizedPerson() { }
+}

Company.Domain/AuthorizedPersonAgg/IAuthorizedPersonRepository.cs

@@ -0,0 +1,9 @@
+using _0_Framework.Domain;
+
+namespace Company.Domain.AuthorizedPersonAgg;
+
+public interface IAuthorizedPersonRepository : IRepository<long, AuthorizedPerson>
+{
+    AuthorizedPerson GetByNationalCode(string nationalCode);
+    bool ExistsByNationalCode(string nationalCode);
+}

Company.Domain/CheckoutAgg/Checkout.cs

@@ -1,6 +1,11 @@
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using _0_Framework.Application;
 using _0_Framework.Domain;
+using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
+using Company.Domain.CheckoutAgg.ValueObjects;
+using Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 using Company.Domain.WorkshopAgg;
 
 namespace Company.Domain.CheckoutAgg;
@@ -21,7 +26,11 @@ public class Checkout : EntityBase
         double salaryAidDeduction, double absenceDeduction, string sumOfWorkingDays
         , string archiveCode, string personnelCode, 
         string totalClaims, string totalDeductions, double totalPayment, string signature, double marriedAllowance, bool leaveCheckout,
-        double creditLeaves, double absencePeriod, double averageHoursPerDay, bool hasRollCall, string overTimeWorkvalue, string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue, string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute)
+        double creditLeaves, double absencePeriod, double averageHoursPerDay, bool hasRollCall, string overTimeWorkvalue,
+        string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue,
+        string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute,
+        ICollection<CheckoutLoanInstallment> loanInstallments,
+        ICollection<CheckoutSalaryAid> salaryAids,CheckoutRollCall checkoutRollCall,TimeSpan employeeMandatoryHours)
     {
         EmployeeFullName = employeeFullName;
         FathersName = fathersName;
@@ -78,8 +87,13 @@ public class Checkout : EntityBase
         TotalDayOfLeaveCompute = totalDayOfLeaveCompute;
         TotalDayOfYearsCompute = totalDayOfYearsCompute;
         TotalDayOfBunosesCompute = totalDayOfBunosesCompute;
+        LoanInstallments = loanInstallments;
+        SalaryAids = salaryAids;
+        CheckoutRollCall = checkoutRollCall;
+        EmployeeMandatoryHours = employeeMandatoryHours;
     }
 
+
     public string EmployeeFullName { get; private set; }
     public string IsActiveString { get; private set; }
     public string Signature { get; private set; }
@@ -181,7 +195,25 @@ public class Checkout : EntityBase
    /// </summary>
    public string TotalDayOfBunosesCompute { get; private set; }
 
-	public Workshop Workshop { get; set; }
+   /// <summary>
+   /// دارای تداخل مبلغ است. این در زمانی اتفاق می افتد که فیش مبلغ آن تغییر کرده ولی به دلیل مسائل قانونی امکان صدور دوباره آن وجود ندارد
+   /// </summary>
+   public bool HasAmountConflict { get; private set; }
+
+   /// <summary>
+   /// ساعت موظفی پرسنل در ماه
+   /// </summary>
+    public TimeSpan EmployeeMandatoryHours { get; set; }
+   
+   #region valueObjects
+
+   public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
+   public ICollection<CheckoutSalaryAid> SalaryAids { get; set; } = [];
+    public CheckoutRollCall CheckoutRollCall { get; private set; }
+    #endregion
+
+
+    public Workshop Workshop { get; set; }
     //public WorkingHours WorkingHours { get; set; }
 
     public void Edit(string employeeFullName, string fathersName, string nationalCode, string dateOfBirth,
@@ -278,4 +310,171 @@ 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;
+    }
+
+    public void SetCheckoutRollCall(CheckoutRollCall checkoutRollCall)
+    {
+        CheckoutRollCall = checkoutRollCall;
+    }
+
+    public void SetAmountConflict(bool hasAmountConflict)
+    {
+	    HasAmountConflict = hasAmountConflict;
+    }
+
+    public void SetEmployeeMandatoryHours(TimeSpan employeeMandatoryHours)
+    {
+        EmployeeMandatoryHours = employeeMandatoryHours;
+    }
+}
+
+public class CheckoutRollCall
+{
+    private CheckoutRollCall(){}
+	public CheckoutRollCall(TimeSpan totalMandatoryTimeSpan, TimeSpan totalPresentTimeSpan, TimeSpan totalBreakTimeSpan,
+		TimeSpan totalWorkingTimeSpan, TimeSpan totalPaidLeaveTmeSpan, TimeSpan totalSickLeaveTimeSpan,
+		ICollection<CheckoutRollCallDay> rollCallDaysCollection)
+	{
+		TotalMandatoryTimeSpan = totalMandatoryTimeSpan;
+		TotalPresentTimeSpan = totalPresentTimeSpan;
+		TotalBreakTimeSpan = totalBreakTimeSpan;
+		TotalWorkingTimeSpan = totalWorkingTimeSpan;
+		TotalPaidLeaveTmeSpan = totalPaidLeaveTmeSpan;
+		TotalSickLeaveTimeSpan = totalSickLeaveTimeSpan;
+		RollCallDaysCollection = rollCallDaysCollection;
+	}
+
+
+    /// <summary>
+    /// مجموع ساعت موظفی
+    /// </summary>
+	public TimeSpan TotalMandatoryTimeSpan { get; private set; }
+
+    /// <summary>
+    /// مجموع ساعت حضور
+    /// </summary>
+	public TimeSpan TotalPresentTimeSpan { get; private set; }
+
+    /// <summary>
+    /// مجموع ساعت استراحت
+    /// </summary>
+	public TimeSpan TotalBreakTimeSpan { get; private set; }
+
+    /// <summary>
+    /// مجموع ساعت کارکرد
+    /// </summary>
+	public TimeSpan TotalWorkingTimeSpan { get; private set; }
+
+    /// <summary>
+    /// مجموع ساعت مرخصی استحقاقی
+    /// </summary>
+	public TimeSpan TotalPaidLeaveTmeSpan { get; private set; }
+
+    /// <summary>
+    /// مجموع ساعت مرخصی استعلاجی
+    /// </summary>
+    public TimeSpan TotalSickLeaveTimeSpan { get; private set; }
+
+    /// <summary>
+    /// روز های حضور غیاب
+    /// </summary>
+    public ICollection<CheckoutRollCallDay> RollCallDaysCollection { get; private set; }
+}
+
+public class CheckoutRollCallDay
+{
+    private CheckoutRollCallDay(){}
+	public CheckoutRollCallDay(DateTime date, string firstStartDate, string firstEndDate,
+		string secondStartDate, string secondEndDate, TimeSpan breakTimeSpan,
+		bool isSliced, TimeSpan workingTimeSpan, bool isAbsent, bool isFriday,
+		bool isHoliday, string leaveType)
+	{
+		Date = date;
+		FirstStartDate = firstStartDate;
+		FirstEndDate = firstEndDate;
+		SecondStartDate = secondStartDate;
+		SecondEndDate = secondEndDate;
+		BreakTimeSpan = breakTimeSpan;
+		IsSliced = isSliced;
+		WorkingTimeSpan = workingTimeSpan;
+		IsAbsent = isAbsent;
+		IsFriday = isFriday;
+		IsHoliday = isHoliday;
+		LeaveType = leaveType;
+	}
+
+	public long Id { get; set; }
+
+    /// <summary>
+    /// تاریخ
+    /// </summary>
+	public DateTime Date { get; private set; }
+    /// <summary>
+    /// ورود اول 
+    /// </summary>
+	public string FirstStartDate { get; private set; }
+
+    /// <summary>
+    /// خروج اول
+    /// </summary>
+	public string FirstEndDate { get; private set; }
+
+    /// <summary>
+    /// ورود دوم
+    /// </summary>
+	public string SecondStartDate { get; private set; }
+
+    /// <summary>
+    /// خروج دوم
+    /// </summary>
+	public string SecondEndDate { get; private set; }
+
+    /// <summary>
+    /// ساعت استراحت
+    /// </summary>
+	public TimeSpan BreakTimeSpan { get; private set; }
+
+    /// <summary>
+    /// مقدار زمان کارکرد
+    /// </summary>
+	public TimeSpan WorkingTimeSpan { get; private set; }
+
+    /// <summary>
+    /// آیا منقطع است؟
+    /// </summary>
+	public bool IsSliced { get; private set; }
+
+    /// <summary>
+    /// آیا غیبت است
+    /// </summary>
+	public bool IsAbsent { get; private set; }  
+
+    /// <summary>
+    /// آیا جمعه است
+    /// </summary>
+	public bool IsFriday { get; private set; }
+
+    /// <summary>
+    /// آیا تعطیل رسمی است
+    /// </summary>
+	public bool IsHoliday { get; private set; }
+
+    /// <summary>
+    /// نوع مرخصی - درصورت نداشتن مرخصی مقدارش null میباشد
+    /// </summary>
+	public string LeaveType { get; private set; }
+
+	public long CheckoutId { get; set; }
+
 }

Company.Domain/CheckoutAgg/ICheckoutRepository.cs

@@ -10,9 +10,36 @@ 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, double RotatingShift, double Nightwork, double Fridaywork, double YraesPay) HasCheckout(long workshopId, long employeId,
+        string year, string month);
     EditCheckout GetDetails(long id);
 
-    void CreateCkeckout(Checkout command);
+    Task CreateCkeckout(Checkout command);
+    /// <summary>
+    /// لود لیست اولیه جهت ایجاد فیش حقوقی
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <param name="employeeId"></param>
+    /// <param name="year"></param>
+    /// <param name="month"></param>
+    /// <param name="contractStart"></param>
+    /// <param name="contractEnd"></param>
+    /// <returns></returns>
+    /// <exception cref="NotImplementedException"></exception>
+    Task<CreateCheckoutListViewModel> GetContractResultToCreateCheckout(long workshopId, long employeeId, string year,
+        string month,
+        string contractStart, string contractEnd);
+    //void CreateCkeckout(Checkout command);
+
+
 
     Task<List<CheckoutViewModel>> Search(CheckoutSearchModel searchModel);
 
@@ -32,6 +59,16 @@ public interface ICheckoutRepository : IRepository<long, Checkout>
     OperationResult DeleteAllCheckouts(List<long> ids);
     OperationResult DeleteCheckout(long id);
     List<long> CheckHasSignature(List<long> ids);
+
+    /// <summary>
+    /// لیست تصفیه حساب
+    /// جدید
+    ///
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    Task<List<CheckoutViewModel>> SearchCheckoutOptimized(CheckoutSearchModel searchModel);
+
     Task<List<CheckoutViewModel>> SearchForMainCheckout(CheckoutSearchModel searchModel);
     #endregion
 
@@ -41,4 +78,6 @@ public interface ICheckoutRepository : IRepository<long, Checkout>
         long workshopId, DateTime start, DateTime end);
 
     #endregion
+
+    Task<Checkout> GetByWorkshopIdEmployeeIdInDate(long workshopId, long employeeId, DateTime inDate);
 }

Company.Domain/CheckoutAgg/ValueObjects/CheckoutLoanInstallment.cs

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

Company.Domain/CheckoutAgg/ValueObjects/CheckoutSalaryAid.cs

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

Company.Domain/ClassifiedSalaryAgg/ClassifiedSalary.cs

@@ -10,6 +10,7 @@ namespace Company.Domain.ClassifiedSalaryAgg
 {
     public class ClassifiedSalary : EntityBase
     {
+        //test//test
         public ClassifiedSalary(double group1, double group2, double group3, double group4, double group5, double group6, double group7, double group8, double group9, double group10, double group11, double group12, double group13, double group14, double group15, double group16, double group17, double group18, double group19, double group20, DateTime startDate, DateTime endDate, int year)
         {
             Group1 = group1;

Company.Domain/Company.Domain.csproj

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

Company.Domain/ContactUsAgg/ContactUs.cs

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

Company.Domain/ContactUsAgg/IContactUsRepository.cs

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

Company.Domain/ContarctingPartyAgg/IPersonalContractingPartyRepository.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using AccountManagement.Application.Contracts.Account;
+using System.Threading.Tasks;
 
 namespace Company.Domain.ContarctingPartyAgg;
 
@@ -14,7 +15,7 @@ public interface IPersonalContractingPartyRepository :IRepository<long, Personal
     EditPersonalContractingParty GetDetailsToEdit(long id);
     string GetFullName(long id);
     List<PersonalContractingPartyViewModel> Search(PersonalContractingPartySearchModel searchModel2);
-    int GetLastArchiveCode();
+    int GetLastNewArchiveCode();
 	#region Mahan
 
 	List<string> SearchByName(string name);
@@ -42,6 +43,37 @@ public interface IPersonalContractingPartyRepository :IRepository<long, Personal
 
     #endregion
 
+    /// <summary>
+    /// لیست طرف حساب ها
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    Task<ICollection<ContractingPartyGetListViewModel>> GetList(ContractingPartyGetListSearchModel searchModel);
 
+    /// <summary>
+    /// لیست طرف حساب برای سلکت لیست سرچ
+    /// </summary>
+    /// <param name="search"></param>
+    /// <returns></returns>
+    Task<List<ContractingPartySelectListViewModel>> GetSelectList(string search,long id);
 
+    /// <summary>
+    /// لیستی از شماره ملی یا شناسه ملی بر اساس حقیقی یا حقوقی بودن
+    /// </summary>
+    /// <returns></returns>
+    Task<List<GetContractingPartyNationalCodeOrNationalIdViewModel>> GetNationalCodeOrNationalId();
+
+    /// <summary>
+    /// غیرفعال کردن طرف حساب و زیرمجموعه های آن
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<OperationResult<string>> DeactivateWithSubordinates(long id);
+
+    void Remove(PersonalContractingParty entity);
+    Task<GetRealContractingPartyDetailsViewModel> GetRealDetails(long id);
+    Task<GetLegalContractingPartyDetailsViewModel> GetLegalDetails(long id);
+
+    Task<PersonalContractingParty> GetByNationalCode(string nationalCode);
+    Task<PersonalContractingParty> GetByRegisterId(string registerId);
 }

Company.Domain/ContarctingPartyAgg/PersonalContractingParty.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Security.Cryptography.X509Certificates;
 using _0_Framework.Application;
 using _0_Framework.Domain;
+using Company.Domain.ContractingPartyBankAccountsAgg;
 using Company.Domain.empolyerAgg;
 using Company.Domain.RepresentativeAgg;
 
@@ -72,17 +73,33 @@ public class PersonalContractingParty : EntityBase
     /// آیا از طریق ای پی ای احراز هویت شده است
     /// </summary>
     public bool IsAuthenticated { get; private set; }
-
-
+    
     /// <summary>
     /// جنسیت
     /// </summary>
     public Gender Gender { get; private set; }
+
+    /// <summary>
+    /// سمت و صاحب امضاء اوراق (فقط برای طرف حقوقی)
+    /// </summary>
+    public string LegalPosition { get; private set; }
+
+    /// <summary>
+    /// نام مدیر عامل (فقط برای طرف حقوقی)
+    /// </summary>
+    public string CeoFName { get; private set; }
+    
+    /// <summary>
+    /// نام خانوادگی مدیر عامل (فقط برای طرف حقوقی)
+    /// </summary>
+    public string CeoLName { get; private set; }
+    
     #endregion
 
 
     public List<Employer> Employers { get; private set; }
     public Representative Representative { get; set; }
+    public List<ContractingPartyBankAccount> ContractingPartyBankAccounts { get; set; }
 
     public PersonalContractingParty()
     {
@@ -92,7 +109,8 @@ public class PersonalContractingParty : EntityBase
     public PersonalContractingParty(string fName, string lName, string nationalcode, string idNumber,
         /*string legalName,*/ string registerId, string nationalId, string isLegal,
         string phone, string agentPhone, string address,long representativeId,
-        string representativeFullName, int archiveCode, string state,string city, string zone, string sureName)
+        string representativeFullName, int archiveCode, string state,string city,
+        string zone, string sureName,string ceoFName,string ceoLName,string legalPosition=null)
     {
 
         FName = fName;
@@ -118,8 +136,9 @@ public class PersonalContractingParty : EntityBase
         IsActiveString = "true";
         IsBlock = "false";
         BlockTimes = 0;
-                
-
+        LegalPosition = legalPosition;
+        CeoFName = ceoFName;
+        CeoLName = ceoLName;
     }
 
 
@@ -149,7 +168,7 @@ public class PersonalContractingParty : EntityBase
     }
 
     public void EditLegal(string lName, string registerId, string nationalId, string phone, string agentPhone, string address, long representativeId, string representativeFullName, int archiveCode, 
-        string state, string city, string zone, string sureName)
+        string state, string city, string zone, string sureName,string legalPosition = null)
     {
 
         LName = lName;
@@ -166,6 +185,8 @@ public class PersonalContractingParty : EntityBase
         State = state;
         City = city;
         Zone = zone;
+        if (legalPosition != null)
+            LegalPosition = legalPosition;
 
 
     }
@@ -201,7 +222,8 @@ public class PersonalContractingParty : EntityBase
         IsAuthenticated = true;
     }
 
-    public void Authentication(string fName, string lName, string fatherName,string idNumber, string idNumberSeri, string idNumberSerial, string dateOfBirth, Gender gender)
+    public void Authentication(string fName, string lName, string fatherName,string idNumber,
+        string idNumberSeri, string idNumberSerial, string dateOfBirth, Gender gender,string phone)
     {
         this.FName = fName;
         this.LName = lName;
@@ -212,5 +234,31 @@ public class PersonalContractingParty : EntityBase
         this.IdNumber = idNumber;
         this.Gender = gender;
         this.IsAuthenticated = true;
+        Phone = phone;
+    }
+
+    public void LegalAuthentication(string fName, string lName, string fatherName,string idNumber, string idNumberSeri,
+        string idNumberSerial, string dateOfBirth, Gender gender,string phone)
+    {
+        CeoFName = fName;
+        CeoLName = lName;
+        this.FatherName = fatherName;
+        this.IdNumberSeri = idNumberSeri;
+        this.IdNumberSerial = idNumberSerial;
+        this.DateOfBirth = !string.IsNullOrWhiteSpace(dateOfBirth) ? dateOfBirth.ToGeorgianDateTime() : null;
+        this.IdNumber = idNumber;
+        this.Gender = gender;
+        this.IsAuthenticated = true;
+        Phone = phone;
+    }
+
+    public void RegisterComplete(string fatherName, string idNumberSeri, string idNumberSerial, DateTime dateOfBirth, Gender gender)
+    {
+        this.FatherName = fatherName;
+        this.IdNumberSeri = idNumberSeri;
+        this.IdNumberSerial = idNumberSerial;
+        this.DateOfBirth = dateOfBirth;
+        this.Gender = gender;
+        this.IsAuthenticated = true;
     }
 }

Company.Domain/ContractAgg/Contract.cs

@@ -17,7 +17,7 @@ public class Contract : EntityBase
     public Contract(long personnelCode, long employeeId, long employerId, 
         long workshopIds, long yearlySalaryId, DateTime contarctStart, DateTime contractEnd, string dayliWage,
         string archiveCode, DateTime getWorkDate, DateTime setContractDate, string jobType,
-        string contractType, string workshopAddress1, string workshopAddress2, string consumableItems, long jobTypeId, string housingAllowance, string agreementSalary, string workingHoursWeekly, string familyAllowance, string contractPeriod)
+        string contractType, string workshopAddress1, string workshopAddress2, string consumableItems, long jobTypeId, string housingAllowance, string agreementSalary, string workingHoursWeekly, string familyAllowance, string contractPeriod, double dailySalaryAffected, double baseYearAffected, double dailySalaryUnAffected, double baseYearUnAffected, bool hasManualDailyWage, string dailyWageType)
     {
         PersonnelCode = personnelCode;
         EmployeeId = employeeId;
@@ -45,6 +45,19 @@ public class Contract : EntityBase
         WorkingHoursWeekly = workingHoursWeekly;
         FamilyAllowance = familyAllowance;
         ContractPeriod = contractPeriod;
+        
+        //پراپرتی های جدید برای دستمزد دلخواه
+        #region NewManualDailyWage
+        DailySalaryAffected = dailySalaryAffected;
+        BaseYearAffected = baseYearAffected;
+        DailySalaryUnAffected = dailySalaryUnAffected;
+        BaseYearUnAffected = baseYearUnAffected;
+        HasManualDailyWage = hasManualDailyWage;
+        DailyWageType = dailyWageType;
+
+        #endregion
+
+
         Signature = "0";
 
 
@@ -65,7 +78,42 @@ public class Contract : EntityBase
     public DateTime SetContractDate { get; private set; }
     public string JobType { get; private set; }
     public string ContractType { get; private set; }
+    /// <summary>
+    /// مزد تجمیعی یعد از تاثیر ساعت کار
+    /// </summary>
     public string DayliWage { get; private set; }
+
+    /// <summary>
+    ///  دستمزد روزانه خام بعد از تاثیر ساعت کار
+    /// </summary>
+    public double DailySalaryAffected { get; set; }
+
+    /// <summary>
+    /// پایه سنوات بعد از تاثیر ساعت کار
+    /// </summary>
+    public double BaseYearAffected { get; set; }
+
+
+    /// <summary>
+    /// دستمزد روزانه قبل از تاثیر ساعت کار
+    /// </summary>
+    public double DailySalaryUnAffected { get; set; }
+
+    /// <summary>
+    /// پایه سنوات قبل از تاثیر ساعت کار
+    /// </summary>
+    public double BaseYearUnAffected { get; set; }
+
+    /// <summary>
+    /// آیا دستمزد روزانه دستی وارد شده است؟
+    /// </summary>
+    public bool HasManualDailyWage { get; set; }
+
+    /// <summary>
+    /// نوع دستمزد انتخاب شده
+    /// </summary>
+    public string DailyWageType { get; set; }
+
     public string IsActiveString { get; private set; }
     public string ArchiveCode { get; private set; }
     public string WorkshopAddress1 { get; private set; }
@@ -89,6 +137,7 @@ public class Contract : EntityBase
 
     public Contract()
     {
+     
         WorkingHoursList = new List<WorkingHours>();
     }
     public void Edit(long pesrsonnelCode, long employeeId, long employerId, long workshopId, long yearlySalaryId,

Company.Domain/ContractAgg/IContractRepository.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.Contract;
@@ -9,6 +10,24 @@ namespace Company.Domain.ContractAgg;
 
 public interface IContractRepository : IRepository<long, Contract>
 {
+    /// <summary>
+    /// دریافت مزد ارتقاء یافته
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <param name="employeeId"></param>
+    /// <param name="yearlySalaryId"></param>
+    /// <returns></returns>
+    Task<double> GetManualDailWage(long workshopId, long employeeId, long yearlySalaryId, DateTime contractStart);
+
+    /// <summary>
+    /// دریافت لیست مزد ارتقاء یافته
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <param name="employeeId"></param>
+    /// <param name="contractStart"></param>
+    /// <returns></returns>
+    Task<UpgradeManualDailyWageModel> GetManualDailWageList(long workshopId, long employeeId,
+        DateTime contractStart);
     EditContract GetDetails(long id);
     EditContract GetContractByStartEnd(DateTime start, DateTime end, long workshopId, long employeeId);