add: implement AsghaeeAzarWorkshopsExcelGenerator and view model for generating Excel reports

# Conflicts:
#	CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

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

AccountManagement.Application/AccountApplication.cs

@@ -155,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));
@@ -252,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();
 
         //اگر کاربر در پروگرام منیجر قبلا ایجاد شده
@@ -396,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)
             {
@@ -405,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, 

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/BackgroundInstitutionContract.Task.csproj

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

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Jobs/JobSchedulerRegistrator.cs

@@ -47,6 +47,11 @@ public class JobSchedulerRegistrator
             () => SendBlockSms(),
             "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
         );
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.SendInstitutionContractConfirmSms",
+            () => SendInstitutionContractConfirmSms(),
+            "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
+        );
     }
 
 
@@ -146,4 +151,15 @@ public class JobSchedulerRegistrator
         await _institutionContractRepository.SendBlockSmsForBackgroundTask();
     }
 
+
+    /// <summary>
+    /// ارسال پیامک یادآور تایید قراداد مالی
+    /// </summary>
+    /// <returns></returns>
+    [DisableConcurrentExecution(timeoutInSeconds: 100)]
+    public async System.Threading.Tasks.Task SendInstitutionContractConfirmSms()
+    {
+        await _institutionContractRepository.SendInstitutionContractConfirmSmsTask();
+    }
+
 }

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Program.cs

@@ -7,11 +7,16 @@ using BackgroundInstitutionContract.Task;
 using BackgroundInstitutionContract.Task.Jobs;
 using CompanyManagment.App.Contracts.Hubs;
 using CompanyManagment.EFCore.Services;
+using GozareshgirProgramManager.Application._Bootstrapper;
+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 Shared.Contracts.PmUser.Queries;
 using WorkFlow.Infrastructure.Config;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -38,10 +43,15 @@ 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();

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

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

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

@@ -37,4 +37,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/InsuranceListAgg/IInsuranceListRepository.cs

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

Company.Domain/WorkshopAgg/Workshop.cs

@@ -316,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/AsghaeeAzarWorkshops/AsghaeeAzarWorkshopsExcelGenerator.cs

@@ -0,0 +1,154 @@
+using System.Drawing;
+using _0_Framework.Application;
+using OfficeOpenXml;
+using OfficeOpenXml.Style;
+
+namespace CompanyManagement.Infrastructure.Excel.Checkout.AsghaeeAzarWorkshops;
+
+public class AsghaeeAzarWorkshopsExcelGenerator
+{
+    public static Dictionary<string, string> Header { get; set; } = new()
+    {
+        { "FullName", "نام و نام خانوادگی" },
+        { "NationalCode", "کد ملی" },
+        { "FinalAmount", "مبلغ نهایی" }
+    };
+
+    public static byte[] Generate(List<AsghaeeAzarWorkshopsExcelViewModel> data)
+    {
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        using var package = new ExcelPackage();
+        var worksheet = package.Workbook.Worksheets.Add("Sheet1");
+
+        // Add index column header
+        var indexCell = worksheet.Cells[1, 1];
+        indexCell.Value = "ردیف";
+        ApplyHeaderStyle(indexCell);
+
+        // Add headers to worksheet
+        for (int i = 0; i < Header.Count; i++)
+        {
+            worksheet.Cells[1, i + 2].Value = Header.ElementAt(i).Value;
+            ApplyHeaderStyle(worksheet.Cells[1, i + 2]);
+        }
+
+        var dataRow = 2;
+        int finalAmountColumnIndex = -1;
+
+        foreach (var item in data)
+        {
+            var column = 2;
+            foreach (var header in Header)
+            {
+                var property = item.GetType().GetProperty(header.Key);
+                var value = property?.GetValue(item, null)?.ToString();
+
+                // Check if the property requires MoneyToDouble()
+                if (header.Key == "FinalAmount")
+                {
+                    worksheet.Cells[dataRow, column].Value = MoneyToDouble(value ?? "0");
+                    finalAmountColumnIndex = column;
+                }
+                else
+                {
+                    worksheet.Cells[dataRow, column].Value = value;
+                }
+
+                ApplyGeneralDataStyle(worksheet.Cells[dataRow, column]);
+                ApplySpecificStyle(worksheet.Cells[dataRow, column], header.Key);
+
+                column++;
+            }
+
+            // Add row number
+            var rowCounter = worksheet.Cells[dataRow, 1];
+            rowCounter.Value = dataRow - 1;
+            ApplyGeneralDataStyle(rowCounter);
+            ApplySpecificStyle(rowCounter, "RowNumber");
+
+            dataRow++;
+        }
+
+        worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns();
+        worksheet.PrinterSettings.PaperSize = ePaperSize.A4;
+        worksheet.PrinterSettings.Orientation = eOrientation.Portrait;
+        worksheet.PrinterSettings.FitToPage = true;
+        worksheet.PrinterSettings.FitToWidth = 1;
+        worksheet.PrinterSettings.FitToHeight = 0;
+        worksheet.PrinterSettings.Scale = 85;
+        worksheet.View.RightToLeft = true;
+
+        if (finalAmountColumnIndex != -1)
+        {
+            ApplyConditionalFormatting(worksheet, dataRow, finalAmountColumnIndex);
+        }
+
+        return package.GetAsByteArray();
+    }
+
+    private static double MoneyToDouble(string value)
+    {
+        if (string.IsNullOrEmpty(value))
+            return 0;
+
+        var min = value.Length > 1 ? value.Substring(0, 2) : "";
+        var result = min == "\u200e\u2212" ? value.MoneyToDouble() * -1 : value.MoneyToDouble();
+        return result;
+    }
+
+    private static void ApplyHeaderStyle(ExcelRange cell)
+    {
+        cell.Style.Font.Bold = true;
+        cell.Style.Fill.PatternType = ExcelFillStyle.Solid;
+        cell.Style.Fill.BackgroundColor.SetColor(Color.LightGray);
+        cell.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
+        cell.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
+        cell.Style.Border.BorderAround(ExcelBorderStyle.Thin);
+    }
+
+    private static void ApplyGeneralDataStyle(ExcelRange cell)
+    {
+        cell.Style.Border.BorderAround(ExcelBorderStyle.Thin);
+        cell.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
+        cell.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
+        cell.Style.Fill.PatternType = ExcelFillStyle.Solid;
+    }
+
+    private static void ApplySpecificStyle(ExcelRange cell, string columnKey)
+    {
+        switch (columnKey)
+        {
+            case "RowNumber":
+            case "FullName":
+            case "NationalCode":
+                cell.Style.Fill.BackgroundColor.SetColor(Color.LightYellow);
+                break;
+            case "FinalAmount":
+                cell.Style.Fill.BackgroundColor.SetColor(ColorTranslator.FromHtml("#A8BAFE")); // Light blue
+                cell.Style.Numberformat.Format = "#,##0";
+                break;
+        }
+    }
+
+    private static void ApplyConditionalFormatting(ExcelWorksheet worksheet, int dataRow, int finalAmountColumnIndex)
+    {
+        for (int rowIndex = 2; rowIndex < dataRow; rowIndex++)
+        {
+            var finalAmountValue = worksheet.Cells[rowIndex, finalAmountColumnIndex].Value;
+            if (finalAmountValue != null && double.TryParse(finalAmountValue.ToString(), out double amount))
+            {
+                if (amount < 0)
+                {
+                    var rowRange = worksheet.Cells[rowIndex, 1, rowIndex, worksheet.Dimension.End.Column];
+                    rowRange.Style.Fill.PatternType = ExcelFillStyle.Solid;
+                    rowRange.Style.Fill.BackgroundColor.SetColor(Color.Red);
+                    foreach (var cell in rowRange)
+                    {
+                        cell.Style.Font.Color.SetColor(Color.White);
+                    }
+                }
+            }
+        }
+    }
+}
+

CompanyManagement.Infrastructure.Excel/Checkout/AsghaeeAzarWorkshops/AsghaeeAzarWorkshopsExcelViewModel.cs

@@ -0,0 +1,8 @@
+namespace CompanyManagement.Infrastructure.Excel.Checkout.AsghaeeAzarWorkshops;
+
+public class AsghaeeAzarWorkshopsExcelViewModel
+{
+    public string FullName { get; set; }
+    public string NationalCode { get; set; }
+    public string FinalAmount { get; set; }
+}

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)
         {
@@ -220,4 +220,4 @@ public class EmployeeBankInfoExcelGenerator
         cell.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
         cell.Style.Fill.PatternType = ExcelFillStyle.Solid;
     }
-}
+}

CompanyManagement.Infrastructure.Excel/InstitutionContract/InstitutionContractExcelGenerator.cs

@@ -13,7 +13,7 @@ public class InstitutionContractExcelGenerator
 
     public static byte[] GenerateExcel(List<InstitutionContractViewModel> institutionContractViewModels)
     {
-        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         using var package = new ExcelPackage();
         var allWorksheet = package.Workbook.Worksheets.Add("همه");
 

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");

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>
     /// پرسنل هایی که در کارگاهی از سمت ادمین شروع به کار کرده اند

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

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

CompanyManagment.App.Contracts/InstitutionContract/InsertAmendmentTempWorkshopResponse.cs

@@ -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/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/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/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/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; }
+}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractResetDiscountForCreateRequest.cs

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

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractResetDiscountForExtensionRequest.cs

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

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractSelectListViewModel.cs

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

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractSetDiscountForExtensionRequest.cs

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

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractSetDiscountRequest.cs

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

CompanyManagment.App.Contracts/InstitutionContract/InstitutionCreationVerificationSmsDto.cs

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

CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs

@@ -90,8 +90,27 @@ public interface IInsuranceListApplication
     Task<InsuranceListConfirmOperation> GetInsuranceOperationDetails(long id);
 
 	Task<InsuranceListTabsCountViewModel> GetTabCounts(InsuranceListSearchModel searchModel);
+    Task<PagedResult<InsuranceClientListViewModel>> GetInsuranceClientList(InsuranceClientSearchModel searchModel);
+    
 
 	#endregion
 
     Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel);
+}
+
+public class InsuranceClientSearchModel:PaginationRequest
+{
+    public int Year { get; set; }
+    public int Month { get; set; }
+    public string Sorting { get; set; }
+}
+public class InsuranceClientListViewModel
+{
+    public long Id { get; set; }
+    public string Year { get; set; }
+    public string Month { get; set; }
+    public long WorkShopId { get; set; }
+    public int YearInt { get; set; }
+    public string MonthName { get; set; }
+    public int MonthInt { get; set; }
 }

CompanyManagment.App.Contracts/RollCallEmployee/IRollCallEmployeeApplication.cs

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

CompanyManagment.Application/EmployeeAplication.cs

@@ -1263,7 +1263,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         System.IO.File.WriteAllBytes(filePath, bytes);
     }
     public async Task<OperationResult<EmployeeByNationalCodeInWorkshopViewModel>>
-        ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(string nationalCode, string birthDate, long workshopId)
+        ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(string nationalCode, string birthDate,bool authorizedCanceled, long workshopId)
     {
         var op = new OperationResult<EmployeeByNationalCodeInWorkshopViewModel>();
 
@@ -1279,65 +1279,25 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         var employee = _EmployeeRepository.GetByNationalCodeIgnoreQueryFilter(nationalCode);
 
-        if (employee == null)
+        if (employee == null && !authorizedCanceled)
         {
             var personalInfo = await _uidService.GetPersonalInfo(nationalCode, birthDate);
-
-            if (personalInfo.ResponseContext.Status.Code == 14)
+            if (personalInfo != null)
             {
-                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید", new EmployeeByNationalCodeInWorkshopViewModel() { AuthorizedCanceled = true });
-            }
-            if (personalInfo.ResponseContext.Status.Code != 0)
-            {
-                return op.Failed("کد ملی و تاریخ تولد با هم همخانی ندارند");
-            }
+                if (personalInfo.ResponseContext.Status.Code == 14)
+                {
+                    return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید", new EmployeeByNationalCodeInWorkshopViewModel() { AuthorizedCanceled = true });
+                }
+                if (personalInfo.ResponseContext.Status.Code != 0)
+                {
+                    return op.Failed("کد ملی و تاریخ تولد با هم همخانی ندارند");
+                }
 
-            var basicInfo = personalInfo.BasicInformation;
-            var identityInfo = personalInfo.IdentificationInformation;
-            DateTime apiBirthDate = identityInfo.BirthDate.ToGeorgianDateTime();
+                var basicInfo = personalInfo.BasicInformation;
+                var identityInfo = personalInfo.IdentificationInformation;
+                DateTime apiBirthDate = identityInfo.BirthDate.ToGeorgianDateTime();
 
-            var dateOfIssue = new DateTime(1922, 1, 1);
-
-            var gender = basicInfo.GenderEnum switch
-            {
-                Gender.Female => "زن",
-                Gender.Male => "مرد",
-                _ => throw new AggregateException()
-            };
-
-            var idNumber = identityInfo.ShenasnamehNumber == "0" ? identityInfo.NationalId : identityInfo.ShenasnamehNumber;
-
-            var newEmployee = new Employee(basicInfo.FirstName, basicInfo.LastName, basicInfo.FatherName, apiBirthDate,
-                dateOfIssue, null, identityInfo.NationalId, idNumber, gender, "ایرانی", identityInfo.ShenasnameSerial, identityInfo.ShenasnameSeri);
-            newEmployee.Authorized();
-            await _EmployeeRepository.CreateAsync(newEmployee);
-            await _EmployeeRepository.SaveChangesAsync();
-
-            return op.Succcedded(new EmployeeByNationalCodeInWorkshopViewModel()
-            {
-                EmployeeId = newEmployee.id,
-                EmployeeFName = newEmployee.FName,
-                Gender = newEmployee.Gender,
-                Nationality = newEmployee.Nationality,
-                EmployeeLName = newEmployee.LName
-            });
-        }
-
-        if (_leftWorkTempRepository.ExistsIgnoreQueryFilter(x =>
-                x.EmployeeId == employee.id && x.WorkshopId == workshopId && x.LeftWorkType == LeftWorkTempType.StartWork))
-        {
-            return op.Failed("این پرسنل در کارگاه شما قبلا افزوده شده است و در انتظار تایید میباشد");
-        }
-
-        if (employee.IsAuthorized == false)
-        {
-            var personalInfoResponse = await _uidService.GetPersonalInfo(nationalCode, birthDate);
-
-            if (personalInfoResponse.ResponseContext.Status.Code == 0)
-            {
-                var basicInfo = personalInfoResponse.BasicInformation;
-                var identityInfo = personalInfoResponse.IdentificationInformation;
-                var apiBirthDate = identityInfo.BirthDate.ToGeorgianDateTime();
+                var dateOfIssue = new DateTime(1922, 1, 1);
 
                 var gender = basicInfo.GenderEnum switch
                 {
@@ -1348,31 +1308,90 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
                 var idNumber = identityInfo.ShenasnamehNumber == "0" ? identityInfo.NationalId : identityInfo.ShenasnamehNumber;
 
-
-                employee.Edit(basicInfo.FirstName, basicInfo.LastName, basicInfo.FatherName, apiBirthDate,
-                    employee.DateOfIssue, employee.PlaceOfIssue, identityInfo.NationalId, idNumber,
-                    gender, "ایرانی", employee.Phone, employee.Address, employee.State, employee.City,
-                    employee.MaritalStatus, employee.MilitaryService, employee.LevelOfEducation,
-                    employee.FieldOfStudy, employee.BankCardNumber, employee.BankBranch, employee.InsuranceCode, employee.InsuranceHistoryByYear,
-                    employee.InsuranceHistoryByMonth, employee.NumberOfChildren,
-                    employee.OfficePhone, employee.MclsUserName, employee.MclsPassword,
-                    employee.EserviceUserName, employee.EservicePassword, employee.TaxOfficeUserName,
-                    employee.TaxOfficepassword, employee.SanaUserName, employee.SanaPassword);
-
-                employee.Authorized();
-
+                var newEmployee = new Employee(basicInfo.FirstName, basicInfo.LastName, basicInfo.FatherName, apiBirthDate,
+                    dateOfIssue, null, identityInfo.NationalId, idNumber, gender, "ایرانی", identityInfo.ShenasnameSerial, identityInfo.ShenasnameSeri);
+                newEmployee.Authorized();
+                await _EmployeeRepository.CreateAsync(newEmployee);
                 await _EmployeeRepository.SaveChangesAsync();
 
+                return op.Succcedded(new EmployeeByNationalCodeInWorkshopViewModel()
+                {
+                    EmployeeId = newEmployee.id,
+                    EmployeeFName = newEmployee.FName,
+                    Gender = newEmployee.Gender,
+                    Nationality = newEmployee.Nationality,
+                    EmployeeLName = newEmployee.LName
+                });
             }
             else
+            {
+                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید", new EmployeeByNationalCodeInWorkshopViewModel() { AuthorizedCanceled = true });
+            }
+          
+           
+            
+        
+        }
+        else if (employee == null && authorizedCanceled)
+        {
+            return op.Succcedded(new EmployeeByNationalCodeInWorkshopViewModel());
+        }
+
+        if (_leftWorkTempRepository.ExistsIgnoreQueryFilter(x =>
+                x.EmployeeId == employee.id && x.WorkshopId == workshopId && x.LeftWorkType == LeftWorkTempType.StartWork))
+        {
+            return op.Failed("این پرسنل در کارگاه شما قبلا افزوده شده است و در انتظار تایید میباشد");
+        }
+
+        var personalInfoResponse = await _uidService.GetPersonalInfo(nationalCode, birthDate);
+        if (personalInfoResponse != null)
+        {
+            if (employee.IsAuthorized == false)
+            {
+
+
+                if (personalInfoResponse.ResponseContext.Status.Code == 0)
+                {
+                    var basicInfo = personalInfoResponse.BasicInformation;
+                    var identityInfo = personalInfoResponse.IdentificationInformation;
+                    var apiBirthDate = identityInfo.BirthDate.ToGeorgianDateTime();
+
+                    var gender = basicInfo.GenderEnum switch
+                    {
+                        Gender.Female => "زن",
+                        Gender.Male => "مرد",
+                        _ => throw new AggregateException()
+                    };
+
+                    var idNumber = identityInfo.ShenasnamehNumber == "0" ? identityInfo.NationalId : identityInfo.ShenasnamehNumber;
+
+
+                    employee.Edit(basicInfo.FirstName, basicInfo.LastName, basicInfo.FatherName, apiBirthDate,
+                        employee.DateOfIssue, employee.PlaceOfIssue, identityInfo.NationalId, idNumber,
+                        gender, "ایرانی", employee.Phone, employee.Address, employee.State, employee.City,
+                        employee.MaritalStatus, employee.MilitaryService, employee.LevelOfEducation,
+                        employee.FieldOfStudy, employee.BankCardNumber, employee.BankBranch, employee.InsuranceCode, employee.InsuranceHistoryByYear,
+                        employee.InsuranceHistoryByMonth, employee.NumberOfChildren,
+                        employee.OfficePhone, employee.MclsUserName, employee.MclsPassword,
+                        employee.EserviceUserName, employee.EservicePassword, employee.TaxOfficeUserName,
+                        employee.TaxOfficepassword, employee.SanaUserName, employee.SanaPassword);
+
+                    employee.Authorized();
+
+                    await _EmployeeRepository.SaveChangesAsync();
+
+                }
+                else
+                {
+                    return op.Failed("کد ملی با تاریخ تولد وارد شده مطابقت ندارد");
+                }
+            }
+            else if (employee.DateOfBirth.ToFarsi() != birthDate || employee.NationalCode != nationalCode)
             {
                 return op.Failed("کد ملی با تاریخ تولد وارد شده مطابقت ندارد");
             }
         }
-        else if (employee.DateOfBirth.ToFarsi() != birthDate || employee.NationalCode != nationalCode)
-        {
-            return op.Failed("کد ملی با تاریخ تولد وارد شده مطابقت ندارد");
-        }
+       
 
         var leftWorkViewModel = _leftWorkRepository.GetLastLeftWorkByEmployeeIdAndWorkshopId(workshopId, employee.id);
         if (leftWorkViewModel == null)

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -1537,7 +1537,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return (await _institutionContractRepository.PrintAllAsync([id])).FirstOrDefault();
     }
 
-    public async Task<OperationResult> SetPendingWorkflow(long entityId)
+    public async Task<OperationResult> SetPendingWorkflow(long entityId,InstitutionContractSigningType signingType)
     {
         var op = new OperationResult();
         var institutionContract = await _institutionContractRepository.GetIncludeWorkshopDetailsAsync(entityId);
@@ -1551,6 +1551,30 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             return op.Failed("وضعیت قرارداد مالی برای این عملیات مناسب نمی باشد");
         }
 
+        var initialCreatedWorkshops = institutionContract.WorkshopGroup.InitialWorkshops
+            .Where(x => x.WorkshopCreated && x.WorkshopId is > 0).ToList();
+        
+        var currentWorkshops = institutionContract.WorkshopGroup.CurrentWorkshops.ToList();
+        foreach (var createdWorkshop in initialCreatedWorkshops)
+        {
+            if (currentWorkshops.Any(x => x.WorkshopId == createdWorkshop.WorkshopId))
+            {
+                continue;
+            }
+
+            var currentWorkshop = new InstitutionContractWorkshopCurrent(createdWorkshop.WorkshopName,
+                createdWorkshop.Services.RollCall, createdWorkshop.Services.RollCallInPerson,
+                createdWorkshop.Services.CustomizeCheckout, createdWorkshop.Services.Contract,
+                createdWorkshop.Services.ContractInPerson, createdWorkshop.Services.Insurance,
+                createdWorkshop.Services.InsuranceInPerson,createdWorkshop.PersonnelCount, createdWorkshop.Price,
+                createdWorkshop.InstitutionContractWorkshopGroupId,createdWorkshop.WorkshopGroup,
+                createdWorkshop.WorkshopId!.Value, createdWorkshop.id);
+            institutionContract.WorkshopGroup.AddCurrentWorkshop(currentWorkshop);
+
+
+
+        }
+        
         if (institutionContract.WorkshopGroup.InitialWorkshops.All(x => x.WorkshopCreated && x.WorkshopId is > 0))
         {
             institutionContract.Verified();
@@ -1559,7 +1583,9 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         {
             institutionContract.SetPendingWorkflow();
         }
-
+        
+        institutionContract.SetSigningType(signingType);
+        
         await _institutionContractRepository.SaveChangesAsync();
         return op.Succcedded();
     }
@@ -1569,6 +1595,28 @@ public class InstitutionContractApplication : IInstitutionContractApplication
 		return await _institutionContractRepository.GetIdByInstallmentId(installmentId);
 	}
 
+    public async Task<OperationResult> VerifyInstitutionContractManually(long institutionContractId)
+    {
+        var op = new OperationResult();
+        
+        var institutionContract =await _institutionContractRepository
+            .GetIncludeWorkshopDetailsAsync(institutionContractId);
+        
+        if (institutionContract == null)
+            return op.Failed("قرارداد مالی یافت نشد");
+        
+        if (institutionContract.VerificationStatus == InstitutionContractVerificationStatus.Verified)
+            return op.Failed("قرارداد مالی قبلا تایید شده است");
+
+        var transaction = await _institutionContractRepository.BeginTransactionAsync();
+        await SetPendingWorkflow(institutionContractId,InstitutionContractSigningType.Physical);
+        
+        
+        await transaction.CommitAsync();
+        await _institutionContractRepository.SaveChangesAsync();
+        return op.Succcedded();
+    }
+
     private async Task<OperationResult<PersonalContractingParty>> CreateLegalContractingPartyEntity(
         CreateInstitutionContractLegalPartyRequest request, long representativeId, string address, string city,
         string state)

CompanyManagment.Application/InsuranceListApplication.cs

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

CompanyManagment.Application/RollCallApplication.cs

@@ -384,6 +384,7 @@ public class RollCallApplication : IRollCallApplication
 
 
         var workshopSettings = _customizeWorkshopSettingsRepository.GetBy(command.WorkshopId);
+        
         var employeeSettings =
             _customizeWorkshopEmployeeSettingsRepository.GetByEmployeeIdAndWorkshopIdIncludeGroupSettings(
                 command.WorkshopId, command.EmployeeId)?.WorkshopShiftStatus;

CompanyManagment.Application/RollCallEmployeeApplication.cs

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

CompanyManagment.EFCore/Mapping/InstitutionContractMapping.cs

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

CompanyManagment.EFCore/Migrations/20251220143403_addsigningTypeforinstitutioncontract.cs

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

CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs

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

CompanyManagment.EFCore/Repository/EmployeeDocumentsRepository.cs

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

CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs

@@ -1,23 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Diagnostics;
-using System.Diagnostics.Metrics;
-using System.Drawing;
-using System.Globalization;
-using System.Linq;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-using _0_Framework.Application;
+using _0_Framework.Application;
 using _0_Framework.Application.Enums;
 using _0_Framework.Application.Sms;
 using _0_Framework.Exceptions;
 using _0_Framework.InfraStructure;
 using Company.Domain.ContarctingPartyAgg;
-using Company.Domain.ContractingPartyAccountAgg;
 using Company.Domain.empolyerAgg;
-using Company.Domain.FinancialInvoiceAgg;
 using Company.Domain.FinancialStatmentAgg;
 using Company.Domain.FinancialTransactionAgg;
 using Company.Domain.InstitutionContractAgg;
@@ -28,7 +15,6 @@ using Company.Domain.InstitutionPlanAgg;
 using Company.Domain.SmsResultAgg;
 using Company.Domain.WorkshopAgg;
 using CompanyManagment.App.Contracts.Employer;
-using CompanyManagment.App.Contracts.FinancialInvoice;
 using CompanyManagment.App.Contracts.FinancialStatment;
 using CompanyManagment.App.Contracts.FinancilTransaction;
 using CompanyManagment.App.Contracts.Hubs;
@@ -37,20 +23,21 @@ using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
 using CompanyManagment.App.Contracts.Law;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.App.Contracts.Workshop;
-using CompanyManagment.App.Contracts.WorkshopPlan;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Storage;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using MongoDB.Driver;
-using OfficeOpenXml.Packaging.Ionic.Zip;
 using PersianTools.Core;
-using static System.Runtime.InteropServices.JavaScript.JSType;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
-using SmsResult = CompanyManagment.EFCore.Migrations.SmsResult;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ContractingPartyAccount = Company.Domain.ContractingPartyAccountAgg.ContractingPartyAccount;
+using FinancialStatment = Company.Domain.FinancialStatmentAgg.FinancialStatment;
 using String = System.String;
+using Workshop = Company.Domain.WorkshopAgg.Workshop;
 
 namespace CompanyManagment.EFCore.Repository;
 
@@ -102,69 +89,69 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     public EditInstitutionContract GetDetails(long id)
     {
         return _context.InstitutionContractSet.Select(x => new EditInstitutionContract()
-            {
-                Id = x.id,
-                ContractNo = x.ContractNo,
-                ContractStartGr = x.ContractStartGr,
-                ContractStartFa = x.ContractStartFa,
-                ContractEndGr = x.ContractEndGr,
-                ContractEndFa = x.ContractEndFa,
-                RepresentativeName = x.RepresentativeName,
-                ContractingPartyName = x.ContractingPartyName,
-                RepresentativeId = x.RepresentativeId,
-                ContractingPartyId = x.ContractingPartyId,
-                ContractDateFa = x.ContractDateFa,
-                State = x.State,
-                City = x.City,
-                Address = x.Address,
-                Description = x.Description,
-                WorkshopManualCount = x.WorkshopManualCount,
-                EmployeeManualCount = x.EmployeeManualCount,
-                ContractAmountString = x.ContractAmount.ToMoney(),
-                ContractAmount = x.ContractAmount,
-                DailyCompenseationString = x.DailyCompenseation.ToMoney(),
-                ObligationString = x.Obligation.ToMoney(),
-                TotalAmountString = x.TotalAmount.ToMoney(),
-                ExtensionNo = x.ExtensionNo,
-                OfficialCompany = x.OfficialCompany,
-                TypeOfContract = x.TypeOfContract,
-                Signature = x.Signature,
-                HasValueAddedTax = x.HasValueAddedTax,
-                ValueAddedTax = x.ValueAddedTax,
-            })
+        {
+            Id = x.id,
+            ContractNo = x.ContractNo,
+            ContractStartGr = x.ContractStartGr,
+            ContractStartFa = x.ContractStartFa,
+            ContractEndGr = x.ContractEndGr,
+            ContractEndFa = x.ContractEndFa,
+            RepresentativeName = x.RepresentativeName,
+            ContractingPartyName = x.ContractingPartyName,
+            RepresentativeId = x.RepresentativeId,
+            ContractingPartyId = x.ContractingPartyId,
+            ContractDateFa = x.ContractDateFa,
+            State = x.State,
+            City = x.City,
+            Address = x.Address,
+            Description = x.Description,
+            WorkshopManualCount = x.WorkshopManualCount,
+            EmployeeManualCount = x.EmployeeManualCount,
+            ContractAmountString = x.ContractAmount.ToMoney(),
+            ContractAmount = x.ContractAmount,
+            DailyCompenseationString = x.DailyCompenseation.ToMoney(),
+            ObligationString = x.Obligation.ToMoney(),
+            TotalAmountString = x.TotalAmount.ToMoney(),
+            ExtensionNo = x.ExtensionNo,
+            OfficialCompany = x.OfficialCompany,
+            TypeOfContract = x.TypeOfContract,
+            Signature = x.Signature,
+            HasValueAddedTax = x.HasValueAddedTax,
+            ValueAddedTax = x.ValueAddedTax,
+        })
             .FirstOrDefault(x => x.Id == id);
     }
 
     public EditInstitutionContract GetFirstContract(long contractingPartyId, string typeOfContract)
     {
         return _context.InstitutionContractSet.Select(x => new EditInstitutionContract()
-            {
-                Id = x.id,
-                ContractNo = x.ContractNo,
-                ContractStartGr = x.ContractStartGr,
-                ContractStartFa = x.ContractStartFa,
-                ContractEndGr = x.ContractEndGr,
-                ContractEndFa = x.ContractEndFa,
-                RepresentativeName = x.RepresentativeName,
-                ContractingPartyName = x.ContractingPartyName,
-                RepresentativeId = x.RepresentativeId,
-                ContractingPartyId = x.ContractingPartyId,
-                ContractDateFa = x.ContractDateFa,
-                State = x.State,
-                City = x.City,
-                Address = x.Address,
-                Description = x.Description,
-                WorkshopManualCount = x.WorkshopManualCount,
-                EmployeeManualCount = x.EmployeeManualCount,
-                ContractAmountString = x.ContractAmount.ToMoney(),
-                DailyCompenseationString = x.DailyCompenseation.ToMoney(),
-                ObligationString = x.Obligation.ToMoney(),
-                TotalAmountString = x.TotalAmount.ToMoney(),
-                ExtensionNo = x.ExtensionNo,
-                OfficialCompany = x.OfficialCompany,
-                TypeOfContract = x.TypeOfContract,
-                Signature = x.Signature
-            })
+        {
+            Id = x.id,
+            ContractNo = x.ContractNo,
+            ContractStartGr = x.ContractStartGr,
+            ContractStartFa = x.ContractStartFa,
+            ContractEndGr = x.ContractEndGr,
+            ContractEndFa = x.ContractEndFa,
+            RepresentativeName = x.RepresentativeName,
+            ContractingPartyName = x.ContractingPartyName,
+            RepresentativeId = x.RepresentativeId,
+            ContractingPartyId = x.ContractingPartyId,
+            ContractDateFa = x.ContractDateFa,
+            State = x.State,
+            City = x.City,
+            Address = x.Address,
+            Description = x.Description,
+            WorkshopManualCount = x.WorkshopManualCount,
+            EmployeeManualCount = x.EmployeeManualCount,
+            ContractAmountString = x.ContractAmount.ToMoney(),
+            DailyCompenseationString = x.DailyCompenseation.ToMoney(),
+            ObligationString = x.Obligation.ToMoney(),
+            TotalAmountString = x.TotalAmount.ToMoney(),
+            ExtensionNo = x.ExtensionNo,
+            OfficialCompany = x.OfficialCompany,
+            TypeOfContract = x.TypeOfContract,
+            Signature = x.Signature
+        })
             .Where(x => x.ContractingPartyId == contractingPartyId && x.TypeOfContract == typeOfContract)
             .OrderBy(x => x.ExtensionNo).FirstOrDefault();
     }
@@ -582,40 +569,40 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 }).ToList(),
         }).ToList();
         listQuery = listQuery.Select(x => new InstitutionContractViewModel()
-            {
-                Id = x.Id,
-                ContractNo = x.ContractNo,
-                ContractStartGr = x.ContractStartGr,
-                ContractStartFa = x.ContractStartFa,
-                ContractEndGr = x.ContractEndGr,
-                ContractEndFa = x.ContractEndFa,
-                RepresentativeId = x.RepresentativeId,
-                RepresentativeName = x.RepresentativeName,
-                ContractingPartyName = x.ContractingPartyName,
-                ContractingPartyId = x.ContractingPartyId,
-                ContractAmount = x.ContractAmount,
-                TotalAmount = x.TotalAmount,
-                SearchAmount = x.SearchAmount,
-                IsActiveString = x.IsActiveString,
-                OfficialCompany = x.OfficialCompany,
-                TypeOfContract = x.TypeOfContract,
-                Signature = x.Signature,
-                ExpireColor = x.ExpireColor,
-                IsExpier = x.IsExpier,
-                BalanceDouble = x.BalanceDouble,
-                BalanceStr = x.BalanceStr,
-                EmployerViewModels = x.EmployerViewModels,
-                EmployerNo = x.EmployerNo,
-                EmployerName = x.EmployerViewModels.Select(n => n.FullName).FirstOrDefault(),
-                WorkshopViewModels = x.WorkshopViewModels,
-                WorkshopCount = x.WorkshopCount,
-                IsContractingPartyBlock = x.IsContractingPartyBlock,
-                BlockTimes = x.BlockTimes,
-                EmployeeCount =
+        {
+            Id = x.Id,
+            ContractNo = x.ContractNo,
+            ContractStartGr = x.ContractStartGr,
+            ContractStartFa = x.ContractStartFa,
+            ContractEndGr = x.ContractEndGr,
+            ContractEndFa = x.ContractEndFa,
+            RepresentativeId = x.RepresentativeId,
+            RepresentativeName = x.RepresentativeName,
+            ContractingPartyName = x.ContractingPartyName,
+            ContractingPartyId = x.ContractingPartyId,
+            ContractAmount = x.ContractAmount,
+            TotalAmount = x.TotalAmount,
+            SearchAmount = x.SearchAmount,
+            IsActiveString = x.IsActiveString,
+            OfficialCompany = x.OfficialCompany,
+            TypeOfContract = x.TypeOfContract,
+            Signature = x.Signature,
+            ExpireColor = x.ExpireColor,
+            IsExpier = x.IsExpier,
+            BalanceDouble = x.BalanceDouble,
+            BalanceStr = x.BalanceStr,
+            EmployerViewModels = x.EmployerViewModels,
+            EmployerNo = x.EmployerNo,
+            EmployerName = x.EmployerViewModels.Select(n => n.FullName).FirstOrDefault(),
+            WorkshopViewModels = x.WorkshopViewModels,
+            WorkshopCount = x.WorkshopCount,
+            IsContractingPartyBlock = x.IsContractingPartyBlock,
+            BlockTimes = x.BlockTimes,
+            EmployeeCount =
                     ((x.WorkshopViewModels.Sum(w => w.LeftWorkIds.Count)) + (x.WorkshopViewModels.Sum(w =>
                         w.InsuranceLeftWorkIds.Count(c => !w.LeftWorkIds.Contains(c))))).ToString(),
-                ArchiveCode = x.WorkshopViewModels.Count > 0 ? ArchiveCodeFinder(x.WorkshopViewModels) : 0,
-            }).OrderBy(x => x.WorkshopCount != "0" && string.IsNullOrWhiteSpace(x.ExpireColor))
+            ArchiveCode = x.WorkshopViewModels.Count > 0 ? ArchiveCodeFinder(x.WorkshopViewModels) : 0,
+        }).OrderBy(x => x.WorkshopCount != "0" && string.IsNullOrWhiteSpace(x.ExpireColor))
             .ThenBy(x => x.WorkshopCount == "0" && string.IsNullOrWhiteSpace(x.ExpireColor))
             .ThenBy(x => x.IsExpier == "true")
             .ThenBy(x => x.ExpireColor == "purple")
@@ -640,17 +627,17 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         var op = new OperationResult();
         var institutionContarct = _context.InstitutionContractSet
             .FirstOrDefault(x => x.id == id);
-        
+
         var prevInstitutionContracts = _context.InstitutionContractSet
             .Where(x => x.ContractingPartyId == institutionContarct.ContractingPartyId)
             .OrderByDescending(x => x.ContractEndGr).Skip(1).FirstOrDefault();
-        
+
         var transaction = _context.Database.BeginTransaction();
-        
+
         var contactInfo = _context.InstitutionContractContactInfos
             .Where(x => x.InstitutionContractId == id)
             .ToList();
-        
+
         if (contactInfo.Count > 0)
         {
             foreach (var item in contactInfo)
@@ -673,20 +660,20 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             var financialStatement =
                 _context.FinancialStatments
                     .Include(x => x.FinancialTransactionList)
-                    .FirstOrDefault(x=>x.ContractingPartyId == institutionContarct.ContractingPartyId);
+                    .FirstOrDefault(x => x.ContractingPartyId == institutionContarct.ContractingPartyId);
             if (financialStatement != null)
             {
-  
-             var sumDebtor = financialStatement.FinancialTransactionList
-                 .Sum(x => x.Deptor);
+
+                var sumDebtor = financialStatement.FinancialTransactionList
+                    .Sum(x => x.Deptor);
                 var sumCreditor = financialStatement.FinancialTransactionList
                     .Sum(x => x.Creditor);
                 var balance = sumDebtor - sumCreditor;
-             if (balance>0 && prevInstitutionContracts.ContractEndGr<now)
-             {
-                 prevInstitutionContracts.DeActiveBlue();
-                 _context.SaveChanges();
-             }
+                if (balance > 0 && prevInstitutionContracts.ContractEndGr < now)
+                {
+                    prevInstitutionContracts.DeActiveBlue();
+                    _context.SaveChanges();
+                }
             }
         }
 
@@ -1372,7 +1359,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     .Count(l => l.StartWorkDate <= DateTime.Now && l.LeftWorkDate >= DateTime.Now);
                 return new GetInstitutionContractListItemsViewModel()
                 {
-                    ContractAmount = x.contract.ContractAmount,
+                    ContractAmount = x.contract.ContractAmountWithTax,
                     Balance = statement?.FinancialTransactionList.Sum(ft => ft.Deptor - ft.Creditor) ?? 0,
                     WorkshopsCount = workshops.Count(),
                     ContractStartFa = x.contract.ContractStartGr.ToFarsi(),
@@ -1392,9 +1379,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     Workshops = workshopDetails,
                     IsInPersonContract = x.contract.WorkshopGroup?.CurrentWorkshops
                         .Any(y => y.Services.ContractInPerson) ?? true,
-                    IsOldContract = x.contract.WorkshopGroup?.CurrentWorkshops == null
-                                    || x.contract.WorkshopGroup.CurrentWorkshops.Count == 0
-                                    || x.contract.WorkshopGroup.CurrentWorkshops.Any(y => y.Price == 0)
+                    IsOldContract = x.contract.SigningType == InstitutionContractSigningType.Legacy
                 };
             }).ToList()
         };
@@ -3213,6 +3198,9 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 PaymentPrice = institution.TotalAmount.ToMoney(),
                 TotalPrice = (institution.TotalAmount - institution.ValueAddedTax).ToMoney(),
                 TaxPrice = institution.ValueAddedTax.ToMoney(),
+                OneMonthPrice = institution.ContractAmountWithTax.ToMoney(),
+                OneMonthWithoutTax = institution.ContractAmount.ToMoney(),
+                OneMonthTax = institution.ContractAmountTax.ToMoney(),
                 VerifierFullName = institution.VerifierFullName,
                 VerifierPhoneNumber = institution.VerifierPhoneNumber,
                 VerifyCode = institution.VerifyCode,
@@ -3573,19 +3561,19 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         var smsList = new List<BlockSmsListData>();
 
         var institutionContracts = await _context.InstitutionContractSet.Select(x => new InstitutionContractViewModel
-            {
-                Id = x.id,
-                ContractingPartyId = x.ContractingPartyId,
-                ContractingPartyName = x.ContractingPartyName,
-                ContractStartGr = x.ContractStartGr,
-                ContractStartFa = x.ContractStartFa,
-                ContractEndGr = x.ContractEndGr,
-                ContractEndFa = x.ContractEndFa,
-                IsActiveString = x.IsActiveString,
-                ContractAmountDouble = x.ContractAmount,
-                OfficialCompany = x.OfficialCompany
-            }).Where(x => x.ContractStartGr < checkDate && x.ContractEndGr >= checkDate &&
-                          x.ContractAmountDouble > 0).GroupBy(x => x.ContractingPartyId).Select(x => x.First())
+        {
+            Id = x.id,
+            ContractingPartyId = x.ContractingPartyId,
+            ContractingPartyName = x.ContractingPartyName,
+            ContractStartGr = x.ContractStartGr,
+            ContractStartFa = x.ContractStartFa,
+            ContractEndGr = x.ContractEndGr,
+            ContractEndFa = x.ContractEndFa,
+            IsActiveString = x.IsActiveString,
+            ContractAmountDouble = x.ContractAmount,
+            OfficialCompany = x.OfficialCompany
+        }).Where(x => x.ContractStartGr < checkDate && x.ContractEndGr >= checkDate &&
+                      x.ContractAmountDouble > 0).GroupBy(x => x.ContractingPartyId).Select(x => x.First())
             .ToListAsync();
 
 
@@ -3679,9 +3667,12 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                                 {
                                     smsList.Add(new BlockSmsListData()
                                     {
-                                        PhoneNumber = number.PhoneNumber, PartyName = partyName,
-                                        AccountType = accountType, Amount = amount,
-                                        ContractingPartyId = contractingParty.id, InstitutionContractId = item.Id,
+                                        PhoneNumber = number.PhoneNumber,
+                                        PartyName = partyName,
+                                        AccountType = accountType,
+                                        Amount = amount,
+                                        ContractingPartyId = contractingParty.id,
+                                        InstitutionContractId = item.Id,
                                         AproveId = aprove
                                     });
                                 }
@@ -3869,11 +3860,16 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
                                                     smsList.Add(new SmsListData()
                                                     {
-                                                        PhoneNumber = number.PhoneNumber, TemplateId = templateId,
-                                                        PartyName = partyName, Amount = balanceToMoney,
-                                                        ContractingPartyId = contractingParty.id, AproveId = aprove,
-                                                        TypeOfSmsMethod = "MonthlyBillNew", Code1 = code1,
-                                                        Code2 = code2, InstitutionContractId = item.Id
+                                                        PhoneNumber = number.PhoneNumber,
+                                                        TemplateId = templateId,
+                                                        PartyName = partyName,
+                                                        Amount = balanceToMoney,
+                                                        ContractingPartyId = contractingParty.id,
+                                                        AproveId = aprove,
+                                                        TypeOfSmsMethod = "MonthlyBillNew",
+                                                        Code1 = code1,
+                                                        Code2 = code2,
+                                                        InstitutionContractId = item.Id
                                                     });
                                                 }
                                                 else
@@ -3887,10 +3883,15 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
                                                     smsList.Add(new SmsListData()
                                                     {
-                                                        PhoneNumber = number.PhoneNumber, TemplateId = templateId,
-                                                        PartyName = partyName, Amount = balanceToMoney,
-                                                        ContractingPartyId = contractingParty.id, AproveId = aprove,
-                                                        TypeOfSmsMethod = "MonthlyBill", Code1 = "", Code2 = "",
+                                                        PhoneNumber = number.PhoneNumber,
+                                                        TemplateId = templateId,
+                                                        PartyName = partyName,
+                                                        Amount = balanceToMoney,
+                                                        ContractingPartyId = contractingParty.id,
+                                                        AproveId = aprove,
+                                                        TypeOfSmsMethod = "MonthlyBill",
+                                                        Code1 = "",
+                                                        Code2 = "",
                                                         InstitutionContractId = item.Id
                                                     });
                                                 }
@@ -3922,11 +3923,16 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
                                                     smsList.Add(new SmsListData()
                                                     {
-                                                        PhoneNumber = number.PhoneNumber, TemplateId = templateId,
-                                                        PartyName = partyName, Amount = balanceToMoney,
-                                                        ContractingPartyId = contractingParty.id, AproveId = aprove,
-                                                        TypeOfSmsMethod = "MonthlyBillNew", Code1 = code1,
-                                                        Code2 = code2, InstitutionContractId = item.Id
+                                                        PhoneNumber = number.PhoneNumber,
+                                                        TemplateId = templateId,
+                                                        PartyName = partyName,
+                                                        Amount = balanceToMoney,
+                                                        ContractingPartyId = contractingParty.id,
+                                                        AproveId = aprove,
+                                                        TypeOfSmsMethod = "MonthlyBillNew",
+                                                        Code1 = code1,
+                                                        Code2 = code2,
+                                                        InstitutionContractId = item.Id
                                                     });
                                                 }
                                                 else
@@ -3940,10 +3946,15 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
                                                     smsList.Add(new SmsListData()
                                                     {
-                                                        PhoneNumber = number.PhoneNumber, TemplateId = templateId,
-                                                        PartyName = partyName, Amount = balanceToMoney,
-                                                        ContractingPartyId = contractingParty.id, AproveId = aprove,
-                                                        TypeOfSmsMethod = "MonthlyBill", Code1 = "", Code2 = "",
+                                                        PhoneNumber = number.PhoneNumber,
+                                                        TemplateId = templateId,
+                                                        PartyName = partyName,
+                                                        Amount = balanceToMoney,
+                                                        ContractingPartyId = contractingParty.id,
+                                                        AproveId = aprove,
+                                                        TypeOfSmsMethod = "MonthlyBill",
+                                                        Code1 = "",
+                                                        Code2 = "",
                                                         InstitutionContractId = item.Id
                                                     });
                                                 }
@@ -3979,11 +3990,16 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
                                                     smsList.Add(new SmsListData()
                                                     {
-                                                        PhoneNumber = number.PhoneNumber, TemplateId = templateId,
-                                                        PartyName = partyName, Amount = balanceToMoney,
-                                                        ContractingPartyId = contractingParty.id, AproveId = aprove,
-                                                        TypeOfSmsMethod = "MonthlyBillNew", Code1 = code1,
-                                                        Code2 = code2, InstitutionContractId = item.Id
+                                                        PhoneNumber = number.PhoneNumber,
+                                                        TemplateId = templateId,
+                                                        PartyName = partyName,
+                                                        Amount = balanceToMoney,
+                                                        ContractingPartyId = contractingParty.id,
+                                                        AproveId = aprove,
+                                                        TypeOfSmsMethod = "MonthlyBillNew",
+                                                        Code1 = code1,
+                                                        Code2 = code2,
+                                                        InstitutionContractId = item.Id
                                                     });
                                                 }
                                                 else
@@ -3997,10 +4013,15 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
                                                     smsList.Add(new SmsListData()
                                                     {
-                                                        PhoneNumber = number.PhoneNumber, TemplateId = templateId,
-                                                        PartyName = partyName, Amount = balanceToMoney,
-                                                        ContractingPartyId = contractingParty.id, AproveId = aprove,
-                                                        TypeOfSmsMethod = "MonthlyBill", Code1 = "", Code2 = "",
+                                                        PhoneNumber = number.PhoneNumber,
+                                                        TemplateId = templateId,
+                                                        PartyName = partyName,
+                                                        Amount = balanceToMoney,
+                                                        ContractingPartyId = contractingParty.id,
+                                                        AproveId = aprove,
+                                                        TypeOfSmsMethod = "MonthlyBill",
+                                                        Code1 = "",
+                                                        Code2 = "",
                                                         InstitutionContractId = item.Id
                                                     });
                                                 }
@@ -4035,11 +4056,16 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                                                     string code2 = publicId.Substring(25);
                                                     smsList.Add(new SmsListData()
                                                     {
-                                                        PhoneNumber = number.PhoneNumber, TemplateId = templateId,
-                                                        PartyName = partyName, Amount = balanceToMoney,
-                                                        ContractingPartyId = contractingParty.id, AproveId = aprove,
-                                                        TypeOfSmsMethod = "MonthlyBillNew", Code1 = code1,
-                                                        Code2 = code2, InstitutionContractId = item.Id
+                                                        PhoneNumber = number.PhoneNumber,
+                                                        TemplateId = templateId,
+                                                        PartyName = partyName,
+                                                        Amount = balanceToMoney,
+                                                        ContractingPartyId = contractingParty.id,
+                                                        AproveId = aprove,
+                                                        TypeOfSmsMethod = "MonthlyBillNew",
+                                                        Code1 = code1,
+                                                        Code2 = code2,
+                                                        InstitutionContractId = item.Id
                                                     });
                                                 }
                                                 else
@@ -4053,10 +4079,15 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
                                                     smsList.Add(new SmsListData()
                                                     {
-                                                        PhoneNumber = number.PhoneNumber, TemplateId = templateId,
-                                                        PartyName = partyName, Amount = balanceToMoney,
-                                                        ContractingPartyId = contractingParty.id, AproveId = aprove,
-                                                        TypeOfSmsMethod = "MonthlyBill", Code1 = "", Code2 = "",
+                                                        PhoneNumber = number.PhoneNumber,
+                                                        TemplateId = templateId,
+                                                        PartyName = partyName,
+                                                        Amount = balanceToMoney,
+                                                        ContractingPartyId = contractingParty.id,
+                                                        AproveId = aprove,
+                                                        TypeOfSmsMethod = "MonthlyBill",
+                                                        Code1 = "",
+                                                        Code2 = "",
                                                         InstitutionContractId = item.Id
                                                     });
                                                 }
@@ -4217,6 +4248,9 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         #endregion
     }
 
+
+
+
     #region PrivateMetods
 
     /// <summary>
@@ -4258,6 +4292,88 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             .FirstOrDefaultAsync(x => x.ContractingPartyId == contractingPartyId);
     }
 
+    #endregion
+
+
+    #region InstitutionContractConfirm
+    /// <summary>
+    /// ارسال پیامک یادآور تایید قراداد مالی
+    /// </summary>
+    /// <returns></returns>
+    public async Task SendInstitutionContractConfirmSmsTask()
+    {
+        var now = DateTime.Now;
+
+
+        // تبدیل تاریخ میلادی به شمسی
+        var persianNow = now.ToFarsi();
+        var persianEndOfMonth = int.Parse(persianNow.FindeEndOfMonth().Substring(8, 2));
+        var dayOfMonth = int.Parse(persianNow.Substring(8, 2));
+        var hour = now.Hour;
+        var minute = now.Minute;
+        var checkAnyToExecute = false;
+
+        //اگر آخرین روز ماه باشد
+        //اگر روز مثلا عدد روز 31 بود ولی آخرین روز ماه 30 بود
+        if (dayOfMonth == persianEndOfMonth)
+        {
+            checkAnyToExecute = await _context.SmsSettings
+                .AnyAsync(x =>
+                    x.DayOfMonth >= dayOfMonth && /// اگر بزرگتر یا مساوی رو جاری بود
+                    x.TimeOfDay.Hours == hour &&
+                    x.TimeOfDay.Minutes == minute &&
+                    x.TypeOfSmsSetting == TypeOfSmsSetting.InstitutionContractConfirm &&
+                    x.IsActive
+                );
+        }
+        else
+        {
+            checkAnyToExecute = await _context.SmsSettings
+                .AnyAsync(x =>
+                    x.DayOfMonth == dayOfMonth &&
+                    x.TimeOfDay.Hours == hour &&
+                    x.TimeOfDay.Minutes == minute &&
+                    x.TypeOfSmsSetting == TypeOfSmsSetting.InstitutionContractConfirm &&
+                    x.IsActive
+                );
+        }
+
+
+        if (checkAnyToExecute)
+        {
+            //اجرای تسک
+
+            //دریافت لیست قراداد های تایید نشده
+            var fromAmonthAgo = now.AddDays(-30);
+            var pendingContracts = await _context.InstitutionContractSet
+                .Where(x => x.CreationDate >= fromAmonthAgo && x.CreationDate.Date != now.Date && x.VerificationStatus == InstitutionContractVerificationStatus.PendingForVerify)
+                .Join(_context.PersonalContractingParties,
+                   contract => contract.ContractingPartyId,
+                    contractingParty => contractingParty.id,
+                    (contract, contractingParty) => new { contract, contractingParty }).Select(x => new InstitutionCreationVerificationSmsDto
+                    {
+                        Number = x.contractingParty.Phone,
+                        FullName = x.contractingParty.IsLegal == "حقیقی" ? $"{x.contractingParty.FName} {x.contractingParty.LName}" : $"{x.contractingParty.LName}",
+                        ContractingPartyId = x.contract.ContractingPartyId,
+                        InstitutionContractId = x.contract.id,
+                        InstitutionId = x.contract.PublicId,
+                    }).ToListAsync();
+
+            string typeOfSms = "یادآور تایید قرارداد مالی";
+            foreach (var item in pendingContracts)
+            {
+                var sendResult = await _smsService.SendInstitutionCreationVerificationLink(item.Number, item.FullName,
+                    item.InstitutionId, item.ContractingPartyId, item.InstitutionContractId, typeOfSms);
+            }
+
+            Console.WriteLine("executed at : " + persianNow + " - " + hour + ":" + minute);
+
+        }
+
+
+    }
+
+
     #endregion
 
     #endregion
@@ -4301,7 +4417,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 VerificationStatus = x.VerificationStatus,
                 InstallmentList = x.Installments
                     .Select(ins => new InstitutionContractInstallmentViewModel
-                        { AmountDouble = ins.Amount, InstallmentDateGr = ins.InstallmentDateGr })
+                    { AmountDouble = ins.Amount, InstallmentDateGr = ins.InstallmentDateGr })
                     .OrderBy(ins => ins.InstallmentDateGr).Skip(1).ToList(),
             }).Where(x =>
                 x.ContractStartGr < endOfMonthGr && x.ContractEndGr >= endOfMonthGr && x.ContractAmountDouble > 0)
@@ -4345,7 +4461,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     VerificationStatus = x.VerificationStatus,
                     InstallmentList = x.Installments
                         .Select(ins => new InstitutionContractInstallmentViewModel
-                            { AmountDouble = ins.Amount, InstallmentDateGr = ins.InstallmentDateGr })
+                        { AmountDouble = ins.Amount, InstallmentDateGr = ins.InstallmentDateGr })
                         .OrderBy(ins => ins.InstallmentDateGr).Skip(1).ToList(),
                 }).ToListAsync();
 
@@ -4642,6 +4758,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             .Where(x => x.Installments.Any(i => i.Id == installmentId))
             .Select(x => x.id).FirstOrDefaultAsync();
     }
+    
 
     #endregion
 

CompanyManagment.EFCore/Repository/InsuranceListRepository.cs

@@ -1777,6 +1777,49 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
         return res;
     }
 
+    public async Task<PagedResult<InsuranceClientListViewModel>> GetInsuranceClientList(InsuranceClientSearchModel searchModel)
+    {
+        var workshopId = _authHelper.GetWorkshopId();
+        var query = _context.InsuranceListSet
+            .Select(x => new InsuranceClientListViewModel
+        {
+            Id = x.id,
+            WorkShopId = x.WorkshopId,
+            Year = x.Year,
+            YearInt = Convert.ToInt32(x.Year),
+            Month = x.Month,
+            MonthName = x.Month.ToFarsiMonthByNumber(),
+            MonthInt = Convert.ToInt32(x.Month),
+        }).Where(x => x.WorkShopId == workshopId);
+
+
+        if (searchModel.Year>0)
+        {
+            query = query.Where(x => x.YearInt == searchModel.Year);
+        } 
+        if (searchModel.Month > 0)
+        {
+            query = query.Where(x => x.MonthInt == searchModel.Month);
+        }
+
+        var res = new PagedResult<InsuranceClientListViewModel>
+        {
+            TotalCount = query.Count()
+        };
+        query = searchModel.Sorting switch
+        {
+            "CreationDate-Max" => query.OrderByDescending(x => x.Id),
+            "CreationDate-Min" => query.OrderBy(x => x.Id),
+            "Month-Max" => query.OrderByDescending(x => x.MonthInt),
+            "Month-Min" => query.OrderBy(x => x.MonthInt),
+            "Year-Max" => query.OrderByDescending(x => x.YearInt),
+            "Year-Min" => query.OrderBy(x => x.YearInt),
+            _ => query.OrderByDescending(x => x.Id),
+        };
+        res.List =await query.ApplyPagination(searchModel.PageIndex,searchModel.PageSize).ToListAsync();
+        return res;
+    }
+
     public async Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel)
     {
         if (string.IsNullOrEmpty(searchModel.Month) || string.IsNullOrEmpty(searchModel.Year))

CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs

@@ -1994,8 +1994,9 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
                     case "شنبه":
                         w1 = 7;
                         w2 = 14;
-                        w3 = 28;
-                        w4 = 31;
+                        w3 = 21;
+                        w4 = 28;
+                        w5 = 31;
                         break;
                     case "یکشنبه":
                         w1 = 6;
@@ -2361,6 +2362,7 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
                         break;
                 }
             }
+
         }
 
         #endregion

CompanyManagment.EFCore/Services/SmsService.cs

@@ -350,9 +350,12 @@ public class SmsService : ISmsService
 
 	}
 
-	public async Task<bool> SendInstitutionCreationVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId)
+	public async Task<bool> SendInstitutionCreationVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId, string typeOfSms)
 	{
-		var full = fullName;
+        typeOfSms = string.IsNullOrWhiteSpace(typeOfSms) ? "لینک تاییدیه ایجاد قرارداد مالی" : typeOfSms;
+      
+        
+        var full = fullName;
 		var fullName1 = fullName;
 		if (fullName.Length >= 25)
 		{
@@ -377,8 +380,9 @@ public class SmsService : ISmsService
 			new("CODE1",firstPart),
 			new("CODE2",secondPart)
 		});
+       
 
-		var smsResult = new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message, "لینک تاییدیه ایجاد قرارداد مالی",
+        var smsResult = new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message, typeOfSms,
 			 fullName, number, contractingPartyId, institutionContractId);
 		await _smsResultRepository.CreateAsync(smsResult);
 		await _smsResultRepository.SaveChangesAsync();

ProgramManager/src/Application/GozareshgirProgramManager.Application/DomainEventHandlers/ProjectSection/TaskSectionAddedHandler.cs

@@ -4,23 +4,20 @@ using GozareshgirProgramManager.Domain.ProjectAgg.Events;
 using MediatR;
 using Microsoft.Extensions.Logging;
 
-namespace GozareshgirProgramManager.Application.DomainEventHandlers.TaskSection;
+namespace GozareshgirProgramManager.Application.DomainEventHandlers.ProjectSection;
 
-public class ProjectSectionAddedHandler:INotificationHandler<DomainEventNotification<TaskSectionAddedEvent>>
+public class ProjectSectionAddedHandler:INotificationHandler<DomainEventNotification<ProjectSectionAddedEvent>>
 {
     private readonly ILogger<CustomerRegisteredHandler> _logger;
-    private readonly IBoardNotificationPublisher _boardNotificationPublisher;
 
-    public ProjectSectionAddedHandler(ILogger<CustomerRegisteredHandler> logger, IBoardNotificationPublisher boardNotificationPublisher)
+    public ProjectSectionAddedHandler(ILogger<CustomerRegisteredHandler> logger)
     {
         _logger = logger;
-        _boardNotificationPublisher = boardNotificationPublisher;
     }
 
-    public Task Handle(DomainEventNotification<TaskSectionAddedEvent> notification, CancellationToken cancellationToken)
+    public Task Handle(DomainEventNotification<ProjectSectionAddedEvent> notification, CancellationToken cancellationToken)
     {
-        var domainEvent = notification.DomainEvent;
-        //_boardNotificationPublisher.NotifyTaskCreated()
+        
         return Task.CompletedTask;
     }
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/DomainEventHandlers/ProjectSection/TaskSectionAssignedHandler.cs

@@ -2,7 +2,7 @@ using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain.ProjectAgg.Events;
 using MediatR;
 
-namespace GozareshgirProgramManager.Application.DomainEventHandlers.TaskSection;
+namespace GozareshgirProgramManager.Application.DomainEventHandlers.ProjectSection;
 
 public class ProjectSectionAssignedHandler:INotificationHandler<DomainEventNotification<ProjectSectionAssignedEvent>>
 {

ProgramManager/src/Application/GozareshgirProgramManager.Application/DomainEventHandlers/ProjectSection/TaskSectionStatusChangedHandler.cs

@@ -3,7 +3,7 @@ using GozareshgirProgramManager.Application.Interfaces;
 using GozareshgirProgramManager.Domain.ProjectAgg.Events;
 using MediatR;
 
-namespace GozareshgirProgramManager.Application.DomainEventHandlers.TaskSection;
+namespace GozareshgirProgramManager.Application.DomainEventHandlers.ProjectSection;
 
 public class TaskSectionStatusChangedHandler:INotificationHandler<DomainEventNotification<TaskSectionStatusChangedEvent>>
 {
@@ -17,7 +17,7 @@ public class TaskSectionStatusChangedHandler:INotificationHandler<DomainEventNot
     public Task Handle(DomainEventNotification<TaskSectionStatusChangedEvent> notification, CancellationToken cancellationToken)
     {
         var domainEvent = notification.DomainEvent;
-        _boardNotificationPublisher.NotifyTaskStatusChanged(domainEvent.UserId,domainEvent.OldStatus,domainEvent.NewStatus,domainEvent.SectionId);
+        _boardNotificationPublisher.SendProjectStatusChanged(domainEvent.UserId,domainEvent.OldStatus,domainEvent.NewStatus,domainEvent.SectionId);
         return Task.CompletedTask;
     }
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Interfaces/IBoardNotificationPublisher.cs

@@ -1,19 +1,9 @@
-using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
-using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 
 namespace GozareshgirProgramManager.Application.Interfaces;
 
 public interface IBoardNotificationPublisher
 {
-    Task NotifyTaskStatusChanged(long userId, TaskSectionStatus oldStatus, 
+    Task SendProjectStatusChanged(long userId, TaskSectionStatus oldStatus, 
         TaskSectionStatus newStatus, Guid sectionId);
-    
-    Task NotifyTaskCreated(TaskSection taskSection);
-    
-    Task NotifyTaskAssigned(long userId, Guid sectionId);
-    
-    Task NotifyTaskRemoved(long userId, Guid sectionId);
-    
-    
-    
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AutoStopOverTimeTaskSections/AutoStopOverTimeTaskSectionsCommand.cs

@@ -0,0 +1,49 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.AutoStopOverTimeTaskSections;
+
+public record AutoStopOverTimeTaskSectionsCommand : IBaseCommand;
+
+public class AutoStopOverTimeTaskSectionsCommandHandler : IBaseCommandHandler<AutoStopOverTimeTaskSectionsCommand>
+{
+    private readonly ITaskSectionRepository _taskSectionRepository;
+    private readonly IUnitOfWork _unitOfWork;
+
+    public AutoStopOverTimeTaskSectionsCommandHandler(ITaskSectionRepository taskSectionRepository,
+        IUnitOfWork unitOfWork)
+    {
+        _taskSectionRepository = taskSectionRepository;
+        _unitOfWork = unitOfWork;
+    }
+
+    public async Task<OperationResult> Handle(AutoStopOverTimeTaskSectionsCommand request,
+        CancellationToken cancellationToken)
+    {
+        try
+        {
+            // دریافت تمام تسک‌های در حال انجام
+            var taskSections = await _taskSectionRepository.GetActiveSectionsIncludeAllAsync(cancellationToken);
+
+
+            foreach (var taskSection in taskSections)
+            {
+                // استفاده از متد Domain برای بررسی و متوقف کردن خودکار
+                taskSection.AutoStopIfOverTime();
+            }
+
+            // ذخیره تغییرات در دیتابیس
+            await _unitOfWork.SaveChangesAsync(cancellationToken);
+
+            return OperationResult.Success();
+        }
+        catch (Exception ex)
+        {
+            return OperationResult.Failure($"خطا در ناتمام کردن تسک‌های overtime: {ex.Message}");
+        }
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/ChangeStatusSection/ChangeStatusSectionCommandHandler.cs

@@ -49,8 +49,11 @@ public class ChangeStatusSectionCommandHandler : IBaseCommandHandler<ChangeStatu
         }
         else if (request.Status == TaskSectionStatus.InProgress)
         {
-            // Going TO InProgress: Start work and create activity
-            section.StartWork();
+			// Going TO InProgress: Check if section has remaining time, then start work
+			if (!section.HasRemainingTime())
+				return OperationResult.ValidationError("زمان این بخش به پایان رسیده است");
+
+			section.StartWork();
         }
         else
         {

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/CreateProject/CreateProjectCommandValidator.cs

@@ -8,6 +8,8 @@ public class CreateProjectCommandValidator:AbstractValidator<CreateProjectComman
     public CreateProjectCommandValidator()
     {
         RuleFor(x => x.Name)
+            .MaximumLength(25)
+            .WithMessage("نام نمیتواند بیشتر از 25 کاراکتر باشد")
             .NotEmpty()
             .NotNull()
             .WithMessage("نام نمیتواند خالی باشد");

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/SetTimeProject/SetTimeProjectCommandHandler.cs

@@ -2,13 +2,14 @@ using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Application.Modules.Projects.DTOs;
 using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain._Common.Exceptions;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.SetTimeProject;
 
-public class SetTimeProjectCommandHandler:IBaseCommandHandler<SetTimeProjectCommand>
+public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCommand>
 {
     private readonly IProjectRepository _projectRepository;
     private readonly IProjectPhaseRepository _projectPhaseRepository;
@@ -16,7 +17,7 @@ public class SetTimeProjectCommandHandler:IBaseCommandHandler<SetTimeProjectComm
     private readonly IUnitOfWork _unitOfWork;
     private readonly IAuthHelper _authHelper;
     private long? _userId;
-    
+
 
     public SetTimeProjectCommandHandler(
         IProjectRepository projectRepository,
@@ -40,11 +41,11 @@ public class SetTimeProjectCommandHandler:IBaseCommandHandler<SetTimeProjectComm
                 return await SetTimeForProjectTask(request, cancellationToken);
             default:
                 return OperationResult.Failure("سطح پروژه نامعتبر است");
-            
         }
     }
 
-    private async Task<OperationResult> SetTimeForProject(SetTimeProjectCommand request, CancellationToken cancellationToken)
+    private async Task<OperationResult> SetTimeForProject(SetTimeProjectCommand request,
+        CancellationToken cancellationToken)
     {
         var project = await _projectRepository.GetWithFullHierarchyAsync(request.Id);
         if (project == null)
@@ -75,7 +76,8 @@ public class SetTimeProjectCommandHandler:IBaseCommandHandler<SetTimeProjectComm
         return OperationResult.Success();
     }
 
-    private async Task<OperationResult> SetTimeForProjectPhase(SetTimeProjectCommand request, CancellationToken cancellationToken)
+    private async Task<OperationResult> SetTimeForProjectPhase(SetTimeProjectCommand request,
+        CancellationToken cancellationToken)
     {
         var phase = await _projectPhaseRepository.GetWithTasksAsync(request.Id);
         if (phase == null)
@@ -103,13 +105,13 @@ public class SetTimeProjectCommandHandler:IBaseCommandHandler<SetTimeProjectComm
         return OperationResult.Success();
     }
 
-    private async Task<OperationResult> SetTimeForProjectTask(SetTimeProjectCommand request, CancellationToken cancellationToken)
+    private async Task<OperationResult> SetTimeForProjectTask(SetTimeProjectCommand request,
+        CancellationToken cancellationToken)
     {
         var task = await _projectTaskRepository.GetWithSectionsAsync(request.Id);
         if (task == null)
         {
             return OperationResult.NotFound("تسک یافت نشد");
-            return OperationResult.NotFound("<22>Ә <20><><EFBFBD><EFBFBD> <20><><EFBFBD>");
         }
 
         long? addedByUserId = _userId;
@@ -127,12 +129,17 @@ public class SetTimeProjectCommandHandler:IBaseCommandHandler<SetTimeProjectComm
         await _unitOfWork.SaveChangesAsync(cancellationToken);
         return OperationResult.Success();
     }
-    
+
     private void SetSectionTime(TaskSection section, SetTimeProjectSectionItem sectionItem, long? addedByUserId)
     {
         var initData = sectionItem.InitData;
         var initialTime = TimeSpan.FromHours(initData.Hours);
         
+        if (initialTime <= TimeSpan.Zero)
+        {
+            return;
+        }
+
         // تنظیم زمان اولیه
         section.UpdateInitialEstimatedHours(initialTime, initData.Description);
 
@@ -144,7 +151,7 @@ public class SetTimeProjectCommandHandler:IBaseCommandHandler<SetTimeProjectComm
             section.AddAdditionalTime(additionalTimeSpan, additionalTime.Description, addedByUserId);
         }
     }
-    
+
     // private void SetSectionTime(ProjectSection section, SetTimeProjectSectionItem sectionItem, long? addedByUserId)
     // {
     //     var initData = sectionItem.InitData;
@@ -161,4 +168,4 @@ public class SetTimeProjectCommandHandler:IBaseCommandHandler<SetTimeProjectComm
     //         section.AddAdditionalTime(additionalTimeSpan, additionalTime.Description, addedByUserId);
     //     }
     // }
-}
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/SetTimeProject/SetTimeProjectCommandValidator.cs

@@ -1,4 +1,5 @@
 using FluentValidation;
+using FluentValidation.Validators;
 using GozareshgirProgramManager.Application.Modules.Projects.DTOs;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.SetTimeProject;
@@ -15,6 +16,9 @@ public class SetTimeProjectCommandValidator:AbstractValidator<SetTimeProjectComm
         RuleForEach(x => x.SectionItems)
             .SetValidator(command => new SetTimeProjectSectionItemValidator());
 
+        RuleFor(x => x.SectionItems)
+            .Must(sectionItems => sectionItems.Any(si => si.InitData?.Hours > 0))
+            .WithMessage("حداقل یکی از بخش‌ها باید مقدار ساعت معتبری داشته باشد.");
     }
 }
 public class SetTimeProjectSectionItemValidator:AbstractValidator<SetTimeProjectSectionItem>
@@ -30,13 +34,14 @@ public class SetTimeProjectSectionItemValidator:AbstractValidator<SetTimeProject
             .SetValidator(new TimeDataValidator());
         
         RuleForEach(x=>x.AdditionalTime)
-            .SetValidator(new TimeDataValidator());
+            .SetValidator(new AdditionalTimeDataValidator());
+        
     }
 }
 
-public class TimeDataValidator : AbstractValidator<SetTimeSectionTime>
+public class AdditionalTimeDataValidator: AbstractValidator<SetTimeSectionTime>
 {
-    public TimeDataValidator()
+    public AdditionalTimeDataValidator()
     {
         RuleFor(x => x.Hours)
             .GreaterThanOrEqualTo(0)
@@ -45,6 +50,13 @@ public class TimeDataValidator : AbstractValidator<SetTimeSectionTime>
         RuleFor(x=>x.Description)
             .MaximumLength(500)
             .WithMessage("توضیحات نمی‌تواند بیشتر از 500 کاراکتر باشد.");
+    }
+}
+
+public class TimeDataValidator : AbstractValidator<SetTimeSectionTime>
+{
+    public TimeDataValidator()
+    {
         
     }
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectsListQueryHandler.cs

@@ -132,91 +132,82 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
 
     private async Task SetSkillFlags(List<GetProjectListDto> projects, CancellationToken cancellationToken)
     {
+        if (!projects.Any())
+            return;
+
         var projectIds = projects.Select(x => x.Id).ToList();
-        
-        // تنها تسک‌ها sections دارند، بنابراین برای سطوح مختلف باید متفاوت عمل کنیم
-        List<Guid> taskIds;
-        
-        switch (projects.FirstOrDefault()?.Level)
+        var hierarchyLevel = projects.First().Level;
+
+        switch (hierarchyLevel)
         {
             case ProjectHierarchyLevel.Project:
-                // برای پروژه‌ها، باید تمام تسک‌های زیرمجموعه را پیدا کنیم
-                var phaseIds = await _context.ProjectPhases
-                    .Where(ph => projectIds.Contains(ph.ProjectId))
-                    .Select(ph => ph.Id)
-                    .ToListAsync(cancellationToken);
-                    
-                taskIds = await _context.ProjectTasks
-                    .Where(t => phaseIds.Contains(t.PhaseId))
-                    .Select(t => t.Id)
-                    .ToListAsync(cancellationToken);
+                await SetSkillFlagsForProjects(projects, projectIds, cancellationToken);
                 break;
                 
             case ProjectHierarchyLevel.Phase:
-                // برای فازها، تمام تسک‌های آن فازها را پیدا کنیم
-                taskIds = await _context.ProjectTasks
-                    .Where(t => projectIds.Contains(t.PhaseId))
-                    .Select(t => t.Id)
-                    .ToListAsync(cancellationToken);
+                await SetSkillFlagsForPhases(projects, projectIds, cancellationToken);
                 break;
                 
             case ProjectHierarchyLevel.Task:
-                // برای تسک‌ها، خود آنها taskIds هستند
-                taskIds = projectIds;
+                await SetSkillFlagsForTasks(projects, projectIds, cancellationToken);
                 break;
-                
-            default:
-                return;
         }
+    }
 
-        if (!taskIds.Any())
-            return;
-
-        var sections = await _context.TaskSections
+    private async Task SetSkillFlagsForProjects(List<GetProjectListDto> projects, List<Guid> projectIds, CancellationToken cancellationToken)
+    {
+        var projectSections = await _context.ProjectSections
             .Include(x => x.Skill)
-            .Where(x => taskIds.Contains(x.TaskId))
+            .Where(s => projectIds.Contains(s.ProjectId))
             .ToListAsync(cancellationToken);
 
+        if (!projectSections.Any())
+            return;
+
         foreach (var project in projects)
         {
-            List<Guid> relevantTaskIds;
-            
-            switch (project.Level)
-            {
-                case ProjectHierarchyLevel.Project:
-                    // برای پروژه، تمام تسک‌های زیرمجموعه
-                    var projectPhaseIds = await _context.ProjectPhases
-                        .Where(ph => ph.ProjectId == project.Id)
-                        .Select(ph => ph.Id)
-                        .ToListAsync(cancellationToken);
-                        
-                    relevantTaskIds = await _context.ProjectTasks
-                        .Where(t => projectPhaseIds.Contains(t.PhaseId))
-                        .Select(t => t.Id)
-                        .ToListAsync(cancellationToken);
-                    break;
-                    
-                case ProjectHierarchyLevel.Phase:
-                    // برای فاز، تمام تسک‌های آن فاز
-                    relevantTaskIds = await _context.ProjectTasks
-                        .Where(t => t.PhaseId == project.Id)
-                        .Select(t => t.Id)
-                        .ToListAsync(cancellationToken);
-                    break;
-                    
-                case ProjectHierarchyLevel.Task:
-                    // برای تسک، خود آن
-                    relevantTaskIds = new List<Guid> { project.Id };
-                    break;
-                    
-                default:
-                    continue;
-            }
-            
-            var projectSections = sections.Where(x => relevantTaskIds.Contains(x.TaskId)).ToList();
-            project.HasBackend = projectSections.Any(x => x.Skill.Name == "Backend");
-            project.HasFront = projectSections.Any(x => x.Skill.Name == "Frontend");
-            project.HasDesign = projectSections.Any(x => x.Skill.Name == "UI/UX Design");
+            var sections = projectSections.Where(s => s.ProjectId == project.Id).ToList();
+            project.HasBackend = sections.Any(x => x.Skill?.Name == "Backend");
+            project.HasFront = sections.Any(x => x.Skill?.Name == "Frontend");
+            project.HasDesign = sections.Any(x => x.Skill?.Name == "UI/UX Design");
+        }
+    }
+
+    private async Task SetSkillFlagsForPhases(List<GetProjectListDto> projects, List<Guid> phaseIds, CancellationToken cancellationToken)
+    {
+        var phaseSections = await _context.PhaseSections
+            .Include(x => x.Skill)
+            .Where(s => phaseIds.Contains(s.PhaseId))
+            .ToListAsync(cancellationToken);
+
+        if (!phaseSections.Any())
+            return;
+
+        foreach (var phase in projects)
+        {
+            var sections = phaseSections.Where(s => s.PhaseId == phase.Id).ToList();
+            phase.HasBackend = sections.Any(x => x.Skill?.Name == "Backend");
+            phase.HasFront = sections.Any(x => x.Skill?.Name == "Frontend");
+            phase.HasDesign = sections.Any(x => x.Skill?.Name == "UI/UX Design");
+        }
+    }
+
+    private async Task SetSkillFlagsForTasks(List<GetProjectListDto> projects, List<Guid> taskIds, CancellationToken cancellationToken)
+    {
+        var taskSections = await _context.TaskSections
+            .Include(x => x.Skill)
+            .Where(s => taskIds.Contains(s.TaskId))
+            .ToListAsync(cancellationToken);
+
+        if (!taskSections.Any())
+            return;
+
+        foreach (var task in projects)
+        {
+            var sections = taskSections.Where(s => s.TaskId == task.Id).ToList();
+            task.HasBackend = sections.Any(x => x.Skill?.Name == "Backend");
+            task.HasFront = sections.Any(x => x.Skill?.Name == "Frontend");
+            task.HasDesign = sections.Any(x => x.Skill?.Name == "UI/UX Design");
         }
     }
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardDetail/ProjectBoardDetailQueryHandler.cs

@@ -0,0 +1,85 @@
+using System.Globalization;
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectBoardDetail;
+
+public record ProjectBoardDetailQuery(Guid SectionId) : IBaseQuery<ProjectBoardDetailResponse>;
+
+public record ProjectBoardDetailResponse(List<ProjectBoardDetailUserResponse> Users, string TotalTime,string RemainingTime );
+
+public record ProjectBoardDetailUserResponse
+{
+    public List<ProjectBoardDetailUserHistoryResponse> Histories { get; init; }
+    public string UserFullName { get; init; }
+    public string TotalTime { get; init; }
+    public string SpentTime { get; init; }
+    public long UserId { get; init; }
+}
+
+public record ProjectBoardDetailUserHistoryResponse
+{
+    public string Date { get; init; }
+    public string startTime { get; init; }
+    public string EndTime { get; init; }
+    public string TotalTime { get; init; }
+}
+
+public class ProjectBoardDetailQueryHandler : IBaseQueryHandler<ProjectBoardDetailQuery, ProjectBoardDetailResponse>
+{
+    private readonly IProgramManagerDbContext _programManagerDbContext;
+
+    public ProjectBoardDetailQueryHandler(IProgramManagerDbContext programManagerDbContext)
+    {
+        _programManagerDbContext = programManagerDbContext;
+    }
+
+    public async Task<OperationResult<ProjectBoardDetailResponse>> Handle(ProjectBoardDetailQuery request,
+        CancellationToken cancellationToken)
+    {
+        var section = await _programManagerDbContext.TaskSections
+            .Include(x => x.Activities)
+            .Include(x=>x.AdditionalTimes)
+            .FirstOrDefaultAsync(x => x.Id == request.SectionId, cancellationToken: cancellationToken);
+        
+        if (section == null)
+            return OperationResult<ProjectBoardDetailResponse>.NotFound("بخش مورد نظر یافت نشد");
+        
+        var userIds = section.Activities.Select(x => x.UserId).Distinct().ToList();
+        
+        var usersDict = await _programManagerDbContext.Users
+            .Where(x => userIds.Contains(x.Id))
+            .ToDictionaryAsync(x => x.Id, x => x.FullName, cancellationToken);
+
+        var totalActivityTimeSpan = section.Activities
+            .Select(x => x.GetTimeSpent())
+            .Aggregate(TimeSpan.Zero, (sum, next) => sum.Add(next));
+        
+        var finalTime = section.FinalEstimatedHours;
+        
+        var remainingTimeSpan = finalTime >= totalActivityTimeSpan
+            ? TimeSpan.FromTicks(finalTime.Ticks - totalActivityTimeSpan.Ticks)
+            : TimeSpan.Zero;
+        var users = section.Activities.GroupBy(x => x.UserId).Select(x =>
+        {
+            return new ProjectBoardDetailUserResponse()
+            {
+                UserId = x.Key,
+                UserFullName = usersDict[x.Key],
+                TotalTime = TimeSpan.FromTicks(x.Sum(h=>h.GetTimeSpent().Ticks)).TotalHours.ToString(CultureInfo.InvariantCulture),
+                Histories = x.Select(h => new ProjectBoardDetailUserHistoryResponse()
+                {
+                    Date = h.StartDate.ToFarsi(),
+                    startTime = h.StartDate.ToString("HH:mm"),
+                    EndTime = h.EndDate?.ToString("HH:mm") ?? "-",
+                    TotalTime = h.GetTimeSpent().ToString(@"hh\:mm")
+                }).ToList()
+            };
+        }).ToList();
+        var response = new ProjectBoardDetailResponse(users, $"{(int)totalActivityTimeSpan.TotalHours}:{totalActivityTimeSpan.Minutes:D2}",
+            $"{(int)remainingTimeSpan.TotalHours}:{remainingTimeSpan.Minutes:D2}");
+        return OperationResult<ProjectBoardDetailResponse>.Success(response);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListQuery.cs

@@ -6,5 +6,5 @@ namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.Project
 
 public record ProjectBoardListQuery: IBaseQuery<List<ProjectBoardListResponse>>
 {
-}
-
+    public TaskSectionStatus? Status { get; set; }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListQueryHandler.cs

@@ -1,6 +1,9 @@
+using GozareshgirProgramManager.Application._Common.Constants;
 using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Query.Internal;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectBoardList;
 
@@ -19,21 +22,36 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
         CancellationToken cancellationToken)
     {
         var currentUserId = _authHelper.GetCurrentUserId();
-        var data = await _programManagerDbContext.TaskSections.AsNoTracking()
-            .Where(x => x.CurrentAssignedUserId == currentUserId)
-            .Where(x => x.InitialEstimatedHours > TimeSpan.Zero)
+        
+        var queryable = _programManagerDbContext.TaskSections.AsNoTracking()
+            .Where(x => x.InitialEstimatedHours > TimeSpan.Zero && x.Status != TaskSectionStatus.Completed)
             .Include(x => x.Task)
             .ThenInclude(x => x.Phase)
             .ThenInclude(x => x.Project)
             .Include(x => x.Activities)
-            .Include(x => x.AdditionalTimes)
-            .ToListAsync(cancellationToken);
+            .Include(x => x.AdditionalTimes).AsQueryable().
+            Include(x => x.Skill).AsQueryable();
+
+        if (!_authHelper.HasPermission(ProgramManagerPermissionCode.Board.ViewAllUsersProjects.Code))
+        {
+            queryable = queryable.Where(x => x.CurrentAssignedUserId == currentUserId);
+        }
+        if (request.Status != null)
+        {
+            queryable = queryable.Where(x => x.Status == request.Status);
+        }
+        
+        var data = await queryable.ToListAsync(cancellationToken);
 
         var activityUserIds = data.SelectMany(x => x.Activities).Select(a => a.UserId).Distinct().ToList();
+        var assignedUser = data.Select(x => x.CurrentAssignedUserId)
+            .Concat(data.Select(x => x.OriginalAssignedUserId)).ToList(); 
+        var allUserIds = activityUserIds.Concat(assignedUser).Distinct().ToList();
         var users = await _programManagerDbContext.Users.AsNoTracking()
-            .Where(x => activityUserIds.Contains(x.Id))
+            .Where(x => allUserIds.Contains(x.Id))
             .Select(x => new { x.Id, x.FullName })
             .ToDictionaryAsync(x => x.Id, x => x.FullName, cancellationToken);
+        
 
         var result = data.Select(x =>
         {
@@ -89,7 +107,11 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
                     CompleteSecond = x.FinalEstimatedHours.TotalSeconds,
                     CurrentSecond = activityTimeData.Sum(a => a.TotalSeconds),
                     Histories = mergedHistories
-                }
+                },
+                OriginalUser = users.GetValueOrDefault(x.OriginalAssignedUserId, "ناشناس"),
+                AssignedUser = x.CurrentAssignedUserId == x.OriginalAssignedUserId ? null 
+                    : users.GetValueOrDefault(x.CurrentAssignedUserId, "ناشناس"),
+                SkillName =  x.Skill?.Name??"-",
             };
         }).ToList();
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListResponse.cs

@@ -10,6 +10,10 @@ public class ProjectBoardListResponse
     public string TaskName { get; set; }
     public ProjectProgressDto Progress { get; set; }
     public TaskSectionStatus SectionStatus { get; set; }
+    public string? AssignedUser { get; set; }
+    public string OriginalUser { get; set; }
+    public string SkillName { get; set; }
+    
 }
 public class ProjectProgressDto
 {

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectDeployBoardList/ProjectDeployBoardListQueryHandler.cs

@@ -0,0 +1,67 @@
+using System.Xml.Schema;
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectDeployBoardList;
+
+public record ProjectDeployBoardListItem()
+{
+    public string ProjectName { get; set; }
+    public string PhaseName { get; set; }
+    public int TotalTasks { get; set; }
+    public int DoneTasks { get; set; }
+    public TimeSpan TotalTimeSpan { get; set; }
+    public TimeSpan DoneTimeSpan { get; set; }
+}
+public record GetProjectsDeployBoardListResponse(List<ProjectDeployBoardListItem> Items);
+
+
+public record GetProjectDeployBoardListQuery():IBaseQuery<GetProjectsDeployBoardListResponse>;
+
+public class ProjectDeployBoardListQueryHandler:IBaseQueryHandler<GetProjectDeployBoardListQuery, GetProjectsDeployBoardListResponse>
+{
+    private readonly IProgramManagerDbContext _dbContext;
+    private readonly IAuthHelper _authHelper;
+
+    
+    public ProjectDeployBoardListQueryHandler(IProgramManagerDbContext dbContext, IAuthHelper authHelper)
+    {
+        _dbContext = dbContext;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult<GetProjectsDeployBoardListResponse>> Handle(GetProjectDeployBoardListQuery request, CancellationToken cancellationToken)
+    {
+        var userId = _authHelper.GetCurrentUserId();
+        if (userId == null)
+        {
+            return OperationResult<GetProjectsDeployBoardListResponse>.NotFound("کاربر یافت نشد");
+        }
+
+        var query =await _dbContext.TaskSections
+            .Include(x=>x.Task)
+            .ThenInclude(x => x.Phase)
+            .ThenInclude(x => x.Project)
+            .AsNoTracking()
+            .Where(x => x.Status == TaskSectionStatus.Completed
+                        || x.Status == TaskSectionStatus.PendingForCompletion 
+                        || x.Task.Phase.DeployStatus != ProjectDeployStatus.NoTCompleted)
+            .GroupBy(x=>x.Task.PhaseId).ToListAsync(cancellationToken: cancellationToken);
+        
+        var list = query.Select(g => new ProjectDeployBoardListItem
+        {
+            ProjectName = g.First().Task.Phase.Project.Name,
+            PhaseName = g.First().Task.Phase.Name,
+            TotalTasks = g.Select(x => x.TaskId).Distinct().Count(),
+            DoneTasks = g.Where(x => x.Status == TaskSectionStatus.Completed).Select(x => x.TaskId).Distinct().Count(),
+            TotalTimeSpan = TimeSpan.FromHours(g.Sum(x => x.InitialEstimatedHours.TotalHours)),
+            DoneTimeSpan = TimeSpan.FromHours(g.Where(x => x.Status == TaskSectionStatus.Completed).Sum(x => x.InitialEstimatedHours.TotalHours))
+        }).ToList();
+        var response = new GetProjectsDeployBoardListResponse(list);
+        return OperationResult<GetProjectsDeployBoardListResponse>.Success(response);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/_Common/Constants/ProgramManagerPermissionCode.cs

@@ -4,35 +4,238 @@ namespace GozareshgirProgramManager.Application._Common.Constants;
 
 public static class ProgramManagerPermissionCode
 {
-  
+    /// <summary>
+    /// دسترسی به بخش مدیریت پروژه
+    /// </summary>
     public const int Code = 99;
 
+    #region DeveloperUsers[تب کاربران برنامه نویسی]
     /// <summary>
-    ///بخش اجرا 
+    /// تب کاربران برنامه نویسی
+    /// </summary>
+    public static class DeveloperUsers
+    {
+        public const int Code = 9900;
+
+        /// <summary>
+        /// تب تعیین حقوق
+        /// </summary>
+        public static class SalaryDetermination
+        {
+            public const int Code = 990001;
+
+            /// <summary>
+            /// تعیین زمان
+            /// </summary>
+            public const int WorkingHoursDetermination = 990001;
+        }
+
+        /// <summary>
+        /// تب وضعیت کارکرد 
+        /// </summary>
+        public static class WorkingStatus
+        {
+            public const int Code = 990002;
+        }
+
+        /// <summary>
+        /// تب فیش حقوقی
+        /// </summary>
+        public static class Checkout
+        {
+            public const int Code = 990003;
+
+            /// <summary>
+            /// ایجاد فیش
+            /// </summary>
+            public const int Create = 99000301;
+
+            /// <summary>
+            /// حذف تکی فیش
+            /// </summary>
+            public const int SingleDeletion = 99000302;
+
+            /// <summary>
+            /// حذف گروهی فیش ها
+            /// </summary>
+            public const int GroupDeletion = 99000303;
+
+            /// <summary>
+            /// محاسبه مجدد گروهی فیش ها
+            /// </summary>
+            public const int GroupReCompute = 99000304;
+
+            /// <summary>
+            /// محاسبه مجدد تکی فیش
+            /// </summary>
+            public const int SingleReCompute = 99000305;
+
+        }
+
+    }
+
+    #endregion
+
+    #region ProgramManager[تب مدیریت پروژه]
+    
+    /// <summary>
+    /// تب مدیریت پروژه
+    /// </summary>
+    public static class ProgramManager
+    {
+        public const int Code = 9901;
+
+        /// <summary>
+        /// ایجاد پروژه
+        /// </summary>
+        public static class CreateProject
+        {
+            public const int Code = 9901;
+        }
+
+        /// <summary>
+        /// همه پروژه ها
+        /// </summary>
+        public static class AllProjects
+        {
+            public const int Code = 990102;
+
+        }
+
+        /// <summary>
+        /// تعیین کاربر
+        /// </summary>
+        public static class UserDetermination
+        {
+            public const int Code = 990106;
+        }
+
+        /// <summary>
+        /// تعیین زمان پروژه
+        /// </summary>
+        public static class ProjectTimeSetting
+        {
+            public const int Code = 990107;
+        }
+
+        /// <summary>
+        /// ویرایش پروژه
+        /// </summary>
+        public static class EditProject
+        {
+            public const int Code = 990108;
+        }
+
+        /// <summary>
+        /// حذف پروژه
+        /// </summary>
+        public static class DeleteProject
+        {
+            public const int Code = 990109;
+        }
+
+        /// <summary>
+        /// ایجاد بخش اصلی
+        /// </summary>
+        public static class CreateMainSection
+        {
+            public const int Code = 990110;
+        }
+
+        /// <summary>
+        /// ایجاد بخش فرعی
+        /// </summary>
+        public static class CreateSubSection
+        {
+            public const int Code = 990111;
+        }
+    }
+
+    #endregion
+
+    #region Board[تب اجرا]
+
+    /// <summary>
+    ///تب اجرا 
     /// </summary>
     public static class Board
     {
-        public const int Code = 991;
+        public const int Code = 9902;
 
         /// <summary>
         /// تب همه
         /// </summary>
         public static class All
         {
-            public const int Code = 99101;
+            public const int Code = 990201;
+        }
 
-            /// <summary>
-            /// دیدن همه تسک ها
-            /// </summary>
-            public const int ViewAll = 9910101;
+        /// <summary>
+        /// آماده اجرا
+        /// </summary>
+        public static class ReadyToRun
+        {
+            public const int Code = 990202;
+        }
+
+        /// <summary>
+        /// در حال اجرا
+        /// </summary>
+        public static class Running
+        {
+            public const int Code = 990203;
+        }
+
+
+        /// <summary>
+        /// نیمه کاره
+        /// </summary>
+        public static class Unfinished
+        {
+            public const int Code = 990204;
+        }
+
+        /// <summary>
+        /// اتمام اجرا
+        /// </summary>
+        public static class Finished
+        {
+            public const int Code = 990204;
+        }
+
+        /// <summary>
+        /// دیدن پروژه همه کاربران
+        /// </summary>
+        public static class ViewAllUsersProjects
+        {
+            public const int Code = 990206;
+        }
+
+        /// <summary>
+        /// ارجاع به دیگران
+        /// </summary>
+        public static class ReferralToOthers
+        {
+            public const int Code = 990207;
+        }
+
+        /// <summary>
+        /// چت
+        /// </summary>
+        public static class Chat
+        {
+            public const int Code = 990208;
         }
     }
-    
-    public static List<int> GetAllCodes()
-    {
-        var result = new List<int>();
 
-        void Collect(Type type)
+    #endregion
+
+   
+    public static Dictionary<string, object> GetAllCodes()
+    {
+        var result = new Dictionary<string, object>();
+
+        void Collect(Type type, Dictionary<string, object> dict)
         {
             // Collect const int fields directly declared on this type
             var fields = type.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.DeclaredOnly);
@@ -43,7 +246,7 @@ public static class ProgramManagerPermissionCode
                     var raw = f.GetRawConstantValue();
                     if (raw is int value)
                     {
-                        result.Add(value);
+                        dict[f.Name] = value;
                     }
                 }
             }
@@ -52,11 +255,16 @@ public static class ProgramManagerPermissionCode
             var nestedTypes = type.GetNestedTypes(BindingFlags.Public | BindingFlags.NonPublic);
             foreach (var nt in nestedTypes)
             {
-                Collect(nt);
+                var nestedDict = new Dictionary<string, object>();
+                Collect(nt, nestedDict);
+                if (nestedDict.Count > 0)
+                {
+                    dict[nt.Name] = nestedDict;
+                }
             }
         }
 
-        Collect(typeof(ProgramManagerPermissionCode));
+        Collect(typeof(ProgramManagerPermissionCode), result);
         return result;
     }
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/_Common/Interfaces/IAuthHelper.cs

@@ -71,6 +71,10 @@ public interface IAuthHelper
     /// دریافت نام کامل کاربر جاری از Claims
     /// </summary>
     string? GetCurrentFullName();
+    bool HasPermission(int permission);
+    List<int> GetPermissions();
+    
+    
 
     
 }

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/GozareshgirProgramManager.Domain.csproj

@@ -8,6 +8,7 @@
 
     <ItemGroup>
         <PackageReference Include="DNTPersianUtils.Core" Version="6.7.1" />
+        <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.3" />
         <PackageReference Include="PersianTools.Core" Version="2.0.4" />
     </ItemGroup>
 

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/PhaseSection.cs

@@ -1,4 +1,5 @@
 using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.SkillAgg.Entities;
 
 namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
 
@@ -22,6 +23,7 @@ public class PhaseSection : EntityBase<Guid>
 
     // Navigation property
     public ProjectPhase Phase { get; private set; } = null!;
+    public Skill? Skill { get; set; }
 
     public void UpdateUser(long userId)
     {

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/ProjectPhase.cs

@@ -23,6 +23,7 @@ public class ProjectPhase : ProjectHierarchyNode
         ProjectId = projectId;
         _tasks = new List<ProjectTask>();
         _phaseSections = new List<PhaseSection>();
+        DeployStatus = ProjectDeployStatus.NoTCompleted;
         AddDomainEvent(new PhaseCreatedEvent(Id, projectId, name));
     }
     
@@ -36,6 +37,8 @@ public class ProjectPhase : ProjectHierarchyNode
     public DateTime? StartDate { get; private set; }
     public DateTime? EndDate { get; private set; }
     public int OrderIndex { get; private set; }
+    public bool IsArchived { get; set; }
+    public ProjectDeployStatus DeployStatus { get; set; }
 
     #region Task Management
 
@@ -196,4 +199,26 @@ public class ProjectPhase : ProjectHierarchyNode
     }
 
     #endregion
+    
+    public void SetArchived()
+    {
+        IsArchived = true;
+    }
+    public void SetUnarchived()
+    {
+        IsArchived = false;
+    }
+    public void UpdateDeployStatus(ProjectDeployStatus status)
+    {
+        DeployStatus = status;
+    }
+}
+
+public enum ProjectDeployStatus
+{
+    NoTCompleted,
+    PendingDevDeploy,
+    DevDeployed,
+    PendingDeploy,
+    Deployed
 }

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/ProjectSection.cs

@@ -1,4 +1,5 @@
 using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.SkillAgg.Entities;
 
 namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
 
@@ -21,6 +22,7 @@ public class ProjectSection : EntityBase<Guid>
     public Guid SkillId { get; private set; }
 
     public Project Project { get; private set; } = null!;
+    public Skill? Skill { get; set; }
 
     public void UpdateUser(long userId)
     {

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/TaskSection.cs

@@ -210,4 +210,46 @@ public class TaskSection : EntityBase<Guid>
     {
         _additionalTimes.Clear();
     }
+
+    public bool HasRemainingTime()
+    {
+        var totalSpent = GetTotalTimeSpent();
+        var finalEstimate = FinalEstimatedHours;
+        return totalSpent < finalEstimate;
+    }
+
+    /// <summary>
+    /// اگر زمان کار شده بیش از تایم تعیین شده باشد، تسک را متوقف می‌کند
+    /// و EndDate را به طوری تنظیم می‌کند که کل زمان برابر با FinalEstimatedHours شود
+    /// </summary>
+    public void AutoStopIfOverTime()
+    {
+        if (Status != TaskSectionStatus.InProgress)
+            return;
+
+        var activeActivity = _activities.FirstOrDefault(a => a.IsActive);
+        if (activeActivity == null)
+            return;
+
+        // محاسبه کل زمان صرف شده تا کنون (بدون فعالیت فعال)
+        var totalTimeSpentExcludingActive = _activities.Where(a => !a.IsActive).Sum(a => a.GetTimeSpent().Ticks);
+        var totalTimeSpentTimeSpan = TimeSpan.FromTicks(totalTimeSpentExcludingActive);
+        var finalEstimate = FinalEstimatedHours;
+
+        // اگر زمان صرف شده (بدون فعالیت فعال) + فعالیت فعال > تایم تعیین شده
+        var activeTimeSpent = activeActivity.GetTimeSpent();
+        if (totalTimeSpentTimeSpan + activeTimeSpent > finalEstimate)
+        {
+            // محاسبه مدت زمانی که این فعالیت باید برای رسیدن به FinalEstimatedHours داشته باشد
+            var remainingTime = finalEstimate - totalTimeSpentTimeSpan;
+            
+            // EndDate = StartDate + remainingTime
+            var adjustedEndDate = activeActivity.StartDate.Add(remainingTime);
+            
+            // متوقف کردن فعالیت با EndDate دقیق شده
+            activeActivity.StopWorkWithSpecificTime(adjustedEndDate, "متوقف خودکار - بیش از تایم تعیین شده");
+            
+            UpdateStatus(TaskSectionStatus.Incomplete);
+        }
+    }
 }

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/TaskSectionActivity.cs

@@ -40,6 +40,22 @@ public class TaskSectionActivity : EntityBase<Guid>
         IsActive = false;
     }
 
+    /// <summary>
+    /// متوقف کردن فعالیت با مشخص کردن EndDate دقیق
+    /// </summary>
+    public void StopWorkWithSpecificTime(DateTime endDate, string? endNotes = null)
+    {
+        if (!IsActive)
+            throw new InvalidOperationException("این فعالیت قبلاً متوقف شده است.");
+
+        if (endDate < StartDate)
+            throw new InvalidOperationException("تاریخ پایان نمی‌تواند قبل از تاریخ شروع باشد.");
+
+        EndDate = endDate;
+        EndNotes = endNotes;
+        IsActive = false;
+    }
+
     public TimeSpan GetTimeSpent()
    {
            if (IsActive)

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Enums/TaskSectionStatus.cs

@@ -6,5 +6,6 @@ public enum TaskSectionStatus
     ReadyToStart = 1,      // آماده شروع
     InProgress = 2,        // درحال انجام
     Incomplete = 3,        // ناتمام شده
-    Completed = 4          // تکمیل شده
+    PendingForCompletion = 4, // در انتظار تکمیل
+    Completed = 5          // تکمیل شده
 }

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Events/ProjectEvents.cs

@@ -8,171 +8,171 @@ namespace GozareshgirProgramManager.Domain.ProjectAgg.Events;
 // Project Events
 public record ProjectCreatedEvent(Guid ProjectId, string Name) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record ProjectStatusUpdatedEvent(Guid ProjectId, ProjectStatus Status) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record ProjectAssignedEvent(Guid ProjectId, long UserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record ProjectUnassignedEvent(Guid ProjectId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 // Phase Events
 public record PhaseCreatedEvent(Guid PhaseId, Guid ProjectId, string Name) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record PhaseAddedEvent(Guid PhaseId, Guid ProjectId, string Name) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record PhaseRemovedEvent(Guid PhaseId, Guid ProjectId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record PhaseStatusUpdatedEvent(Guid PhaseId, PhaseStatus Status) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record PhaseAssignedEvent(Guid PhaseId, long UserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record PhaseUnassignedEvent(Guid PhaseId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 // Task Events
 public record TaskCreatedEvent(Guid TaskId, Guid PhaseId, string Name) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskAddedEvent(Guid TaskId, Guid PhaseId, string Name) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskRemovedEvent(Guid TaskId, Guid PhaseId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskStatusUpdatedEvent(Guid TaskId, TaskStatus Status) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskPriorityUpdatedEvent(Guid TaskId, TaskPriority Priority) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskAssignedEvent(Guid TaskId, long UserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskUnassignedEvent(Guid TaskId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskSectionAddedEvent(Guid TaskId, Guid SectionId, Guid SkillId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskSectionRemovedEvent(Guid TaskId, Guid SectionId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 // TaskSection Events
 public record TaskSectionStatusChangedEvent(Guid SectionId, TaskSectionStatus OldStatus,
     TaskSectionStatus NewStatus,long UserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskSectionAssignedEvent(Guid SectionId, long UserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskSectionTransferredEvent(Guid SectionId, long FromUserId, long ToUserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 // Section Events (Legacy - keeping for backward compatibility)
 public record ProjectPhaseAddedEvent(Guid ProjectId, Guid PhaseId, string PhaseName) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record ProjectTaskStatusChangedEvent(Guid SectionId, TaskStatus OldStatus, TaskStatus NewStatus) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record ProjectSectionAddedEvent(Guid SectionId, Guid TaskId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 
 public record ProjectSectionAssignedEvent(Guid SectionId, long UserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record ProjectSectionTransferredEvent(Guid SectionId, long FromUserId, long ToUserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record WorkStartedEvent(Guid SectionId, long UserId, DateTime StartTime, string? Notes) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record WorkStoppedEvent(Guid SectionId, long UserId, DateTime StartTime, DateTime EndTime, TimeSpan Duration, string? Notes) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record ProjectSectionCompletedEvent(Guid ProjectId, long UserId, TimeSpan TotalTimeSpent, string? Notes) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record AdditionalTimeAddedEvent(Guid ProjectId, Guid AdditionalTimeId, TimeSpan Hours, string? Reason, long? AddedByUserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record AdditionalTimeRemovedEvent(Guid ProjectId, Guid AdditionalTimeId, TimeSpan RemovedHours) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record InitialEstimatedTimeUpdatedEvent(Guid ProjectId, TimeSpan OldEstimate, TimeSpan NewEstimate) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/ITaskSectionRepository.cs

@@ -1,3 +1,4 @@
+using System.Collections;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
 
@@ -11,4 +12,5 @@ public interface ITaskSectionRepository: IRepository<Guid,TaskSection>
     Task<TaskSection?> GetByIdWithFullDataAsync(Guid id, CancellationToken cancellationToken = default);
 
     Task<List<TaskSection>> GetAssignedToUserAsync(long userId);
+    Task<List<TaskSection>> GetActiveSectionsIncludeAllAsync(CancellationToken cancellationToken);
 }

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/_Common/Tools.cs

@@ -1,5 +1,7 @@
 using System.Globalization;
 using System.Text.RegularExpressions;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Bson;
 using PersianTools.Core;
 
 
@@ -1704,25 +1706,25 @@ public static class Tools
     //    return Convert.ToBase64String(bsonData);
     //}
     ////بیسان هایی که  بصورت لیست بودند استخراج میشود
-    //public static List<T> DeserializeFromBsonList<T>(string base64Data)
-    //{
-    //    byte[] data = Convert.FromBase64String(base64Data);
+    public static List<T> DeserializeFromBsonList<T>(string base64Data)
+    {
+        byte[] data = Convert.FromBase64String(base64Data);
 
-    //    using MemoryStream memoryStream = new MemoryStream(data);
-    //    using BsonDataReader reader = new BsonDataReader(memoryStream);
-    //    reader.ReadRootValueAsArray = true;
-    //    JsonSerializer serializer = new JsonSerializer();
-    //    return serializer.Deserialize<List<T>>(reader);
-    //}
-    ////بیسان هایی که  بصورت تکی بودند استخراج میشود
-    //public static T DeserializeFromBson<T>(string base64Data)
-    //{
-    //    byte[] bsonData = Convert.FromBase64String(base64Data);
-    //    using MemoryStream memoryStream = new MemoryStream(bsonData);
-    //    using BsonDataReader bsonReader = new BsonDataReader(memoryStream);
-    //    JsonSerializer serializer = new JsonSerializer();
-    //    return serializer.Deserialize<T>(bsonReader);
-    //}
+        using MemoryStream memoryStream = new MemoryStream(data);
+        using BsonDataReader reader = new BsonDataReader(memoryStream);
+        reader.ReadRootValueAsArray = true;
+        JsonSerializer serializer = new JsonSerializer();
+        return serializer.Deserialize<List<T>>(reader);
+    }
+    //بیسان هایی که  بصورت تکی بودند استخراج میشود
+    public static T DeserializeFromBson<T>(string base64Data)
+    {
+        byte[] bsonData = Convert.FromBase64String(base64Data);
+        using MemoryStream memoryStream = new MemoryStream(bsonData);
+        using BsonDataReader bsonReader = new BsonDataReader(memoryStream);
+        JsonSerializer serializer = new JsonSerializer();
+        return serializer.Deserialize<T>(bsonReader);
+    }
 
     //public static TimeOnly CalculateOffset(ICollection<CustomizeSifts> shiftDetailsRegularShifts)
     //{

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Migrations/20251215155149_add relation to phase section and projectsection to skill.Designer.cs

@@ -0,0 +1,857 @@
+// <auto-generated />
+using System;
+using GozareshgirProgramManager.Infrastructure.Persistence.Context;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace GozareshgirProgramManager.Infrastructure.Migrations
+{
+    [DbContext(typeof(ProgramManagerDbContext))]
+    [Migration("20251215155149_add relation to phase section and projectsection to skill")]
+    partial class addrelationtophasesectionandprojectsectiontoskill
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "10.0.1")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.CheckoutAgg.Entities.Checkout", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CheckoutEndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("CheckoutStartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<double>("DeductionFromSalary")
+                        .HasColumnType("float");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int>("MandatoryHours")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Month")
+                        .HasColumnType("int");
+
+                    b.Property<double>("MonthlySalaryDefined")
+                        .HasColumnType("float");
+
+                    b.Property<double>("MonthlySalaryPay")
+                        .HasColumnType("float");
+
+                    b.Property<int>("RemainingHours")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TotalDaysWorked")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TotalHoursWorked")
+                        .HasColumnType("int");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("Year")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Checkouts", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.CustomerAgg.Customer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Customers", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.PhaseSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("PhaseId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("SkillId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PhaseId");
+
+                    b.HasIndex("SkillId");
+
+                    b.ToTable("PhaseSections");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("HasAssignmentOverride")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.Property<DateTime?>("PlannedEndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("PlannedStartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Projects", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("HasAssignmentOverride")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.Property<int>("OrderIndex")
+                        .HasColumnType("int");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProjectId");
+
+                    b.ToTable("ProjectPhases", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("SkillId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProjectId");
+
+                    b.HasIndex("SkillId");
+
+                    b.ToTable("ProjectSections");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("AllocatedTime")
+                        .HasMaxLength(30)
+                        .HasColumnType("nvarchar(30)");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("HasAssignmentOverride")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("HasTimeOverride")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.Property<int>("OrderIndex")
+                        .HasColumnType("int");
+
+                    b.Property<Guid>("PhaseId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PhaseId");
+
+                    b.ToTable("ProjectTasks", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<long>("CurrentAssignedUserId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("InitialDescription")
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<string>("InitialEstimatedHours")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("nvarchar(30)");
+
+                    b.Property<long>("OriginalAssignedUserId")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SkillId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<Guid>("TaskId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SkillId");
+
+                    b.HasIndex("TaskId");
+
+                    b.ToTable("TaskSections", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSectionActivity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("EndNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("TaskSectionActivities", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSectionAdditionalTime", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<long?>("AddedByUserId")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Hours")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("nvarchar(30)");
+
+                    b.Property<string>("Reason")
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<Guid?>("TaskSectionId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TaskSectionId");
+
+                    b.ToTable("TaskSectionAdditionalTimes", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.RoleAgg.Entities.Role", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<long?>("GozareshgirRoleId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PmRoles", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.SalaryPaymentSettingAgg.Entities.SalaryPaymentSetting", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("EndSettingDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("HolidayWorking")
+                        .HasColumnType("bit");
+
+                    b.Property<double>("MonthlySalary")
+                        .HasColumnType("float");
+
+                    b.Property<DateTime?>("StartSettingDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SalaryPaymentSetting", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.SkillAgg.Entities.Skill", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Skills", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.UserAgg.Entities.User", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
+
+                    b.Property<long?>("AccountId")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Mobile")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("nvarchar(20)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<string>("ProfilePhotoPath")
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("VerifyCode")
+                        .HasMaxLength(10)
+                        .HasColumnType("nvarchar(10)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Users", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.UserAgg.Entities.UserRefreshToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("ExpiresAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("IpAddress")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<DateTime?>("RevokedAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<string>("UserAgent")
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ExpiresAt");
+
+                    b.HasIndex("Token")
+                        .IsUnique();
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserRefreshTokens", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.PhaseSection", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", "Phase")
+                        .WithMany("PhaseSections")
+                        .HasForeignKey("PhaseId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("GozareshgirProgramManager.Domain.SkillAgg.Entities.Skill", "Skill")
+                        .WithMany()
+                        .HasForeignKey("SkillId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.Navigation("Phase");
+
+                    b.Navigation("Skill");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", "Project")
+                        .WithMany("Phases")
+                        .HasForeignKey("ProjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Project");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectSection", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", "Project")
+                        .WithMany("ProjectSections")
+                        .HasForeignKey("ProjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("GozareshgirProgramManager.Domain.SkillAgg.Entities.Skill", "Skill")
+                        .WithMany()
+                        .HasForeignKey("SkillId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.Navigation("Project");
+
+                    b.Navigation("Skill");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", "Phase")
+                        .WithMany("Tasks")
+                        .HasForeignKey("PhaseId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Phase");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.SkillAgg.Entities.Skill", "Skill")
+                        .WithMany("Sections")
+                        .HasForeignKey("SkillId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", "Task")
+                        .WithMany("Sections")
+                        .HasForeignKey("TaskId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Skill");
+
+                    b.Navigation("Task");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSectionActivity", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", "Section")
+                        .WithMany("Activities")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSectionAdditionalTime", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", null)
+                        .WithMany("AdditionalTimes")
+                        .HasForeignKey("TaskSectionId");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.RoleAgg.Entities.Role", b =>
+                {
+                    b.OwnsMany("GozareshgirProgramManager.Domain.PermissionAgg.Entities.Permission", "Permissions", b1 =>
+                        {
+                            b1.Property<long>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("bigint");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("Id"));
+
+                            b1.Property<int>("Code")
+                                .HasColumnType("int");
+
+                            b1.Property<long>("RoleId")
+                                .HasColumnType("bigint");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("RoleId");
+
+                            b1.ToTable("PmRolePermissions", (string)null);
+
+                            b1.WithOwner("Role")
+                                .HasForeignKey("RoleId");
+
+                            b1.Navigation("Role");
+                        });
+
+                    b.Navigation("Permissions");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.SalaryPaymentSettingAgg.Entities.SalaryPaymentSetting", b =>
+                {
+                    b.OwnsMany("GozareshgirProgramManager.Domain.SalaryPaymentSettingAgg.Entities.WorkingHours", "WorkingHoursList", b1 =>
+                        {
+                            b1.Property<long>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("bigint");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("Id"));
+
+                            b1.Property<TimeSpan>("EndShiftOne")
+                                .HasColumnType("time(0)");
+
+                            b1.Property<TimeSpan>("EndShiftTwo")
+                                .HasColumnType("time(0)");
+
+                            b1.Property<bool>("HasRestTime")
+                                .HasColumnType("bit");
+
+                            b1.Property<bool>("HasShiftOne")
+                                .HasColumnType("bit");
+
+                            b1.Property<bool>("HasShiftTow")
+                                .HasColumnType("bit");
+
+                            b1.Property<bool>("IsActiveDay")
+                                .HasColumnType("bit");
+
+                            b1.Property<int>("PersianDayOfWeek")
+                                .HasColumnType("int");
+
+                            b1.Property<TimeSpan>("RestTime")
+                                .HasColumnType("time(0)");
+
+                            b1.Property<long>("SalaryPaymentSettingId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<int>("ShiftDurationInMinutes")
+                                .HasColumnType("int");
+
+                            b1.Property<TimeSpan>("StartShiftOne")
+                                .HasColumnType("time(0)");
+
+                            b1.Property<TimeSpan>("StartShiftTwo")
+                                .HasColumnType("time(0)");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("SalaryPaymentSettingId");
+
+                            b1.ToTable("WorkingHours", (string)null);
+
+                            b1.WithOwner("SalaryPaymentSetting")
+                                .HasForeignKey("SalaryPaymentSettingId");
+
+                            b1.Navigation("SalaryPaymentSetting");
+                        });
+
+                    b.Navigation("WorkingHoursList");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.UserAgg.Entities.User", b =>
+                {
+                    b.OwnsMany("GozareshgirProgramManager.Domain.RoleUserAgg.RoleUser", "RoleUser", b1 =>
+                        {
+                            b1.Property<long>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("bigint");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("Id"));
+
+                            b1.Property<long>("RoleId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<long>("UserId")
+                                .HasColumnType("bigint");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("UserId");
+
+                            b1.ToTable("RoleUsers", (string)null);
+
+                            b1.WithOwner("User")
+                                .HasForeignKey("UserId");
+
+                            b1.Navigation("User");
+                        });
+
+                    b.Navigation("RoleUser");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.UserAgg.Entities.UserRefreshToken", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.UserAgg.Entities.User", "User")
+                        .WithMany("RefreshTokens")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", b =>
+                {
+                    b.Navigation("Phases");
+
+                    b.Navigation("ProjectSections");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", b =>
+                {
+                    b.Navigation("PhaseSections");
+
+                    b.Navigation("Tasks");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", b =>
+                {
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", b =>
+                {
+                    b.Navigation("Activities");
+
+                    b.Navigation("AdditionalTimes");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.SkillAgg.Entities.Skill", b =>
+                {
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.UserAgg.Entities.User", b =>
+                {
+                    b.Navigation("RefreshTokens");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Migrations/20251215155149_add relation to phase section and projectsection to skill.cs

@@ -0,0 +1,63 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace GozareshgirProgramManager.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class addrelationtophasesectionandprojectsectiontoskill : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ProjectSections_SkillId",
+                table: "ProjectSections",
+                column: "SkillId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PhaseSections_SkillId",
+                table: "PhaseSections",
+                column: "SkillId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_PhaseSections_Skills_SkillId",
+                table: "PhaseSections",
+                column: "SkillId",
+                principalTable: "Skills",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_ProjectSections_Skills_SkillId",
+                table: "ProjectSections",
+                column: "SkillId",
+                principalTable: "Skills",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_PhaseSections_Skills_SkillId",
+                table: "PhaseSections");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_ProjectSections_Skills_SkillId",
+                table: "ProjectSections");
+
+            migrationBuilder.DropIndex(
+                name: "IX_ProjectSections_SkillId",
+                table: "ProjectSections");
+
+            migrationBuilder.DropIndex(
+                name: "IX_PhaseSections_SkillId",
+                table: "PhaseSections");
+
+        }
+    }
+}

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Migrations/20251227094008_add phase deploy status and is archived.Designer.cs

@@ -0,0 +1,865 @@
+// <auto-generated />
+using System;
+using GozareshgirProgramManager.Infrastructure.Persistence.Context;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace GozareshgirProgramManager.Infrastructure.Migrations
+{
+    [DbContext(typeof(ProgramManagerDbContext))]
+    [Migration("20251227094008_add phase deploy status and is archived")]
+    partial class addphasedeploystatusandisarchived
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "10.0.1")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.CheckoutAgg.Entities.Checkout", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CheckoutEndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("CheckoutStartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<double>("DeductionFromSalary")
+                        .HasColumnType("float");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int>("MandatoryHours")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Month")
+                        .HasColumnType("int");
+
+                    b.Property<double>("MonthlySalaryDefined")
+                        .HasColumnType("float");
+
+                    b.Property<double>("MonthlySalaryPay")
+                        .HasColumnType("float");
+
+                    b.Property<int>("RemainingHours")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TotalDaysWorked")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TotalHoursWorked")
+                        .HasColumnType("int");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("Year")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Checkouts", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.CustomerAgg.Customer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Customers", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.PhaseSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("PhaseId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("SkillId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PhaseId");
+
+                    b.HasIndex("SkillId");
+
+                    b.ToTable("PhaseSections");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("HasAssignmentOverride")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.Property<DateTime?>("PlannedEndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("PlannedStartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Projects", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("DeployStatus")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("nvarchar(30)");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("HasAssignmentOverride")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.Property<int>("OrderIndex")
+                        .HasColumnType("int");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProjectId");
+
+                    b.ToTable("ProjectPhases", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("SkillId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProjectId");
+
+                    b.HasIndex("SkillId");
+
+                    b.ToTable("ProjectSections");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("AllocatedTime")
+                        .HasMaxLength(30)
+                        .HasColumnType("nvarchar(30)");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("HasAssignmentOverride")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("HasTimeOverride")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.Property<int>("OrderIndex")
+                        .HasColumnType("int");
+
+                    b.Property<Guid>("PhaseId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PhaseId");
+
+                    b.ToTable("ProjectTasks", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<long>("CurrentAssignedUserId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("InitialDescription")
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<string>("InitialEstimatedHours")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("nvarchar(30)");
+
+                    b.Property<long>("OriginalAssignedUserId")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SkillId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<Guid>("TaskId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SkillId");
+
+                    b.HasIndex("TaskId");
+
+                    b.ToTable("TaskSections", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSectionActivity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("EndNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("TaskSectionActivities", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSectionAdditionalTime", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<long?>("AddedByUserId")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Hours")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("nvarchar(30)");
+
+                    b.Property<string>("Reason")
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<Guid?>("TaskSectionId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TaskSectionId");
+
+                    b.ToTable("TaskSectionAdditionalTimes", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.RoleAgg.Entities.Role", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<long?>("GozareshgirRoleId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PmRoles", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.SalaryPaymentSettingAgg.Entities.SalaryPaymentSetting", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("EndSettingDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("HolidayWorking")
+                        .HasColumnType("bit");
+
+                    b.Property<double>("MonthlySalary")
+                        .HasColumnType("float");
+
+                    b.Property<DateTime?>("StartSettingDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SalaryPaymentSetting", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.SkillAgg.Entities.Skill", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Skills", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.UserAgg.Entities.User", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
+
+                    b.Property<long?>("AccountId")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Mobile")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("nvarchar(20)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<string>("ProfilePhotoPath")
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("VerifyCode")
+                        .HasMaxLength(10)
+                        .HasColumnType("nvarchar(10)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Users", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.UserAgg.Entities.UserRefreshToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("ExpiresAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("IpAddress")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<DateTime?>("RevokedAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<string>("UserAgent")
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ExpiresAt");
+
+                    b.HasIndex("Token")
+                        .IsUnique();
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserRefreshTokens", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.PhaseSection", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", "Phase")
+                        .WithMany("PhaseSections")
+                        .HasForeignKey("PhaseId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("GozareshgirProgramManager.Domain.SkillAgg.Entities.Skill", "Skill")
+                        .WithMany()
+                        .HasForeignKey("SkillId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.Navigation("Phase");
+
+                    b.Navigation("Skill");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", "Project")
+                        .WithMany("Phases")
+                        .HasForeignKey("ProjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Project");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectSection", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", "Project")
+                        .WithMany("ProjectSections")
+                        .HasForeignKey("ProjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("GozareshgirProgramManager.Domain.SkillAgg.Entities.Skill", "Skill")
+                        .WithMany()
+                        .HasForeignKey("SkillId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.Navigation("Project");
+
+                    b.Navigation("Skill");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", "Phase")
+                        .WithMany("Tasks")
+                        .HasForeignKey("PhaseId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Phase");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.SkillAgg.Entities.Skill", "Skill")
+                        .WithMany("Sections")
+                        .HasForeignKey("SkillId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", "Task")
+                        .WithMany("Sections")
+                        .HasForeignKey("TaskId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Skill");
+
+                    b.Navigation("Task");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSectionActivity", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", "Section")
+                        .WithMany("Activities")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSectionAdditionalTime", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", null)
+                        .WithMany("AdditionalTimes")
+                        .HasForeignKey("TaskSectionId");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.RoleAgg.Entities.Role", b =>
+                {
+                    b.OwnsMany("GozareshgirProgramManager.Domain.PermissionAgg.Entities.Permission", "Permissions", b1 =>
+                        {
+                            b1.Property<long>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("bigint");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("Id"));
+
+                            b1.Property<int>("Code")
+                                .HasColumnType("int");
+
+                            b1.Property<long>("RoleId")
+                                .HasColumnType("bigint");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("RoleId");
+
+                            b1.ToTable("PmRolePermissions", (string)null);
+
+                            b1.WithOwner("Role")
+                                .HasForeignKey("RoleId");
+
+                            b1.Navigation("Role");
+                        });
+
+                    b.Navigation("Permissions");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.SalaryPaymentSettingAgg.Entities.SalaryPaymentSetting", b =>
+                {
+                    b.OwnsMany("GozareshgirProgramManager.Domain.SalaryPaymentSettingAgg.Entities.WorkingHours", "WorkingHoursList", b1 =>
+                        {
+                            b1.Property<long>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("bigint");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("Id"));
+
+                            b1.Property<TimeSpan>("EndShiftOne")
+                                .HasColumnType("time(0)");
+
+                            b1.Property<TimeSpan>("EndShiftTwo")
+                                .HasColumnType("time(0)");
+
+                            b1.Property<bool>("HasRestTime")
+                                .HasColumnType("bit");
+
+                            b1.Property<bool>("HasShiftOne")
+                                .HasColumnType("bit");
+
+                            b1.Property<bool>("HasShiftTow")
+                                .HasColumnType("bit");
+
+                            b1.Property<bool>("IsActiveDay")
+                                .HasColumnType("bit");
+
+                            b1.Property<int>("PersianDayOfWeek")
+                                .HasColumnType("int");
+
+                            b1.Property<TimeSpan>("RestTime")
+                                .HasColumnType("time(0)");
+
+                            b1.Property<long>("SalaryPaymentSettingId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<int>("ShiftDurationInMinutes")
+                                .HasColumnType("int");
+
+                            b1.Property<TimeSpan>("StartShiftOne")
+                                .HasColumnType("time(0)");
+
+                            b1.Property<TimeSpan>("StartShiftTwo")
+                                .HasColumnType("time(0)");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("SalaryPaymentSettingId");
+
+                            b1.ToTable("WorkingHours", (string)null);
+
+                            b1.WithOwner("SalaryPaymentSetting")
+                                .HasForeignKey("SalaryPaymentSettingId");
+
+                            b1.Navigation("SalaryPaymentSetting");
+                        });
+
+                    b.Navigation("WorkingHoursList");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.UserAgg.Entities.User", b =>
+                {
+                    b.OwnsMany("GozareshgirProgramManager.Domain.RoleUserAgg.RoleUser", "RoleUser", b1 =>
+                        {
+                            b1.Property<long>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("bigint");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("Id"));
+
+                            b1.Property<long>("RoleId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<long>("UserId")
+                                .HasColumnType("bigint");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("UserId");
+
+                            b1.ToTable("RoleUsers", (string)null);
+
+                            b1.WithOwner("User")
+                                .HasForeignKey("UserId");
+
+                            b1.Navigation("User");
+                        });
+
+                    b.Navigation("RoleUser");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.UserAgg.Entities.UserRefreshToken", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.UserAgg.Entities.User", "User")
+                        .WithMany("RefreshTokens")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", b =>
+                {
+                    b.Navigation("Phases");
+
+                    b.Navigation("ProjectSections");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", b =>
+                {
+                    b.Navigation("PhaseSections");
+
+                    b.Navigation("Tasks");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", b =>
+                {
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", b =>
+                {
+                    b.Navigation("Activities");
+
+                    b.Navigation("AdditionalTimes");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.SkillAgg.Entities.Skill", b =>
+                {
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.UserAgg.Entities.User", b =>
+                {
+                    b.Navigation("RefreshTokens");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Migrations/20251227094008_add phase deploy status and is archived.cs

@@ -0,0 +1,41 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace GozareshgirProgramManager.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class addphasedeploystatusandisarchived : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "DeployStatus",
+                table: "ProjectPhases",
+                type: "nvarchar(30)",
+                maxLength: 30,
+                nullable: false,
+                defaultValue: "");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsArchived",
+                table: "ProjectPhases",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "DeployStatus",
+                table: "ProjectPhases");
+
+            migrationBuilder.DropColumn(
+                name: "IsArchived",
+                table: "ProjectPhases");
+        }
+    }
+}

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Migrations/AppDbContextModelSnapshot.cs

@@ -17,7 +17,7 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.0")
+                .HasAnnotation("ProductVersion", "10.0.1")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
@@ -102,56 +102,6 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.ToTable("Customers", (string)null);
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.HolidayAgg.Holiday", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
-
-                    b.Property<DateTime>("CreationDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("Year")
-                        .IsRequired()
-                        .HasMaxLength(4)
-                        .HasColumnType("nvarchar(4)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Holidays", (string)null);
-                });
-
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.HolidayItemAgg.HolidayItem", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
-
-                    b.Property<DateTime>("CreationDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<long>("HolidayId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("HolidayYear")
-                        .IsRequired()
-                        .HasMaxLength(4)
-                        .HasColumnType("nvarchar(4)");
-
-                    b.Property<DateTime>("Holidaydate")
-                        .HasColumnType("datetime2");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("HolidayId");
-
-                    b.ToTable("Holidayitems", (string)null);
-                });
-
             modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.PhaseSection", b =>
                 {
                     b.Property<Guid>("Id")
@@ -174,6 +124,8 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
 
                     b.HasIndex("PhaseId");
 
+                    b.HasIndex("SkillId");
+
                     b.ToTable("PhaseSections");
                 });
 
@@ -227,6 +179,11 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("DeployStatus")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("nvarchar(30)");
+
                     b.Property<string>("Description")
                         .HasMaxLength(1000)
                         .HasColumnType("nvarchar(1000)");
@@ -237,6 +194,9 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.Property<bool>("HasAssignmentOverride")
                         .HasColumnType("bit");
 
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("bit");
+
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(200)
@@ -284,6 +244,8 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
 
                     b.HasIndex("ProjectId");
 
+                    b.HasIndex("SkillId");
+
                     b.ToTable("ProjectSections");
                 });
 
@@ -630,17 +592,6 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.ToTable("UserRefreshTokens", (string)null);
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.HolidayItemAgg.HolidayItem", b =>
-                {
-                    b.HasOne("GozareshgirProgramManager.Domain.HolidayAgg.Holiday", "Holidayss")
-                        .WithMany("HolidayItems")
-                        .HasForeignKey("HolidayId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Holidayss");
-                });
-
             modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.PhaseSection", b =>
                 {
                     b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", "Phase")
@@ -649,7 +600,14 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("GozareshgirProgramManager.Domain.SkillAgg.Entities.Skill", "Skill")
+                        .WithMany()
+                        .HasForeignKey("SkillId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
                     b.Navigation("Phase");
+
+                    b.Navigation("Skill");
                 });
 
             modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", b =>
@@ -671,7 +629,14 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("GozareshgirProgramManager.Domain.SkillAgg.Entities.Skill", "Skill")
+                        .WithMany()
+                        .HasForeignKey("SkillId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
                     b.Navigation("Project");
+
+                    b.Navigation("Skill");
                 });
 
             modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", b =>
@@ -856,11 +821,6 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.HolidayAgg.Holiday", b =>
-                {
-                    b.Navigation("HolidayItems");
-                });
-
             modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", b =>
                 {
                     b.Navigation("Phases");

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Mappings/PhaseSectionMapping.cs

@@ -17,5 +17,11 @@ public class PhaseSectionMapping:IEntityTypeConfiguration<PhaseSection>
             .WithMany(p => p.PhaseSections)
             .HasForeignKey(ps => ps.PhaseId)
             .OnDelete(DeleteBehavior.Cascade);
+
+        builder.HasOne(ps => ps.Skill)
+            .WithMany()
+            .HasForeignKey(ps => ps.SkillId)
+			.IsRequired(false)
+			.OnDelete(DeleteBehavior.Restrict);
     }
 }

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Mappings/ProjectPhaseMapping.cs

@@ -48,6 +48,9 @@ public class ProjectPhaseMapping : IEntityTypeConfiguration<ProjectPhase>
         builder.Property(ph => ph.HasAssignmentOverride)
             .IsRequired();
 
+        builder.Property(x => x.DeployStatus)
+            .HasConversion<string>().HasMaxLength(30);
+
         // Relationship with Project
         builder.HasOne(ph => ph.Project)
             .WithMany(p => p.Phases)

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Mappings/ProjectSectionMapping.cs

@@ -16,5 +16,11 @@ public class ProjectSectionMapping:IEntityTypeConfiguration<ProjectSection>
             .WithMany(x => x.ProjectSections)
             .HasForeignKey(x => x.ProjectId)
             .OnDelete(DeleteBehavior.Cascade);
+
+        builder.HasOne(x => x.Skill)
+            .WithMany()
+            .HasForeignKey(x => x.SkillId)
+            .IsRequired(false)
+            .OnDelete(DeleteBehavior.Restrict);
     }
 }

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Repositories/TaskSectionRepository.cs

@@ -1,4 +1,5 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 using GozareshgirProgramManager.Infrastructure.Persistence._Common;
 using GozareshgirProgramManager.Infrastructure.Persistence.Context;
@@ -35,4 +36,13 @@ public class TaskSectionRepository:RepositoryBase<Guid,TaskSection>,ITaskSection
             .Where(x => x.CurrentAssignedUserId == userId)
             .ToListAsync();
     }
+
+    public Task<List<TaskSection>> GetActiveSectionsIncludeAllAsync(CancellationToken cancellationToken)
+    {
+        return _context.TaskSections
+            .Where(x => x.Status == TaskSectionStatus.InProgress)
+            .Include(x => x.Activities)
+            .Include(x => x.AdditionalTimes)
+            .ToListAsync(cancellationToken);
+    }
 }

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Services/Authentication/AuthHelper.cs

@@ -1,5 +1,6 @@
 using System.Security.Claims;
 using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Domain._Common;
 using Microsoft.AspNetCore.Http;
 
 namespace GozareshgirProgramManager.Infrastructure.Services.Authentication;
@@ -106,6 +107,21 @@ public class AuthHelper : IAuthHelper
         return _httpContextAccessor.HttpContext?.User?.FindFirst("FullName")?.Value;
     }
 
+    public bool HasPermission(int permission)
+    {
+        return GetPermissions().Any(x => x == permission);
+    }
+
+    public List<int> GetPermissions()
+    {
+        if (!IsAuthenticated())
+            return new List<int>();
+
+        var permissions = _httpContextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == "permissions")
+            ?.Value;
+        return Tools.DeserializeFromBsonList<int>(permissions); //Mahan
+    }
+
     // /// <summary>
     // /// دریافت AccountId کاربر جاری از Claims
     // /// </summary>

ServiceHost/Areas/Admin/Controllers/ProgramManager/ProjectController.cs

@@ -1,5 +1,7 @@
-using GozareshgirProgramManager.Application._Common.Models;
+using System.Runtime.InteropServices;
+using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.AssignProject;
+using GozareshgirProgramManager.Application.Modules.Projects.Commands.AutoStopOverTimeTaskSections;
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.ChangeStatusSection;
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.CreateProject;
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.DeleteProject;
@@ -8,7 +10,9 @@ using GozareshgirProgramManager.Application.Modules.Projects.Commands.SetTimePro
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.TransferSection;
 using GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectAssignDetails;
 using GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
+using GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectBoardDetail;
 using GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectBoardList;
+using GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectDeployBoardList;
 using GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectSetTimeDetails;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
@@ -96,7 +100,24 @@ public class ProjectController : ProgramManagerBaseController
     [HttpGet("board")]
     public async Task<ActionResult<OperationResult<List<ProjectBoardListResponse>>>> GetProjectBoard([FromQuery] ProjectBoardListQuery query)
     {
+        // اجرای Command برای متوقف کردن تسک‌های overtime قبل از نمایش
+        await _mediator.Send(new AutoStopOverTimeTaskSectionsCommand());
+        
         var res = await _mediator.Send(query);
         return res;
     }
+    [HttpGet("board/details")]
+    public async Task<ActionResult<OperationResult<ProjectBoardDetailResponse>>> GetProjectBoardDetails(Guid id)
+    {
+        var query = new ProjectBoardDetailQuery(id);
+        var res = await _mediator.Send(query);
+        return res;
+    }
+
+    [HttpGet("deploy-board")]
+    public async Task<ActionResult<OperationResult<GetProjectsDeployBoardListResponse>>> GetProjectDeployBoard()
+    {
+        var request = new GetProjectDeployBoardListQuery();
+        return await _mediator.Send(request);
+    }
 }

ServiceHost/Areas/Admin/Controllers/institutionContractController.cs

@@ -807,6 +807,13 @@ public class institutionContractController : AdminBaseController
         var res =await _institutionContractApplication.PrintOneAsync(id);
         return res;
     }
+
+    [HttpPost("mannual-verify/{id}")]
+    public async Task<ActionResult<OperationResult>> VerifyInstitutionContractMannualy(long id)
+    {
+        var res= await _institutionContractApplication.VerifyInstitutionContractManually(id);
+        return res;
+    }
 }
 
 

ServiceHost/Areas/Admin/Pages/Accounts/Account/Create.cshtml

@@ -129,7 +129,7 @@
                 <div class="col-md-6">
                     <div class="row"></div>
                     <div class="form-group" style="margin: 29px 7px 0px;">
-                        <span> فعالیت کاربر در پروگرام منیجر </span>
+                        <span> فعالیت کاربر در مدیریت پروژه </span>
                         <span>&nbsp;</span>
                         <label class="switch">
                             <input id="checkAll" asp-for="IsProgramManagerUser" type="checkbox"/>
@@ -143,7 +143,7 @@
 				
                 <div class="col-md-6">
                     <div class="form-group">
-                        <label asp-for="UserRoles" > نقش  در پروگرام منیجر </label>
+                        <label asp-for="UserRoles" > انتخاب نقش در مدیریت پروژه </label>
                         <select disabled="disabled" class="form-control select-city" multiple="multiple" asp-for="UserRoles" asp-items="Model.RoleList">
                             <option value="0"></option>
                         </select>

ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml

@@ -1,6 +1,10 @@
 @model AccountManagement.Application.Contracts.Role.CreateRole
 @{
 	<style>
+
+		.modal .modal-dialog .modal-content{
+			width: 645px;
+		}
         .child-check {
             margin-left: 15px;
             display: none;
@@ -224,9 +228,18 @@
 	<div class="child-check level3">
 		<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="10323" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب امور قرارداد </span> </label>
 	</div>
-	<div class="child-check level3">
-		<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="10324" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب امور بیمه ای </span> </label>
-	</div>
+    <div class="child-check level3">
+        <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+            <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+        </label>
+        <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="10324" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب امور بیمه ای </span> </label>
+									
+        <!-----------------------Sub Menu------------------->
+        <div class="child-check level3">
+										<label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="1032401" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> محاسبه اضافه کار و حق عائله مندی در بیمه  </span> </label>
+        </div>
+    </div>
+   
 	<div class="child-check level3">
 		<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="10327" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب امور مالیاتی </span> </label>
 	</div>
@@ -1014,7 +1027,7 @@
 						
 
                         <!-- پروگرام منیجر -->
-                        <div class="parent-check">
+         @*                <div class="parent-check">
                             <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
                                 <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
                             </label>
@@ -1024,111 +1037,281 @@
 
                 
 
-                        </div>
+                        </div> *@
 						
-						<!-- مدیریت برنامه نویسان -->
+						<!--### مدیریت پروژه ###-->
 						<div class="parent-check">
 							<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
 								<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
 							</label>
 							
-							<label class="btn btn-inverse waves-effect waves-light m-b-5 parent"> <input type="checkbox" value="99"  class="check-btn" data-pm="" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> مدیریت برنامه نویسان </span>&nbsp;</label>
-                            <!--  مدیریت پروژه -->
-							<div class="child-check level2">
+							<label class="btn btn-inverse waves-effect waves-light m-b-5 parent"> <input type="checkbox" value="99"  class="check-btn" data-pm="" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> مدیریت پروژه </span>&nbsp;</label>
+
+							<!--=================================================-->
+							<!--#### تب کاربران برنامه نویسی ####-->
+                            <div class="child-check level2">
 								<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
 									<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
 								</label>
-								<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="991" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> مدیریت پروژه </span> </label>
-                               
+								<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="9900" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> تب کاربران برنامه نویسی </span> </label>
+                              
+                                <!-----------------------Sub Menu------------------->
+								<!-- تعیین حقوق -->
                                 <div class="child-check level3">
                                     <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
                                         <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
                                     </label>
-                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="99101" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد پروژه </span> </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990001" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> تب تعیین حقوق </span> </label>
+									
+                                    <!-----------------------Sub Menu------------------->
+                                    <div class="child-check level3">
+                                        <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="99000101" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> تعیین زمان </span> </label>
+                                    </div>
+                                </div>
+								
+                                <!--  وضعیت کارکرد -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990002" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> تب وضعیت کارکرد </span> </label>
+									
+                                    
+                                </div>
+								
+                                <!--  فیش حقوقی -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990003" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> تب فیش حقوقی </span> </label>
+                                   
+                                    <!-----------------------Sub Menu------------------->
+                                    <div class="child-check level3">
+										<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="99000301" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد فیش </span> </label>
+                                    </div>
+                                    <div class="child-check level3">
+										<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="99000302" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative">  حذف تکی فیش </span> </label>
+                                    </div>
+                                    <div class="child-check level3">
+										<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="99000303" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> حذف گروهی فیش ها </span> </label>
+                                    </div>
+                                    <div class="child-check level3">
+										<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="99000304" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> محاسبه مجدد گروهی فیش ها </span> </label>
+                                    </div>
+                                    <div class="child-check level3">
+										<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="99000305" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> محاسبه مجدد تکی فیش</span> </label>
+                                    </div>
+                                </div>
+                            </div>
+							
+
+                            <!--=================================================-->
+							<!--#### تب مدیریت پروژه ####-->
+                            <div class="child-check level2">
+								<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+									<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+								</label>
+								<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="9901" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> تب مدیریت پروژه </span> </label>
+                               <!-----------------------Sub Menu------------------->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990101" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد پروژه </span> </label>
 
                                 </div>
-
-								<!--  ستون لیست پروژه  -->
+								
+								
+                                <!--  همه پروژه ها -->
 								<div class="child-check level3">
 									<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
 										<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
 									</label>
-									<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="9911" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ستون لیست پروژه ها </span> </label>
-
-									<div class="child-check level3">
-										<label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="99111" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> تعیین کاربر </span> </label>
-									</div>
-									<div class="child-check level3">
-										<label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="99112" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> توضیحات</span> </label>
-									</div>
-									<div class="child-check level3">
-										<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="99113" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ویرایش</span> </label>
-									</div>
-                                    <div class="child-check level3">
-                                        <label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="99114" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> حذف</span> </label>
-                                    </div>
+									<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990102" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> همه پروژه ها </span> </label>
+								
 								</div>
-                                <!--ستون بخش اصلی -->
+                                <!-- پروژه های آماده برنامه ریزی -->
                                 <div class="child-check level3">
                                     <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
                                         <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
                                     </label>
-                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="9912" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ستون بخش اصلی </span> </label>
+									<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990103" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> پروژه های آماده برنامه ریزی  </span> </label>
 
-                                    <div class="child-check level3">
-                                        <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="99121" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> تعیین کاربر </span> </label>
-                                    </div>
-                                    <div class="child-check level3">
-                                        <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="99122" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> توضیحات </span> </label>
-                                    </div>
-                                    <div class="child-check level3">
-                                        <label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="99124" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ویرایش  </span> </label>
-                                    </div>
-                                    <div class="child-check level3">
-                                        <label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="99124" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> حذف </span> </label>
-                                    </div>
+                                   
                                 </div>
-                                <!--ستون بخش فرعی -->
+                                <!-- پروژه های در حال اجرا -->
                                 <div class="child-check level3">
                                     <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
                                         <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
                                     </label>
-                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="9913" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ستون بخش اصلی </span> </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990104" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> پروژه های در حال اجرا </span> </label>
 
-                                    <div class="child-check level3">
-                                        <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="99131" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> تعیین کاربر </span> </label>
-                                    </div>
-                                    <div class="child-check level3">
-                                        <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="99132" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> توضیحات </span> </label>
-                                    </div>
-                                    <div class="child-check level3">
-                                        <label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="99134" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ویرایش  </span> </label>
-                                    </div>
-                                    <div class="child-check level3">
-                                        <label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="99134" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> حذف </span> </label>
-                                    </div>
+                                  
                                 </div>
-							</div>
-                            <!--اجرا-->
+								
+                                <!-- پروژه های به اتمام رسیده -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990105" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> پروژه های به اتمام رسیده </span> </label>
+
+                                  
+                                </div>
+								<!-- تعیین کاربر -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990106" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> تعیین کاربر </span> </label>
+
+                                  
+                                </div>
+								
+                                <!-- تعیین زمان پروژه -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990107" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> تعیین زمان پروژه </span> </label>
+
+                                  
+                                </div>
+								
+                                <!-- ویرایش پروژه -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990108" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ویرایش پروژه </span> </label>
+
+                                  
+                                </div>
+								
+                                <!-- حذف پروژه -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990109" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> حذف پروژه </span> </label>
+
+                                  
+                                </div>
+
+
+								<!-- ایجاد بخش اصلی -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+									<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990110" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد بخش اصلی </span> </label>
+
+                                  
+                                </div>
+
+
+								<!-- ایجاد بخش فرعی -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+									<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990111" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد بخش فرعی </span> </label>
+
+                                  
+                                </div>
+                            </div>
+                           
+                            <!--=================================================-->
+							<!--#### تب اجرا ####-->
 							<div class="child-check level2">
 								<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
 									<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
 								</label>
-								<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="992" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> همه </span> </label>
+								<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="9902" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> تب اجرا </span> </label>
+
+
+								<!--  همه -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990201" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> همه </span> </label>
+									
+                                </div>
+								
+                                <!-- آماده اجرا -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990202" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> آماده اجرا </span> </label>
+
+									
+                                </div>
+								
+                                <!-- در حال اجرا -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990203" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> در حال اجرا </span> </label>
+
+									
+                                </div>
+								
+                                <!-- نیمه کاره -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990204" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> نیمه کاره </span> </label>
+
+									
+                                </div>
+								
+								
+                                <!--  اتمام اجرا -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990205" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> نیمه کاره </span> </label>
+
+									
+                                </div>
+								
+                                <!-- دیدن پروژه همه کاربران -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990206" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> دیدن پروژه همه کاربران </span> </label>
+
+									
+                                </div>
+								
+                                <!-- ارجاع به دیگران -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990207" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ارجاع به دیگران </span> </label>
+
+									
+                                </div>
+								
+                                <!-- چت -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990208" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative">  چت </span> </label>
+
+									
+                                </div>
+                            </div>
 
-								<div class="child-check level3">
-									<label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="9921" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> آماده اجرا </span> </label>
-								</div>
-								<div class="child-check level3">
-									<label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="9922" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> در حال اجرا </span> </label>
-								</div>
-								<div class="child-check level3">
-									<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="9023" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> نیمه کاره </span> </label>
-								</div>
-								<div class="child-check level3">
-									<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="9024" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> اتمام اجرا </span> </label>
-								</div>
-							</div>
 							
 						</div>
 						
@@ -1324,6 +1507,13 @@
 						   name="PmPermissions[${pmIndex}]"
 						   value="${chk.checked ? chk.value : 0}">
 				`);
+				if(chk.checked && chk.value == 99){
+					$("#hiddenInput").append(`
+					<input class="item1" type="hidden"
+						   name="Permissions[${normalIndex}]"
+						   value="${chk.checked ? chk.value : 0}">`);
+						   normalIndex++;
+				}
 				pmIndex++;
 			} else {
 				$("#hiddenInput").append(`