feat: add GetEmployeeClientList API to retrieve employee client data

.github/workflows/dotnet-developPublish.yml

@@ -5,6 +5,8 @@ on:
     branches:
       - Main
 
+env:
+  DOTNET_ENVIRONMENT: Development
 
 jobs:
   build-and-deploy:
@@ -35,11 +37,12 @@ jobs:
         & "C:\Program Files\IIS\Microsoft Web Deploy V3\msdeploy.exe" `
           -verb:sync `
           -source:contentPath="$publishFolder" `
-          -dest:contentPath="dadmehrg",computerName="https://$env:SERVER_HOST:8172/msdeploy.axd?site=gozareshgir",userName="$env:DEPLOY_USER",password="$env:DEPLOY_PASSWORD",authType="Basic" `
+          -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: 171.22.24.15
+        SERVER_HOST: your-server-ip-or-domain
         DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
         DEPLOY_PASSWORD: ${{ secrets.DEPLOY_PASSWORD }}

0_Framework/0_Framework.csproj

@@ -6,7 +6,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="12.1.1" />
     <PackageReference Include="IPE.SmsIR" Version="1.2.7" />
     <PackageReference Include="EPPlus" Version="8.4.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.3.0" />

0_Framework/Application/AuthHelper.cs

@@ -56,11 +56,6 @@ public class AuthHelper : IAuthHelper
 		return Tools.DeserializeFromBsonList<int>(permissions); //Mahan
 	}
 
-	public bool HasPermission(int permission)
-	{
-		return GetPermissions().Any(x => x == permission);
-	}
-
 	public long CurrentAccountId()
 	{
 		return IsAuthenticated()
@@ -204,7 +199,7 @@ public class AuthHelper : IAuthHelper
 			new("WorkshopSlug",slug),
 			new("WorkshopId", account.WorkshopId.ToString()),
 			new("WorkshopName",account.WorkshopName??""),
-			new("pm.userId", account.PmUserId.ToString()),
+			new("pm.userId", account.PmUserId?.ToString() ?? "0"),
 
 		};
 

0_Framework/Application/Enums/TypeOfSmsSetting.cs

@@ -33,9 +33,4 @@ public enum TypeOfSmsSetting
     /// </summary>
     LegalAction,
 
-    /// <summary>
-    /// پیامک تایید قراداد
-    /// </summary>
-    InstitutionContractConfirm,
-
 }

0_Framework/Application/FaceEmbedding/IFaceEmbeddingService.cs

@@ -11,7 +11,6 @@ public interface IFaceEmbeddingService
     Task<OperationResult> RefineEmbeddingAsync(long employeeId, long workshopId, float[] embedding, float confidence, Dictionary<string, object> metadata = null);
     Task<OperationResult> DeleteEmbeddingAsync(long employeeId, long workshopId);
     Task<OperationResult<FaceEmbeddingResponse>> GetEmbeddingAsync(long employeeId, long workshopId);
-    Task<OperationResult> UpdateEmbeddingFullNameAsync(long employeeId, long workshopId, string newFullName);
 }
 
 public class FaceEmbeddingResponse

0_Framework/Application/IAuthHelper.cs

@@ -12,7 +12,6 @@ public interface IAuthHelper
     string CurrentAccountRole();
     AuthViewModel CurrentAccountInfo();
     List<int> GetPermissions();
-    bool HasPermission(int permission);
     long CurrentAccountId();
     string CurrentAccountMobile();
 

0_Framework/Application/Sms/ISmsService.cs

@@ -27,7 +27,7 @@ public interface ISmsService
 
     Task<double> GetCreditAmount();
     
-    public Task<bool> SendInstitutionCreationVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId, string typeOfSms = null);
+    public Task<bool> SendInstitutionCreationVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId);
     
     public Task<bool> SendInstitutionVerificationCode(string number, string code, string contractingPartyFullName,
         long contractingPartyId, long institutionContractId);

0_Framework/Application/StaticWorkshopAccounts.cs

@@ -39,15 +39,4 @@ public static class StaticWorkshopAccounts
     /// که کاربر همچنان به کارگاه دسترسی دارد
     /// </summary>
     public static DateTime ContinuesWorkingDate = new DateTime(2150, 1, 1);
-
-
-    /// <summary>
-    /// لیستی آی دی نقش هایی که مسئول بیمه کارگاه هستند
-    /// 7 : بیمه ارشد
-    /// 8 : بیمه ساده
-    /// </summary>
-    public static List<long> InsuranceAccountsRoleIds = [7, 8];
-
-
-
 }

0_Framework/Excel/ExcelGenerator.cs

@@ -17,7 +17,7 @@ public class ExcelGenerator
 {
     public ExcelGenerator()
     {
-        OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
     }
     public static byte[] GenerateExcel<T>(List<T> obj, string date = "") where T : class
     {

0_Framework/Exceptions/Handler/CustomExceptionHandler.cs

@@ -1,10 +1,7 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using FluentValidation;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -24,24 +21,12 @@ public class CustomExceptionHandler : IExceptionHandler
 
     public async ValueTask<bool> TryHandleAsync(HttpContext context, Exception exception, CancellationToken cancellationToken)
     {
-        _logger.LogError(exception,
-            "Error Message: {exceptionMessage}, Type: {exceptionType}, Time: {time}, Path: {path}, TraceId: {traceId}",
-            exception.Message, 
-            exception.GetType().FullName, 
-            DateTime.UtcNow,
-            context.Request.Path,
-            context.TraceIdentifier);
+        _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
         {
-            ValidationException validationException =>
-            (
-                validationException.Errors.FirstOrDefault()?.ErrorMessage ?? "One or more validation errors occurred.",
-                "Validation Error",
-                context.Response.StatusCode = StatusCodes.Status400BadRequest,
-                null
-            ),
-            
             InternalServerException =>
             (
                 exception.Message,
@@ -49,7 +34,6 @@ public class CustomExceptionHandler : IExceptionHandler
                 context.Response.StatusCode = StatusCodes.Status500InternalServerError,
                 null
             ),
-
             BadRequestException bre =>
             (
                 exception.Message,
@@ -57,7 +41,6 @@ public class CustomExceptionHandler : IExceptionHandler
                 context.Response.StatusCode = StatusCodes.Status400BadRequest,
                 bre.Extra
             ),
-            
             NotFoundException =>
             (
                 exception.Message,
@@ -65,7 +48,6 @@ public class CustomExceptionHandler : IExceptionHandler
                 context.Response.StatusCode = StatusCodes.Status404NotFound,
                 null
             ),
-            
             UnAuthorizeException =>
             (
                 exception.Message,
@@ -73,7 +55,6 @@ public class CustomExceptionHandler : IExceptionHandler
                 context.Response.StatusCode = StatusCodes.Status401Unauthorized,
                 null
             ),
-            
             _ =>
             (
                 exception.Message,
@@ -92,6 +73,8 @@ public class CustomExceptionHandler : IExceptionHandler
             Extensions = details.Extra ?? new Dictionary<string, object>()
         };
         
+
+        
         problemDetails.Extensions.Add("traceId", context.TraceIdentifier);
 
         await context.Response.WriteAsJsonAsync(problemDetails, cancellationToken: cancellationToken);

0_Framework/InfraStructure/FaceEmbeddingService.cs

@@ -18,387 +18,329 @@ namespace _0_Framework.Infrastructure;
 /// </summary>
 public class FaceEmbeddingService : IFaceEmbeddingService
 {
-    private readonly IHttpClientFactory _httpClientFactory;
-    private readonly ILogger<FaceEmbeddingService> _logger;
-    private readonly IFaceEmbeddingNotificationService _notificationService;
-    private readonly string _apiBaseUrl;
+	private readonly IHttpClientFactory _httpClientFactory;
+	private readonly ILogger<FaceEmbeddingService> _logger;
+	private readonly IFaceEmbeddingNotificationService _notificationService;
+	private readonly string _apiBaseUrl;
 
-    public FaceEmbeddingService(IHttpClientFactory httpClientFactory, ILogger<FaceEmbeddingService> logger,
-        IFaceEmbeddingNotificationService notificationService = null)
-    {
-        _httpClientFactory = httpClientFactory;
-        _logger = logger;
-        _notificationService = notificationService;
-        _apiBaseUrl = "http://localhost:8000";
-    }
+	public FaceEmbeddingService(IHttpClientFactory httpClientFactory, ILogger<FaceEmbeddingService> logger, 
+		IFaceEmbeddingNotificationService notificationService = null)
+	{
+		_httpClientFactory = httpClientFactory;
+		_logger = logger;
+		_notificationService = notificationService;
+		_apiBaseUrl = "http://localhost:8000";
+	}
 
-    public async Task<OperationResult> GenerateEmbeddingsAsync(long employeeId, long workshopId,
-        string employeeFullName, string picture1Path, string picture2Path)
-    {
-        try
-        {
-            var httpClient = _httpClientFactory.CreateClient();
-            httpClient.BaseAddress = new Uri(_apiBaseUrl);
-            httpClient.Timeout = TimeSpan.FromSeconds(30);
+	public async Task<OperationResult> GenerateEmbeddingsAsync(long employeeId, long workshopId,
+		string employeeFullName, string picture1Path, string picture2Path)
+	{
+		try
+		{
+			var httpClient = _httpClientFactory.CreateClient();
+			httpClient.BaseAddress = new Uri(_apiBaseUrl);
+			httpClient.Timeout = TimeSpan.FromSeconds(30);
 
-            using var content = new MultipartFormDataContent();
+			using var content = new MultipartFormDataContent();
 
-            // Add form fields
-            content.Add(new StringContent(employeeId.ToString()), "employee_id");
-            content.Add(new StringContent(workshopId.ToString()), "workshop_id");
-            content.Add(new StringContent(employeeFullName ?? ""), "employee_full_name");
+			// Add form fields
+			content.Add(new StringContent(employeeId.ToString()), "employee_id");
+			content.Add(new StringContent(workshopId.ToString()), "workshop_id");
+			content.Add(new StringContent(employeeFullName ?? ""), "employee_full_name");
 
-            // Add picture files
-            if (File.Exists(picture1Path))
-            {
-                var picture1Bytes = await File.ReadAllBytesAsync(picture1Path);
-                var picture1Content = new ByteArrayContent(picture1Bytes);
-                picture1Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
-                content.Add(picture1Content, "picture1", "1.jpg");
-            }
-            else
-            {
-                _logger.LogWarning("Picture1 not found at path: {Path}", picture1Path);
-                return new OperationResult { IsSuccedded = false, Message = "تصویر اول یافت نشد" };
-            }
+			// Add picture files
+			if (File.Exists(picture1Path))
+			{
+				var picture1Bytes = await File.ReadAllBytesAsync(picture1Path);
+				var picture1Content = new ByteArrayContent(picture1Bytes);
+				picture1Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
+				content.Add(picture1Content, "picture1", "1.jpg");
+			}
+			else
+			{
+				_logger.LogWarning("Picture1 not found at path: {Path}", picture1Path);
+				return new OperationResult { IsSuccedded = false, Message = "تصویر اول یافت نشد" };
+			}
 
-            if (File.Exists(picture2Path))
-            {
-                var picture2Bytes = await File.ReadAllBytesAsync(picture2Path);
-                var picture2Content = new ByteArrayContent(picture2Bytes);
-                picture2Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
-                content.Add(picture2Content, "picture2", "2.jpg");
-            }
-            else
-            {
-                _logger.LogWarning("Picture2 not found at path: {Path}", picture2Path);
-                return new OperationResult { IsSuccedded = false, Message = "تصویر دوم یافت نشد" };
-            }
+			if (File.Exists(picture2Path))
+			{
+				var picture2Bytes = await File.ReadAllBytesAsync(picture2Path);
+				var picture2Content = new ByteArrayContent(picture2Bytes);
+				picture2Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
+				content.Add(picture2Content, "picture2", "2.jpg");
+			}
+			else
+			{
+				_logger.LogWarning("Picture2 not found at path: {Path}", picture2Path);
+				return new OperationResult { IsSuccedded = false, Message = "تصویر دوم یافت نشد" };
+			}
 
-            // Send request to Python API
-            var response = await httpClient.PostAsync("embeddings", content);
+			// Send request to Python API
+			var response = await httpClient.PostAsync("embeddings", content);
 
-            if (response.IsSuccessStatusCode)
-            {
-                var responseContent = await response.Content.ReadAsStringAsync();
-                _logger.LogInformation(
-                    "Embeddings generated successfully for Employee {EmployeeId}, Workshop {WorkshopId}",
-                    employeeId, workshopId);
+			if (response.IsSuccessStatusCode)
+			{
+				var responseContent = await response.Content.ReadAsStringAsync();
+				_logger.LogInformation("Embeddings generated successfully for Employee {EmployeeId}, Workshop {WorkshopId}",
+	employeeId, workshopId);
 
-                // ارسال اطلاع‌رسانی به سایر سیستم‌ها
-                if (_notificationService != null)
-                {
-                    await _notificationService.NotifyEmbeddingCreatedAsync(workshopId, employeeId, employeeFullName);
-                }
+				// ارسال اطلاع‌رسانی به سایر سیستم‌ها
+				if (_notificationService != null)
+				{
+					await _notificationService.NotifyEmbeddingCreatedAsync(workshopId, employeeId, employeeFullName);
+				}
 
-                return new OperationResult
-                {
-                    IsSuccedded = true,
-                    Message = "Embedding با موفقیت ایجاد شد"
-                };
-            }
-            else
-            {
-                var errorContent = await response.Content.ReadAsStringAsync();
-                _logger.LogError("Failed to generate embeddings. Status: {StatusCode}, Error: {Error}",
-                    response.StatusCode, errorContent);
+				return new OperationResult
+				{
+					IsSuccedded = true,
+					Message = "Embedding با موفقیت ایجاد شد"
+				};
+			}
+			else
+			{
+				var errorContent = await response.Content.ReadAsStringAsync();
+				_logger.LogError("Failed to generate embeddings. Status: {StatusCode}, Error: {Error}",
+				  response.StatusCode, errorContent);
 
-                return new OperationResult
-                {
-                    IsSuccedded = false,
-                    Message = $"خطا در تولید Embedding: {response.StatusCode}"
-                };
-            }
-        }
-        catch (HttpRequestException ex)
-        {
-            _logger.LogError(ex, "HTTP error while calling embeddings API for Employee {EmployeeId}", employeeId);
-            return new OperationResult
-            {
-                IsSuccedded = false,
-                Message = "خطا در ارتباط با سرور Embedding"
-            };
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error while calling embeddings API for Employee {EmployeeId}", employeeId);
-            return new OperationResult
-            {
-                IsSuccedded = false,
-                Message = "خطای غیرمنتظره در تولید Embedding"
-            };
-        }
-    }
+				return new OperationResult
+				{
+					IsSuccedded = false,
+					Message = $"خطا در تولید Embedding: {response.StatusCode}"
+				};
+			}
+		}
+		catch (HttpRequestException ex)
+		{
+			_logger.LogError(ex, "HTTP error while calling embeddings API for Employee {EmployeeId}", employeeId);
+			return new OperationResult
+			{
+				IsSuccedded = false,
+				Message = "خطا در ارتباط با سرور Embedding"
+			};
+		}
+		catch (Exception ex)
+		{
+			_logger.LogError(ex, "Error while calling embeddings API for Employee {EmployeeId}", employeeId);
+			return new OperationResult
+			{
+				IsSuccedded = false,
+				Message = "خطای غیرمنتظره در تولید Embedding"
+			};
+		}
+	}
 
-    public async Task<OperationResult> GenerateEmbeddingsFromStreamAsync(long employeeId, long workshopId,
-        string employeeFullName, Stream picture1Stream, Stream picture2Stream)
-    {
-        try
-        {
-            var httpClient = _httpClientFactory.CreateClient();
-            httpClient.BaseAddress = new Uri(_apiBaseUrl);
-            httpClient.Timeout = TimeSpan.FromSeconds(30);
+	public async Task<OperationResult> GenerateEmbeddingsFromStreamAsync(long employeeId, long workshopId,
+		string employeeFullName, Stream picture1Stream, Stream picture2Stream)
+	{
+		try
+		{
+			var httpClient = _httpClientFactory.CreateClient();
+			httpClient.BaseAddress = new Uri(_apiBaseUrl);
+			httpClient.Timeout = TimeSpan.FromSeconds(30);
 
-            using var content = new MultipartFormDataContent();
+			using var content = new MultipartFormDataContent();
 
-            // Add form fields
-            content.Add(new StringContent(employeeId.ToString()), "employee_id");
-            content.Add(new StringContent(workshopId.ToString()), "workshop_id");
-            content.Add(new StringContent(employeeFullName ?? ""), "employee_full_name");
+			// Add form fields
+			content.Add(new StringContent(employeeId.ToString()), "employee_id");
+			content.Add(new StringContent(workshopId.ToString()), "workshop_id");
+			content.Add(new StringContent(employeeFullName ?? ""), "employee_full_name");
 
-            // Add picture streams
-            var picture1Content = new StreamContent(picture1Stream);
-            picture1Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
-            content.Add(picture1Content, "picture1", "1.jpg");
+			// Add picture streams
+			var picture1Content = new StreamContent(picture1Stream);
+			picture1Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
+			content.Add(picture1Content, "picture1", "1.jpg");
 
-            var picture2Content = new StreamContent(picture2Stream);
-            picture2Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
-            content.Add(picture2Content, "picture2", "2.jpg");
+			var picture2Content = new StreamContent(picture2Stream);
+			picture2Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
+			content.Add(picture2Content, "picture2", "2.jpg");
 
-            // Send request to Python API
-            var response = await httpClient.PostAsync("embeddings", content);
+			// Send request to Python API
+			var response = await httpClient.PostAsync("embeddings", content);
 
-            if (response.IsSuccessStatusCode)
-            {
-                _logger.LogInformation("Embeddings generated successfully from streams for Employee {EmployeeId}",
-                    employeeId);
+			if (response.IsSuccessStatusCode)
+			{
+				_logger.LogInformation("Embeddings generated successfully from streams for Employee {EmployeeId}", employeeId);
+				
+				// ارسال اطلاع‌رسانی به سایر سیستم‌ها
+				if (_notificationService != null)
+				{
+					await _notificationService.NotifyEmbeddingCreatedAsync(workshopId, employeeId, employeeFullName);
+				}
+				
+				return new OperationResult { IsSuccedded = true, Message = "Embedding با موفقیت ایجاد شد" };
+			}
+			else
+			{
+				var errorContent = await response.Content.ReadAsStringAsync();
+				_logger.LogError("Failed to generate embeddings from streams. Status: {StatusCode}, Error: {Error}",
+						 response.StatusCode, errorContent);
 
-                // ارسال اطلاع‌رسانی به سایر سیستم‌ها
-                if (_notificationService != null)
-                {
-                    await _notificationService.NotifyEmbeddingCreatedAsync(workshopId, employeeId, employeeFullName);
-                }
+				return new OperationResult
+				{
+					IsSuccedded = false,
+					Message = $"خطا در تولید Embedding: {response.StatusCode}"
+				};
+			}
+		}
+		catch (Exception ex)
+		{
+			_logger.LogError(ex, "Error while generating embeddings from streams for Employee {EmployeeId}", employeeId);
+			return new OperationResult
+			{
+				IsSuccedded = false,
+				Message = "خطا در تولید Embedding"
+			};
+		}
+	}
 
-                return new OperationResult { IsSuccedded = true, Message = "Embedding با موفقیت ایجاد شد" };
-            }
-            else
-            {
-                var errorContent = await response.Content.ReadAsStringAsync();
-                _logger.LogError("Failed to generate embeddings from streams. Status: {StatusCode}, Error: {Error}",
-                    response.StatusCode, errorContent);
+	public async Task<OperationResult> RefineEmbeddingAsync(long employeeId, long workshopId, float[] embedding,
+		float confidence, Dictionary<string, object> metadata = null)
+	{
+		try
+		{
+			var httpClient = _httpClientFactory.CreateClient();
+			httpClient.BaseAddress = new Uri(_apiBaseUrl);
+			httpClient.Timeout = TimeSpan.FromSeconds(30);
 
-                return new OperationResult
-                {
-                    IsSuccedded = false,
-                    Message = $"خطا در تولید Embedding: {response.StatusCode}"
-                };
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error while generating embeddings from streams for Employee {EmployeeId}",
-                employeeId);
-            return new OperationResult
-            {
-                IsSuccedded = false,
-                Message = "خطا در تولید Embedding"
-            };
-        }
-    }
+			var requestBody = new
+			{
+				employeeId,
+				workshopId,
+				embedding,
+				confidence,
+				metadata = metadata ?? new Dictionary<string, object>()
+			};
 
-    public async Task<OperationResult> RefineEmbeddingAsync(long employeeId, long workshopId, float[] embedding,
-        float confidence, Dictionary<string, object> metadata = null)
-    {
-        try
-        {
-            var httpClient = _httpClientFactory.CreateClient();
-            httpClient.BaseAddress = new Uri(_apiBaseUrl);
-            httpClient.Timeout = TimeSpan.FromSeconds(30);
+			var response = await httpClient.PostAsJsonAsync("embeddings/refine", requestBody);
 
-            var requestBody = new
-            {
-                employeeId,
-                workshopId,
-                embedding,
-                confidence,
-                metadata = metadata ?? new Dictionary<string, object>()
-            };
+			if (response.IsSuccessStatusCode)
+			{
+				_logger.LogInformation("Embedding refined successfully for Employee {EmployeeId}", employeeId);
+				
+				// ارسال اطلاع‌رسانی به سایر سیستم‌ها
+				if (_notificationService != null)
+				{
+					await _notificationService.NotifyEmbeddingRefinedAsync(workshopId, employeeId);
+				}
+				
+				return new OperationResult { IsSuccedded = true, Message = "Embedding بهبود یافت" };
+			}
+			else
+			{
+				var errorContent = await response.Content.ReadAsStringAsync();
+				_logger.LogError("Failed to refine embedding. Status: {StatusCode}, Error: {Error}",
+				response.StatusCode, errorContent);
 
-            var response = await httpClient.PostAsJsonAsync("embeddings/refine", requestBody);
+				return new OperationResult
+				{
+					IsSuccedded = false,
+					Message = $"خطا در بهبود Embedding: {response.StatusCode}"
+				};
+			}
+		}
+		catch (Exception ex)
+		{
+			_logger.LogError(ex, "Error while refining embedding for Employee {EmployeeId}", employeeId);
+			return new OperationResult
+			{
+				IsSuccedded = false,
+				Message = "خطا در بهبود Embedding"
+			};
+		}
+	}
 
-            if (response.IsSuccessStatusCode)
-            {
-                _logger.LogInformation("Embedding refined successfully for Employee {EmployeeId}", employeeId);
+	public async Task<OperationResult> DeleteEmbeddingAsync(long employeeId, long workshopId)
+	{
+		try
+		{
+			var httpClient = _httpClientFactory.CreateClient();
+			httpClient.BaseAddress = new Uri(_apiBaseUrl);
+			httpClient.Timeout = TimeSpan.FromSeconds(30);
 
-                // ارسال اطلاع‌رسانی به سایر سیستم‌ها
-                if (_notificationService != null)
-                {
-                    await _notificationService.NotifyEmbeddingRefinedAsync(workshopId, employeeId);
-                }
+			var response = await httpClient.DeleteAsync($"embeddings/{workshopId}/{employeeId}");
 
-                return new OperationResult { IsSuccedded = true, Message = "Embedding بهبود یافت" };
-            }
-            else
-            {
-                var errorContent = await response.Content.ReadAsStringAsync();
-                _logger.LogError("Failed to refine embedding. Status: {StatusCode}, Error: {Error}",
-                    response.StatusCode, errorContent);
+			if (response.IsSuccessStatusCode)
+			{
+				_logger.LogInformation("Embedding deleted successfully for Employee {EmployeeId}", employeeId);
+				
+				// ارسال اطلاع‌رسانی به سایر سیستم‌ها
+				if (_notificationService != null)
+				{
+					await _notificationService.NotifyEmbeddingDeletedAsync(workshopId, employeeId);
+				}
+				
+				return new OperationResult { IsSuccedded = true, Message = "Embedding حذف شد" };
+			}
+			else
+			{
+				var errorContent = await response.Content.ReadAsStringAsync();
+				_logger.LogError("Failed to delete embedding. Status: {StatusCode}, Error: {Error}",
+								response.StatusCode, errorContent);
 
-                return new OperationResult
-                {
-                    IsSuccedded = false,
-                    Message = $"خطا در بهبود Embedding: {response.StatusCode}"
-                };
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error while refining embedding for Employee {EmployeeId}", employeeId);
-            return new OperationResult
-            {
-                IsSuccedded = false,
-                Message = "خطا در بهبود Embedding"
-            };
-        }
-    }
+				return new OperationResult
+				{
+					IsSuccedded = false,
+					Message = $"خطا در حذف Embedding: {response.StatusCode}"
+				};
+			}
+		}
+		catch (Exception ex)
+		{
+			_logger.LogError(ex, "Error while deleting embedding for Employee {EmployeeId}", employeeId);
+			return new OperationResult
+			{
+				IsSuccedded = false,
+				Message = "خطا در حذف Embedding"
+			};
+		}
+	}
 
-    public async Task<OperationResult> DeleteEmbeddingAsync(long employeeId, long workshopId)
-    {
-        try
-        {
-            var httpClient = _httpClientFactory.CreateClient();
-            httpClient.BaseAddress = new Uri(_apiBaseUrl);
-            httpClient.Timeout = TimeSpan.FromSeconds(30);
+	public async Task<OperationResult<FaceEmbeddingResponse>> GetEmbeddingAsync(long employeeId, long workshopId)
+	{
+		try
+		{
+			var httpClient = _httpClientFactory.CreateClient();
+			httpClient.BaseAddress = new Uri(_apiBaseUrl);
+			httpClient.Timeout = TimeSpan.FromSeconds(30);
 
-            var response = await httpClient.DeleteAsync($"embeddings/{workshopId}/{employeeId}");
+			var response = await httpClient.GetAsync($"embeddings/{workshopId}/{employeeId}");
 
-            if (response.IsSuccessStatusCode)
-            {
-                _logger.LogInformation("Embedding deleted successfully for Employee {EmployeeId}", employeeId);
+			if (response.IsSuccessStatusCode)
+			{
+				var content = await response.Content.ReadAsStringAsync();
+				var embeddingData = JsonSerializer.Deserialize<FaceEmbeddingResponse>(content,
+		   new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
 
-                // ارسال اطلاع‌رسانی به سایر سیستم‌ها
-                if (_notificationService != null)
-                {
-                    await _notificationService.NotifyEmbeddingDeletedAsync(workshopId, employeeId);
-                }
+				_logger.LogInformation("Embedding retrieved successfully for Employee {EmployeeId}", employeeId);
 
-                return new OperationResult { IsSuccedded = true, Message = "Embedding حذف شد" };
-            }
-            else
-            {
-                var errorContent = await response.Content.ReadAsStringAsync();
-                _logger.LogError("Failed to delete embedding. Status: {StatusCode}, Error: {Error}",
-                    response.StatusCode, errorContent);
-
-                return new OperationResult
-                {
-                    IsSuccedded = false,
-                    Message = $"خطا در حذف Embedding: {response.StatusCode}"
-                };
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error while deleting embedding for Employee {EmployeeId}", employeeId);
-            return new OperationResult
-            {
-                IsSuccedded = false,
-                Message = "خطا در حذف Embedding"
-            };
-        }
-    }
-
-    public async Task<OperationResult<FaceEmbeddingResponse>> GetEmbeddingAsync(long employeeId, long workshopId)
-    {
-        try
-        {
-            var httpClient = _httpClientFactory.CreateClient();
-            httpClient.BaseAddress = new Uri(_apiBaseUrl);
-            httpClient.Timeout = TimeSpan.FromSeconds(30);
-
-            var response = await httpClient.GetAsync($"embeddings/{workshopId}/{employeeId}");
-
-            if (response.IsSuccessStatusCode)
-            {
-                var content = await response.Content.ReadAsStringAsync();
-                var embeddingData = JsonSerializer.Deserialize<FaceEmbeddingResponse>(content,
-                    new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
-
-                _logger.LogInformation("Embedding retrieved successfully for Employee {EmployeeId}", employeeId);
-
-                return new OperationResult<FaceEmbeddingResponse>
-                {
-                    IsSuccedded = true,
-                    Message = "Embedding دریافت شد",
-                    Data = embeddingData
-                };
-            }
-            else
-            {
-                var errorContent = await response.Content.ReadAsStringAsync();
-                _logger.LogError("Failed to get embedding. Status: {StatusCode}, Error: {Error}",
-                    response.StatusCode, errorContent);
-
-                return new OperationResult<FaceEmbeddingResponse>
-                {
-                    IsSuccedded = false,
-                    Message = $"خطا در دریافت Embedding: {response.StatusCode}"
-                };
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error while getting embedding for Employee {EmployeeId}", employeeId);
-            return new OperationResult<FaceEmbeddingResponse>
-            {
-                IsSuccedded = false,
-                Message = "خطا در دریافت Embedding"
-            };
-        }
-    }
-
-    public async Task<OperationResult> UpdateEmbeddingFullNameAsync(long employeeId, long workshopId,
-        string newFullName)
-    {
-        try
-        {
-            var httpClient = _httpClientFactory.CreateClient();
-            httpClient.BaseAddress = new Uri(_apiBaseUrl);
-            httpClient.Timeout = TimeSpan.FromSeconds(30);
-
-            var requestBody = new
-            {
-                employee_id = employeeId,
-                workshop_id = workshopId,
-                employee_full_name = newFullName
-            };
-
-            var response = await httpClient.PutAsJsonAsync("embeddings/update-name", requestBody);
-
-            if (response.IsSuccessStatusCode)
-            {
-                _logger.LogInformation("Employee Name Changed For {EmployeeId} In workshop ={WorkshopId}", employeeId,
-                    workshopId);
-
-                // ارسال اطلاع‌رسانی به سایر سیستم‌ها
-                if (_notificationService != null)
-                {
-                    //await _notificationService.NotifyEmbeddingRefinedAsync(workshopId, employeeId);
-                }
-
-                return new OperationResult { IsSuccedded = true, Message = "عملیات با موفقیت انجام شد" };
-            }
-            else
-            {
-                var errorContent = await response.Content.ReadAsStringAsync();
-                _logger.LogError("Failed to refine embedding. Status: {StatusCode}, Error: {Error}",
-                    response.StatusCode, errorContent);
-
-                return new OperationResult
-                {
-                    IsSuccedded = false,
-                    Message = $"خطا در بهبود Embedding: {response.StatusCode}"
-                };
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error while Changing EmployeeFullName for Employee {EmployeeId}", employeeId);
-            return new OperationResult
-            {
-                IsSuccedded = false,
-                Message = "خطا در بهبود Embedding"
-            };
-        }
-    }
-}
+				return new OperationResult<FaceEmbeddingResponse>
+				{
+					IsSuccedded = true,
+					Message = "Embedding دریافت شد",
+					Data = embeddingData
+				};
+			}
+			else
+			{
+				var errorContent = await response.Content.ReadAsStringAsync();
+				_logger.LogError("Failed to get embedding. Status: {StatusCode}, Error: {Error}",
+						response.StatusCode, errorContent);
+					
+				return new OperationResult<FaceEmbeddingResponse>
+				{
+					IsSuccedded = false,
+					Message = $"خطا در دریافت Embedding: {response.StatusCode}"
+				};
+			}
+		}
+		catch (Exception ex)
+		{
+			_logger.LogError(ex, "Error while getting embedding for Employee {EmployeeId}", employeeId);
+			return new OperationResult<FaceEmbeddingResponse>
+			{
+				IsSuccedded = false,
+				Message = "خطا در دریافت Embedding"
+			};
+		}
+	}
+}

AccountManagement.Application.Contracts/Account/EditAccount.cs

@@ -1,4 +1,6 @@
-namespace AccountManagement.Application.Contracts.Account;
+using System.Collections.Generic;
+
+namespace AccountManagement.Application.Contracts.Account;
 
 public class EditAccount : CreateAccount
 {

AccountManagement.Application.Contracts/Account/EditClientAccount.cs

@@ -1,4 +1,10 @@
-namespace AccountManagement.Application.Contracts.Account;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AccountManagement.Application.Contracts.Account;
 
 public class EditClientAccount : RegisterAccount
 {

AccountManagement.Application.Contracts/Account/IAccountApplication.cs

@@ -2,7 +2,7 @@
 
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Shared.Contracts.PmUser.Queries;
+using AccountManagement.Application.Contracts.ProgramManager;
 
 namespace AccountManagement.Application.Contracts.Account;
 
@@ -74,7 +74,12 @@ public interface IAccountApplication
 
     void CameraLogin(CameraLoginRequest request);
 
-    Task<GetPmUserDto> GetPmUserAsync(long accountId);
+    /// <summary>
+    /// دریافت کاربر پروگرام منیجر با اکانت آی دی
+    /// </summary>
+    /// <param name="accountId"></param>
+    /// <returns></returns>
+    Task<GetPmUserDto> GetPmUserByAccountId(long accountId);
 }
 
 public class CameraLoginRequest

AccountManagement.Application.Contracts/Account/RegisterAccount.cs

@@ -1,4 +1,10 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using _0_Framework.Application;
 using Microsoft.AspNetCore.Http;
 
 namespace AccountManagement.Application.Contracts.Account;

AccountManagement.Application.Contracts/Account/WorkshopSelectList.cs

@@ -1,4 +1,10 @@
-namespace AccountManagement.Application.Contracts.Account;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AccountManagement.Application.Contracts.Account;
 
 public class WorkshopSelectList
 {

AccountManagement.Application.Contracts/ProgramManager/GetPmUserDto.cs

@@ -1,8 +1,9 @@
-namespace Shared.Contracts.PmUser.Queries;
+using System.Collections.Generic;
+
+namespace AccountManagement.Application.Contracts.ProgramManager;
 
 public class GetPmUserDto
 {
-    public long Id { get; set; }
     /// <summary>
     /// نام و نام خانوادگی 
     /// </summary>
@@ -42,7 +43,7 @@ public class GetPmUserDto
     public List<long> Roles { get; set; }
 
 
-    public List<RoleListDto>? RoleListDto { get; set; }
+    public List<RoleListDto> RoleListDto { get; set; }
 
 
 }

AccountManagement.Application.Contracts/ProgramManager/GetRoleDto.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+
+namespace AccountManagement.Application.Contracts.ProgramManager;
+
+public record GetPmRolesDto
+{
+    /// <summary>
+    /// آی دی نقش
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// نام نقش
+    /// </summary>
+    public string RoleName { get; set; }
+
+    /// <summary>
+    /// آی دی نقش در گزارشگیر
+    /// </summary>
+    public long? GozareshgirRoleId { get; set; }
+
+    /// <summary>
+    /// لیست کدهای دسترسی
+    /// </summary>
+    public List<int> Permissions { get; set; }
+
+
+}

AccountManagement.Application/AccountApplication.cs

@@ -2,9 +2,13 @@
 using _0_Framework.Application.Sms;
 using _0_Framework.Exceptions;
 using AccountManagement.Application.Contracts.Account;
+using AccountManagement.Application.Contracts.ProgramManagerApiResult;
 using AccountManagement.Domain.AccountAgg;
 using AccountManagement.Domain.AccountLeftWorkAgg;
 using AccountManagement.Domain.CameraAccountAgg;
+using AccountManagement.Domain.InternalApiCaller;
+using AccountManagement.Domain.PmDomains.PmRoleUserAgg;
+using AccountManagement.Domain.PmDomains.PmUserAgg;
 using AccountManagement.Domain.PositionAgg;
 using AccountManagement.Domain.RoleAgg;
 using AccountManagement.Domain.SubAccountAgg;
@@ -13,14 +17,25 @@ using AccountManagement.Domain.SubAccountRoleAgg;
 using Company.Domain._common;
 using Company.Domain.WorkshopAgg;
 using Company.Domain.WorkshopSubAccountAgg;
+using CompanyManagment.App.Contracts.Workshop;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.JsonPatch.Operations;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
+using System.Runtime.InteropServices;
+using System.Security.Claims;
+using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
-
-using Shared.Contracts.PmUser.Commands;
-using Shared.Contracts.PmUser.Queries;
+using AccountManagement.Application.Contracts.ProgramManager;
+using Shared.Contracts.PmUser;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
 
 //using AccountManagement.Domain.RoleAgg;
 
@@ -42,13 +57,12 @@ public class AccountApplication : IAccountApplication
     private readonly ISubAccountRoleRepository _subAccountRoleRepository;
     private readonly IWorkshopSubAccountRepository _workshopSubAccountRepository;
     private readonly ISubAccountPermissionSubtitle1Repository _accountPermissionSubtitle1Repository;
-
+    private readonly IPmUserRepository _pmUserRepository;
     private readonly IUnitOfWork _unitOfWork;
     private readonly IPmUserQueryService _pmUserQueryService;
-    private readonly IPmUserCommandService _pmUserCommandService;
 
     public AccountApplication(IAccountRepository accountRepository, IPasswordHasher passwordHasher,
-        IFileUploader fileUploader, IAuthHelper authHelper, IRoleRepository roleRepository, IWorker worker, ISmsService smsService, ICameraAccountRepository cameraAccountRepository, IPositionRepository positionRepository, IAccountLeftworkRepository accountLeftworkRepository, IWorkshopRepository workshopRepository, ISubAccountRepository subAccountRepository, ISubAccountRoleRepository subAccountRoleRepository, IWorkshopSubAccountRepository workshopSubAccountRepository, ISubAccountPermissionSubtitle1Repository accountPermissionSubtitle1Repository, IUnitOfWork unitOfWork, IPmUserQueryService pmUserQueryService, IPmUserCommandService pmUserCommandService)
+        IFileUploader fileUploader, IAuthHelper authHelper, IRoleRepository roleRepository, IWorker worker, ISmsService smsService, ICameraAccountRepository cameraAccountRepository, IPositionRepository positionRepository, IAccountLeftworkRepository accountLeftworkRepository, IWorkshopRepository workshopRepository, ISubAccountRepository subAccountRepository, ISubAccountRoleRepository subAccountRoleRepository, IWorkshopSubAccountRepository workshopSubAccountRepository, ISubAccountPermissionSubtitle1Repository accountPermissionSubtitle1Repository, IUnitOfWork unitOfWork, IPmUserRepository pmUserRepository, IPmUserQueryService pmUserQueryService)
     {
         _authHelper = authHelper;
         _roleRepository = roleRepository;
@@ -62,9 +76,8 @@ public class AccountApplication : IAccountApplication
         _workshopSubAccountRepository = workshopSubAccountRepository;
         _accountPermissionSubtitle1Repository = accountPermissionSubtitle1Repository;
         _unitOfWork = unitOfWork;
-
+        _pmUserRepository = pmUserRepository;
         _pmUserQueryService = pmUserQueryService;
-        _pmUserCommandService = pmUserCommandService;
         _fileUploader = fileUploader;
         _passwordHasher = passwordHasher;
         _accountRepository = accountRepository;
@@ -155,18 +168,40 @@ public class AccountApplication : IAccountApplication
 
         if (command.IsProgramManagerUser)
         {
-            if (command.UserRoles == null)
-                return operation.Failed("حداقل یک نقش برای کاربر مدیریت پروژه لازم است");
-            var pmUserRoles = command.UserRoles.Where(x => x > 0).ToList();
-            var createPm = await _pmUserCommandService.Create(new CreatePmUserDto(command.Fullname, command.Username, account.Password, command.Mobile,
-                null, account.id, pmUserRoles));
-            if (!createPm.isSuccess)
+
+            try
             {
-                _unitOfWork.RollbackAccountContext();
-                return operation.Failed("خطا در ویرایش کاربر پروگرام منیجر");
+                if (_pmUserRepository.Exists(x => x.FullName == command.Fullname))
+                {
+                    _unitOfWork.RollbackAccountContext();
+                    return operation.Failed("نام و خانوادگی تکراری است");
+                }
+
+                if (_pmUserRepository.Exists(x => x.UserName == command.Username))
+                {
+                    _unitOfWork.RollbackAccountContext();
+                    return operation.Failed("نام کاربری تکراری است");
+                }
+
+                if (_pmUserRepository.Exists(x => !string.IsNullOrWhiteSpace(x.Mobile) && x.Mobile == command.Mobile))
+                {
+                    _unitOfWork.RollbackAccountContext();
+                    return operation.Failed("این شماره همراه قبلا به فرد دیگری اختصاص داده شده است");
+                }
+
+
+
+                var userRoles = command.UserRoles.Where(x => x > 0).Select(x => new PmRoleUser(x)).ToList();
+                var create = new PmUser(command.Fullname, command.Username, command.Password, command.Mobile,
+                    null, account.id, userRoles);
+                await _pmUserRepository.CreateAsync(create);
+                await _pmUserRepository.SaveChangesAsync();
+            }
+            catch (Exception e)
+            {
+               _unitOfWork.RollbackAccountContext();
+               return operation.Failed("خطا در ایجاد کاربر پروگرام منیجر");
             }
-
-
 
             //var url = "api/user/create";
             //var key = SecretKeys.ProgramManagerInternalApi;
@@ -252,29 +287,31 @@ public class AccountApplication : IAccountApplication
         //    $"api/user/{account.id}",
         //    key
         //);
-        var userResult =await _pmUserQueryService.GetPmUserDataByAccountId(account.id);
+        var userResult = _pmUserRepository.GetByPmUsertoEditbyAccountId(account.id).GetAwaiter().GetResult();
+
 
-        if (command.UserRoles == null)
-            return operation.Failed("حداقل یک نقش برای کاربر مدیریت پروژه لازم است");
-        var pmUserRoles = command.UserRoles.Where(x => x > 0).ToList();
 
         //اگر کاربر در پروگرام منیجر قبلا ایجاد شده
-        if (userResult.Id >0)
+        if (userResult != null)
         {
             if (!command.UserRoles.Any())
             {
                 _unitOfWork.RollbackAccountContext();
                 return operation.Failed("حداقل یک نقش باید انتخاب شود");
             }
-           
-            var editPm =await _pmUserCommandService.Edit(new EditPmUserDto(command.Fullname, command.Username, command.Mobile, account.id, pmUserRoles,
-                command.IsProgramManagerUser));
-            if (!editPm.isSuccess)
+              
+            try
+            {
+
+                var userRoles = command.UserRoles.Where(x => x > 0).Select(x => new PmRoleUser(x)).ToList();
+                userResult.Edit(command.Fullname, command.Username, command.Mobile, userRoles, command.IsProgramManagerUser);
+                await _pmUserRepository.SaveChangesAsync();
+            }
+            catch (Exception)
             {
                 _unitOfWork.RollbackAccountContext();
                 return operation.Failed("خطا در ویرایش کاربر پروگرام منیجر");
             }
- 
             //var parameters = new EditUserCommand(
             //    command.Fullname,
             //    command.Username,
@@ -315,19 +352,39 @@ public class AccountApplication : IAccountApplication
                     return operation.Failed("حداقل یک نقش باید انتخاب شود");
                 }
 
-             
-
-                
-
-               
-                var createPm = await _pmUserCommandService.Create(new CreatePmUserDto(command.Fullname, command.Username, account.Password, command.Mobile,
-                    null, account.id, pmUserRoles));
-                if (!createPm.isSuccess)
+                if (_pmUserRepository.Exists(x => x.FullName == command.Fullname))
                 {
+                    _unitOfWork.RollbackAccountContext();
+                    return operation.Failed("نام و خانوادگی تکراری است");
+                }
+
+                if (_pmUserRepository.Exists(x => x.UserName == command.Username))
+                {
+                    _unitOfWork.RollbackAccountContext();
+                    return operation.Failed("نام کاربری تکراری است");
+                }
+
+                if (_pmUserRepository.Exists(x => !string.IsNullOrWhiteSpace(x.Mobile) && x.Mobile == command.Mobile))
+                {
+                    _unitOfWork.RollbackAccountContext();
+                    return operation.Failed("این شماره همراه قبلا به فرد دیگری اختصاص داده شده است");
+                }
+
+
+                try
+                {
+                    var userRoles = command.UserRoles.Where(x => x > 0).Select(x => new PmRoleUser(x)).ToList();
+                    var create = new PmUser(command.Fullname, command.Username, account.Password, command.Mobile,
+                        null, account.id, userRoles);
+                    await _pmUserRepository.CreateAsync(create);
+                    await _pmUserRepository.SaveChangesAsync();
+                }
+                catch (Exception)
+                {
+
                     _unitOfWork.RollbackAccountContext();
                     return operation.Failed("خطا در ویرایش کاربر پروگرام منیجر");
                 }
-              
 
 
                 //var parameters = new CreateProgramManagerUser(
@@ -400,23 +457,6 @@ public class AccountApplication : IAccountApplication
                 .Permissions
                 .Select(x => x.Code)
                 .ToList();
-            //PmPermission
-            var PmUserData = _pmUserQueryService.GetPmUserDataByAccountId(account.id).GetAwaiter().GetResult();
-            if (PmUserData.AccountId > 0 && PmUserData.IsActive)
-            {
-                
-                var pmUserPermissions =
-                    PmUserData.RoleListDto != null
-                        ? PmUserData.RoleListDto
-                            .SelectMany(x => x.Permissions)
-                            .Where(p => p != 99)
-                            .Distinct()                    
-                            .ToList()
-                        : new List<int>();
-                permissions.AddRange(pmUserPermissions);
-            }
-           
-
             int? positionValue;
             if (account.PositionId != null)
             {
@@ -426,7 +466,7 @@ public class AccountApplication : IAccountApplication
             {
                 positionValue = null;
             }
-            var pmUserId = PmUserData.AccountId > 0 ? PmUserData.AccountId : null;
+            var pmUserId = _pmUserQueryService.GetCurrentPmUserIdFromAccountId(account.id).GetAwaiter().GetResult();
             var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
                 , account.Username, account.Mobile, account.ProfilePhoto,
                 permissions, account.RoleName, account.AdminAreaPermission, 
@@ -1020,9 +1060,8 @@ public class AccountApplication : IAccountApplication
         _authHelper.CameraSignIn(authViewModel);
     }
 
-    public async Task<GetPmUserDto> GetPmUserAsync(long accountId)
+    public async Task<GetPmUserDto> GetPmUserByAccountId(long accountId)
     {
-        return await _pmUserQueryService.GetPmUserDataByAccountId(accountId);
+        return await _pmUserRepository.GetPmUserByAccountId(accountId);
     }
-    
 }

AccountManagement.Application/CameraAccountApplication.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 using AccountManagement.Application.Contracts.Account;
 using AccountManagement.Application.Contracts.CameraAccount;

AccountManagement.Application/MediaApplication.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using _0_Framework.Application;

AccountManagement.Application/RoleApplication.cs

@@ -4,7 +4,13 @@ using AccountManagement.Domain.RoleAgg;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using AccountManagement.Application.Contracts.ProgramManagerApiResult;
+using AccountManagement.Domain.InternalApiCaller;
 using Company.Domain._common;
+using AccountManagement.Application.Contracts.Ticket;
+using AccountManagement.Domain.PmDomains.PmPermissionAgg;
+using AccountManagement.Domain.PmDomains.PmRoleAgg;
+using AccountManagement.Domain.PmDomains.PmUserAgg;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Shared.Contracts.PmRole.Commands;
 using GetPmRolesDto = Shared.Contracts.PmRole.Queries.GetPmRolesDto;
@@ -16,15 +22,18 @@ namespace AccountManagement.Application;
 public class RoleApplication : IRoleApplication
 {
     private readonly IRoleRepository _roleRepository;
-
+    private readonly IPmRoleRepository _pmRoleRepository;
+    private readonly IPmUserRepository _pmUserRepository;
     private readonly IPmRoleQueryService _pmRoleQueryService;
     private readonly IPmRoleCommandService _pmRoleCommandService;
     private readonly IUnitOfWork _unitOfWork;
 
-    public RoleApplication(IRoleRepository roleRepository, IUnitOfWork unitOfWork, IPmRoleQueryService pmRoleQueryService, IPmRoleCommandService pmRoleCommandService)
+    public RoleApplication(IRoleRepository roleRepository, IUnitOfWork unitOfWork, IPmRoleRepository pmRoleRepository, IPmUserRepository pmUserRepository, IPmRoleQueryService pmRoleQueryService, IPmRoleCommandService pmRoleCommandService)
     {
         _roleRepository = roleRepository;
         _unitOfWork = unitOfWork;
+        _pmRoleRepository = pmRoleRepository;
+        _pmUserRepository = pmUserRepository;
         _pmRoleQueryService = pmRoleQueryService;
         _pmRoleCommandService = pmRoleCommandService;
     }
@@ -179,28 +188,22 @@ public class RoleApplication : IRoleApplication
             //این نقش را سمت پروگرام منیجر بساز
             if (pmPermissions.Any())
             {
-                var pmRole = new CreatePmRoleDto { RoleName = command.Name, Permissions = pmPermissions, GozareshgirRoleId = role.id };
-                var res = await _pmRoleCommandService.Create(pmRole);
-                if (!res.Item1)
+
+
+                try
+                {
+                    var pmPermissionsData = pmPermissions.Where(x => x > 0).Select(x => new PmPermission(x)).ToList();
+                    var pmRole = new PmRole(command.Name, command.Id, pmPermissionsData);
+                    await _pmRoleRepository.CreateAsync(pmRole);
+                    await _pmRoleRepository.SaveChangesAsync();
+               
+                }
+                catch (System.Exception)
                 {
                     _unitOfWork.RollbackAccountContext();
                     return operation.Failed("خطا در ویرایش دسترسی ها در پروگرام منیجر");
                 }
 
-                //try
-                //{
-                //    var pmPermissionsData = pmPermissions.Where(x => x > 0).Select(x => new PmPermission(x)).ToList();
-                //    var pmRole = new PmRole(command.Name, command.Id, pmPermissionsData);
-                //    await _pmRoleRepository.CreateAsync(pmRole);
-                //    await _pmRoleRepository.SaveChangesAsync();
-               
-                //}
-                //catch (System.Exception)
-                //{
-                //    _unitOfWork.RollbackAccountContext();
-                //    return operation.Failed("خطا در ویرایش دسترسی ها در پروگرام منیجر");
-                //}
-
                 //var parameters = new CreateProgramManagerRole
                 //{
                 //    RoleName = command.Name,

AccountManagement.Application/SubAccountApplication.cs

@@ -5,11 +5,14 @@ using AccountManagement.Domain.AccountAgg;
 using AccountManagement.Domain.CameraAccountAgg;
 using AccountManagement.Domain.SubAccountAgg;
 using AccountManagement.Domain.SubAccountRoleAgg;
+using Company.Domain.WorkshopAccountAgg;
 using Company.Domain.WorkshopSubAccountAgg;
+using CompanyManagment.App.Contracts.Workshop;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
 
 
 namespace AccountManagement.Application

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

@@ -0,0 +1,18 @@
+using AccountManagement.Domain.PmDomains.PmRoleAgg;
+using AccountManagement.Domain.PmDomains.PmUserAgg;
+using AccountMangement.Infrastructure.EFCore.PmDbConetxt;
+using AccountMangement.Infrastructure.EFCore.Repository.PmRepositories;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace AccountManagement.Configuration;
+
+public class PmDbBootstrapper
+{
+    public static void Configure(IServiceCollection services, string connectionString)
+    {
+        services.AddTransient<IPmRoleRepository, PmRoleRepository>();
+        services.AddTransient<IPmUserRepository, PmUserRepository>();
+        services.AddDbContext<PmDbContext>(x => x.UseSqlServer(connectionString));
+    }
+}

AccountManagement.Domain/PmDomains/PmPermissionAgg/PmPermission.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using AccountManagement.Domain.PmDomains.PmRoleAgg;
+
+namespace AccountManagement.Domain.PmDomains.PmPermissionAgg;
+
+public class PmPermission 
+{
+    public long Id { get; private set; }
+    public int Code { get; private set; }
+    public PmRole Role { get; private set; }
+
+    public PmPermission(int code)
+    {
+        Code = code;
+    }
+}

AccountManagement.Domain/PmDomains/PmRoleAgg/IPmRoleRepository.cs

@@ -0,0 +1,15 @@
+using _0_Framework.Domain;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using AccountManagement.Application.Contracts.ProgramManager;
+
+namespace AccountManagement.Domain.PmDomains.PmRoleAgg;
+
+public interface IPmRoleRepository :IRepository<long, PmRole>
+{
+    Task<List<GetPmRolesDto>> GetPmRoleList(long? gozareshgirRoleId);
+
+    Task<PmRole?> GetPmRoleToEdit(long gozareshgirRoleId);
+
+}
+

AccountManagement.Domain/PmDomains/PmRoleAgg/PmRole.cs

@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+using _0_Framework.Domain;
+using AccountManagement.Domain.PmDomains.PmPermissionAgg;
+
+namespace AccountManagement.Domain.PmDomains.PmRoleAgg;
+
+public class PmRole : EntityBase
+{
+    /// <summary>
+    /// نام نقش
+    /// </summary>
+    public string RoleName { get; private set; }
+
+
+    /// <summary>
+    /// لیست پرمیشن کد ها
+    /// </summary>
+    public List<PmPermission> PmPermission { get; private set; }
+
+    /// <summary>
+    /// ای دی نقش در گزارشگیر
+    /// </summary>
+    public long? GozareshgirRoleId { get; private set; }
+
+
+    protected PmRole()
+    {
+    }
+
+    public PmRole(string roleName,long? gozareshgirRolId, List<PmPermission> permissions)
+    {
+        RoleName = roleName;
+        PmPermission = permissions;
+        GozareshgirRoleId = gozareshgirRolId;
+
+    }
+
+
+    public void Edit(string roleName, List<PmPermission> permissions)
+    {
+        RoleName = roleName;
+        PmPermission = permissions;
+    }
+
+ 
+}

AccountManagement.Domain/PmDomains/PmRoleUserAgg/PmRoleUser.cs

@@ -0,0 +1,19 @@
+using AccountManagement.Domain.PmDomains.PmUserAgg;
+
+namespace AccountManagement.Domain.PmDomains.PmRoleUserAgg;
+
+public class PmRoleUser
+{
+    public PmRoleUser(long roleId)
+    {
+        RoleId = roleId;
+    }
+
+    public long Id { get; private set; }
+    public long RoleId { get; private set; }
+
+
+    public PmUser User { get; set; }
+
+
+}

AccountManagement.Domain/PmDomains/PmUserAgg/IPmUserRepository.cs

@@ -0,0 +1,21 @@
+using _0_Framework.Domain;
+using AccountManagement.Application.Contracts.ProgramManager;
+using System.Threading.Tasks;
+
+namespace AccountManagement.Domain.PmDomains.PmUserAgg;
+
+public interface IPmUserRepository : IRepository<long, PmUser>
+{
+    /// <summary>
+    /// دریافت کاربر پروگرام منیجر جهتد ویرایش
+    /// </summary>
+    /// <param name="accountId"></param>
+    /// <returns></returns>
+    Task<PmUser?> GetByPmUsertoEditbyAccountId(long accountId);
+    /// <summary>
+    /// دریافت کرابر پروگرام منیجر با اکانت آی دی در گزارشگیر
+    /// </summary>
+    /// <param name="accountId"></param>
+    /// <returns></returns>
+    Task<GetPmUserDto> GetPmUserByAccountId(long accountId);
+}

AccountManagement.Domain/PmDomains/PmUserAgg/PmUser.cs

@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using _0_Framework.Domain;
+using AccountManagement.Domain.PmDomains.PmRoleUserAgg;
+
+
+namespace AccountManagement.Domain.PmDomains.PmUserAgg;
+
+/// <summary>
+/// کاربر
+/// </summary>
+public class PmUser : EntityBase
+{
+    /// <summary>
+    /// ایجاد
+    /// </summary>
+    /// <param name="fullName"></param>
+    /// <param name="userName"></param>
+    /// <param name="password"></param>
+    /// <param name="mobile"></param>
+    /// <param name="email"></param>
+    /// <param name="accountId"></param>
+    /// <param name="roles"></param>
+    public PmUser(string fullName, string userName, string password, string mobile, string email, long? accountId, List<PmRoleUser> roles)
+    {
+        FullName = fullName;
+        UserName = userName;
+        Password = password;
+        Mobile = mobile;
+        Email = email;
+        IsActive = true;
+        AccountId = accountId;
+        RoleUser = roles;
+    }
+
+    protected PmUser()
+    {
+
+    }
+    /// <summary>
+    /// نام و نام خانوادگی 
+    /// </summary>
+    public string FullName { get; private set; }
+
+    /// <summary>
+    /// نام کاربری
+    /// </summary>
+    public string UserName { get; private set; }
+
+    /// <summary>
+    /// گذرواژه
+    /// </summary>
+    public string Password { get; private set; }
+
+    /// <summary>
+    /// مسیر عکس پروفایل
+    /// </summary>
+    public string ProfilePhotoPath { get; private set; }
+
+    /// <summary>
+    /// شماره موبایل
+    /// </summary>
+    public string Mobile { get; set; }
+
+    /// <summary>
+    /// ایمیل
+    /// </summary>
+    public string Email { get; private set; }
+
+    /// <summary>
+    /// فعال/غیر فعال بودن یوزر
+    /// </summary>
+    public bool IsActive { get; private set; }
+
+
+    /// <summary>
+    /// کد یکبارمصرف ورود
+    /// </summary>
+    public string VerifyCode { get; private set; }
+
+    /// <summary>
+    /// آی دی کاربر در گزارشگیر
+    /// </summary>
+    public long? AccountId { get; private set; }
+
+
+    /// <summary>
+    /// لیست پرمیشن کد ها
+    /// </summary>
+    public List<PmRoleUser> RoleUser { get; private set; }
+
+
+    /// <summary>
+    /// آپدیت کاربر
+    /// </summary>
+    /// <param name="fullName"></param>
+    /// <param name="userName"></param>
+    /// <param name="mobile"></param>
+    /// <param name="roles"></param>
+    /// <param name="isActive"></param>
+    public void Edit(string fullName, string userName, string mobile, List<PmRoleUser> roles, bool isActive)
+    {
+        FullName = fullName;
+        UserName = userName;
+        Mobile = mobile;
+        RoleUser = roles;
+        IsActive = isActive;
+    }
+
+    /// <summary>
+    /// غیرفعال سازی
+    /// </summary>
+    public void DeActive()
+    {
+        IsActive = false;
+    }
+
+    /// <summary>
+    /// فعال سازی
+    /// </summary>
+    public void ReActive()
+    {
+        IsActive = true;
+    }
+
+
+}

AccountMangement.Infrastructure.EFCore/Mappings/PmMappings/PmRoleMapping.cs

@@ -0,0 +1,24 @@
+using AccountManagement.Domain.PmDomains.PmRoleAgg;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace AccountMangement.Infrastructure.EFCore.Mappings.PmMappings;
+
+public class PmRoleMapping : IEntityTypeConfiguration<PmRole>
+{
+    public void Configure(EntityTypeBuilder<PmRole> builder)
+    {
+        builder.ToTable("PmRoles", t => t.ExcludeFromMigrations());
+        builder.HasKey(x => x.id);
+
+        builder.Property(x => x.RoleName).HasMaxLength(100).IsRequired();
+
+        builder.OwnsMany(x => x.PmPermission, navigationBuilder =>
+        {
+            navigationBuilder.HasKey(x => x.Id);
+            navigationBuilder.ToTable("PmRolePermissions", t => t.ExcludeFromMigrations());
+
+            navigationBuilder.WithOwner(x => x.Role);
+        });
+    }
+}

AccountMangement.Infrastructure.EFCore/Mappings/PmMappings/PmUserMapping.cs

@@ -0,0 +1,30 @@
+using AccountManagement.Domain.PmDomains.PmUserAgg;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace AccountMangement.Infrastructure.EFCore.Mappings.PmMappings;
+
+public class PmUserMapping :IEntityTypeConfiguration<PmUser>
+{
+    public void Configure(EntityTypeBuilder<PmUser> builder)
+    {
+        builder.ToTable("Users");
+        builder.HasKey(x => x.id);
+
+        builder.Property(x => x.FullName).HasMaxLength(100).IsRequired();
+        builder.Property(x => x.UserName).HasMaxLength(100).IsRequired();
+        builder.Property(x => x.Password).HasMaxLength(1000).IsRequired();
+        builder.Property(x => x.ProfilePhotoPath).HasMaxLength(500).IsRequired(false);
+        builder.Property(x => x.Mobile).HasMaxLength(20).IsRequired();
+        builder.Property(x => x.Email).HasMaxLength(150).IsRequired(false); ;
+        builder.Property(x => x.VerifyCode).HasMaxLength(10).IsRequired(false);
+        builder.OwnsMany(x => x.RoleUser, navigationBuilder =>
+        {
+            navigationBuilder.HasKey(x => x.Id);
+            navigationBuilder.ToTable("RoleUsers");
+            navigationBuilder.WithOwner(x => x.User);
+        });
+
+
+    }
+}

AccountMangement.Infrastructure.EFCore/PmDbConetxt/PmDbContext.cs

@@ -0,0 +1,32 @@
+using AccountManagement.Domain.PmDomains.PmRoleAgg;
+using AccountManagement.Domain.PmDomains.PmUserAgg;
+using AccountMangement.Infrastructure.EFCore.Mappings;
+using AccountMangement.Infrastructure.EFCore.Mappings.PmMappings;
+using Microsoft.EntityFrameworkCore;
+
+namespace AccountMangement.Infrastructure.EFCore.PmDbConetxt;
+
+public class PmDbContext : DbContext
+{
+    public PmDbContext(DbContextOptions<PmDbContext> options) : base(options)
+    {
+
+    }
+    public DbSet<PmUser> Users { get; set; } = null!;
+    public DbSet<PmRole> PmRoles { get; set; } = null!;
+
+
+    public PmDbContext()
+    {
+
+    }
+
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        var assembly = typeof(PmUserMapping).Assembly;
+        modelBuilder.ApplyConfigurationsFromAssembly(assembly);
+        //SubAccountPermissionSeeder.Seed(modelBuilder);
+        base.OnModelCreating(modelBuilder);
+    }
+}

AccountMangement.Infrastructure.EFCore/Repository/PmRepositories/PmRoleRepository.cs

@@ -0,0 +1,49 @@
+using _0_Framework.InfraStructure;
+using AccountManagement.Application.Contracts.ProgramManager;
+using AccountManagement.Domain.PmDomains.PmRoleAgg;
+using AccountMangement.Infrastructure.EFCore.PmDbConetxt;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
+
+namespace AccountMangement.Infrastructure.EFCore.Repository.PmRepositories;
+
+public class PmRoleRepository : RepositoryBase<long, PmRole>, IPmRoleRepository
+{
+    private readonly PmDbContext _pmDbContext;
+    public PmRoleRepository(PmDbContext context) : base(context)
+    {
+        _pmDbContext = context;
+    }
+
+    public async Task<List<GetPmRolesDto>> GetPmRoleList(long? gozareshgirRoleId)
+    {
+        var query = _pmDbContext.PmRoles.AsQueryable();
+        if (gozareshgirRoleId != null && gozareshgirRoleId > 0)
+            query = query.Where(x => x.GozareshgirRoleId == gozareshgirRoleId);
+        var res = await query
+            .Select(p => new GetPmRolesDto()
+            {
+                Id = p.id,
+                RoleName = p.RoleName,
+                GozareshgirRoleId = p.GozareshgirRoleId,
+                Permissions = p.PmPermission.Select(x => x.Code).ToList()
+
+            })
+            .ToListAsync();
+
+        return res;
+    }
+
+
+
+    public async Task<PmRole?> GetPmRoleToEdit(long gozareshgirRoleId)
+    {
+        return await _pmDbContext.PmRoles.FirstOrDefaultAsync(x => x.GozareshgirRoleId == gozareshgirRoleId);
+       
+    }
+
+}

AccountMangement.Infrastructure.EFCore/Repository/PmRepositories/PmUserRepository.cs

@@ -0,0 +1,47 @@
+using _0_Framework.InfraStructure;
+using AccountManagement.Application.Contracts.ProgramManager;
+using AccountManagement.Domain.PmDomains.PmUserAgg;
+using AccountMangement.Infrastructure.EFCore.PmDbConetxt;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace AccountMangement.Infrastructure.EFCore.Repository.PmRepositories;
+
+public class PmUserRepository :RepositoryBase<long, PmUser>, IPmUserRepository
+{
+    private readonly PmDbContext _pmDbContext;
+    public PmUserRepository(PmDbContext context, PmDbContext pmDbContext) : base(context)
+    {
+        _pmDbContext = pmDbContext;
+    }
+    public async Task<PmUser?> GetByPmUsertoEditbyAccountId(long accountId)
+    {
+        return await _pmDbContext.Users.FirstOrDefaultAsync(x => x.AccountId == accountId);
+    }
+
+    public async Task<GetPmUserDto> GetPmUserByAccountId(long accountId)
+    {
+        var query = await _pmDbContext.Users.FirstOrDefaultAsync(x => x.AccountId == accountId);
+        if (query == null)
+            return new GetPmUserDto();
+        List<long> roles = query.RoleUser.Select(x => x.RoleId).ToList();
+        return new GetPmUserDto()
+        {
+            FullName = query.FullName,
+            UserName = query.UserName,
+            ProfilePhotoPath = query.ProfilePhotoPath,
+            Mobile = query.Mobile,
+            IsActive = query.IsActive,
+            AccountId = query.AccountId,
+            Roles = roles,
+            RoleListDto = await _pmDbContext.PmRoles.Where(x => roles.Contains(x.id)).Select(x => new RoleListDto()
+            {
+                RoleName = x.RoleName,
+                RoleId = x.id,
+                Permissions = x.PmPermission.Select(x => x.Code).ToList()
+            }).ToListAsync(),
+        };
+    }
+}

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/BackgroundInstitutionContract.Task.csproj

@@ -12,14 +12,8 @@
       <ProjectReference Include="..\..\0_Framework\0_Framework.csproj" />
       <ProjectReference Include="..\..\AccountManagement.Configuration\AccountManagement.Configuration.csproj" />
       <ProjectReference Include="..\..\PersonalContractingParty.Config\PersonalContractingParty.Config.csproj" />
-      <ProjectReference Include="..\..\ProgramManager\src\Infrastructure\GozareshgirProgramManager.Infrastructure\GozareshgirProgramManager.Infrastructure.csproj" />
       <ProjectReference Include="..\..\Query.Bootstrapper\Query.Bootstrapper.csproj" />
       <ProjectReference Include="..\..\WorkFlow\Infrastructure\WorkFlow.Infrastructure.Config\WorkFlow.Infrastructure.Config.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
-      <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
-    </ItemGroup>
-
 </Project>

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Jobs/JobSchedulerRegistrator.cs

@@ -1,6 +1,5 @@
 
 using _0_Framework.Application;
-using _0_Framework.Application.Sms;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.InstitutionContractAgg;
 using Hangfire;
@@ -14,22 +13,18 @@ public class JobSchedulerRegistrator
     private readonly IInstitutionContractRepository _institutionContractRepository;
     private static DateTime? _lastRunCreateTransaction;
     private static DateTime? _lastRunSendMonthlySms;
-    private readonly ISmsService _smsService;
-    private readonly ILogger<JobSchedulerRegistrator> _logger;
 
 
-    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient, IInstitutionContractRepository institutionContractRepository, ISmsService smsService, ILogger<JobSchedulerRegistrator> logger)
+    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient, IInstitutionContractRepository institutionContractRepository)
     {
         _smsReminder = smsReminder;
         _backgroundJobClient = backgroundJobClient;
         _institutionContractRepository = institutionContractRepository;
-        _smsService = smsService;
-        _logger = logger;
     }
 
     public void Register()
     {
-        _logger.LogInformation("hangfire Started");
+
         RecurringJob.AddOrUpdate(
             "InstitutionContract.CreateFinancialTransaction",
             () => CreateFinancialTransaction(),
@@ -52,11 +47,6 @@ public class JobSchedulerRegistrator
             () => SendBlockSms(),
             "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
         );
-        RecurringJob.AddOrUpdate(
-            "InstitutionContract.SendInstitutionContractConfirmSms",
-            () => SendInstitutionContractConfirmSms(),
-            "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
-        );
     }
 
 
@@ -70,7 +60,7 @@ public class JobSchedulerRegistrator
         var now =DateTime.Now;
         var endOfMonth = now.ToFarsi().FindeEndOfMonth();
         var endOfMonthGr = endOfMonth.ToGeorgianDateTime();
-        _logger.LogInformation("CreateFinancialTransaction job run");
+
         if (now.Date == endOfMonthGr.Date && now.Hour >= 2 && now.Hour < 4 &&
             now.Date != _lastRunCreateTransaction?.Date)
         {
@@ -96,8 +86,8 @@ public class JobSchedulerRegistrator
             }
             catch (Exception e)
             {
-                await _smsService.Alarm("09114221321", "خطا-ایجاد سند مالی");
-
+                //_smsService.Alarm("09114221321", "خطا-ایجاد سند مالی");
+          
             }
            
         }
@@ -115,7 +105,7 @@ public class JobSchedulerRegistrator
         var now = DateTime.Now;
         var endOfMonth = now.ToFarsi().FindeEndOfMonth();
         var endOfMonthGr = endOfMonth.ToGeorgianDateTime();
-        _logger.LogInformation("SendFirstDayOfMonthSms job run");
+
         if (now.Date == endOfMonthGr.Date && now.Hour >= 10 && now.Hour < 11 &&
             now.Date != _lastRunSendMonthlySms?.Date)
         {
@@ -143,7 +133,6 @@ public class JobSchedulerRegistrator
     [DisableConcurrentExecution(timeoutInSeconds: 1200)]
     public async System.Threading.Tasks.Task SendReminderSms()
     {
-        _logger.LogInformation("SendReminderSms job run");
         await _institutionContractRepository.SendReminderSmsForBackgroundTask();
     }
 
@@ -154,20 +143,7 @@ public class JobSchedulerRegistrator
     [DisableConcurrentExecution(timeoutInSeconds: 100)]
     public async System.Threading.Tasks.Task SendBlockSms()
     {
-        _logger.LogInformation("SendBlockSms job run");
         await _institutionContractRepository.SendBlockSmsForBackgroundTask();
     }
 
-
-    /// <summary>
-    /// ارسال پیامک یادآور تایید قراداد مالی
-    /// </summary>
-    /// <returns></returns>
-    [DisableConcurrentExecution(timeoutInSeconds: 100)]
-    public async System.Threading.Tasks.Task SendInstitutionContractConfirmSms()
-    {
-        _logger.LogInformation("SendInstitutionContractConfirmSms job run");
-        await _institutionContractRepository.SendInstitutionContractConfirmSmsTask();
-    }
-
 }

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/NullBoardNotificationPublisher.cs

@@ -1,10 +0,0 @@
-using GozareshgirProgramManager.Application.Interfaces;
-using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
-
-public class NullBoardNotificationPublisher:IBoardNotificationPublisher
-{
-    public Task SendProjectStatusChanged(long userId, TaskSectionStatus oldStatus, TaskSectionStatus newStatus, Guid sectionId)
-    {
-        throw new NotImplementedException();
-    }
-}

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Program.cs

@@ -7,47 +7,13 @@ using BackgroundInstitutionContract.Task;
 using BackgroundInstitutionContract.Task.Jobs;
 using CompanyManagment.App.Contracts.Hubs;
 using CompanyManagment.EFCore.Services;
-using GozareshgirProgramManager.Application._Bootstrapper;
-using GozareshgirProgramManager.Application.Interfaces;
-using GozareshgirProgramManager.Application.Modules.Users.Commands.CreateUser;
-using GozareshgirProgramManager.Infrastructure;
-using GozareshgirProgramManager.Infrastructure.Persistence.Seed;
 using Hangfire;
 using Microsoft.AspNetCore.Identity;
 using MongoDB.Driver;
 using PersonalContractingParty.Config;
 using Query.Bootstrapper;
-using Serilog;
-using Serilog.Events;
-using Shared.Contracts.PmUser.Queries;
 using WorkFlow.Infrastructure.Config;
 
-var logDirectory = @"C:\Logs\Hangfire\BackgroundInstitutionContract\";
-
-if (!Directory.Exists(logDirectory))
-{
-    Directory.CreateDirectory(logDirectory);
-}
-
-Log.Logger = new LoggerConfiguration()
-    //NO EF Core log
-    .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning)
-
-    //NO DbCommand log
-    .MinimumLevel.Override("Microsoft.EntityFrameworkCore.Database.Command", LogEventLevel.Warning)
-
-    //NO Microsoft Public log
-    .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
-    //.MinimumLevel.Information()
-    .WriteTo.File(
-        path: Path.Combine(logDirectory, "institution-contract-log-.txt"),
-        rollingInterval: RollingInterval.Day,
-        retainedFileCountLimit: 30,
-        shared: true,
-        outputTemplate:
-        "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level}] {Message}{NewLine}{Exception}"
-    ).CreateLogger();
-
 var builder = WebApplication.CreateBuilder(args);
 var hangfireConnectionString = builder.Configuration.GetConnectionString("HangfireDb");
 builder.Services.AddHangfire(x => x.UseSqlServerStorage(hangfireConnectionString));
@@ -60,7 +26,7 @@ builder.Services.AddTransient<ISmsService, SmsService>();
 builder.Services.AddTransient<IUidService, UidService>();
 builder.Services.AddTransient<IFileUploader, FileUploader>();
 builder.Services.Configure<AppSettingConfiguration>(builder.Configuration);
-builder.Services.AddScoped<IBoardNotificationPublisher, NullBoardNotificationPublisher>();
+
 #region MongoDb
 
 var mongoConnectionSection = builder.Configuration.GetSection("MongoDb");
@@ -72,28 +38,17 @@ builder.Services.AddSingleton<IMongoDatabase>(mongoDatabase);
 
 #endregion
 
-builder.Services.AddProgramManagerApplication();
-builder.Services.AddProgramManagerInfrastructure(builder.Configuration);
-
-
 PersonalBootstrapper.Configure(builder.Services, connectionString);
 TestDbBootStrapper.Configure(builder.Services, connectionStringTestDb);
 AccountManagementBootstrapper.Configure(builder.Services, connectionString);
 WorkFlowBootstrapper.Configure(builder.Services, connectionString);
-
 QueryBootstrapper.Configure(builder.Services);
 JobsBootstrapper.Configure(builder.Services);
 builder.Services.AddHttpClient();
 builder.Services.AddHttpContextAccessor();
 builder.Services.AddSignalR();
 
-
-builder.Host.UseSerilog();
-Log.Information("SERILOG STARTED SUCCESSFULLY");
-
-
 var app = builder.Build();
-
 app.MapHub<SendSmsHub>("/sendSmsHub");
 
 app.MapHangfireDashboard();

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/appsettings.Development.json

@@ -25,8 +25,8 @@
 
     //mahan Docker
     //"MesbahDb": "Data Source=localhost,5069;Initial Catalog=mesbah_db;User ID=sa;Password=YourPassword123;TrustServerCertificate=True;",
-    "HangfireDb": "Data Source=.;Initial Catalog=hangfire_db;Integrated Security=True;TrustServerCertificate=true;",
-    //"HangfireDb": "Data Source=185.208.175.186;Initial Catalog=hangfire_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]18[3019]#@ATt;TrustServerCertificate=true;"
+    //"HangfireDb": "Data Source=.;Initial Catalog=hangfire_db;Integrated Security=True;TrustServerCertificate=true;",
+    "HangfireDb": "Data Source=185.208.175.186;Initial Catalog=hangfire_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]18[3019]#@ATt;TrustServerCertificate=true;"
   },
 
   "GoogleRecaptchaV3": {

Company.Domain/ContarctingPartyAgg/IPersonalContractingPartyRepository.cs

@@ -1,5 +1,4 @@
-using System;
-using CompanyManagment.App.Contracts.PersonalContractingParty;
+using CompanyManagment.App.Contracts.PersonalContractingParty;
 using System.Collections.Generic;
 using _0_Framework.Application;
 using _0_Framework.Domain;
@@ -33,9 +32,7 @@ public interface IPersonalContractingPartyRepository :IRepository<long, Personal
     List<PersonalContractingPartyViewModel> SearchForMain(PersonalContractingPartySearchModel searchModel2); 
     OperationResult DeletePersonalContractingParties(long id);
     bool GetHasContract(long id);
-    [Obsolete("از متدهای async استفاده کنید")]
     OperationResult DeActiveAll(long id);
-    [Obsolete("از متدهای async استفاده کنید")]
     OperationResult ActiveAll(long id);
 
     #endregion
@@ -79,9 +76,4 @@ public interface IPersonalContractingPartyRepository :IRepository<long, Personal
 
     Task<PersonalContractingParty> GetByNationalCode(string nationalCode);
     Task<PersonalContractingParty> GetByNationalId(string registerId);
-    
-    Task<OperationResult> DeActiveAllAsync(long id);
-    Task<OperationResult> ActiveAllAsync(long id);
-    
-    
 }

Company.Domain/ContractAgg/IContractRepository.cs

@@ -48,10 +48,6 @@ public interface IContractRepository : IRepository<long, Contract>
     bool Remove(long id);
 
     List<ContractViweModel> SearchForClient(ContractSearchModel searchModel);
-    
-    Task<PagedResult<GetContractListForClientResponse>> GetContractListForClient(GetContractListForClientRequest searchModel);
-    
-    Task<List<ContractPrintViewModel>> PrintAllAsync(List<long> ids);
     #endregion
     #region NewChangeByHeydari
 
@@ -67,8 +63,4 @@ public interface IContractRepository : IRepository<long, Contract>
     ContractViweModel GetByWorkshopIdEmployeeIdInDates(long workshopId, long employeeId, DateTime startOfMonth, DateTime endOfMonth);
     List<ContractViweModel> GetByWorkshopIdInDates(long workshopId, DateTime contractStart, DateTime contractEnd);
     #endregion
-
-}
-
-
-
+}

Company.Domain/EmployeeAgg/IEmployeeRepository.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using _0_Framework.Application;
 using _0_Framework.Domain;
 using Company.Domain.EmployeeInsuranceRecordAgg;
 using CompanyManagment.App.Contracts.Employee;
@@ -76,8 +77,8 @@ public interface IEmployeeRepository : IRepository<long, Employee>
 	#region Api
 	Task<List<EmployeeSelectListViewModel>> GetSelectList(string searchText,long id);
 	Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel);
-	Task<List<GetClientEmployeeListViewModel>> GetClientEmployeeList(GetClientEmployeeListSearchModel searchModel, long workshopId);
 	#endregion
-
-
+	
+	Task<List<GetEmployeeClientListViewModel>> GetEmployeeClientList(GetEmployeeClientListSearchModel searchModel,
+		long workshopId);
 }

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -56,7 +56,7 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     void UpdateStatusIfNeeded(long institutionContractId);
     Task<GetInstitutionVerificationDetailsViewModel> GetVerificationDetails(Guid id);
     Task<InstitutionContract> GetByPublicIdAsync(Guid id);
-    InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request,string contractStart = null);
+    InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request);
     InstitutionContractDiscountResponse ResetDiscountCreate(InstitutionContractResetDiscountForCreateRequest request);
     
 
@@ -140,11 +140,6 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     /// <returns></returns>
     Task SendReminderSmsToContractingParties(List<SmsListData> smsListData, string typeOfSms, string sendMessStart, string sendMessEnd);
 
-    /// <summary>
-    /// ارسال پیامک یادآور تایید قراداد مالی
-    /// </summary>
-    /// <returns></returns>
-    Task SendInstitutionContractConfirmSmsTask();
     #endregion
 
     #region CreateMontlyTransaction
@@ -159,5 +154,4 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     #endregion
 
     Task<long> GetIdByInstallmentId(long installmentId);
-    Task<InstitutionContract> GetPreviousContract(long currentInstitutionContractId);
 }

Company.Domain/InstitutionContractAgg/InstitutionContract.cs

@@ -98,11 +98,6 @@ public class InstitutionContract : EntityBase
     // مبلغ قرارداد
     public double ContractAmount { get; private set; }
 
-    public double ContractAmountWithTax => !IsOldContract  ? ContractAmount + ContractAmountTax
-        : ContractAmount;
-    
-    public double ContractAmountTax => ContractAmount*0.10;
-
     //خسارت روزانه
     public double DailyCompenseation { get; private set; }
 
@@ -164,10 +159,6 @@ public class InstitutionContract : EntityBase
 
     public List<InstitutionContractAmendment> Amendments { get; private set; }
 
-    public InstitutionContractSigningType? SigningType { get; private set; }
-
-    public bool IsOldContract => LawId== 0;
-
     public InstitutionContract()
     {
         ContactInfoList = [];
@@ -271,10 +262,6 @@ public class InstitutionContract : EntityBase
     {
         WorkshopGroup = null;
     }
-    public void SetSigningType(InstitutionContractSigningType signingType)
-    {
-        SigningType = signingType;
-    }
 }
 
 public class InstitutionContractAmendment : EntityBase

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs

@@ -10,15 +10,13 @@ public class InstitutionContractWorkshopCurrent:InstitutionContractWorkshopBase
     public InstitutionContractWorkshopCurrent(string workshopName, bool hasRollCallPlan,
         bool hasRollCallPlanInPerson, bool hasCustomizeCheckoutPlan, bool hasContractPlan,
         bool hasContractPlanInPerson, bool hasInsurancePlan, bool hasInsurancePlanInPerson,
-        int personnelCount, double price,long institutionContractWorkshopGroupId,
-        InstitutionContractWorkshopGroup workshopGroup,long workshopId,long initialWorkshopId) : base(workshopName, hasRollCallPlan, 
+        int personnelCount, double price,long institutionContractWorkshopGroupId,InstitutionContractWorkshopGroup workshopGroup,long workshopId) : base(workshopName, hasRollCallPlan, 
         hasRollCallPlanInPerson, hasCustomizeCheckoutPlan, hasContractPlan,
         hasContractPlanInPerson, hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price)
     {
         InstitutionContractWorkshopGroupId = institutionContractWorkshopGroupId;
         WorkshopGroup = workshopGroup;
         WorkshopId = workshopId;
-        InitialWorkshopId = initialWorkshopId;
     }
     public long InstitutionContractWorkshopGroupId { get; private set; }
     public InstitutionContractWorkshopGroup WorkshopGroup { get; private set; }

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopGroup.cs

@@ -23,8 +23,6 @@ public class InstitutionContractWorkshopGroup : EntityBase
         !InitialWorkshops.Cast<InstitutionContractWorkshopBase>()
             .SequenceEqual(CurrentWorkshops.Cast<InstitutionContractWorkshopBase>());
 
-    public bool IsInPersonContract => InitialWorkshops.Any(x => x.Services.ContractInPerson);
-
     public InstitutionContractWorkshopGroup(long institutionContractId,
         List<InstitutionContractWorkshopInitial> initialDetails)
     {
@@ -39,10 +37,4 @@ public class InstitutionContractWorkshopGroup : EntityBase
         CurrentWorkshops = updatedDetails.ToList();
         LastModifiedDate = DateTime.Now;
     }
-
-    public void AddCurrentWorkshop(InstitutionContractWorkshopCurrent currentWorkshop)
-    {
-        CurrentWorkshops.Add(currentWorkshop);
-        LastModifiedDate = DateTime.Now;
-    }
 }

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopInitial.cs

@@ -31,7 +31,7 @@ public class InstitutionContractWorkshopInitial:InstitutionContractWorkshopBase
         WorkshopCreated = true;
         WorkshopCurrent = new InstitutionContractWorkshopCurrent(WorkshopName,Services.RollCall,Services.RollCallInPerson,
             Services.CustomizeCheckout,Services.Contract,Services.ContractInPerson,Services.Insurance,
-            Services.InsuranceInPerson,PersonnelCount,Price,InstitutionContractWorkshopGroupId,WorkshopGroup,workshopId,id);
+            Services.InsuranceInPerson,PersonnelCount,Price,InstitutionContractWorkshopGroupId,WorkshopGroup,workshopId);
         WorkshopCurrent.SetEmployers(Employers.Select(x=>x.EmployerId).ToList());
     }
 

Company.Domain/InstitutionPlanAgg/IPlanPercentageRepository.cs

@@ -1,9 +1,7 @@
-using _0_Framework.Application;
-using _0_Framework.Domain;
+using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.InstitutionPlan;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace Company.Domain.InstitutionPlanAgg;
 
@@ -28,18 +26,4 @@ public interface IPlanPercentageRepository : IRepository<long, PlanPercentage>
     /// <param name="command"></param>
     /// <returns></returns>
     InstitutionPlanViewModel GetInstitutionPlanForWorkshop(WorkshopTempViewModel command);
-
-    /// <summary>
-    /// دریافت دیتای مودال ایجاد
-    /// </summary>
-    /// <returns></returns>
-    Task<CreateServiceAmountDto> GetCreateModalData();
-
-    /// <summary>
-    /// دریافت لیست مبالغ سرویس ها
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<PagedResult<InstitutionPlanListDto>> GetList(
-        InstitutionPlanSearchModel searchModel);
 }

Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs

@@ -73,12 +73,10 @@ public interface IInsuranceListRepository:IRepository<long, InsuranceList>
     Task<InsuranceListConfirmOperation> GetInsuranceOperationDetails(long id);
 
 	Task<InsuranceListTabsCountViewModel> GetTabCounts(InsuranceListSearchModel searchModel);
-	Task<PagedResult<InsuranceClientListViewModel>> GetInsuranceClientList(InsuranceClientSearchModel searchModel);
 
 	#endregion
 
 	Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel);
-	Task<InsuranceClientPrintViewModel> ClientPrintOne(long id);
 }
 
 

Company.Domain/LeaveAgg/ILeaveRepository.cs

@@ -1,10 +1,8 @@
-using _0_Framework.Application;
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.InstitutionPlan;
-using CompanyManagment.App.Contracts.Leave;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
+using _0_Framework.Application;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.Leave;
 
 namespace Company.Domain.LeaveAgg;
 
@@ -12,7 +10,7 @@ public interface ILeaveRepository : IRepository<long, Leave>
 {
     EditLeave GetDetails(long id);
     List<LeaveViewModel> search(LeaveSearchModel searchModel);
-    Task<OperationResult> RemoveLeave(long id);
+    OperationResult RemoveLeave(long id);
 
     #region Pooya
     List<LeaveViewModel> GetByWorkshopIdEmployeeIdInDates(long workshopId, long employeeId, DateTime start, DateTime end);
@@ -29,8 +27,6 @@ public interface ILeaveRepository : IRepository<long, Leave>
     List<LeaveMainViewModel> searchClient(LeaveSearchModel searchModel);
     LeavePrintViewModel PrintOne(long id);
     List<LeavePrintViewModel> PrintAll(List<long> id);
-    
-    Task<List<LeavePrintResponseViewModel>> PrintAllAsync(List<long> ids, long workshopId);
 
     #region Vafa
 
@@ -38,27 +34,4 @@ public interface ILeaveRepository : IRepository<long, Leave>
 
     #endregion
     bool CheckIfValidToEdit(long id);
-
-    /// <summary>
-    /// دریافت لیست مرخصی ها در کلاینت
-    /// Api
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<PagedResult<leaveListDto>> GetList(
-        LeaveListSearchModel searchModel);
-
-    /// <summary>
-    /// دریافت لیست گروه بندی شده
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<List<GroupLeaveListDto>> GetGroupList(LeaveListSearchModel searchModel);
-
-    /// <summary>
-    /// پرینت لیستی
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <returns></returns>
-    Task<LeaveListPrintDto> ListPrint(List<long> ids);
 }

Company.Domain/WorkshopAgg/Workshop.cs

@@ -316,10 +316,7 @@ public class Workshop : EntityBase
         IsStaticCheckout = isStaticCheckout;
     }
 
-    public void AddContractingPartyId(long contractingPartyId)
-    {
-        ContractingPartyId = contractingPartyId;
-    }
+
     public void Active(string archiveCode)
     {
         this.IsActive = true;

CompanyManagement.Infrastructure.Excel/CWS/CustomizeWorkshopGroupSettingExcelGenerator.cs

@@ -26,7 +26,7 @@ public class CustomizeWorkshopGroupSettingExcelGenerator
 {
     public static byte[] Generate(List<CustomizeWorkshopGroupExcelViewModel> groups)
     {
-        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
         using (var package = new ExcelPackage())
         {
             var worksheet = package.Workbook.Worksheets.Add("GroupsAndEmployees");

CompanyManagement.Infrastructure.Excel/CaseManagement/CaseManagementExcelGenerator.cs

@@ -24,7 +24,7 @@ public class CaseManagementExcelGenerator
     };
     public static byte[] GenerateCheckoutTempExcelInfo(List<FileExcelViewModel> data)
     {
-        OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        OfficeOpenXml.ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
         using var package = new ExcelPackage();
         CreateSheet(data, package,"همه");
         CreateSheet(data.Where(x=>x.Status ==2).ToList(), package,"فعال");

CompanyManagement.Infrastructure.Excel/Checkout/CustomizeCheckoutExcelGenerator.cs

@@ -46,7 +46,7 @@ public class CustomizeCheckoutExcelGenerator
     };
     public static byte[] GenerateCheckoutTempExcelInfo(List<CustomizeCheckoutTempExcelViewModel> data, List<string> selectedParameters)
     {
-        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        OfficeOpenXml.ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
         using var package = new ExcelPackage();
         var worksheet = package.Workbook.Worksheets.Add("Sheet1");
 

CompanyManagement.Infrastructure.Excel/EmployeeBankInfo/EmployeeBankInfoExcelGenerator.cs

@@ -7,7 +7,7 @@ public class EmployeeBankInfoExcelGenerator
 {
     public static byte[] Generate(List<EmployeeBankInfoExcelViewModel> list)
     {
-        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
         using var package = new ExcelPackage();
         var worksheet = package.Workbook.Worksheets.Add("EmployeeBankInfo");
 
@@ -166,7 +166,7 @@ public class EmployeeBankInfoExcelGenerator
 
     public static byte[] Generate2(List<EmployeeBankInfoExcelViewModel> list)
     {
-        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
         using var package = new ExcelPackage();
         foreach (var employee in list)
         {
@@ -220,4 +220,4 @@ public class EmployeeBankInfoExcelGenerator
         cell.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
         cell.Style.Fill.PatternType = ExcelFillStyle.Solid;
     }
-}
+}

CompanyManagement.Infrastructure.Excel/InstitutionContract/InstitutionContractExcelGenerator.cs

@@ -8,129 +8,86 @@ using System.Text.RegularExpressions;
 
 namespace CompanyManagement.Infrastructure.Excel.InstitutionContract;
 
-// Enum برای تعریف ستون‌های موجود
-public enum ExcelColumnType
-{
-    RowNumber,                  // ردیف
-    PhysicalContract,          // قرارداد فیزیکی
-    ContractNo,                 // شماره قرارداد
-    Representative,             // معرف
-    ContractingPartyName,       // طرف حساب
-    ArchiveCode,                // شماره کارفرما
-    EmployerName,               // کارفرما
-    WorkshopName,               // کارگاه‌ها (چندخطی)
-    WorkshopCount,              // تعداد کارگاه
-    EmployeeCount,              // مجموع پرسنل
-    ContractStartDate,          // شروع قرارداد
-    ContractEndDate,            // پایان قرارداد
-    InstallmentAmount,          // مبلغ قسط
-    ContractAmount,             // مبلغ قرارداد
-    FinancialStatus             // وضعیت مالی
-}
-
-// کلاس کانفیگ برای تنظیم ستون‌های نمایشی
-public class ExcelColumnConfig
-{
-    public List<ExcelColumnType> VisibleColumns { get; set; }
-    
-    public ExcelColumnConfig()
-    {
-        // فعلاً تمام ستون‌ها فعال هستند
-        VisibleColumns = new List<ExcelColumnType>
-        {
-            ExcelColumnType.PhysicalContract,
-            ExcelColumnType.ContractNo,
-            ExcelColumnType.Representative,
-            ExcelColumnType.ContractingPartyName,
-            ExcelColumnType.ArchiveCode,
-            ExcelColumnType.EmployerName,
-            ExcelColumnType.WorkshopName,
-            ExcelColumnType.WorkshopCount,
-            ExcelColumnType.EmployeeCount,
-            ExcelColumnType.ContractStartDate,
-            ExcelColumnType.ContractEndDate,
-            ExcelColumnType.InstallmentAmount,
-            ExcelColumnType.ContractAmount,
-            ExcelColumnType.FinancialStatus
-        };
-    }
-}
-
 public class InstitutionContractExcelGenerator
 {
-    private static ExcelColumnConfig _columnConfig = new ExcelColumnConfig();
 
-    public static byte[] GenerateExcel(List<InstitutionContractExcelViewModel> contractViewModels)
+    public static byte[] GenerateExcel(List<InstitutionContractViewModel> institutionContractViewModels)
     {
-        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
         using var package = new ExcelPackage();
+        var allWorksheet = package.Workbook.Worksheets.Add("همه");
+
+        var blueWorksheet = package.Workbook.Worksheets.Add("آبی");
+        blueWorksheet.TabColor = Color.LightBlue;
+
+        var grayWorksheet = package.Workbook.Worksheets.Add("خاکستری");
+        grayWorksheet.TabColor = Color.LightGray;
+
+        var redWorksheet = package.Workbook.Worksheets.Add("قرمز");
+        redWorksheet.TabColor = Color.LightCoral;
+
+        var purpleWorksheet = package.Workbook.Worksheets.Add("بنفش");
+        purpleWorksheet.TabColor = Color.MediumPurple;
+
+        var blackWorksheet = package.Workbook.Worksheets.Add("مشکی");
+        blackWorksheet.TabColor = Color.DimGray;
+
+        var yellowWorksheet = package.Workbook.Worksheets.Add("زرد");
+        yellowWorksheet.TabColor = Color.Yellow;
+            
+        var whiteWorksheet = package.Workbook.Worksheets.Add("سفید");
+        whiteWorksheet.TabColor = Color.White;
+
+
+        CreateExcelSheet(institutionContractViewModels, allWorksheet);
+
+        var blueContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "blue").ToList();
+        CreateExcelSheet(blueContracts, blueWorksheet);
+        institutionContractViewModels = institutionContractViewModels.Except(blueContracts).ToList();
+
+        var grayContracts = institutionContractViewModels.Where(x => x.IsContractingPartyBlock == "true").ToList();
+        CreateExcelSheet(grayContracts, grayWorksheet);
+        institutionContractViewModels = institutionContractViewModels.Except(grayContracts).ToList();
+
+        var redContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "red").ToList();
+        CreateExcelSheet(redContracts, redWorksheet);
+        institutionContractViewModels = institutionContractViewModels.Except(redContracts).ToList();
+
+        var purpleContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "purple").ToList();
+        CreateExcelSheet(purpleContracts, purpleWorksheet);
+        institutionContractViewModels = institutionContractViewModels.Except(purpleContracts).ToList();
         
-        // ایجاد شیت برای هر تب با داده‌های مربوطه
-        foreach (var viewModel in contractViewModels)
-        {
-            var worksheet = CreateWorksheet(package, viewModel.Tab);
-            CreateExcelSheet(viewModel.GetInstitutionContractListItemsViewModels ?? new List<GetInstitutionContractListItemsViewModel>(), worksheet);
-        }
+        var blackContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "black").ToList();
+        CreateExcelSheet(blackContracts, blackWorksheet);
+        institutionContractViewModels = institutionContractViewModels.Except(blackContracts).ToList();
+
+        var yellowContracts = institutionContractViewModels
+            .Where(x => string.IsNullOrWhiteSpace(x.ExpireColor) && x.WorkshopCount == "0").ToList();
+        CreateExcelSheet(yellowContracts, yellowWorksheet);
+        institutionContractViewModels = institutionContractViewModels.Except(yellowContracts).ToList();
+
+        var otherContracts = institutionContractViewModels;
+        CreateExcelSheet(otherContracts, whiteWorksheet);
 
         return package.GetAsByteArray();
     }
 
-    /// <summary>
-    /// ایجاد شیت بر اساس نوع تب
-    /// </summary>
-    private static ExcelWorksheet CreateWorksheet(ExcelPackage package, InstitutionContractListStatus? status)
+    private static void CreateExcelSheet(List<InstitutionContractViewModel> institutionContractViewModels, ExcelWorksheet worksheet)
     {
-        return status switch
-        {
-            InstitutionContractListStatus.DeactiveWithDebt =>
-                CreateColoredWorksheet(package, "غیرفعال دارای بدهی", Color.LightBlue),
-            
-            InstitutionContractListStatus.Deactive =>
-                CreateColoredWorksheet(package, "غیرفعال", Color.LightGray),
-            
-            InstitutionContractListStatus.PendingForRenewal =>
-                CreateColoredWorksheet(package, "در انتظار تمدید", Color.LightCoral),
-            
-            InstitutionContractListStatus.Free =>
-                CreateColoredWorksheet(package, "بنفش", Color.MediumPurple),
-            
-            InstitutionContractListStatus.Block =>
-                CreateColoredWorksheet(package, "بلاک", Color.DimGray),
-            
-            InstitutionContractListStatus.WithoutWorkshop =>
-                CreateColoredWorksheet(package, "بدون کارگاه", Color.Yellow),
-            
-            InstitutionContractListStatus.Active =>
-                CreateColoredWorksheet(package, "فعال", Color.White),
-            
-            InstitutionContractListStatus.PendingForVerify => 
-            CreateColoredWorksheet(package, "در انتظار تایید", Color.OrangeRed),
-            
-            null => CreateColoredWorksheet(package, "کل قرارداد ها", Color.White),
-            _ => throw new ArgumentOutOfRangeException(nameof(status), status, null)
-        };
-    }
+        // Headers
+        worksheet.Cells[1, 1].Value = "شماره قرارداد";
+        worksheet.Cells[1, 2].Value = "طرف حساب";
+        worksheet.Cells[1, 3].Value = "شماره کارفرما";
+        worksheet.Cells[1, 4].Value = "کارفرما ها";
+        worksheet.Cells[1, 5].Value = "کارگاه ها";
+        worksheet.Cells[1, 6].Value = "مجبوع پرسنل";
+        worksheet.Cells[1, 7].Value = "شروع قرارداد";
+        worksheet.Cells[1, 8].Value = "پایان قرارداد";
+        worksheet.Cells[1, 9].Value = "مبلغ قرارداد (بدون کارگاه)";
+        worksheet.Cells[1, 10].Value = "مبلغ قرارداد";
+        worksheet.Cells[1, 11].Value = "وضعیت مالی";
 
-    /// <summary>
-    /// ایجاد شیت با رنگ تب
-    /// </summary>
-    private static ExcelWorksheet CreateColoredWorksheet(ExcelPackage package, string sheetName, Color tabColor)
-    {
-        var worksheet = package.Workbook.Worksheets.Add(sheetName);
-        worksheet.TabColor = tabColor;
-        return worksheet;
-    }
-
-    private static void CreateExcelSheet(List<GetInstitutionContractListItemsViewModel> contractItems, ExcelWorksheet worksheet)
-    {
-        // دریافت نقشه ستون‌های مرئی
-        var visibleColumnIndices = GetVisibleColumnIndices();
-        int columnCount = visibleColumnIndices.Count;
-
-        // تنظیم Headers
-        SetupHeaders(worksheet, visibleColumnIndices, columnCount);
-
-        using (var range = worksheet.Cells[1, 1, 1, columnCount])
+        using (var range = worksheet.Cells[1, 1, 1, 11])
         {
             range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
             range.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
@@ -153,35 +110,30 @@ public class InstitutionContractExcelGenerator
 
         int row = 2;
 
-        for (int i = 0; i < contractItems.Count; i++)
+        for (int i = 0; i < institutionContractViewModels.Count; i++)
         {
-            var contract = contractItems[i];
-            var employers = contract.EmployerNames?.ToList() ?? new();
-            var workshops = contract.WorkshopNames?.ToList() ?? new();
+            var contract = institutionContractViewModels[i];
+            var employers = contract.EmployerViewModels?.ToList() ?? new();
+            var workshops = contract.WorkshopViewModels?.ToList() ?? new();
 
-            int maxRows = 1; // هر قرارداد فقط یک ردیف؛ نیازی به مرج عمودی نیست
+            int maxRows = Math.Max(employers.Count, workshops.Count);
+            maxRows = Math.Max(1, maxRows);
 
             int startRow = row;
             int endRow = row + maxRows - 1;
 
-            // 🎨 دریافت رنگ پس‌زمینه بر اساس وضعیت قرارداد
-            var fillColor = GetColorByStatus(contract.ListStatus, contract.WorkshopsCount);
+            // 🎨 دریافت رنگ پس‌زمینه از مقدار رنگ موجود در داده
+            string colorName = contract.ExpireColor.ToLower();
+            var fillColor = GetColorByName(colorName, contract.WorkshopCount, contract.IsContractingPartyBlock);
 
             for (int j = 0; j < maxRows; j++)
             {
                 int currentRow = row + j;
 
-                // پر کردن ستون‌های employer و workshop
-                var employerColIndex = GetColumnIndexForType(ExcelColumnType.EmployerName, visibleColumnIndices);
-                var workshopColIndex = GetColumnIndexForType(ExcelColumnType.WorkshopName, visibleColumnIndices);
+                worksheet.Cells[currentRow, 4].Value = j < employers.Count ? employers[j].FullName : null;
+                worksheet.Cells[currentRow, 5].Value = j < workshops.Count ? workshops[j].WorkshopFullName : null;
 
-                if (employerColIndex > 0)
-                    worksheet.Cells[currentRow, employerColIndex].Value = j < employers.Count ? employers[j] : null;
-
-                if (workshopColIndex > 0)
-                    worksheet.Cells[currentRow, workshopColIndex].Value = j < workshops.Count ? workshops[j] : null;
-
-                for (int col = 1; col <= columnCount; col++)
+                for (int col = 1; col <= 11; col++)
                 {
                     var cell = worksheet.Cells[currentRow, col];
 
@@ -202,235 +154,109 @@ public class InstitutionContractExcelGenerator
             }
 
             // 🧱 مرج و مقداردهی ستون‌های اصلی
-            FillColumnData(worksheet, contract, startRow, endRow, visibleColumnIndices);
+            worksheet.Cells[startRow, 1, endRow, 1].Merge = true;
+            worksheet.Cells[startRow, 1].Value = contract.ContractNo;
+
+            worksheet.Cells[startRow, 2, endRow, 2].Merge = true;
+            worksheet.Cells[startRow, 2].Value = contract.ContractingPartyName;
+
+            worksheet.Cells[startRow, 3, endRow, 3].Merge = true;
+            worksheet.Cells[startRow, 3].Value = contract.ArchiveCode;
+
+            worksheet.Cells[startRow, 6, endRow, 6].Merge = true;
+            worksheet.Cells[startRow, 6].Value = contract.EmployeeCount;
+
+            worksheet.Cells[startRow, 7, endRow, 7].Merge = true;
+            worksheet.Cells[startRow, 7].Value = contract.ContractStartFa;
+
+            worksheet.Cells[startRow, 8, endRow, 8].Merge = true;
+            worksheet.Cells[startRow, 8].Value = contract.ContractEndFa;
+
+            worksheet.Cells[startRow, 9, endRow, 9].Merge = true;
+            var contractWithoutWorkshopAmountCell = worksheet.Cells[startRow, 9];
+            contractWithoutWorkshopAmountCell.Value = contract.WorkshopCount == "0" ? MoneyToDouble(contract.ContractAmount) : "";
+            contractWithoutWorkshopAmountCell.Style.Numberformat.Format = "#,##0";
+
+
+            worksheet.Cells[startRow, 10, endRow, 10].Merge = true;
+            var contractAmountCell = worksheet.Cells[startRow, 10];
+            contractAmountCell.Value = contract.WorkshopCount != "0" ? MoneyToDouble(contract.ContractAmount) : "";
+            contractAmountCell.Style.Numberformat.Format = "#,##0";
+
+
+            worksheet.Cells[startRow, 11, endRow, 11].Merge = true;
+            var balance = MoneyToDouble(contract.BalanceStr);
+            var balanceCell = worksheet.Cells[startRow, 11];
+            balanceCell.Value = balance;
+            balanceCell.Style.Numberformat.Format = "#,##0";
+
+            if (balance > 0)
+                balanceCell.Style.Font.Color.SetColor(Color.Red);
+            else if (balance < 0)
+                balanceCell.Style.Font.Color.SetColor(Color.Green);
 
             // 📦 بوردر ضخیم خارجی برای هر سطر
-            var boldRange = worksheet.Cells[startRow, 1, endRow, columnCount];
+            var boldRange = worksheet.Cells[startRow, 1, endRow, 11];
             boldRange.Style.Border.BorderAround(ExcelBorderStyle.Medium);
 
             row += maxRows;
         }
 
-        SetupPrintSettings(worksheet, visibleColumnIndices, columnCount);
-    }
 
-    /// <summary>
-    /// دریافت فهرست ستون‌های مرئی بر اساس کانفیگ
-    /// </summary>
-    private static List<ExcelColumnType> GetVisibleColumnIndices()
-    {
-        return _columnConfig.VisibleColumns;
-    }
 
-    /// <summary>
-    /// دریافت شماره ستون برای یک نوع ستون خاص
-    /// </summary>
-    private static int GetColumnIndexForType(ExcelColumnType columnType, List<ExcelColumnType> visibleColumns)
-    {
-        var index = visibleColumns.IndexOf(columnType);
-        return index >= 0 ? index + 1 : 0; // 1-based indexing
-    }
-
-    /// <summary>
-    /// دریافت متن header برای یک نوع ستون
-    /// </summary>
-    private static string GetColumnHeader(ExcelColumnType columnType)
-    {
-        return columnType switch
-        {
-            ExcelColumnType.RowNumber => "ردیف",
-            ExcelColumnType.PhysicalContract => "قرارداد فیزیکی",
-            ExcelColumnType.ContractNo => "شماره قرارداد",
-            ExcelColumnType.Representative => "معرف",
-            ExcelColumnType.ContractingPartyName => "طرف حساب",
-            ExcelColumnType.ArchiveCode => "شماره کارفرما",
-            ExcelColumnType.EmployerName => "کارفرما",
-            ExcelColumnType.WorkshopName => "کارگاه‌ها",
-            ExcelColumnType.WorkshopCount => "تعداد کارگاه",
-            ExcelColumnType.EmployeeCount => "مجموع پرسنل",
-            ExcelColumnType.ContractStartDate => "شروع قرارداد",
-            ExcelColumnType.ContractEndDate => "پایان قرارداد",
-            ExcelColumnType.InstallmentAmount => "مبلغ قسط",
-            ExcelColumnType.ContractAmount => "مبلغ قرارداد",
-            ExcelColumnType.FinancialStatus => "وضعیت مالی",
-            _ => ""
-        };
-    }
-
-    /// <summary>
-    /// تنظیم Header‌های ستون‌ها
-    /// </summary>
-    private static void SetupHeaders(ExcelWorksheet worksheet, List<ExcelColumnType> visibleColumns, int columnCount)
-    {
-        for (int i = 0; i < visibleColumns.Count; i++)
-        {
-            worksheet.Cells[1, i + 1].Value = GetColumnHeader(visibleColumns[i]);
-        }
-    }
-
-    /// <summary>
-    /// پر کردن داده‌های ستون‌ها برای یک قرارداد
-    /// </summary>
-    private static void FillColumnData(ExcelWorksheet worksheet, GetInstitutionContractListItemsViewModel contract, int startRow, int endRow, List<ExcelColumnType> visibleColumns)
-    {
-        for (int i = 0; i < visibleColumns.Count; i++)
-        {
-            int columnIndex = i + 1; // 1-based indexing
-            var columnType = visibleColumns[i];
-
-            // Merge cells for non-repeating columns
-            worksheet.Cells[startRow, columnIndex, endRow, columnIndex].Merge = true;
-
-            var cell = worksheet.Cells[startRow, columnIndex];
-
-            switch (columnType)
-            {
-                case ExcelColumnType.PhysicalContract:
-                    var physicalText = contract.IsOldContract
-                        ? (contract.HasSigniture ? "موجود" : "ناموجود")
-                        : (contract.IsInPersonContract ? "الکترونیکی حضوری" : "الکترونیکی غیر حضوری");
-
-                    cell.Value = physicalText;
-                    cell.Style.Font.Bold = true;
-                    cell.Style.Font.Color.SetColor(physicalText switch
-                    {
-                        "موجود" => Color.Green,
-                        "ناموجود" => Color.Red,
-                        "الکترونیکی حضوری" => Color.Purple,
-                        _ => Color.Blue
-                    });
-                    break;
-                case ExcelColumnType.ContractNo:
-                    cell.Value = contract.ContractNo;
-                    break;
-                case ExcelColumnType.Representative:
-                    cell.Value = contract.RepresentativeName;
-                    break;
-                case ExcelColumnType.ContractingPartyName:
-                    cell.Value = contract.ContractingPartyName;
-                    break;
-                case ExcelColumnType.ArchiveCode:
-                    cell.Value = contract.ArchiveNo;
-                    break;
-                case ExcelColumnType.EmployerName:
-                    // این ستون چندخطی است و داخل loop پر می‌شود
-                    break;
-                case ExcelColumnType.WorkshopName:
-                    // این ستون چندخطی است و داخل loop پر می‌شود
-                    break;
-                case ExcelColumnType.WorkshopCount:
-                    cell.Value = contract.WorkshopsCount;
-                    break;
-                case ExcelColumnType.EmployeeCount:
-                    cell.Value = contract.EmployeesCount;
-                    break;
-                case ExcelColumnType.ContractStartDate:
-                    cell.Value = contract.ContractStartFa;
-                    break;
-                case ExcelColumnType.ContractEndDate:
-                    cell.Value = contract.ContractEndFa;
-                    break;
-                case ExcelColumnType.InstallmentAmount:
-                    cell.Value = contract.InstallmentAmount;
-                    cell.Style.Numberformat.Format = "#,##0";
-                    break;
-                case ExcelColumnType.ContractAmount:
-                    cell.Value = contract.ContractAmount;
-                    cell.Style.Numberformat.Format = "#,##0";
-                    break;
-                case ExcelColumnType.FinancialStatus:
-                    cell.Value = contract.Balance;
-                    cell.Style.Numberformat.Format = "#,##0";
-
-                    if (contract.Balance > 0)
-                        cell.Style.Font.Color.SetColor(Color.Red);
-                    else if (contract.Balance < 0)
-                        cell.Style.Font.Color.SetColor(Color.Green);
-                    break;
-            }
-        }
-    }
-
-    /// <summary>
-    /// تنظیم تنظیمات چاپ و عرض ستون‌ها
-    /// </summary>
-    private static void SetupPrintSettings(ExcelWorksheet worksheet, List<ExcelColumnType> visibleColumns, int columnCount)
-    {
         worksheet.PrinterSettings.PaperSize = ePaperSize.A4;
         worksheet.PrinterSettings.Orientation = eOrientation.Landscape;
         worksheet.PrinterSettings.FitToPage = true;
         worksheet.PrinterSettings.FitToWidth = 1;
         worksheet.PrinterSettings.FitToHeight = 0;
         worksheet.PrinterSettings.Scale = 85;
-
-        // تنظیم عرض ستون‌ها بر اساس نوع ستون
-        for (int i = 0; i < visibleColumns.Count; i++)
-        {
-            int columnIndex = i + 1;
-            worksheet.Columns[columnIndex].Width = GetColumnWidth(visibleColumns[i]);
-        }
-
+        int contractNoCol = 1;
+        int contractingPartyNameCol = 2;
+        int archiveNoCol = 3;
+        int employersCol = 4;
+        int workshopsCol = 5;
+        int employeeCountCol = 6;
+        int startContractCol = 7;
+        int endContractCol = 8;
+        int contractWithoutWorkshopAmountCol = 9;
+        int contractAmountCol = 10;
+        int balanceCol = 11;
+        worksheet.Columns[contractNoCol].Width = 17;
+        worksheet.Columns[contractingPartyNameCol].Width = 40;
+        worksheet.Columns[archiveNoCol].Width = 10;
+        worksheet.Columns[employersCol].Width = 40;
+        worksheet.Columns[workshopsCol].Width = 45;
+        worksheet.Columns[employeeCountCol].Width = 12;
+        worksheet.Columns[startContractCol].Width = 12;
+        worksheet.Columns[endContractCol].Width = 12;
+        worksheet.Columns[contractWithoutWorkshopAmountCol].Width = 18;
+        worksheet.Columns[contractAmountCol].Width = 12;
+        worksheet.Columns[balanceCol].Width = 12;
         worksheet.View.RightToLeft = true; // فارسی
-    }
-
-    /// <summary>
-    /// دریافت عرض ستون پیش‌فرض برای هر نوع ستون
-    /// </summary>
-    private static double GetColumnWidth(ExcelColumnType columnType)
-    {
-        return columnType switch
-        {
-            ExcelColumnType.RowNumber => 8,
-            ExcelColumnType.PhysicalContract => 15,
-            ExcelColumnType.ContractNo => 17,
-            ExcelColumnType.Representative => 15,
-            ExcelColumnType.ContractingPartyName => 40,
-            ExcelColumnType.ArchiveCode => 10,
-            ExcelColumnType.EmployerName => 40,
-            ExcelColumnType.WorkshopName => 45,
-            ExcelColumnType.WorkshopCount => 12,
-            ExcelColumnType.EmployeeCount => 12,
-            ExcelColumnType.ContractStartDate => 12,
-            ExcelColumnType.ContractEndDate => 12,
-            ExcelColumnType.InstallmentAmount => 15,
-            ExcelColumnType.ContractAmount => 15,
-            ExcelColumnType.FinancialStatus => 12,
-            _ => 12
-        };
+        //worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns();
     }
 
     private static double MoneyToDouble(string value)
     {
-        if (string.IsNullOrEmpty(value))
-            return 0;
-
+        Console.WriteLine(value);
         var min = value.Length > 1 ? value.Substring(0, 2) : "";
         var test = min == "\u200e\u2212" ? value.MoneyToDouble() * -1 : value.MoneyToDouble();
+
+        Console.WriteLine(test);
         return test;
     }
-
-    /// <summary>
-    /// دریافت رنگ بر اساس وضعیت قرارداد
-    /// </summary>
-    private static Color GetColorByStatus(InstitutionContractListStatus status, int workshopsCount)
+    private static Color GetColorByName(string name, string workshopCount, string IsContractingPartyBlock)
     {
-        return status switch
+        return name switch
         {
-            InstitutionContractListStatus.DeactiveWithDebt => Color.LightBlue,
-            InstitutionContractListStatus.Deactive => Color.LightGray,
-            InstitutionContractListStatus.PendingForRenewal => Color.LightCoral,
-            InstitutionContractListStatus.Free => Color.MediumPurple,
-            InstitutionContractListStatus.Block => Color.DimGray,
-            InstitutionContractListStatus.WithoutWorkshop => Color.Yellow,
-            InstitutionContractListStatus.Active => Color.White,
+            "blue" => Color.LightBlue,
+            _ when IsContractingPartyBlock == "true" => Color.LightGray,
+            "red" => Color.LightCoral,
+            "purple" => Color.MediumPurple,
+            "black" => Color.DimGray,
+            var n when string.IsNullOrWhiteSpace(n) && workshopCount == "0" => Color.Yellow,
             _ => Color.White
         };
     }
 
-}
-
-public class InstitutionContractExcelViewModel
-{
-    public InstitutionContractListStatus? Tab { get; set; }
-    public List<GetInstitutionContractListItemsViewModel> GetInstitutionContractListItemsViewModels { get; set; }
-}
+}

CompanyManagement.Infrastructure.Excel/RollCall/RollCallExcelGenerator.cs

@@ -8,7 +8,7 @@ public class RollCallExcelGenerator : ExcelGenerator
 {
     public static byte[] CaseHistoryExcelForEmployee(CaseHistoryRollCallExcelForEmployeeViewModel data)
     {
-        OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        OfficeOpenXml.ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
         using var package = new OfficeOpenXml.ExcelPackage();
         var worksheet = package.Workbook.Worksheets.Add("Sheet1");
         var rollCalls = data.RollCalls;
@@ -181,7 +181,7 @@ public class RollCallExcelGenerator : ExcelGenerator
 
     public static byte[] CaseHistoryExcelForOneDay(CaseHistoryRollCallForOneDayViewModel data)
     {
-        OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        OfficeOpenXml.ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
         using var package = new OfficeOpenXml.ExcelPackage();
         var worksheet = package.Workbook.Worksheets.Add("Sheet1");
         var rollCalls = data.RollCalls;

CompanyManagement.Infrastructure.Excel/SalaryAid/SalaryAidImportExcel.cs

@@ -43,7 +43,7 @@ public class SalaryAidImportExcel
             ValidData = []
         };
 
-        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
 
         if (file == null || file.Length == 0)
         {

CompanyManagement.Infrastructure.Excel/WorkshopsRollCall/WorkshopRollCallExcelExporter.cs

@@ -9,7 +9,7 @@ public class WorkshopRollCallExcelExporter
 {
     public static byte[] Export(List<WorkshopRollCallExcelViewModel> workshops)
     {
-        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
         using (var package = new ExcelPackage())
         {
             var ws = package.Workbook.Worksheets.Add("Workshops");

CompanyManagment.App.Contracts/CompanyManagment.App.Contracts.csproj

@@ -3,7 +3,6 @@
 	<PropertyGroup>
 		<TargetFramework>net10.0</TargetFramework>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-		<NoWarn>$(NoWarn);1591</NoWarn>
 	</PropertyGroup>
 
 	<ItemGroup>

CompanyManagment.App.Contracts/Contract/ContractListOrderType.cs

@@ -1,12 +0,0 @@
-namespace CompanyManagment.App.Contracts.Contract;
-
-public enum ContractListOrderType
-{
-    ByContractCreationDate,
-    BySignedContract,
-    ByUnSignedContract,
-    ByPersonnelCode,
-    ByPersonnelCodeDescending,
-    ByContractStartDate,
-    ByContractStartDateDescending
-}

CompanyManagment.App.Contracts/Contract/GetContractListForClientRequest.cs

@@ -1,13 +0,0 @@
-using _0_Framework.Application;
-
-namespace CompanyManagment.App.Contracts.Contract;
-
-public class GetContractListForClientRequest: PaginationRequest
-{
-    public int Year { get; set; }
-    public int Month { get; set; }
-    public string StartDate { get; set; }
-    public string EndDate { get; set; }
-    public long EmployeeId { get; set; }
-    public ContractListOrderType? OrderType { get; set; }
-}

CompanyManagment.App.Contracts/Contract/GetContractListForClientResponse.cs

@@ -1,15 +0,0 @@
-namespace CompanyManagment.App.Contracts.Contract;
-
-public class GetContractListForClientResponse
-{
-    public long Id { get; set; }
-    public string PersonnelCode { get; set; }
-    public string ContractNo { get; set; }
-    public string EmployeeFullName { get; set; }
-    public string ContractStart { get; set; }
-    public string ContractEnd { get; set; }
-    public bool IsSigned { get; set; }
-    public string DailyWage { get; set; }
-    public string AvgWorkingHour { get; set; }
-    public string FamilyAllowance { get; set; }
-}

CompanyManagment.App.Contracts/Contract/IContractApplication.cs

@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.Workshop;
 using System.Threading.Tasks;
-using _0_Framework.Application.Enums;
-
 namespace CompanyManagment.App.Contracts.Contract;
 
 public interface IContractApplication
@@ -47,101 +45,16 @@ public interface IContractApplication
     #region Client
 
     OperationResult Remove(long id);
-    
-    [Obsolete("این متد منسوخ شده است. لطفاً از متد GetContractListForClient استفاده کنید.")]
     List<ContractViweModel> SearchForClient(ContractSearchModel searchModel);
-    
-    /// <summary>
-    /// لیست قراردادها برای کلاینت
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<PagedResult<GetContractListForClientResponse>> 
-        GetContractListForClient(GetContractListForClientRequest searchModel);
-    Task<ContractPrintViewModel> PrintOneAsync(long id);
-    Task<List<ContractPrintViewModel>> PrintAllAsync(List<long> ids);
+    #endregion
 
-	#endregion
+    #region NewChangeByHeydari
 
-	#region NewChangeByHeydari
-
-	OperationResult DeleteAllContarcts(List<long> ids);
+    OperationResult DeleteAllContarcts(List<long> ids);
     OperationResult DeleteContarcts(long id);
     List<long> CheckHasCheckout(List<long> ids);
     List<long> CheckHasSignature(List<long> ids);
     List<ContractViweModel> SearchForMainContract(ContractSearchModel searchModel);
 
     #endregion
-}
-
-public class ContractPrintViewModel
-{
-    public string ContractNo { get; set; }
-    public ContractPrintEmployerViewModel Employer { get; set; }
-    public ContractPrintEmployeeViewModel Employee { get; set; }
-    public ContractPrintTypeOfContractViewModel TypeOfContract { get; set; }
-    public ContractPrintFeesViewModel Fees { get; set; }
-    public string ConditionAndDetials { get; set; }
-    
-    
-}
-
-public class ContractPrintFeesViewModel
-{
-    public string DailyWage { get; set; }
-    public string FamilyAllowance { get; set; }
-    public string ConsumableItems { get; set; }
-    public string HousingAllowance { get; set; }
-}
-
-public class ContractPrintTypeOfContractViewModel
-{
-    public string ContractType { get; set; }
-    public string JobName { get; set; }
-    public string SetContractDate { get; set; }
-    public string ContarctStart { get; set; }
-    public string ContractEnd { get; set; }
-    public string WorkingHoursWeekly { get; set; }
-    public List<string> WorkshopAddress { get; set; }
-    
-    
-    
-}
-
-public class ContractPrintEmployeeViewModel
-{
-    public string FullName { get; set; }
-    public string NationalCode { get; set; }
-    public string IdNumber { get; set; }
-    public string DateOfBirth { get; set; }
-    public string FatherName { get; set; }
-    public string LevelOfEducation { get; set; }
-    public string Address { get; set; }
-    
-    
-}
-
-public class ContractPrintEmployerViewModel
-{
-    public LegalType LegalType { get; set; }
-    public ContractPrintRealEmployerViewModel RealEmployer { get; set; }
-    public ContractPrintLegalEmployerViewModel LegalEmployer { get; set; }
-    public string WorkshopName { get; set; }
-    public string Address { get; set; }
-    public string WorkshopCode { get; set; }
-    
-}
-
-public class ContractPrintLegalEmployerViewModel
-{
-    public string CompanyName { get; set; }
-    public string NationalId  { get; set; }
-    public string RegisterId { get; set; }
-}
-
-public class ContractPrintRealEmployerViewModel
-{
-    public string FullName { get; set; }
-    public string NationalCode { get; set; }
-    public string IdNumber { get; set; }
 }

CompanyManagment.App.Contracts/Employee/IEmployeeApplication.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.Employee.DTO;
@@ -60,7 +61,7 @@ public interface IEmployeeApplication
     /// <returns></returns>
     Task<OperationResult<EmployeeByNationalCodeInWorkshopViewModel>>
         ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(string nationalCode,
-            string birthDate,bool authorizedCanceled, long workshopId);
+            string birthDate, long workshopId);
 
     /// <summary>
     /// پرسنل هایی که در کارگاهی از سمت ادمین شروع به کار کرده اند
@@ -94,42 +95,42 @@ public interface IEmployeeApplication
 	/// </summary>
 	/// <returns></returns>
 	Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel);
-	
-	/// <summary>
-	/// لیست کل پرسنل کلاینت
-	/// </summary>
-	/// <param name="searchModel"></param>
-	/// <param name="workshopId"></param>
-	/// <returns></returns>
-	Task<List<GetClientEmployeeListViewModel>> GetClientEmployeeList(GetClientEmployeeListSearchModel searchModel, long workshopId);
 
+	Task<List<GetEmployeeClientListViewModel>> GetEmployeeClientList(GetEmployeeClientListSearchModel searchModel,
+		long workshopId);
 	#endregion
 
 }
 
-public class GetClientEmployeeListSearchModel
+public class GetEmployeeClientListSearchModel
 {
+	public string NationalCode { get; set; }
+	public string FullName { get; set; }
+	
 }
 
-public class GetClientEmployeeListViewModel
+public class GetEmployeeClientListViewModel
 {
-	public string FullName { get; set; }
-	public long EmployeeId { get; set; }
 	public long WorkshopId { get; set; }
+	public long EmployeeId { get; set; }
+	public string FullName { get; set; }
 	public long PersonnelCode { get; set; }
-	public string MaritalStatus { get; set; }
-	public string NationalCode { get; set; }
-	public string IdNumber { get; set; }
-	public string DateOfBirthFa { get; set; }
-	public string FatherName { get; set; }
-	public int ChildrenCount { get; set; }
+	public bool HasInsurance { get; set; }
+	public bool HasContract { get; set; }
+	public bool InsuranceLeft { get; set; }
+	public bool ContractLeft { get; set; }
+	public DateTime StartWork { get; set; }
+	public DateTime LeftWork { get; set; }
 	public string LastStartInsuranceWork { get; set; }
 	public string LastLeftInsuranceWork { get; set; }
 	public string LastStartContractWork { get; set; }
 	public string LastLeftContractWork { get; set; }
-	public bool HasContractLeftWork { get; set; }
-	public bool HasInsuranceLeftWork { get; set; }
-	public bool LeftWorkCompletely { get; set; }
-	public bool PendingStartWork { get; set; }
-	public bool PendingLeftWork { get; set; }
+	public string NationalCode { get; set; }
+	public string IdNumber { get; set; }
+	public string MaritalStatus { get; set; }
+	public string DateOfBirthFa { get; set; }
+	public string FatherName { get; set; }
+	public bool PendingCreate { get; set; }
+	public bool PendingLefWork { get; set; }
+	public int ChildrenCount { get; set; }
 }

CompanyManagment.App.Contracts/EmployeeDocuments/WorkshopWithEmployeeDocumentsViewModel.cs

@@ -13,6 +13,5 @@ namespace CompanyManagment.App.Contracts.EmployeeDocuments
 		public string EmployerName { get; set; }
         public List<EmployeeDocumentItemViewModel> SubmittedItems { get; set; }
         public int EmployeesWithoutDocumentCount { get; set; }
-        public long EmployeeId { get; set; }
     }
 }

CompanyManagment.App.Contracts/InstitutionContract/ContractSigningType.cs

@@ -1,17 +0,0 @@
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public enum InstitutionContractSigningType
-{ 
-    /// <summary>
-    /// قدیمی
-    /// </summary>
-    Legacy = 0,
-    /// <summary>
-    /// الکترونیکی با کد یکبار مصرف
-    /// </summary>
-    OtpBased = 1,
-    /// <summary>
-    /// به صورت فیزیکی
-    /// </summary>
-    Physical = 2
-}

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListItemsViewModel.cs

@@ -91,11 +91,6 @@ public class GetInstitutionContractListItemsViewModel
     public bool IsInPersonContract { get; set; }
     
     public bool IsOldContract { get; set; }
-
-    /// <summary>
-    /// مبلغ قسط
-    /// </summary>
-    public double InstallmentAmount { get; set; }
 }
 
 public class InstitutionContractListWorkshop

CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Application.Sms;
 using CompanyManagment.App.Contracts.Checkout;
+using CompanyManagment.App.Contracts.Law;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.App.Contracts.Workshop;
 using CompanyManagment.App.Contracts.WorkshopPlan;
@@ -259,13 +260,154 @@ public interface IInstitutionContractApplication
     /// <returns></returns>
     Task<InstitutionContractPrintViewModel> PrintOneAsync(long id);
 
-    Task<OperationResult> SetPendingWorkflow(long entityId,InstitutionContractSigningType signingType);
+    Task<OperationResult> SetPendingWorkflow(long entityId);
     Task<long> GetIdByInstallmentId(long installmentId);
-    /// <summary>
-    /// تایید قرارداد مالی به صورت دستی
-    /// </summary>
-    /// <param name="institutionContractId"></param>
-    /// <returns></returns>
-    Task<OperationResult> VerifyInstitutionContractManually(long institutionContractId);
 
+}
+
+public class InstitutionContractDiscountResponse
+{
+    public InstitutionContractDiscountOneTimeViewModel OneTime { get; set; }
+    public InstitutionContractDiscountMonthlyViewModel Monthly { get; set; }
+}
+
+public class InstitutionContractDiscountMonthlyViewModel:InstitutionContractDiscountOneTimeViewModel
+{
+    public List<MonthlyInstallment> Installments { get; set; }
+}
+
+public class InstitutionContractDiscountOneTimeViewModel
+{
+    /// <summary>
+    /// مجموع مبالغ
+    /// </summary>
+    public string TotalAmount { get; set; }
+    /// <summary>
+    /// ارزش افزوده
+    /// </summary>
+    public string Tax { get; set; }
+    /// <summary>
+    /// مبلغ قابل پرداخت
+    /// </summary>
+    public string PaymentAmount { get; set; }
+    
+    public string DiscountedAmount { get; set; }
+    
+    public int DiscountPercetage { get; set; }
+
+    public string Obligation { get; set; }
+    
+    public string OneMonthAmount { get; set; }
+}
+
+public class InstitutionContractResetDiscountForCreateRequest
+{
+    public int DiscountPercentage { get; set; }
+    public double TotalAmount { get; set; }
+    public bool IsInstallment { get; set; }
+    public InstitutionContractDuration Duration { get; set; }
+    public double OneMonthAmount { get; set; }
+}
+
+public class InstitutionContractSetDiscountForExtensionRequest
+{
+    public Guid TempId { get; set; }
+    public int DiscountPercentage { get; set; }
+    public double TotalAmount { get; set; }
+    public bool IsInstallment { get; set; }
+}
+public class InstitutionContractResetDiscountForExtensionRequest
+{
+    public Guid TempId { get; set; }
+    public bool IsInstallment { get; set; }
+}
+
+
+public class InstitutionContractSetDiscountRequest
+{
+    public int DiscountPercentage { get; set; }
+    public double TotalAmount { get; set; }
+    public InstitutionContractDuration Duration { get; set; }
+    public double OneMonthAmount { get; set; }
+    public bool IsInstallment { get; set; }
+}
+
+public class InstitutionContractPrintViewModel
+{
+    public InstitutionContratVerificationParty FirstParty { get; set; }
+    public InstitutionContratVerificationParty SecondParty { get; set; }
+    public string ContractNo { get; set; }
+    public string CreationDate { get; set; }
+    public string ContractStart { get; set; }
+    public string ContractEnd { get; set; }
+    public List<GetInstitutionVerificationDetailsWorkshopsViewModel> Workshops { get; set; }
+    public string TotalPrice { get; set; }
+    public string TaxPrice { get; set; }
+    public string PaymentPrice { get; set; }
+    public string VerifyCode { get; set; }
+    public string VerifyDate { get; set; }
+    public string VerifyTime { get; set; }
+    public string VerifierFullName { get; set; }
+    public string VerifierPhoneNumber { get; set; }
+    public LawViewModel LawViewModel { get; set; }
+    public string Obligation { get; set; }
+}
+
+public class InsertAmendmentTempWorkshopResponse
+{
+    public Guid WorkshopTempId { get; set; }
+    public string Amount { get; set; }
+}
+
+public class InstitutionContractAmendmentWorkshopsResponse
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public List<InstitutionContractAmendmentTempWorkshopViewModel> Workshops { get; set; }
+
+    public Guid TempId { get; set; }
+
+}
+
+public class InstitutionContractSelectListViewModel : SelectListViewModel;
+
+public class InstitutionContractExtensionInquiryResponse
+{
+    public long Id { get; set; }
+    public string FName { get; set; }
+    public string LName { get; set; }
+    public string DateOfBirthFa { get; set; }
+    public string FatherName { get; set; }
+    public string IdNumberSerial { get; set; }
+    public string IdNumber { get; set; }
+    public string Address { get; set; }
+    public string Phone { get; set; }
+    public string City { get; set; }
+    public string State { get; set; }
+    public long RepresentativeId { get; set; }
+    public string NationalCode { get; set; }
+}
+
+
+
+public class InstitutionContractExtensionPaymentMonthly:InstitutionContractExtensionPaymentOneTime
+{
+    public List<MonthlyInstallment> Installments { get; set; }
+}
+
+public class InstitutionContractExtensionPaymentOneTime
+{
+    /// <summary>
+    /// مجموع مبالغ
+    /// </summary>
+    public string TotalAmount { get; set; }
+    /// <summary>
+    /// ارزش افزوده
+    /// </summary>
+    public string Tax { get; set; }
+    /// <summary>
+    /// مبلغ قابل پرداخت
+    /// </summary>
+    public string PaymentAmount { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/InsertAmendmentTempWorkshopResponse.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InsertAmendmentTempWorkshopResponse
-{
-    public Guid WorkshopTempId { get; set; }
-    public string Amount { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractAmendmentWorkshopsResponse.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractAmendmentWorkshopsResponse
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public List<InstitutionContractAmendmentTempWorkshopViewModel> Workshops { get; set; }
-
-    public Guid TempId { get; set; }
-
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractDiscountResponse.cs

@@ -1,38 +0,0 @@
-using System.Collections.Generic;
-using CompanyManagment.App.Contracts.TemporaryClientRegistration;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractDiscountResponse
-{
-    public InstitutionContractDiscountOneTimeViewModel OneTime { get; set; }
-    public InstitutionContractDiscountMonthlyViewModel Monthly { get; set; }
-}
-public class InstitutionContractDiscountMonthlyViewModel:InstitutionContractDiscountOneTimeViewModel
-{
-    public List<MonthlyInstallment> Installments { get; set; }
-}
-
-public class InstitutionContractDiscountOneTimeViewModel
-{
-    /// <summary>
-    /// مجموع مبالغ
-    /// </summary>
-    public string TotalAmount { get; set; }
-    /// <summary>
-    /// ارزش افزوده
-    /// </summary>
-    public string Tax { get; set; }
-    /// <summary>
-    /// مبلغ قابل پرداخت
-    /// </summary>
-    public string PaymentAmount { get; set; }
-    
-    public string DiscountedAmount { get; set; }
-    
-    public int DiscountPercetage { get; set; }
-
-    public string Obligation { get; set; }
-    
-    public string OneMonthAmount { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionInquiryResponse.cs

@@ -1,18 +0,0 @@
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractExtensionInquiryResponse
-{
-    public long Id { get; set; }
-    public string FName { get; set; }
-    public string LName { get; set; }
-    public string DateOfBirthFa { get; set; }
-    public string FatherName { get; set; }
-    public string IdNumberSerial { get; set; }
-    public string IdNumber { get; set; }
-    public string Address { get; set; }
-    public string Phone { get; set; }
-    public string City { get; set; }
-    public string State { get; set; }
-    public long RepresentativeId { get; set; }
-    public string NationalCode { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionPaymentOneTime.cs

@@ -1,24 +0,0 @@
-using System.Collections.Generic;
-using CompanyManagment.App.Contracts.TemporaryClientRegistration;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractExtensionPaymentMonthly:InstitutionContractExtensionPaymentOneTime
-{
-    public List<MonthlyInstallment> Installments { get; set; }
-}
-public class InstitutionContractExtensionPaymentOneTime
-{
-    /// <summary>
-    /// مجموع مبالغ
-    /// </summary>
-    public string TotalAmount { get; set; }
-    /// <summary>
-    /// ارزش افزوده
-    /// </summary>
-    public string Tax { get; set; }
-    /// <summary>
-    /// مبلغ قابل پرداخت
-    /// </summary>
-    public string PaymentAmount { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractPaymentOneTimeViewModel.cs

@@ -18,16 +18,6 @@ public class InstitutionContractPaymentOneTimeViewModel
     /// </summary>
     public string PaymentAmount { get; set; }
 
-    /// <summary>
-    /// مجموع مبالغ بدون تخفیف
-    /// </summary>
-    public string TotalAmountWithoutDiscount { get; set; }
-
-    /// <summary>
-    /// مبلغ یک ماه بدون تخفیف
-    /// </summary>
-    public string OneMonthPaymentWithoutDiscount { get; set; }
-
     public string DiscountedAmount { get; set; }
     public int DiscountPercetage { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractPrintViewModel.cs

@@ -1,28 +0,0 @@
-using System.Collections.Generic;
-using CompanyManagment.App.Contracts.Law;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractPrintViewModel
-{
-    public InstitutionContratVerificationParty FirstParty { get; set; }
-    public InstitutionContratVerificationParty SecondParty { get; set; }
-    public string ContractNo { get; set; }
-    public string CreationDate { get; set; }
-    public string ContractStart { get; set; }
-    public string ContractEnd { get; set; }
-    public List<GetInstitutionVerificationDetailsWorkshopsViewModel> Workshops { get; set; }
-    public string TotalPrice { get; set; }
-    public string TaxPrice { get; set; }
-    public string PaymentPrice { get; set; }
-    public string OneMonthPrice { get; set; }
-    public string VerifyCode { get; set; }
-    public string VerifyDate { get; set; }
-    public string VerifyTime { get; set; }
-    public string VerifierFullName { get; set; }
-    public string VerifierPhoneNumber { get; set; }
-    public LawViewModel LawViewModel { get; set; }
-    public string Obligation { get; set; }
-    public string OneMonthWithoutTax { get; set; }
-    public string OneMonthTax { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractResetDiscountForCreateRequest.cs

@@ -1,10 +0,0 @@
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractResetDiscountForCreateRequest
-{
-    public int DiscountPercentage { get; set; }
-    public double TotalAmount { get; set; }
-    public bool IsInstallment { get; set; }
-    public InstitutionContractDuration Duration { get; set; }
-    public double OneMonthAmount { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractResetDiscountForExtensionRequest.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractResetDiscountForExtensionRequest
-{
-    public Guid TempId { get; set; }
-    public bool IsInstallment { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractSelectListViewModel.cs

@@ -1,5 +0,0 @@
-using _0_Framework.Application;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractSelectListViewModel : SelectListViewModel;

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractSetDiscountForExtensionRequest.cs

@@ -1,11 +0,0 @@
-using System;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractSetDiscountForExtensionRequest
-{
-    public Guid TempId { get; set; }
-    public int DiscountPercentage { get; set; }
-    public double TotalAmount { get; set; }
-    public bool IsInstallment { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractSetDiscountRequest.cs

@@ -1,10 +0,0 @@
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractSetDiscountRequest
-{
-    public int DiscountPercentage { get; set; }
-    public double TotalAmount { get; set; }
-    public InstitutionContractDuration Duration { get; set; }
-    public double OneMonthAmount { get; set; }
-    public bool IsInstallment { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractViewModel.cs

@@ -76,7 +76,5 @@ public class InstitutionContractViewModel
     public bool IsInstallment { get; set; }
     public InstitutionContractVerificationStatus VerificationStatus { get; set; }
 
-    public InstitutionContractSigningType? SigningType { get; set; }
-
     public List<InstitutionContractInstallmentViewModel> InstallmentList { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionCreationVerificationSmsDto.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public record InstitutionCreationVerificationSmsDto
-{
-    public string Number{ get; set; }
-    public string FullName { get; set; }
-    public Guid InstitutionId { get; set; }
-    public long ContractingPartyId { get; set; }
-    public long InstitutionContractId { get; set; }
-};

CompanyManagment.App.Contracts/InstitutionPlan/CreateServiceAmountDto.cs

@@ -1,51 +0,0 @@
-namespace CompanyManagment.App.Contracts.InstitutionPlan;
-
-public class CreateServiceAmountDto
-{
-    /// <summary>
-    /// آی دی
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// قرارداد و تصفیه
-    /// درصد از مزد روزانه
-    /// string
-    /// </summary>
-    public string ContractAndCheckoutPercentStr { get; set; }
-
-    /// <summary>
-    /// بیمه
-    /// درصد از مزد روزانه
-    /// string
-    /// </summary>
-    public string InsurancePercentStr { get; set; }
-
-    /// <summary>
-    /// حضورغباب
-    /// درصد از مزد روزانه
-    /// string
-    /// </summary>
-    public string RollCallPercentStr { get; set; }
-
-    /// <summary>
-    /// فیش غیر رسمی
-    /// درصد از مزد روزانه
-    /// string
-    /// </summary>
-    public string CustomizeCheckoutPercentStr { get; set; }
-
-    /// <summary>
-    /// خدمات حضوری قرداد و تصفیه
-    /// درصد از مزد روزانه
-    /// string
-    /// </summary>
-    public string ContractAndCheckoutInPersonPercentStr { get; set; }
-
-    /// <summary>
-    /// خدمات حضوری بیمه
-    /// درصد از مزد روزانه
-    /// string
-    /// </summary>
-    public string InsuranceInPersonPercentStr { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionPlan/IInstitutionPlanApplication.cs

@@ -1,7 +1,6 @@
-using _0_Framework.Application;
+using System.Collections.Generic;
+using _0_Framework.Application;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace CompanyManagment.App.Contracts.InstitutionPlan;
 
@@ -35,27 +34,4 @@ public interface IInstitutionPlanApplication
     /// <param name="command"></param>
     /// <returns></returns>
     InstitutionPlanViewModel GetInstitutionPlanForWorkshop(WorkshopTempViewModel command);
-
-
-    /// <summary>
-    /// دریافت دیتای درصد سرویس برای مودال ایجاد
-    /// </summary>
-    /// <returns></returns>
-    Task<CreateServiceAmountDto> GetCreateModalData();
-
-    /// <summary>
-    /// ایجاد درصد سرویس
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    Task<OperationResult> CreateInstitutionPlanPercentage(CreateServiceAmountDto command);
-
-
-    /// <summary>
-    /// دریافت لیست مبالغ سرویس ها
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<PagedResult<InstitutionPlanListDto>> GetList(
-        InstitutionPlanSearchModel searchModel);
 }

CompanyManagment.App.Contracts/InstitutionPlan/InstitutionPlanListDto.cs

@@ -1,84 +0,0 @@
-namespace CompanyManagment.App.Contracts.InstitutionPlan;
-
-public class InstitutionPlanListDto
-{
-
-
-    /// <summary>
-    /// تعداد پرسنل
-    /// </summary>
-    public int CountPerson { get; set; }
-
-    /// <summary>
-    /// مبلغ قرارداد و تصفیه 
-    /// </summary>
-    public string ContractAndCheckout { get; set; }
-
-    /// <summary>
-    /// مبلغ بیمه
-    /// </summary>
-    public string Insurance { get; set; }
-
-    /// <summary>
-    /// مبلغ حضورغباب
-    /// </summary>
-    public string RollCall { get; set; }
-
-    /// <summary>
-    /// مبلغ فیش غیر رسمی
-    /// </summary>
-    public string CustomizeCheckout { get; set; }
-
-    /// <summary>
-    /// مبلغ خدمات حضوری قرداد و تصفیه
-    /// </summary>
-    public string ContractAndCheckoutInPerson { get; set; }
-
-    /// <summary>
-    /// مبلغ خدمات حضوری بیمه
-    /// </summary>
-    public string InsuranceInPerson { get; set; }
-
-
-
-
-    #region Total
-
-
-    /// <summary>
-    /// مبلغ کل خدمات حضوری
-    /// </summary>
-    public string InPersonSumAmountStr { get; set; }
-
-    /// <summary>
-    /// مبلغ کل خدمات آنلاین
-    /// </summary>
-    public string OnlineOnlySumAmountStr { get; set; }
-
-    /// <summary>
-    /// مبلغ کل خدمات حضوری و آنلاین
-    /// </summary>
-    public string OnlineAndInPersonSumAmountStr { get; set; }
-
-    /// <summary>
-    /// مبلغ کل خدمات حضوری و آنلاین
-    /// double
-    /// </summary>
-    public double OnlineAndInPersonSumAmountDouble { get; set; }
-
-
-    /// <summary>
-    /// مبلغ کل خدمات حضوری
-    /// double
-    /// </summary>
-    public double InPersonSumAmountDouble { get; set; }
-
-    /// <summary>
-    /// مبلغ کل خدمات آنلاین
-    /// double
-    /// </summary>
-    public double OnlineOnlySumAmountDouble { get; set; }
-
-
-    #endregion
-}

CompanyManagment.App.Contracts/InstitutionPlan/InstitutionPlanSearchModel.cs

@@ -1,11 +0,0 @@
-using _0_Framework.Application;
-
-namespace CompanyManagment.App.Contracts.InstitutionPlan;
-
-public class InstitutionPlanSearchModel : PaginationRequest
-{
-    /// <summary>
-    /// تعداد پرسنل برای جستجو
-    /// </summary>
-    public int CountPerson { get; set; }
-}

CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs

@@ -5,7 +5,6 @@ using System.Text;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.InsuranceList;
-using CompanyManagment.App.Contracts.Workshop;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
@@ -91,122 +90,8 @@ public interface IInsuranceListApplication
     Task<InsuranceListConfirmOperation> GetInsuranceOperationDetails(long id);
 
 	Task<InsuranceListTabsCountViewModel> GetTabCounts(InsuranceListSearchModel searchModel);
-    Task<PagedResult<InsuranceClientListViewModel>> GetInsuranceClientList(InsuranceClientSearchModel searchModel);
-    
 
 	#endregion
 
     Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel);
-    Task<InsuranceClientPrintViewModel> ClientPrintOne(long id);
-}
-
-public class InsuranceClientPrintViewModel
-{
-    public string Month { get; set; }
-    public string Year { get; set; }
-    public string WorkshopName { get; set; }
-    public string ListNo { get; set; }
-    public string AgreementNumber { get; set; }
-    public string WorkshopInsuranceCode { get; set; }
-    public string WorkshopEmployerName { get; set; }
-    public string WorkshopAddress { get; set; }
-    public List<InsuranceClientPrintItemsViewModel> Items { get; set; }
-    public string EmployerShare { get; set; }
-    public string InsuredShare { get; set; }
-    public string UnEmploymentInsurance { get; set; }
-    public string AllInsuredShare { get; set; }
-    
-}
-public class InsuranceClientPrintItemsViewModel
-{
-    /// <summary>
-    /// شماره بیمه 
-    /// </summary>
-    public string InsuranceCode { get; set; }
-    /// <summary>
-    /// نام و نام خانوادگی
-    /// </summary>
-    public string FullName { get; set; }
-    /// <summary>
-    /// شغل
-    /// </summary>
-    public string JobName { get; set; }
-    /// <summary>
-    /// کد ملی
-    /// </summary>
-    public string NationalCode { get; set; }
-    /// <summary>
-    /// شروع به کار
-    /// </summary>
-    public string StartWork { get; set; }
-    /// <summary>
-    /// ترک کار
-    /// </summary>
-    public string LeftWork { get; set; }
-    /// <summary>
-    /// روزهای کارکرد
-    /// </summary>
-    public string WorkingDays { get; set; }
-    /// <summary>
-    /// دستمزد روزانه
-    /// </summary>
-    public string DailyWage { get; set; }
-    /// <summary>
-    /// پایه سنوات روزانه
-    /// </summary>
-    public string BaseYears { get; set; }
-    /// <summary>
-    /// دستمزد ماهانه
-    /// </summary>
-    public string MonthlySalary { get; set; }
-    /// <summary>
-    /// مزایای ماهیانه مشمول
-    /// </summary>
-    public string MonthlyBenefits { get; set; }
-    /// <summary>
-    /// حق تاهل
-    /// </summary>
-    public string MarriedAllowance { get; set; }
-    /// <summary>
-    /// حقوق و مزایای ماهیانه مشمول
-    /// </summary>
-    public string BenefitsIncludedContinuous { get; set; }
-    /// <summary>
-    /// حقوق و مزایای ماهیانه غیر مشمول
-    /// </summary>
-    public string BenefitsIncludedNonContinuous { get; set; }
-    /// <summary>
-    /// مجموع مزایای ماهیانه مشمول و غیر مشمول
-    /// </summary>
-    public string IncludedAndNotIncluded { get; set; }
-    /// <summary>
-    /// حق بیمه سهم بیمه شده
-    /// </summary>
-    public string InsuranceShare { get; set; }
-    
-    
-}
-
-public class InsuranceClientSearchModel:PaginationRequest
-{
-    public int Year { get; set; }
-    public int Month { get; set; }
-    public string Sorting { get; set; }
-}
-public class InsuranceClientListViewModel
-{
-    public long Id { get; set; }
-    public string Year { get; set; }
-    public string Month { get; set; }
-    public long WorkShopId { get; set; }
-    public int YearInt { get; set; }
-    public string MonthName { get; set; }
-    public int MonthInt { get; set; }
-    public int PersonnelCount { get; set; }
-    public int LeftWorkCount { get; set; }
-    public string AllInsuredShare { get; set; }
-    public string InsuredShare { get; set; }
-    public string EmployerShare { get; set; }
-    public string UnEmploymentInsurance { get; set; }
-    
 }

CompanyManagment.App.Contracts/Leave/CheckIsInvalidLeaveDto.cs

@@ -1,15 +0,0 @@
-namespace CompanyManagment.App.Contracts.Leave;
-
-public class CheckIsInvalidLeaveDto
-{
-    /// <summary>
-    /// آیا تعطیل است
-    /// </summary>
-    public bool IsHoliday { get; set; }
-
-    /// <summary>
-    /// فاقد/دارای اعتبار فیش غیر رسمی
-    /// </summary>
-    public bool CanCreateInvalid { get; set; }
-
-}

CompanyManagment.App.Contracts/Leave/CreateLeaveDto.cs

@@ -1,78 +0,0 @@
-using CompanyManagment.App.Contracts.CustomizeWorkshopSettings;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
-
-namespace CompanyManagment.App.Contracts.Leave;
-
-public class CreateLeaveDto
-{
-    /// <summary>
-    /// تاریخ شروع مرخصی
-    /// </summary>
-    [Required(ErrorMessage = "این مقدار نمی تواند خالی باشد")]
-    public string StartLeave { get; set; }
-
-
-    /// <summary>
-    /// تاریخ پایان مرخصی
-    /// </summary>
-    [Required(ErrorMessage = "این مقدار نمی تواند خالی باشد")]
-    public string EndLeave { get; set; }
-
-    /// <summary>
-    /// آی دی کارگاه
-    /// </summary>
-    public long WorkshopId { get; set; }
-
-    /// <summary>
-    /// آی دی پرسنل
-    /// </summary>
-    public long EmployeeId { get; set; }
-
-    /// <summary>
-    /// نوع مدت مرخص روزانه/ ساعتی
-    /// </summary>
-    public PaidLeaveType PaidLeaveType { get; set; }
-
-    /// <summary>
-    /// نوع مرخصی استحقاقی/استعلاجی
-    /// </summary>
-    public LeaveType LeaveType { get; set; }
-
-    /// <summary>
-    /// نام کامل کارگاه
-    /// </summary>
-    public string WorkshopName { get; set; }
-
-    /// <summary>
-    /// ساعت شروع مرخصی
-    /// </summary>
-    public string StartHoures { get; set; }
-
-    /// <summary>
-    /// ساعت پایان مرخصی
-    /// </summary>
-    public string EndHours { get; set; }
-
-    /// <summary>
-    /// موافقت / عدم موافقت کارفرما
-    /// </summary>
-    public bool IsAccepted { get; set; }
-
-    /// <summary>
-    /// توضیحات
-    /// </summary>
-    public string Decription { get; set; }
-
-
-    public List<CustomizeRotatingShiftsViewModel> RotatingShifts { get; set; }
-
-    /// <summary>
-    /// دارای اعتبار / فاقد اعتبار  فیش غیررسمی
-    /// </summary>
-    public bool IsInvallid { get; set; }
-    public CustomizeRotatingShiftsViewModel SelectedShift { get; set; }
-
-}

CompanyManagment.App.Contracts/Leave/GroupLeaveListDto.cs

@@ -1,88 +0,0 @@
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.Leave;
-
-public class GroupLeaveListDto
-{
-    /// <summary>
-    /// سال مرخصی
-    /// </summary>
-    public string YearStr { get; set; }
-
-    /// <summary>
-    /// ماه مرخصی
-    /// </summary>
-    public string MonthStr { get; set; }
-    /// <summary>
-    /// آیتم های هر گروه
-    /// </summary>
-    public List<LeaveListItemsDto> LeaveListItemsDto { get; set; }
-}
-
-/// <summary>
-/// آیتم های هر گروه
-/// </summary>
-public class LeaveListItemsDto
-{
-    /// <summary>
-    /// نوع مرخصی، استحقاقی/استعلاجی
-    /// </summary>
-    public string LeaveType { get; set; }
-
-
-    /// <summary>
-    /// تاریخ شروع مرخصی
-    /// </summary>
-    public string StartLeave { get; set; }
-
-    /// <summary>
-    /// تاریخ پایان مرخصی
-    /// </summary>
-    public string EndLeave { get; set; }
-
-
-    /// <summary>
-    /// زمان مرخصی
-    /// بازه مرخصی ساعتی
-    /// </summary>
-    public string HourlyInterval { get; set; }
-
-
-    /// <summary>
-    /// مدت مرخصی
-    /// </summary>
-    public string LeaveDuration { get; set; }
-
-    /// <summary>
-    /// موافقت/عدم موافقت  کارفرما
-    /// </summary>
-    public bool IsAccepted { get; set; }
-
-
-
-
-
-    /// <summary>
-    /// آی دی
-    /// </summary>
-    public long Id { get; set; }
-
-
-
-    /// <summary>
-    /// آی دی گارگاه
-    /// </summary>
-    public long WorkshopId { get; set; }
-
-    /// <summary>
-    /// آی دی پرسنل
-    /// </summary>
-    public long EmployeeId { get; set; }
-
-
-
-    /// <summary>
-    ///آیا فاقد اعتبار است. فاقد اعتبار ها فقط برای فیش های غیررسمی مورد استفاده قرار میگیرند 
-    /// </summary>
-    public bool IsInvalid { get; set; }
-}

CompanyManagment.App.Contracts/Leave/ILeaveApplication.cs

@@ -19,7 +19,6 @@ public interface ILeaveApplication
     GroupLeavePrintViewModel PrintPersonnelLeaveList(List<long> id);
 
 	OperationResult RemoveLeave(long id);
-    Task<OperationResult> RemoveLeaveAsync(long id);
     LeaveViewModel LeavOnChekout(DateTime starContract, DateTime endContract, long employeeId, long workshopId);
     List<LeaveMainViewModel> searchClient(LeaveSearchModel search);
 
@@ -37,117 +36,5 @@ public interface ILeaveApplication
     TimeSpan GetEmployeeLeaveTimeSpanInDates(long workshopId, long employeeId, string startFa, string endFa,
         string type);
 
-    #endregion
-
-
-    /// <summary>
-    /// دریافت لیست مرخصی ها در کلاینت
-    /// Api
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<PagedResult<leaveListDto>> GetList(
-        LeaveListSearchModel searchModel);
-
-    /// <summary>
-    /// دریافت لیست گروه بندی شده
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<List<GroupLeaveListDto>> GetGroupList(LeaveListSearchModel searchModel);
-
-    /// <summary>
-    /// دریافت مجکوع مرخصی پرسنل
-    /// اگر آی دی پرسنل، سال و ماه خالی نباشد
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <param name="employeeId"></param>
-    /// <param name="yearStr"></param>
-    /// <param name="monthStr"></param>
-    /// <param name="leaveType"></param>
-    /// <returns></returns>
-    TimeSpan SumOfEmployeeLeaveTimeSpanInDates(long workshopId, long employeeId, string yearStr, string monthStr,
-        LeaveType leaveType);
-
-    Task<List<LeavePrintResponseViewModel>> PrintAllAsync(List<long> ids, long workshopId);
-    Task<LeavePrintResponseViewModel> PrintOneAsync(long id, long workshopId);
-
-    /// <summary>
-    /// چک میکند که تاریخ وارد شده در شروع مرخصی تعطیل است یا خیر
-    /// دارای/فاقد اعتبار فیش غیررسمی را چک میکند
-    /// </summary>
-    /// <param name="startLeaveDate"></param>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    Task<OperationResult<CheckIsInvalidLeaveDto>> CheckIsInvalidLeave(string startLeaveDate, long workshopId);
-
-    /// <summary>
-    /// ایجاد مرخصی از ای پی آی
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    Task<OperationResult> CreateLeave(CreateLeaveDto command);
-
-    /// <summary>
-    /// چک میکند که آیا  پرسنل حضور غیاب دارای شیفت گردشی دارد یا خیر
-    /// اگر داشت دریافت شیف گردشی   
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <param name="employeeId"></param>
-    /// <param name="startLeaveDate"></param>
-    /// <returns></returns>
-    Task<OperationResult<RotatingShiftDto>> HasRotatingShift(long workshopId, long employeeId, string startLeaveDate);
-
-    /// <summary>
-    /// پرینت لیستی
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <returns></returns>
-    Task<LeaveListPrintDto> ListPrint(List<long> ids);
-
-
-    /// <summary>
-    /// محاسبه مدت مرخصی ساعتی
-    /// </summary>
-    /// <param name="startHours"></param>
-    /// <param name="endHours"></param>
-    /// <returns></returns>
-    Task<string> GetHourlyLeaveDuration(string startHours, string endHours);
-
-    /// <summary>
-    /// محاسبه مدت مرخصی روزانه
-    /// </summary>
-    /// <param name="startDate"></param>
-    /// <param name="endDate"></param>
-    /// <returns></returns>
-    Task<string> GetDailyLeaveDuration(string startDate, string endDate);
-
-}
-
-public class LeavePrintResponseViewModel
-{
-    public string FullName { get; set; }
-    public string NationalCode { get; set; }
-    public string WorkshopName { get; set; }
-    public List<string> EmployerNames { get; set; }
-    public string PaidLeaveType { get; set; }
-    public string ContractNo { get; set; }
-    public LeavePrintHourlyResponseViewModel HourlyLeave { get; set; }
-    public LeavePrintDailyResponseViewModel DailyLeave { get; set; }
-    
-}
-
-public class LeavePrintDailyResponseViewModel
-{
-    public string StartLeave { get; set; }
-    public string EndLeave { get; set; }
-    public string TotalDay { get; set; }
-}
-
-public class LeavePrintHourlyResponseViewModel
-{
-    public string LeaveDate { get; set; }
-    public string StartHour { get; set; }
-    public string EndHour { get; set; }
-    public string TotalHour { get; set; }
+	#endregion
 }

CompanyManagment.App.Contracts/Leave/LeaveListMultipleDto.cs

@@ -1,24 +0,0 @@
-using _0_Framework.Application;
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.Leave;
-
-public class LeaveListMultipleDto
-{
-    /// <summary>
-    /// لیست گروهبندی شده بر اساس سال و ماه
-    /// اگر در جستجو پرسنل انتخاب شود
-    /// </summary>
-    public List<GroupLeaveListDto>? GroupLeaveListDto { get; set; }
-
-    /// <summary>
-    /// لیست نرمال PageResult
-    /// </summary>
-    public PagedResult<leaveListDto>? leaveListDto { get; set; }
-
-    /// <summary>
-    /// مجموع مرخصی پرسنل
-    /// اگر پرسنل انتخاب شده باشد
-    /// </summary>
-    public string? SumOfEmployeeleaves { get; set; }
-}

CompanyManagment.App.Contracts/Leave/LeaveListPrintDto.cs

@@ -1,77 +0,0 @@
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.Leave;
-
-/// <summary>
-/// پرینت لیستی
-/// api
-/// </summary>
-public class LeaveListPrintDto
-{
-
-    /// <summary>
-    /// نام کامل پرسنل
-    /// </summary>
-    public string EmployeeFullName { get; set; }
-
-    /// <summary>
-    /// مجموع مرخصی پرسنل
-    /// </summary>
-    public string? SumOfEmployeeleaves { get; set; }
-
-    /// <summary>
-    /// لیست مرخصی
-    /// </summary>
-    public List<LeavePrintListItemsDto> LeavePrintListItemsDto { get; set; }
-
-
-}
-
-public class LeavePrintListItemsDto
-{
-    /// <summary>
-    /// سال مرخصی
-    /// </summary>
-    public string YearStr { get; set; }
-
-    /// <summary>
-    /// ماه مرخصی
-    /// </summary>
-    public string MonthStr { get; set; }
-
-
-    /// <summary>
-    /// نوع مرخصی، استحقاقی/استعلاجی
-    /// </summary>
-    public string LeaveType { get; set; }
-
-
-    /// <summary>
-    /// تاریخ شروع مرخصی
-    /// </summary>
-    public string StartLeave { get; set; }
-
-    /// <summary>
-    /// تاریخ پایان مرخصی
-    /// </summary>
-    public string EndLeave { get; set; }
-
-
-    /// <summary>
-    /// زمان مرخصی
-    /// بازه مرخصی ساعتی
-    /// </summary>
-    public string HourlyInterval { get; set; }
-
-
-    /// <summary>
-    /// مدت مرخصی
-    /// </summary>
-    public string LeaveDuration { get; set; }
-
-    /// <summary>
-    /// موافقت/عدم موافقت  کارفرما
-    /// </summary>
-    public bool IsAccepted { get; set; }
-
-}

CompanyManagment.App.Contracts/Leave/LeaveListSearchModel.cs

@@ -1,45 +0,0 @@
-using _0_Framework.Application;
-
-namespace CompanyManagment.App.Contracts.Leave;
-
-public class LeaveListSearchModel : PaginationRequest
-{
-    /// <summary>
-    /// آی دی کارگاه
-    /// </summary>
-    public long WorkshopId { get; set; }
-    /// <summary>
-    /// نوع مرخصی، استحقاقی/استعلاجی
-    /// </summary>
-    public LeaveType LeaveType { get; set; }
-
-    /// <summary>
-    /// سال مرخصی
-    /// </summary>
-    public string YearStr { get; set; }
-
-    /// <summary>
-    /// ماه مرخصی
-    /// </summary>
-    public string MonthStr { get; set; }
-
-    /// <summary>
-    ///آیا فاقد اعتبار است. فاقد اعتبار ها فقط برای فیش های غیررسمی مورد استفاده قرار میگیرند 
-    /// </summary>
-    public bool IsInvalid { get; private set; }
-
-    /// <summary>
-    /// تاریخ شروع مرخصی
-    /// </summary>
-    public string StartLeave { get; set; }
-
-    /// <summary>
-    /// تاریخ پایان مرخصی
-    /// </summary>
-    public string EndLeave { get; set; }
-
-    /// <summary>
-    /// آی دی پرسنل
-    /// </summary>
-    public long EmployeeId { get; set; }
-}

CompanyManagment.App.Contracts/Leave/LeaveType.cs

@@ -1,18 +0,0 @@
-namespace CompanyManagment.App.Contracts.Leave;
-
-public enum LeaveType
-{
-    /// <summary>
-    /// هر دو
-    /// </summary>
-    Both,
-    /// <summary>
-    /// مرخصی استعلاجی
-    /// </summary>
-    SickLeave,
-
-    /// <summary>
-    /// مرخصی استحقاقی
-    /// </summary>
-    PaidLeave
-}

CompanyManagment.App.Contracts/Leave/PaidLeaveType.cs

@@ -1,17 +0,0 @@
-namespace CompanyManagment.App.Contracts.Leave;
-
-/// <summary>
-/// نوع مدت مرخصی
-/// </summary>
-public enum PaidLeaveType
-{
-    /// <summary>
-    /// روزانه
-    /// </summary>
-    Daily,
-
-    /// <summary>
-    /// ساعتی
-    /// </summary>
-    Hourly,
-}

CompanyManagment.App.Contracts/Leave/RotatingShiftDto.cs

@@ -1,17 +0,0 @@
-using CompanyManagment.App.Contracts.CustomizeWorkshopSettings;
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.Leave;
-
-public class RotatingShiftDto
-{
-    /// <summary>
-    /// آیا حضورغیاب به همراه گروهبندی گردشی دارد
-    /// </summary>
-    public bool HasRollCall {get; set;}
-
-    /// <summary>
-    /// لیست شیفت های گردشی پرسنل
-    /// </summary>
-    public List<CustomizeRotatingShiftsViewModel> RotatingShifts { get; set; }
-}