feat: add GetEmployeeClientList API to retrieve employee client data

.github/workflows/dotnet-developPublish.yml

@@ -37,7 +37,7 @@ jobs:
         & "C:\Program Files\IIS\Microsoft Web Deploy V3\msdeploy.exe" `
           -verb:sync `
           -source:contentPath="$publishFolder" `
-          -dest:contentPath="dadmehrg",computerName="https://171.22.24.15:8172/msdeploy.axd?site=dadmehrg",userName="Administrator",password="R",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
 

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,8 +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,8 +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/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

@@ -37,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,7 +73,6 @@ public interface IInsuranceListRepository:IRepository<long, InsuranceList>
     Task<InsuranceListConfirmOperation> GetInsuranceOperationDetails(long id);
 
 	Task<InsuranceListTabsCountViewModel> GetTabCounts(InsuranceListSearchModel searchModel);
-	Task<PagedResult<InsuranceClientListViewModel>> GetInsuranceClientList(InsuranceClientSearchModel searchModel);
 
 	#endregion
 

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

@@ -90,27 +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);
-}
-
-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; }
 }

CompanyManagment.App.Contracts/RollCall/IRollCallApplication.cs

@@ -124,7 +124,7 @@ namespace CompanyManagment.App.Contracts.RollCall
         /// <param name="workshopId"></param>
         /// <param name="command"></param>
         /// <returns></returns>
-        Task<OperationResult> RecalculateValues(long workshopId, List<ReCalculateRollCallValues> command);
+        OperationResult RecalculateValues(long workshopId, List<ReCalculateRollCallValues> command);
     }
     public class ReCalculateRollCallValues
     {

CompanyManagment.App.Contracts/RollCallEmployee/IRollCallEmployeeApplication.cs

@@ -1,7 +1,6 @@
 using _0_Framework.Application;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace CompanyManagment.App.Contracts.RollCallEmployee;
 

CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs

@@ -25,7 +25,6 @@ using Microsoft.EntityFrameworkCore.Query;
 using Company.Domain.CheckoutAgg;
 using Company.Domain.CustomizeCheckoutAgg;
 using Company.Domain.CustomizeCheckoutTempAgg;
-using Company.Domain.RollCallAgg;
 using CompanyManagment.EFCore.Repository;
 
 
@@ -39,8 +38,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 	IRollCallApplication rollCallAppllication,
 	ICheckoutRepository checkoutRepository,
 	ICustomizeCheckoutRepository customizeCheckoutRepository,
-	ICustomizeCheckoutTempRepository customizeCheckoutTempRepository,
-	IRollCallRepository rollCallRepository)
+	ICustomizeCheckoutTempRepository customizeCheckoutTempRepository)
 	: ICustomizeWorkshopSettingsApplication
 {
 	private readonly ICustomizeWorkshopSettingsRepository _customizeWorkshopSettingsRepository = customizeWorkshopSettingsRepository;
@@ -55,7 +53,6 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 	private readonly ICheckoutRepository _checkoutRepository = checkoutRepository;
 	private readonly ICustomizeCheckoutRepository _customizeCheckoutRepository = customizeCheckoutRepository;
 	private readonly ICustomizeCheckoutTempRepository _customizeCheckoutTempRepository = customizeCheckoutTempRepository;
-	private readonly IRollCallRepository _rollCallRepository = rollCallRepository;
 
 	#region RollCallShifts
 
@@ -825,19 +822,14 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 
 		var notSelectedEmployeeSettings = employeeSettings.Where(x => !selectedEmployeesIds.Contains(x.EmployeeId));
 
-		var weeklyOffDays = command.OffDayOfWeeks?
-			.Select(x => new WeeklyOffDay(x)).ToList() ?? [];
-
-		using var rollCallTransaction = _rollCallRepository.BeginTransactionAsync()
-			.GetAwaiter().GetResult();
+		var weeklyOffDays = command.OffDayOfWeeks?.Select(x => new WeeklyOffDay(x)).ToList() ?? [];
+		using var transaction = new TransactionScope();
 
 		entity.EditSimpleAndOverwriteOnEmployee(command.Name, selectedEmployeesIds, groupSettingsShifts, command.WorkshopShiftStatus,
 			command.IrregularShift, breakTime, isChanged, command.HolidayWork, rotatingShift, weeklyOffDays);
 		if (reCalculateCommand.Count > 0)
 		{
-			var result = _rollCallApplication
-				.RecalculateValues(workshopSettings.WorkshopId, reCalculateCommand)
-				.GetAwaiter().GetResult();
+			var result = _rollCallApplication.RecalculateValues(workshopSettings.WorkshopId, reCalculateCommand);
 
 			if (result.IsSuccedded == false)
 			{
@@ -852,7 +844,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 
 		_customizeWorkshopGroupSettingsRepository.SaveChanges();
 
-		rollCallTransaction.Commit();
+		transaction.Complete();
 		return op.Succcedded();
 	}
 	public OperationResult EditSimpleRollCallEmployeeSetting(EditCustomizeEmployeeSettings command,
@@ -1051,9 +1043,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 		_customizeWorkshopGroupSettingsRepository.SaveChanges();
 		if (reCalculateCommand.Count > 0)
 		{
-			var result = _rollCallApplication
-				.RecalculateValues(command.WorkshopId, reCalculateCommand)
-				.GetAwaiter().GetResult();
+			var result = _rollCallApplication.RecalculateValues(command.WorkshopId, reCalculateCommand);
 
 			if (result.IsSuccedded == false)
 			{

CompanyManagment.Application/EmployeeAplication.cs

@@ -64,33 +64,49 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
     private readonly ILeftWorkInsuranceRepository _leftWorkInsuranceRepository;
     private readonly IFaceEmbeddingService _faceEmbeddingService;
 
-	public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context, IWorkshopRepository workShopRepository, IWebHostEnvironment webHostEnvironment, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, IRollCallEmployeeRepository rollCallEmployeeRepository, ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication, IEmployeeDocumentsApplication employeeDocumentsApplication, IEmployeeDocumentsRepository employeeDocumentsRepository, IEmployeeBankInformationApplication employeeBankInformationApplication, ILeftWorkTempRepository leftWorkTempRepository, IUidService uidService, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository, IPersonnelCodeRepository personnelCodeRepository, IEmployeeClientTempRepository employeeClientTempRepository, ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository, ILeftWorkRepository leftWorkRepository, IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository, ILeftWorkInsuranceRepository leftWorkInsuranceRepository, IFaceEmbeddingService faceEmbeddingService) : base(context)
-	{
-		_context = context;
-		_WorkShopRepository = workShopRepository;
-		_webHostEnvironment = webHostEnvironment;
-		_rollCallEmployeeStatusApplication = rollCallEmployeeStatusApplication;
-		_rollCallEmployeeRepository = rollCallEmployeeRepository;
-		_customizeWorkshopSettingsApplication = customizeWorkshopSettingsApplication;
-		_employeeDocumentsApplication = employeeDocumentsApplication;
-		_employeeBankInformationApplication = employeeBankInformationApplication;
-		_leftWorkTempRepository = leftWorkTempRepository;
-		_uidService = uidService;
-		_customizeWorkshopEmployeeSettingsRepository = customizeWorkshopEmployeeSettingsRepository;
-		_personnelCodeRepository = personnelCodeRepository;
-		_employeeClientTempRepository = employeeClientTempRepository;
-		_leftWorkRepository = leftWorkRepository;
-		_employeeAuthorizeTempRepository = employeeAuthorizeTempRepository;
-		_leftWorkInsuranceRepository = leftWorkInsuranceRepository;
-		_EmployeeRepository = employeeRepository;
-		_faceEmbeddingService = faceEmbeddingService;
-	}
+    public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context,
+        IWorkshopRepository workShopRepository, IWebHostEnvironment webHostEnvironment,
+        IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication,
+        IRollCallEmployeeRepository rollCallEmployeeRepository,
+        ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication,
+        IEmployeeDocumentsApplication employeeDocumentsApplication,
+        IEmployeeDocumentsRepository employeeDocumentsRepository,
+        IEmployeeBankInformationApplication employeeBankInformationApplication,
+        ILeftWorkTempRepository leftWorkTempRepository, IUidService uidService,
+        ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository,
+        IPersonnelCodeRepository personnelCodeRepository, IEmployeeClientTempRepository employeeClientTempRepository,
+        ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository,
+        ILeftWorkRepository leftWorkRepository, IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository,
+        ILeftWorkInsuranceRepository leftWorkInsuranceRepository,
+        IFaceEmbeddingService faceEmbeddingService) : base(context)
+    {
+        _context = context;
+        _WorkShopRepository = workShopRepository;
+        _webHostEnvironment = webHostEnvironment;
+        _rollCallEmployeeStatusApplication = rollCallEmployeeStatusApplication;
+        _rollCallEmployeeRepository = rollCallEmployeeRepository;
+        _customizeWorkshopSettingsApplication = customizeWorkshopSettingsApplication;
+        _employeeDocumentsApplication = employeeDocumentsApplication;
+        _employeeBankInformationApplication = employeeBankInformationApplication;
+        _leftWorkTempRepository = leftWorkTempRepository;
+        _uidService = uidService;
+        _customizeWorkshopEmployeeSettingsRepository = customizeWorkshopEmployeeSettingsRepository;
+        _personnelCodeRepository = personnelCodeRepository;
+        _employeeClientTempRepository = employeeClientTempRepository;
+        _leftWorkRepository = leftWorkRepository;
+        _employeeAuthorizeTempRepository = employeeAuthorizeTempRepository;
+        _leftWorkInsuranceRepository = leftWorkInsuranceRepository;
+        _EmployeeRepository = employeeRepository;
+        _faceEmbeddingService = faceEmbeddingService;
+    }
 
-	public OperationResult Create(CreateEmployee command)
+    public OperationResult Create(CreateEmployee command)
     {
         var opration = new OperationResult();
         if (_EmployeeRepository.Exists(x =>
-                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.NationalCode != null && x.IsActiveString == "true"))
+                x.LName == command.LName && x.NationalCode == command.NationalCode &&
+                !string.IsNullOrWhiteSpace(command.NationalCode) && x.NationalCode != null &&
+                x.IsActiveString == "true"))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
 
         //if (_EmployeeRepository.Exists(x => x.IdNumber == command.IdNumber && x.IdNumber !=null))
@@ -182,13 +198,13 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 else
                 {
 
-                   
-                   
-                        nationalCodValid = false;
-                        return opration.Failed("کد ملی وارد شده نا معتبر است");
-                    
-                    
-                   
+
+
+                    nationalCodValid = false;
+                    return opration.Failed("کد ملی وارد شده نا معتبر است");
+
+
+
                 }
             }
             catch (Exception)
@@ -198,6 +214,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 return opration.Failed("لطفا کد ملی 10 رقمی وارد کنید");
 
             }
+
             if (_EmployeeRepository.Exists(x => x.NationalCode == command.NationalCode))
             {
                 nationalcodeIsOk = false;
@@ -210,24 +227,31 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
 
         string initial = "1300/10/11";
-        var dateOfBirth = command.DateOfBirth != null ? command.DateOfBirth.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
-        var dateOfIssue = command.DateOfIssue != null ? command.DateOfIssue.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
+        var dateOfBirth = command.DateOfBirth != null
+            ? command.DateOfBirth.ToGeorgianDateTime()
+            : initial.ToGeorgianDateTime();
+        var dateOfIssue = command.DateOfIssue != null
+            ? command.DateOfIssue.ToGeorgianDateTime()
+            : initial.ToGeorgianDateTime();
 
 
         var employeeData = new Employee(command.FName, command.LName, command.FatherName, dateOfBirth,
             dateOfIssue,
-            command.PlaceOfIssue, command.NationalCode, command.IdNumber, command.Gender, command.Nationality, command.IdNumberSerial, command.IdNumberSeri,
+            command.PlaceOfIssue, command.NationalCode, command.IdNumber, command.Gender, command.Nationality,
+            command.IdNumberSerial, command.IdNumberSeri,
             command.Phone, command.Address,
             command.State, command.City, command.MaritalStatus, command.MilitaryService, command.LevelOfEducation,
             command.FieldOfStudy, command.BankCardNumber,
             command.BankBranch, command.InsuranceCode, command.InsuranceHistoryByYear,
-            command.InsuranceHistoryByMonth, command.NumberOfChildren, command.OfficePhone, command.MclsUserName, command.MclsPassword, command.EserviceUserName, command.EservicePassword,
+            command.InsuranceHistoryByMonth, command.NumberOfChildren, command.OfficePhone, command.MclsUserName,
+            command.MclsPassword, command.EserviceUserName, command.EservicePassword,
             command.TaxOfficeUserName, command.TaxOfficepassword, command.SanaUserName, command.SanaPassword);
 
         if (command.IsAuthorized)
         {
             employeeData.Authorized();
         }
+
         _EmployeeRepository.Create(employeeData);
         _EmployeeRepository.SaveChanges();
 
@@ -244,7 +268,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             return opration.Failed("رکورد مورد نظر یافت نشد");
 
         if (_EmployeeRepository.Exists(x =>
-                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.id != command.Id && x.IsActiveString == "true"))
+                x.LName == command.LName && x.NationalCode == command.NationalCode &&
+                !string.IsNullOrWhiteSpace(command.NationalCode) && x.id != command.Id && x.IsActiveString == "true"))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
         //if (_EmployeeRepository.Exists(x => x.IdNumber == command.IdNumber && x.IdNumber != null && x.id != command.Id))
         //    return opration.Failed("شماره شناسنامه وارد شده تکراری است");
@@ -339,6 +364,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 return opration.Failed("لطفا کد ملی 10 رقمی وارد کنید");
 
             }
+
             if (_EmployeeRepository.Exists(x => x.NationalCode == command.NationalCode && x.id != command.Id))
             {
                 nationalcodeIsOk = false;
@@ -349,8 +375,12 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
 
         string initial = "1300/10/11";
-        var dateOfBirth = command.DateOfBirth != null ? command.DateOfBirth.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
-        var dateOfIssue = command.DateOfIssue != null ? command.DateOfIssue.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
+        var dateOfBirth = command.DateOfBirth != null
+            ? command.DateOfBirth.ToGeorgianDateTime()
+            : initial.ToGeorgianDateTime();
+        var dateOfIssue = command.DateOfIssue != null
+            ? command.DateOfIssue.ToGeorgianDateTime()
+            : initial.ToGeorgianDateTime();
         employee.Edit(command.FName, command.LName, command.FatherName, dateOfBirth,
             dateOfIssue,
             command.PlaceOfIssue, command.NationalCode, command.IdNumber, command.Gender, command.Nationality,
@@ -435,7 +465,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
     {
         var opration = new OperationResult();
 
-        var employeeData = new EmployeeInsuranceRecord(command.EmployeeId, command.WorkShopId, command.DateOfStart, command.DateOfEnd);
+        var employeeData = new EmployeeInsuranceRecord(command.EmployeeId, command.WorkShopId, command.DateOfStart,
+            command.DateOfEnd);
 
         _EmployeeRepository.CreateEmployeeInsuranceRecord(employeeData);
         _EmployeeRepository.SaveChanges();
@@ -444,6 +475,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
 
     }
+
     public OperationResult EditEmployeeInsuranceRecord(EditEmployeeInsuranceRecord command)
     {
         var opration = new OperationResult();
@@ -455,6 +487,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
 
     }
+
     public void RemoveEmployeeInsuranceRecord(long Id)
     {
         _EmployeeRepository.RemoveEmployeeInsuranceRecord(Id);
@@ -468,12 +501,14 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             return opration.Failed("خطا در انتخاب کارگاه");
 
         }
+
         var ws = _WorkShopRepository.GetDetails(eir.WorkShopId);
         if (string.IsNullOrWhiteSpace(eir.DateOfStart))
         {
             return opration.Failed("تاریخ شروع نمی تواند خالی باشد - " + ws.WorkshopFullName);
 
         }
+
         if (!string.IsNullOrWhiteSpace(eir.DateOfEnd))
         {
             if (eir.DateOfEnd.ToGeorgianDateTime() < eir.DateOfStart.ToGeorgianDateTime())
@@ -490,6 +525,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         return opration.Succcedded();
     }
+
     public OperationResult ValidationEmployeeInsuranceRecord(List<CreateEmployeeInsuranceRecord> eir_lst)
     {
         var opration = new OperationResult();
@@ -509,16 +545,19 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                     {
                         return opration.Failed("خطا در تداخل تاریخ - " + wshop.WorkshopFullName);
                     }
+
                 if (string.IsNullOrEmpty(q[i].DateOfEnd.ToString()))
                 {
                     count++;
                 }
             }
+
             if (count > 1)
             {
                 return opration.Failed("تاریخ ترک کار را وارد نمایید ");
             }
         }
+
         return opration.Succcedded();
 
 
@@ -532,11 +571,13 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         {
             return opration.Failed("خطا در انتخاب پرسنل");
         }
+
         var employee = _EmployeeRepository.GetDetails(employeeId);
         if (string.IsNullOrWhiteSpace(employee.FName))
         {
             error += "(نام)" + Environment.NewLine;
         }
+
         if (string.IsNullOrWhiteSpace(employee.LName))
         {
             error += "(نام خانوادگی)" + Environment.NewLine;
@@ -546,22 +587,27 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         {
             error += "(کد ملی)" + Environment.NewLine;
         }
+
         if (string.IsNullOrWhiteSpace(employee.PlaceOfIssue))
         {
             error += "(شهر محل تولد)" + Environment.NewLine;
         }
+
         if (string.IsNullOrWhiteSpace(employee.DateOfBirth))
         {
             error += "(تاریخ تولد)" + Environment.NewLine;
         }
+
         if (string.IsNullOrWhiteSpace(employee.IdNumber))
         {
             error += "(شماره شناسنامه)" + Environment.NewLine;
         }
+
         if (string.IsNullOrWhiteSpace(employee.InsuranceCode))
         {
             error += "(شماره بیمه)" + Environment.NewLine;
         }
+
         if (!string.IsNullOrWhiteSpace(error))
         {
             var note = "آیتم های زیر برای ثبت سابقه الزامی می باشد" + Environment.NewLine + error;
@@ -610,7 +656,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 InsuranceCode = x.InsuranceCode,
                 IsActiveString = x.IsActiveString,
                 IsActive = x.IsActive,
-                PersonnelCode = _context.PersonnelCodeSet.FirstOrDefault(p => p.EmployeeId == x.Id && p.WorkshopId == searchModel.WorkshopId)?.PersonnelCode
+                PersonnelCode = _context.PersonnelCodeSet
+                    .FirstOrDefault(p => p.EmployeeId == x.Id && p.WorkshopId == searchModel.WorkshopId)?.PersonnelCode
             }).ToList();
             //w2.Stop();
             //Console.WriteLine("efore :" + w2.ElapsedMilliseconds);
@@ -619,6 +666,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         {
 
         }
+
         return res;
     }
 
@@ -663,6 +711,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             if (_EmployeeRepository.ExistsEmployeeWorkshopNationalCode(command.NationalCode, command.WorkshopId))
                 return opration.Failed("کد ملی وارد شده تکراری است");
         }
+
         if (_EmployeeRepository.Exists(x => x.InsuranceCode == command.InsuranceCode && x.InsuranceCode != null))
         {
             if (_EmployeeRepository.ExistsEmployeeWorkshoppInsuranceCode(command.InsuranceCode, command.WorkshopId))
@@ -789,13 +838,17 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         if (_EmployeeRepository.Exists(x => x.NationalCode == command.NationalCode && x.id != command.Id))
         {
             nationalcodeIsOk = false;
-            if (_EmployeeRepository.ExistsEmployeeWorkshopNationalCodeEmployeeId(command.NationalCode, command.WorkshopId, command.Id))
+            if (_EmployeeRepository.ExistsEmployeeWorkshopNationalCodeEmployeeId(command.NationalCode,
+                    command.WorkshopId, command.Id))
                 return opration.Failed("کد ملی وارد شده تکراری است");
         }
-        if (!string.IsNullOrEmpty(command.InsuranceCode) && _EmployeeRepository.Exists(x => x.InsuranceCode == command.InsuranceCode && x.id != command.Id))
+
+        if (!string.IsNullOrEmpty(command.InsuranceCode) &&
+            _EmployeeRepository.Exists(x => x.InsuranceCode == command.InsuranceCode && x.id != command.Id))
         {
             nationalcodeIsOk = false;
-            if (_EmployeeRepository.ExistsEmployeeWorkshopInsuranceCodeEmployeeId(command.InsuranceCode, command.WorkshopId, command.Id))
+            if (_EmployeeRepository.ExistsEmployeeWorkshopInsuranceCodeEmployeeId(command.InsuranceCode,
+                    command.WorkshopId, command.Id))
                 return opration.Failed("کد بیمه وارد شده تکراری است");
         }
 
@@ -877,8 +930,12 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
 
         string initial = "1300/10/11";
-        var dateOfBirth = command.DateOfBirth != null ? command.DateOfBirth.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
-        var dateOfIssue = command.DateOfIssue != null ? command.DateOfIssue.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
+        var dateOfBirth = command.DateOfBirth != null
+            ? command.DateOfBirth.ToGeorgianDateTime()
+            : initial.ToGeorgianDateTime();
+        var dateOfIssue = command.DateOfIssue != null
+            ? command.DateOfIssue.ToGeorgianDateTime()
+            : initial.ToGeorgianDateTime();
         employee.Edit(command.FName, command.LName, command.FatherName, dateOfBirth,
             dateOfIssue,
             command.PlaceOfIssue, command.NationalCode, command.IdNumber, command.Gender, command.Nationality,
@@ -898,14 +955,17 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
 
     }
+
     public EditEmployee GetDetailsForClient(long id, long workshopId)
     {
         var employee = _EmployeeRepository.GetDetails(id);
-        employee.PersonelCode = _context.PersonnelCodeSet.FirstOrDefault(p => p.EmployeeId == id && p.WorkshopId == workshopId)?.PersonnelCode;
+        employee.PersonelCode = _context.PersonnelCodeSet
+            .FirstOrDefault(p => p.EmployeeId == id && p.WorkshopId == workshopId)?.PersonnelCode;
         return employee;
     }
 
     #region NewByHeydari
+
     public List<EmployeeViewModel> SearchForMain(EmployeeSearchModel searchModel)
     {
         var res = _EmployeeRepository.SearchForMain(searchModel);
@@ -917,6 +977,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         return res;
     }
+
     #endregion
 
 
@@ -926,7 +987,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
     {
         if (nationalCode.NationalCodeValid() != "valid")
             return new();
-        var workshopEmployeesWithLeftWork = _EmployeeRepository.GetWorkingEmployeesByWorkshopIdsAndNationalCodeAndDate(workshopIds, nationalCode, DateTime.Now.Date);
+        var workshopEmployeesWithLeftWork =
+            _EmployeeRepository.GetWorkingEmployeesByWorkshopIdsAndNationalCodeAndDate(workshopIds, nationalCode,
+                DateTime.Now.Date);
         return workshopEmployeesWithLeftWork.FirstOrDefault();
     }
 
@@ -934,9 +997,12 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
     {
         if (nationalCode.NationalCodeValid() != "valid")
             return new();
-        var workshopEmployeesWithLeftWork = _EmployeeRepository.GetWorkedEmployeesByWorkshopIdsAndNationalCodeAndDate(workshopIds, nationalCode, DateTime.Now.Date);
+        var workshopEmployeesWithLeftWork =
+            _EmployeeRepository.GetWorkedEmployeesByWorkshopIdsAndNationalCodeAndDate(workshopIds, nationalCode,
+                DateTime.Now.Date);
         return workshopEmployeesWithLeftWork.FirstOrDefault();
     }
+
     public List<EmployeeViewModel> GetWorkingEmployeesByWorkshopId(long workshopId)
     {
         return _EmployeeRepository.GetWorkingEmployeesByWorkshopId(workshopId);
@@ -980,6 +1046,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
     #endregion
 
     #region Mahan
+
     public OperationResult CreateEmployeeByClient(CreateEmployeeByClient command)
     {
         OperationResult op = new();
@@ -1028,20 +1095,23 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             _EmployeeRepository.SaveChanges();
 
         }
+
         if (employee == null)
         {
             return op.Failed("خطای سیستمی. لطفا دوباره تلاش کنید . درصورت تکرار این مشکل با تیم پشتیبان تماس بگیرید");
         }
 
         if (_leftWorkTempRepository.Exists(x =>
-                x.EmployeeId == employee.id && x.WorkshopId == command.WorkshopId && x.LeftWorkType == LeftWorkTempType.StartWork))
+                x.EmployeeId == employee.id && x.WorkshopId == command.WorkshopId &&
+                x.LeftWorkType == LeftWorkTempType.StartWork))
         {
             return op.Failed("این پرسنل در کارگاه شما قبلا افزوده شده است و در انتظار تایید میباشد");
         }
 
         var startLeftWork = command.StartLeftWork.ToGeorgianDateTime();
 
-        var leftWorkViewModel = _leftWorkRepository.GetLastLeftWorkByEmployeeIdAndWorkshopId(command.WorkshopId, employee.id);
+        var leftWorkViewModel =
+            _leftWorkRepository.GetLastLeftWorkByEmployeeIdAndWorkshopId(command.WorkshopId, employee.id);
 
 
         PersonnelCodeDomain personnelCode = null;
@@ -1125,8 +1195,10 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 rollCallEmployee.HasImage();
                 _rollCallEmployeeRepository.Create(rollCallEmployee);
                 _rollCallEmployeeRepository.SaveChanges();
-				string employeeFullName = employee.FName + " " + employee.LName;
-				var res = _faceEmbeddingService.GenerateEmbeddingsAsync(employee.id,command.WorkshopId,employeeFullName, filePath1,filePath2).GetAwaiter().GetResult();
+                string employeeFullName = employee.FName + " " + employee.LName;
+                var res = _faceEmbeddingService
+                    .GenerateEmbeddingsAsync(employee.id, command.WorkshopId, employeeFullName, filePath1, filePath2)
+                    .GetAwaiter().GetResult();
                 if (!res.IsSuccedded)
                 {
                     return op.Failed(res.Message);
@@ -1212,7 +1284,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         command.EmployeeDocumentItems = command.EmployeeDocumentItems ?? [];
 
-        var employeeDocumentResult = _employeeDocumentsApplication.AddRangeEmployeeDocumentItemsByClient(command.WorkshopId,
+        var employeeDocumentResult = _employeeDocumentsApplication.AddRangeEmployeeDocumentItemsByClient(
+            command.WorkshopId,
             employee.id, command.EmployeeDocumentItems);
 
         if (employeeDocumentResult.IsSuccedded == false)
@@ -1262,8 +1335,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         byte[] bytes = Convert.FromBase64String(subBase64);
         System.IO.File.WriteAllBytes(filePath, bytes);
     }
+
     public async Task<OperationResult<EmployeeByNationalCodeInWorkshopViewModel>>
-        ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(string nationalCode, string birthDate,bool authorizedCanceled, long workshopId)
+        ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(string nationalCode, string birthDate, long workshopId)
     {
         var op = new OperationResult<EmployeeByNationalCodeInWorkshopViewModel>();
 
@@ -1279,25 +1353,71 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         var employee = _EmployeeRepository.GetByNationalCodeIgnoreQueryFilter(nationalCode);
 
-        if (employee == null && !authorizedCanceled)
+        if (employee == null)
         {
             var personalInfo = await _uidService.GetPersonalInfo(nationalCode, birthDate);
-            if (personalInfo != null)
+
+            if (personalInfo.ResponseContext.Status.Code == 14)
             {
-                if (personalInfo.ResponseContext.Status.Code == 14)
-                {
-                    return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید", new EmployeeByNationalCodeInWorkshopViewModel() { AuthorizedCanceled = true });
-                }
-                if (personalInfo.ResponseContext.Status.Code != 0)
-                {
-                    return op.Failed("کد ملی و تاریخ تولد با هم همخانی ندارند");
-                }
+                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید",
+                    new EmployeeByNationalCodeInWorkshopViewModel() { AuthorizedCanceled = true });
+            }
 
-                var basicInfo = personalInfo.BasicInformation;
-                var identityInfo = personalInfo.IdentificationInformation;
-                DateTime apiBirthDate = identityInfo.BirthDate.ToGeorgianDateTime();
+            if (personalInfo.ResponseContext.Status.Code != 0)
+            {
+                return op.Failed("کد ملی و تاریخ تولد با هم همخانی ندارند");
+            }
 
-                var dateOfIssue = new DateTime(1922, 1, 1);
+            var basicInfo = personalInfo.BasicInformation;
+            var identityInfo = personalInfo.IdentificationInformation;
+            DateTime apiBirthDate = identityInfo.BirthDate.ToGeorgianDateTime();
+
+            var dateOfIssue = new DateTime(1922, 1, 1);
+
+            var gender = basicInfo.GenderEnum switch
+            {
+                Gender.Female => "زن",
+                Gender.Male => "مرد",
+                _ => throw new AggregateException()
+            };
+
+            var idNumber = identityInfo.ShenasnamehNumber == "0"
+                ? identityInfo.NationalId
+                : identityInfo.ShenasnamehNumber;
+
+            var newEmployee = new Employee(basicInfo.FirstName, basicInfo.LastName, basicInfo.FatherName, apiBirthDate,
+                dateOfIssue, null, identityInfo.NationalId, idNumber, gender, "ایرانی", identityInfo.ShenasnameSerial,
+                identityInfo.ShenasnameSeri);
+            newEmployee.Authorized();
+            await _EmployeeRepository.CreateAsync(newEmployee);
+            await _EmployeeRepository.SaveChangesAsync();
+
+            return op.Succcedded(new EmployeeByNationalCodeInWorkshopViewModel()
+            {
+                EmployeeId = newEmployee.id,
+                EmployeeFName = newEmployee.FName,
+                Gender = newEmployee.Gender,
+                Nationality = newEmployee.Nationality,
+                EmployeeLName = newEmployee.LName
+            });
+        }
+
+        if (_leftWorkTempRepository.ExistsIgnoreQueryFilter(x =>
+                x.EmployeeId == employee.id && x.WorkshopId == workshopId &&
+                x.LeftWorkType == LeftWorkTempType.StartWork))
+        {
+            return op.Failed("این پرسنل در کارگاه شما قبلا افزوده شده است و در انتظار تایید میباشد");
+        }
+
+        if (employee.IsAuthorized == false)
+        {
+            var personalInfoResponse = await _uidService.GetPersonalInfo(nationalCode, birthDate);
+
+            if (personalInfoResponse.ResponseContext.Status.Code == 0)
+            {
+                var basicInfo = personalInfoResponse.BasicInformation;
+                var identityInfo = personalInfoResponse.IdentificationInformation;
+                var apiBirthDate = identityInfo.BirthDate.ToGeorgianDateTime();
 
                 var gender = basicInfo.GenderEnum switch
                 {
@@ -1306,92 +1426,36 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                     _ => throw new AggregateException()
                 };
 
-                var idNumber = identityInfo.ShenasnamehNumber == "0" ? identityInfo.NationalId : identityInfo.ShenasnamehNumber;
+                var idNumber = identityInfo.ShenasnamehNumber == "0"
+                    ? identityInfo.NationalId
+                    : identityInfo.ShenasnamehNumber;
+
+
+                employee.Edit(basicInfo.FirstName, basicInfo.LastName, basicInfo.FatherName, apiBirthDate,
+                    employee.DateOfIssue, employee.PlaceOfIssue, identityInfo.NationalId, idNumber,
+                    gender, "ایرانی", employee.Phone, employee.Address, employee.State, employee.City,
+                    employee.MaritalStatus, employee.MilitaryService, employee.LevelOfEducation,
+                    employee.FieldOfStudy, employee.BankCardNumber, employee.BankBranch, employee.InsuranceCode,
+                    employee.InsuranceHistoryByYear,
+                    employee.InsuranceHistoryByMonth, employee.NumberOfChildren,
+                    employee.OfficePhone, employee.MclsUserName, employee.MclsPassword,
+                    employee.EserviceUserName, employee.EservicePassword, employee.TaxOfficeUserName,
+                    employee.TaxOfficepassword, employee.SanaUserName, employee.SanaPassword);
+
+                employee.Authorized();
 
-                var newEmployee = new Employee(basicInfo.FirstName, basicInfo.LastName, basicInfo.FatherName, apiBirthDate,
-                    dateOfIssue, null, identityInfo.NationalId, idNumber, gender, "ایرانی", identityInfo.ShenasnameSerial, identityInfo.ShenasnameSeri);
-                newEmployee.Authorized();
-                await _EmployeeRepository.CreateAsync(newEmployee);
                 await _EmployeeRepository.SaveChangesAsync();
 
-                return op.Succcedded(new EmployeeByNationalCodeInWorkshopViewModel()
-                {
-                    EmployeeId = newEmployee.id,
-                    EmployeeFName = newEmployee.FName,
-                    Gender = newEmployee.Gender,
-                    Nationality = newEmployee.Nationality,
-                    EmployeeLName = newEmployee.LName
-                });
             }
             else
-            {
-                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید", new EmployeeByNationalCodeInWorkshopViewModel() { AuthorizedCanceled = true });
-            }
-          
-           
-            
-        
-        }
-        else if (employee == null && authorizedCanceled)
-        {
-            return op.Succcedded(new EmployeeByNationalCodeInWorkshopViewModel());
-        }
-
-        if (_leftWorkTempRepository.ExistsIgnoreQueryFilter(x =>
-                x.EmployeeId == employee.id && x.WorkshopId == workshopId && x.LeftWorkType == LeftWorkTempType.StartWork))
-        {
-            return op.Failed("این پرسنل در کارگاه شما قبلا افزوده شده است و در انتظار تایید میباشد");
-        }
-
-        var personalInfoResponse = await _uidService.GetPersonalInfo(nationalCode, birthDate);
-        if (personalInfoResponse != null)
-        {
-            if (employee.IsAuthorized == false)
-            {
-
-
-                if (personalInfoResponse.ResponseContext.Status.Code == 0)
-                {
-                    var basicInfo = personalInfoResponse.BasicInformation;
-                    var identityInfo = personalInfoResponse.IdentificationInformation;
-                    var apiBirthDate = identityInfo.BirthDate.ToGeorgianDateTime();
-
-                    var gender = basicInfo.GenderEnum switch
-                    {
-                        Gender.Female => "زن",
-                        Gender.Male => "مرد",
-                        _ => throw new AggregateException()
-                    };
-
-                    var idNumber = identityInfo.ShenasnamehNumber == "0" ? identityInfo.NationalId : identityInfo.ShenasnamehNumber;
-
-
-                    employee.Edit(basicInfo.FirstName, basicInfo.LastName, basicInfo.FatherName, apiBirthDate,
-                        employee.DateOfIssue, employee.PlaceOfIssue, identityInfo.NationalId, idNumber,
-                        gender, "ایرانی", employee.Phone, employee.Address, employee.State, employee.City,
-                        employee.MaritalStatus, employee.MilitaryService, employee.LevelOfEducation,
-                        employee.FieldOfStudy, employee.BankCardNumber, employee.BankBranch, employee.InsuranceCode, employee.InsuranceHistoryByYear,
-                        employee.InsuranceHistoryByMonth, employee.NumberOfChildren,
-                        employee.OfficePhone, employee.MclsUserName, employee.MclsPassword,
-                        employee.EserviceUserName, employee.EservicePassword, employee.TaxOfficeUserName,
-                        employee.TaxOfficepassword, employee.SanaUserName, employee.SanaPassword);
-
-                    employee.Authorized();
-
-                    await _EmployeeRepository.SaveChangesAsync();
-
-                }
-                else
-                {
-                    return op.Failed("کد ملی با تاریخ تولد وارد شده مطابقت ندارد");
-                }
-            }
-            else if (employee.DateOfBirth.ToFarsi() != birthDate || employee.NationalCode != nationalCode)
             {
                 return op.Failed("کد ملی با تاریخ تولد وارد شده مطابقت ندارد");
             }
         }
-       
+        else if (employee.DateOfBirth.ToFarsi() != birthDate || employee.NationalCode != nationalCode)
+        {
+            return op.Failed("کد ملی با تاریخ تولد وارد شده مطابقت ندارد");
+        }
 
         var leftWorkViewModel = _leftWorkRepository.GetLastLeftWorkByEmployeeIdAndWorkshopId(workshopId, employee.id);
         if (leftWorkViewModel == null)
@@ -1403,7 +1467,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 Gender = employee.Gender,
                 Nationality = employee.Nationality,
                 EmployeeLName = employee.LName
-            }); ;
+            });
+            ;
         }
 
         if (leftWorkViewModel.LeftWorkDate >= DateTime.Now || !leftWorkViewModel.HasLeft)
@@ -1455,17 +1520,18 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             Picture1 = picture1,
             Picture2 = picture2,
             PersonnelCode = personnelCode,
-            EmployeeBankInfos = bankInformationViewModel.BankInformation.Select(x => new EmployeeByNationalCodeEmployeeBankInfoViewModel
-            {
-                ShebaNumber = x.ShebaNumber,
-                IsDefault = x.IsDefault,
-                CardNumber = x.CardNumber,
-                BankAccountNumber = x.BankAccountNumber,
-                BankId = x.BankId,
-                BankLogoMediaId = x.BankLogoMediaId,
-                BankLogoPath = x.BankLogoPath,
-                BankName = x.BankName
-            }).ToList(),
+            EmployeeBankInfos = bankInformationViewModel.BankInformation.Select(x =>
+                new EmployeeByNationalCodeEmployeeBankInfoViewModel
+                {
+                    ShebaNumber = x.ShebaNumber,
+                    IsDefault = x.IsDefault,
+                    CardNumber = x.CardNumber,
+                    BankAccountNumber = x.BankAccountNumber,
+                    BankId = x.BankId,
+                    BankLogoMediaId = x.BankLogoMediaId,
+                    BankLogoPath = x.BankLogoPath,
+                    BankName = x.BankName
+                }).ToList(),
             EmployeeDocument = new EmployeeByNationalCodeEmployeeDocumentViewModel
             {
                 EducationalDegree = employeeDocumentsViewModel.EducationalDegree,
@@ -1519,6 +1585,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             {
                 return op.Failed("جنسیت وارد شده نامعتبر است");
             }
+
             if (command.BirthDate.TryToGeorgianDateTime(out var birthDateGr) == false)
             {
                 return op.Failed("تاریخ تولد وارد شده نامعتبر است");
@@ -1555,7 +1622,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             }
         }
 
-        var employeeClientTemp = _employeeClientTempRepository.GetByEmployeeIdAndWorkshopId(command.EmployeeId, command.WorkshopId);
+        var employeeClientTemp =
+            _employeeClientTempRepository.GetByEmployeeIdAndWorkshopId(command.EmployeeId, command.WorkshopId);
 
         employeeClientTemp?.Edit(command.MaritalStatus);
 
@@ -1582,6 +1650,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 employee.EserviceUserName, employee.EservicePassword, employee.TaxOfficeUserName,
                 employee.TaxOfficepassword, employee.SanaUserName, employee.SanaPassword);
         }
+
         await _EmployeeRepository.SaveChangesAsync();
 
         return op.Succcedded();
@@ -1592,7 +1661,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         return await _EmployeeRepository.WorkedEmployeesInWorkshopSelectList(workshopId);
     }
 
-    public async Task<OperationResult<EmployeeDataFromApiViewModel>> GetEmployeeDataFromApi(string nationalCode, string birthDate)
+    public async Task<OperationResult<EmployeeDataFromApiViewModel>> GetEmployeeDataFromApi(string nationalCode,
+        string birthDate)
     {
         var op = new OperationResult<EmployeeDataFromApiViewModel>();
         var birthDateGr = birthDate.ToGeorgianDateTime();
@@ -1604,20 +1674,23 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             if (employee.IsAuthorized == false)
             {
                 var apiResult = await _uidService.GetPersonalInfo(nationalCode, birthDate);
-                
+
                 if (apiResult == null)
                 {
                     return op.Failed("این پرسنل در بانک اطلاعات موجود میباشد");
                 }
+
                 if (apiResult.ResponseContext.Status.Code is 14 or 3)
                 {
                     return op.Failed("این پرسنل در بانک اطلاعات موجود میباشد");
 
                 }
+
                 if (apiResult.ResponseContext.Status.Code != 0)
                 {
                     return op.Failed("کد ملی و تاریخ تولد با هم همخانی ندارند");
                 }
+
                 var basicInfo = apiResult.BasicInformation;
                 var identityInfo = apiResult.IdentificationInformation;
 
@@ -1628,12 +1701,15 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                     _ => throw new AggregateException()
                 };
 
-                var idNumber = identityInfo.ShenasnamehNumber == "0" ? identityInfo.NationalId : identityInfo.ShenasnamehNumber;
+                var idNumber = identityInfo.ShenasnamehNumber == "0"
+                    ? identityInfo.NationalId
+                    : identityInfo.ShenasnamehNumber;
                 employee.Edit(basicInfo.FirstName, basicInfo.LastName, basicInfo.FatherName, birthDateGr,
                     employee.DateOfIssue, employee.PlaceOfIssue, identityInfo.NationalId, idNumber,
                     gender, "ایرانی", employee.Phone, employee.Address, employee.State, employee.City,
                     employee.MaritalStatus, employee.MilitaryService, employee.LevelOfEducation,
-                    employee.FieldOfStudy, employee.BankCardNumber, employee.BankBranch, employee.InsuranceCode, employee.InsuranceHistoryByYear,
+                    employee.FieldOfStudy, employee.BankCardNumber, employee.BankBranch, employee.InsuranceCode,
+                    employee.InsuranceHistoryByYear,
                     employee.InsuranceHistoryByMonth, employee.NumberOfChildren,
                     employee.OfficePhone, employee.MclsUserName, employee.MclsPassword,
                     employee.EserviceUserName, employee.EservicePassword, employee.TaxOfficeUserName,
@@ -1668,15 +1744,18 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 };
                 return op.Succcedded(data);
             }
-            
+
             var apiResult = await _uidService.GetPersonalInfo(nationalCode, birthDate);
             if (apiResult == null)
             {
-                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید", new EmployeeDataFromApiViewModel() { AuthorizedCanceled = true });
+                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید",
+                    new EmployeeDataFromApiViewModel() { AuthorizedCanceled = true });
             }
+
             if (apiResult.ResponseContext.Status.Code is 14 or 3)
             {
-                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید", new EmployeeDataFromApiViewModel() { AuthorizedCanceled = true });
+                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید",
+                    new EmployeeDataFromApiViewModel() { AuthorizedCanceled = true });
 
             }
 
@@ -1684,10 +1763,12 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             {
                 return op.Failed("کد ملی و تاریخ تولد با هم همخانی ندارند");
             }
+
             if (apiResult.ResponseContext.Status.Code != 0)
             {
                 return op.Failed("اطلاعات وارد شده نامعتبر میباشد");
             }
+
             var basicInfo = apiResult.BasicInformation;
             var identityInfo = apiResult.IdentificationInformation;
 
@@ -1695,7 +1776,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             {
                 BirthDate = identityInfo.BirthDate,
                 NationalCode = identityInfo.NationalId,
-                IdNumber = identityInfo.ShenasnamehNumber == "0" ? identityInfo.NationalId : identityInfo.ShenasnamehNumber,
+                IdNumber = identityInfo.ShenasnamehNumber == "0"
+                    ? identityInfo.NationalId
+                    : identityInfo.ShenasnamehNumber,
                 FatherName = basicInfo.FatherName,
                 FName = basicInfo.FirstName,
                 Gender = basicInfo.GenderEnum,
@@ -1704,7 +1787,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 IdNumberSerial = identityInfo.ShenasnameSerial
             };
 
-            var newAuthorizeTemp = new EmployeeAuthorizeTemp(data.Gender, data.FName, data.LName, data.FatherName, birthDateGr, data.NationalCode, data.IdNumber, data.IdNumberSerial, data.IdNumberSeri);
+            var newAuthorizeTemp = new EmployeeAuthorizeTemp(data.Gender, data.FName, data.LName, data.FatherName,
+                birthDateGr, data.NationalCode, data.IdNumber, data.IdNumberSerial, data.IdNumberSeri);
             await _employeeAuthorizeTempRepository.CreateAsync(newAuthorizeTemp);
             await _employeeAuthorizeTempRepository.SaveChangesAsync();
 
@@ -1719,9 +1803,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
     #region Api
 
-    public async Task<List<EmployeeSelectListViewModel>> GetSelectList(string searchText,long id)
+    public async Task<List<EmployeeSelectListViewModel>> GetSelectList(string searchText, long id)
     {
-        return await _EmployeeRepository.GetSelectList(searchText,id );
+        return await _EmployeeRepository.GetSelectList(searchText, id);
     }
 
     public async Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel)
@@ -1729,10 +1813,10 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         return await _EmployeeRepository.GetList(searchModel);
     }
 
-    public async Task<List<GetClientEmployeeListViewModel>> GetClientEmployeeList(GetClientEmployeeListSearchModel searchModel, long workshopId)
+    public Task<List<GetEmployeeClientListViewModel>> GetEmployeeClientList(GetEmployeeClientListSearchModel searchModel,long workshopId)
     {
-        return await _EmployeeRepository.GetClientEmployeeList(searchModel, workshopId);
+        return _EmployeeRepository.GetEmployeeClientList(searchModel, workshopId);
     }
 
-    #endregion
+#endregion
 }

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -22,7 +22,6 @@ using Company.Domain.InstitutionContractAgg;
 using Company.Domain.LeftWorkAgg;
 using Company.Domain.PaymentTransactionAgg;
 using Company.Domain.RepresentativeAgg;
-using Company.Domain.RollCallServiceAgg;
 using Company.Domain.TemporaryClientRegistrationAgg;
 using Company.Domain.WorkshopAgg;
 using CompanyManagment.App.Contracts.FinancialInvoice;
@@ -60,7 +59,6 @@ public class InstitutionContractApplication : IInstitutionContractApplication
     private readonly IFinancialInvoiceRepository _financialInvoiceRepository;
     private readonly IPaymentGateway _paymentGateway;
     private readonly IPaymentTransactionRepository _paymentTransactionRepository;
-    private readonly IRollCallServiceRepository _rollCallServiceRepository;
 
 
     public InstitutionContractApplication(IInstitutionContractRepository institutionContractRepository,
@@ -72,7 +70,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         IFinancialStatmentRepository financialStatmentRepository, IContactInfoApplication contactInfoApplication,
         IAccountApplication accountApplication, ISmsService smsService, IUidService uidService,
         IFinancialInvoiceRepository financialInvoiceRepository, IHttpClientFactory httpClientFactory,
-        IPaymentTransactionRepository paymentTransactionRepository, IRollCallServiceRepository rollCallServiceRepository)
+        IPaymentTransactionRepository paymentTransactionRepository)
     {
         _institutionContractRepository = institutionContractRepository;
         _contractingPartyRepository = contractingPartyRepository;
@@ -90,7 +88,6 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         _uidService = uidService;
         _financialInvoiceRepository = financialInvoiceRepository;
         _paymentTransactionRepository = paymentTransactionRepository;
-        _rollCallServiceRepository = rollCallServiceRepository;
         _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
     }
 
@@ -1540,7 +1537,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return (await _institutionContractRepository.PrintAllAsync([id])).FirstOrDefault();
     }
 
-    public async Task<OperationResult> SetPendingWorkflow(long entityId,InstitutionContractSigningType signingType)
+    public async Task<OperationResult> SetPendingWorkflow(long entityId)
     {
         var op = new OperationResult();
         var institutionContract = await _institutionContractRepository.GetIncludeWorkshopDetailsAsync(entityId);
@@ -1554,64 +1551,15 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             return op.Failed("وضعیت قرارداد مالی برای این عملیات مناسب نمی باشد");
         }
 
-        var initialCreatedWorkshops = institutionContract.WorkshopGroup.InitialWorkshops
-            .Where(x => x.WorkshopCreated && x.WorkshopId is > 0).ToList();
-        
-        var currentWorkshops = institutionContract.WorkshopGroup.CurrentWorkshops.ToList();
-        var accountId = _contractingPartyRepository
-            .GetAccountByPersonalContractingParty(institutionContract.ContractingPartyId).Id;
-        foreach (var createdWorkshop in initialCreatedWorkshops)
-        {
-            if (currentWorkshops.Any(x => x.WorkshopId == createdWorkshop.WorkshopId))
-            {
-                //rollcall serviecs
-                if (createdWorkshop.Services.RollCall)
-                {
-                    var ActiveService = _rollCallServiceRepository.GetActiveServiceByWorkshopId(createdWorkshop.WorkshopId!.Value);
-                    var startTime = institutionContract.ContractStartGr;
-                    var endTime = institutionContract.ContractEndGr;
-                    if (ActiveService != null)
-                    {
-                        if (ActiveService.EndService> startTime)
-                        {
-                            startTime = ActiveService.EndService;
-                        }
-                        
-                    }
-                    var rollCallService = new RollCallService("BasedOnIC",
-                        startTime, endTime, createdWorkshop.WorkshopId.Value,accountId,createdWorkshop.PersonnelCount,
-                        0,"12");
-                    await _rollCallServiceRepository.CreateAsync(rollCallService);
-                }
-            }
-            else
-            {
-                var currentWorkshop = new InstitutionContractWorkshopCurrent(createdWorkshop.WorkshopName,
-                    createdWorkshop.Services.RollCall, createdWorkshop.Services.RollCallInPerson,
-                    createdWorkshop.Services.CustomizeCheckout, createdWorkshop.Services.Contract,
-                    createdWorkshop.Services.ContractInPerson, createdWorkshop.Services.Insurance,
-                    createdWorkshop.Services.InsuranceInPerson,createdWorkshop.PersonnelCount, createdWorkshop.Price,
-                    createdWorkshop.InstitutionContractWorkshopGroupId,createdWorkshop.WorkshopGroup,
-                    createdWorkshop.WorkshopId!.Value, createdWorkshop.id);
-                institutionContract.WorkshopGroup.AddCurrentWorkshop(currentWorkshop);
-            }
-        }
-        
         if (institutionContract.WorkshopGroup.InitialWorkshops.All(x => x.WorkshopCreated && x.WorkshopId is > 0))
         {
-            
             institutionContract.Verified();
         }
         else
         {
             institutionContract.SetPendingWorkflow();
         }
-        
-        institutionContract.SetSigningType(signingType);
-        var previousInstitutionContract = await _institutionContractRepository
-            .GetPreviousContract(institutionContract.id);
-        previousInstitutionContract?.DeActive();
-        ReActiveAllAfterCreateNew(institutionContract.ContractingPartyId);
+
         await _institutionContractRepository.SaveChangesAsync();
         return op.Succcedded();
     }
@@ -1621,42 +1569,6 @@ public class InstitutionContractApplication : IInstitutionContractApplication
 		return await _institutionContractRepository.GetIdByInstallmentId(installmentId);
 	}
 
-    public async Task<OperationResult> VerifyInstitutionContractManually(long institutionContractId)
-    {
-        var op = new OperationResult();
-        
-        var institutionContract =await _institutionContractRepository
-            .GetIncludeWorkshopDetailsAsync(institutionContractId);
-        
-        if (institutionContract == null)
-            return op.Failed("قرارداد مالی یافت نشد");
-        
-        if (institutionContract.VerificationStatus == InstitutionContractVerificationStatus.Verified)
-            return op.Failed("قرارداد مالی قبلا تایید شده است");
-
-        var transaction = await _institutionContractRepository.BeginTransactionAsync();
-        await SetPendingWorkflow(institutionContractId,InstitutionContractSigningType.Physical);
-        
-        var financialStatement = await _financialStatmentRepository
-            .GetByContractingPartyId(institutionContract.ContractingPartyId);
-        
-        DateTime today = DateTime.Today;
-        var description = institutionContract.IsInstallment
-            ? "قسط اول سرویس"
-            : "پرداخت کل سرویس";
-        var debtorAmount = institutionContract.IsInstallment
-            ? institutionContract.Installments.First().Amount
-            : institutionContract.TotalAmount;
-        
-        var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
-            description, "debt", "بابت خدمات", debtorAmount, 0, 0);
-        financialStatement.AddFinancialTransaction(financialTransaction);
-        
-        await _institutionContractRepository.SaveChangesAsync();
-        await transaction.CommitAsync();
-        return op.Succcedded();
-    }
-
     private async Task<OperationResult<PersonalContractingParty>> CreateLegalContractingPartyEntity(
         CreateInstitutionContractLegalPartyRequest request, long representativeId, string address, string city,
         string state)

CompanyManagment.Application/InstitutionPlanApplication.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using _0_Framework.Application;
 using Company.Domain.InstitutionPlanAgg;
 using CompanyManagment.App.Contracts.InstitutionPlan;
@@ -85,73 +84,4 @@ public class InstitutionPlanApplication : IInstitutionPlanApplication
     {
         return _planPercentageRepository.GetInstitutionPlanForWorkshop(command);
     }
-
-
-    #region ForApi
-
-    public async Task<CreateServiceAmountDto> GetCreateModalData()
-    {
-        return await _planPercentageRepository.GetCreateModalData();
-    }
-
-
-    public async Task<OperationResult> CreateInstitutionPlanPercentage(CreateServiceAmountDto command)
-    {
-        var op = new OperationResult();
-        if (string.IsNullOrWhiteSpace(command.ContractAndCheckoutInPersonPercentStr) || command.ContractAndCheckoutInPersonPercentStr == "0" ||
-            string.IsNullOrWhiteSpace(command.ContractAndCheckoutPercentStr) || (command.ContractAndCheckoutPercentStr == "0" ||
-            string.IsNullOrWhiteSpace(command.CustomizeCheckoutPercentStr) || command.CustomizeCheckoutPercentStr == "0" ||
-            string.IsNullOrWhiteSpace(command.InsuranceInPersonPercentStr) || command.InsuranceInPersonPercentStr == "0" ||
-            string.IsNullOrWhiteSpace(command.InsurancePercentStr) || command.InsurancePercentStr == "0" ||
-            string.IsNullOrWhiteSpace(command.RollCallPercentStr) || command.RollCallPercentStr == "0"))
-            return op.Failed("هیچ یک از فیلدها نمیتوانند صفر باشند");
-
-        int contractAndCheckoutInPersonPercent = 0;
-        int contractAndCheckoutPercent = 0;
-        int customizeCheckoutPercent = 0;
-        int insuranceInPersonPercent = 0;
-        int insurancePercent = 0;
-        int rollCallPercent = 0;
-
-        try
-        {
-            contractAndCheckoutInPersonPercent = Convert.ToInt32(command.ContractAndCheckoutInPersonPercentStr);
-            contractAndCheckoutPercent = Convert.ToInt32(command.ContractAndCheckoutPercentStr);
-            customizeCheckoutPercent = Convert.ToInt32(command.CustomizeCheckoutPercentStr);
-            insuranceInPersonPercent = Convert.ToInt32(command.InsuranceInPersonPercentStr);
-            insurancePercent = Convert.ToInt32(command.InsurancePercentStr);
-            rollCallPercent = Convert.ToInt32(command.RollCallPercentStr);
-        }
-        catch (Exception e)
-        {
-            return op.Failed("لطفا عدد معتبر وارد کنید");
-
-        }
-
-        var firstPlan =await _planPercentageRepository.GetCreateModalData();
-        if (firstPlan != null)
-        {
-            var planPercentage = _planPercentageRepository.Get(firstPlan.Id);
-            planPercentage.Edit(contractAndCheckoutPercent, insurancePercent, rollCallPercent, customizeCheckoutPercent, contractAndCheckoutInPersonPercent, insuranceInPersonPercent);
-            _planPercentageRepository.SaveChanges();
-        }
-        else
-        {
-            var create = new PlanPercentage(contractAndCheckoutPercent, insurancePercent, rollCallPercent,
-                customizeCheckoutPercent, contractAndCheckoutInPersonPercent, insuranceInPersonPercent);
-            await _planPercentageRepository.CreateAsync(create);
-            await _planPercentageRepository.SaveChangesAsync();
-        }
-
-
-
-        return op.Succcedded();
-    }
-
-    public async Task<PagedResult<InstitutionPlanListDto>> GetList(InstitutionPlanSearchModel searchModel)
-    {
-        return await _planPercentageRepository.GetList(searchModel);
-    }
-
-    #endregion
 }

CompanyManagment.Application/InsuranceListApplication.cs

@@ -2371,11 +2371,6 @@ public class InsuranceListApplication : IInsuranceListApplication
 		return _insuranceListRepositpry.GetTabCounts(searchModel);
 	}
 
-	public async Task<PagedResult<InsuranceClientListViewModel>> GetInsuranceClientList(InsuranceClientSearchModel searchModel)
-	{
-		return await _insuranceListRepositpry.GetInsuranceClientList(searchModel);
-	}
-
 	public async Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel)
 	{
 		return await _insuranceListRepositpry.GetNotCreatedWorkshop(searchModel);

CompanyManagment.Application/RollCallApplication.cs

@@ -384,7 +384,6 @@ public class RollCallApplication : IRollCallApplication
 
 
         var workshopSettings = _customizeWorkshopSettingsRepository.GetBy(command.WorkshopId);
-        
         var employeeSettings =
             _customizeWorkshopEmployeeSettingsRepository.GetByEmployeeIdAndWorkshopIdIncludeGroupSettings(
                 command.WorkshopId, command.EmployeeId)?.WorkshopShiftStatus;
@@ -788,7 +787,7 @@ public class RollCallApplication : IRollCallApplication
 		return _rollCallRepository.CheckRepeat(employeeId, workshopId);
 	}
 
-    public async Task<OperationResult> RecalculateValues(long workshopId, List<ReCalculateRollCallValues> commands)
+    public OperationResult RecalculateValues(long workshopId, List<ReCalculateRollCallValues> commands)
     {
         var operationResult = new OperationResult();
         try
@@ -812,43 +811,24 @@ public class RollCallApplication : IRollCallApplication
 
             var oldestDate = commands.MinBy(x => x.FromDate).FromDate.ToGeorgianDateTime();
 
-            var allRollCalls = await _rollCallRepository
+            var allRollCalls = _rollCallRepository
                 .GetRollCallsUntilNowWithWorkshopIdEmployeeIds(workshopId, commands.Select(x => x.EmployeeId).ToList(),
-                    oldestDate);
-            
-            var rollCalls =
-	            commands.SelectMany(command =>
-		            allRollCalls.Where(x =>
-			            x.EmployeeId == command.EmployeeId &&
-			            x.ShiftDate >= command.FromDate.ToGeorgianDateTime()
-		            )
-	            );
+                    oldestDate).GetAwaiter().GetResult();
 
-            foreach (var rollCall in rollCalls)
+
+            foreach (var command in commands)
             {
-	            rollCall.ClearTimeDiff();
+                var rollCalls = allRollCalls
+                    .Where(x => x.EmployeeId == command.EmployeeId && x.ShiftDate >= command.FromDate.ToGeorgianDateTime()).ToList();
 
-	            await _rollCallRepository.SaveChangesAsync();
-
-	            rollCall.SetEndDateTime(
-		            rollCall.EndDate!.Value,
-		            _rollCallDomainService
-	            );
+                foreach (var rollCall in rollCalls)
+                {
+                    rollCall.ClearTimeDiff();
+                    _rollCallRepository.SaveChanges();
+                    rollCall.SetEndDateTime(rollCall.EndDate!.Value, _rollCallDomainService);
+                }
             }
-
-            // foreach (var command in commands)
-            // {
-            //     var rollCalls = allRollCalls
-            //         .Where(x => x.EmployeeId == command.EmployeeId && x.ShiftDate >= command.FromDate.ToGeorgianDateTime()).ToList();
-            //
-            //     foreach (var rollCall in rollCalls)
-            //     {
-            //         rollCall.ClearTimeDiff();
-            //         await _rollCallRepository.SaveChangesAsync();
-            //         rollCall.SetEndDateTime(rollCall.EndDate!.Value, _rollCallDomainService);
-            //     }
-            // }
-            await _rollCallRepository.SaveChangesAsync();
+            _rollCallRepository.SaveChanges();
 
             return operationResult.Succcedded();
         }

CompanyManagment.Application/RollCallEmployeeApplication.cs

@@ -11,7 +11,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Transactions;
-using _0_Framework.Application.FaceEmbedding;
 using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
 
 namespace CompanyManagment.Application;
@@ -24,9 +23,7 @@ public class RollCallEmployeeApplication : IRollCallEmployeeApplication
 	private readonly ILeftWorkRepository _leftWorkRepository;
 	private readonly IRollCallEmployeeStatusRepository _rollCallEmployeeStatusRepository;
 	private readonly IWebHostEnvironment _webHostEnvironment;
-	private readonly IFaceEmbeddingService _faceEmbeddingService;
-	
-	public RollCallEmployeeApplication(IRollCallEmployeeRepository rollCallEmployeeRepository, IEmployeeRepository employeeRepository, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, ILeftWorkRepository leftWorkRepository, IRollCallEmployeeStatusRepository rollCallEmployeeStatusRepository, IWebHostEnvironment webHostEnvironment, IFaceEmbeddingService faceEmbeddingService)
+	public RollCallEmployeeApplication(IRollCallEmployeeRepository rollCallEmployeeRepository, IEmployeeRepository employeeRepository, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, ILeftWorkRepository leftWorkRepository, IRollCallEmployeeStatusRepository rollCallEmployeeStatusRepository, IWebHostEnvironment webHostEnvironment)
 	{
 		_rollCallEmployeeRepository = rollCallEmployeeRepository;
 		_employeeRepository = employeeRepository;
@@ -34,7 +31,6 @@ public class RollCallEmployeeApplication : IRollCallEmployeeApplication
 		_leftWorkRepository = leftWorkRepository;
 		_rollCallEmployeeStatusRepository = rollCallEmployeeStatusRepository;
 		_webHostEnvironment = webHostEnvironment;
-		_faceEmbeddingService = faceEmbeddingService;
 	}
 
 	public OperationResult Create(CreateRollCallEmployee command)
@@ -217,18 +213,9 @@ public class RollCallEmployeeApplication : IRollCallEmployeeApplication
 		if (entity.IsActiveString != "true")
 			return result.Failed("امکان تغییر نام برای کارمند غیر فعال وجود ندارد");
 
-		var transaction = _rollCallEmployeeRepository.BeginTransactionAsync().GetAwaiter().GetResult();
-		
+
 		entity.ChangeName(fName, lName);
 		_rollCallEmployeeRepository.SaveChanges();
-		
-		var embeddingRes =_faceEmbeddingService
-			.UpdateEmbeddingFullNameAsync(entity.EmployeeId, entity.WorkshopId, fullName)
-			.GetAwaiter().GetResult();
-		if (!embeddingRes.IsSuccedded)
-			return result.Failed("خطا در به روز رسانی نام در سیستم تشخیص چهره: " + embeddingRes.Message);
-		
-		transaction.Commit();
 		return result.Succcedded();
 	}
 	#endregion

CompanyManagment.Application/WorkshopAppliction.cs

@@ -1092,9 +1092,7 @@ public class WorkshopAppliction : IWorkshopApplication
                 Amount = 1000,
                 MaxPersonValid = 500,
                 Duration = "12",
-                HasCustomizeCheckoutService = command.HasCustomizeCheckoutService,
-                StartService = institutionContract.ContractStartGr,
-                
+                HasCustomizeCheckoutService = command.HasCustomizeCheckoutService
             };
             _rollCallServiceApplication.Create(commandSave);
         }

CompanyManagment.EFCore/Mapping/InstitutionContractMapping.cs

@@ -34,10 +34,6 @@ public class InstitutionContractMapping : IEntityTypeConfiguration<InstitutionCo
         builder.Property(x => x.VerifierPhoneNumber).HasMaxLength(20);
 
         builder.Property(x => x.VerificationStatus).HasConversion<string>().HasMaxLength(122);
-        
-        builder.Property(x=>x.SigningType).HasConversion<string>()
-            .HasMaxLength(25)
-            .IsRequired(false);
 
         builder.HasMany(x => x.Installments)
             .WithOne(x => x.InstitutionContract)
@@ -49,10 +45,5 @@ public class InstitutionContractMapping : IEntityTypeConfiguration<InstitutionCo
 
         builder.HasMany(x => x.Amendments).WithOne(x => x.InstitutionContract)
             .HasForeignKey(x => x.InstitutionContractId);
-
-
-        builder.Ignore(x => x.ContractAmountWithTax);
-        builder.Ignore(x => x.ContractAmountTax);
-        builder.Ignore(x => x.ContractAmountTax);
     }
 }

CompanyManagment.EFCore/Migrations/20251220143403_addsigningTypeforinstitutioncontract.cs

@@ -1,29 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addsigningTypeforinstitutioncontract : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "SigningType",
-                table: "InstitutionContracts",
-                type: "nvarchar(25)",
-                maxLength: 25,
-                nullable: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "SigningType",
-                table: "InstitutionContracts");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs

@@ -3462,10 +3462,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(1)
                         .HasColumnType("nvarchar(1)");
 
-                    b.Property<string>("SigningType")
-                        .HasMaxLength(25)
-                        .HasColumnType("nvarchar(25)");
-
                     b.Property<string>("State")
                         .HasMaxLength(20)
                         .HasColumnType("nvarchar(20)");

CompanyManagment.EFCore/Repository/CheckoutRepository.cs

@@ -64,7 +64,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
     }
 
     /// <summary>
-    /// چک میکند که آیا پرسنل در سال و ماه درخواستی در این کارگاه فیش حقوقی دارد یا خیر
+    /// چیک میکند که آیا پرسنل در سال و ماه درخواستی در این کارگاه فیش حقوقی دارد یا خیر
     /// </summary>
     /// <param name="workshopId"></param>
     /// <param name="employeId"></param>
@@ -74,21 +74,12 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
     public (bool hasChekout, double FamilyAlloance, double OverTimePay, double RotatingShift, double Nightwork, double Fridaywork, double YraesPay) HasCheckout(long workshopId, long employeId, string year, string month)
     {
         var farisMonthName = Tools.ToFarsiMonthByNumber(month);
-       
+
         var res = _context.CheckoutSet.FirstOrDefault(x =>
             x.WorkshopId == workshopId && x.EmployeeId == employeId && x.Year == year && x.Month == farisMonthName &&
             x.IsActiveString == "true");
         if (res == null)
-        {
-            var checkLeftDate = ($"{year}/{month}/01").ToGeorgianDateTime();
-            var hasLeftwork = _context.LeftWorkList.Any(x =>
-                x.EmployeeId == employeId && x.WorkshopId == workshopId && x.LeftWorkDate == checkLeftDate);
-            if(hasLeftwork)
-                return (true, 0, 0, 0, 0, 0, 0);
-
-            return (false, 0, 0, 0, 0, 0, 0);
-        }
-           
+            return (false, 0, 0,0,0,0,0);
 
         return (true, res.FamilyAllowance, res.OvertimePay, res.ShiftPay, res.NightworkPay, res.FridayPay,res.YearsPay);
     }

CompanyManagment.EFCore/Repository/EmployeeDocumentsRepository.cs

@@ -1194,99 +1194,41 @@ public class EmployeeDocumentsRepository : RepositoryBase<long, EmployeeDocument
         {
             return new List<WorkshopWithEmployeeDocumentsViewModel>();
         }
-        // Step 1: Get employee client temps in memory
-        var employeeClientTempData = await _companyContext.EmployeeClientTemps
-	        .Where(x => workshops.Contains(x.WorkshopId))
-	        .Select(x => new { x.WorkshopId, x.EmployeeId })
-	        .ToListAsync();
-        // Step 2: Get employee documents with simplified filter
-        var employeeDocuments = await _companyContext.EmployeeDocuments
-	        .Where(x => workshops.Contains(x.WorkshopId) && !x.IsConfirmed && !x.IsSentToChecker)
-	        .Select(x => new
-	        {
-		        x.id,
-		        x.WorkshopId,
-		        x.EmployeeId,
-		        x.IsConfirmed,
-		        x.IsSentToChecker,
-		        WorkshopName = x.Workshop.WorkshopName
-	        })
-	        .ToListAsync();
 
-        var filteredDocuments = employeeDocuments
-	        .Where(x => employeeClientTempData.Any(temp =>
-		        temp.WorkshopId == x.WorkshopId && temp.EmployeeId == x.EmployeeId))
-	        .ToList();
-        var groupedByWorkshop = filteredDocuments
-	        .GroupBy(x => x.WorkshopId)
-	        .Select(g => new
-	        {
-		        WorkshopId = g.Key,
-		        WorkshopName = g.First().WorkshopName,
-		        Count = g.Count()
-	        })
-	        .ToList();
+        var employeeClientTemp = _companyContext.EmployeeClientTemps.Where(x => workshops.Contains(x.WorkshopId));
 
-        // Step 5: Get workshop employers for the filtered workshops
-        var workshopIds = groupedByWorkshop.Select(x => x.WorkshopId).ToList();
-        var workshopEmployers = await _companyContext.WorkshopEmployers
-	        .Where(x => workshopIds.Contains(x.WorkshopId))
-	        .Include(x => x.Employer)
-	        .GroupBy(x => x.WorkshopId)
-	        .Select(g => g.FirstOrDefault())
-	        .ToListAsync();
-
-        // Step 6: Build result
-        var res = groupedByWorkshop
-	        .Select(x => new WorkshopWithEmployeeDocumentsViewModel()
-	        {
-		        WorkshopId = x.WorkshopId,
-		        WorkshopFullName = x.WorkshopName,
-		        EmployeesWithoutDocumentCount = x.Count,
-		        EmployerName = workshopEmployers
-			        .FirstOrDefault(y => y.WorkshopId == x.WorkshopId)?
-			        .Employer?.FullName
-	        })
-	        .Where(x => x.EmployeesWithoutDocumentCount > 0)
-	        .OrderByDescending(x => x.EmployeesWithoutDocumentCount)
-	        .ToList();
-
-        return res;
-
-		//var employeeClientTemp = _companyContext.EmployeeClientTemps.Where(x => workshops.Contains(x.WorkshopId));
-
-  //      var query = _companyContext.EmployeeDocuments
-  //          .Where(x => workshops.Contains(x.WorkshopId) &&
-  //                      employeeClientTemp.Any(temp => x.EmployeeId == temp.EmployeeId && temp.WorkshopId == x.WorkshopId) && x.IsConfirmed == false &&x.IsSentToChecker == false)
-  //          .Include(x => x.Workshop).Include(x => x.EmployeeDocumentItemCollection)
-  //          .GroupBy(x => x.WorkshopId).Select(x => new WorkshopWithEmployeeDocumentsViewModel()
-  //          {
-  //              WorkshopId = x.Key,
-  //              WorkshopFullName = x.FirstOrDefault().Workshop.WorkshopFullName,
-  //              EmployeesWithoutDocumentCount = x.Count()
-  //          });
+        var query = _companyContext.EmployeeDocuments
+            .Where(x => workshops.Contains(x.WorkshopId) &&
+                        employeeClientTemp.Any(temp => x.EmployeeId == temp.EmployeeId && temp.WorkshopId == x.WorkshopId) && x.IsConfirmed == false &&x.IsSentToChecker == false)
+            .Include(x => x.Workshop).Include(x => x.EmployeeDocumentItemCollection)
+            .GroupBy(x => x.WorkshopId).Select(x => new WorkshopWithEmployeeDocumentsViewModel()
+            {
+                WorkshopId = x.Key,
+                WorkshopFullName = x.FirstOrDefault().Workshop.WorkshopFullName,
+                EmployeesWithoutDocumentCount = x.Count()
+            });
 
 
 
-  //      var workshopEmployers = await _companyContext.WorkshopEmployers.Include(x => x.Employer)
-  //          .Where(x => query.Any(y => y.WorkshopId == x.WorkshopId))
-  //          .GroupBy(x => x.WorkshopId).Select(x => x.FirstOrDefault()).ToListAsync();
+        var workshopEmployers = await _companyContext.WorkshopEmployers.Include(x => x.Employer)
+            .Where(x => query.Any(y => y.WorkshopId == x.WorkshopId))
+            .GroupBy(x => x.WorkshopId).Select(x => x.FirstOrDefault()).ToListAsync();
 
 
 
 
-  //      var result = await query.ToListAsync();
+        var result = await query.ToListAsync();
 
 
-  //      result.ForEach(x =>
-  //      {
-  //          var employer = workshopEmployers.FirstOrDefault(y => y.WorkshopId == x.WorkshopId)?.Employer;
-  //          x.EmployerName = employer?.FullName;
+        result.ForEach(x =>
+        {
+            var employer = workshopEmployers.FirstOrDefault(y => y.WorkshopId == x.WorkshopId)?.Employer;
+            x.EmployerName = employer?.FullName;
 
-  //          //x.SubmittedItems.ForEach(y=>y.PicturePath= medias.FirstOrDefault(z=>z.id == y.MediaId)?.Path ?? "");
-  //      });
+            //x.SubmittedItems.ForEach(y=>y.PicturePath= medias.FirstOrDefault(z=>z.id == y.MediaId)?.Path ?? "");
+        });
 
-  //      return result.Where(x => x.EmployeesWithoutDocumentCount > 0).OrderByDescending(x => x.EmployeesWithoutDocumentCount).ToList();
+        return result.Where(x => x.EmployeesWithoutDocumentCount > 0).OrderByDescending(x => x.EmployeesWithoutDocumentCount).ToList();
     }
 
     public async Task<List<EmployeeDocumentsViewModel>> GetCreatedEmployeesDocumentByWorkshopIdForAdmin(long workshopId)
@@ -1405,37 +1347,33 @@ public class EmployeeDocumentsRepository : RepositoryBase<long, EmployeeDocument
         // ترکیب کل لیست‌ها در حافظه
         var allActiveEmployees = activeEmployees
             .Concat(clientTemp)
-            .Concat(leftWorkTemp).ToList();
+            .Concat(leftWorkTemp);
 
         var contractingPartyIds = _companyContext.WorkshopEmployers.Where(x => workshops.Contains(x.WorkshopId))
-            .Include(x => x.Employer).Select(x => x.Employer.ContractingPartyId).Distinct().ToList();
+            .Include(x => x.Employer).Select(x => x.Employer.ContractingPartyId).Distinct();
 
         var accountIds = await _companyContext.ContractingPartyAccounts
             .Where(x => contractingPartyIds.Contains(x.PersonalContractingPartyId)).Select(x => x.AccountId)
             .ToListAsync();
 
-        var query =await _companyContext.EmployeeDocuments
-            .Where(x => workshops.Contains(x.WorkshopId))
+        var query = _companyContext.EmployeeDocuments
+            .Where(x => workshops.Contains(x.WorkshopId) &&
+                        (allActiveEmployees.Any(y => y.WorkshopId == x.WorkshopId && y.EmployeeId == x.EmployeeId)))
             .Include(x => x.Workshop).Include(x => x.EmployeeDocumentItemCollection)
             .Where(x => x.IsSentToChecker == false && x.HasRejectedItems && x.EmployeeDocumentItemCollection.Any(i => i.DocumentStatus == DocumentStatus.Rejected && accountIds.Contains(i.UploaderId)))
             .GroupBy(x => x.WorkshopId).Select(x => new WorkshopWithEmployeeDocumentsViewModel()
             {
                 WorkshopId = x.Key,
                 WorkshopFullName = x.FirstOrDefault().Workshop.WorkshopName,
-                EmployeesWithoutDocumentCount = x.Count(),
-                EmployeeId = x.First().EmployeeId
-            }).ToListAsync();
+                EmployeesWithoutDocumentCount = x.Count()
+            });
 
-        query = query.Where(x =>
-	        (allActiveEmployees.Any(y => y.WorkshopId == x.WorkshopId && y.EmployeeId == x.EmployeeId))).ToList();
-
-        var resWorkshopIds = query.Select(x => x.WorkshopId).ToList();
         var workshopEmployers = await _companyContext.WorkshopEmployers.Include(x => x.Employer)
-            .Where(x => resWorkshopIds.Contains(x.WorkshopId))
+            .Where(x => query.Any(y => y.WorkshopId == x.WorkshopId))
             .GroupBy(x => x.WorkshopId).Select(x => x.FirstOrDefault()).ToListAsync();
 
 
-        var result = query;
+        var result = await query.ToListAsync();
 
 
         result.ForEach(x =>

CompanyManagment.EFCore/Repository/EmployeeRepository .cs

@@ -18,6 +18,8 @@ using CompanyManagment.App.Contracts.Employee.DTO;
 using CompanyManagment.App.Contracts.LeftWorkTemp;
 using _0_Framework.Application.Enums;
 using _0_Framework.Exceptions;
+using CompanyManagment.App.Contracts.EmployeeChildren;
+using CompanyManagment.App.Contracts.Workshop;
 
 namespace CompanyManagment.EFCore.Repository;
 
@@ -1062,116 +1064,158 @@ public class EmployeeRepository : RepositoryBase<long, Employee>, IEmployeeRepos
 
 	}
 
-    public Task<List<GetClientEmployeeListViewModel>> GetClientEmployeeList(GetClientEmployeeListSearchModel searchModel, long workshopId)
+    public async Task<List<GetEmployeeClientListViewModel>> GetEmployeeClientList(GetEmployeeClientListSearchModel searchModel,long workshopId)
     {
-        //  var leftDate = Tools.GetUndefinedDateTime();
-        //
-        // var personnelCodes = _context.PersonnelCodeSet.Include(x => x.Employee)
-        //     .ThenInclude(x => x.EmployeeChildrenList).IgnoreQueryFilters().Where(x => x.WorkshopId == workshopId).ToList();
-        //
-        // var contractLeftWork =
-        //     _context.LeftWorkList.Where(x => x.WorkshopId == workshopId)
-        //        .GroupBy(x => x.EmployeeId).Select(x => x.OrderByDescending(y => y.LeftWork).First()).ToList();
-        //
-        //
-        //
-        //
-        // var insuranceLeftWork = _context.LeftWorkInsuranceList.Where(x => x.WorkshopId == workshopId).Select(x => new
-        // {
-        //     EmployeeId = x.EmployeeId,
-        //     FullName = x.EmployeeFullName,
-        //     PersonnelCode = 0,
-        //     InsurancePerson = true,
-        //     InsuranceLeft = x.LeftWorkDate != null,
-        //     StartWork = x.StartWorkDate,
-        //     LeftWork = x.LeftWorkDate ?? leftDate,
-        //     LastStartInsuranceWork = x.StartWorkDate.ToFarsi(),
-        //     LastLeftInsuranceWork = x.LeftWorkDate != null ? x.LeftWorkDate.ToFarsi() : "-",
-        //     LastStartContractWork = "-",
-        //     LastLeftContractWork = "-"
-        // }).GroupBy(x => x.EmployeeId)
-        //     .Select(x => x.OrderByDescending(y => y.LeftWork).First()).ToList();
-        //
-        // var leftWorkTemp = _context.LeftWorkTemps.Where(x => x.WorkshopId == workshopId).Select(x => new
-        // {
-        //     WorkshopId = x.WorkshopId,
-        //     EmployeeId = x.EmployeeId,
-        //     PersonnelCode = 0,
-        //     ContractPerson = true,
-        //     ContractLeft = x.LeftWork != leftDate,
-        //     StartWork = x.StartWork,
-        //     LeftWork = x.LeftWork,
-        //     LastStartContractWork = x.StartWork.ToFarsi(),
-        //     LastLeftContractWork = x.LeftWork != leftDate ? x.LeftWork.ToFarsi() : "-",
-        //     LastStartInsuranceWork = "-",
-        //     LastLeftInsuranceWork = "-",
-        //     LefWorkTemp = x.LeftWorkType == LeftWorkTempType.LeftWork,
-        //     CreatedByClient = x.LeftWorkType == LeftWorkTempType.StartWork
-        // }).ToList();
-        //
-        //
-        // var employeeClientTemp = _context.EmployeeClientTemps.Where(x => x.WorkshopId == workshopId).Select(x => new
-        // {
-        //     WorkshopId = x.WorkshopId,
-        //     EmployeeId = x.EmployeeId,
-        //     PersonnelCode = 0,
-        //     CreatedByClient = true,
-        //     ContractPerson = true
-        // }).ToList();
-        //
-        // var resultTemp = employeeClientTemp.Concat(leftWorkTemp).ToList().GroupBy(x => x.EmployeeId);
-        //
-        //
-        //
-        // var result = contractLeftWork.Concat(insuranceLeftWork).GroupBy(x => x.EmployeeId).ToList();
-        //
-        // result = result.Concat(resultTemp).GroupBy(x => x.First().EmployeeId).Select(x => x.First()).ToList();
-        //
-        // var employeeClientTempList = employeeClientTemp.ToList();
-        // var startWorkTempsForWorkshop = leftWorkTemp.Where(x => x.CreatedByClient).ToList();
-        // var leftWorkTempsForWorkshop = leftWorkTemp.Where(x => x.LefWorkTemp).ToList();
-        //
-        // return result.Select(x =>
-        // {
-        //     var insurance = x.FirstOrDefault(y => y.InsurancePerson);
-        //     var contract = x.FirstOrDefault(y => y.ContractPerson);
-        //     var personnelCode = personnelCodes.FirstOrDefault(y => y.EmployeeId == x.Key);
-        //     var employee = personnelCode.Employee;
-        //     var employeeClient = employeeClientTempList.FirstOrDefault(t => t.EmployeeId == x.First().EmployeeId);
-        //     var startWorkTemp = startWorkTempsForWorkshop.FirstOrDefault(s => s.EmployeeId == x.First().EmployeeId);
-        //     var leftWorkTemp = leftWorkTempsForWorkshop.FirstOrDefault(s => s.EmployeeId == x.First().EmployeeId);
-        //
-        //
-        //     return new GetClientEmployeeListViewModel()
-        //     {
-        //         EmployeeId = x.Key,
-        //         FullName = employee.FullName,
-        //         PersonnelCode = personnelCode?.PersonnelCode ?? 0,
-        //         HasContractLeftWork = insurance != null,
-        //         HasInsuranceLeftWork = contract != null,
-        //         
-        //         LeftWorkCompletely = (insurance?.InsuranceLeft ?? false) && (contract?.ContractLeft ?? false),
-        //
-        //         LastStartInsuranceWork = insurance != null ? insurance.LastStartInsuranceWork : "-",
-        //         LastLeftInsuranceWork = insurance != null ? insurance.LastLeftInsuranceWork : "-",
-        //         LastStartContractWork = contract != null ? contract.LastStartContractWork : "-",
-        //         LastLeftContractWork = contract != null ? contract.LastLeftContractWork : "-",
-        //
-        //         NationalCode = employee.NationalCode,
-        //         IdNumber = employee.IdNumber,
-        //         MaritalStatus = employee.MaritalStatus,
-        //         DateOfBirthFa = employee.DateOfBirth.ToFarsi(),
-        //         FatherName = employee.FatherName,
-        //         ChildrenCount = employee.EmployeeChildrenList.Count,
-        //         
-        //         PendingStartWork = employeeClient != null || startWorkTemp != null,
-        //         PendingLeftWork = leftWorkTemp != null,
-        //
-        //
-        //     };
-        // }).OrderByDescending(x => x.StartWork).ToList();
-throw new NotImplementedException();
+          var leftDate = Tools.GetUndefinedDateTime();
+
+        var personnelCodes =await _context.PersonnelCodeSet.Include(x => x.Employee)
+            .ThenInclude(x => x.EmployeeChildrenList)
+            .IgnoreQueryFilters()
+            .Where(x => x.WorkshopId == workshopId).ToListAsync();
+
+        var contractLeftWork =
+           await _context.LeftWorkList.Where(x => x.WorkshopId == workshopId)
+                .Select(x => new PersonnelInfoViewModel()
+                {
+                    WorkshopId = x.WorkshopId,
+                    EmployeeId = x.EmployeeId,
+                    FullName = x.EmployeeFullName,
+                    PersonnelCode = 0,
+                    ContractPerson = true,
+                    ContractLeft = x.LeftWorkDate != leftDate,
+                    StartWork = x.StartWorkDate,
+                    LeftWork = x.LeftWorkDate,
+                    LastStartContractWork = x.StartWorkDate.ToFarsi(),
+                    LastLeftContractWork = x.LeftWorkDate != leftDate ? x.LeftWorkDate.ToFarsi() : "-",
+                    LastStartInsuranceWork = "-",
+                    LastLeftInsuranceWork = "-",
+                }).GroupBy(x => x.EmployeeId)
+                .Select(x => x.OrderByDescending(y => y.LeftWork)
+                    .First()).ToListAsync();
+
+
+
+
+        var insuranceLeftWork =await _context.LeftWorkInsuranceList
+            .Where(x => x.WorkshopId == workshopId)
+            .Select(x => new PersonnelInfoViewModel()
+        {
+            WorkshopId = x.WorkshopId,
+            EmployeeId = x.EmployeeId,
+            FullName = x.EmployeeFullName,
+            PersonnelCode = 0,
+            InsurancePerson = true,
+            InsuranceLeft = x.LeftWorkDate != null,
+            StartWork = x.StartWorkDate,
+            LeftWork = x.LeftWorkDate ?? leftDate,
+            LastStartInsuranceWork = x.StartWorkDate.ToFarsi(),
+            LastLeftInsuranceWork = x.LeftWorkDate != null ? x.LeftWorkDate.ToFarsi() : "-",
+            LastStartContractWork = "-",
+            LastLeftContractWork = "-"
+        }).GroupBy(x => x.EmployeeId)
+            .Select(x => x.OrderByDescending(y => y.LeftWork)
+                .First()).ToListAsync();
+
+        var leftWorkTemp =await _context.LeftWorkTemps
+            .Where(x => x.WorkshopId == workshopId)
+            .Select(x => new PersonnelInfoViewModel()
+        {
+            WorkshopId = x.WorkshopId,
+            EmployeeId = x.EmployeeId,
+            PersonnelCode = 0,
+            ContractPerson = true,
+            ContractLeft = x.LeftWork != leftDate,
+            StartWork = x.StartWork,
+            LeftWork = x.LeftWork,
+            LastStartContractWork = x.StartWork.ToFarsi(),
+            LastLeftContractWork = x.LeftWork != leftDate ? x.LeftWork.ToFarsi() : "-",
+            LastStartInsuranceWork = "-",
+            LastLeftInsuranceWork = "-",
+            LefWorkTemp = x.LeftWorkType == LeftWorkTempType.LeftWork,
+            CreatedByClient = x.LeftWorkType == LeftWorkTempType.StartWork
+        }).ToListAsync();
+
+
+        var employeeClientTemp =await _context.EmployeeClientTemps
+            .Where(x => x.WorkshopId == workshopId)
+            .Select(x => new PersonnelInfoViewModel()
+        {
+            WorkshopId = x.WorkshopId,
+            EmployeeId = x.EmployeeId,
+            PersonnelCode = 0,
+            CreatedByClient = true,
+            ContractPerson = true
+        }).ToListAsync();
+
+        var resultTemp = employeeClientTemp.Concat(leftWorkTemp).ToList().GroupBy(x => x.EmployeeId);
+
+
+        var groupRes = contractLeftWork.Concat(insuranceLeftWork).GroupBy(x => x.EmployeeId).ToList();
+
+
+        groupRes = groupRes.Concat(resultTemp).GroupBy(x => x.First().EmployeeId).Select(x => x.First()).ToList();
+
+        var employeeClientTempList = employeeClientTemp.ToList();
+        var startWorkTempsForWorkshop = leftWorkTemp.Where(x => x.CreatedByClient).ToList();
+        var leftWorkTempsForWorkshop = leftWorkTemp.Where(x => x.LefWorkTemp).ToList();
+        
+   
+        var res= groupRes.Select(x =>
+        {
+            var insurance = x.FirstOrDefault(y => y.InsurancePerson);
+            var contract = x.FirstOrDefault(y => y.ContractPerson);
+            var personnelCode = personnelCodes.FirstOrDefault(y => y.EmployeeId == x.Key);
+            var employee = personnelCode.Employee;
+            var employeeClient = employeeClientTempList.FirstOrDefault(t => t.EmployeeId == x.First().EmployeeId);
+            var startWorkTemp = startWorkTempsForWorkshop.FirstOrDefault(s => s.EmployeeId == x.First().EmployeeId);
+            var leftWorkTemp = leftWorkTempsForWorkshop.FirstOrDefault(s => s.EmployeeId == x.First().EmployeeId);
+
+
+            return new GetEmployeeClientListViewModel()
+            {
+                WorkshopId = workshopId,
+                EmployeeId = x.Key,
+                FullName = employee.FullName,
+                PersonnelCode = personnelCode?.PersonnelCode ?? 0,
+
+                HasInsurance = insurance != null,
+                HasContract = contract != null,
+
+                InsuranceLeft = insurance?.InsuranceLeft ?? false,
+                ContractLeft = contract?.ContractLeft ?? false,
+
+                StartWork = contract?.StartWork ?? insurance.StartWork,
+                LeftWork = contract?.LeftWork ?? insurance.LeftWork,
+
+                LastStartInsuranceWork = insurance != null ? insurance.LastStartInsuranceWork : "-",
+                LastLeftInsuranceWork = insurance != null ? insurance.LastLeftInsuranceWork : "-",
+                LastStartContractWork = contract != null ? contract.LastStartContractWork : "-",
+                LastLeftContractWork = contract != null ? contract.LastLeftContractWork : "-",
+                
+                NationalCode = employee.NationalCode,
+                IdNumber = employee.IdNumber,
+                MaritalStatus = employee.MaritalStatus,
+                DateOfBirthFa = employee.DateOfBirth.ToFarsi(),
+                FatherName = employee.FatherName,
+
+                PendingCreate = employeeClient != null || startWorkTemp != null,
+
+                PendingLefWork= leftWorkTemp != null,
+
+                ChildrenCount = employee.EmployeeChildrenList.Count,
+
+            };
+        }).ToList();
+        
+        if (!string.IsNullOrWhiteSpace(searchModel.FullName))
+            res = res.Where(x => x.FullName.Contains(searchModel.FullName)).ToList();
+
+        if (!string.IsNullOrWhiteSpace(searchModel.NationalCode))
+            res = res.Where(x => x.NationalCode.Contains(searchModel.NationalCode)).ToList();
+        return res;
     }
 
     #endregion
-}
+}
+
+

CompanyManagment.EFCore/Repository/EmployerRepository.cs

@@ -722,33 +722,34 @@ public class EmployerRepository : RepositoryBase<long, Employer>, IEmployerRepos
     public OperationResult ActiveAll(long id)
     {
         OperationResult result = new OperationResult();
-        try
+        using (var transaction = _context.Database.BeginTransaction())
         {
-            var employer = _context.Employers.FirstOrDefault(x => x.id == id);
-            if (employer == null)
+            try
             {
-                return result.Failed("کارفرما یافت نشد");
+                var employer = _context.Employers.FirstOrDefault(x => x.id == id);
+                employer.Active();
+
+                var workshopIds = _context.WorkshopEmployers.Where(x => x.EmployerId == id).Select(x => x.WorkshopId)
+                    .ToList();
+                var workshops = _context.Workshops.Where(x => workshopIds.Contains(x.id)).ToList();
+                workshops.ForEach(x => x.Active(x.ArchiveCode));
+
+                var contracts = _context.Contracts.Where(x => workshopIds.Contains(x.WorkshopIds)).ToList();
+                contracts.ForEach(x => x.Active());
+
+                var contractIds = contracts.Select(x => x.id).ToList();
+                var checkouts = _context.CheckoutSet.Where(x => contractIds.Contains(x.ContractId)).ToList();
+                checkouts.ForEach(x => x.Active());
+
+                _context.SaveChanges();
+                transaction.Commit();
+                result.Succcedded();
+            }
+            catch (Exception)
+            {
+                result.Failed("فعال کردن کارفرما با خطا مواجه شد");
+                transaction.Rollback();
             }
-            employer.Active();
-
-            var workshopIds = _context.WorkshopEmployers.Where(x => x.EmployerId == id).Select(x => x.WorkshopId)
-                .ToList();
-            var workshops = _context.Workshops.Where(x => workshopIds.Contains(x.id)).ToList();
-            workshops.ForEach(x => x.Active(x.ArchiveCode));
-
-            var contracts = _context.Contracts.Where(x => workshopIds.Contains(x.WorkshopIds)).ToList();
-            contracts.ForEach(x => x.Active());
-
-            var contractIds = contracts.Select(x => x.id).ToList();
-            var checkouts = _context.CheckoutSet.Where(x => contractIds.Contains(x.ContractId)).ToList();
-            checkouts.ForEach(x => x.Active());
-
-            _context.SaveChanges();
-            result.Succcedded();
-        }
-        catch (Exception)
-        {
-            result.Failed("فعال کردن کارفرما با خطا مواجه شد");
         }
 
         return result;