feat: update institution contract creation to retrieve representatives and set contracting party info

Updated deployment configuration to use environment variables for server host and credentials.

.github/workflows/dotnet-developPublish.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - Main
 
-env:
-  DOTNET_ENVIRONMENT: Development
 
 jobs:
   build-and-deploy:
@@ -37,12 +35,11 @@ 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="R2rNpdnetP3j>q5b18",authType="Basic" `
+          -dest:contentPath="dadmehrg",computerName="https://$env:SERVER_HOST:8172/msdeploy.axd?site=gozareshgir",userName="$env:DEPLOY_USER",password="$env:DEPLOY_PASSWORD",authType="Basic" `
           -allowUntrusted `
           -enableRule:AppOffline
           
-
       env:
-        SERVER_HOST: your-server-ip-or-domain
+        SERVER_HOST: 171.22.24.15
         DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
         DEPLOY_PASSWORD: ${{ secrets.DEPLOY_PASSWORD }}

0_Framework/0_Framework.csproj

@@ -6,6 +6,7 @@
   </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,6 +56,11 @@ 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()
@@ -199,7 +204,7 @@ public class AuthHelper : IAuthHelper
 			new("WorkshopSlug",slug),
 			new("WorkshopId", account.WorkshopId.ToString()),
 			new("WorkshopName",account.WorkshopName??""),
-			new("pm.userId", account.PmUserId?.ToString() ?? "0"),
+			new("pm.userId", account.PmUserId.ToString()),
 
 		};
 

0_Framework/Application/Enums/TypeOfSmsSetting.cs

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

0_Framework/Application/FaceEmbedding/IFaceEmbeddingService.cs

@@ -11,6 +11,7 @@ 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,6 +12,7 @@ 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);
+    public Task<bool> SendInstitutionCreationVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId, string typeOfSms = null);
     
     public Task<bool> SendInstitutionVerificationCode(string number, string code, string contractingPartyFullName,
         long contractingPartyId, long institutionContractId);

0_Framework/Application/StaticWorkshopAccounts.cs

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

0_Framework/Exceptions/Handler/CustomExceptionHandler.cs

@@ -1,7 +1,10 @@
-using System;
+#nullable enable
+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;
@@ -21,12 +24,24 @@ public class CustomExceptionHandler : IExceptionHandler
 
     public async ValueTask<bool> TryHandleAsync(HttpContext context, Exception exception, CancellationToken cancellationToken)
     {
-        _logger.LogError(
+        _logger.LogError(exception,
-            "Error Message: {exceptionMessage}, Time of occurrence {time}",
+            "Error Message: {exceptionMessage}, Type: {exceptionType}, Time: {time}, Path: {path}, TraceId: {traceId}",
-            exception.Message, DateTime.UtcNow);
+            exception.Message, 
+            exception.GetType().FullName, 
+            DateTime.UtcNow,
+            context.Request.Path,
+            context.TraceIdentifier);
 
         (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,
@@ -34,6 +49,7 @@ public class CustomExceptionHandler : IExceptionHandler
                 context.Response.StatusCode = StatusCodes.Status500InternalServerError,
                 null
             ),
+
             BadRequestException bre =>
             (
                 exception.Message,
@@ -41,6 +57,7 @@ public class CustomExceptionHandler : IExceptionHandler
                 context.Response.StatusCode = StatusCodes.Status400BadRequest,
                 bre.Extra
             ),
+            
             NotFoundException =>
             (
                 exception.Message,
@@ -48,6 +65,7 @@ public class CustomExceptionHandler : IExceptionHandler
                 context.Response.StatusCode = StatusCodes.Status404NotFound,
                 null
             ),
+            
             UnAuthorizeException =>
             (
                 exception.Message,
@@ -55,6 +73,7 @@ public class CustomExceptionHandler : IExceptionHandler
                 context.Response.StatusCode = StatusCodes.Status401Unauthorized,
                 null
             ),
+            
             _ =>
             (
                 exception.Message,
@@ -73,8 +92,6 @@ 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,329 +18,387 @@ namespace _0_Framework.Infrastructure;
 /// </summary>
 public class FaceEmbeddingService : IFaceEmbeddingService
 {
-	private readonly IHttpClientFactory _httpClientFactory;
+    private readonly IHttpClientFactory _httpClientFactory;
-	private readonly ILogger<FaceEmbeddingService> _logger;
+    private readonly ILogger<FaceEmbeddingService> _logger;
-	private readonly IFaceEmbeddingNotificationService _notificationService;
+    private readonly IFaceEmbeddingNotificationService _notificationService;
-	private readonly string _apiBaseUrl;
+    private readonly string _apiBaseUrl;
 
-	public FaceEmbeddingService(IHttpClientFactory httpClientFactory, ILogger<FaceEmbeddingService> logger, 
+    public FaceEmbeddingService(IHttpClientFactory httpClientFactory, ILogger<FaceEmbeddingService> logger,
-		IFaceEmbeddingNotificationService notificationService = null)
+        IFaceEmbeddingNotificationService notificationService = null)
-	{
+    {
-		_httpClientFactory = httpClientFactory;
+        _httpClientFactory = httpClientFactory;
-		_logger = logger;
+        _logger = logger;
-		_notificationService = notificationService;
+        _notificationService = notificationService;
-		_apiBaseUrl = "http://localhost:8000";
+        _apiBaseUrl = "http://localhost:8000";
-	}
+    }
 
-	public async Task<OperationResult> GenerateEmbeddingsAsync(long employeeId, long workshopId,
+    public async Task<OperationResult> GenerateEmbeddingsAsync(long employeeId, long workshopId,
-		string employeeFullName, string picture1Path, string picture2Path)
+        string employeeFullName, string picture1Path, string picture2Path)
-	{
+    {
-		try
+        try
-		{
+        {
-			var httpClient = _httpClientFactory.CreateClient();
+            var httpClient = _httpClientFactory.CreateClient();
-			httpClient.BaseAddress = new Uri(_apiBaseUrl);
+            httpClient.BaseAddress = new Uri(_apiBaseUrl);
-			httpClient.Timeout = TimeSpan.FromSeconds(30);
+            httpClient.Timeout = TimeSpan.FromSeconds(30);
 
-			using var content = new MultipartFormDataContent();
+            using var content = new MultipartFormDataContent();
 
-			// Add form fields
+            // Add form fields
-			content.Add(new StringContent(employeeId.ToString()), "employee_id");
+            content.Add(new StringContent(employeeId.ToString()), "employee_id");
-			content.Add(new StringContent(workshopId.ToString()), "workshop_id");
+            content.Add(new StringContent(workshopId.ToString()), "workshop_id");
-			content.Add(new StringContent(employeeFullName ?? ""), "employee_full_name");
+            content.Add(new StringContent(employeeFullName ?? ""), "employee_full_name");
 
-			// Add picture files
+            // Add picture files
-			if (File.Exists(picture1Path))
+            if (File.Exists(picture1Path))
-			{
+            {
-				var picture1Bytes = await File.ReadAllBytesAsync(picture1Path);
+                var picture1Bytes = await File.ReadAllBytesAsync(picture1Path);
-				var picture1Content = new ByteArrayContent(picture1Bytes);
+                var picture1Content = new ByteArrayContent(picture1Bytes);
-				picture1Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
+                picture1Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
-				content.Add(picture1Content, "picture1", "1.jpg");
+                content.Add(picture1Content, "picture1", "1.jpg");
-			}
+            }
-			else
+            else
-			{
+            {
-				_logger.LogWarning("Picture1 not found at path: {Path}", picture1Path);
+                _logger.LogWarning("Picture1 not found at path: {Path}", picture1Path);
-				return new OperationResult { IsSuccedded = false, Message = "تصویر اول یافت نشد" };
+                return new OperationResult { IsSuccedded = false, Message = "تصویر اول یافت نشد" };
-			}
+            }
 
-			if (File.Exists(picture2Path))
+            if (File.Exists(picture2Path))
-			{
+            {
-				var picture2Bytes = await File.ReadAllBytesAsync(picture2Path);
+                var picture2Bytes = await File.ReadAllBytesAsync(picture2Path);
-				var picture2Content = new ByteArrayContent(picture2Bytes);
+                var picture2Content = new ByteArrayContent(picture2Bytes);
-				picture2Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
+                picture2Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
-				content.Add(picture2Content, "picture2", "2.jpg");
+                content.Add(picture2Content, "picture2", "2.jpg");
-			}
+            }
-			else
+            else
-			{
+            {
-				_logger.LogWarning("Picture2 not found at path: {Path}", picture2Path);
+                _logger.LogWarning("Picture2 not found at path: {Path}", picture2Path);
-				return new OperationResult { IsSuccedded = false, Message = "تصویر دوم یافت نشد" };
+                return new OperationResult { IsSuccedded = false, Message = "تصویر دوم یافت نشد" };
-			}
+            }
 
-			// Send request to Python API
+            // Send request to Python API
-			var response = await httpClient.PostAsync("embeddings", content);
+            var response = await httpClient.PostAsync("embeddings", content);
 
-			if (response.IsSuccessStatusCode)
+            if (response.IsSuccessStatusCode)
-			{
+            {
-				var responseContent = await response.Content.ReadAsStringAsync();
+                var responseContent = await response.Content.ReadAsStringAsync();
-				_logger.LogInformation("Embeddings generated successfully for Employee {EmployeeId}, Workshop {WorkshopId}",
+                _logger.LogInformation(
-	employeeId, workshopId);
+                    "Embeddings generated successfully for Employee {EmployeeId}, Workshop {WorkshopId}",
+                    employeeId, workshopId);
 
-				// ارسال اطلاع‌رسانی به سایر سیستم‌ها
+                // ارسال اطلاع‌رسانی به سایر سیستم‌ها
-				if (_notificationService != null)
+                if (_notificationService != null)
-				{
+                {
-					await _notificationService.NotifyEmbeddingCreatedAsync(workshopId, employeeId, employeeFullName);
+                    await _notificationService.NotifyEmbeddingCreatedAsync(workshopId, employeeId, employeeFullName);
-				}
+                }
 
-				return new OperationResult
+                return new OperationResult
-				{
+                {
-					IsSuccedded = true,
+                    IsSuccedded = true,
-					Message = "Embedding با موفقیت ایجاد شد"
+                    Message = "Embedding با موفقیت ایجاد شد"
-				};
+                };
-			}
+            }
-			else
+            else
-			{
+            {
-				var errorContent = await response.Content.ReadAsStringAsync();
+                var errorContent = await response.Content.ReadAsStringAsync();
-				_logger.LogError("Failed to generate embeddings. Status: {StatusCode}, Error: {Error}",
+                _logger.LogError("Failed to generate embeddings. Status: {StatusCode}, Error: {Error}",
-				  response.StatusCode, errorContent);
+                    response.StatusCode, errorContent);
 
-				return new OperationResult
+                return new OperationResult
-				{
+                {
-					IsSuccedded = false,
+                    IsSuccedded = false,
-					Message = $"خطا در تولید Embedding: {response.StatusCode}"
+                    Message = $"خطا در تولید Embedding: {response.StatusCode}"
-				};
+                };
-			}
+            }
-		}
+        }
-		catch (HttpRequestException ex)
+        catch (HttpRequestException ex)
-		{
+        {
-			_logger.LogError(ex, "HTTP error while calling embeddings API for Employee {EmployeeId}", employeeId);
+            _logger.LogError(ex, "HTTP error while calling embeddings API for Employee {EmployeeId}", employeeId);
-			return new OperationResult
+            return new OperationResult
-			{
+            {
-				IsSuccedded = false,
+                IsSuccedded = false,
-				Message = "خطا در ارتباط با سرور Embedding"
+                Message = "خطا در ارتباط با سرور Embedding"
-			};
+            };
-		}
+        }
-		catch (Exception ex)
+        catch (Exception ex)
-		{
+        {
-			_logger.LogError(ex, "Error while calling embeddings API for Employee {EmployeeId}", employeeId);
+            _logger.LogError(ex, "Error while calling embeddings API for Employee {EmployeeId}", employeeId);
-			return new OperationResult
+            return new OperationResult
-			{
+            {
-				IsSuccedded = false,
+                IsSuccedded = false,
-				Message = "خطای غیرمنتظره در تولید Embedding"
+                Message = "خطای غیرمنتظره در تولید Embedding"
-			};
+            };
-		}
+        }
-	}
+    }
 
-	public async Task<OperationResult> GenerateEmbeddingsFromStreamAsync(long employeeId, long workshopId,
+    public async Task<OperationResult> GenerateEmbeddingsFromStreamAsync(long employeeId, long workshopId,
-		string employeeFullName, Stream picture1Stream, Stream picture2Stream)
+        string employeeFullName, Stream picture1Stream, Stream picture2Stream)
-	{
+    {
-		try
+        try
-		{
+        {
-			var httpClient = _httpClientFactory.CreateClient();
+            var httpClient = _httpClientFactory.CreateClient();
-			httpClient.BaseAddress = new Uri(_apiBaseUrl);
+            httpClient.BaseAddress = new Uri(_apiBaseUrl);
-			httpClient.Timeout = TimeSpan.FromSeconds(30);
+            httpClient.Timeout = TimeSpan.FromSeconds(30);
 
-			using var content = new MultipartFormDataContent();
+            using var content = new MultipartFormDataContent();
 
-			// Add form fields
+            // Add form fields
-			content.Add(new StringContent(employeeId.ToString()), "employee_id");
+            content.Add(new StringContent(employeeId.ToString()), "employee_id");
-			content.Add(new StringContent(workshopId.ToString()), "workshop_id");
+            content.Add(new StringContent(workshopId.ToString()), "workshop_id");
-			content.Add(new StringContent(employeeFullName ?? ""), "employee_full_name");
+            content.Add(new StringContent(employeeFullName ?? ""), "employee_full_name");
 
-			// Add picture streams
+            // Add picture streams
-			var picture1Content = new StreamContent(picture1Stream);
+            var picture1Content = new StreamContent(picture1Stream);
-			picture1Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
+            picture1Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
-			content.Add(picture1Content, "picture1", "1.jpg");
+            content.Add(picture1Content, "picture1", "1.jpg");
 
-			var picture2Content = new StreamContent(picture2Stream);
+            var picture2Content = new StreamContent(picture2Stream);
-			picture2Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
+            picture2Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
-			content.Add(picture2Content, "picture2", "2.jpg");
+            content.Add(picture2Content, "picture2", "2.jpg");
 
-			// Send request to Python API
+            // Send request to Python API
-			var response = await httpClient.PostAsync("embeddings", content);
+            var response = await httpClient.PostAsync("embeddings", content);
 
-			if (response.IsSuccessStatusCode)
+            if (response.IsSuccessStatusCode)
-			{
+            {
-				_logger.LogInformation("Embeddings generated successfully from streams for Employee {EmployeeId}", employeeId);
+                _logger.LogInformation("Embeddings generated successfully from streams for Employee {EmployeeId}",
+                    employeeId);
 
-				// ارسال اطلاع‌رسانی به سایر سیستم‌ها
+                // ارسال اطلاع‌رسانی به سایر سیستم‌ها
-				if (_notificationService != null)
+                if (_notificationService != null)
-				{
+                {
-					await _notificationService.NotifyEmbeddingCreatedAsync(workshopId, employeeId, employeeFullName);
+                    await _notificationService.NotifyEmbeddingCreatedAsync(workshopId, employeeId, employeeFullName);
-				}
+                }
 
-				return new OperationResult { IsSuccedded = true, Message = "Embedding با موفقیت ایجاد شد" };
+                return new OperationResult { IsSuccedded = true, Message = "Embedding با موفقیت ایجاد شد" };
-			}
+            }
-			else
+            else
-			{
+            {
-				var errorContent = await response.Content.ReadAsStringAsync();
+                var errorContent = await response.Content.ReadAsStringAsync();
-				_logger.LogError("Failed to generate embeddings from streams. Status: {StatusCode}, Error: {Error}",
+                _logger.LogError("Failed to generate embeddings from streams. Status: {StatusCode}, Error: {Error}",
-						 response.StatusCode, errorContent);
+                    response.StatusCode, errorContent);
 
-				return new OperationResult
+                return new OperationResult
-				{
+                {
-					IsSuccedded = false,
+                    IsSuccedded = false,
-					Message = $"خطا در تولید Embedding: {response.StatusCode}"
+                    Message = $"خطا در تولید Embedding: {response.StatusCode}"
-				};
+                };
-			}
+            }
-		}
+        }
-		catch (Exception ex)
+        catch (Exception ex)
-		{
+        {
-			_logger.LogError(ex, "Error while generating embeddings from streams for Employee {EmployeeId}", employeeId);
+            _logger.LogError(ex, "Error while generating embeddings from streams for Employee {EmployeeId}",
-			return new OperationResult
+                employeeId);
-			{
+            return new OperationResult
-				IsSuccedded = false,
+            {
-				Message = "خطا در تولید Embedding"
+                IsSuccedded = false,
-			};
+                Message = "خطا در تولید Embedding"
-		}
+            };
-	}
+        }
+    }
 
-	public async Task<OperationResult> RefineEmbeddingAsync(long employeeId, long workshopId, float[] embedding,
+    public async Task<OperationResult> RefineEmbeddingAsync(long employeeId, long workshopId, float[] embedding,
-		float confidence, Dictionary<string, object> metadata = null)
+        float confidence, Dictionary<string, object> metadata = null)
-	{
+    {
-		try
+        try
-		{
+        {
-			var httpClient = _httpClientFactory.CreateClient();
+            var httpClient = _httpClientFactory.CreateClient();
-			httpClient.BaseAddress = new Uri(_apiBaseUrl);
+            httpClient.BaseAddress = new Uri(_apiBaseUrl);
-			httpClient.Timeout = TimeSpan.FromSeconds(30);
+            httpClient.Timeout = TimeSpan.FromSeconds(30);
 
-			var requestBody = new
+            var requestBody = new
-			{
+            {
-				employeeId,
+                employeeId,
-				workshopId,
+                workshopId,
-				embedding,
+                embedding,
-				confidence,
+                confidence,
-				metadata = metadata ?? new Dictionary<string, object>()
+                metadata = metadata ?? new Dictionary<string, object>()
-			};
+            };
 
-			var response = await httpClient.PostAsJsonAsync("embeddings/refine", requestBody);
+            var response = await httpClient.PostAsJsonAsync("embeddings/refine", requestBody);
 
-			if (response.IsSuccessStatusCode)
+            if (response.IsSuccessStatusCode)
-			{
+            {
-				_logger.LogInformation("Embedding refined successfully for Employee {EmployeeId}", employeeId);
+                _logger.LogInformation("Embedding refined successfully for Employee {EmployeeId}", employeeId);
 
-				// ارسال اطلاع‌رسانی به سایر سیستم‌ها
+                // ارسال اطلاع‌رسانی به سایر سیستم‌ها
-				if (_notificationService != null)
+                if (_notificationService != null)
-				{
+                {
-					await _notificationService.NotifyEmbeddingRefinedAsync(workshopId, employeeId);
+                    await _notificationService.NotifyEmbeddingRefinedAsync(workshopId, employeeId);
-				}
+                }
 
-				return new OperationResult { IsSuccedded = true, Message = "Embedding بهبود یافت" };
+                return new OperationResult { IsSuccedded = true, Message = "Embedding بهبود یافت" };
-			}
+            }
-			else
+            else
-			{
+            {
-				var errorContent = await response.Content.ReadAsStringAsync();
+                var errorContent = await response.Content.ReadAsStringAsync();
-				_logger.LogError("Failed to refine embedding. Status: {StatusCode}, Error: {Error}",
+                _logger.LogError("Failed to refine embedding. Status: {StatusCode}, Error: {Error}",
-				response.StatusCode, errorContent);
+                    response.StatusCode, errorContent);
 
-				return new OperationResult
+                return new OperationResult
-				{
+                {
-					IsSuccedded = false,
+                    IsSuccedded = false,
-					Message = $"خطا در بهبود Embedding: {response.StatusCode}"
+                    Message = $"خطا در بهبود Embedding: {response.StatusCode}"
-				};
+                };
-			}
+            }
-		}
+        }
-		catch (Exception ex)
+        catch (Exception ex)
-		{
+        {
-			_logger.LogError(ex, "Error while refining embedding for Employee {EmployeeId}", employeeId);
+            _logger.LogError(ex, "Error while refining embedding for Employee {EmployeeId}", employeeId);
-			return new OperationResult
+            return new OperationResult
-			{
+            {
-				IsSuccedded = false,
+                IsSuccedded = false,
-				Message = "خطا در بهبود Embedding"
+                Message = "خطا در بهبود Embedding"
-			};
+            };
-		}
+        }
-	}
+    }
 
-	public async Task<OperationResult> DeleteEmbeddingAsync(long employeeId, long workshopId)
+    public async Task<OperationResult> DeleteEmbeddingAsync(long employeeId, long workshopId)
-	{
+    {
-		try
+        try
-		{
+        {
-			var httpClient = _httpClientFactory.CreateClient();
+            var httpClient = _httpClientFactory.CreateClient();
-			httpClient.BaseAddress = new Uri(_apiBaseUrl);
+            httpClient.BaseAddress = new Uri(_apiBaseUrl);
-			httpClient.Timeout = TimeSpan.FromSeconds(30);
+            httpClient.Timeout = TimeSpan.FromSeconds(30);
 
-			var response = await httpClient.DeleteAsync($"embeddings/{workshopId}/{employeeId}");
+            var response = await httpClient.DeleteAsync($"embeddings/{workshopId}/{employeeId}");
 
-			if (response.IsSuccessStatusCode)
+            if (response.IsSuccessStatusCode)
-			{
+            {
-				_logger.LogInformation("Embedding deleted successfully for Employee {EmployeeId}", employeeId);
+                _logger.LogInformation("Embedding deleted successfully for Employee {EmployeeId}", employeeId);
 
-				// ارسال اطلاع‌رسانی به سایر سیستم‌ها
+                // ارسال اطلاع‌رسانی به سایر سیستم‌ها
-				if (_notificationService != null)
+                if (_notificationService != null)
-				{
+                {
-					await _notificationService.NotifyEmbeddingDeletedAsync(workshopId, employeeId);
+                    await _notificationService.NotifyEmbeddingDeletedAsync(workshopId, employeeId);
-				}
+                }
 
-				return new OperationResult { IsSuccedded = true, Message = "Embedding حذف شد" };
+                return new OperationResult { IsSuccedded = true, Message = "Embedding حذف شد" };
-			}
+            }
-			else
+            else
-			{
+            {
-				var errorContent = await response.Content.ReadAsStringAsync();
+                var errorContent = await response.Content.ReadAsStringAsync();
-				_logger.LogError("Failed to delete embedding. Status: {StatusCode}, Error: {Error}",
+                _logger.LogError("Failed to delete embedding. Status: {StatusCode}, Error: {Error}",
-								response.StatusCode, errorContent);
+                    response.StatusCode, errorContent);
 
-				return new OperationResult
+                return new OperationResult
-				{
+                {
-					IsSuccedded = false,
+                    IsSuccedded = false,
-					Message = $"خطا در حذف Embedding: {response.StatusCode}"
+                    Message = $"خطا در حذف Embedding: {response.StatusCode}"
-				};
+                };
-			}
+            }
-		}
+        }
-		catch (Exception ex)
+        catch (Exception ex)
-		{
+        {
-			_logger.LogError(ex, "Error while deleting embedding for Employee {EmployeeId}", employeeId);
+            _logger.LogError(ex, "Error while deleting embedding for Employee {EmployeeId}", employeeId);
-			return new OperationResult
+            return new OperationResult
-			{
+            {
-				IsSuccedded = false,
+                IsSuccedded = false,
-				Message = "خطا در حذف Embedding"
+                Message = "خطا در حذف Embedding"
-			};
+            };
-		}
+        }
-	}
+    }
 
-	public async Task<OperationResult<FaceEmbeddingResponse>> GetEmbeddingAsync(long employeeId, long workshopId)
+    public async Task<OperationResult<FaceEmbeddingResponse>> GetEmbeddingAsync(long employeeId, long workshopId)
-	{
+    {
-		try
+        try
-		{
+        {
-			var httpClient = _httpClientFactory.CreateClient();
+            var httpClient = _httpClientFactory.CreateClient();
-			httpClient.BaseAddress = new Uri(_apiBaseUrl);
+            httpClient.BaseAddress = new Uri(_apiBaseUrl);
-			httpClient.Timeout = TimeSpan.FromSeconds(30);
+            httpClient.Timeout = TimeSpan.FromSeconds(30);
 
-			var response = await httpClient.GetAsync($"embeddings/{workshopId}/{employeeId}");
+            var response = await httpClient.GetAsync($"embeddings/{workshopId}/{employeeId}");
 
-			if (response.IsSuccessStatusCode)
+            if (response.IsSuccessStatusCode)
-			{
+            {
-				var content = await response.Content.ReadAsStringAsync();
+                var content = await response.Content.ReadAsStringAsync();
-				var embeddingData = JsonSerializer.Deserialize<FaceEmbeddingResponse>(content,
+                var embeddingData = JsonSerializer.Deserialize<FaceEmbeddingResponse>(content,
-		   new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
+                    new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
 
-				_logger.LogInformation("Embedding retrieved successfully for Employee {EmployeeId}", employeeId);
+                _logger.LogInformation("Embedding retrieved successfully for Employee {EmployeeId}", employeeId);
 
-				return new OperationResult<FaceEmbeddingResponse>
+                return new OperationResult<FaceEmbeddingResponse>
-				{
+                {
-					IsSuccedded = true,
+                    IsSuccedded = true,
-					Message = "Embedding دریافت شد",
+                    Message = "Embedding دریافت شد",
-					Data = embeddingData
+                    Data = embeddingData
-				};
+                };
-			}
+            }
-			else
+            else
-			{
+            {
-				var errorContent = await response.Content.ReadAsStringAsync();
+                var errorContent = await response.Content.ReadAsStringAsync();
-				_logger.LogError("Failed to get embedding. Status: {StatusCode}, Error: {Error}",
+                _logger.LogError("Failed to get embedding. Status: {StatusCode}, Error: {Error}",
-						response.StatusCode, errorContent);
+                    response.StatusCode, errorContent);
 
-				return new OperationResult<FaceEmbeddingResponse>
+                return new OperationResult<FaceEmbeddingResponse>
-				{
+                {
-					IsSuccedded = false,
+                    IsSuccedded = false,
-					Message = $"خطا در دریافت Embedding: {response.StatusCode}"
+                    Message = $"خطا در دریافت Embedding: {response.StatusCode}"
-				};
+                };
-			}
+            }
-		}
+        }
-		catch (Exception ex)
+        catch (Exception ex)
-		{
+        {
-			_logger.LogError(ex, "Error while getting embedding for Employee {EmployeeId}", employeeId);
+            _logger.LogError(ex, "Error while getting embedding for Employee {EmployeeId}", employeeId);
-			return new OperationResult<FaceEmbeddingResponse>
+            return new OperationResult<FaceEmbeddingResponse>
-			{
+            {
-				IsSuccedded = false,
+                IsSuccedded = false,
-				Message = "خطا در دریافت Embedding"
+                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"
+            };
+        }
+    }
 }

AccountManagement.Application.Contracts/Account/EditAccount.cs

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

AccountManagement.Application.Contracts/Account/EditClientAccount.cs

@@ -1,10 +1,4 @@
-using System;
+namespace AccountManagement.Application.Contracts.Account;
-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,6 @@
 
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using AccountManagement.Application.Contracts.ProgramManager;
 using Shared.Contracts.PmUser.Queries;
 
 namespace AccountManagement.Application.Contracts.Account;
@@ -35,7 +34,7 @@ public interface IAccountApplication
     OperationResult DeActive(long id);
     OperationResult DirectLogin(long id);
 
-    AccountLeftWorkViewModel WorkshopList(long accountId);
+    // AccountLeftWorkViewModel WorkshopList(long accountId);
     OperationResult SaveWorkshopAccount(
         List<WorkshopAccountlistViewModel> workshopAccountList,
         string startDate,
@@ -75,12 +74,8 @@ public interface IAccountApplication
 
     void CameraLogin(CameraLoginRequest request);
 
-    /// <summary>
+    Task<GetPmUserDto> GetPmUserAsync(long accountId);
-    /// دریافت کاربر پروگرام منیجر با اکانت آی دی
+
-    /// </summary>
-    /// <param name="accountId"></param>
-    /// <returns></returns>
-    Task<GetPmUserDto> GetPmUserByAccountId(long accountId);
 }
 
 public class CameraLoginRequest

AccountManagement.Application.Contracts/Account/RegisterAccount.cs

@@ -1,10 +1,4 @@
-using System;
+using System.ComponentModel.DataAnnotations;
-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,10 +1,4 @@
-using System;
+namespace AccountManagement.Application.Contracts.Account;
-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/GetRoleDto.cs

@@ -1,28 +0,0 @@
-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,13 +2,9 @@
 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;
@@ -17,25 +13,13 @@ 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 AccountManagement.Application.Contracts.ProgramManager;
+
 using Shared.Contracts.PmUser.Commands;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
 using Shared.Contracts.PmUser.Queries;
 
 //using AccountManagement.Domain.RoleAgg;
@@ -58,13 +42,13 @@ 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, IPmUserRepository pmUserRepository, 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, IPmUserQueryService pmUserQueryService, IPmUserCommandService pmUserCommandService)
     {
         _authHelper = authHelper;
         _roleRepository = roleRepository;
@@ -78,7 +62,7 @@ public class AccountApplication : IAccountApplication
         _workshopSubAccountRepository = workshopSubAccountRepository;
         _accountPermissionSubtitle1Repository = accountPermissionSubtitle1Repository;
         _unitOfWork = unitOfWork;
-        _pmUserRepository = pmUserRepository;
+
         _pmUserQueryService = pmUserQueryService;
         _pmUserCommandService = pmUserCommandService;
         _fileUploader = fileUploader;
@@ -171,6 +155,8 @@ 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));
@@ -268,6 +254,8 @@ public class AccountApplication : IAccountApplication
         //);
         var userResult =await _pmUserQueryService.GetPmUserDataByAccountId(account.id);
 
+        if (command.UserRoles == null)
+            return operation.Failed("حداقل یک نقش برای کاربر مدیریت پروژه لازم است");
         var pmUserRoles = command.UserRoles.Where(x => x > 0).ToList();
 
         //اگر کاربر در پروگرام منیجر قبلا ایجاد شده
@@ -412,6 +400,23 @@ 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)
             {
@@ -421,7 +426,7 @@ public class AccountApplication : IAccountApplication
             {
                 positionValue = null;
             }
-            var pmUserId = _pmUserQueryService.GetCurrentPmUserIdFromAccountId(account.id).GetAwaiter().GetResult();
+            var pmUserId = PmUserData.AccountId > 0 ? PmUserData.AccountId : null;
             var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
                 , account.Username, account.Mobile, account.ProfilePhoto,
                 permissions, account.RoleName, account.AdminAreaPermission, 
@@ -740,25 +745,25 @@ public class AccountApplication : IAccountApplication
     }
 
 
-    public AccountLeftWorkViewModel WorkshopList(long accountId)
+    // public AccountLeftWorkViewModel WorkshopList(long accountId)
-    {
+    // {
-        string fullname = this._accountRepository.GetById(accountId).Fullname;
+    //     string fullname = this._accountRepository.GetById(accountId).Fullname;
-        List<WorkshopAccountlistViewModel> source = _accountLeftworkRepository.WorkshopList(accountId);
+    //     List<WorkshopAccountlistViewModel> source = _accountLeftworkRepository.WorkshopList(accountId);
-        List<long> userWorkshopIds = source.Select(x => x.WorkshopId).ToList();
+    //     List<long> userWorkshopIds = source.Select(x => x.WorkshopId).ToList();
-        List<WorkshopSelectList> allWorkshops = this._accountLeftworkRepository.GetAllWorkshops();
+    //     List<WorkshopSelectList> allWorkshops = this._accountLeftworkRepository.GetAllWorkshops();
-        List<AccountViewModel> accountSelectList = this._accountRepository.GetAdminAccountSelectList();
+    //     List<AccountViewModel> accountSelectList = this._accountRepository.GetAdminAccountSelectList();
-        (string StartWorkFa, string LeftWorkFa) byAccountId = this._accountLeftworkRepository.GetByAccountId(accountId);
+    //     (string StartWorkFa, string LeftWorkFa) byAccountId = this._accountLeftworkRepository.GetByAccountId(accountId);
-        return new AccountLeftWorkViewModel()
+    //     return new AccountLeftWorkViewModel()
-        {
+    //     {
-            AccountId = accountId,
+    //         AccountId = accountId,
-            AccountFullName = fullname,
+    //         AccountFullName = fullname,
-            StartDateFa = byAccountId.StartWorkFa,
+    //         StartDateFa = byAccountId.StartWorkFa,
-            LeftDateFa = byAccountId.LeftWorkFa,
+    //         LeftDateFa = byAccountId.LeftWorkFa,
-            WorkshopAccountlist = source,
+    //         WorkshopAccountlist = source,
-            WorkshopSelectList = new SelectList(allWorkshops.Where(x => !userWorkshopIds.Contains(x.Id)), "Id", "WorkshopFullName"),
+    //         WorkshopSelectList = new SelectList(allWorkshops.Where(x => !userWorkshopIds.Contains(x.Id)), "Id", "WorkshopFullName"),
-            AccountSelectList = new SelectList(accountSelectList, "Id", "Fullname")
+    //         AccountSelectList = new SelectList(accountSelectList, "Id", "Fullname")
-        };
+    //     };
-    }
+    // }
 
     public OperationResult SaveWorkshopAccount(
         List<WorkshopAccountlistViewModel> workshopAccountList,
@@ -1015,8 +1020,8 @@ public class AccountApplication : IAccountApplication
         _authHelper.CameraSignIn(authViewModel);
     }
 
-    public async Task<GetPmUserDto> GetPmUserByAccountId(long accountId)
+    public async Task<GetPmUserDto> GetPmUserAsync(long accountId)
     {
-        return await _pmUserRepository.GetPmUserByAccountId(accountId);
+        return await _pmUserQueryService.GetPmUserDataByAccountId(accountId);
     }
 }

AccountManagement.Application/CameraAccountApplication.cs

@@ -1,8 +1,6 @@
 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,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using _0_Framework.Application;

AccountManagement.Application/RoleApplication.cs

@@ -4,13 +4,7 @@ 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;
@@ -22,18 +16,15 @@ 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, IPmRoleRepository pmRoleRepository, IPmUserRepository pmUserRepository, IPmRoleQueryService pmRoleQueryService, IPmRoleCommandService pmRoleCommandService)
+    public RoleApplication(IRoleRepository roleRepository, IUnitOfWork unitOfWork, IPmRoleQueryService pmRoleQueryService, IPmRoleCommandService pmRoleCommandService)
     {
         _roleRepository = roleRepository;
         _unitOfWork = unitOfWork;
-        _pmRoleRepository = pmRoleRepository;
-        _pmUserRepository = pmUserRepository;
         _pmRoleQueryService = pmRoleQueryService;
         _pmRoleCommandService = pmRoleCommandService;
     }

AccountManagement.Application/SubAccountApplication.cs

@@ -5,14 +5,11 @@ 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,9 +1,7 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using _0_Framework.Application;
 using AccountManagement.Application.Contracts.TaskSubject;
 using AccountManagement.Domain.TaskSubjectAgg;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
 
 namespace AccountManagement.Application;
 

AccountManagement.Configuration/PmDbBootstrapper.cs

@@ -1,18 +0,0 @@
-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/AccountLeftWorkAgg/IAccountLeftworkRepository.cs

@@ -10,7 +10,7 @@ public interface IAccountLeftworkRepository : IRepository<long, AccountLeftWork>
 {
 	(string StartWorkFa, string LeftWorkFa) GetByAccountId(long accountId);
 	List<WorkshopAccountlistViewModel> WorkshopList(long accountId);
-    List<WorkshopSelectList> GetAllWorkshops();
+    // List<WorkshopSelectList> GetAllWorkshops();
 
     OperationResult CopyWorkshopToNewAccount(long currentAccountId, long newAccountId);
 

AccountManagement.Domain/PmDomains/PmPermissionAgg/PmPermission.cs

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

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

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

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

@@ -1,22 +0,0 @@
-using _0_Framework.Domain;
-using AccountManagement.Application.Contracts.ProgramManager;
-using System.Threading.Tasks;
-using Shared.Contracts.PmUser.Queries;
-
-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

@@ -1,127 +0,0 @@
-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/AccountContext.cs

@@ -1,4 +1,4 @@
-using AccountManagement.Domain.AccountAgg;
+using AccountManagement.Domain.AccountAgg;
 using AccountMangement.Infrastructure.EFCore.Mappings;
 using Microsoft.EntityFrameworkCore;
 using System;
@@ -26,7 +26,6 @@ using AccountManagement.Domain.SubAccountPermissionSubtitle2Agg;
 using AccountManagement.Domain.SubAccountPermissionSubtitle3Agg;
 using AccountManagement.Domain.SubAccountPermissionSubtitle4Agg;
 using AccountManagement.Domain.SubAccountRoleAgg;
-using AccountMangement.Infrastructure.EFCore.Seed;
 using AccountManagement.Domain.TaskScheduleAgg;
 
 namespace AccountMangement.Infrastructure.EFCore
@@ -60,9 +59,10 @@ namespace AccountMangement.Infrastructure.EFCore
 
         public DbSet<TaskSchedule> TaskSchedules { get; set; }
 
-
         #endregion
 
+
+
         #region Pooya
         public DbSet<SubAccount> SubAccounts { get; set; }
         public DbSet<SubAccountRole> SubAccountRoles { get; set; }

AccountMangement.Infrastructure.EFCore/AccountMangement.Infrastructure.EFCore.csproj

@@ -24,4 +24,8 @@
 	  <Folder Include="Services\" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Compile Remove="Mappings\BugReportMapping.cs" />
+	</ItemGroup>
+
 </Project>

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

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

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

@@ -1,32 +0,0 @@
-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/AccountLeftworkRepository.cs

@@ -18,14 +18,13 @@ public class AccountLeftworkRepository : RepositoryBase<long, AccountLeftWork>,
 {
 	private readonly AccountContext _accountContext;
   private readonly IWorkshopAccountRepository _workshopAccountRepository;
-  private readonly IWorkshopApplication _workshopApplication;
 
-    public AccountLeftworkRepository(AccountContext accountContext, IWorkshopAccountRepository workshopAccountRepository, IWorkshopApplication workshopApplication) : base(accountContext)
+    public AccountLeftworkRepository(AccountContext accountContext,
+	    IWorkshopAccountRepository workshopAccountRepository) : base(accountContext)
 	{
 		_accountContext = accountContext;
 		_workshopAccountRepository = workshopAccountRepository;
-        _workshopApplication = workshopApplication;
+	}
-    }
 
 	public (string StartWorkFa, string LeftWorkFa) GetByAccountId(long accountId)
 	{
@@ -58,14 +57,14 @@ public class AccountLeftworkRepository : RepositoryBase<long, AccountLeftWork>,
 		}).ToList();
 	}
 
-    public List<WorkshopSelectList> GetAllWorkshops()
+    // public List<WorkshopSelectList> GetAllWorkshops()
-    {
+    // {
-        return this._workshopApplication.GetWorkshopAll().Select(x => new WorkshopSelectList()
+    //     return this._workshopApplication.GetWorkshopAll().Select(x => new WorkshopSelectList()
-        {
+    //     {
-            Id = x.Id,
+    //         Id = x.Id,
-            WorkshopFullName = x.WorkshopFullName
+    //         WorkshopFullName = x.WorkshopFullName
-        }).ToList();
+    //     }).ToList();
-    }
+    // }
 
     public OperationResult CopyWorkshopToNewAccount(long currentAccountId, long newAccountId)
     {

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

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

@@ -1,48 +0,0 @@
-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;
-using Shared.Contracts.PmUser.Queries;
-
-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(),
-        };
-    }
-}

BUG_REPORT_SYSTEM.md

@@ -0,0 +1,175 @@
+# سیستم گزارش خرابی (Bug Report System)
+
+## نمای کلی
+
+این سیستم برای جمع‌آوری، ذخیره و مدیریت گزارش‌های خرابی از تطبیق موبایلی طراحی شده است.
+
+## ساختار فایل‌ها
+
+### Domain Layer
+- `AccountManagement.Domain/BugReportAgg/`
+  - `BugReport.cs` - موجودیت اصلی
+  - `BugReportLog.cs` - لاگ‌های گزارش
+  - `BugReportScreenshot.cs` - تصاویر ضمیمه شده
+
+### Application Contracts
+- `AccountManagement.Application.Contracts/BugReport/`
+  - `IBugReportApplication.cs` - اینترفیس سرویس
+  - `CreateBugReportCommand.cs` - درخواست ایجاد
+  - `EditBugReportCommand.cs` - درخواست ویرایش
+  - `BugReportViewModel.cs` - نمایش لیست
+  - `BugReportDetailViewModel.cs` - نمایش جزئیات
+  - `IBugReportRepository.cs` - اینترفیس Repository
+
+### Application Service
+- `AccountManagement.Application/BugReportApplication.cs` - پیاده‌سازی سرویس
+
+### Infrastructure
+- `AccountMangement.Infrastructure.EFCore/`
+  - `Mappings/BugReportMapping.cs`
+  - `Mappings/BugReportLogMapping.cs`
+  - `Mappings/BugReportScreenshotMapping.cs`
+  - `Repository/BugReportRepository.cs`
+
+### API Controller
+- `ServiceHost/Controllers/BugReportController.cs`
+
+### Admin Pages
+- `ServiceHost/Areas/AdminNew/Pages/BugReport/`
+  - `BugReportPageModel.cs` - base model
+  - `Index.cshtml.cs / Index.cshtml` - لیست گزارش‌ها
+  - `Details.cshtml.cs / Details.cshtml` - جزئیات کامل
+  - `Edit.cshtml.cs / Edit.cshtml` - ویرایش وضعیت/اولویت
+  - `Delete.cshtml.cs / Delete.cshtml` - حذف
+
+## روش استفاده
+
+### 1. ثبت گزارش از موبایل
+
+```csharp
+POST /api/bugreport/submit
+
+{
+  "title": "برنامه هنگام ورود خراب می‌شود",
+  "description": "هنگام وارد کردن نام کاربری، برنامه کرش می‌کند",
+  "userEmail": "user@example.com",
+  "deviceModel": "Samsung Galaxy S21",
+  "osVersion": "Android 12",
+  "platform": "Android",
+  "manufacturer": "Samsung",
+  "deviceId": "device-unique-id",
+  "screenResolution": "1440x3200",
+  "memoryInMB": 8000,
+  "storageInMB": 256000,
+  "batteryLevel": 75,
+  "isCharging": false,
+  "networkType": "4G",
+  "appVersion": "1.0.0",
+  "buildNumber": "100",
+  "packageName": "com.example.app",
+  "installTime": "2024-01-01T10:00:00Z",
+  "lastUpdateTime": "2024-12-01T14:30:00Z",
+  "flavor": "production",
+  "type": 1,           // Crash = 1
+  "priority": 2,       // High = 2
+  "stackTrace": "...",
+  "logs": ["log1", "log2"],
+  "screenshots": ["base64-encoded-image-1"]
+}
+```
+
+### 2. دسترسی به Admin Panel
+
+```
+https://yourdomain.com/AdminNew/BugReport
+```
+
+**صفحات موجود:**
+- **Index** - لیست تمام گزارش‌ها با فیلترها
+- **Details** - نمایش جزئیات کامل شامل:
+  - معلومات کاربر و گزارش
+  - معلومات دستگاه
+  - معلومات برنامه
+  - لاگ‌ها
+  - تصاویر
+  - Stack Trace
+- **Edit** - تغییر وضعیت و اولویت
+- **Delete** - حذف گزارش
+
+### 3. درخواست‌های API
+
+#### دریافت لیست
+```
+GET /api/bugreport/list?type=1&priority=2&status=1&searchTerm=crash&pageNumber=1&pageSize=10
+```
+
+#### دریافت جزئیات
+```
+GET /api/bugreport/{id}
+```
+
+#### ویرایش
+```
+PUT /api/bugreport/{id}
+
+{
+  "id": 1,
+  "priority": 2,
+  "status": 3
+}
+```
+
+#### حذف
+```
+DELETE /api/bugreport/{id}
+```
+
+## انواع (Enums)
+
+### BugReportType
+- `1` - Crash (کرش)
+- `2` - UI (مشکل رابط)
+- `3` - Performance (عملکرد)
+- `4` - Feature (فیچر)
+- `5` - Network (شبکه)
+- `6` - Camera (دوربین)
+- `7` - FaceRecognition (تشخیص چهره)
+- `8` - Database (دیتابیس)
+- `9` - Login (ورود)
+- `10` - Other (سایر)
+
+### BugPriority
+- `1` - Critical (بحرانی)
+- `2` - High (بالا)
+- `3` - Medium (متوسط)
+- `4` - Low (پایین)
+
+### BugReportStatus
+- `1` - Open (باز)
+- `2` - InProgress (در حال بررسی)
+- `3` - Fixed (رفع شده)
+- `4` - Closed (بسته شده)
+- `5` - Reopened (مجدداً باز)
+
+## Migration
+
+برای اعمال تغییرات دیتابیس:
+
+```powershell
+Add-Migration AddBugReportTables
+Update-Database
+```
+
+## نکات مهم
+
+1. **تصاویر**: تصاویر به صورت Base64 encoded ذخیره می‌شوند
+2. **لاگ‌ها**: تمام لاگ‌ها به صورت جدا ذخیره می‌شوند
+3. **وضعیت پیش‌فرض**: وقتی گزارش ثبت می‌شود، وضعیت آن "Open" است
+4. **تاریخ**: تاریخ ایجاد و بروزرسانی خودکار ثبت می‌شود
+
+## Security
+
+- API endpoints از `authentication` محافظت می‌شوند
+- Admin pages تنها برای کاربرانی با دسترسی AdminArea قابل دسترس هستند
+- حذف و ویرایش نیاز به تأیید دارد
+

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/BackgroundInstitutionContract.Task.csproj

@@ -12,8 +12,14 @@
       <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,5 +1,6 @@
 
 using _0_Framework.Application;
+using _0_Framework.Application.Sms;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.InstitutionContractAgg;
 using Hangfire;
@@ -13,18 +14,22 @@ 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)
+    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient, IInstitutionContractRepository institutionContractRepository, ISmsService smsService, ILogger<JobSchedulerRegistrator> logger)
     {
         _smsReminder = smsReminder;
         _backgroundJobClient = backgroundJobClient;
         _institutionContractRepository = institutionContractRepository;
+        _smsService = smsService;
+        _logger = logger;
     }
 
     public void Register()
     {
-
+        _logger.LogInformation("hangfire Started");
         RecurringJob.AddOrUpdate(
             "InstitutionContract.CreateFinancialTransaction",
             () => CreateFinancialTransaction(),
@@ -47,6 +52,11 @@ public class JobSchedulerRegistrator
             () => SendBlockSms(),
             "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
         );
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.SendInstitutionContractConfirmSms",
+            () => SendInstitutionContractConfirmSms(),
+            "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
+        );
     }
 
 
@@ -60,7 +70,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)
         {
@@ -86,7 +96,7 @@ public class JobSchedulerRegistrator
             }
             catch (Exception e)
             {
-                //_smsService.Alarm("09114221321", "خطا-ایجاد سند مالی");
+                await _smsService.Alarm("09114221321", "خطا-ایجاد سند مالی");
 
             }
            
@@ -105,7 +115,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)
         {
@@ -133,6 +143,7 @@ public class JobSchedulerRegistrator
     [DisableConcurrentExecution(timeoutInSeconds: 1200)]
     public async System.Threading.Tasks.Task SendReminderSms()
     {
+        _logger.LogInformation("SendReminderSms job run");
         await _institutionContractRepository.SendReminderSmsForBackgroundTask();
     }
 
@@ -143,7 +154,20 @@ 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

@@ -0,0 +1,10 @@
+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,13 +7,47 @@ 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));
@@ -26,7 +60,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");
@@ -38,17 +72,28 @@ 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=.;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=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": {

CHANGELOG.md

@@ -0,0 +1,314 @@
+# خلاصه تغییرات سیستم گزارش خرابی
+
+## 📝 فایل‌های اضافه شده (23 فایل)
+
+### 1️⃣ Domain Layer (3 فایل)
+```
+✓ AccountManagement.Domain/BugReportAgg/
+  ├── BugReport.cs
+  ├── BugReportLog.cs
+  └── BugReportScreenshot.cs
+```
+
+### 2️⃣ Application Contracts (6 فایل)
+```
+✓ AccountManagement.Application.Contracts/BugReport/
+  ├── IBugReportRepository.cs
+  ├── IBugReportApplication.cs
+  ├── CreateBugReportCommand.cs
+  ├── EditBugReportCommand.cs
+  ├── BugReportViewModel.cs
+  └── BugReportDetailViewModel.cs
+```
+
+### 3️⃣ Application Service (1 فایل)
+```
+✓ AccountManagement.Application/
+  └── BugReportApplication.cs
+```
+
+### 4️⃣ Infrastructure EFCore (4 فایل)
+```
+✓ AccountMangement.Infrastructure.EFCore/
+  ├── Mappings/
+  │   ├── BugReportMapping.cs
+  │   ├── BugReportLogMapping.cs
+  │   └── BugReportScreenshotMapping.cs
+  └── Repository/
+      └── BugReportRepository.cs
+```
+
+### 5️⃣ API Controller (1 فایل)
+```
+✓ ServiceHost/Controllers/
+  └── BugReportController.cs
+```
+
+### 6️⃣ Admin Pages (8 فایل)
+```
+✓ ServiceHost/Areas/AdminNew/Pages/BugReport/
+  ├── BugReportPageModel.cs
+  ├── Index.cshtml.cs
+  ├── Index.cshtml
+  ├── Details.cshtml.cs
+  ├── Details.cshtml
+  ├── Edit.cshtml.cs
+  ├── Edit.cshtml
+  ├── Delete.cshtml.cs
+  └── Delete.cshtml
+```
+
+### 7️⃣ Documentation (2 فایل)
+```
+✓ BUG_REPORT_SYSTEM.md
+✓ FLUTTER_BUG_REPORT_EXAMPLE.dart
+```
+
+---
+
+## ✏️ فایل‌های اصلاح شده (2 فایل)
+
+### 1. AccountManagement.Configuration/AccountManagementBootstrapper.cs
+**تغییر:** اضافه کردن using برای BugReport
+```csharp
+using AccountManagement.Application.Contracts.BugReport;
+```
+
+**تغییر:** رجیستریشن سرویس‌ها
+```csharp
+services.AddTransient<IBugReportApplication, BugReportApplication>();
+services.AddTransient<IBugReportRepository, BugReportRepository>();
+```
+
+### 2. AccountMangement.Infrastructure.EFCore/AccountContext.cs
+**تغییر:** اضافه کردن using
+```csharp
+using AccountManagement.Domain.BugReportAgg;
+```
+
+**تغییر:** اضافه کردن DbSets
+```csharp
+#region BugReport
+public DbSet<BugReport> BugReports { get; set; }
+public DbSet<BugReportLog> BugReportLogs { get; set; }
+public DbSet<BugReportScreenshot> BugReportScreenshots { get; set; }
+#endregion
+```
+
+---
+
+## 🔧 موارد مورد نیاز قبل از استفاده
+
+### 1. Database Migration
+```powershell
+# در Package Manager Console
+cd AccountMangement.Infrastructure.EFCore
+
+Add-Migration AddBugReportSystem
+Update-Database
+```
+
+### 2. الگوی Enum برای Flutter
+```dart
+enum BugReportType {
+  crash, // 1
+  ui, // 2
+  performance, // 3
+  feature, // 4
+  network, // 5
+  camera, // 6
+  faceRecognition, // 7
+  database, // 8
+  login, // 9
+  other, // 10
+}
+
+enum BugPriority {
+  critical, // 1
+  high, // 2
+  medium, // 3
+  low, // 4
+}
+```
+
+---
+
+## 🚀 نقاط ورود
+
+### API Endpoints
+```
+POST   /api/bugreport/submit          - ثبت گزارش جدید
+GET    /api/bugreport/list            - دریافت لیست
+GET    /api/bugreport/{id}            - دریافت جزئیات
+PUT    /api/bugreport/{id}            - ویرایش وضعیت/اولویت
+DELETE /api/bugreport/{id}            - حذف گزارش
+```
+
+### Admin Pages
+```
+/AdminNew/BugReport                   - لیست گزارش‌ها
+/AdminNew/BugReport/Details/{id}      - جزئیات کامل
+/AdminNew/BugReport/Edit/{id}         - ویرایش
+/AdminNew/BugReport/Delete/{id}       - حذف
+```
+
+---
+
+## 📊 Database Schema
+
+### BugReports جدول
+```sql
+- id (bigint, PK)
+- Title (nvarchar(200))
+- Description (ntext)
+- UserEmail (nvarchar(150))
+- AccountId (bigint, nullable)
+- DeviceModel (nvarchar(100))
+- OsVersion (nvarchar(50))
+- Platform (nvarchar(50))
+- Manufacturer (nvarchar(100))
+- DeviceId (nvarchar(200))
+- ScreenResolution (nvarchar(50))
+- MemoryInMB (int)
+- StorageInMB (int)
+- BatteryLevel (int)
+- IsCharging (bit)
+- NetworkType (nvarchar(50))
+- AppVersion (nvarchar(50))
+- BuildNumber (nvarchar(50))
+- PackageName (nvarchar(150))
+- InstallTime (datetime2)
+- LastUpdateTime (datetime2)
+- Flavor (nvarchar(50))
+- Type (int)
+- Priority (int)
+- Status (int)
+- StackTrace (ntext, nullable)
+- CreationDate (datetime2)
+- UpdateDate (datetime2, nullable)
+```
+
+### BugReportLogs جدول
+```sql
+- id (bigint, PK)
+- BugReportId (bigint, FK)
+- Message (ntext)
+- Timestamp (datetime2)
+```
+
+### BugReportScreenshots جدول
+```sql
+- id (bigint, PK)
+- BugReportId (bigint, FK)
+- Base64Data (ntext)
+- FileName (nvarchar(255))
+- UploadDate (datetime2)
+```
+
+---
+
+## ✨ مثال درخواست API
+
+```json
+POST /api/bugreport/submit
+Content-Type: application/json
+
+{
+  "title": "برنامه هنگام ورود خراب می‌شود",
+  "description": "هنگام فشار دادن دکمه ورود، برنامه کرش می‌کند",
+  "userEmail": "user@example.com",
+  "accountId": 123,
+  "deviceModel": "Samsung Galaxy S21",
+  "osVersion": "Android 12",
+  "platform": "Android",
+  "manufacturer": "Samsung",
+  "deviceId": "device-12345",
+  "screenResolution": "1440x3200",
+  "memoryInMB": 8000,
+  "storageInMB": 256000,
+  "batteryLevel": 75,
+  "isCharging": false,
+  "networkType": "4G",
+  "appVersion": "1.0.0",
+  "buildNumber": "100",
+  "packageName": "com.example.app",
+  "installTime": "2024-01-01T10:00:00Z",
+  "lastUpdateTime": "2024-12-07T14:30:00Z",
+  "flavor": "production",
+  "type": 1,
+  "priority": 2,
+  "stackTrace": "...",
+  "logs": ["log line 1", "log line 2"],
+  "screenshots": ["base64-string"]
+}
+```
+
+---
+
+## 🔐 Security Features
+
+- ✅ Authorization برای Admin Pages (AdminAreaPermission required)
+- ✅ API Authentication
+- ✅ XSS Protection (Html.Raw محدود)
+- ✅ CSRF Protection (ASP.NET Core default)
+- ✅ Input Validation
+- ✅ Safe Delete with Confirmation
+
+---
+
+## 📚 Documentation Files
+
+1. **BUG_REPORT_SYSTEM.md** - راهنمای کامل سیستم
+2. **FLUTTER_BUG_REPORT_EXAMPLE.dart** - مثال پیاده‌سازی Flutter
+3. **CHANGELOG.md** (این فایل) - خلاصه تغییرات
+
+---
+
+## ✅ Checklist پیاده‌سازی
+
+- [x] Domain Models
+- [x] Database Mappings
+- [x] Repository Pattern
+- [x] Application Services
+- [x] API Endpoints
+- [x] Admin UI Pages
+- [x] Dependency Injection
+- [x] Error Handling
+- [x] Documentation
+- [x] Flutter Example
+- [ ] Database Migration (باید دستی اجرا شود)
+- [ ] Testing
+
+---
+
+## 🎯 مراحل بعدی
+
+1. **اجرای Migration:**
+   ```powershell
+   Add-Migration AddBugReportSystem
+   Update-Database
+   ```
+
+2. **تست API:**
+   - استفاده از Postman/Thunder Client
+   - تست تمام endpoints
+
+3. **تست Admin Panel:**
+   - دسترسی به /AdminNew/BugReport
+   - تست فیلترها و جستجو
+   - تست ویرایش و حذف
+
+4. **Integration Flutter:**
+   - کپی کردن `FLUTTER_BUG_REPORT_EXAMPLE.dart`
+   - سازگار کردن با پروژه Flutter
+   - تست ثبت گزارش‌ها
+
+---
+
+## 📞 پشتیبانی
+
+برای هر سوال یا مشکل:
+1. بررسی کنید `BUG_REPORT_SYSTEM.md`
+2. بررسی کنید logs و error messages
+3. مطمئن شوید Migration اجرا شده است
+

Company.Domain/CameraBugReportAgg/CameraBugReport.cs

@@ -0,0 +1,195 @@
+using System;
+using System.Collections.Generic;
+using _0_Framework.Domain;
+using MongoDB.Bson.Serialization.Attributes;
+
+namespace Company.Domain.CameraBugReportAgg;
+
+/// <summary>
+/// مدل دامنه برای گزارش خرابی دوربین
+/// </summary>
+public class CameraBugReport 
+{
+    [BsonId]
+    [BsonRepresentation(MongoDB.Bson.BsonType.String)]
+    public Guid Id { get; set; }
+
+    public CameraBugReport()
+    {
+        Id = Guid.NewGuid();
+        CreationDate = DateTime.Now;
+        Status = CameraBugReportStatus.Open;
+        Screenshots = new List<CameraBugReportScreenshot>();
+        Logs = new List<CameraBugReportLog>();
+    }
+
+    public CameraBugReport(
+        string title,
+        string description,
+        string userEmail,
+        string deviceModel,
+        string osVersion,
+        string manufacturer,
+        string buildNumber,
+        string appVersion,
+        string screenResolution,
+        bool isCharging,
+        int batteryLevel,
+        int storageInMB,
+        int memoryInMB,
+        string networkType,
+        string platform,
+        string deviceId,
+        string packageName,
+        DateTime installTime,
+        DateTime lastUpdateTime,
+        string flavor,
+        CameraBugReportType type,
+        CameraBugPriority priority,
+        long? accountId = null,
+        string stackTrace = null) : this()
+
+    {
+        Priority = priority;
+        Type = type;
+        Flavor = flavor;
+        LastUpdateTime = lastUpdateTime;
+        InstallTime = installTime;
+        PackageName = packageName;
+        BuildNumber = buildNumber;
+        AppVersion = appVersion;
+        NetworkType = networkType;
+        IsCharging = isCharging;
+        BatteryLevel = batteryLevel;
+        StorageInMB = storageInMB;
+        MemoryInMB = memoryInMB;
+        ScreenResolution = screenResolution;
+        DeviceId = deviceId;
+        Manufacturer = manufacturer;
+        Platform = platform;
+        OsVersion = osVersion;
+        DeviceModel = deviceModel;
+        AccountId = accountId;
+        UserEmail = userEmail;
+        Description = description;
+        Title = title;
+        StackTrace = stackTrace;
+    }
+
+    [BsonElement("screenshots")]
+    public List<CameraBugReportScreenshot> Screenshots { get; private set; }
+    
+    [BsonElement("logs")]
+    public List<CameraBugReportLog> Logs { get; private set; }
+    
+    [BsonElement("updateDate")]
+    public DateTime? UpdateDate { get; private set; }
+    
+    [BsonElement("creationDate")]
+    public DateTime CreationDate { get; private set; }
+    
+    [BsonElement("stackTrace")]
+    public string StackTrace { get; private set; }
+    
+    [BsonElement("status")]
+    [BsonRepresentation(MongoDB.Bson.BsonType.String)]
+    public CameraBugReportStatus Status { get; private set; }
+    
+    [BsonElement("priority")]
+    [BsonRepresentation(MongoDB.Bson.BsonType.String)]
+    
+    public CameraBugPriority Priority { get; private set; }
+    
+    [BsonElement("type")]
+    [BsonRepresentation(MongoDB.Bson.BsonType.String)]
+    
+    public CameraBugReportType Type { get; private set; }
+    
+    [BsonElement("flavor")]
+    public string Flavor { get; private set; }
+    
+    [BsonElement("lastUpdateTime")]
+    public DateTime LastUpdateTime { get; private set; }
+    
+    [BsonElement("installTime")]
+    public DateTime InstallTime { get; private set; }
+    
+    [BsonElement("packageName")]
+    public string PackageName { get; private set; }
+    
+    [BsonElement("buildNumber")]
+    public string BuildNumber { get; private set; }
+    
+    [BsonElement("appVersion")]
+    public string AppVersion { get; private set; }
+    
+    [BsonElement("networkType")]
+    public string NetworkType { get; private set; }
+    
+    [BsonElement("isCharging")]
+    public bool IsCharging { get; private set; }
+    
+    [BsonElement("batteryLevel")]
+    public int BatteryLevel { get; private set; }
+    
+    [BsonElement("storageInMB")]
+    public int StorageInMB { get; private set; }
+    
+    [BsonElement("memoryInMB")]
+    public int MemoryInMB { get; private set; }
+    
+    [BsonElement("screenResolution")]
+    public string ScreenResolution { get; private set; }
+    
+    [BsonElement("deviceId")]
+    public string DeviceId { get; private set; }
+    
+    [BsonElement("manufacturer")]
+    public string Manufacturer { get; private set; }
+    
+    [BsonElement("platform")]
+    public string Platform { get; private set; }
+    
+    [BsonElement("osVersion")]
+    public string OsVersion { get; private set; }
+    
+    [BsonElement("deviceModel")]
+    public string DeviceModel { get; private set; }
+    
+    [BsonElement("accountId")]
+    public long? AccountId { get; private set; }
+    
+    [BsonElement("userEmail")]
+    public string UserEmail { get; private set; }
+    
+    [BsonElement("description")]
+    public string Description { get; private set; }
+    
+    [BsonElement("title")]
+    public string Title { get; private set; }
+
+
+    public void ChangeStatus(CameraBugReportStatus newStatus)
+    {
+        UpdateDate = DateTime.Now;
+        Status = newStatus;
+    }
+
+    public void ChangePriority(CameraBugPriority newPriority)
+    {
+        Priority = newPriority;
+        UpdateDate = DateTime.Now;
+    }
+
+    public void AddScreenshot(string base64Data, string fileName)
+    {
+        Screenshots.Add(new CameraBugReportScreenshot
+            { Base64Data = base64Data, FileName = fileName, UploadDate = DateTime.Now });
+    }
+
+    public void AddLog(string logMessage)
+    {
+        Logs.Add(new CameraBugReportLog { Message = logMessage, Timestamp = DateTime.Now });
+    }
+}
+

Company.Domain/CameraBugReportAgg/CameraBugReportLog.cs

@@ -0,0 +1,20 @@
+using System;
+using _0_Framework.Domain;
+using MongoDB.Bson.Serialization.Attributes;
+
+namespace Company.Domain.CameraBugReportAgg
+{
+    /// <summary>
+    /// لاگ‌های گزارش خرابی دوربین
+    /// </summary>
+    public class CameraBugReportLog : EntityBase
+    {
+        // FK و navigation property حذف شد برای MongoDB
+        [BsonElement("message")]
+        public string Message { get; set; }
+        
+        [BsonElement("timestamp")]
+        public DateTime Timestamp { get; set; }
+    }
+}
+

Company.Domain/CameraBugReportAgg/CameraBugReportScreenshot.cs

@@ -0,0 +1,23 @@
+using System;
+using _0_Framework.Domain;
+using MongoDB.Bson.Serialization.Attributes;
+
+namespace Company.Domain.CameraBugReportAgg
+{
+    /// <summary>
+    /// عکس‌های ضمیمه شده به گزارش خرابی دوربین (Base64 encoded)
+    /// </summary>
+    public class CameraBugReportScreenshot : EntityBase
+    {
+        // FK و navigation property حذف شد برای MongoDB
+        [BsonElement("base64Data")]
+        public string Base64Data { get; set; }
+        
+        [BsonElement("fileName")]
+        public string FileName { get; set; }
+        
+        [BsonElement("uploadDate")]
+        public DateTime UploadDate { get; set; }
+    }
+}
+

Company.Domain/CameraBugReportAgg/ICameraBugReportRepository.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using _0_Framework.InfraStructure;
+
+namespace Company.Domain.CameraBugReportAgg;
+
+/// <summary>
+/// رابط انبار گزارش خرابی دوربین برای MongoDB
+/// </summary>
+public interface ICameraBugReportRepository
+{
+    // Async methods for MongoDB operations
+    Task CreateAsync(CameraBugReport bugReport);
+    Task UpdateAsync(CameraBugReport bugReport);
+    Task<CameraBugReport> GetByIdAsync(Guid id);
+    Task<List<CameraBugReport>> GetAllAsync();
+    Task<List<CameraBugReport>> GetAllAsync(int skip, int take);
+    Task DeleteAsync(Guid id);
+    Task<bool> IsExistAsync(Guid id);
+    Task<List<CameraBugReport>> FilterAsync(
+        CameraBugReportType? type = null,
+        CameraBugPriority? priority = null,
+        CameraBugReportStatus? status = null,
+        string searchTerm = null,
+        int skip = 0,
+        int take = 10);
+    Task<int> CountAsync(
+        CameraBugReportType? type = null,
+        CameraBugPriority? priority = null,
+        CameraBugReportStatus? status = null,
+        string searchTerm = null);
+}

Company.Domain/ContractAgg/IContractRepository.cs

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

Company.Domain/EmployeeAgg/IEmployeeRepository.cs

@@ -76,6 +76,7 @@ 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
 
 

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -56,9 +56,13 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     void UpdateStatusIfNeeded(long institutionContractId);
     Task<GetInstitutionVerificationDetailsViewModel> GetVerificationDetails(Guid id);
     Task<InstitutionContract> GetByPublicIdAsync(Guid id);
-    InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request);
+    InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request,string contractStart = null);
     InstitutionContractDiscountResponse ResetDiscountCreate(InstitutionContractResetDiscountForCreateRequest request);
 
+    #region Creation
+
+    
+    #endregion
 
     #region Extension
 
@@ -140,6 +144,11 @@ 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
@@ -154,4 +163,12 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     #endregion
 
     Task<long> GetIdByInstallmentId(long installmentId);
+    Task<InstitutionContract> GetPreviousContract(long currentInstitutionContractId);
+    Task<InstitutionContractCreationInquiryResult> CreationInquiry(InstitutionContractCreationInquiryRequest request);
+    Task<InstitutionContractCreationWorkshopsResponse> GetCreationWorkshops(InstitutionContractCreationWorkshopsRequest request);
+    Task<InstitutionContractCreationPlanResponse> GetCreationInstitutionPlan(InstitutionContractCreationPlanRequest request);
+    Task<InstitutionContractCreationPaymentResponse> GetCreationPaymentMethod(InstitutionContractCreationPaymentRequest request);
+    Task<InstitutionContractDiscountResponse> SetDiscountForCreation(InstitutionContractSetDiscountForCreationRequest request);
+    Task<InstitutionContractDiscountResponse> ResetDiscountForCreation(InstitutionContractResetDiscountForExtensionRequest request);
+    Task<OperationResult> CreationComplete(InstitutionContractExtensionCompleteRequest request);
 }

Company.Domain/InstitutionContractAgg/InstitutionContract.cs

@@ -98,6 +98,11 @@ 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; }
 
@@ -159,6 +164,10 @@ 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 = [];
@@ -262,6 +271,10 @@ public class InstitutionContract : EntityBase
     {
         WorkshopGroup = null;
     }
+    public void SetSigningType(InstitutionContractSigningType signingType)
+    {
+        SigningType = signingType;
+    }
 }
 
 public class InstitutionContractAmendment : EntityBase

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs

@@ -10,13 +10,15 @@ 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) : base(workshopName, hasRollCallPlan, 
+        int personnelCount, double price,long institutionContractWorkshopGroupId,
+        InstitutionContractWorkshopGroup workshopGroup,long workshopId,long initialWorkshopId) : base(workshopName, hasRollCallPlan, 
         hasRollCallPlanInPerson, hasCustomizeCheckoutPlan, hasContractPlan,
         hasContractPlanInPerson, hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price)
     {
         InstitutionContractWorkshopGroupId = institutionContractWorkshopGroupId;
         WorkshopGroup = workshopGroup;
         WorkshopId = workshopId;
+        InitialWorkshopId = initialWorkshopId;
     }
     public long InstitutionContractWorkshopGroupId { get; private set; }
     public InstitutionContractWorkshopGroup WorkshopGroup { get; private set; }

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopGroup.cs

@@ -23,6 +23,8 @@ public class InstitutionContractWorkshopGroup : EntityBase
         !InitialWorkshops.Cast<InstitutionContractWorkshopBase>()
             .SequenceEqual(CurrentWorkshops.Cast<InstitutionContractWorkshopBase>());
 
+    public bool IsInPersonContract => InitialWorkshops.Any(x => x.Services.ContractInPerson);
+
     public InstitutionContractWorkshopGroup(long institutionContractId,
         List<InstitutionContractWorkshopInitial> initialDetails)
     {
@@ -37,4 +39,10 @@ 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);
+            Services.InsuranceInPerson,PersonnelCount,Price,InstitutionContractWorkshopGroupId,WorkshopGroup,workshopId,id);
         WorkshopCurrent.SetEmployers(Employers.Select(x=>x.EmployerId).ToList());
     }
 

Company.Domain/InstitutionContractCreationTempAgg/InstitutionContractCreationTemp.cs

@@ -0,0 +1,340 @@
+using System;
+using System.Collections.Generic;
+using _0_Framework.Application;
+using _0_Framework.Application.Enums;
+using CompanyManagment.App.Contracts.InstitutionContract;
+using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+
+namespace Company.Domain.InstitutionContractCreationTempAgg;
+
+public class InstitutionContractCreationTemp
+{
+    public InstitutionContractCreationTemp()
+    {
+        Id = Guid.NewGuid();
+    }
+    
+    [BsonId] // Specifies this field as the _id in MongoDB
+    [BsonRepresentation(BsonType.String)] // Ensures the GUID is stored as a string
+    public Guid Id { get; set; }
+    
+    /// <summary>
+    /// نوع حقوقی طرف قرارداد (حقیقی یا حقوقی)
+    /// </summary>
+    public LegalType ContractingPartyLegalType { get; set; }
+    
+    /// <summary>
+    /// اطلاعات شخص حقیقی
+    /// </summary>
+    public InstitutionContractCreationTempRealParty RealParty { get; set; }
+    
+    /// <summary>
+    /// اطلاعات شخص حقوقی
+    /// </summary>
+    public InstitutionContractCreationTempLegalParty LegalParty { get; set; }
+    
+    public string Address { get; set; }
+    public string City { get; set; }
+    public string Province { get; set; }
+    public List<EditContactInfo> ContactInfos { get; set; }
+    public long RepresentativeId { get; set; }
+    
+
+    public List<InstitutionContractCreationTempWorkshop> Workshops { get; set; }
+
+    public InstitutionContractCreationPlanDetail OneMonth { get; set; }
+    public InstitutionContractCreationPlanDetail ThreeMonths { get; set; }
+    public InstitutionContractCreationPlanDetail SixMonths { get; set; }
+    public InstitutionContractCreationPlanDetail TwelveMonths { get; set; }
+    public InstitutionContractPaymentMonthlyViewModel MonthlyPayment { get; set; }
+    public InstitutionContractPaymentOneTimeViewModel OneTimePayment { get; set; }
+
+    public bool HasContractInPerson { get; set; }
+
+    public InstitutionContractDuration? Duration { get; set; }
+    
+    public void SetContractingPartyInfo(LegalType legalType,
+        InstitutionContractCreationTempRealParty realParty,
+        InstitutionContractCreationTempLegalParty legalParty)
+    {
+        ContractingPartyLegalType = legalType;
+        RealParty = realParty;
+        LegalParty = legalParty;
+    }
+    
+    public void SetWorkshopsAndPlanAmounts(List<InstitutionContractCreationTempWorkshop> workshops,
+        InstitutionContractCreationPlanDetail oneMonth,
+        InstitutionContractCreationPlanDetail threeMonth, InstitutionContractCreationPlanDetail sixMonth,
+        InstitutionContractCreationPlanDetail twelveMonth, bool hasContractInPerson)
+    {
+        Workshops = workshops;
+        OneMonth = oneMonth;
+        ThreeMonths = threeMonth;
+        SixMonths = sixMonth;
+        TwelveMonths = twelveMonth;
+        HasContractInPerson = hasContractInPerson;
+    }
+
+    public void SetAmountAndDuration(InstitutionContractDuration duration,InstitutionContractPaymentMonthlyViewModel monthly,
+        InstitutionContractPaymentOneTimeViewModel oneTime)
+    {
+        Duration = duration;
+        MonthlyPayment = monthly;
+        OneTimePayment = oneTime;
+    }
+
+
+    public void SetContractingPartyContactInfo(string address, string city, string province, List<EditContactInfo> requestContactInfos,long representativeId)
+    {
+        Address = address;
+        City = city;
+        Province = province;
+        ContactInfos = requestContactInfos;
+        RepresentativeId = representativeId;
+    }
+
+}
+
+public class InstitutionContractCreationTempLegalParty
+{
+    /// <summary>
+    /// آیدی طرف حساب در صورتی که از قبل ایجاد شده باشد
+    /// </summary>
+    public long Id { get; set; }
+    
+    /// <summary>
+    /// نام شرکت
+    /// </summary>
+    public string CompanyName { get; set; }
+    
+    /// <summary>
+    /// شماره ثبت
+    /// </summary>
+    public string RegisterId { get; set; }
+    
+    /// <summary>
+    /// شناسه ملی شرکت
+    /// </summary>
+    public string NationalId { get; set; }
+    
+    /// <summary>
+    /// شماره تلفن شرکت
+    /// </summary>
+    public string PhoneNumber { get; set; }
+    
+    /// <summary>
+    /// شناسه موقت طرف قرارداد
+    /// </summary>
+    public long ContractingPartyTempId { get; set; }
+    
+    /// <summary>
+    /// کد ملی نماینده قانونی
+    /// </summary>
+    public string NationalCode { get; set; }
+    
+    /// <summary>
+    /// تاریخ تولد نماینده قانونی فارسی
+    /// </summary>
+    public string BirthDateFa { get; set; }
+    
+    /// <summary>
+    /// نام نماینده قانونی
+    /// </summary>
+    public string FName { get; set; }
+    
+    /// <summary>
+    /// نام خانوادگی نماینده قانونی
+    /// </summary>
+    public string LName { get; set; }
+    
+    /// <summary>
+    /// نام پدر نماینده قانونی
+    /// </summary>
+    public string FatherName { get; set; }
+    
+    /// <summary>
+    /// شماره شناسنامه نماینده قانونی
+    /// </summary>
+    public string IdNumber { get; set; }
+    
+    /// <summary>
+    /// وضعیت احراز هویت نماینده قانونی
+    /// </summary>
+    public bool IsAuth { get; set; }
+    
+    /// <summary>
+    /// سمت نماینده قانونی در شرکت
+    /// </summary>
+    public string Position { get; set; }
+
+    /// <summary>
+    /// جنسیت نماینده قانونی
+    /// </summary>
+    public Gender Gender { get; set; }
+    
+    public string IdNumberSeri { get; set; }
+    
+    public string IdNumberSerial { get; set; }
+}
+
+public class InstitutionContractCreationTempRealParty
+{
+    /// <summary>
+    /// آیدی طرف حساب در صورتی که از قبل ایجاد شده باشد
+    /// </summary>
+    public long Id { get; set; }
+    /// <summary>
+    /// کد ملی
+    /// </summary>
+    public string NationalCode { get; set; }
+    
+    /// <summary>
+    /// تاریخ تولد فارسی
+    /// </summary>
+    public string BirthDateFa { get; set; }
+    
+    /// <summary>
+    /// شماره تلفن
+    /// </summary>
+    public string PhoneNumber { get; set; }
+    
+    /// <summary>
+    /// وضعیت احراز هویت
+    /// </summary>
+    public bool IsAuth { get; set; }
+    
+    /// <summary>
+    /// نام
+    /// </summary>
+    public string FName { get; set; }
+    
+    /// <summary>
+    /// نام خانوادگی
+    /// </summary>
+    public string LName { get; set; }
+    
+    /// <summary>
+    /// نام پدر
+    /// </summary>
+    public string FatherName { get; set; }
+    
+    /// <summary>
+    /// شماره شناسنامه
+    /// </summary>
+    public string IdNumber { get; set; }
+    
+    /// <summary>
+    /// شناسه موقت طرف قرارداد
+    /// </summary>
+    public long ContractingPartyTempId { get; set; }
+    
+    /// <summary>
+    /// جنسیت
+    /// </summary>
+    public Gender Gender { get; set; }
+    
+    public string IdNumberSeri { get; set; }
+    
+    public string IdNumberSerial { get; set; }
+}
+
+public class InstitutionContractCreationTempPlan
+{
+    public InstitutionContractCreationTempPlan(string contractStart, string contractEnd, 
+        string oneMonthPaymentDiscounted, string oneMonthDiscount, string oneMonthOriginalPayment,
+        string totalPayment, string dailyCompensation, string obligation)
+    {
+        ContractStart = contractStart;
+        ContractEnd = contractEnd;
+        OneMonthPaymentDiscounted = oneMonthPaymentDiscounted;
+        OneMonthDiscount = oneMonthDiscount;
+        OneMonthOriginalPayment = oneMonthOriginalPayment;
+        TotalPayment = totalPayment;
+        DailyCompensation = dailyCompensation;
+        Obligation = obligation;
+    }
+
+    public string ContractStart { get; set; }
+    public string ContractEnd { get; set; }
+    public string OneMonthPaymentDiscounted { get; set; }
+    public string OneMonthDiscount { get; set; }
+    public string OneMonthOriginalPayment { get; set; }
+    public string TotalPayment { get; set; }
+    public string DailyCompensation { get; set; }
+    public string Obligation { get; set; }
+}
+
+public class InstitutionContractCreationTempWorkshop
+{
+    public InstitutionContractCreationTempWorkshop(string workshopName, int countPerson, bool contractAndCheckout, bool contractAndCheckoutInPerson, 
+        bool insurance, bool insuranceInPerson,
+        bool rollCall,bool rollCallInPerson, bool customizeCheckout,double price,long workshopId)
+    {
+        WorkshopName = workshopName;
+        CountPerson = countPerson;
+        ContractAndCheckout = contractAndCheckout;
+        Insurance = insurance;
+        RollCall = rollCall;
+        CustomizeCheckout = customizeCheckout;
+        ContractAndCheckoutInPerson = contractAndCheckoutInPerson;
+        InsuranceInPerson = insuranceInPerson;
+        RollCallInPerson = rollCallInPerson;
+        Price = price;
+        WorkshopId = workshopId;
+    }
+
+    public long WorkshopId { get; set; }
+
+    /// <summary>
+    /// نام کارگاه
+    /// </summary>
+    public string WorkshopName { get; private set; }
+
+    /// <summary>
+    /// تعداد پرسنل 
+    /// </summary>
+    public int CountPerson { get; private  set; }
+    
+    
+    #region ServiceSelection
+
+    /// <summary>
+    /// قرارداد و تصفیه
+    /// </summary>
+    public bool ContractAndCheckout { get; private  set; }
+
+    /// <summary>
+    /// بیمه
+    /// </summary>
+    public bool Insurance { get; private  set; }
+
+    /// <summary>
+    /// حضورغباب
+    /// </summary>
+    public bool RollCall { get; private  set; }
+
+    public bool RollCallInPerson { get; set; }
+
+    /// <summary>
+    /// فیش غیر رسمی
+    /// </summary>
+    public bool CustomizeCheckout { get;private  set; }
+
+    /// <summary>
+    /// خدمات حضوری قرداد و تصفیه
+    /// </summary>
+    public bool ContractAndCheckoutInPerson { get; private  set; }
+
+    /// <summary>
+    /// خدمات حضوری بیمه
+    /// </summary>
+    public bool InsuranceInPerson { get; private  set; }
+
+    public double Price{ get; set; }
+
+    #endregion    
+}
+
+

Company.Domain/InstitutionPlanAgg/IPlanPercentageRepository.cs

@@ -1,7 +1,9 @@
-using _0_Framework.Domain;
+using _0_Framework.Application;
+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;
 
@@ -26,4 +28,18 @@ 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,10 +73,12 @@ public interface IInsuranceListRepository:IRepository<long, InsuranceList>
     Task<InsuranceListConfirmOperation> GetInsuranceOperationDetails(long id);
 
 	Task<InsuranceListTabsCountViewModel> GetTabCounts(InsuranceListSearchModel searchModel);
+	Task<PagedResult<InsuranceClientListViewModel>> GetInsuranceClientList(InsuranceClientSearchModel searchModel);
 
 	#endregion
 
 	Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel);
+	Task<InsuranceClientPrintViewModel> ClientPrintOne(long id);
 }
 
 

Company.Domain/LeaveAgg/ILeaveRepository.cs

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

Company.Domain/WorkshopAgg/Workshop.cs

@@ -316,7 +316,10 @@ 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.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         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.LicenseContext = LicenseContext.NonCommercial;
+        OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         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)
     {
-        OfficeOpenXml.ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         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.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         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.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         using var package = new ExcelPackage();
         foreach (var employee in list)
         {

CompanyManagement.Infrastructure.Excel/InstitutionContract/InstitutionContractExcelGenerator.cs

@@ -8,86 +8,129 @@ 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<InstitutionContractViewModel> institutionContractViewModels)
+    public static byte[] GenerateExcel(List<InstitutionContractExcelViewModel> contractViewModels)
     {
-        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         using var package = new ExcelPackage();
-        var allWorksheet = package.Workbook.Worksheets.Add("همه");
         
-        var blueWorksheet = package.Workbook.Worksheets.Add("آبی");
+        // ایجاد شیت برای هر تب با داده‌های مربوطه
-        blueWorksheet.TabColor = Color.LightBlue;
+        foreach (var viewModel in contractViewModels)
-
+        {
-        var grayWorksheet = package.Workbook.Worksheets.Add("خاکستری");
+            var worksheet = CreateWorksheet(package, viewModel.Tab);
-        grayWorksheet.TabColor = Color.LightGray;
+            CreateExcelSheet(viewModel.GetInstitutionContractListItemsViewModels ?? new List<GetInstitutionContractListItemsViewModel>(), worksheet);
-
+        }
-        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();
-        
-        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();
     }
 
-    private static void CreateExcelSheet(List<InstitutionContractViewModel> institutionContractViewModels, ExcelWorksheet worksheet)
+    /// <summary>
+    /// ایجاد شیت بر اساس نوع تب
+    /// </summary>
+    private static ExcelWorksheet CreateWorksheet(ExcelPackage package, InstitutionContractListStatus? status)
     {
-        // Headers
+        return status switch
-        worksheet.Cells[1, 1].Value = "شماره قرارداد";
+        {
-        worksheet.Cells[1, 2].Value = "طرف حساب";
+            InstitutionContractListStatus.DeactiveWithDebt =>
-        worksheet.Cells[1, 3].Value = "شماره کارفرما";
+                CreateColoredWorksheet(package, "غیرفعال دارای بدهی", Color.LightBlue),
-        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 = "وضعیت مالی";
             
-        using (var range = worksheet.Cells[1, 1, 1, 11])
+            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)
+        };
+    }
+
+    /// <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])
         {
             range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
             range.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
@@ -110,30 +153,35 @@ public class InstitutionContractExcelGenerator
 
         int row = 2;
 
-        for (int i = 0; i < institutionContractViewModels.Count; i++)
+        for (int i = 0; i < contractItems.Count; i++)
         {
-            var contract = institutionContractViewModels[i];
+            var contract = contractItems[i];
-            var employers = contract.EmployerViewModels?.ToList() ?? new();
+            var employers = contract.EmployerNames?.ToList() ?? new();
-            var workshops = contract.WorkshopViewModels?.ToList() ?? new();
+            var workshops = contract.WorkshopNames?.ToList() ?? new();
 
-            int maxRows = Math.Max(employers.Count, workshops.Count);
+            int maxRows = 1; // هر قرارداد فقط یک ردیف؛ نیازی به مرج عمودی نیست
-            maxRows = Math.Max(1, maxRows);
 
             int startRow = row;
             int endRow = row + maxRows - 1;
 
-            // 🎨 دریافت رنگ پس‌زمینه از مقدار رنگ موجود در داده
+            // 🎨 دریافت رنگ پس‌زمینه بر اساس وضعیت قرارداد
-            string colorName = contract.ExpireColor.ToLower();
+            var fillColor = GetColorByStatus(contract.ListStatus, contract.WorkshopsCount);
-            var fillColor = GetColorByName(colorName, contract.WorkshopCount, contract.IsContractingPartyBlock);
 
             for (int j = 0; j < maxRows; j++)
             {
                 int currentRow = row + j;
 
-                worksheet.Cells[currentRow, 4].Value = j < employers.Count ? employers[j].FullName : null;
+                // پر کردن ستون‌های employer و workshop
-                worksheet.Cells[currentRow, 5].Value = j < workshops.Count ? workshops[j].WorkshopFullName : null;
+                var employerColIndex = GetColumnIndexForType(ExcelColumnType.EmployerName, visibleColumnIndices);
+                var workshopColIndex = GetColumnIndexForType(ExcelColumnType.WorkshopName, visibleColumnIndices);
 
-                for (int col = 1; col <= 11; col++)
+                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++)
                 {
                     var cell = worksheet.Cells[currentRow, col];
 
@@ -154,109 +202,235 @@ public class InstitutionContractExcelGenerator
             }
 
             // 🧱 مرج و مقداردهی ستون‌های اصلی
-            worksheet.Cells[startRow, 1, endRow, 1].Merge = true;
+            FillColumnData(worksheet, contract, startRow, endRow, visibleColumnIndices);
-            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, 11];
+            var boldRange = worksheet.Cells[startRow, 1, endRow, columnCount];
             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;
-        int contractNoCol = 1;
+
-        int contractingPartyNameCol = 2;
+        // تنظیم عرض ستون‌ها بر اساس نوع ستون
-        int archiveNoCol = 3;
+        for (int i = 0; i < visibleColumns.Count; i++)
-        int employersCol = 4;
+        {
-        int workshopsCol = 5;
+            int columnIndex = i + 1;
-        int employeeCountCol = 6;
+            worksheet.Columns[columnIndex].Width = GetColumnWidth(visibleColumns[i]);
-        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; // فارسی
-        //worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns();
+    }
+
+    /// <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
+        };
     }
 
     private static double MoneyToDouble(string value)
     {
-        Console.WriteLine(value);
+        if (string.IsNullOrEmpty(value))
+            return 0;
+
         var min = value.Length > 1 ? value.Substring(0, 2) : "";
         var test = min == "\u200e\u2212" ? value.MoneyToDouble() * -1 : value.MoneyToDouble();
-
-        Console.WriteLine(test);
         return test;
     }
-    private static Color GetColorByName(string name, string workshopCount, string IsContractingPartyBlock)
+
+    /// <summary>
+    /// دریافت رنگ بر اساس وضعیت قرارداد
+    /// </summary>
+    private static Color GetColorByStatus(InstitutionContractListStatus status, int workshopsCount)
     {
-        return name switch
+        return status switch
         {
-            "blue" => Color.LightBlue,
+            InstitutionContractListStatus.DeactiveWithDebt => Color.LightBlue,
-            _ when IsContractingPartyBlock == "true" => Color.LightGray,
+            InstitutionContractListStatus.Deactive => Color.LightGray,
-            "red" => Color.LightCoral,
+            InstitutionContractListStatus.PendingForRenewal => Color.LightCoral,
-            "purple" => Color.MediumPurple,
+            InstitutionContractListStatus.Free => Color.MediumPurple,
-            "black" => Color.DimGray,
+            InstitutionContractListStatus.Block => Color.DimGray,
-            var n when string.IsNullOrWhiteSpace(n) && workshopCount == "0" => Color.Yellow,
+            InstitutionContractListStatus.WithoutWorkshop => Color.Yellow,
+            InstitutionContractListStatus.Active => Color.White,
             _ => 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.LicenseContext = LicenseContext.NonCommercial;
+        OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         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.LicenseContext = LicenseContext.NonCommercial;
+        OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         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.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
 
         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.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         using (var package = new ExcelPackage())
         {
             var ws = package.Workbook.Worksheets.Add("Workshops");

CompanyManagement.Infrastructure.Mongo/CameraBugReportRepo/CameraBugReportRepository.cs

@@ -0,0 +1,176 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Company.Domain.CameraBugReportAgg;
+using MongoDB.Bson;
+using MongoDB.Driver;
+
+namespace CompanyManagement.Infrastructure.Mongo.CameraBugReportRepo;
+
+/// <summary>
+/// پیاده‌سازی انبار گزارش خرابی دوربین برای MongoDB
+/// </summary>
+public class CameraBugReportRepository : ICameraBugReportRepository
+{
+    private readonly IMongoCollection<CameraBugReport> _cameraBugReports;
+
+    public CameraBugReportRepository(IMongoDatabase database)
+    {
+        _cameraBugReports = database.GetCollection<CameraBugReport>("CameraBugReports");
+    }
+
+    public async Task CreateAsync(CameraBugReport bugReport)
+    {
+        await _cameraBugReports.InsertOneAsync(bugReport);
+    }
+
+    public async Task UpdateAsync(CameraBugReport bugReport)
+    {
+        await _cameraBugReports.ReplaceOneAsync(
+            x => x.Id == bugReport.Id,
+            bugReport);
+    }
+
+    public async Task<CameraBugReport> GetByIdAsync(Guid id)
+    {
+        return await _cameraBugReports
+            .Find(x => x.Id == id)
+            .FirstOrDefaultAsync();
+    }
+
+    public async Task<List<CameraBugReport>> GetAllAsync()
+    {
+        return await _cameraBugReports
+            .Find(_ => true)
+            .ToListAsync();
+    }
+
+    public async Task<List<CameraBugReport>> GetAllAsync(int skip, int take)
+    {
+        return await _cameraBugReports
+            .Find(_ => true)
+            .Skip(skip)
+            .Limit(take)
+            .SortByDescending(x => x.CreationDate)
+            .ToListAsync();
+    }
+
+    public async Task DeleteAsync(Guid id)
+    {
+        await _cameraBugReports.DeleteOneAsync(x => x.Id == id);
+    }
+
+    public async Task<bool> IsExistAsync(Guid id)
+    {
+        var result = await _cameraBugReports
+            .Find(x => x.Id == id)
+            .FirstOrDefaultAsync();
+        return result != null;
+    }
+
+    public async Task<List<CameraBugReport>> FilterAsync(
+        CameraBugReportType? type = null,
+        CameraBugPriority? priority = null,
+        CameraBugReportStatus? status = null,
+        string searchTerm = null,
+        int skip = 0,
+        int take = 10)
+    {
+        var filterDefinition = BuildFilterDefinition(type, priority, status, searchTerm);
+
+        return await _cameraBugReports
+            .Find(filterDefinition)
+            .Skip(skip)
+            .Limit(take)
+            .SortByDescending(x => x.CreationDate)
+            .ToListAsync();
+    }
+
+    public async Task<int> CountAsync(
+        CameraBugReportType? type = null,
+        CameraBugPriority? priority = null,
+        CameraBugReportStatus? status = null,
+        string searchTerm = null)
+    {
+        var filterDefinition = BuildFilterDefinition(type, priority, status, searchTerm);
+        var count = await _cameraBugReports.CountDocumentsAsync(filterDefinition);
+        return (int)count;
+    }
+
+    private FilterDefinition<CameraBugReport> BuildFilterDefinition(
+        CameraBugReportType? type = null,
+        CameraBugPriority? priority = null,
+        CameraBugReportStatus? status = null,
+        string searchTerm = null)
+    {
+        var filters = new List<FilterDefinition<CameraBugReport>>();
+
+        if (type.HasValue)
+            filters.Add(Builders<CameraBugReport>.Filter.Eq(x => x.Type, type.Value));
+
+        if (priority.HasValue)
+            filters.Add(Builders<CameraBugReport>.Filter.Eq(x => x.Priority, priority.Value));
+
+        if (status.HasValue)
+            filters.Add(Builders<CameraBugReport>.Filter.Eq(x => x.Status, status.Value));
+
+        if (!string.IsNullOrEmpty(searchTerm))
+        {
+            var searchFilter = Builders<CameraBugReport>.Filter.Or(
+                Builders<CameraBugReport>.Filter.Regex(x => x.Title, new BsonRegularExpression(searchTerm, "i")),
+                Builders<CameraBugReport>.Filter.Regex(x => x.Description, new BsonRegularExpression(searchTerm, "i")),
+                Builders<CameraBugReport>.Filter.Regex(x => x.UserEmail, new BsonRegularExpression(searchTerm, "i"))
+            );
+            filters.Add(searchFilter);
+        }
+
+        if (filters.Count == 0)
+            return Builders<CameraBugReport>.Filter.Empty;
+
+        return Builders<CameraBugReport>.Filter.And(filters);
+    }
+
+    // Sync methods from IRepository interface (not used in MongoDB flow but required for interface implementation)
+    public CameraBugReport Get(long id)
+    {
+        throw new NotImplementedException("استفاده از GetByIdAsync برای MongoDB");
+    }
+
+    public List<CameraBugReport> Get()
+    {
+        throw new NotImplementedException("استفاده از GetAllAsync برای MongoDB");
+    }
+
+    public void Create(CameraBugReport entity)
+    {
+        throw new NotImplementedException("استفاده از CreateAsync برای MongoDB");
+    }
+
+    public bool ExistsIgnoreQueryFilter(System.Linq.Expressions.Expression<Func<CameraBugReport, bool>> expression)
+    {
+        throw new NotImplementedException("استفاده از IsExistAsync برای MongoDB");
+    }
+
+    public bool Exists(System.Linq.Expressions.Expression<Func<CameraBugReport, bool>> expression)
+    {
+        throw new NotImplementedException("استفاده از FilterAsync برای MongoDB");
+    }
+
+    public void SaveChanges()
+    {
+        throw new NotImplementedException("MongoDB نیازی به SaveChanges ندارد");
+    }
+
+    public async Task SaveChangesAsync()
+    {
+        // MongoDB خودکار ذخیره می‌کند، بنابراین این متد خالی است
+        await Task.CompletedTask;
+    }
+
+    public Task<Microsoft.EntityFrameworkCore.Storage.IDbContextTransaction> BeginTransactionAsync()
+    {
+        throw new NotImplementedException("MongoDB اعاملات را بصورت متفاوت مدیریت می‌کند");
+    }
+}
+

CompanyManagment.App.Contracts/CameraBugReport/CameraBugReportDetailViewModel.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+
+namespace CompanyManagment.App.Contracts.CameraBugReport
+{
+    public class CameraBugReportDetailViewModel
+    {
+        public Guid Id { get; set; }
+        public string Title { get; set; }
+        public string Description { get; set; }
+        public string UserEmail { get; set; }
+        public long? AccountId { get; set; }
+        public string DeviceModel { get; set; }
+        public string OsVersion { get; set; }
+        public string Platform { get; set; }
+        public string Manufacturer { get; set; }
+        public string DeviceId { get; set; }
+        public string ScreenResolution { get; set; }
+        public int MemoryInMB { get; set; }
+        public int StorageInMB { get; set; }
+        public int BatteryLevel { get; set; }
+        public bool IsCharging { get; set; }
+        public string NetworkType { get; set; }
+        public string AppVersion { get; set; }
+        public string BuildNumber { get; set; }
+        public string PackageName { get; set; }
+        public DateTime InstallTime { get; set; }
+        public DateTime LastUpdateTime { get; set; }
+        public string Flavor { get; set; }
+        public CameraBugReportType Type { get; set; }
+        public CameraBugPriority Priority { get; set; }
+        public CameraBugReportStatus Status { get; set; }
+        public string StackTrace { get; set; }
+        public DateTime CreationDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public List<string> Logs { get; set; }
+        public List<CameraBugReportScreenshotViewModel> Screenshots { get; set; }
+    }
+
+    public class CameraBugReportScreenshotViewModel
+    {
+        public string FileName { get; set; }
+        public DateTime UploadDate { get; set; }
+        public string Base64Data { get; set; }
+    }
+}
+

CompanyManagment.App.Contracts/CameraBugReport/CameraBugReportViewModel.cs

@@ -0,0 +1,23 @@
+using System;
+
+namespace CompanyManagment.App.Contracts.CameraBugReport
+{
+    public class CameraBugReportViewModel
+    {
+        public Guid Id { get; set; }
+        public string Title { get; set; }
+        public string Description { get; set; }
+        public string UserEmail { get; set; }
+        public long? AccountId { get; set; }
+        public string DeviceModel { get; set; }
+        public string AppVersion { get; set; }
+        public CameraBugReportType Type { get; set; }
+        public CameraBugPriority Priority { get; set; }
+        public CameraBugReportStatus Status { get; set; }
+        public DateTime CreationDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public int LogsCount { get; set; }
+        public int ScreenshotsCount { get; set; }
+    }
+}
+

CompanyManagment.App.Contracts/CameraBugReport/CreateCameraBugReportCommand.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+
+namespace CompanyManagment.App.Contracts.CameraBugReport
+{
+    public class CreateCameraBugReportCommand
+    {
+        public string Title { get; set; }
+        public string Description { get; set; }
+        public string UserEmail { get; set; }
+        public long? AccountId { get; set; }
+        public string DeviceModel { get; set; }
+        public string OsVersion { get; set; }
+        public string Platform { get; set; }
+        public string Manufacturer { get; set; }
+        public string DeviceId { get; set; }
+        public string ScreenResolution { get; set; }
+        public int MemoryInMB { get; set; }
+        public int StorageInMB { get; set; }
+        public int BatteryLevel { get; set; }
+        public bool IsCharging { get; set; }
+        public string NetworkType { get; set; }
+        public string AppVersion { get; set; }
+        public string BuildNumber { get; set; }
+        public string PackageName { get; set; }
+        public DateTime InstallTime { get; set; }
+        public DateTime LastUpdateTime { get; set; }
+        public string Flavor { get; set; }
+        public CameraBugReportType Type { get; set; }
+        public CameraBugPriority Priority { get; set; }
+        public string StackTrace { get; set; }
+        public List<string> Logs { get; set; }
+        public List<string> Screenshots { get; set; }
+    }
+}
+

CompanyManagment.App.Contracts/CameraBugReport/EditCameraBugReportCommand.cs

@@ -0,0 +1,13 @@
+
+using System;
+
+namespace CompanyManagment.App.Contracts.CameraBugReport
+{
+    public class EditCameraBugReportCommand
+    {
+        public Guid Id { get; set; }
+        public CameraBugPriority Priority { get; set; }
+        public CameraBugReportStatus Status { get; set; }
+    }
+}
+

CompanyManagment.App.Contracts/CameraBugReport/ICameraBugReportApplication.cs

@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using _0_Framework.Application;
+
+namespace CompanyManagment.App.Contracts.CameraBugReport
+{
+    public interface ICameraBugReportApplication
+    {
+        Task<OperationResult> CreateAsync(CreateCameraBugReportCommand command);
+        Task<OperationResult> EditAsync(EditCameraBugReportCommand command);
+        Task<OperationResult> DeleteAsync(Guid id);
+        Task<List<CameraBugReportViewModel>> GetAllAsync(CameraBugReportSearchModel searchModel);
+        Task<CameraBugReportDetailViewModel> GetDetailsAsync(Guid id);
+        Task<bool> IsExistAsync(Guid id);
+        
+        // Keep sync methods for backward compatibility but they delegate to async
+        OperationResult Create(CreateCameraBugReportCommand command);
+        OperationResult Edit(EditCameraBugReportCommand command);
+        OperationResult Delete(Guid id);
+        List<CameraBugReportViewModel> GetAll(CameraBugReportSearchModel searchModel);
+        CameraBugReportDetailViewModel GetDetails(Guid id);
+        bool IsExist(Guid id);
+    }
+
+    public class CameraBugReportSearchModel
+    {
+        public CameraBugReportType? Type { get; set; }
+        public CameraBugPriority? Priority { get; set; }
+        public CameraBugReportStatus? Status { get; set; }
+        public string SearchTerm { get; set; }
+        public int PageNumber { get; set; } = 1;
+        public int PageSize { get; set; } = 10;
+    }
+}
+
+/// </summary>
+/// وضعیت گزارش خرابی دوربین
+/// <summary>
+public enum CameraBugReportStatus
+{
+    Reopened = 5, // مجدداً باز شده
+    Closed = 4, // بسته شده
+    Fixed = 3, // رفع شده
+    InProgress = 2, // در حال بررسی
+    Open = 1, // باز
+}
+
+/// </summary>
+/// اولویت گزارش خرابی دوربین
+/// <summary>
+public enum CameraBugPriority
+{
+    Low = 4, // پایین
+    Medium = 3, // متوسط
+    High = 2, // بالا
+    Critical = 1, // بحرانی
+}
+
+/// </summary>
+/// انواع گزارش خرابی دوربین
+/// <summary>
+public enum CameraBugReportType
+{
+    Other = 8, // سایر
+    CrashOnCapture = 7, // کرش هنگام عکس‌برداری
+    LightingIssue = 6, // مشکل روشنایی
+    FocusIssue = 5, // مشکل فوکوس
+    PerformanceIssue = 4, // مشکل عملکردی
+    FaceRecognitionFailed = 3, // شناسایی چهره ناموفق
+    BlurryImage = 2, // تصویر مبهم
+    CameraNotWorking = 1, // دوربین کار نمی‌کند
+}

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

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

CompanyManagment.App.Contracts/Contract/ContractListOrderType.cs

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

CompanyManagment.App.Contracts/Contract/GetContractListForClientRequest.cs

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

CompanyManagment.App.Contracts/Contract/GetContractListForClientResponse.cs

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

CompanyManagment.App.Contracts/Contract/IContractApplication.cs

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

CompanyManagment.App.Contracts/Employee/IEmployeeApplication.cs

@@ -60,7 +60,7 @@ public interface IEmployeeApplication
     /// <returns></returns>
     Task<OperationResult<EmployeeByNationalCodeInWorkshopViewModel>>
         ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(string nationalCode,
-            string birthDate, long workshopId);
+            string birthDate,bool authorizedCanceled, long workshopId);
 
     /// <summary>
     /// پرسنل هایی که در کارگاهی از سمت ادمین شروع به کار کرده اند
@@ -95,6 +95,41 @@ public interface IEmployeeApplication
 	/// <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);
+
 	#endregion
 
 }
+
+public class GetClientEmployeeListSearchModel
+{
+}
+
+public class GetClientEmployeeListViewModel
+{
+	public string FullName { get; set; }
+	public long EmployeeId { get; set; }
+	public long WorkshopId { 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 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; }
+}

CompanyManagment.App.Contracts/EmployeeDocuments/WorkshopWithEmployeeDocumentsViewModel.cs

@@ -13,5 +13,6 @@ 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

@@ -0,0 +1,17 @@
+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,6 +91,11 @@ 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

@@ -5,9 +5,10 @@ using System.Drawing;
 using System.Linq;
 using System.Threading.Tasks;
 using _0_Framework.Application;
+using _0_Framework.Application.Enums;
 using _0_Framework.Application.Sms;
 using CompanyManagment.App.Contracts.Checkout;
-using CompanyManagment.App.Contracts.Law;
+using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.App.Contracts.Workshop;
 using CompanyManagment.App.Contracts.WorkshopPlan;
@@ -200,6 +201,7 @@ public interface IInstitutionContractApplication
     /// </summary>
     /// <returns></returns>
     Task<List<RegistrationWorkflowMainListViewModel>> RegistrationWorkflowMainList();
+
     /// <summary>
     /// دریافت آیتم های کارپوشه ثبت نام
     /// </summary>
@@ -207,8 +209,6 @@ public interface IInstitutionContractApplication
     /// <returns></returns>
     Task<List<RegistrationWorkflowItemsViewModel>> RegistrationWorkflowItems(long institutionContractId);
 
-    
-
     #endregion
 
     Task<GetInstitutionVerificationDetailsViewModel> GetVerificationDetails(Guid id);
@@ -218,6 +218,31 @@ public interface IInstitutionContractApplication
     InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request);
     InstitutionContractDiscountResponse ResetDiscountCreate(InstitutionContractResetDiscountForCreateRequest request);
 
+    #region Creation
+
+    /// <summary>
+    /// تب ایجاد قرارداد مؤسسه - احراز هویت
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    Task<InstitutionContractCreationInquiryResult> CreationInquiry(InstitutionContractCreationInquiryRequest request);
+
+    /// <summary>
+    /// تب ایجاد قرارداد مؤسسه -مشخصات طرف قرارداد و انتخاب کارگاه ها
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    Task<InstitutionContractCreationWorkshopsResponse> GetCreationWorkshops(
+        InstitutionContractCreationWorkshopsRequest request);
+    /// <summary>
+    /// تب ایجاد قرارداد مؤسسه - مالی
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    Task<InstitutionContractCreationPlanResponse> GetCreationInstitutionPlan(InstitutionContractCreationPlanRequest request);
+
+    #endregion
+
     #region Extension
 
     Task<InstitutionContractExtensionInquiryResult> GetExtensionInquiry(long previousContractId);
@@ -233,21 +258,27 @@ public interface IInstitutionContractApplication
 
     Task<InstitutionContractDiscountResponse> SetDiscountForExtension(
         InstitutionContractSetDiscountForExtensionRequest request);
+
     Task<InstitutionContractDiscountResponse> ResetDiscountForExtension(
         InstitutionContractResetDiscountForExtensionRequest request);
 
 
     Task<OperationResult> ExtensionComplete(InstitutionContractExtensionCompleteRequest request);
-    Task<List<InstitutionContractSelectListViewModel>> GetInstitutionContractSelectList(string search,string selected);
+    Task<List<InstitutionContractSelectListViewModel>> GetInstitutionContractSelectList(string search, string selected);
 
     #endregion
 
     #region Upgrade (Amendment)
 
     Task<InstitutionContractAmendmentWorkshopsResponse> GetAmendmentWorkshops(long institutionContractId);
-    Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(InstitutionContractAmendmentTempWorkshopViewModel request);
+
+    Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(
+        InstitutionContractAmendmentTempWorkshopViewModel request);
+
     Task RemoveAmendmentWorkshops(Guid workshopTempId);
-    Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(InsitutionContractAmendmentPaymentRequest request);
+
+    Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(
+        InsitutionContractAmendmentPaymentRequest request);
 
     #endregion
 
@@ -260,154 +291,52 @@ public interface IInstitutionContractApplication
     /// <returns></returns>
     Task<InstitutionContractPrintViewModel> PrintOneAsync(long id);
 
-    Task<OperationResult> SetPendingWorkflow(long entityId);
+    Task<OperationResult> SetPendingWorkflow(long entityId, InstitutionContractSigningType signingType);
     Task<long> GetIdByInstallmentId(long installmentId);
 
-}
-
-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; }
+    /// <param name="institutionContractId"></param>
-    /// <summary>
+    /// <returns></returns>
-    /// ارزش افزوده
+    Task<OperationResult> VerifyInstitutionContractManually(long institutionContractId);
-    /// </summary>
-    public string Tax { get; set; }
-    /// <summary>
-    /// مبلغ قابل پرداخت
-    /// </summary>
-    public string PaymentAmount { get; set; }
 
-    public string DiscountedAmount { get; set; }
+    Task<InstitutionContractCreationPaymentResponse> GetCreationPaymentMethod(InstitutionContractCreationPaymentRequest request);
-    
+    Task<InstitutionContractDiscountResponse> SetDiscountForCreation(InstitutionContractSetDiscountForCreationRequest request);
-    public int DiscountPercetage { get; set; }
+    Task<InstitutionContractDiscountResponse> ResetDiscountForCreation(InstitutionContractResetDiscountForExtensionRequest request);
-
+    Task<OperationResult> CreationComplete(InstitutionContractExtensionCompleteRequest request);
-    public string Obligation { get; set; }
-    
-    public string OneMonthAmount { get; set; }
 }
 
-public class InstitutionContractResetDiscountForCreateRequest
+public class CreationSetContractingPartyResponse
 {
-    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 InstitutionContractCreationWorkshopsResponse
-
-public class InstitutionContractExtensionPaymentMonthly:InstitutionContractExtensionPaymentOneTime
 {
-    public List<MonthlyInstallment> Installments { get; set; }
+    public List<WorkshopTempViewModel> WorkshopTemps { get; set; }
-}
-
-public class InstitutionContractExtensionPaymentOneTime
-{
-    /// <summary>
-    /// مجموع مبالغ
-    /// </summary>
     public string TotalAmount { get; set; }
-    /// <summary>
+}
-    /// ارزش افزوده
+
-    /// </summary>
+public class InstitutionContractCreationWorkshopsRequest
-    public string Tax { get; set; }
+{
-    /// <summary>
+    public Guid TempId { get; set; }
-    /// مبلغ قابل پرداخت
+    public string City { get; set; }
-    /// </summary>
+    public string Province { get; set; }
-    public string PaymentAmount { get; set; }
+    public string Address { get; set; }
+    public List<EditContactInfo> ContactInfos { get; set; }
+
+    /// <summary>
+    /// اطلاعات شخص حقیقی
+    /// </summary>
+    public CreateInstitutionContractRealPartyRequest RealParty { get; set; }
+
+    /// <summary>
+    /// اطلاعات شخص حقوقی
+    /// </summary>
+    public CreateInstitutionContractLegalPartyRequest LegalParty { get; set; }
+
+    public LegalType LegalType { get; set; }
+
+    public long RepresentativeId { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/InsertAmendmentTempWorkshopResponse.cs

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

@@ -0,0 +1,15 @@
+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/InstitutionContractCreationInquiryRequest.cs

@@ -0,0 +1,11 @@
+using _0_Framework.Application.Enums;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+public class InstitutionContractCreationInquiryRequest
+{
+    public string NationalCode { get; set; }
+    public string DateOfBirth { get; set; }
+    public string Mobile { get; set; }
+    public LegalType LegalType { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractDiscountResponse.cs

@@ -0,0 +1,38 @@
+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/InstitutionContractExtensionCompleteRequest.cs

@@ -8,3 +8,10 @@ public class InstitutionContractExtensionCompleteRequest
     public bool IsInstallment { get; set; }
     public long LawId { get; set; }
 }
+
+public class InstitutionContractCreationCompleteRequest
+{
+    public Guid TemporaryId { get; set; }
+    public bool IsInstallment { get; set; }
+    public long LawId { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionInquiryResponse.cs

@@ -0,0 +1,18 @@
+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/InstitutionContractExtensionInquiryResult.cs

@@ -25,3 +25,20 @@ public class InstitutionContractExtensionInquiryResult
     public List<EditContactInfo> ContactInfoViewModels { get; set; }
     public long RepresentativeId { get; set; }
 }
+
+public class InstitutionContractCreationInquiryResult
+{
+    /// <summary>
+    /// اطلاعات شخص حقیقی
+    /// </summary>
+    public CreateInstitutionContractRealPartyRequest RealParty { get; set; }
+    
+    /// <summary>
+    /// اطلاعات شخص حقوقی
+    /// </summary>
+    public CreateInstitutionContractLegalPartyRequest LegalParty { get; set; }
+
+    public LegalType LegalType { get; set; }
+    
+    public Guid TempId { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionPaymentOneTime.cs

@@ -0,0 +1,24 @@
+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/InstitutionContractExtensionPaymentRequest.cs

@@ -7,3 +7,8 @@ public class InstitutionContractExtensionPaymentRequest
     public InstitutionContractDuration Duration { get; set; }
     public Guid TempId { get; set; }
 }
+public class InstitutionContractCreationPaymentRequest
+{
+    public InstitutionContractDuration Duration { get; set; }
+    public Guid TempId { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionPaymentResponse.cs

@@ -6,3 +6,10 @@ public class InstitutionContractExtensionPaymentResponse
     public InstitutionContractPaymentMonthlyViewModel Monthly { get; set; }
     
 }
+
+public class InstitutionContractCreationPaymentResponse
+{
+    public InstitutionContractPaymentOneTimeViewModel OneTime { get; set; }
+    public InstitutionContractPaymentMonthlyViewModel Monthly { get; set; }
+    
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionPlanRequest.cs

@@ -10,3 +10,10 @@ public class InstitutionContractExtensionPlanRequest
     public string TotalAmount { get; set; }
     public Guid TempId { get; set; }
 }
+
+public class InstitutionContractCreationPlanRequest
+{
+    public List<WorkshopTempViewModel> WorkshopTemps { get; set; }
+    public string TotalAmount { get; set; }
+    public Guid TempId { get; set; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionPlanResponse.cs

@@ -7,7 +7,18 @@ public class InstitutionContractExtensionPlanResponse
     public InstitutionContractExtensionPlanDetail SixMonths { get; set; }
     public InstitutionContractExtensionPlanDetail TwelveMonths { get; set; }
 }
-public class InstitutionContractExtensionPlanDetail
+public class InstitutionContractExtensionPlanDetail:InstitutionContractCreationPlanDetail
+{
+}
+
+public class InstitutionContractCreationPlanResponse
+{
+    public InstitutionContractCreationPlanDetail OneMonth { get; set; }
+    public InstitutionContractCreationPlanDetail ThreeMonths { get; set; }
+    public InstitutionContractCreationPlanDetail SixMonths { get; set; }
+    public InstitutionContractCreationPlanDetail TwelveMonths { get; set; }
+}   
+public class InstitutionContractCreationPlanDetail
 {
     public string ContractStart { get; set; }
     public string ContractEnd { get; set; }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractPaymentOneTimeViewModel.cs

@@ -18,10 +18,20 @@ 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; }
 }
 public class InstitutionContractPaymentMonthlyViewModel:InstitutionContractPaymentOneTimeViewModel
 {
-    public List<MonthlyInstallment> Installments { get; set; }
+    public List<MonthlyInstallment> Installments { get; set; } = [];
 }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractPrintViewModel.cs

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