feat: add API endpoint to retrieve working employees select list for current workshop

0_Framework/Application/Enums/TypeOfCheckoutWarning.cs

@@ -1,15 +0,0 @@
-namespace _0_Framework.Application.Enums;
-
-public enum TypeOfCheckoutWarning
-{
-    /// <summary>
-    /// هشدار های متفرقه
-    /// </summary>
-    OthersWarning,
-    /// <summary>
-    /// هشدار سهم بیمه کارگر
-    /// </summary>
-    InsuranceEmployeeShare,
-
-
-}

0_Framework/Application/FaceEmbedding/IFaceEmbeddingNotificationService.cs

@@ -1,25 +0,0 @@
-using System.Threading.Tasks;
-
-namespace _0_Framework.Application.FaceEmbedding;
-
-/// <summary>
-/// سرویس اطلاع‌رسانی تغییرات Face Embedding
-/// </summary>
-public interface IFaceEmbeddingNotificationService
-{
-    /// <summary>
-    /// اطلاع‌رسانی ایجاد یا به‌روزرسانی Embedding
-    /// </summary>
-    Task NotifyEmbeddingCreatedAsync(long workshopId, long employeeId, string employeeFullName);
-    
-    /// <summary>
-    /// اطلاع‌رسانی حذف Embedding
-    /// </summary>
-    Task NotifyEmbeddingDeletedAsync(long workshopId, long employeeId);
-    
-    /// <summary>
-    /// اطلاع‌رسانی بهبود Embedding
-    /// </summary>
-    Task NotifyEmbeddingRefinedAsync(long workshopId, long employeeId);
-}
-

0_Framework/Application/FaceEmbedding/IFaceEmbeddingService.cs

@@ -1,24 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-
-namespace _0_Framework.Application.FaceEmbedding;
-
-public interface IFaceEmbeddingService
-{
- Task<OperationResult> GenerateEmbeddingsAsync(long employeeId, long workshopId, string employeeFullName, string picture1Path, string picture2Path);
-    Task<OperationResult> GenerateEmbeddingsFromStreamAsync(long employeeId, long workshopId, string employeeFullName, Stream picture1Stream, Stream picture2Stream);
-    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);
-}
-
-public class FaceEmbeddingResponse
-{
-    public long EmployeeId { get; set; }
-    public long WorkshopId { get; set; }
-    public string EmployeeFullName { get; set; }
-    public float[] Embedding { get; set; }
-    public float Confidence { get; set; }
-    public Dictionary<string, object> Metadata { get; set; }
-}

0_Framework/Application/PaymentGateway/IPaymentGateway.cs

@@ -29,11 +29,9 @@ public class PaymentGatewayResponse
     public int? ErrorCode { get; set; }
 
     [JsonPropertyName("transid")]
-	public string Token { get; set; }
+    public string TransactionId { get; set; }
 
-    public bool IsSuccess { get; set; }
-
-    public string Message { get; set; }
+    public bool IsSuccess => Status == "success";
 }
 
 public class WalletAmountResponse
@@ -55,12 +53,10 @@ public class CreatePaymentGatewayRequest
     public string Mobile { get; set; }
     public string Email { get; set; }
     public string Description { get; set; }
-    public IDictionary<string, object> ExtraData { get; set; }
 }
 
 public class VerifyPaymentGateWayRequest
 {
-	public string DigitalReceipt { get; set; }
-	public string TransactionId { get; set; }
+    public string TransactionId { get; set; }
     public double Amount { get; set; }
 }

0_Framework/Application/PaymentGateway/SepehrPaymentGateway.cs

@@ -1,97 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Threading;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-
-namespace _0_Framework.Application.PaymentGateway;
-
-public class SepehrPaymentGateway:IPaymentGateway
-{
-	private readonly HttpClient _httpClient;
-	private const long TerminalId = 99213700;
-
-	public SepehrPaymentGateway(IHttpClientFactory httpClient)
-	{
-		_httpClient = httpClient.CreateClient();
-		_httpClient.BaseAddress = new Uri("https://sepehr.shaparak.ir/Rest/V1/PeymentApi/");
-
-
-	}
-
-	public async Task<PaymentGatewayResponse> Create(CreatePaymentGatewayRequest command, CancellationToken cancellationToken = default)
-	{
-		var extraData = JsonConvert.SerializeObject(command.ExtraData);
-		var res = await _httpClient.PostAsJsonAsync("GetToken", new
-		{
-			TerminalID = TerminalId,
-			Amount = command.Amount,
-			InvoiceID = command.InvoiceId,
-			callbackURL = command.CallBackUrl,
-			payload = extraData
-		}, cancellationToken: cancellationToken);
-		// خواندن محتوای پاسخ
-		var content = await res.Content.ReadAsStringAsync(cancellationToken);
-
-		// تبدیل پاسخ JSON به آبجکت دات‌نت
-		var json = System.Text.Json.JsonDocument.Parse(content);
-
-		// گرفتن مقدار AccessToken
-		var accessToken = json.RootElement.GetProperty("Accesstoken").ToString();
-		var status = json.RootElement.GetProperty("Status").ToString();
-
-		return new PaymentGatewayResponse
-		{
-			Status = status,
-			IsSuccess = status == "0",
-			Token = accessToken
-		};
-	}
-
-	public string GetStartPayUrl(string token)=>
-		$"https://sepehr.shaparak.ir/Payment/Pay?token={token}&terminalId={TerminalId}";
-
-	public async Task<PaymentGatewayResponse> Verify(VerifyPaymentGateWayRequest command, CancellationToken cancellationToken = default)
-	{
-		var res = await _httpClient.PostAsJsonAsync("Advice", new
-		{
-			digitalreceipt = command.DigitalReceipt,
-			Tid = TerminalId,
-		}, cancellationToken: cancellationToken);
-
-		// خواندن محتوای پاسخ
-		var content = await res.Content.ReadAsStringAsync(cancellationToken);
-
-		// تبدیل پاسخ JSON به آبجکت دات‌نت
-		var json = System.Text.Json.JsonDocument.Parse(content);
-
-
-		var message = json.RootElement.GetProperty("Message").GetString();
-		var status = json.RootElement.GetProperty("Status").GetString();
-		return new PaymentGatewayResponse
-		{
-			Status = status,
-			IsSuccess = status.ToLower() == "ok",
-			Message = message
-		};
-
-
-
-	}
-
-	public Task<PaymentGatewayResponse> CreateSandBox(CreatePaymentGatewayRequest command, CancellationToken cancellationToken = default)
-	{
-		throw new System.NotImplementedException();
-	}
-
-	public string GetStartPaySandBoxUrl(string transactionId)
-	{
-		throw new System.NotImplementedException();
-	}
-
-	public Task<WalletAmountResponse> GetWalletAmount(CancellationToken cancellationToken)
-	{
-		throw new System.NotImplementedException();
-	}
-}

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> SendInstitutionVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId);
     
     public Task<bool> SendInstitutionVerificationCode(string number, string code, string contractingPartyFullName,
         long contractingPartyId, long institutionContractId);

0_Framework/InfraStructure/FaceEmbeddingService.cs

@@ -1,346 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Net.Http.Json;
-using System.Text.Json;
-using _0_Framework.Application;
-using _0_Framework.Application.FaceEmbedding;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Http;
-using System.Threading.Tasks;
-
-namespace _0_Framework.Infrastructure;
-
-/// <summary>
-/// پیاده‌سازی سرویس ارتباط با API پایتون برای مدیریت Embeddings چهره
-/// </summary>
-public class FaceEmbeddingService : IFaceEmbeddingService
-{
-	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 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();
-
-			// 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 = "تصویر اول یافت نشد" };
-			}
-
-			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);
-
-			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);
-				}
-
-				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"
-			};
-		}
-	}
-
-	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();
-
-			// 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");
-
-			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);
-
-			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);
-
-				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"
-			};
-		}
-	}
-
-	public async Task<OperationResult> RefineEmbeddingAsync(long employeeId, long workshopId, float[] embedding,
-		float confidence, Dictionary<string, object> metadata = null)
-	{
-		try
-		{
-			var httpClient = _httpClientFactory.CreateClient();
-			httpClient.BaseAddress = new Uri(_apiBaseUrl);
-			httpClient.Timeout = TimeSpan.FromSeconds(30);
-
-			var requestBody = new
-			{
-				employeeId,
-				workshopId,
-				embedding,
-				confidence,
-				metadata = metadata ?? new Dictionary<string, object>()
-			};
-
-			var response = await httpClient.PostAsJsonAsync("embeddings/refine", requestBody);
-
-			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);
-
-				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> DeleteEmbeddingAsync(long employeeId, long workshopId)
-	{
-		try
-		{
-			var httpClient = _httpClientFactory.CreateClient();
-			httpClient.BaseAddress = new Uri(_apiBaseUrl);
-			httpClient.Timeout = TimeSpan.FromSeconds(30);
-
-			var response = await httpClient.DeleteAsync($"embeddings/{workshopId}/{employeeId}");
-
-			if (response.IsSuccessStatusCode)
-			{
-				_logger.LogInformation("Embedding deleted successfully for Employee {EmployeeId}", employeeId);
-				
-				// ارسال اطلاع‌رسانی به سایر سیستم‌ها
-				if (_notificationService != null)
-				{
-					await _notificationService.NotifyEmbeddingDeletedAsync(workshopId, employeeId);
-				}
-				
-				return new OperationResult { IsSuccedded = true, Message = "Embedding حذف شد" };
-			}
-			else
-			{
-				var errorContent = await response.Content.ReadAsStringAsync();
-				_logger.LogError("Failed to delete embedding. Status: {StatusCode}, Error: {Error}",
-								response.StatusCode, errorContent);
-
-				return new OperationResult
-				{
-					IsSuccedded = false,
-					Message = $"خطا در حذف Embedding: {response.StatusCode}"
-				};
-			}
-		}
-		catch (Exception ex)
-		{
-			_logger.LogError(ex, "Error while 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"
-			};
-		}
-	}
-}

0_Framework/InfraStructure/NullFaceEmbeddingNotificationService.cs

@@ -1,30 +0,0 @@
-using System.Threading.Tasks;
-using _0_Framework.Application.FaceEmbedding;
-
-namespace _0_Framework.InfraStructure;
-
-/// <summary>
-/// پیاده‌سازی پیش‌فرض (بدون عملیات) برای IFaceEmbeddingNotificationService
-/// این کلاس زمانی استفاده می‌شود که SignalR در دسترس نباشد
-/// </summary>
-public class NullFaceEmbeddingNotificationService : IFaceEmbeddingNotificationService
-{
-    public Task NotifyEmbeddingCreatedAsync(long workshopId, long employeeId, string employeeFullName)
-    {
-        // هیچ عملیاتی انجام نمی‌دهد
-        return Task.CompletedTask;
-    }
-
-    public Task NotifyEmbeddingDeletedAsync(long workshopId, long employeeId)
-    {
-        // هیچ عملیاتی انجام نمی‌دهد
-        return Task.CompletedTask;
-    }
-
-    public Task NotifyEmbeddingRefinedAsync(long workshopId, long employeeId)
-    {
-        // هیچ عملیاتی انجام نمی‌دهد
-        return Task.CompletedTask;
-    }
-}
-

ANDROID_SIGNALR_GUIDE.md

@@ -1,624 +0,0 @@
-# راهنمای اتصال اپلیکیشن Android به SignalR برای Face Embedding
-
-## 1. افزودن کتابخانه SignalR به پروژه Android
-
-در فایل `build.gradle` (Module: app) خود، dependency زیر را اضافه کنید:
-
-```gradle
-dependencies {
-    // SignalR for Android
-    implementation 'com.microsoft.signalr:signalr:7.0.0'
-    
-    // اگر از Kotlin استفاده می‌کنید:
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
-    
-    // برای JSON پردازش:
-    implementation 'com.google.code.gson:gson:2.10.1'
-}
-```
-
-## 2. اضافه کردن Permission در AndroidManifest.xml
-
-```xml
-<uses-permission android:name="android.permission.INTERNET" />
-<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-```
-
-## 3. کد Java/Kotlin برای اتصال به SignalR
-
-### نسخه Java:
-
-```java
-import com.microsoft.signalr.HubConnection;
-import com.microsoft.signalr.HubConnectionBuilder;
-import com.microsoft.signalr.HubConnectionState;
-import com.google.gson.JsonObject;
-import android.util.Log;
-
-public class FaceEmbeddingSignalRClient {
-    private static final String TAG = "FaceEmbeddingHub";
-    private HubConnection hubConnection;
-    private String serverUrl = "http://YOUR_SERVER_IP:PORT/trackingFaceEmbeddingHub"; // آدرس سرور خود را وارد کنید
-    private long workshopId;
-
-    public FaceEmbeddingSignalRClient(long workshopId) {
-        this.workshopId = workshopId;
-        initializeSignalR();
-    }
-
-    private void initializeSignalR() {
-        // ایجاد اتصال SignalR
-        hubConnection = HubConnectionBuilder
-                .create(serverUrl)
-                .build();
-
-        // دریافت رویداد ایجاد Embedding
-        hubConnection.on("EmbeddingCreated", (data) -> {
-            JsonObject jsonData = (JsonObject) data;
-            long employeeId = jsonData.get("employeeId").getAsLong();
-            String employeeFullName = jsonData.get("employeeFullName").getAsString();
-            String timestamp = jsonData.get("timestamp").getAsString();
-            
-            Log.d(TAG, "Embedding Created - Employee: " + employeeFullName + " (ID: " + employeeId + ")");
-            
-            // اینجا می‌توانید داده‌های جدید را از سرور بگیرید یا UI را بروزرسانی کنید
-            onEmbeddingCreated(employeeId, employeeFullName, timestamp);
-            
-        }, JsonObject.class);
-
-        // دریافت رویداد حذف Embedding
-        hubConnection.on("EmbeddingDeleted", (data) -> {
-            JsonObject jsonData = (JsonObject) data;
-            long employeeId = jsonData.get("employeeId").getAsLong();
-            String timestamp = jsonData.get("timestamp").getAsString();
-            
-            Log.d(TAG, "Embedding Deleted - Employee ID: " + employeeId);
-            onEmbeddingDeleted(employeeId, timestamp);
-            
-        }, JsonObject.class);
-
-        // دریافت رویداد بهبود Embedding
-        hubConnection.on("EmbeddingRefined", (data) -> {
-            JsonObject jsonData = (JsonObject) data;
-            long employeeId = jsonData.get("employeeId").getAsLong();
-            String timestamp = jsonData.get("timestamp").getAsString();
-            
-            Log.d(TAG, "Embedding Refined - Employee ID: " + employeeId);
-            onEmbeddingRefined(employeeId, timestamp);
-            
-        }, JsonObject.class);
-    }
-
-    public void connect() {
-        if (hubConnection.getConnectionState() == HubConnectionState.DISCONNECTED) {
-            hubConnection.start()
-                .doOnComplete(() -> {
-                    Log.d(TAG, "Connected to SignalR Hub");
-                    joinWorkshopGroup();
-                })
-                .doOnError(error -> {
-                    Log.e(TAG, "Error connecting to SignalR: " + error.getMessage());
-                })
-                .subscribe();
-        }
-    }
-
-    private void joinWorkshopGroup() {
-        // عضویت در گروه مخصوص این کارگاه
-        hubConnection.send("JoinWorkshopGroup", workshopId);
-        Log.d(TAG, "Joined workshop group: " + workshopId);
-    }
-
-    public void disconnect() {
-        if (hubConnection.getConnectionState() == HubConnectionState.CONNECTED) {
-            // خروج از گروه
-            hubConnection.send("LeaveWorkshopGroup", workshopId);
-            
-            hubConnection.stop();
-            Log.d(TAG, "Disconnected from SignalR Hub");
-        }
-    }
-
-    // این متدها را در Activity/Fragment خود override کنید
-    protected void onEmbeddingCreated(long employeeId, String employeeFullName, String timestamp) {
-        // اینجا UI را بروزرسانی کنید یا داده جدید را بگیرید
-    }
-
-    protected void onEmbeddingDeleted(long employeeId, String timestamp) {
-        // اینجا UI را بروزرسانی کنید
-    }
-
-    protected void onEmbeddingRefined(long employeeId, String timestamp) {
-        // اینجا UI را بروزرسانی کنید
-    }
-}
-```
-
-### نسخه Kotlin:
-
-```kotlin
-import com.microsoft.signalr.HubConnection
-import com.microsoft.signalr.HubConnectionBuilder
-import com.microsoft.signalr.HubConnectionState
-import com.google.gson.JsonObject
-import android.util.Log
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-
-class FaceEmbeddingSignalRClient(private val workshopId: Long) {
-    
-    companion object {
-        private const val TAG = "FaceEmbeddingHub"
-    }
-    
-    private lateinit var hubConnection: HubConnection
-    private val serverUrl = "http://YOUR_SERVER_IP:PORT/trackingFaceEmbeddingHub" // آدرس سرور خود را وارد کنید
-    
-    init {
-        initializeSignalR()
-    }
-    
-    private fun initializeSignalR() {
-        hubConnection = HubConnectionBuilder
-            .create(serverUrl)
-            .build()
-            
-        // دریافت رویداد ایجاد Embedding
-        hubConnection.on("EmbeddingCreated", { data: JsonObject ->
-            val employeeId = data.get("employeeId").asLong
-            val employeeFullName = data.get("employeeFullName").asString
-            val timestamp = data.get("timestamp").asString
-            
-            Log.d(TAG, "Embedding Created - Employee: $employeeFullName (ID: $employeeId)")
-            onEmbeddingCreated(employeeId, employeeFullName, timestamp)
-        }, JsonObject::class.java)
-        
-        // دریافت رویداد حذف Embedding
-        hubConnection.on("EmbeddingDeleted", { data: JsonObject ->
-            val employeeId = data.get("employeeId").asLong
-            val timestamp = data.get("timestamp").asString
-            
-            Log.d(TAG, "Embedding Deleted - Employee ID: $employeeId")
-            onEmbeddingDeleted(employeeId, timestamp)
-        }, JsonObject::class.java)
-        
-        // دریافت رویداد بهبود Embedding
-        hubConnection.on("EmbeddingRefined", { data: JsonObject ->
-            val employeeId = data.get("employeeId").asLong
-            val timestamp = data.get("timestamp").asString
-            
-            Log.d(TAG, "Embedding Refined - Employee ID: $employeeId")
-            onEmbeddingRefined(employeeId, timestamp)
-        }, JsonObject::class.java)
-    }
-    
-    fun connect() {
-        if (hubConnection.connectionState == HubConnectionState.DISCONNECTED) {
-            CoroutineScope(Dispatchers.IO).launch {
-                try {
-                    hubConnection.start().blockingAwait()
-                    Log.d(TAG, "Connected to SignalR Hub")
-                    joinWorkshopGroup()
-                } catch (e: Exception) {
-                    Log.e(TAG, "Error connecting to SignalR: ${e.message}")
-                }
-            }
-        }
-    }
-    
-    private fun joinWorkshopGroup() {
-        hubConnection.send("JoinWorkshopGroup", workshopId)
-        Log.d(TAG, "Joined workshop group: $workshopId")
-    }
-    
-    fun disconnect() {
-        if (hubConnection.connectionState == HubConnectionState.CONNECTED) {
-            hubConnection.send("LeaveWorkshopGroup", workshopId)
-            hubConnection.stop()
-            Log.d(TAG, "Disconnected from SignalR Hub")
-        }
-    }
-    
-    // این متدها را override کنید
-    open fun onEmbeddingCreated(employeeId: Long, employeeFullName: String, timestamp: String) {
-        // اینجا UI را بروزرسانی کنید یا داده جدید را بگیرید
-    }
-    
-    open fun onEmbeddingDeleted(employeeId: Long, timestamp: String) {
-        // اینجا UI را بروزرسانی کنید
-    }
-    
-    open fun onEmbeddingRefined(employeeId: Long, timestamp: String) {
-        // اینجا UI را بروزرسانی کنید
-    }
-}
-```
-
-## 4. استفاده در Activity یا Fragment
-
-### مثال با Login و دریافت WorkshopId
-
-#### Java:
-```java
-public class LoginActivity extends AppCompatActivity {
-    
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_login);
-        
-        Button btnLogin = findViewById(R.id.btnLogin);
-        btnLogin.setOnClickListener(v -> performLogin());
-    }
-    
-    private void performLogin() {
-        // فراخوانی API لاگین
-        // فرض کنید response شامل workshopId است
-        
-        // مثال ساده (باید از Retrofit یا کتابخانه مشابه استفاده کنید):
-        // LoginResponse response = apiService.login(username, password);
-        // long workshopId = response.getWorkshopId();
-        
-        long workshopId = 123; // این را از response دریافت کنید
-        
-        // ذخیره workshopId
-        SharedPreferences prefs = getSharedPreferences("AppPrefs", MODE_PRIVATE);
-        prefs.edit().putLong("workshopId", workshopId).apply();
-        
-        // رفتن به صفحه اصلی
-        Intent intent = new Intent(this, MainActivity.class);
-        startActivity(intent);
-        finish();
-    }
-}
-
-public class MainActivity extends AppCompatActivity {
-    private FaceEmbeddingSignalRClient signalRClient;
-    
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        
-        // دریافت workshopId از SharedPreferences
-        SharedPreferences prefs = getSharedPreferences("AppPrefs", MODE_PRIVATE);
-        long workshopId = prefs.getLong("workshopId", 0);
-        
-        if (workshopId == 0) {
-            // اگر workshopId وجود نداره، برگرد به صفحه لاگین
-            Intent intent = new Intent(this, LoginActivity.class);
-            startActivity(intent);
-            finish();
-            return;
-        }
-        
-        // ایجاد و اتصال SignalR
-        signalRClient = new FaceEmbeddingSignalRClient(workshopId) {
-            @Override
-            protected void onEmbeddingCreated(long employeeId, String employeeFullName, String timestamp) {
-                runOnUiThread(() -> {
-                    // بروزرسانی UI
-                    Toast.makeText(MainActivity.this, 
-                        "Embedding ایجاد شد برای: " + employeeFullName, 
-                        Toast.LENGTH_SHORT).show();
-                    
-                    // دریافت داده‌های جدید از API
-                    refreshEmployeeList();
-                });
-            }
-            
-            @Override
-            protected void onEmbeddingDeleted(long employeeId, String timestamp) {
-                runOnUiThread(() -> {
-                    // بروزرسانی UI
-                    refreshEmployeeList();
-                });
-            }
-            
-            @Override
-            protected void onEmbeddingRefined(long employeeId, String timestamp) {
-                runOnUiThread(() -> {
-                    // بروزرسانی UI
-                    refreshEmployeeList();
-                });
-            }
-        };
-        
-        signalRClient.connect();
-    }
-    
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        if (signalRClient != null) {
-            signalRClient.disconnect();
-        }
-    }
-    
-    private void refreshEmployeeList() {
-        // دریافت لیست جدید کارمندان از API
-    }
-}
-```
-
-#### Kotlin:
-```kotlin
-class LoginActivity : AppCompatActivity() {
-    
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_login)
-        
-        val btnLogin = findViewById<Button>(R.id.btnLogin)
-        btnLogin.setOnClickListener { performLogin() }
-    }
-    
-    private fun performLogin() {
-        // فراخوانی API لاگین
-        // فرض کنید response شامل workshopId است
-        
-        // مثال ساده (باید از Retrofit یا کتابخانه مشابه استفاده کنید):
-        // val response = apiService.login(username, password)
-        // val workshopId = response.workshopId
-        
-        val workshopId = 123L // این را از response دریافت کنید
-        
-        // ذخیره workshopId
-        val prefs = getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
-        prefs.edit().putLong("workshopId", workshopId).apply()
-        
-        // رفتن به صفحه اصلی
-        val intent = Intent(this, MainActivity::class.java)
-        startActivity(intent)
-        finish()
-    }
-}
-
-class MainActivity : AppCompatActivity() {
-    private lateinit var signalRClient: FaceEmbeddingSignalRClient
-    
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        
-        // دریافت workshopId از SharedPreferences
-        val prefs = getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
-        val workshopId = prefs.getLong("workshopId", 0L)
-        
-        if (workshopId == 0L) {
-            // اگر workshopId وجود نداره، برگرد به صفحه لاگین
-            val intent = Intent(this, LoginActivity::class.java)
-            startActivity(intent)
-            finish()
-            return
-        }
-        
-        // ایجاد و اتصال SignalR
-        signalRClient = object : FaceEmbeddingSignalRClient(workshopId) {
-            override fun onEmbeddingCreated(employeeId: Long, employeeFullName: String, timestamp: String) {
-                runOnUiThread {
-                    // بروزرسانی UI
-                    Toast.makeText(this@MainActivity, 
-                        "Embedding ایجاد شد برای: $employeeFullName", 
-                        Toast.LENGTH_SHORT).show()
-                    
-                    // دریافت داده‌های جدید از API
-                    refreshEmployeeList()
-                }
-            }
-            
-            override fun onEmbeddingDeleted(employeeId: Long, timestamp: String) {
-                runOnUiThread {
-                    // بروزرسانی UI
-                    refreshEmployeeList()
-                }
-            }
-            
-            override fun onEmbeddingRefined(employeeId: Long, timestamp: String) {
-                runOnUiThread {
-                    // بروزرسانی UI
-                    refreshEmployeeList()
-                }
-            }
-        }
-        
-        signalRClient.connect()
-    }
-    
-    override fun onDestroy() {
-        super.onDestroy()
-        signalRClient.disconnect()
-    }
-    
-    private fun refreshEmployeeList() {
-        // دریافت لیست جدید کارمندان از API
-    }
-}
-```
-
-### مثال ساده بدون Login:
-اگر workshopId را از قبل می‌دانید:
-
-#### Java:
-```java
-public class MainActivity extends AppCompatActivity {
-    private FaceEmbeddingSignalRClient signalRClient;
-    
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        
-        long workshopId = 123; // شناسه کارگاه خود را وارد کنید
-        
-        signalRClient = new FaceEmbeddingSignalRClient(workshopId) {
-            @Override
-            protected void onEmbeddingCreated(long employeeId, String employeeFullName, String timestamp) {
-                runOnUiThread(() -> {
-                    // بروزرسانی UI
-                    Toast.makeText(MainActivity.this, 
-                        "Embedding ایجاد شد برای: " + employeeFullName, 
-                        Toast.LENGTH_SHORT).show();
-                    
-                    // دریافت داده‌های جدید از API
-                    refreshEmployeeList();
-                });
-            }
-            
-            @Override
-            protected void onEmbeddingDeleted(long employeeId, String timestamp) {
-                runOnUiThread(() -> {
-                    // بروزرسانی UI
-                    refreshEmployeeList();
-                });
-            }
-        };
-        
-        signalRClient.connect();
-    }
-    
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        if (signalRClient != null) {
-            signalRClient.disconnect();
-        }
-    }
-    
-    private void refreshEmployeeList() {
-        // دریافت لیست جدید کارمندان از API
-    }
-}
-```
-
-#### Kotlin:
-```kotlin
-class MainActivity : AppCompatActivity() {
-    private lateinit var signalRClient: FaceEmbeddingSignalRClient
-    
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        
-        val workshopId = 123L // شناسه کارگاه خود را وارد کنید
-        
-        signalRClient = object : FaceEmbeddingSignalRClient(workshopId) {
-            override fun onEmbeddingCreated(employeeId: Long, employeeFullName: String, timestamp: String) {
-                runOnUiThread {
-                    // بروزرسانی UI
-                    Toast.makeText(this@MainActivity, 
-                        "Embedding ایجاد شد برای: $employeeFullName", 
-                        Toast.LENGTH_SHORT).show()
-                    
-                    // دریافت داده‌های جدید از API
-                    refreshEmployeeList()
-                }
-            }
-            
-            override fun onEmbeddingDeleted(employeeId: Long, timestamp: String) {
-                runOnUiThread {
-                    // بروزرسانی UI
-                    refreshEmployeeList()
-                }
-            }
-        }
-        
-        signalRClient.connect()
-    }
-    
-    override fun onDestroy() {
-        super.onDestroy()
-        signalRClient.disconnect()
-    }
-    
-    private fun refreshEmployeeList() {
-        // دریافت لیست جدید کارمندان از API
-    }
-}
-```
-
-## 5. نکات مهم
-
-### آدرس سرور
-- اگر روی شبیه‌ساز اندروید تست می‌کنید و سرور روی localhost اجرا می‌شود، از آدرس `http://10.0.2.2:PORT` استفاده کنید
-- اگر روی دستگاه فیزیکی تست می‌کنید، از آدرس IP شبکه محلی سرور استفاده کنید (مثل `http://192.168.1.100:PORT`)
-- PORT پیش‌فرض معمولاً 5000 یا 5001 است (بسته به کانفیگ پروژه شما)
-
-### دریافت WorkshopId از Login
-بعد از login موفق، workshopId را از سرور دریافت کنید و در SharedPreferences یا یک Singleton ذخیره کنید:
-
-```java
-// بعد از login موفق
-SharedPreferences prefs = getSharedPreferences("AppPrefs", MODE_PRIVATE);
-prefs.edit().putLong("workshopId", workshopId).apply();
-
-// استفاده در Activity
-long workshopId = prefs.getLong("workshopId", 0);
-```
-
-یا در Kotlin:
-
-```kotlin
-// بعد از login موفق
-val prefs = getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
-prefs.edit().putLong("workshopId", workshopId).apply()
-
-// استفاده در Activity
-val workshopId = prefs.getLong("workshopId", 0L)
-```
-
-### مدیریت اتصال
-برای reconnection خودکار:
-
-```java
-hubConnection.onClosed(exception -> {
-    Log.e(TAG, "Connection closed. Attempting to reconnect...");
-    new Handler().postDelayed(() -> connect(), 5000); // تلاش مجدد بعد از 5 ثانیه
-});
-```
-
-### Thread Safety
-همیشه UI updates را در main thread انجام دهید:
-
-```java
-runOnUiThread(() -> {
-    // UI updates here
-});
-```
-
-## 6. تست اتصال
-
-برای تست می‌توانید:
-1. اپلیکیشن را اجرا کنید
-2. از طریق Postman یا Swagger یک Embedding ایجاد کنید
-3. باید در Logcat پیام "Embedding Created" را ببینید
-
-## 7. خطایابی (Debugging)
-
-برای دیدن جزئیات بیشتر:
-
-```java
-hubConnection = HubConnectionBuilder
-    .create(serverUrl)
-    .withHttpConnectionOptions(options -> {
-        options.setLogging(LogLevel.TRACE);
-    })
-    .build();
-```
-
----
-
-## خلاصه Endpoints
-
-| نوع رویداد | متد SignalR | پارامترهای دریافتی |
-|-----------|-------------|---------------------|
-| ایجاد Embedding | `EmbeddingCreated` | workshopId, employeeId, employeeFullName, timestamp |
-| حذف Embedding | `EmbeddingDeleted` | workshopId, employeeId, timestamp |
-| بهبود Embedding | `EmbeddingRefined` | workshopId, employeeId, timestamp |
-
-| متد ارسالی | پارامتر | توضیحات |
-|-----------|---------|---------|
-| `JoinWorkshopGroup` | workshopId | عضویت در گروه کارگاه |
-| `LeaveWorkshopGroup` | workshopId | خروج از گروه کارگاه |
-

AccountManagement.Application.Contracts/Account/IAccountApplication.cs

@@ -66,11 +66,4 @@ public interface IAccountApplication
     public bool CheckExistClientAccount(string userName);
     List<AccountViewModel> GetAdminAccountsNew();
 
-    void CameraLogin(CameraLoginRequest request);
-}
-
-public class CameraLoginRequest
-{
-    public string UserName { get; set; }
-    public string Password { get; set; }
 }

AccountManagement.Application/AccountApplication.cs

@@ -18,7 +18,6 @@ using Microsoft.AspNetCore.Mvc.Rendering;
 using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
 using Company.Domain.WorkshopAgg;
 using System.Security.Claims;
-using _0_Framework.Exceptions;
 using AccountManagement.Domain.PositionAgg;
 using AccountManagement.Domain.SubAccountAgg;
 using AccountManagement.Domain.SubAccountPermissionSubtitle1Agg;
@@ -804,29 +803,4 @@ public class AccountApplication : IAccountApplication
     {
         return _accountRepository.GetAdminAccountsNew();
     }
-
-    public void CameraLogin(CameraLoginRequest request)
-    {
-        var cameraAccount = _cameraAccountRepository.GetBy(request.UserName);
-
-        if (cameraAccount == null)
-        {
-            throw new BadRequestException(ApplicationMessages.WrongUserPass);
-        }
-
-        (bool Verified, bool NeedUpgrade) result = _passwordHasher.Check(cameraAccount.Password, request.Password);
-        
-        if (!result.Verified)
-            throw new BadRequestException(ApplicationMessages.WrongUserPass);
-
-        var mobile = string.IsNullOrWhiteSpace(cameraAccount.Mobile) ? " " : cameraAccount.Mobile;
-        
-        var authViewModel = new CameraAuthViewModel(cameraAccount.id, cameraAccount.WorkshopId,
-            cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId,
-            cameraAccount.IsActiveSting);
-        if (cameraAccount.IsActiveSting != "true")
-            throw new BadRequestException(ApplicationMessages.WrongUserPass);
-
-        _authHelper.CameraSignIn(authViewModel);
-    }
 }

Company.Domain/AndroidApkVersionAgg/AndroidApkVersion.cs

@@ -1,7 +1,6 @@
 using System;
 using _0_Framework.Application;
 using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.AndroidApkVersion;
 
 namespace Company.Domain.AndroidApkVersionAgg;
 
@@ -9,17 +8,14 @@ public class AndroidApkVersion:EntityBase
 {
     private AndroidApkVersion () { }
 
-    public AndroidApkVersion( string versionName,string versionCode, IsActive isActive, string path, ApkType apkType, bool isForce = false)
+    public AndroidApkVersion( string versionName,string versionCode, IsActive isActive, string path)
     {
         
         VersionName = versionName;
         VersionCode = versionCode;
         IsActive = isActive;
         Path = path;
-        ApkType = apkType;
-        IsForce = isForce;
-        var appName = apkType == ApkType.WebView ? "Gozareshgir-WebView" : "Gozareshgir-FaceDetection";
-        Title = $"{appName}-{versionName}-{CreationDate:g}";
+        Title = $"Gozareshgir-{versionName}-{CreationDate:g}";
     }
 
     public string Title { get; private set; }
@@ -27,9 +23,6 @@ public class AndroidApkVersion:EntityBase
     public string VersionCode{ get; private set; }
     public IsActive IsActive { get; private set; }
     public string Path { get; set; }
-    public ApkType ApkType { get; private set; }
-    public bool IsForce { get; private set; }
-    
 
     public void Active()
     {
@@ -40,4 +33,4 @@ public class AndroidApkVersion:EntityBase
     {
         IsActive = IsActive.False;
     }
-}
+}

Company.Domain/AndroidApkVersionAgg/IAndroidApkVersionRepository.cs

@@ -1,14 +1,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using _0_Framework_b.Domain;
-using CompanyManagment.App.Contracts.AndroidApkVersion;
 
 namespace Company.Domain.AndroidApkVersionAgg;
 
 public interface IAndroidApkVersionRepository:IRepository<long,AndroidApkVersion>
 {
-    IQueryable<AndroidApkVersion> GetActives(ApkType apkType);
-    AndroidApkVersion GetLatestActive(ApkType apkType);
+    IQueryable<AndroidApkVersion> GetActives();
     void Remove(AndroidApkVersion entity);
-    System.Threading.Tasks.Task<string> GetLatestActiveVersionPath(ApkType apkType);
+    System.Threading.Tasks.Task<string> GetLatestActiveVersionPath();
 }

Company.Domain/CheckoutAgg/Checkout.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Security.AccessControl;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
@@ -13,25 +12,25 @@ namespace Company.Domain.CheckoutAgg;
 
 public class Checkout : EntityBase
 {
-    public Checkout()
-    {
-    }
-
+	private Checkout()
+	{
+	
+	}
     public Checkout(string employeeFullName, string fathersName, string nationalCode, string dateOfBirth,
         long employeeId, string workshopName, long workshopId, string contractNo, DateTime contractStart,
-        DateTime contractEnd, string month, string year, long contractId, long workingHoursId,
+        DateTime contractEnd, string month, string year, long contractId, long workingHoursId, 
         double monthlySalary, double baseYearsPay, double consumableItems, double housingAllowance,
         double overtimePay, double nightworkPay, double fridayPay, double missionPay, double shiftPay,
         double familyAllowance, double bonusesPay, double yearsPay, double leavePay,
         double insuranceDeduction, double taxDeducation, double installmentDeduction,
         double salaryAidDeduction, double absenceDeduction, string sumOfWorkingDays
-        , string archiveCode, string personnelCode,
+        , string archiveCode, string personnelCode, 
         string totalClaims, string totalDeductions, double totalPayment, string signature, double marriedAllowance, bool leaveCheckout,
         double creditLeaves, double absencePeriod, double averageHoursPerDay, bool hasRollCall, string overTimeWorkvalue,
         string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue,
         string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute,
         ICollection<CheckoutLoanInstallment> loanInstallments,
-        ICollection<CheckoutSalaryAid> salaryAids, CheckoutRollCall checkoutRollCall, TimeSpan employeeMandatoryHours, bool hasInsuranceShareTheSameAsList)
+        ICollection<CheckoutSalaryAid> salaryAids,CheckoutRollCall checkoutRollCall,TimeSpan employeeMandatoryHours)
     {
         EmployeeFullName = employeeFullName;
         FathersName = fathersName;
@@ -92,7 +91,6 @@ public class Checkout : EntityBase
         SalaryAids = salaryAids;
         CheckoutRollCall = checkoutRollCall;
         EmployeeMandatoryHours = employeeMandatoryHours;
-        HasInsuranceShareTheSameAsList = hasInsuranceShareTheSameAsList;
     }
 
 
@@ -101,7 +99,7 @@ public class Checkout : EntityBase
     public string Signature { get; private set; }
     public string FathersName { get; private set; }
     public string NationalCode { get; private set; }
-    public string DateOfBirth { get; private set; }
+    public string DateOfBirth { get; private set; } 
     public long EmployeeId { get; private set; }
 
     public string WorkshopName { get; private set; }
@@ -137,7 +135,7 @@ public class Checkout : EntityBase
     public double SalaryAidDeduction { get; private set; }
 
     public double AbsenceDeduction { get; private set; }
-
+    
     public string SumOfWorkingDays { get; private set; }
     public string ArchiveCode { get; private set; }
     public string PersonnelCode { get; private set; }
@@ -159,70 +157,58 @@ public class Checkout : EntityBase
     //میانگین ساعت کار در یک روز
     public double AverageHoursPerDay { get; private set; }
     public bool HasRollCall { get; private set; }
-    /// <summary>
-    /// مقدار اضافه کار
-    /// </summary>
+   /// <summary>
+   /// مقدار اضافه کار
+   /// </summary>
     public string OverTimeWorkValue { get; private set; }
-
-    /// <summary>
-    /// مقدار شبکاری
-    /// </summary>
+   
+   /// <summary>
+   /// مقدار شبکاری
+   /// </summary>
     public string OverNightWorkValue { get; private set; }
-
-    /// <summary>
-    /// مقدار جمعه کاری
-    /// </summary>
-    public string FridayWorkValue { get; private set; }
-
-    /// <summary>
-    /// درصد نوبت کاری
-    /// </summary>
-    public string RotatingShiftValue { get; private set; }
-
-    /// <summary>
+ 
+   /// <summary>
+   /// مقدار جمعه کاری
+   /// </summary>
+   public string FridayWorkValue { get; private set; }
+ 
+   /// <summary>
+   /// درصد نوبت کاری
+   /// </summary>
+   public string RotatingShiftValue { get; private set; }
+    
+   /// <summary>
     /// مقدار غیبت  
     /// </summary>
-    public string AbsenceValue { get; private set; }
+   public string AbsenceValue { get; private set; }
 
-    /// <summary>
-    /// تعداد روزهای محاسبه شده برای مزد مرخصی
-    /// </summary>
-    public string TotalDayOfLeaveCompute { get; private set; }
-    /// <summary>
-    /// تعداد روزهای محاسبه شده برای سنوات
-    /// </summary>
-    public string TotalDayOfYearsCompute { get; private set; }
-    /// <summary>
-    /// تعداد روزهای محاسبه شده برای عیدی و پاداش
-    /// </summary>
-    public string TotalDayOfBunosesCompute { get; private set; }
+   /// <summary>
+   /// تعداد روزهای محاسبه شده برای مزد مرخصی
+   /// </summary>
+   public string TotalDayOfLeaveCompute { get; private set; }
+   /// <summary>
+   /// تعداد روزهای محاسبه شده برای سنوات
+   /// </summary>
+   public string TotalDayOfYearsCompute { get; private set; }
+   /// <summary>
+   /// تعداد روزهای محاسبه شده برای عیدی و پاداش
+   /// </summary>
+   public string TotalDayOfBunosesCompute { get; private set; }
 
-    /// <summary>
-    /// دارای تداخل مبلغ است. این در زمانی اتفاق می افتد که فیش مبلغ آن تغییر کرده ولی به دلیل مسائل قانونی امکان صدور دوباره آن وجود ندارد
-    /// </summary>
-    public bool HasAmountConflict { get; private set; }
+   /// <summary>
+   /// دارای تداخل مبلغ است. این در زمانی اتفاق می افتد که فیش مبلغ آن تغییر کرده ولی به دلیل مسائل قانونی امکان صدور دوباره آن وجود ندارد
+   /// </summary>
+   public bool HasAmountConflict { get; private set; }
 
-    /// <summary>
-    /// ساعت موظفی پرسنل در ماه
-    /// </summary>
+   /// <summary>
+   /// ساعت موظفی پرسنل در ماه
+   /// </summary>
     public TimeSpan EmployeeMandatoryHours { get; set; }
+   
+   #region valueObjects
 
-    /// <summary>
-    /// آیا حق بیمه مشابه لیست بیمه حساب شده؟
-    /// </summary>
-    public bool HasInsuranceShareTheSameAsList { get; private set; }
-
-    /// <summary>
-    /// آیا فیش  نیاز به بروزرسانی دارد
-    /// </summary>
-    public bool IsUpdateNeeded { get; private set; }
-
-    public List<CheckoutWarningMessage> CheckoutWarningMessageList { get; set; }
-
-    #region valueObjects
-
-    public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
-    public ICollection<CheckoutSalaryAid> SalaryAids { get; set; } = [];
+   public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
+   public ICollection<CheckoutSalaryAid> SalaryAids { get; set; } = [];
     public CheckoutRollCall CheckoutRollCall { get; private set; }
     #endregion
 
@@ -291,7 +277,7 @@ public class Checkout : EntityBase
         var year = contarctStart.ToFarsiYear();
         var sumYear = year.Substring(Math.Max(0, year.Length - 2));
 
-
+          
         ContractNo = archiveCode + "/" + personnelCode + "/" + sumYear + "/" + month;
     }
     public void Active()
@@ -326,7 +312,7 @@ public class Checkout : EntityBase
     }
 
 
-    public void SetSalaryAid(ICollection<CheckoutSalaryAid> salaryAids, double salaryAidAmount)
+    public void SetSalaryAid(ICollection<CheckoutSalaryAid> salaryAids,double salaryAidAmount)
     {
         SalaryAids = salaryAids;
         SalaryAidDeduction = salaryAidAmount;
@@ -344,45 +330,30 @@ public class Checkout : EntityBase
 
     public void SetAmountConflict(bool hasAmountConflict)
     {
-        HasAmountConflict = hasAmountConflict;
+	    HasAmountConflict = hasAmountConflict;
     }
 
     public void SetEmployeeMandatoryHours(TimeSpan employeeMandatoryHours)
     {
         EmployeeMandatoryHours = employeeMandatoryHours;
     }
-
-    public void SetInsuranceShare()
-    {
-        HasInsuranceShareTheSameAsList = true;
-    }
-
-    /// <summary>
-    /// نیاز به آپدیت 
-    /// </summary>
-    public void SetUpdateNeeded()
-    {
-        IsUpdateNeeded = true;
-    }
-
-
 }
 
 public class CheckoutRollCall
 {
-    private CheckoutRollCall() { }
-    public CheckoutRollCall(TimeSpan totalMandatoryTimeSpan, TimeSpan totalPresentTimeSpan, TimeSpan totalBreakTimeSpan,
-        TimeSpan totalWorkingTimeSpan, TimeSpan totalPaidLeaveTmeSpan, TimeSpan totalSickLeaveTimeSpan,
-        ICollection<CheckoutRollCallDay> rollCallDaysCollection)
-    {
-        TotalMandatoryTimeSpan = totalMandatoryTimeSpan;
-        TotalPresentTimeSpan = totalPresentTimeSpan;
-        TotalBreakTimeSpan = totalBreakTimeSpan;
-        TotalWorkingTimeSpan = totalWorkingTimeSpan;
-        TotalPaidLeaveTmeSpan = totalPaidLeaveTmeSpan;
-        TotalSickLeaveTimeSpan = totalSickLeaveTimeSpan;
-        RollCallDaysCollection = rollCallDaysCollection;
-    }
+    private CheckoutRollCall(){}
+	public CheckoutRollCall(TimeSpan totalMandatoryTimeSpan, TimeSpan totalPresentTimeSpan, TimeSpan totalBreakTimeSpan,
+		TimeSpan totalWorkingTimeSpan, TimeSpan totalPaidLeaveTmeSpan, TimeSpan totalSickLeaveTimeSpan,
+		ICollection<CheckoutRollCallDay> rollCallDaysCollection)
+	{
+		TotalMandatoryTimeSpan = totalMandatoryTimeSpan;
+		TotalPresentTimeSpan = totalPresentTimeSpan;
+		TotalBreakTimeSpan = totalBreakTimeSpan;
+		TotalWorkingTimeSpan = totalWorkingTimeSpan;
+		TotalPaidLeaveTmeSpan = totalPaidLeaveTmeSpan;
+		TotalSickLeaveTimeSpan = totalSickLeaveTimeSpan;
+		RollCallDaysCollection = rollCallDaysCollection;
+	}
 
 
     /// <summary>
@@ -423,27 +394,27 @@ public class CheckoutRollCall
 
 public class CheckoutRollCallDay
 {
-    private CheckoutRollCallDay() { }
-    public CheckoutRollCallDay(DateTime date, string firstStartDate, string firstEndDate,
-        string secondStartDate, string secondEndDate, TimeSpan breakTimeSpan,
-        bool isSliced, TimeSpan workingTimeSpan, bool isAbsent, bool isFriday,
-        bool isHoliday, string leaveType)
-    {
-        Date = date;
-        FirstStartDate = firstStartDate;
-        FirstEndDate = firstEndDate;
-        SecondStartDate = secondStartDate;
-        SecondEndDate = secondEndDate;
-        BreakTimeSpan = breakTimeSpan;
-        IsSliced = isSliced;
-        WorkingTimeSpan = workingTimeSpan;
-        IsAbsent = isAbsent;
-        IsFriday = isFriday;
-        IsHoliday = isHoliday;
-        LeaveType = leaveType;
-    }
+    private CheckoutRollCallDay(){}
+	public CheckoutRollCallDay(DateTime date, string firstStartDate, string firstEndDate,
+		string secondStartDate, string secondEndDate, TimeSpan breakTimeSpan,
+		bool isSliced, TimeSpan workingTimeSpan, bool isAbsent, bool isFriday,
+		bool isHoliday, string leaveType)
+	{
+		Date = date;
+		FirstStartDate = firstStartDate;
+		FirstEndDate = firstEndDate;
+		SecondStartDate = secondStartDate;
+		SecondEndDate = secondEndDate;
+		BreakTimeSpan = breakTimeSpan;
+		IsSliced = isSliced;
+		WorkingTimeSpan = workingTimeSpan;
+		IsAbsent = isAbsent;
+		IsFriday = isFriday;
+		IsHoliday = isHoliday;
+		LeaveType = leaveType;
+	}
 
-    public long Id { get; set; }
+	public long Id { get; set; }
 
     /// <summary>
     /// تاریخ
@@ -487,12 +458,12 @@ public class CheckoutRollCallDay
     /// <summary>
     /// آیا غیبت است
     /// </summary>
-	public bool IsAbsent { get; private set; }
+	public bool IsAbsent { get; private set; }  
 
     /// <summary>
     /// آیا جمعه است
     /// </summary>
-    public bool IsFriday { get; private set; }
+	public bool IsFriday { get; private set; }
 
     /// <summary>
     /// آیا تعطیل رسمی است
@@ -504,6 +475,6 @@ public class CheckoutRollCallDay
     /// </summary>
 	public string LeaveType { get; private set; }
 
-    public long CheckoutId { get; set; }
+	public long CheckoutId { get; set; }
 
 }

Company.Domain/CheckoutAgg/CheckoutWarningMessage.cs

@@ -1,32 +0,0 @@
-using _0_Framework.Application.Enums;
-using _0_Framework.Domain;
-
-namespace Company.Domain.CheckoutAgg;
-
-public class CheckoutWarningMessage : EntityBaseWithoutCreationDate
-{
-    public CheckoutWarningMessage(string warningMessage, long checkoutId, TypeOfCheckoutWarning typeOfCheckoutWarning)
-    {
-        WarningMessage = warningMessage;
-        CheckoutId = checkoutId;
-        TypeOfCheckoutWarning = typeOfCheckoutWarning;
-    }
-
-    /// <summary>
-    /// پیام هشدار
-    /// </summary>
-    public string WarningMessage { get; private set; }
-
-
-    /// <summary>
-    /// آی دی فیش حقوقی
-    /// </summary>
-    public long CheckoutId { get; private set; }
-
-    /// <summary>
-    /// نوع هشدار فیش حقوقی
-    /// </summary>
-    public TypeOfCheckoutWarning TypeOfCheckoutWarning { get; private set; }
-
-    public Checkout Checkout { get; set; }
-}

Company.Domain/EmployeeAgg/IEmployeeRepository.cs

@@ -79,4 +79,5 @@ public interface IEmployeeRepository : IRepository<long, Employee>
 	#endregion
 
 
+	Task<List<EmployeeSelectListViewModel>> GetWorkingEmployeesSelectList(long workshopId);
 }

Company.Domain/EmployeeFaceEmbeddingAgg/EmployeeFaceEmbedding.cs

@@ -1,189 +0,0 @@
-using System;
-using System.Collections.Generic;
-using MongoDB.Bson;
-using MongoDB.Bson.Serialization.Attributes;
-
-namespace Company.Domain.EmployeeFaceEmbeddingAgg;
-
-public class EmployeeFaceEmbedding
-    {
-        public EmployeeFaceEmbedding()
-        {
-            EmbeddingHistory = new List<EmbeddingHistoryItem>();
-            MetadataHistory = new List<MetadataHistoryItem>();
-        }
-
-        public EmployeeFaceEmbedding(string employeeFullName, long employeeId, long workshopId, 
-            List<double> embeddings, EmployeeFaceEmbeddingMetadata metadata)
-        {
-            Id = Guid.NewGuid().ToString();
-            EmployeeFullName = employeeFullName;
-            EmployeeId = employeeId;
-            WorkshopId = workshopId;
-            Embeddings = embeddings;
-            Metadata = metadata;
-            EmbeddingHistory = new List<EmbeddingHistoryItem>();
-            MetadataHistory = new List<MetadataHistoryItem>();
-            CreatedAt = DateTime.UtcNow;
-            UpdatedAt = DateTime.UtcNow;
-        }
-
-        [BsonId]
-        [BsonRepresentation(BsonType.String)]
-        public string Id { get; set; }
-
-        [BsonElement("employeeFullName")]
-        public string EmployeeFullName { get; set; }
-        
-        [BsonElement("employeeId")]
-        public long EmployeeId { get; set; }
-        
-        [BsonElement("workshopId")]
-        public long WorkshopId { get; set; }
-
-        [BsonElement("embeddings")]
-        public List<double> Embeddings { get; set; }
-        
-        [BsonElement("metadata")]
-        public EmployeeFaceEmbeddingMetadata Metadata { get; set; }
-
-        [BsonElement("embeddingHistory")]
-        public List<EmbeddingHistoryItem> EmbeddingHistory { get; set; }
-        
-        [BsonElement("metadataHistory")]
-        public List<MetadataHistoryItem> MetadataHistory { get; set; }
-
-        [BsonElement("createdAt")]
-        public DateTime CreatedAt { get; set; }
-        
-        [BsonElement("updatedAt")]
-        public DateTime UpdatedAt { get; set; }
-
-        public void UpdateEmbedding(List<double> newEmbedding, double confidence, double refinementPercentage)
-        {
-            if (Embeddings != null)
-            {
-                EmbeddingHistory.Add(new EmbeddingHistoryItem
-                {
-                    Embedding = new List<double>(Embeddings),
-                    Timestamp = DateTime.UtcNow,
-                    Confidence = confidence,
-                    RefinementPercentage = refinementPercentage
-                });
-            }
-
-            Embeddings = newEmbedding;
-            UpdatedAt = DateTime.UtcNow;
-        }
-
-        public void UpdateMetadata(EmployeeFaceEmbeddingMetadata newMetadata, double confidence, double refinementPercentage)
-        {
-            if (Metadata != null)
-            {
-                MetadataHistory.Add(new MetadataHistoryItem
-                {
-                    Metadata = Metadata,
-                    Timestamp = DateTime.UtcNow,
-                    Confidence = confidence,
-                    RefinementPercentage = refinementPercentage
-                });
-            }
-
-            Metadata = newMetadata;
-            UpdatedAt = DateTime.UtcNow;
-        }
-
-        public void UpdateEmployeeInfo(string employeeFullName, long workshopId)
-        {
-            EmployeeFullName = employeeFullName;
-            WorkshopId = workshopId;
-            UpdatedAt = DateTime.UtcNow;
-        }
-    }
-
-    public class EmployeeFaceEmbeddingMetadata
-    {
-        [BsonElement("avg_eye_distance_normalized")]
-        public double AvgEyeDistanceNormalized { get; set; }
-
-        [BsonElement("avg_eye_to_face_ratio")]
-        public double AvgEyeToFaceRatio { get; set; }
-
-        [BsonElement("avg_face_aspect_ratio")]
-        public double AvgFaceAspectRatio { get; set; }
-
-        [BsonElement("avg_detection_confidence")]
-        public double AvgDetectionConfidence { get; set; }
-
-        [BsonElement("avg_keypoints_normalized")]
-        public EmployeeFaceEmbeddingKeypoints AvgKeypointsNormalized { get; set; }
-
-        [BsonElement("per_image_metadata")]
-        public List<ImageMetadata> PerImageMetadata { get; set; }
-    }
-
-    public class EmployeeFaceEmbeddingKeypoints
-    {
-        [BsonElement("left_eye")]
-        public double[] LeftEye { get; set; }
-
-        [BsonElement("right_eye")]
-        public double[] RightEye { get; set; }
-
-        [BsonElement("nose")]
-        public double[] Nose { get; set; }
-
-        [BsonElement("mouth_left")]
-        public double[] MouthLeft { get; set; }
-
-        [BsonElement("mouth_right")]
-        public double[] MouthRight { get; set; }
-    }
-
-    public class ImageMetadata
-    {
-        [BsonElement("face_aspect_ratio")]
-        public double FaceAspectRatio { get; set; }
-
-        [BsonElement("eye_distance_normalized")]
-        public double EyeDistanceNormalized { get; set; }
-
-        [BsonElement("eye_to_face_ratio")]
-        public double EyeToFaceRatio { get; set; }
-
-        [BsonElement("detection_confidence")]
-        public double DetectionConfidence { get; set; }
-
-        [BsonElement("keypoints_normalized")]
-        public EmployeeFaceEmbeddingKeypoints KeypointsNormalized { get; set; }
-    }
-
-    public class EmbeddingHistoryItem
-    {
-        [BsonElement("embedding")]
-        public List<double> Embedding { get; set; }
-
-        [BsonElement("timestamp")]
-        public DateTime Timestamp { get; set; }
-
-        [BsonElement("confidence")]
-        public double Confidence { get; set; }
-
-        [BsonElement("refinementPercentage")]
-        public double RefinementPercentage { get; set; }
-    }
-
-    public class MetadataHistoryItem
-    {
-        [BsonElement("metadata")]
-        public EmployeeFaceEmbeddingMetadata Metadata { get; set; }
-
-        [BsonElement("timestamp")]
-        public DateTime Timestamp { get; set; }
-
-        [BsonElement("confidence")]
-        public double Confidence { get; set; }
-
-        [BsonElement("refinementPercentage")]
-        public double RefinementPercentage { get; set; }
-    }

Company.Domain/EmployeeFaceEmbeddingAgg/IEmployeeFaceEmbeddingRepository.cs

@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Company.Domain.EmployeeFaceEmbeddingAgg;
-
-public interface IEmployeeFaceEmbeddingRepository
-{
-    Task CreateAsync(EmployeeFaceEmbedding employeeFaceEmbedding);
-    Task UpdateAsync(EmployeeFaceEmbedding employeeFaceEmbedding);
-    Task<EmployeeFaceEmbedding> GetByIdAsync(string id);
-    Task<EmployeeFaceEmbedding> GetByEmployeeIdAsync(long employeeId);
-    Task<List<EmployeeFaceEmbedding>> GetByWorkshopIdAsync(long workshopId);
-    Task<List<EmployeeFaceEmbedding>> GetByWorkshopIdsAsync(List<long> workshopIds);
-    Task DeleteAsync(string id);
-}

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -77,5 +77,4 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
 
     Task<List<InstitutionContractSelectListViewModel>> GetInstitutionContractSelectList(string search, string selected);
     Task<List<InstitutionContractPrintViewModel>> PrintAllAsync(List<long> ids);
-    Task<GetInstitutionContractWorkshopsDetails> GetContractWorkshopsDetails(long id);
 }

Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs

@@ -51,14 +51,6 @@ public interface IInsuranceListRepository:IRepository<long, InsuranceList>
     List<EmployeeInsurancListDataViewModel> GetEmployeeInsuranceDataAmonthAgo(DateTime currentMonthStartDate, long workshopId);
     #endregion
 
-    /// <summary>
-    /// دریافت اطلاعات بیمه کارکنان برای استفاده در فیش حقوقی
-    /// </summary>
-    /// <param name="startDate"></param>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    List<EmployeeInsurancListDataViewModel> EmployeeInsuranceDataBy(DateTime startDate, long workshopId);
-
     /// <summary>
     /// بدست آوردن اطلاعات محاسباتی ماه پرسنل برای ویرایش
     /// </summary>

Company.Domain/PaymentTransactionAgg/PaymentTransaction.cs

@@ -18,15 +18,13 @@ public class PaymentTransaction:EntityBase
     /// <param name="callBackUrl"></param>
     public PaymentTransaction(long contractingPartyId,
         double amount,
-        string contractingPartyName,string callBackUrl,
-        PaymentTransactionGateWay gateway)
+        string contractingPartyName,string callBackUrl)
     {
         ContractingPartyId = contractingPartyId;
         Status = PaymentTransactionStatus.Pending;
         Amount = amount;
         ContractingPartyName = contractingPartyName;
         CallBackUrl = callBackUrl;
-        Gateway = gateway;
     }
 
     /// <summary>
@@ -70,20 +68,13 @@ public class PaymentTransaction:EntityBase
     public string TransactionId { get; private set; }
 
     public string CallBackUrl { get; private set; }
-    public PaymentTransactionGateWay Gateway { get; private set; }
-    public string Rrn { get; private set; }
-    public string DigitalReceipt { get; private set; }
 
-
-    public void SetPaid(string cardNumber,string bankName,string rrn,string digitalReceipt)
+    public void SetPaid(string cardNumber,string bankName)
     {
         Status = PaymentTransactionStatus.Success;
         TransactionDate = DateTime.Now;
         CardNumber = cardNumber;
         BankName = bankName;
-        Rrn = rrn;
-        DigitalReceipt = digitalReceipt;
-
     }
     public void SetFailed()
     {
@@ -94,5 +85,4 @@ public class PaymentTransaction:EntityBase
     {
         TransactionId = transactionId;
     }
-}
-
+}

Company.Domain/ReportAgg/IReportRepository.cs

@@ -11,23 +11,21 @@ namespace Company.Domain.ReportAgg
     {
         Task<AllReport> GetAllActiveWorkshopsNew(string year, string month);
         AllReport GetAllActiveWorkshops(string year, string month);
-        Task<WorkshopResult> GetWorkshopContractDone(string year, string month, long accountId, List<long> workshopList);
-        Task<WorkshopResult> GetWorkshopContractSignDone(string year, string month, long accountId,
+        WorkshopResult GetWorkshopContractDone(string year, string month, long accountId, List<long> workshopList);
+        WorkshopResult GetWorkshopContractSignDone(string year, string month, long accountId, List<long> workshopList);
+        WorkshopResult GetWorkshopCheckoutDone(string year, string month, long accountId, List<long> workshopList);
+        WorkshopResult GetWorkshopCheckoutSignDone(string year, string month, long accountId, List<long> workshopList);
+        List<EmployeeNotDone> GetEmployeeContract(string year, string month, long workshopId);
+        List<EmployeeNotDone> GetEmployeeContractSign(string year, string month, long workshopId);
+        List<EmployeeNotDone> GetEmployeeCheckout(string year, string month, long workshopId);
+        List<EmployeeNotDone> GetEmployeeCheckoutSign(string year, string month, long workshopId);
+        PrintAllContractCheckout GetPrintAllContractDone(string year, string month, long accountId,
             List<long> workshopList);
-        Task<WorkshopResult> GetWorkshopCheckoutDone(string year, string month, long accountId, List<long> workshopList);
-        Task<WorkshopResult> GetWorkshopCheckoutSignDone(string year, string month, long accountId,
+        PrintAllContractCheckout GetPrintAllContractSignDone(string year, string month, long accountId,
             List<long> workshopList);
-        Task<List<EmployeeNotDone>> GetEmployeeContract(string year, string month, long workshopId);
-        Task<List<EmployeeNotDone>> GetEmployeeContractSign(string year, string month, long workshopId);
-        Task<List<EmployeeNotDone>> GetEmployeeCheckout(string year, string month, long workshopId);
-        Task<List<EmployeeNotDone>> GetEmployeeCheckoutSign(string year, string month, long workshopId);
-        Task<PrintAllContractCheckout> GetPrintAllContractDone(string year, string month, long accountId,
+        PrintAllContractCheckout GetPrintAllCheckoutDone(string year, string month, long accountId,
             List<long> workshopList);
-        Task<PrintAllContractCheckout> GetPrintAllContractSignDone(string year, string month, long accountId,
-            List<long> workshopList);
-        Task<PrintAllContractCheckout> GetPrintAllCheckoutDone(string year, string month, long accountId,
-            List<long> workshopList);
-        Task<PrintAllContractCheckout> GetPrintAllCheckoutSignDone(string year, string month, long accountId,
+        PrintAllContractCheckout GetPrintAllCheckoutSignDone(string year, string month, long accountId,
             List<long> workshopList);
 
 

Company.Domain/RollCallAgg/IRollCallRepository.cs

@@ -25,7 +25,7 @@ namespace Company.Domain.RollCallAgg
           DateTime endSearch);
         void RemoveEmployeeRollCallsInDate(long workshopId, long employeeId, DateTime date);
         RollCallsByDateViewModel GetWorkshopRollCallHistory(RollCallSearchModel searchModel);
-        CurrentDayRollCall GetWorkshopCurrentDayRollCalls(long workshopId);
+        CurrentDayRollCall GetWorkshopCurrentDayRollCalls(long workshopId,WorkshopCurrentDayRollCallSearchModel searchModel);
         List<PersonnelCheckoutDailyRollCallViewModel> GetEmployeeRollCallsForMonth(IEnumerable<long> employeeIds,
             long workshopId, DateTime start, DateTime end);
 

Company.Domain/RollCallEmployeeStatusAgg/IRollCallEmployeeStatusRepository.cs

@@ -26,6 +26,5 @@ namespace Company.Domain.RollCallEmployeeStatusAgg
         List<RollCallEmployeeStatusViewModel> GetActiveByWorkshopIdInDate(long workshopId, DateTime startDateGr, DateTime endDateGr);
         List<RollCallEmployeeStatusViewModel> GetByWorkshopIdInDates(long workshopId, DateTime start, DateTime end);
         bool IsActiveInPeriod(long employeeId, long workshopId, DateTime startDate, DateTime endDate);
-        void RemoveRange(IEnumerable<RollCallEmployeeStatus> rollCallEmployeeStatusList);
-	}
+    }
 }

CompanyManagement.Infrastructure.Mongo/EmployeeFaceEmbeddingRepo/EmployeeFaceEmbeddingRepository.cs

@@ -1,60 +0,0 @@
-using Company.Domain.EmployeeFaceEmbeddingAgg;
-using MongoDB.Driver;
-
-namespace CompanyManagement.Infrastructure.Mongo.EmployeeFaceEmbeddingRepo;
-
-public class EmployeeFaceEmbeddingRepository : IEmployeeFaceEmbeddingRepository
-{
-    private readonly IMongoCollection<EmployeeFaceEmbedding> _employeeFaceEmbeddings;
-
-    public EmployeeFaceEmbeddingRepository(IMongoDatabase database)
-    {
-        _employeeFaceEmbeddings = database.GetCollection<EmployeeFaceEmbedding>("EmployeeFaces");
-    }
-
-    public async Task CreateAsync(EmployeeFaceEmbedding employeeFaceEmbedding)
-    {
-        await _employeeFaceEmbeddings.InsertOneAsync(employeeFaceEmbedding);
-    }
-
-    public async Task UpdateAsync(EmployeeFaceEmbedding employeeFaceEmbedding)
-    {
-        await _employeeFaceEmbeddings.ReplaceOneAsync(
-            x => x.Id == employeeFaceEmbedding.Id, 
-            employeeFaceEmbedding);
-    }
-
-    public async Task<EmployeeFaceEmbedding> GetByIdAsync(string id)
-    {
-        return await _employeeFaceEmbeddings
-            .Find(x => x.Id == id)
-            .FirstOrDefaultAsync();
-    }
-
-    public async Task<EmployeeFaceEmbedding> GetByEmployeeIdAsync(long employeeId)
-    {
-        return await _employeeFaceEmbeddings
-            .Find(x => x.EmployeeId == employeeId)
-            .FirstOrDefaultAsync();
-    }
-
-    public async Task<List<EmployeeFaceEmbedding>> GetByWorkshopIdAsync(long workshopId)
-    {
-        return await _employeeFaceEmbeddings
-            .Find(x => x.WorkshopId == workshopId)
-            .ToListAsync();
-    }
-
-    public async Task<List<EmployeeFaceEmbedding>> GetByWorkshopIdsAsync(List<long> workshopIds)
-    {
-        return await _employeeFaceEmbeddings
-            .Find(x => workshopIds.First()==x.WorkshopId)
-            .ToListAsync();
-    }
-
-    public async Task DeleteAsync(string id)
-    {
-        await _employeeFaceEmbeddings.DeleteOneAsync(x => x.Id == id);
-    }
-}
-

CompanyManagment.App.Contracts/AndroidApkVersion/ApkType.cs

@@ -1,8 +0,0 @@
-namespace CompanyManagment.App.Contracts.AndroidApkVersion;
-
-public enum ApkType
-{
-    WebView,
-    FaceDetection
-}
-

CompanyManagment.App.Contracts/AndroidApkVersion/IAndroidApkVersionApplication.cs

@@ -4,15 +4,12 @@ using Microsoft.AspNetCore.Http;
 
 namespace CompanyManagment.App.Contracts.AndroidApkVersion;
 
-public record AndroidApkVersionInfo(int LatestVersionCode, string LatestVersionName, bool ShouldUpdate, bool IsForceUpdate, string DownloadUrl, string ReleaseNotes);
-
 public interface IAndroidApkVersionApplication
 {
-    Task<OperationResult> CreateAndActive(IFormFile file, ApkType apkType, string versionName, string versionCode, bool isForce = false);
-    Task<OperationResult> CreateAndDeActive(IFormFile file, ApkType apkType, string versionName, string versionCode, bool isForce = false);
-    Task<string> GetLatestActiveVersionPath(ApkType apkType);
-    Task<AndroidApkVersionInfo> GetLatestActiveInfo(ApkType apkType, int currentVersionCode);
+    Task<OperationResult> CreateAndActive(IFormFile file);
+    Task<OperationResult> CreateAndDeActive(IFormFile file);
+    Task<string> GetLatestActiveVersionPath();
     OperationResult Remove(long id);
 
-    bool HasAndroidApkToDownload(ApkType apkType);
+    bool HasAndroidApkToDownload();
 }

CompanyManagment.App.Contracts/Checkout/CheckoutViewModel.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using _0_Framework.Application.Enums;
 using CompanyManagment.App.Contracts.Employer;
 using CompanyManagment.App.Contracts.Loan;
 using CompanyManagment.App.Contracts.RollCall;
@@ -134,15 +133,6 @@ public class CheckoutViewModel
     /// </summary>
     public string TotalPaidLeave { get; set; }
 
-    /// <summary>
-    /// آیا فیش  نیاز به بروزرسانی دارد
-    /// </summary>
-    public bool IsUpdateNeeded { get; set; }
-
-    /// <summary>
-    /// لیست پیام های هشدار فیش حقوقی
-    /// </summary>
-    public List<CheckoutWarningMessageModel> CheckoutWarningMessageList { get; set; }
 
     public bool HasSignCheckout { get; set; }    
 

CompanyManagment.App.Contracts/Checkout/CheckoutWarningMessageModel.cs

@@ -1,25 +0,0 @@
-using _0_Framework.Application.Enums;
-
-namespace CompanyManagment.App.Contracts.Checkout;
-
-/// <summary>
-/// مدل هشدار فیش حقوقی
-/// </summary>
-public class CheckoutWarningMessageModel
-{
-    /// <summary>
-    /// پیام هشدار
-    /// </summary>
-    public string WarningMessage { get; set; }
-
-
-    /// <summary>
-    /// آی دی فیش حقوقی
-    /// </summary>
-    public long CheckoutId { get; set; }
-
-    /// <summary>
-    /// نوع هشدار فیش حقوقی
-    /// </summary>
-    public TypeOfCheckoutWarning TypeOfCheckoutWarning { get; set; }
-}

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CustomizeWorkshopEmployeeSettingsViewModel.cs

@@ -25,5 +25,4 @@ public class CustomizeWorkshopEmployeeSettingsViewModel
     public int LeavePermittedDays { get; set; }
     public ICollection<CustomizeRotatingShiftsViewModel> CustomizeRotatingShiftsViewModels { get; set; }
     public List<DayOfWeek> WeeklyOffDays { get; set; }
-    public bool HasLeft { get; set; }
 }

CompanyManagment.App.Contracts/Employee/IEmployeeApplication.cs

@@ -76,6 +76,7 @@ public interface IEmployeeApplication
     Task<List<EmployeeSelectListViewModel>> WorkedEmployeesInWorkshopSelectList(long workshopId);
 
     Task<OperationResult<EmployeeDataFromApiViewModel>> GetEmployeeDataFromApi(string nationalCode, string birthDate);
+    Task<List<EmployeeSelectListViewModel>> GetWorkingEmployeesSelectList(long workshopId);
 
 	#endregion
 

CompanyManagment.App.Contracts/EmployeeFaceEmbedding/EmployeeFaceEmbeddingDto.cs

@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.EmployeeFaceEmbedding;
-
-public class EmployeeFaceEmbeddingDto
-{
-    public string Id { get; set; }
-    public string EmployeeFullName { get; set; }
-    public long EmployeeId { get; set; }
-    public long WorkshopId { get; set; }
-    public List<double> Embeddings { get; set; }
-    public EmployeeFaceEmbeddingMetadataDto Metadata { get; set; }
-}
-

CompanyManagment.App.Contracts/EmployeeFaceEmbedding/EmployeeFaceEmbeddingDtos.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.EmployeeFaceEmbedding;
-
-public class EmployeeFaceEmbeddingMetadataDto
-{
-    public double AvgEyeDistanceNormalized { get; set; }
-    public double AvgEyeToFaceRatio { get; set; }
-    public double AvgFaceAspectRatio { get; set; }
-    public double AvgDetectionConfidence { get; set; }
-    public EmployeeFaceEmbeddingKeypointsDto AvgKeypointsNormalized { get; set; }
-    public List<ImageMetadataDto> PerImageMetadata { get; set; }
-}
-
-public class EmployeeFaceEmbeddingKeypointsDto
-{
-    public double[] LeftEye { get; set; }
-    public double[] RightEye { get; set; }
-    public double[] Nose { get; set; }
-    public double[] MouthLeft { get; set; }
-    public double[] MouthRight { get; set; }
-}
-
-public class ImageMetadataDto
-{
-    public double FaceAspectRatio { get; set; }
-    public double EyeDistanceNormalized { get; set; }
-    public double EyeToFaceRatio { get; set; }
-    public double DetectionConfidence { get; set; }
-    public EmployeeFaceEmbeddingKeypointsDto KeypointsNormalized { get; set; }
-}
-
-public class EmbeddingHistoryItemDto
-{
-    public List<double> Embedding { get; set; }
-    public DateTime Timestamp { get; set; }
-    public double Confidence { get; set; }
-    public double RefinementPercentage { get; set; }
-}
-
-public class MetadataHistoryItemDto
-{
-    public EmployeeFaceEmbeddingMetadataDto Metadata { get; set; }
-    public DateTime Timestamp { get; set; }
-    public double Confidence { get; set; }
-    public double RefinementPercentage { get; set; }
-}
-

CompanyManagment.App.Contracts/EmployeeFaceEmbedding/IEmployeeFaceEmbeddingApplication.cs

@@ -1,43 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace CompanyManagment.App.Contracts.EmployeeFaceEmbedding;
-
-/// <summary>
-/// سرویس مدیریت Embedding چهره کارکنان
-/// این سرویس فقط برای دریافت و ارسال داده است و هیچ command-driven نیست
-/// </summary>
-public interface IEmployeeFaceEmbeddingApplication
-{
-    /// <summary>
-    /// دریافت embedding بر اساس شناسه
-    /// </summary>
-    Task<EmployeeFaceEmbeddingDto> GetByIdAsync(string id);
-
-    /// <summary>
-    /// دریافت embedding بر اساس شناسه کارمند
-    /// </summary>
-    Task<EmployeeFaceEmbeddingDto> GetByEmployeeIdAsync(long employeeId);
-
-    /// <summary>
-    /// دریافت لیست embeddings بر اساس شناسه کارگاه
-    /// </summary>
-    Task<List<EmployeeFaceEmbeddingDto>> GetByWorkshopIdAsync(long workshopId);
-
-    /// <summary>
-    /// دریافت لیست embeddings بر اساس لیست شناسه کارگاه‌ها
-    /// </summary>
-    Task<List<EmployeeFaceEmbeddingDto>> GetByWorkshopIdsAsync(List<long> workshopIds);
-
-    /// <summary>
-    /// ذخیره یا به‌روزرسانی embedding
-    /// اگر Id وجود داشته باشد، به‌روزرسانی می‌شود، در غیر این صورت ایجاد می‌شود
-    /// </summary>
-    Task<string> SaveAsync(EmployeeFaceEmbeddingDto dto);
-
-    /// <summary>
-    /// حذف embedding
-    /// </summary>
-    Task DeleteAsync(string id);
-}
-

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListItemsViewModel.cs

@@ -1,7 +1,4 @@
 using System.Collections.Generic;
-using System.Security.AccessControl;
-using CompanyManagment.App.Contracts.Workshop;
-using Microsoft.AspNetCore.Server.HttpSys;
 
 namespace CompanyManagment.App.Contracts.InstitutionContract;
 
@@ -100,7 +97,6 @@ public class InstitutionContractListWorkshop
 {
     public string WorkshopName { get; set; }
     public int EmployeeCount { get; set; }
-    public string Price { get; set; }
     public WorkshopServicesViewModel WorkshopServices { get; set; }
 }
 
@@ -108,31 +104,22 @@ public class WorkshopServicesViewModel
 {
     public bool Insurance { get; set; }
     public string InsuranceLabel => "ارسال لیست بیمه";
-    public string InsurancePrice { get; set; }
 
     public bool InsuranceInPerson { get; set; }
     public string InsuranceInPersonLabel => "خدمات مستقیم";
-    public string InsuranceInPersonPrice { get; set; }
-    
-    
+
     public bool Contract { get; set; }
     public string ContractLabel => "قرارداد و تصفیه حساب";
-    public string ContractPrice { get; set; }
-    
-    
+
     public bool ContractInPerson { get; set; }
     public string ContractInPersonLabel => "خدمات مستقیم";
-    public string ContractInPersonPrice { get; set; }
-    
+
     public bool RollCall { get; set; }
     public string RollCallLabel => "ساعت حضور و غیاب";
-    public string RollCallPrice { get; set; }
-    
+
     public bool RollCallInPerson { get; set; }
     public string RollCallInPersonLabel => "خدمات مستقیم";
-    public string RollCallInPersonPrice { get; set; }
-    
+
     public bool CustomizeCheckout { get; set; }
     public string CustomizeCheckoutLabel => "فیش غیر رسمی";
-    public string CustomizeCheckoutPrice { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

@@ -251,17 +251,8 @@ public interface IInstitutionContractApplication
     /// <param name="id"></param>
     /// <returns></returns>
     Task<InstitutionContractPrintViewModel> PrintOneAsync(long id);
-
-    Task<GetInstitutionContractWorkshopsDetails> GetContractWorkshopsDetails(long id);
 }
 
-public class GetInstitutionContractWorkshopsDetails
-{
-    public List<InstitutionContractListWorkshop> Workshops { get; set; }
-
-}
-
-
 public class InstitutionContractPrintViewModel
 {
     public InstitutionContratVerificationParty FirstParty { get; set; }
@@ -275,8 +266,7 @@ public class InstitutionContractPrintViewModel
     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 VerifyDateTime { get; set; }
     public string VerifierFullName { get; set; }
     public string VerifierPhoneNumber { get; set; }
     public LawViewModel LawViewModel { get; set; }

CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs

@@ -31,50 +31,6 @@ public interface IInsuranceListApplication
     double GetRoundValue(double value);
     OperationResult ConfirmInsuranceList(long id);
 
-    #region New
-    /// <summary>
-    /// دستمزد روزانه مشاغل مقطوع بیمه
-    /// </summary>
-    /// <param name="year"></param>
-    /// <param name="workshopId"></param>
-    /// <param name="employeeId"></param>
-    /// <param name="startDateGr"></param>
-    /// <param name="endDateGr"></param>
-    /// <param name="jobId"></param>
-    /// <param name="population"></param>
-    /// <param name="insuranceJobId"></param>
-    /// <returns></returns>
-    double? GetDailyWageFixedSalary(string year, long workshopId, long employeeId, DateTime? startDateGr,
-        DateTime? endDateGr, long jobId, string population, long? insuranceJobId);
-
-    /// <summary>
-    ///  محاسبه مزایای ماهانه
-    /// </summary>
-    /// <param name="endMonthCurrentDay"></param>
-    /// <param name="consumableItemsItemValue"></param>
-    /// <param name="housingAllowanceItemValue"></param>
-    /// <param name="maritalStatus"></param>
-    /// <param name="countWorkingDays"></param>
-    /// <param name="typeOfInsuranceSendWorkshop"></param>
-    /// <param name="jobId"></param>
-    /// <param name="employeeId"></param>
-    /// <param name="includeStatus"></param>
-    /// <returns></returns>
-    public double GetMonthlyBenefits(int endMonthCurrentDay, double consumableItemsItemValue,
-        double housingAllowanceItemValue, double maritalStatus, int countWorkingDays,
-        string typeOfInsuranceSendWorkshop, long jobId, long employeeId, bool includeStatus);
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="yearlysalaryItemValue"></param>
-    /// <param name="employeeId"></param>
-    /// <param name="workshopId"></param>
-    /// <param name="year"></param>
-    /// <returns></returns>
-    public double ComputeDailyWage(double yearlysalaryItemValue, long employeeId, long workshopId, string year);
-
-        #endregion
     List<InsuranceListViewModel> SearchForClient(InsuranceListSearchModel searchModel);
 
     //farokhiChanges

CompanyManagment.App.Contracts/PaymentTransaction/CreatePaymentTransaction.cs

@@ -17,14 +17,4 @@ public class CreatePaymentTransaction
     /// مسیر برگشت پس از پرداخت
     /// </summary>
     public string CallBackUrl { get; set; }
-
-    /// <summary>
-    /// نوع درگاه
-    /// </summary>
-    public PaymentTransactionGateWay Gateway { get; set; }
-}
-public enum PaymentTransactionGateWay
-{
-	AqayePardakht = 1,
-	SepehrPay = 2
 }

CompanyManagment.App.Contracts/PaymentTransaction/IPaymentTransactionApplication.cs

@@ -49,7 +49,7 @@ public interface IPaymentTransactionApplication
     /// <param name="cardNumber"></param>
     /// <param name="bankName"></param>
     /// <returns></returns>
-    OperationResult SetSuccess(long paymentTransactionId, string cardNumber, string bankName, string rrn, string digitalReceipt);
+    OperationResult SetSuccess(long paymentTransactionId, string cardNumber, string bankName);
 
     Task<OperationResult> SetTransactionId(long id, string transactionId);
 }

CompanyManagment.App.Contracts/Report/AllReport.cs

@@ -27,8 +27,6 @@ namespace CompanyManagment.App.Contracts.Report
         public int ContractSignNotDone { get; set; }
         public int ContractSignDone { get; set; }
 
-        public int ContractSignToBe { get; set; }
-
         //تصفیه
         public int AllCheckout { get; set; }
         public int CheckoutNotDone { get; set; }
@@ -36,8 +34,6 @@ namespace CompanyManagment.App.Contracts.Report
         public int CheckoutSignNotDone { get; set; }
         public int CheckoutSignDone { get; set; }
 
-        public int CheckoutSignToBe { get; set; }
-
 
 
     }

CompanyManagment.App.Contracts/Report/IReportApplication.cs

@@ -10,23 +10,21 @@ namespace CompanyManagment.App.Contracts.Report
     {
         Task<AllReport> GetAllActiveWorkshops(string year, string month);
         Task<AllReport> GetAllReports(string year, string month);
-        Task<WorkshopResult> GetWorkshopContractDone(string year, string month, long accountId, List<long> workshopList);
-        Task<WorkshopResult> GetWorkshopContractSignDone(string year, string month, long accountId,
+        WorkshopResult GetWorkshopContractDone(string year, string month, long accountId, List<long> workshopList);
+        WorkshopResult GetWorkshopContractSignDone(string year, string month, long accountId, List<long> workshopList);
+        WorkshopResult GetWorkshopCheckoutDone(string year, string month, long accountId, List<long> workshopList);
+        WorkshopResult GetWorkshopCheckoutSignDone(string year, string month, long accountId, List<long> workshopList);
+        List<EmployeeNotDone> GetEmployeeContract(string year, string month, long workshopId);
+        List<EmployeeNotDone> GetEmployeeContractSign(string year, string month, long workshopId);
+        List<EmployeeNotDone> GetEmployeeCheckout(string year, string month, long workshopId);
+        List<EmployeeNotDone> GetEmployeeCheckoutSign(string year, string month, long workshopId);
+        PrintAllContractCheckout GetPrintAllContractDone(string year, string month, long accountId,
             List<long> workshopList);
-        Task<WorkshopResult> GetWorkshopCheckoutDone(string year, string month, long accountId, List<long> workshopList);
-        Task<WorkshopResult> GetWorkshopCheckoutSignDone(string year, string month, long accountId,
+        PrintAllContractCheckout GetPrintAllContractSignDone(string year, string month, long accountId,
             List<long> workshopList);
-        Task<List<EmployeeNotDone>> GetEmployeeContract(string year, string month, long workshopId);
-        Task<List<EmployeeNotDone>> GetEmployeeContractSign(string year, string month, long workshopId);
-        Task<List<EmployeeNotDone>> GetEmployeeCheckout(string year, string month, long workshopId);
-        Task<List<EmployeeNotDone>> GetEmployeeCheckoutSign(string year, string month, long workshopId);
-        Task<PrintAllContractCheckout> GetPrintAllContractDone(string year, string month, long accountId,
+        PrintAllContractCheckout GetPrintAllCheckoutDone(string year, string month, long accountId,
             List<long> workshopList);
-        Task<PrintAllContractCheckout> GetPrintAllContractSignDone(string year, string month, long accountId,
-            List<long> workshopList);
-        Task<PrintAllContractCheckout> GetPrintAllCheckoutDone(string year, string month, long accountId,
-            List<long> workshopList);
-        Task<PrintAllContractCheckout> GetPrintAllCheckoutSignDone(string year, string month, long accountId,
+        PrintAllContractCheckout GetPrintAllCheckoutSignDone(string year, string month, long accountId,
             List<long> workshopList);
     }
 }

CompanyManagment.App.Contracts/RollCall/IRollCallApplication.cs

@@ -79,7 +79,7 @@ namespace CompanyManagment.App.Contracts.RollCall
         /// <summary>
         /// گزارش آنلاین حضور غیاب
         /// </summary>
-        CurrentDayRollCall GetWorkshopCurrentDayRollCalls(long workshopId);
+        CurrentDayRollCall GetWorkshopCurrentDayRollCalls(long workshopId,WorkshopCurrentDayRollCallSearchModel searchModel);
 
         /// <summary>
         /// گزارش آفلاین حضور غیاب کارگاه
@@ -126,6 +126,13 @@ namespace CompanyManagment.App.Contracts.RollCall
         /// <returns></returns>
         OperationResult RecalculateValues(long workshopId, List<ReCalculateRollCallValues> command);
     }
+
+    public class WorkshopCurrentDayRollCallSearchModel
+    {
+	    public long EmployeeId { get; set; }
+	    public int PersonnelCode { get; set; }
+    }
+
     public class ReCalculateRollCallValues
     {
         public long EmployeeId { get; set; }

CompanyManagment.Application/AndroidApkVersionApplication.cs

@@ -1,11 +1,13 @@
 using System;
 using System.IO;
 using AccountManagement.Domain.TaskAgg;
+using ApkReader;
 using Company.Domain.AndroidApkVersionAgg;
 using CompanyManagment.App.Contracts.AndroidApkVersion;
-using CompanyManagment.Application.Helpers;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
+using System;
+using System.IO;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 
@@ -22,7 +24,7 @@ public class AndroidApkVersionApplication : IAndroidApkVersionApplication
         _taskRepository = taskRepository;
     }
 
-    public async Task<OperationResult> CreateAndActive(IFormFile file, ApkType apkType, string versionName, string versionCode, bool isForce = false)
+    public async Task<OperationResult> CreateAndActive(IFormFile file)
     {
         OperationResult op = new OperationResult();
 
@@ -34,26 +36,22 @@ public class AndroidApkVersionApplication : IAndroidApkVersionApplication
         if (Path.GetExtension(file.FileName).ToLower() != ".apk")
             return op.Failed("لطفا فایلی با پسوند .apk وارد کنید");
 
-        if (string.IsNullOrWhiteSpace(versionName))
-            return op.Failed("لطفا نام ورژن را وارد کنید");
-
-        if (string.IsNullOrWhiteSpace(versionCode))
-            return op.Failed("لطفا کد ورژن را وارد کنید");
-
         #endregion
 
-        var activeApks = _androidApkVersionRepository.GetActives(apkType);
+        var activeApks = _androidApkVersionRepository.GetActives();
 
          await activeApks.ExecuteUpdateAsync(setter => setter.SetProperty(e => e.IsActive, IsActive.False));
         _androidApkVersionRepository.SaveChanges();
 
-        var folderName = apkType == ApkType.WebView ? "GozreshgirWebView" : "GozreshgirFaceDetection";
         var path = Path.Combine($"{_taskRepository.GetWebEnvironmentPath()}", "Storage",
-            "Apk", "Android", folderName);
+            "Apk", "Android", "GozreshgirWebView");
 
         Directory.CreateDirectory(path);
 
-        string uniqueFileName = $"{Path.GetFileNameWithoutExtension(file.FileName)}.v{versionName}{Path.GetExtension(file.FileName)}";
+        //var apk = new ApkReader.ApkReader().Read(file.OpenReadStream());
+
+        string uniqueFileName = $"{Path.GetFileNameWithoutExtension(file.FileName)}{Path.GetExtension(file.FileName)}";
+
 
         string filepath = Path.Combine(path, uniqueFileName);
 
@@ -62,13 +60,13 @@ public class AndroidApkVersionApplication : IAndroidApkVersionApplication
             await file.CopyToAsync(stream);
         }
 
-        var entity = new AndroidApkVersion(versionName, versionCode, IsActive.True, filepath,apkType,isForce);
+        var entity = new AndroidApkVersion("0", "0", IsActive.True, filepath);
         _androidApkVersionRepository.Create(entity);
         _androidApkVersionRepository.SaveChanges();
         return op.Succcedded();
     }
 
-    public async Task<OperationResult> CreateAndDeActive(IFormFile file, ApkType apkType, string versionName, string versionCode, bool isForce = false)
+    public async Task<OperationResult> CreateAndDeActive(IFormFile file)
     {
         OperationResult op = new OperationResult();
 
@@ -80,22 +78,18 @@ public class AndroidApkVersionApplication : IAndroidApkVersionApplication
         if (Path.GetExtension(file.FileName).ToLower() != ".apk")
             return op.Failed("لطفا فایلی با پسوند .apk وارد کنید");
 
-        if (string.IsNullOrWhiteSpace(versionName))
-            return op.Failed("لطفا نام ورژن را وارد کنید");
-
-        if (string.IsNullOrWhiteSpace(versionCode))
-            return op.Failed("لطفا کد ورژن را وارد کنید");
-
         #endregion
 
 
-        var folderName = apkType == ApkType.WebView ? "GozreshgirWebView" : "GozreshgirFaceDetection";
         var path = Path.Combine($"{_taskRepository.GetWebEnvironmentPath()}", "Storage",
-            "Apk", "Android", folderName);
+            "Apk", "Android", "GozreshgirWebView");
 
         Directory.CreateDirectory(path);
 
-        string uniqueFileName = $"{Path.GetFileNameWithoutExtension(file.FileName)}.v{versionName}{Path.GetExtension(file.FileName)}";
+        var apk = new ApkReader.ApkReader().Read(file.OpenReadStream());
+
+        string uniqueFileName = $"{Path.GetFileNameWithoutExtension(file.FileName)}.v{apk.VersionName}{Path.GetExtension(file.FileName)}";
+
 
         string filepath = Path.Combine(path, uniqueFileName);
 
@@ -104,15 +98,14 @@ public class AndroidApkVersionApplication : IAndroidApkVersionApplication
            await file.CopyToAsync(stream);
         }
 
-        var entity = new AndroidApkVersion(versionName, versionCode, IsActive.False, filepath,apkType);
-        _androidApkVersionRepository.Create(entity);
+        var entity = new AndroidApkVersion(apk.VersionName, apk.VersionCode, IsActive.False, filepath);
         _androidApkVersionRepository.SaveChanges();
         return op.Succcedded();
     }
 
-    public async Task<string> GetLatestActiveVersionPath(ApkType apkType)
+    public async Task<string> GetLatestActiveVersionPath()
     {
-       return await _androidApkVersionRepository.GetLatestActiveVersionPath(apkType);
+       return await _androidApkVersionRepository.GetLatestActiveVersionPath();
     }
 
     public OperationResult Remove(long id)
@@ -134,22 +127,8 @@ public class AndroidApkVersionApplication : IAndroidApkVersionApplication
         return op.Succcedded();
     }
 
-    public bool HasAndroidApkToDownload(ApkType apkType)
+    public bool HasAndroidApkToDownload()
     {
-       return _androidApkVersionRepository.Exists(x => x.IsActive == IsActive.True && x.ApkType == apkType);
-    }
-
-    public Task<AndroidApkVersionInfo> GetLatestActiveInfo(ApkType apkType, int currentVersionCode)
-    {
-        var latest = _androidApkVersionRepository.GetLatestActive(apkType);
-        if (latest == null)
-            return Task.FromResult(new AndroidApkVersionInfo(0, "0", false, false, string.Empty, string.Empty));
-
-        // Return API endpoint for downloading APK file
-        var fileUrl = $"/api/android-apk/download?type={apkType}";
-        int latestCode = 0;
-        int.TryParse(latest.VersionCode, out latestCode);
-        var shouldUpdate = latestCode > currentVersionCode;
-        return Task.FromResult(new AndroidApkVersionInfo(latestCode, latest.VersionName, shouldUpdate, latest.IsForce, fileUrl, "Bug fixes and improvements"));
+       return _androidApkVersionRepository.Exists(x => x.IsActive == IsActive.True);
     }
 }

CompanyManagment.Application/CheckoutApplication.cs

@@ -193,19 +193,8 @@ public class CheckoutApplication : ICheckoutApplication
         //حق بیمه سهم کارگر
         #region InsuranceDeduction
 
-        double insuranceDeduction = 0;
-        bool hasInsuranceShareTheSameAsList = false;
-        if (command.InsuranceDeduction == 0)
-        {
-            var insuranceOverTime = command.HasInsuranceChekoutOverTime ? command.OvertimePay : 0; 
-            insuranceDeduction = (monthlyWage + bacicYears + consumableItem + housingAllowance + marriedAllowance + insuranceOverTime) * 7 / 100;
-        }
-        else
-        {
-            insuranceDeduction = command.InsuranceDeduction;
-            hasInsuranceShareTheSameAsList = true;
-        }
-
+        var insuranceOverTime = command.HasInsuranceChekoutOverTime ? command.OvertimePay : 0;
+        var insuranceDeduction = (monthlyWage + bacicYears + consumableItem + housingAllowance + marriedAllowance + insuranceOverTime) * 7 / 100;
 
         #endregion
 
@@ -386,7 +375,7 @@ public class CheckoutApplication : ICheckoutApplication
 				, command.OvertimePay, command.NightworkPay, command.FridayPay, 0, command.ShiftPay, familyAllowance, bunos, years, command.LeavePay, insuranceDeduction, 0, command.InstallmentDeduction, command.SalaryAidDeduction, command.AbsenceDeduction, sumOfWorkingDays,
 				command.ArchiveCode, command.PersonnelCode, totalClaims, totalDeductions, totalPayment, command.Signature, marriedAllowance, command.LeaveCheckout, command.CreditLeaves, command.AbsencePeriod, command.AverageHoursPerDay, command.HasRollCall, command.OverTimeWorkValue, command.OverNightWorkValue
 				, command.FridayWorkValue, command.RotatingShiftValue, command.AbsenceValue, command.TotalDayOfLeaveCompute, command.TotalDayOfYearsCompute, command.TotalDayOfBunosesCompute,
-				loanInstallments, salaryAids,checkoutRollCall,command.EmployeeMandatoryHours, hasInsuranceShareTheSameAsList);
+				loanInstallments, salaryAids,checkoutRollCall,command.EmployeeMandatoryHours);
 
 			_checkoutRepository.CreateCkeckout(checkout).GetAwaiter().GetResult();
 			//_checkoutRepository.SaveChanges();

CompanyManagment.Application/CompanyManagment.Application.csproj

@@ -5,8 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AndroidXml" Version="1.1.24" />
-    <PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
+    <PackageReference Include="ApkReader" Version="2.0.1.1" />
   </ItemGroup>
 
   <ItemGroup>

CompanyManagment.Application/EmployeeAplication.cs

@@ -31,7 +31,6 @@ using Company.Domain.LeftWorkAgg;
 using CompanyManagment.App.Contracts.Employee.DTO;
 using Company.Domain.EmployeeAuthorizeTempAgg;
 using Company.Domain.LeftWorkInsuranceAgg;
-using _0_Framework.Application.FaceEmbedding;
 
 namespace CompanyManagment.Application;
 
@@ -62,31 +61,29 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
     private readonly ICustomizeWorkshopGroupSettingsRepository _customizeWorkshopGroupSettingsRepository;
     private readonly IEmployeeAuthorizeTempRepository _employeeAuthorizeTempRepository;
     private readonly ILeftWorkInsuranceRepository _leftWorkInsuranceRepository;
-    private readonly IFaceEmbeddingService _faceEmbeddingService;
 
-	public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context, IWorkshopRepository workShopRepository, IWebHostEnvironment webHostEnvironment, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, IRollCallEmployeeRepository rollCallEmployeeRepository, ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication, IEmployeeDocumentsApplication employeeDocumentsApplication, IEmployeeDocumentsRepository employeeDocumentsRepository, IEmployeeBankInformationApplication employeeBankInformationApplication, ILeftWorkTempRepository leftWorkTempRepository, IUidService uidService, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository, IPersonnelCodeRepository personnelCodeRepository, IEmployeeClientTempRepository employeeClientTempRepository, ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository, ILeftWorkRepository leftWorkRepository, IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository, ILeftWorkInsuranceRepository leftWorkInsuranceRepository, IFaceEmbeddingService faceEmbeddingService) : base(context)
-	{
-		_context = context;
-		_WorkShopRepository = workShopRepository;
-		_webHostEnvironment = webHostEnvironment;
-		_rollCallEmployeeStatusApplication = rollCallEmployeeStatusApplication;
-		_rollCallEmployeeRepository = rollCallEmployeeRepository;
-		_customizeWorkshopSettingsApplication = customizeWorkshopSettingsApplication;
-		_employeeDocumentsApplication = employeeDocumentsApplication;
-		_employeeBankInformationApplication = employeeBankInformationApplication;
-		_leftWorkTempRepository = leftWorkTempRepository;
-		_uidService = uidService;
-		_customizeWorkshopEmployeeSettingsRepository = customizeWorkshopEmployeeSettingsRepository;
-		_personnelCodeRepository = personnelCodeRepository;
-		_employeeClientTempRepository = employeeClientTempRepository;
-		_leftWorkRepository = leftWorkRepository;
-		_employeeAuthorizeTempRepository = employeeAuthorizeTempRepository;
-		_leftWorkInsuranceRepository = leftWorkInsuranceRepository;
-		_EmployeeRepository = employeeRepository;
-		_faceEmbeddingService = faceEmbeddingService;
-	}
+    public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context, IWorkshopRepository workShopRepository, IWebHostEnvironment webHostEnvironment, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, IRollCallEmployeeRepository rollCallEmployeeRepository, ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication, IEmployeeDocumentsApplication employeeDocumentsApplication, IEmployeeDocumentsRepository employeeDocumentsRepository, IEmployeeBankInformationApplication employeeBankInformationApplication, ILeftWorkTempRepository leftWorkTempRepository, IUidService uidService, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository, IPersonnelCodeRepository personnelCodeRepository, IEmployeeClientTempRepository employeeClientTempRepository, ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository, ILeftWorkRepository leftWorkRepository, IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository, ILeftWorkInsuranceRepository leftWorkInsuranceRepository) : base(context)
+    {
+        _context = context;
+        _WorkShopRepository = workShopRepository;
+        _webHostEnvironment = webHostEnvironment;
+        _rollCallEmployeeStatusApplication = rollCallEmployeeStatusApplication;
+        _rollCallEmployeeRepository = rollCallEmployeeRepository;
+        _customizeWorkshopSettingsApplication = customizeWorkshopSettingsApplication;
+        _employeeDocumentsApplication = employeeDocumentsApplication;
+        _employeeBankInformationApplication = employeeBankInformationApplication;
+        _leftWorkTempRepository = leftWorkTempRepository;
+        _uidService = uidService;
+        _customizeWorkshopEmployeeSettingsRepository = customizeWorkshopEmployeeSettingsRepository;
+        _personnelCodeRepository = personnelCodeRepository;
+        _employeeClientTempRepository = employeeClientTempRepository;
+        _leftWorkRepository = leftWorkRepository;
+        _employeeAuthorizeTempRepository = employeeAuthorizeTempRepository;
+        _leftWorkInsuranceRepository = leftWorkInsuranceRepository;
+        _EmployeeRepository = employeeRepository;
+    }
 
-	public OperationResult Create(CreateEmployee command)
+    public OperationResult Create(CreateEmployee command)
     {
         var opration = new OperationResult();
         if (_EmployeeRepository.Exists(x =>
@@ -1125,12 +1122,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 rollCallEmployee.HasImage();
                 _rollCallEmployeeRepository.Create(rollCallEmployee);
                 _rollCallEmployeeRepository.SaveChanges();
-				string employeeFullName = employee.FName + " " + employee.LName;
-				var res = _faceEmbeddingService.GenerateEmbeddingsAsync(employee.id,command.WorkshopId,employeeFullName, filePath1,filePath2).GetAwaiter().GetResult();
-                if (!res.IsSuccedded)
-                {
-                    return op.Failed(res.Message);
-                }
 
             }
 
@@ -1685,6 +1676,10 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
     }
 
+    public async Task<List<EmployeeSelectListViewModel>> GetWorkingEmployeesSelectList(long workshopId)
+    {
+        return await _EmployeeRepository.GetWorkingEmployeesSelectList(workshopId);
+    }
 
     #endregion
 

CompanyManagment.Application/EmployeeFaceEmbeddingApplication.cs

@@ -1,170 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Company.Domain.EmployeeFaceEmbeddingAgg;
-using CompanyManagment.App.Contracts.EmployeeFaceEmbedding;
-
-namespace CompanyManagment.Application;
-
-public class EmployeeFaceEmbeddingApplication : IEmployeeFaceEmbeddingApplication
-{
-    private readonly IEmployeeFaceEmbeddingRepository _repository;
-
-    public EmployeeFaceEmbeddingApplication(IEmployeeFaceEmbeddingRepository repository)
-    {
-        _repository = repository;
-    }
-
-    public async Task<EmployeeFaceEmbeddingDto> GetByIdAsync(string id)
-    {
-        var entity = await _repository.GetByIdAsync(id);
-        return entity == null ? null : MapToDto(entity);
-    }
-
-    public async Task<EmployeeFaceEmbeddingDto> GetByEmployeeIdAsync(long employeeId)
-    {
-        var entity = await _repository.GetByEmployeeIdAsync(employeeId);
-        return entity == null ? null : MapToDto(entity);
-    }
-
-    public async Task<List<EmployeeFaceEmbeddingDto>> GetByWorkshopIdAsync(long workshopId)
-    {
-        var entities = await _repository.GetByWorkshopIdAsync(workshopId);
-        return entities.Select(MapToDto).ToList();
-    }
-
-    public async Task<List<EmployeeFaceEmbeddingDto>> GetByWorkshopIdsAsync(List<long> workshopIds)
-    {
-        var entities = await _repository.GetByWorkshopIdsAsync(workshopIds);
-        return entities.Select(MapToDto).ToList();
-    }
-
-    public async Task<string> SaveAsync(EmployeeFaceEmbeddingDto dto)
-    {
-        if (string.IsNullOrWhiteSpace(dto.Id))
-        {
-            // ایجاد جدید
-            var metadata = MapMetadataFromDto(dto.Metadata);
-            var entity = new EmployeeFaceEmbedding(
-                dto.EmployeeFullName,
-                dto.EmployeeId,
-                dto.WorkshopId,
-                dto.Embeddings,
-                metadata
-            );
-
-            await _repository.CreateAsync(entity);
-            return entity.Id;
-        }
-        else
-        {
-            // به‌روزرسانی
-            var entity = await _repository.GetByIdAsync(dto.Id);
-            if (entity == null)
-                throw new Exception($"EmployeeFaceEmbedding با شناسه {dto.Id} یافت نشد");
-
-            entity.UpdateEmployeeInfo(dto.EmployeeFullName, dto.WorkshopId);
-            entity.UpdateEmbedding(dto.Embeddings, 0, 0);
-            entity.UpdateMetadata(MapMetadataFromDto(dto.Metadata), 0, 0);
-
-            await _repository.UpdateAsync(entity);
-            return entity.Id;
-        }
-    }
-
-    public async Task DeleteAsync(string id)
-    {
-        await _repository.DeleteAsync(id);
-    }
-
-    #region Mapping Methods
-
-    private EmployeeFaceEmbeddingDto MapToDto(EmployeeFaceEmbedding entity)
-    {
-        return new EmployeeFaceEmbeddingDto
-        {
-            Id = entity.Id,
-            EmployeeFullName = entity.EmployeeFullName,
-            EmployeeId = entity.EmployeeId,
-            WorkshopId = entity.WorkshopId,
-            Embeddings = entity.Embeddings,
-            Metadata = MapMetadataToDto(entity.Metadata)
-        };
-    }
-
-    private EmployeeFaceEmbeddingMetadataDto MapMetadataToDto(EmployeeFaceEmbeddingMetadata metadata)
-    {
-        if (metadata == null) return null;
-
-        return new EmployeeFaceEmbeddingMetadataDto
-        {
-            AvgEyeDistanceNormalized = metadata.AvgEyeDistanceNormalized,
-            AvgEyeToFaceRatio = metadata.AvgEyeToFaceRatio,
-            AvgFaceAspectRatio = metadata.AvgFaceAspectRatio,
-            AvgDetectionConfidence = metadata.AvgDetectionConfidence,
-            AvgKeypointsNormalized = MapKeypointsToDto(metadata.AvgKeypointsNormalized),
-            PerImageMetadata = metadata.PerImageMetadata?.Select(x => new ImageMetadataDto
-            {
-                FaceAspectRatio = x.FaceAspectRatio,
-                EyeDistanceNormalized = x.EyeDistanceNormalized,
-                EyeToFaceRatio = x.EyeToFaceRatio,
-                DetectionConfidence = x.DetectionConfidence,
-                KeypointsNormalized = MapKeypointsToDto(x.KeypointsNormalized)
-            }).ToList()
-        };
-    }
-
-    private EmployeeFaceEmbeddingKeypointsDto MapKeypointsToDto(EmployeeFaceEmbeddingKeypoints keypoints)
-    {
-        if (keypoints == null) return null;
-
-        return new EmployeeFaceEmbeddingKeypointsDto
-        {
-            LeftEye = keypoints.LeftEye,
-            RightEye = keypoints.RightEye,
-            Nose = keypoints.Nose,
-            MouthLeft = keypoints.MouthLeft,
-            MouthRight = keypoints.MouthRight
-        };
-    }
-
-    private EmployeeFaceEmbeddingMetadata MapMetadataFromDto(EmployeeFaceEmbeddingMetadataDto dto)
-    {
-        if (dto == null) return null;
-
-        return new EmployeeFaceEmbeddingMetadata
-        {
-            AvgEyeDistanceNormalized = dto.AvgEyeDistanceNormalized,
-            AvgEyeToFaceRatio = dto.AvgEyeToFaceRatio,
-            AvgFaceAspectRatio = dto.AvgFaceAspectRatio,
-            AvgDetectionConfidence = dto.AvgDetectionConfidence,
-            AvgKeypointsNormalized = MapKeypointsFromDto(dto.AvgKeypointsNormalized),
-            PerImageMetadata = dto.PerImageMetadata?.Select(x => new ImageMetadata
-            {
-                FaceAspectRatio = x.FaceAspectRatio,
-                EyeDistanceNormalized = x.EyeDistanceNormalized,
-                EyeToFaceRatio = x.EyeToFaceRatio,
-                DetectionConfidence = x.DetectionConfidence,
-                KeypointsNormalized = MapKeypointsFromDto(x.KeypointsNormalized)
-            }).ToList()
-        };
-    }
-
-    private EmployeeFaceEmbeddingKeypoints MapKeypointsFromDto(EmployeeFaceEmbeddingKeypointsDto dto)
-    {
-        if (dto == null) return null;
-
-        return new EmployeeFaceEmbeddingKeypoints
-        {
-            LeftEye = dto.LeftEye,
-            RightEye = dto.RightEye,
-            Nose = dto.Nose,
-            MouthLeft = dto.MouthLeft,
-            MouthRight = dto.MouthRight
-        };
-    }
-
-    #endregion
-}
-

CompanyManagment.Application/Helpers/ApkHelper.cs

@@ -1,132 +0,0 @@
-
-using System;
-using System.IO;
-using System.IO.Compression;
-using System.Text.RegularExpressions;
-
-namespace CompanyManagment.Application.Helpers
-{
-    public class ApkInfo
-    {
-        public string VersionName { get; set; } = string.Empty;
-        public string VersionCode { get; set; } = string.Empty;
-        public string PackageName { get; set; } = string.Empty;
-        public string ApplicationLabel { get; set; } = string.Empty;
-    }
-
-    public static class ApkHelper
-    {
-        public static ApkInfo ReadApkInfo(Stream apkStream)
-        {
-            var apkInfo = new ApkInfo();
-
-            try
-            {
-                using var archive = new ZipArchive(apkStream, ZipArchiveMode.Read, true);
-                var manifestEntry = archive.GetEntry("AndroidManifest.xml");
-                
-                if (manifestEntry == null)
-                {
-                    throw new InvalidOperationException("AndroidManifest.xml not found in APK file");
-                }
-
-                using var manifestStream = manifestEntry.Open();
-                using var memoryStream = new MemoryStream();
-                manifestStream.CopyTo(memoryStream);
-                var manifestBytes = memoryStream.ToArray();
-
-                // Parse the binary AndroidManifest.xml
-                apkInfo = ParseBinaryManifest(manifestBytes);
-
-                // Validate that we found at least version information
-                if (string.IsNullOrEmpty(apkInfo.VersionCode) && string.IsNullOrEmpty(apkInfo.VersionName))
-                {
-                    throw new InvalidOperationException("Could not extract version information from APK");
-                }
-
-                return apkInfo;
-            }
-            catch (Exception ex)
-            {
-                throw new InvalidOperationException($"Error reading APK file: {ex.Message}", ex);
-            }
-        }
-
-        private static ApkInfo ParseBinaryManifest(byte[] manifestBytes)
-        {
-            var apkInfo = new ApkInfo();
-            
-            try
-            {
-                // Convert bytes to string for regex parsing
-                var text = System.Text.Encoding.UTF8.GetString(manifestBytes);
-                
-                // Extract package name
-                var packageMatch = Regex.Match(text, @"package[^a-zA-Z]+([a-zA-Z][a-zA-Z0-9_]*(?:\.[a-zA-Z][a-zA-Z0-9_]*)+)", RegexOptions.IgnoreCase);
-                if (packageMatch.Success)
-                {
-                    apkInfo.PackageName = packageMatch.Groups[1].Value;
-                }
-                
-                // Extract version code - look for numeric values that could be version codes
-                var versionCodeMatch = Regex.Match(text, @"versionCode[^\d]*(\d+)", RegexOptions.IgnoreCase);
-                if (versionCodeMatch.Success)
-                {
-                    apkInfo.VersionCode = versionCodeMatch.Groups[1].Value;
-                }
-                else
-                {
-                    // Fallback: try to find reasonable numeric values
-                    var numbers = Regex.Matches(text, @"\b(\d{1,8})\b");
-                    foreach (Match numMatch in numbers)
-                    {
-                        if (int.TryParse(numMatch.Groups[1].Value, out int num) && num > 0 && num < 99999999)
-                        {
-                            apkInfo.VersionCode = num.ToString();
-                            break;
-                        }
-                    }
-                }
-                
-                // Extract version name
-                var versionNameMatch = Regex.Match(text, @"versionName[^\d]*(\d+(?:\.\d+)*(?:\.\d+)*)", RegexOptions.IgnoreCase);
-                if (versionNameMatch.Success)
-                {
-                    apkInfo.VersionName = versionNameMatch.Groups[1].Value;
-                }
-                else
-                {
-                    // Fallback: look for version-like patterns
-                    var versionMatch = Regex.Match(text, @"\b(\d+\.\d+(?:\.\d+)*)\b");
-                    if (versionMatch.Success)
-                    {
-                        apkInfo.VersionName = versionMatch.Groups[1].Value;
-                    }
-                }
-                
-                // Set defaults if nothing found
-                if (string.IsNullOrEmpty(apkInfo.VersionCode))
-                    apkInfo.VersionCode = "1";
-                    
-                if (string.IsNullOrEmpty(apkInfo.VersionName))
-                    apkInfo.VersionName = "1.0";
-                    
-                if (string.IsNullOrEmpty(apkInfo.PackageName))
-                    apkInfo.PackageName = "unknown.package";
-
-                return apkInfo;
-            }
-            catch (Exception)
-            {
-                // Return default values if parsing fails
-                return new ApkInfo
-                {
-                    VersionCode = "1",
-                    VersionName = "1.0",
-                    PackageName = "unknown.package"
-                };
-            }
-        }
-    }
-}
-

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -1140,7 +1140,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             CreateContractingPartyAccount(contractingParty.id, res.SendId);
 
 
-        await _smsService.SendInstitutionCreationVerificationLink(contractingParty.Phone, contractingPartyFullName,
+        await _smsService.SendInstitutionVerificationLink(contractingParty.Phone, contractingPartyFullName,
             entity.PublicId, contractingParty.id,entity.id );
 
         await _institutionContractRepository.SaveChangesAsync();
@@ -1377,7 +1377,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         if (contractingParty == null)
             throw new NotFoundException("طرف قرارداد یافت نشد");
         var contractingPartyFullName = contractingParty.FName + " " + contractingParty.LName;
-         await _smsService.SendInstitutionCreationVerificationLink(contractingParty.Phone, contractingPartyFullName,
+         await _smsService.SendInstitutionVerificationLink(contractingParty.Phone, contractingPartyFullName,
             institutionContract.PublicId, contractingParty.id, institutionContract.id);
         return new OperationResult().Succcedded();
     }
@@ -1387,11 +1387,6 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return (await _institutionContractRepository.PrintAllAsync([id])).FirstOrDefault();
     }
 
-    public Task<GetInstitutionContractWorkshopsDetails> GetContractWorkshopsDetails(long id)
-    {
-        return _institutionContractRepository.GetContractWorkshopsDetails(id);
-    }
-
 
     private async Task<OperationResult<PersonalContractingParty>> CreateLegalContractingPartyEntity(
         CreateInstitutionContractLegalPartyRequest request, long representativeId, string address, string city,

CompanyManagment.Application/InsuranceListApplication.cs

@@ -1707,7 +1707,7 @@ public class InsuranceListApplication : IInsuranceListApplication
 		return result;
 	}
 
-    public double? GetDailyWageFixedSalary(string year, long workshopId, long employeeId, DateTime? startDateGr, DateTime? endDateGr, long jobId, string population, long? insuranceJobId)
+    private double? GetDailyWageFixedSalary(string year, long workshopId, long employeeId, DateTime? startDateGr, DateTime? endDateGr, long jobId, string population, long? insuranceJobId)
     {
 
         double? result = 0;
@@ -1858,7 +1858,7 @@ public class InsuranceListApplication : IInsuranceListApplication
     /// <param name="jobId"></param>
     /// <param name="employeeId"></param>
     /// <returns></returns>
-    public double GetMonthlyBenefits(int endMonthCurrentDay, double consumableItemsItemValue, double housingAllowanceItemValue, double maritalStatus, int countWorkingDays, string typeOfInsuranceSendWorkshop, long jobId, long employeeId, bool includeStatus)
+    private double GetMonthlyBenefits(int endMonthCurrentDay, double consumableItemsItemValue, double housingAllowanceItemValue, double maritalStatus, int countWorkingDays, string typeOfInsuranceSendWorkshop, long jobId, long employeeId, bool includeStatus)
     {
         //ToDo
         //افزودن شرط مشمول مزایای
@@ -1898,7 +1898,7 @@ public class InsuranceListApplication : IInsuranceListApplication
 
 
 
-    public double ComputeDailyWage(double yearlysalaryItemValue, long employeeId, long workshopId, string year)
+    private double ComputeDailyWage(double yearlysalaryItemValue, long employeeId, long workshopId, string year)
     {
         double dailyWage = yearlysalaryItemValue;
         InsuranceListSearchModel searchModel = new InsuranceListSearchModel();

CompanyManagment.Application/LeftWorkApplication.cs

@@ -30,14 +30,13 @@ public class LeftWorkApplication : ILeftWorkApplication
     private readonly IEmployeeRepository _employeeRepository;
     private readonly IWorkshopRepository _workshopRepository;
     private readonly IRollCallEmployeeRepository _rollCallEmployeeRepository;
-    private readonly IRollCallEmployeeStatusRepository _rollCallEmployeeStatusRepository;
+	private readonly IRollCallEmployeeStatusRepository _rollCallEmployeeStatusRepository;
 
 
-    public LeftWorkApplication(ILeftWorkRepository leftWorkRepository, IContractRepository contractRepository,
+	public LeftWorkApplication(ILeftWorkRepository leftWorkRepository, IContractRepository contractRepository,
         IContractApplication contractApplication, IWorkingHoursApplication workingHoursApplication,
         IWorkingHoursItemsApplication workingHoursItemsApplication, IEmployeeRepository employeeRepository,
-        IWorkshopRepository workshopRepository, IRollCallEmployeeStatusRepository rollCallEmployeeStatusRepository,
-        IRollCallEmployeeRepository rollCallEmployeeRepository)
+        IWorkshopRepository workshopRepository, IRollCallEmployeeStatusRepository rollCallEmployeeStatusRepository, IRollCallEmployeeRepository rollCallEmployeeRepository)
     {
         _leftWorkRepository = leftWorkRepository;
         _contractRepository = contractRepository;
@@ -52,6 +51,7 @@ public class LeftWorkApplication : ILeftWorkApplication
 
     public OperationResult Create(CreateLeftWork command)
     {
+
         //   var Contracts = _contractRepository.Search(new ContractSearchModel()
         //   {
         //       EmployeeId = command.EmployeeId,
@@ -70,6 +70,7 @@ public class LeftWorkApplication : ILeftWorkApplication
         var start = command.StartWorkDate.ToGeorgianDateTime();
 
 
+
         //if (_leftWorkRepository.Exists(x =>
         //    x.StartWorkDate > start && x.EmployeeId == command.EmployeeId && x.WorkshopId == command.WorkshopId))
         //    return operation.Failed("تاریخ وارد شده کوچکتر از سابقه  شروع به کار قبلی است");
@@ -111,17 +112,16 @@ public class LeftWorkApplication : ILeftWorkApplication
             return operation.Failed("تاریخ وارد شده در بازه زمانی سابقه ترک کار قبلی است");
 
         var employeeFullName = _employeeRepository.GetDetails(command.EmployeeId).EmployeeFullName;
-        var workshop = _workshopRepository.GetDetails(command.WorkshopId);
-        var workshopName = workshop.WorkshopFullName;
+       var workshop = _workshopRepository.GetDetails(command.WorkshopId);
+       var workshopName = workshop.WorkshopFullName;
         var leftWork = new LeftWork(left, start, command.WorkshopId,
             command.EmployeeId, employeeFullName, workshopName, command.JobId, command.IncludeStatus,
-            command.AddBonusesPay, command.AddYearsPay, command.AddLeavePay, workshop.ComputeOptions,
-            workshop.BonusesOptions);
+            command.AddBonusesPay, command.AddYearsPay, command.AddLeavePay,workshop.ComputeOptions,workshop.BonusesOptions);
         _leftWorkRepository.Create(leftWork);
         _leftWorkRepository.SaveChanges();
-        IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(command.EmployeeId, command.WorkshopId);
+        IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(command.EmployeeId);
 
-        return operation.Succcedded();
+		return operation.Succcedded();
     }
 
     //public OperationResult Create(CreateLeftWork command)
@@ -193,8 +193,8 @@ public class LeftWorkApplication : ILeftWorkApplication
             command.EmployeeId, command.JobId, command.IncludeStatus, command.AddBonusesPay, command.AddYearsPay,
             command.AddLeavePay);
         _leftWorkRepository.SaveChanges();
-        IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(command.EmployeeId, command.WorkshopId);
-        return operation.Succcedded();
+        IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(command.EmployeeId);
+		return operation.Succcedded();
     }
 
     public EditLeftWork GetDetails(long id)
@@ -214,9 +214,11 @@ public class LeftWorkApplication : ILeftWorkApplication
 
     public List<LeftWorkViewModel> SearchCreateContract(LeftWorkSearchModel searchModel)
     {
+
         return _leftWorkRepository.SearchCreateContract(searchModel);
     }
 
+ 
 
     public async Task<List<LeftWorkViewModel>> searchAsync(LeftWorkSearchModel searchModel)
     {
@@ -226,6 +228,7 @@ public class LeftWorkApplication : ILeftWorkApplication
 
     public string GetBeforeDate(string date)
     {
+
         var persianBefore = "";
         var year = Convert.ToInt32(date.Substring(0, 4));
         var month = Convert.ToInt32(date.Substring(5, 2));
@@ -252,8 +255,10 @@ public class LeftWorkApplication : ILeftWorkApplication
     }
 
 
+
     public void LeftWorkExtension(long contractId, string CStart, string CEnd)
     {
+
         var step1 = _contractApplication.GetDetails(contractId);
         var step2 = _workingHoursApplication.GetByContractId(contractId);
         var step3 = _workingHoursItemsApplication.GetWorkingHoursItems();
@@ -375,11 +380,13 @@ public class LeftWorkApplication : ILeftWorkApplication
             ContarctStart = CStart,
             ContractEnd = CEnd,
             GetWorkDateHide = step1.GetWorkDate,
+
         };
         var step5 = _contractApplication.MandatoryHours(computing);
         string workingDays = string.Empty;
         if (step5.NumberOfWorkingDays == "0")
         {
+
             workingDays = step5.ComplexNumberOfWorkingDays;
         }
         else
@@ -470,6 +477,8 @@ public class LeftWorkApplication : ILeftWorkApplication
             OverTimeWorkM = step5.OverTimeWorkM == "0" ? "" : step5.OverTimeWorkM,
             OverNightWorkH = step5.OverNightWorkH == "0" ? "" : step5.OverNightWorkH,
             OverNightWorkM = step5.OverNightWorkM == "0" ? "" : step5.OverNightWorkM,
+
+
         };
         var resss = _contractApplication.Create(createNew);
     }
@@ -520,9 +529,7 @@ public class LeftWorkApplication : ILeftWorkApplication
                 item.LeftWorkDate = string.IsNullOrWhiteSpace(item.LeftWorkDate) ? "1500/01/01" : item.LeftWorkDate;
                 var left = item.LeftWorkDate.ToGeorgianDateTime();
                 var start = item.StartWorkDate.ToGeorgianDateTime();
-                if (_leftWorkRepository.Exists(x =>
-                        x.StartWorkDate > start && left == null && x.EmployeeId == informationLeftwork.EmployeeId &&
-                        x.WorkshopId == informationLeftwork.WorkshopId && x.id != item.Id))
+                if (_leftWorkRepository.Exists(x => x.StartWorkDate > start && left == null && x.EmployeeId == informationLeftwork.EmployeeId && x.WorkshopId == informationLeftwork.WorkshopId  && x.id!=item.Id))
                     return operation.Failed("وارد کردن تاریخ پایان کار اجباری است ");
                 if (_leftWorkRepository.Exists(x =>
                         x.StartWorkDate == start && x.EmployeeId == informationLeftwork.EmployeeId &&
@@ -533,23 +540,17 @@ public class LeftWorkApplication : ILeftWorkApplication
                         x.EmployeeId == informationLeftwork.EmployeeId &&
                         x.WorkshopId == informationLeftwork.WorkshopId && x.id != item.Id))
                     return operation.Failed("شروع به کار قبلی این شخص ترک کار ندارد ");
-                if (_leftWorkRepository.Exists(x =>
-                        x.StartWorkDate <= start && x.LeftWorkDate < left && x.LeftWorkDate >= start &&
-                        x.EmployeeId == informationLeftwork.EmployeeId &&
-                        x.WorkshopId == informationLeftwork.WorkshopId && x.id != item.Id))
+                if (_leftWorkRepository.Exists(x => x.StartWorkDate <= start && x.LeftWorkDate < left && x.LeftWorkDate >= start && x.EmployeeId == informationLeftwork.EmployeeId && x.WorkshopId == informationLeftwork.WorkshopId && x.id != item.Id))
                     return operation.Failed("تاریخ وارد شده در بازه زمانی سابقه ترک کار قبلی است");
             }
         }
 
-        operation = _leftWorkRepository.CreateLeftWork(informationLeftwork);
-        if (informationLeftwork != null && operation.IsSuccedded)
-            IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(informationLeftwork.EmployeeId,
-                informationLeftwork.WorkshopId);
-        return operation;
-    }
+		operation = _leftWorkRepository.CreateLeftWork(informationLeftwork);
+		if (informationLeftwork != null && operation.IsSuccedded) IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(informationLeftwork.EmployeeId);
+		return operation;
+	}
 
-    public OperationResult CreateLeftWorkByLeftWorkGroups(string employeeFullName, long commandEmployeeId,
-        List<PersonnelCodeViewModel> commandPersonnelCode, List<LeftWorkGroup> leftWorkGroups)
+    public OperationResult CreateLeftWorkByLeftWorkGroups(string employeeFullName, long commandEmployeeId, List<PersonnelCodeViewModel> commandPersonnelCode, List<LeftWorkGroup> leftWorkGroups)
     {
         var operation = new OperationResult();
 
@@ -559,9 +560,7 @@ public class LeftWorkApplication : ILeftWorkApplication
             {
                 foreach (var item2 in item.LeftWorkViewModels)
                 {
-                    item2.LeftWorkDate = string.IsNullOrWhiteSpace(item2.LeftWorkDate)
-                        ? "1500/01/01"
-                        : item2.LeftWorkDate;
+                    item2.LeftWorkDate = string.IsNullOrWhiteSpace(item2.LeftWorkDate) ? "1500/01/01" : item2.LeftWorkDate;
                     var left = item2.LeftWorkDate.ToGeorgianDateTime();
                     var start = item2.StartWorkDate.ToGeorgianDateTime();
                     if (_leftWorkRepository.Exists(x =>
@@ -587,16 +586,14 @@ public class LeftWorkApplication : ILeftWorkApplication
             }
         }
 
-        operation = _leftWorkRepository.CreateLeftWorkByLeftWorkGroups(employeeFullName, commandEmployeeId,
-            commandPersonnelCode, leftWorkGroups);
-        if (operation.IsSuccedded)
-            IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(commandEmployeeId);
-        return operation;
-    }
+		operation = _leftWorkRepository.CreateLeftWorkByLeftWorkGroups(employeeFullName, commandEmployeeId, commandPersonnelCode, leftWorkGroups);
+		if (operation.IsSuccedded) IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(commandEmployeeId);
+		return operation;
+	}
 
     public OperationResult CheckDeleteLeftWork(long workshopId, long employeeId, string date, int type)
     {
-        return _leftWorkRepository.CheckDeleteLeftWork(workshopId, employeeId, date.ToGeorgianDateTime(), type);
+        return _leftWorkRepository.CheckDeleteLeftWork( workshopId, employeeId, date.ToGeorgianDateTime(),type);
     }
 
     public OperationResult CheckEditLeftWork(long workshopId, long employeeId, string date, int type)
@@ -610,23 +607,21 @@ public class LeftWorkApplication : ILeftWorkApplication
     }
 
     #region Pooya
-
     //این متد ترک کار های کارمند را با فعالیت حضور غیاب یکپارچه می کند
     private void IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(long employeeId)
     {
         //get last leftworks for employee in all workshops
-        var leftWorks = _leftWorkRepository.search(new LeftWorkSearchModel() { EmployeeId = employeeId })
-            .GroupBy(x => x.WorkshopId).Select(x =>
+        var leftWorks = _leftWorkRepository.search(new LeftWorkSearchModel() { EmployeeId = employeeId }).GroupBy(x => x.WorkshopId).Select(x =>
+        {
+            var leftWork = x.MaxBy(y => y.StartWorkDateGr);
+            return new LeftWorkViewModel()
             {
-                var leftWork = x.MaxBy(y => y.StartWorkDateGr);
-                return new LeftWorkViewModel()
-                {
-                    EmployeeId = employeeId,
-                    WorkshopId = x.Key,
-                    LeftWorkDateGr = leftWork.LeftWorkDateGr.Date.AddDays(-1),
-                    StartWorkDateGr = leftWork.StartWorkDateGr
-                };
-            }).ToList();
+                EmployeeId = employeeId,
+                WorkshopId = x.Key,
+                LeftWorkDateGr = leftWork.LeftWorkDateGr.Date.AddDays(-1),
+                StartWorkDateGr = leftWork.StartWorkDateGr
+            };
+        }).ToList();
 
         //get rollCallEmployee associated with those leftworks which have a higher end date than leftworkDate
         var rollCallsEmployee = _rollCallEmployeeRepository.GetByEmployeeIdWithStatuses(employeeId)
@@ -637,90 +632,17 @@ public class LeftWorkApplication : ILeftWorkApplication
             x.WorkshopId,
             x.EmployeeId,
             y.LeftWorkDateGr,
-            Status = x.Statuses.OrderByDescending(z => z.StartDate).FirstOrDefault(z =>
-                z.StartDateGr.Date < y.LeftWorkDateGr && z.EndDateGr.Date > y.LeftWorkDateGr)
+            Status = x.Statuses.OrderByDescending(z => z.StartDate).FirstOrDefault(z => z.StartDateGr.Date < y.LeftWorkDateGr && z.EndDateGr.Date > y.LeftWorkDateGr)
         });
 
         //shaping up the list to send as parameter to repository
-        var newRollCallRecords = joinedList.Where(x => x.Status != null).Select(x =>
-            new AdjustRollCallEmployeesWithEmployeeLeftWork()
-            {
-                LeaveDate = x.LeftWorkDateGr,
-                RollCallStatusId = x.Status.Id
-            }).ToList();
-        if (newRollCallRecords.Count > 0)
+        var newRollCallRecords = joinedList.Where(x => x.Status != null).Select(x => new AdjustRollCallEmployeesWithEmployeeLeftWork()
+        {
+            LeaveDate = x.LeftWorkDateGr,
+            RollCallStatusId = x.Status.Id
+        }).ToList();
+        if(newRollCallRecords.Count > 0)
             _rollCallEmployeeStatusRepository.AdjustRollCallStatusEndDates(newRollCallRecords);
-
-        foreach (var rollCallEmployeeViewModel in rollCallsEmployee)
-        {
-            var maxLeftWork = leftWorks.FirstOrDefault(x => x.WorkshopId == rollCallEmployeeViewModel.WorkshopId);
-            if (maxLeftWork == null)
-            {
-                continue;
-            }
-
-            var employeeStatus = _rollCallEmployeeRepository.GetBy(rollCallEmployeeViewModel.EmployeeId,
-                rollCallEmployeeViewModel.WorkshopId);
-            var rollCallEmployeeStatusList = employeeStatus.EmployeesStatus
-                .Where(x => x.StartDate >= maxLeftWork.LeftWorkDateGr).ToList();
-            if (rollCallEmployeeStatusList.Any())
-            {
-                _rollCallEmployeeStatusRepository.RemoveRange(rollCallEmployeeStatusList);
-                _rollCallEmployeeStatusRepository.SaveChanges();
-            }
-        }
-    }
-
-    private void IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(long employeeId, long workshopId)
-    {
-        //get last leftworks for employee in all workshops
-        var leftWorks = _leftWorkRepository.search(new LeftWorkSearchModel()
-                { EmployeeId = employeeId, WorkshopId = workshopId })
-            .Select(x => new LeftWorkViewModel()
-            {
-                EmployeeId = employeeId,
-                WorkshopId = x.WorkshopId,
-                LeftWorkDateGr = x.LeftWorkDateGr.Date.AddDays(-1),
-                StartWorkDateGr = x.StartWorkDateGr
-            }).ToList();
-
-        var maxLeftWork = leftWorks.MaxBy(y => y.StartWorkDateGr);
-
-
-        //get rollCallEmployee associated with those leftworks which have a higher end date than leftworkDate
-        var rollCallsEmployee = _rollCallEmployeeRepository.GetBy(employeeId, workshopId);
-
-        // var joinedList = rollCallsEmployee.Join(leftWorks, x => x.WorkshopId, y => y.WorkshopId, (x, y) => new
-        // {
-        //     x.WorkshopId,
-        //     x.EmployeeId,
-        //     y.LeftWorkDateGr,
-        //     Status = x.Statuses.OrderByDescending(z => z.StartDate).FirstOrDefault(z => z.StartDateGr.Date < y.LeftWorkDateGr && z.EndDateGr.Date > y.LeftWorkDateGr)
-        // });
-
-
-        var status = rollCallsEmployee.EmployeesStatus.OrderByDescending(z => z.StartDate)
-            .FirstOrDefault(rollCallEmployeeStatus => rollCallEmployeeStatus.StartDate.Date < maxLeftWork.LeftWorkDateGr
-                                                      && rollCallEmployeeStatus.EndDate.Date >
-                                                      maxLeftWork.LeftWorkDateGr);
-
-        if (status != null)
-        {
-            var adjust = new AdjustRollCallEmployeesWithEmployeeLeftWork()
-            {
-                LeaveDate = maxLeftWork.LeftWorkDateGr,
-                RollCallStatusId = status.id
-            };
-            _rollCallEmployeeStatusRepository.AdjustRollCallStatusEndDates([adjust]);
-        }
-
-        var rollCallEmployeeStatusList = rollCallsEmployee.EmployeesStatus
-            .Where(x => x.StartDate >= maxLeftWork.LeftWorkDateGr).ToList();
-        if (rollCallEmployeeStatusList.Any())
-        {
-            _rollCallEmployeeStatusRepository.RemoveRange(rollCallEmployeeStatusList);
-            _rollCallEmployeeStatusRepository.SaveChanges();
-        }
     }
 
     #endregion

CompanyManagment.Application/LeftWorkTempApplication.cs

@@ -27,30 +27,26 @@ namespace CompanyManagment.Application;
 
 public class LeftWorkTempApplication : ILeftWorkTempApplication
 {
-    private readonly ILeftWorkTempRepository _leftWorkTempRepository;
-    private readonly ILeftWorkRepository _leftWorkRepository;
-    private readonly IWorkshopRepository _workshopRepository;
-    private readonly IEmployeeRepository _employeeRepository;
-    private readonly IJobRepository _jobRepository;
-    private readonly ICheckoutRepository _checkoutRepository;
-    private readonly IContractRepository _contractRepository;
+	private readonly ILeftWorkTempRepository _leftWorkTempRepository;
+	private readonly ILeftWorkRepository _leftWorkRepository;
+	private readonly IWorkshopRepository _workshopRepository;
+	private readonly IEmployeeRepository _employeeRepository;
+	private readonly IJobRepository _jobRepository;
+	private readonly ICheckoutRepository _checkoutRepository;
+	private readonly IContractRepository _contractRepository;
     private readonly IRollCallEmployeeRepository _rollCallEmployeeRepository;
     private readonly IRollCallEmployeeStatusRepository _rollCallEmployeeStatusRepository;
 
 
-    public LeftWorkTempApplication(ILeftWorkTempRepository leftWorkTempRepository,
-        ILeftWorkRepository leftWorkRepository, IWorkshopRepository workshopRepository,
-        IEmployeeRepository employeeRepository, IJobRepository jobRepository, ICheckoutRepository checkoutRepository,
-        IContractRepository contractRepository, IRollCallEmployeeStatusRepository rollCallEmployeeStatusRepository,
-        IRollCallEmployeeRepository rollCallEmployeeRepository)
-    {
-        _leftWorkTempRepository = leftWorkTempRepository;
-        _leftWorkRepository = leftWorkRepository;
-        _workshopRepository = workshopRepository;
-        _employeeRepository = employeeRepository;
-        _jobRepository = jobRepository;
-        _checkoutRepository = checkoutRepository;
-        _contractRepository = contractRepository;
+    public LeftWorkTempApplication(ILeftWorkTempRepository leftWorkTempRepository, ILeftWorkRepository leftWorkRepository, IWorkshopRepository workshopRepository, IEmployeeRepository employeeRepository, IJobRepository jobRepository, ICheckoutRepository checkoutRepository, IContractRepository contractRepository, IRollCallEmployeeStatusRepository rollCallEmployeeStatusRepository, IRollCallEmployeeRepository rollCallEmployeeRepository)
+	{
+		_leftWorkTempRepository = leftWorkTempRepository;
+		_leftWorkRepository = leftWorkRepository;
+		_workshopRepository = workshopRepository;
+		_employeeRepository = employeeRepository;
+		_jobRepository = jobRepository;
+		_checkoutRepository = checkoutRepository;
+		_contractRepository = contractRepository;
         _rollCallEmployeeStatusRepository = rollCallEmployeeStatusRepository;
         _rollCallEmployeeRepository = rollCallEmployeeRepository;
     }
@@ -63,16 +59,15 @@ public class LeftWorkTempApplication : ILeftWorkTempApplication
         {
             #region Validation
 
-            if (_leftWorkTempRepository.Exists(x => x.WorkshopId == command.WorkshopId && x.EmployeeId == employeeId))
+            if (_leftWorkTempRepository.Exists(x=>x.WorkshopId == command.WorkshopId && x.EmployeeId == employeeId))
             {
-                return op.Failed("برای پرسنل وارد شده قبلا درخواست ترک کار ثبت کرده اید");
+	            return op.Failed("برای پرسنل وارد شده قبلا درخواست ترک کار ثبت کرده اید");
             }
 
             if (command.LeftWorkTime.TryToGeorgianDateTime(out var leftWorkDateGr) == false)
             {
                 return op.Failed("تاریخ شروع به کار وارد شده نامعتبر است");
             }
-
             if (command.LastDayStanding.TryToGeorgianDateTime(out var lastDayStandingDateGr) == false)
             {
                 return op.Failed("تاریخ شروع به کار وارد شده نامعتبر است");
@@ -106,6 +101,7 @@ public class LeftWorkTempApplication : ILeftWorkTempApplication
             }
 
 
+
             //if (leftWork.StartWorkDate >= leftWorkDateGr)
             //{
             //    return op.Failed("ترک کار نمیتواند کوچک تر یا مساوی شروع به کار باشد");
@@ -125,10 +121,10 @@ public class LeftWorkTempApplication : ILeftWorkTempApplication
             //    return op.Failed("این پرسنل در تاریخ ترک کار وارد شده دارای قرارداد میباشد");
             //}
 
+
             #endregion
 
-            var leftWorkTemp = LeftWorkTemp.CreateLeftWork(leftWork.id, leftWork.StartWorkDate, leftWorkDateGr,
-                lastDayStandingDateGr,
+            var leftWorkTemp = LeftWorkTemp.CreateLeftWork(leftWork.id, leftWork.StartWorkDate, leftWorkDateGr, lastDayStandingDateGr,
                 command.WorkshopId, employeeId, leftWork.JobId);
 
             await _leftWorkTempRepository.CreateAsync(leftWorkTemp);
@@ -139,63 +135,61 @@ public class LeftWorkTempApplication : ILeftWorkTempApplication
     }
 
     public Task<GetStartWorkTempDetails> GetStartAndLeftWorkDetails(long employeeId, long workshopId)
-    {
-        return _leftWorkTempRepository.GetStartAndLeftWorkDetails(employeeId, workshopId);
-    }
+	{
+		return _leftWorkTempRepository.GetStartAndLeftWorkDetails(employeeId, workshopId);
+	}
 
-    public async Task<OperationResult> AcceptStartWork(AcceptStartWorkTemp command)
-    {
-        var op = new OperationResult();
-        if (command.StartDateTime.TryToGeorgianDateTime(out var startDateGr) == false)
-        {
-            return op.Failed("تاریخ شروع به کار وارد شده نامعتبر است");
-        }
+	public async Task<OperationResult> AcceptStartWork(AcceptStartWorkTemp command)
+	{
+		var op = new OperationResult();
+		if (command.StartDateTime.TryToGeorgianDateTime(out var startDateGr) == false)
+		{
+			return op.Failed("تاریخ شروع به کار وارد شده نامعتبر است");
+		}
 
-        var leftWorkTemp = _leftWorkTempRepository.Get(command.LeftWorkTempId);
+		var leftWorkTemp = _leftWorkTempRepository.Get(command.LeftWorkTempId);
 
-        if (leftWorkTemp.LeftWorkType != LeftWorkTempType.StartWork)
-        {
-            return op.Failed("اطلاعات وارد شده نامعتبر است");
-        }
+		if (leftWorkTemp.LeftWorkType != LeftWorkTempType.StartWork)
+		{
+			return op.Failed("اطلاعات وارد شده نامعتبر است");
+		}
 
-        if (_leftWorkRepository.Exists(x =>
-                x.WorkshopId == leftWorkTemp.WorkshopId && x.EmployeeId == leftWorkTemp.EmployeeId &&
-                x.LeftWorkDate >= startDateGr))
-        {
-            return op.Failed("شروع به کار وارد شده با ترک کار های قبلی تداخل دارد");
-        }
+		if (_leftWorkRepository.Exists(x => x.WorkshopId == leftWorkTemp.WorkshopId && x.EmployeeId == leftWorkTemp.EmployeeId && x.LeftWorkDate >= startDateGr))
+		{
+			return op.Failed("شروع به کار وارد شده با ترک کار های قبلی تداخل دارد");
+		}
 
 
-        if (_jobRepository.Exists(x => x.id == command.JobId) == false)
-        {
-            return op.Failed("سمت وارد شده نامعتبر است");
-        }
+		if (_jobRepository.Exists(x => x.id == command.JobId) == false)
+		{
+			return op.Failed("سمت وارد شده نامعتبر است");
+		}
 
-        var defaultTime = new DateTime(2121, 03, 21);
+		var defaultTime = new DateTime(2121, 03, 21);
 
-        var workshop = _workshopRepository.Get(leftWorkTemp.WorkshopId);
-        var employee = _employeeRepository.Get(leftWorkTemp.EmployeeId);
+		var workshop = _workshopRepository.Get(leftWorkTemp.WorkshopId);
+		var employee = _employeeRepository.Get(leftWorkTemp.EmployeeId);
 
-        var newLeftWork = new LeftWork(defaultTime, startDateGr, leftWorkTemp.WorkshopId, leftWorkTemp.EmployeeId,
-            employee.FullName, workshop.WorkshopFullName, command.JobId, false, false, false, false, "", "");
+		var newLeftWork = new LeftWork(defaultTime, startDateGr, leftWorkTemp.WorkshopId, leftWorkTemp.EmployeeId,
+			employee.FullName, workshop.WorkshopFullName, command.JobId, false, false, false, false, "", "");
 
-        await _leftWorkRepository.CreateAsync(newLeftWork);
-        _leftWorkTempRepository.Remove(leftWorkTemp);
-        var rollCallEmployee = _rollCallEmployeeRepository.GetBy(leftWorkTemp.EmployeeId, leftWorkTemp.WorkshopId);
+		await _leftWorkRepository.CreateAsync(newLeftWork);
+		_leftWorkTempRepository.Remove(leftWorkTemp);
+		var rollCallEmployee = _rollCallEmployeeRepository.GetBy(leftWorkTemp.EmployeeId, leftWorkTemp.WorkshopId);
 
-        var rollCallStatus = rollCallEmployee?.EmployeesStatus.MaxBy(x => x.StartDate);
+		var rollCallStatus = rollCallEmployee?.EmployeesStatus.MaxBy(x => x.StartDate);
 
-        if (rollCallStatus != null)
-        {
-            var startWork = newLeftWork.StartWorkDate;
-            rollCallStatus.Edit(startWork, rollCallStatus.EndDate);
-        }
+		if (rollCallStatus != null)
+		{
+			var startWork = newLeftWork.StartWorkDate;
+			rollCallStatus.Edit(startWork, rollCallStatus.EndDate);
 
-        await _leftWorkRepository.SaveChangesAsync();
-        await _leftWorkTempRepository.SaveChangesAsync();
+		}
+		await _leftWorkRepository.SaveChangesAsync();
+		await _leftWorkTempRepository.SaveChangesAsync();
 
-        return op.Succcedded();
-    }
+		return op.Succcedded();
+	}
 
     public async Task<OperationResult> AcceptLeftWork(AcceptLeftWorkTemp command)
     {
@@ -243,12 +237,9 @@ public class LeftWorkTempApplication : ILeftWorkTempApplication
                                             x.WorkshopId == leftWorkTemp.WorkshopId &&
                                             x.ContractStart <= lastDayStandingGr && x.ContractEnd >= lastDayStandingGr))
         {
-            return op.Failed(
-                "این پرسنل در تاریخ ترک کار وارد شده دارای فیش حقوقی میباشد. ابتدا فیش حقوقی پرسنل را حذف کنید ");
+            return op.Failed("این پرسنل در تاریخ ترک کار وارد شده دارای فیش حقوقی میباشد. ابتدا فیش حقوقی پرسنل را حذف کنید ");
         }
 
-        var transaction = await _rollCallEmployeeStatusRepository.BeginTransactionAsync();
-
         leftWork.Edit(leftWorkDateGr, leftWork.StartWorkDate, leftWork.WorkshopId, leftWork.EmployeeId, leftWork.JobId,
             leftWork.IncludeStatus, leftWork.AddBonusesPay, leftWork.AddYearsPay, leftWork.AddLeavePay);
 
@@ -256,9 +247,8 @@ public class LeftWorkTempApplication : ILeftWorkTempApplication
         await _leftWorkRepository.SaveChangesAsync();
         await _leftWorkTempRepository.SaveChangesAsync();
 
-        IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(leftWork.EmployeeId, leftWork.WorkshopId);
+        IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(leftWork.EmployeeId);
 
-        await transaction.CommitAsync();
         return op.Succcedded();
     }
 
@@ -269,59 +259,45 @@ public class LeftWorkTempApplication : ILeftWorkTempApplication
 
     public List<LeftWorkTempViewModel> GetLeftWorksByWorkshopId(long workshopId)
     {
-        return _leftWorkTempRepository.GetLeftWorksByWorkshopId(workshopId);
+	   return  _leftWorkTempRepository.GetLeftWorksByWorkshopId(workshopId);
+
     }
 
     //این متد ترک کار های کارمند را با فعالیت حضور غیاب یکپارچه می کند
-    private void IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(long employeeId, long workshopId)
+    private void IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(long employeeId)
     {
         //get last leftworks for employee in all workshops
-        var leftWorks = _leftWorkRepository.search(new LeftWorkSearchModel()
-                { EmployeeId = employeeId, WorkshopId = workshopId })
-            .Select(x => new LeftWorkViewModel()
+        var leftWorks = _leftWorkRepository.search(new LeftWorkSearchModel() { EmployeeId = employeeId }).GroupBy(x => x.WorkshopId).Select(x =>
+        {
+            var leftWork = x.MaxBy(y => y.StartWorkDateGr);
+            return new LeftWorkViewModel()
             {
                 EmployeeId = employeeId,
-                WorkshopId = x.WorkshopId,
-                LeftWorkDateGr = x.LeftWorkDateGr.Date.AddDays(-1),
-                StartWorkDateGr = x.StartWorkDateGr
-            }).ToList();
-
-        var maxLeftWork = leftWorks.MaxBy(y => y.StartWorkDateGr);
-
+                WorkshopId = x.Key,
+                LeftWorkDateGr = leftWork.LeftWorkDateGr.Date.AddDays(-1),
+                StartWorkDateGr = leftWork.StartWorkDateGr
+            };
+        }).ToList();
 
         //get rollCallEmployee associated with those leftworks which have a higher end date than leftworkDate
-        var rollCallsEmployee = _rollCallEmployeeRepository.GetBy(employeeId, workshopId);
+        var rollCallsEmployee = _rollCallEmployeeRepository.GetByEmployeeIdWithStatuses(employeeId)
+            .Where(x => leftWorks.Any(y => y.WorkshopId == x.WorkshopId)).ToList();
 
-        // var joinedList = rollCallsEmployee.Join(leftWorks, x => x.WorkshopId, y => y.WorkshopId, (x, y) => new
-        // {
-        //     x.WorkshopId,
-        //     x.EmployeeId,
-        //     y.LeftWorkDateGr,
-        //     Status = x.Statuses.OrderByDescending(z => z.StartDate).FirstOrDefault(z => z.StartDateGr.Date < y.LeftWorkDateGr && z.EndDateGr.Date > y.LeftWorkDateGr)
-        // });
-
-
-        var status = rollCallsEmployee.EmployeesStatus.OrderByDescending(z => z.StartDate)
-            .FirstOrDefault(rollCallEmployeeStatus => rollCallEmployeeStatus.StartDate.Date < maxLeftWork.LeftWorkDateGr
-                                                      && rollCallEmployeeStatus.EndDate.Date >
-                                                      maxLeftWork.LeftWorkDateGr);
-
-        if (status != null)
+        var joinedList = rollCallsEmployee.Join(leftWorks, x => x.WorkshopId, y => y.WorkshopId, (x, y) => new
         {
-            var adjust = new AdjustRollCallEmployeesWithEmployeeLeftWork()
-            {
-                LeaveDate = maxLeftWork.LeftWorkDateGr,
-                RollCallStatusId = status.id
-            };
-            _rollCallEmployeeStatusRepository.AdjustRollCallStatusEndDates([adjust]);
-        }
+            x.WorkshopId,
+            x.EmployeeId,
+            y.LeftWorkDateGr,
+            Status = x.Statuses.OrderByDescending(z => z.StartDate).FirstOrDefault(z => z.StartDateGr.Date < y.LeftWorkDateGr && z.EndDateGr.Date > y.LeftWorkDateGr)
+        });
 
-        var rollCallEmployeeStatusList = rollCallsEmployee.EmployeesStatus
-            .Where(x => x.StartDate >= maxLeftWork.LeftWorkDateGr).ToList();
-        if (rollCallEmployeeStatusList.Any())
+        //shaping up the list to send as parameter to repository
+        var newRollCallRecords = joinedList.Where(x => x.Status != null).Select(x => new AdjustRollCallEmployeesWithEmployeeLeftWork()
         {
-            _rollCallEmployeeStatusRepository.RemoveRange(rollCallEmployeeStatusList);
-            _rollCallEmployeeStatusRepository.SaveChanges();
-        }
+            LeaveDate = x.LeftWorkDateGr,
+            RollCallStatusId = x.Status.Id
+        }).ToList();
+        if (newRollCallRecords.Count > 0)
+            _rollCallEmployeeStatusRepository.AdjustRollCallStatusEndDates(newRollCallRecords);
     }
 }

CompanyManagment.Application/PaymentTransactionApplication.cs

@@ -50,7 +50,7 @@ public class PaymentTransactionApplication : IPaymentTransactionApplication
             command.ContractingPartyId,
             command.Amount,
             contractingPartyName,
-            command.CallBackUrl,command.Gateway);
+            command.CallBackUrl);
 
         await _paymentTransactionRepository.CreateAsync(entity);
         await _paymentTransactionRepository.SaveChangesAsync();
@@ -87,7 +87,7 @@ public class PaymentTransactionApplication : IPaymentTransactionApplication
         return op.Succcedded();
     }
 
-    public OperationResult SetSuccess(long paymentTransactionId,string cardNumber, string bankName, string rrn, string digitalReceipt)
+    public OperationResult SetSuccess(long paymentTransactionId,string cardNumber, string bankName)
     {
         var op = new OperationResult();
 
@@ -97,7 +97,7 @@ public class PaymentTransactionApplication : IPaymentTransactionApplication
         {
             return op.Failed("تراکنش مورد نظر یافت نشد");
         }
-        paymentTransaction.SetPaid(cardNumber, bankName,rrn, digitalReceipt);
+        paymentTransaction.SetPaid(cardNumber, bankName);
         _paymentTransactionRepository.SaveChanges();
 
         return op.Succcedded();

CompanyManagment.Application/ReportApplication.cs

@@ -29,67 +29,67 @@ public class ReportApplication : IReportApplication
         return await _reportRepository.GetAllActiveWorkshopsNew(year, month);
     }
 
-    public async Task<WorkshopResult> GetWorkshopContractDone(string year, string month, long accountId, List<long> workshopList)
+    public WorkshopResult GetWorkshopContractDone(string year, string month, long accountId, List<long> workshopList)
     {
-        return await _reportRepository.GetWorkshopContractDone(year, month, accountId, workshopList);
+        return _reportRepository.GetWorkshopContractDone(year, month, accountId, workshopList);
     }
 
-    public async Task<WorkshopResult> GetWorkshopContractSignDone(string year, string month, long accountId, List<long> workshopList)
+    public WorkshopResult GetWorkshopContractSignDone(string year, string month, long accountId, List<long> workshopList)
     {
-        return await _reportRepository.GetWorkshopContractSignDone(year, month, accountId, workshopList);
+        return _reportRepository.GetWorkshopContractSignDone(year, month, accountId, workshopList);
     }
 
-    public async Task<WorkshopResult> GetWorkshopCheckoutDone(string year, string month, long accountId, List<long> workshopList)
+    public WorkshopResult GetWorkshopCheckoutDone(string year, string month, long accountId, List<long> workshopList)
     {
-        return await _reportRepository.GetWorkshopCheckoutDone(year, month, accountId, workshopList);
+        return _reportRepository.GetWorkshopCheckoutDone(year, month, accountId, workshopList);
     }
 
-    public async Task<WorkshopResult> GetWorkshopCheckoutSignDone(string year, string month, long accountId, List<long> workshopList)
+    public WorkshopResult GetWorkshopCheckoutSignDone(string year, string month, long accountId, List<long> workshopList)
     {
-        return await _reportRepository.GetWorkshopCheckoutSignDone(year, month, accountId, workshopList);
+        return _reportRepository.GetWorkshopCheckoutSignDone(year, month, accountId, workshopList);
     }
 
-    public async Task<List<EmployeeNotDone>> GetEmployeeContract(string year, string month, long workshopId)
+    public List<EmployeeNotDone> GetEmployeeContract(string year, string month, long workshopId)
     {
-        return await _reportRepository.GetEmployeeContract(year, month, workshopId);
+        return _reportRepository.GetEmployeeContract(year, month, workshopId);
     }
 
-    public async Task<List<EmployeeNotDone>> GetEmployeeContractSign(string year, string month, long workshopId)
+    public List<EmployeeNotDone> GetEmployeeContractSign(string year, string month, long workshopId)
     {
-        return await _reportRepository.GetEmployeeContractSign(year, month, workshopId);
+        return _reportRepository.GetEmployeeContractSign(year, month, workshopId);
     }
 
-    public async Task<List<EmployeeNotDone>> GetEmployeeCheckout(string year, string month, long workshopId)
+    public List<EmployeeNotDone> GetEmployeeCheckout(string year, string month, long workshopId)
     {
-        return await _reportRepository.GetEmployeeCheckout(year, month, workshopId);
+        return _reportRepository.GetEmployeeCheckout(year, month, workshopId);
     }
 
-    public async Task<List<EmployeeNotDone>> GetEmployeeCheckoutSign(string year, string month, long workshopId)
+    public List<EmployeeNotDone> GetEmployeeCheckoutSign(string year, string month, long workshopId)
     {
-        return await _reportRepository.GetEmployeeCheckoutSign(year, month, workshopId);
+        return _reportRepository.GetEmployeeCheckoutSign(year, month, workshopId);
     }
 
     #region Print
 
-    public async Task<PrintAllContractCheckout> GetPrintAllContractDone(string year, string month, long accountId,
+    public PrintAllContractCheckout GetPrintAllContractDone(string year, string month, long accountId,
         List<long> workshopList)
     {
-        return await _reportRepository.GetPrintAllContractDone(year, month, accountId, workshopList);
+        return _reportRepository.GetPrintAllContractDone(year, month, accountId, workshopList);
     }
-    public async Task<PrintAllContractCheckout> GetPrintAllContractSignDone(string year, string month, long accountId,
+    public PrintAllContractCheckout GetPrintAllContractSignDone(string year, string month, long accountId,
         List<long> workshopList)
     {
-        return await _reportRepository.GetPrintAllContractSignDone(year, month, accountId, workshopList);
+        return _reportRepository.GetPrintAllContractSignDone(year, month, accountId, workshopList);
     }
-    public async Task<PrintAllContractCheckout> GetPrintAllCheckoutDone(string year, string month, long accountId,
+    public PrintAllContractCheckout GetPrintAllCheckoutDone(string year, string month, long accountId,
         List<long> workshopList)
     {
-        return await _reportRepository.GetPrintAllCheckoutDone(year, month, accountId, workshopList);
+        return _reportRepository.GetPrintAllCheckoutDone(year, month, accountId, workshopList);
     }
-    public async Task<PrintAllContractCheckout> GetPrintAllCheckoutSignDone(string year, string month, long accountId,
+    public PrintAllContractCheckout GetPrintAllCheckoutSignDone(string year, string month, long accountId,
         List<long> workshopList)
     {
-        return await _reportRepository.GetPrintAllCheckoutSignDone(year, month, accountId, workshopList);
+        return _reportRepository.GetPrintAllCheckoutSignDone(year, month, accountId, workshopList);
     }
 
     #endregion

CompanyManagment.Application/RollCallApplication.cs

@@ -144,9 +144,9 @@ public class RollCallApplication : IRollCallApplication
 		return _rollCallRepository.GetWorkshopRollCallHistory(searchModel);
 	}
 
-	public CurrentDayRollCall GetWorkshopCurrentDayRollCalls(long workshopId)
+	public CurrentDayRollCall GetWorkshopCurrentDayRollCalls(long workshopId, WorkshopCurrentDayRollCallSearchModel searchModel)
 	{
-		return _rollCallRepository.GetWorkshopCurrentDayRollCalls(workshopId);
+		return _rollCallRepository.GetWorkshopCurrentDayRollCalls(workshopId, searchModel);
 	}
 
 	public List<CheckoutDailyRollCallViewModel> GetActiveEmployeeRollCallsForDuration(long employeeId, long workshopId, string startDate,

CompanyManagment.EFCore/CompanyContext.cs

@@ -230,8 +230,6 @@ public class CompanyContext : DbContext
 
     #endregion
 
-    public DbSet<CheckoutWarningMessage> CheckoutWarningMessages { get; set; }
-
     public DbSet<CustomizeCheckout> CustomizeCheckouts { get; set; }
     public DbSet<CustomizeCheckoutTemp> CustomizeCheckoutTemps { get; set; }
     public DbSet<TaxLeftWorkItem> TaxLeftWorkItems { get; set; }

CompanyManagment.EFCore/CompanyManagment.EFCore.csproj

@@ -13,7 +13,6 @@
     </PackageReference>
     <PackageReference Include="Microsoft.QualityTools.Testing.Fakes" Version="16.11.230815" />
     <PackageReference Include="MongoDB.Driver" Version="3.5.0" />
-    <PackageReference Include="Parbad.Gateway.Sepehr" Version="1.7.0" />
     <PackageReference Include="PersianTools.Core" Version="2.0.4" />
   </ItemGroup>
 

CompanyManagment.EFCore/Mapping/AndroidApkVersionMapping.cs

@@ -1,8 +1,9 @@
-using Company.Domain.AndroidApkVersionAgg;
-using CompanyManagment.App.Contracts.AndroidApkVersion;
+
+using Company.Domain.AndroidApkVersionAgg;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using System;
+using Microsoft.AspNetCore.Hosting.Builder;
 using _0_Framework.Application;
 
 namespace CompanyManagment.EFCore.Mapping;
@@ -18,15 +19,10 @@ public class AndroidApkVersionMapping:IEntityTypeConfiguration<AndroidApkVersion
             v => v.ToString(),
             v => (IsActive)Enum.Parse(typeof(IsActive), v)).HasMaxLength(5);
 
-        builder.Property(x => x.ApkType).HasConversion(
-            v => v.ToString(),
-            v => (ApkType)Enum.Parse(typeof(ApkType), v)).HasMaxLength(20);
-
-        builder.Property(x => x.Title).HasMaxLength(200);
+        builder.Property(x => x.Title).HasMaxLength(50);
         builder.Property(x => x.VersionCode).HasMaxLength(20);
         builder.Property(x => x.VersionName).HasMaxLength(35);
         builder.Property(x => x.Path).HasMaxLength(255);
-        builder.Property(x => x.IsForce);
 
     }
 }

CompanyManagment.EFCore/Mapping/CheckoutMapping.cs

@@ -50,18 +50,12 @@ class CheckoutMapping : IEntityTypeConfiguration<Checkout>
         builder.Property(x => x.TotalDayOfLeaveCompute).HasMaxLength(10);
         builder.Property(x => x.TotalDayOfYearsCompute).HasMaxLength(10);
         builder.Property(x => x.TotalDayOfBunosesCompute).HasMaxLength(10);
-   
 
         builder.Property(x => x.EmployeeMandatoryHours).HasTimeSpanConversion();
 		builder.HasOne(x => x.Workshop)
             .WithMany(x => x.Checkouts)
             .HasForeignKey(x => x.WorkshopId);
 
-        builder.HasMany(x => x.CheckoutWarningMessageList)
-            .WithOne(x => x.Checkout)
-            .HasForeignKey(x => x.CheckoutId);
-            
-
         builder.OwnsMany(x => x.LoanInstallments, installments =>
         {
             installments.Property(x => x.AmountForMonth).HasMaxLength(25);

CompanyManagment.EFCore/Mapping/CheckoutWarningMessageMapping.cs

@@ -1,26 +0,0 @@
-using System;
-using _0_Framework.Application.Enums;
-using Company.Domain.CheckoutAgg;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-
-namespace CompanyManagment.EFCore.Mapping;
-
-public class CheckoutWarningMessageMapping : IEntityTypeConfiguration<CheckoutWarningMessage>
-{
-    public void Configure(EntityTypeBuilder<CheckoutWarningMessage> builder)
-    {
-        builder.ToTable("CheckoutWarningMessage");
-        builder.HasKey(x => x.id);
-
-        builder.Property(x => x.WarningMessage).HasMaxLength(150);
-
-        builder.Property(x => x.TypeOfCheckoutWarning).HasConversion(
-            v => v.ToString(),
-            v => (TypeOfCheckoutWarning)Enum.Parse(typeof(TypeOfCheckoutWarning), v)).HasMaxLength(30);
-
-        builder.HasOne(x => x.Checkout)
-            .WithMany(x => x.CheckoutWarningMessageList)
-            .HasForeignKey(x => x.CheckoutId);
-    }
-}

CompanyManagment.EFCore/Mapping/PaymentTransactionMapping.cs

@@ -15,12 +15,8 @@ public class PaymentTransactionMapping:IEntityTypeConfiguration<PaymentTransacti
         builder.Property(x => x.CardNumber).HasMaxLength(25);
         builder.Property(x => x.BankName).HasMaxLength(50);
         builder.Property(x => x.Status).HasConversion<string>().HasMaxLength(35);
-        builder.Property(x => x.Gateway).HasConversion<string>().HasMaxLength(35);
         builder.Property(x => x.ContractingPartyName).HasMaxLength(255);
         builder.Property(x => x.CallBackUrl).HasMaxLength(500);
-        builder.Property(x => x.Rrn).HasMaxLength(50);
-        builder.Property(x => x.DigitalReceipt).HasMaxLength(50);
-        
 
     }
 }

CompanyManagment.EFCore/Migrations/20251027125514_hasInsuranceShareTheSameAsList_checkoutTable.cs

@@ -1,29 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class hasInsuranceShareTheSameAsList_checkoutTable : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "HasInsuranceShareTheSameAsList",
-                table: "Checkouts",
-                type: "bit",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "HasInsuranceShareTheSameAsList",
-                table: "Checkouts");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20251028121828_CheckoutWarningMessage.cs

@@ -1,58 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class CheckoutWarningMessage : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "IsUpdateNeeded",
-                table: "Checkouts",
-                type: "bit",
-                nullable: false,
-                defaultValue: false);
-
-            migrationBuilder.CreateTable(
-                name: "CheckoutWarningMessage",
-                columns: table => new
-                {
-                    id = table.Column<long>(type: "bigint", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    WarningMessage = table.Column<string>(type: "nvarchar(150)", maxLength: 150, nullable: true),
-                    CheckoutId = table.Column<long>(type: "bigint", nullable: false),
-                    TypeOfCheckoutWarning = table.Column<string>(type: "nvarchar(30)", maxLength: 30, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_CheckoutWarningMessage", x => x.id);
-                    table.ForeignKey(
-                        name: "FK_CheckoutWarningMessage_Checkouts_CheckoutId",
-                        column: x => x.CheckoutId,
-                        principalTable: "Checkouts",
-                        principalColumn: "id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_CheckoutWarningMessage_CheckoutId",
-                table: "CheckoutWarningMessage",
-                column: "CheckoutId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "CheckoutWarningMessage");
-
-            migrationBuilder.DropColumn(
-                name: "IsUpdateNeeded",
-                table: "Checkouts");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20251112143907_addGateways in transaction .cs

@@ -1,30 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addGatewaysintransaction : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "Gateway",
-                table: "PaymentTransactions",
-                type: "nvarchar(35)",
-                maxLength: 35,
-                nullable: false,
-                defaultValue: "");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "Gateway",
-                table: "PaymentTransactions");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20251112151518_add rrn and digital receipt.cs

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

CompanyManagment.EFCore/Migrations/20251115161128_AddApkTypeToAndroidApkVersion.cs

@@ -1,30 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddApkTypeToAndroidApkVersion : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "ApkType",
-                table: "AndroidApkVersions",
-                type: "nvarchar(20)",
-                maxLength: 20,
-                nullable: false,
-                defaultValue: "");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "ApkType",
-                table: "AndroidApkVersions");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20251116081057_AddIsForceFieldToAndroidApkVersions.cs

@@ -1,29 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddIsForceFieldToAndroidApkVersions : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "IsForce",
-                table: "AndroidApkVersions",
-                type: "bit",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "IsForce",
-                table: "AndroidApkVersions");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20251116194223_add title max length in android apk.cs

@@ -1,40 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addtitlemaxlengthinandroidapk : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<string>(
-                name: "Title",
-                table: "AndroidApkVersions",
-                type: "nvarchar(200)",
-                maxLength: 200,
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "nvarchar(50)",
-                oldMaxLength: 50,
-                oldNullable: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<string>(
-                name: "Title",
-                table: "AndroidApkVersions",
-                type: "nvarchar(50)",
-                maxLength: 50,
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "nvarchar(200)",
-                oldMaxLength: 200,
-                oldNullable: true);
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs

@@ -61,11 +61,6 @@ namespace CompanyManagment.EFCore.Migrations
 
                     SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
 
-                    b.Property<string>("ApkType")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("nvarchar(20)");
-
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
@@ -74,16 +69,13 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(5)
                         .HasColumnType("nvarchar(5)");
 
-                    b.Property<bool>("IsForce")
-                        .HasColumnType("bit");
-
                     b.Property<string>("Path")
                         .HasMaxLength(255)
                         .HasColumnType("nvarchar(255)");
 
                     b.Property<string>("Title")
-                        .HasMaxLength(200)
-                        .HasColumnType("nvarchar(200)");
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
 
                     b.Property<string>("VersionCode")
                         .HasMaxLength(20)
@@ -423,9 +415,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<bool>("HasAmountConflict")
                         .HasColumnType("bit");
 
-                    b.Property<bool>("HasInsuranceShareTheSameAsList")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("HasRollCall")
                         .HasColumnType("bit");
 
@@ -442,9 +431,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
 
-                    b.Property<bool>("IsUpdateNeeded")
-                        .HasColumnType("bit");
-
                     b.Property<bool>("LeaveCheckout")
                         .HasColumnType("bit");
 
@@ -557,33 +543,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("Checkouts", (string)null);
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<long>("CheckoutId")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("TypeOfCheckoutWarning")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("nvarchar(30)");
-
-                    b.Property<string>("WarningMessage")
-                        .HasMaxLength(150)
-                        .HasColumnType("nvarchar(150)");
-
-                    b.HasKey("id");
-
-                    b.HasIndex("CheckoutId");
-
-                    b.ToTable("CheckoutWarningMessage", (string)null);
-                });
-
             modelBuilder.Entity("Company.Domain.ClassifiedSalaryAgg.ClassifiedSalary", b =>
                 {
                     b.Property<long>("id")
@@ -4998,19 +4957,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("DigitalReceipt")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
-                    b.Property<string>("Gateway")
-                        .IsRequired()
-                        .HasMaxLength(35)
-                        .HasColumnType("nvarchar(35)");
-
-                    b.Property<string>("Rrn")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
                     b.Property<string>("Status")
                         .IsRequired()
                         .HasMaxLength(35)
@@ -7265,17 +7211,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("Workshop");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.CheckoutWarningMessage", b =>
-                {
-                    b.HasOne("Company.Domain.CheckoutAgg.Checkout", "Checkout")
-                        .WithMany("CheckoutWarningMessageList")
-                        .HasForeignKey("CheckoutId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Checkout");
-                });
-
             modelBuilder.Entity("Company.Domain.ClientEmployeeWorkshopAgg.ClientEmployeeWorkshop", b =>
                 {
                     b.HasOne("Company.Domain.EmployeeAgg.Employee", "Employee")
@@ -10795,11 +10730,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("PetitionsList");
                 });
 
-            modelBuilder.Entity("Company.Domain.CheckoutAgg.Checkout", b =>
-                {
-                    b.Navigation("CheckoutWarningMessageList");
-                });
-
             modelBuilder.Entity("Company.Domain.ContarctingPartyAgg.PersonalContractingParty", b =>
                 {
                     b.Navigation("ContractingPartyBankAccounts");

CompanyManagment.EFCore/Repository/AndroidApkVersionRepository.cs

@@ -3,7 +3,6 @@ using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using Company.Domain.AndroidApkVersionAgg;
-using CompanyManagment.App.Contracts.AndroidApkVersion;
 using Microsoft.EntityFrameworkCore;
 
 namespace CompanyManagment.EFCore.Repository;
@@ -16,21 +15,13 @@ public class AndroidApkVersionRepository:RepositoryBase<long, AndroidApkVersion>
         _companyContext = companyContext;
     }
 
-    public IQueryable<AndroidApkVersion> GetActives(ApkType apkType)
+    public IQueryable<AndroidApkVersion> GetActives()
     {
-        return _companyContext.AndroidApkVersions.Where(x => x.IsActive == IsActive.True && x.ApkType == apkType);
+        return _companyContext.AndroidApkVersions.Where(x => x.IsActive == IsActive.True);
     }
 
-    public async Task<string> GetLatestActiveVersionPath(ApkType apkType)
+    public async Task<string> GetLatestActiveVersionPath()
     {
-        return (await _companyContext.AndroidApkVersions.OrderByDescending(x=>x.CreationDate).FirstOrDefaultAsync(x => x.IsActive == IsActive.True && x.ApkType == apkType)).Path;
-    }
-
-    public AndroidApkVersion GetLatestActive(ApkType apkType)
-    {
-        return _companyContext.AndroidApkVersions
-            .Where(x => x.IsActive == IsActive.True && x.ApkType == apkType)
-            .OrderByDescending(x => x.CreationDate)
-            .FirstOrDefault();
+        return (await _companyContext.AndroidApkVersions.OrderByDescending(x=>x.CreationDate).FirstOrDefaultAsync(x => x.IsActive == IsActive.True)).Path;
     }
 }

CompanyManagment.EFCore/Repository/CheckoutRepository.cs

@@ -524,8 +524,6 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
         entity.SetLoanInstallment(command.LoanInstallments, command.InstallmentDeduction);
         entity.SetCheckoutRollCall(command.CheckoutRollCall);
         entity.SetEmployeeMandatoryHours(command.EmployeeMandatoryHours);
-        if(command.HasInsuranceShareTheSameAsList)
-            entity.SetInsuranceShare();
         await _context.SaveChangesAsync();
 
     }
@@ -1691,7 +1689,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
             return new List<CheckoutViewModel>();
         }
         #endregion
-        var query = _context.CheckoutSet.Include(w => w.CheckoutWarningMessageList)
+        var query = _context.CheckoutSet
             .AsSplitQuery().Select(x => new CheckoutViewModel()
             {
                 Id = x.id,
@@ -1726,14 +1724,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                     SalaryAidDateTimeFa = s.SalaryAidDateTimeFa,
                     SalaryAidDateTimeGe = s.SalaryAidDateTime
                 }).ToList(),
-                HasAmountConflict = x.HasAmountConflict,
-                IsUpdateNeeded = x.IsUpdateNeeded,
-                CheckoutWarningMessageList = x.CheckoutWarningMessageList.Select(wm => new CheckoutWarningMessageModel
-                {
-                    WarningMessage = wm.WarningMessage,
-                    TypeOfCheckoutWarning = wm.TypeOfCheckoutWarning,
-
-                }).ToList()
+                HasAmountConflict = x.HasAmountConflict
 
             }).Where(x => x.WorkshopId == searchModel.WorkshopId);
         if (searchModel.EmployeeId > 0)
@@ -2001,7 +1992,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
         //        );
 
         var checkouts =
-            _context.CheckoutSet.Include(w=>w.CheckoutWarningMessageList).Where(x => workshopAcounts.Contains(x.WorkshopId))
+            _context.CheckoutSet.Where(x => workshopAcounts.Contains(x.WorkshopId))
                 .Join(_context.Workshops.AsSplitQuery(),
                     ch => ch.WorkshopId,
                     workshop => workshop.id,
@@ -2270,14 +2261,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                     CreationDate = x.ch.CreationDate,
                     EmployerName = $"{x.workshopEmployer.Employer.FName} {x.workshopEmployer.Employer.LName}",
                     IsBlockCantracingParty = x.contractingParty.IsBlock,
-                    HasSignCheckout = x.option != null ? x.option.SignCheckout : x.workshop.SignCheckout,
-                    IsUpdateNeeded = x.ch.IsUpdateNeeded,
-                    CheckoutWarningMessageList = x.ch.CheckoutWarningMessageList.Select(wm=> new CheckoutWarningMessageModel
-                    {
-                        WarningMessage = wm.WarningMessage,
-                        TypeOfCheckoutWarning = wm.TypeOfCheckoutWarning,
-
-                    }).ToList()
+                    HasSignCheckout = x.option != null ? x.option.SignCheckout : x.workshop.SignCheckout
 
 
                 }).OrderByDescending(x=>x.Id).Take(3000).ToList().DistinctBy(x => x.Id)
@@ -2315,14 +2299,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                 CreationDate = x.ch.CreationDate,
                 EmployerName = $"{x.workshopEmployer.Employer.FName} {x.workshopEmployer.Employer.LName}",
                 IsBlockCantracingParty = x.contractingParty.IsBlock,
-                HasSignCheckout = x.option != null ? x.option.SignCheckout : x.workshop.SignCheckout,
-                IsUpdateNeeded = x.ch.IsUpdateNeeded,
-                CheckoutWarningMessageList = x.ch.CheckoutWarningMessageList.Select(wm => new CheckoutWarningMessageModel
-                {
-                    WarningMessage = wm.WarningMessage,
-                    TypeOfCheckoutWarning = wm.TypeOfCheckoutWarning,
-
-                }).ToList()
+                HasSignCheckout = x.option != null ? x.option.SignCheckout : x.workshop.SignCheckout
 
             }).OrderByDescending(x => x.Id)
            .GroupBy(x => x.Id)
@@ -2388,14 +2365,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                 CreationDate = x.ch.CreationDate,
                 EmployerName = $"{x.workshopEmployer.Employer.FName} {x.workshopEmployer.Employer.LName}",
                 IsBlockCantracingParty = x.contractingParty.IsBlock,
-                HasSignCheckout = x.option != null ? x.option.SignCheckout : x.workshop.SignCheckout,
-                IsUpdateNeeded = x.ch.IsUpdateNeeded,
-                CheckoutWarningMessageList = x.ch.CheckoutWarningMessageList.Select(wm => new CheckoutWarningMessageModel
-                {
-                    WarningMessage = wm.WarningMessage,
-                    TypeOfCheckoutWarning = wm.TypeOfCheckoutWarning,
-
-                }).ToList()
+                HasSignCheckout = x.option != null ? x.option.SignCheckout : x.workshop.SignCheckout
 
             }).GroupBy(x => x.Id).Select(x => x.First()).ToList()
                 .OrderByDescending(x => x.ContractStartGr).ToList();
@@ -2428,14 +2398,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                 CreationDate = x.ch.CreationDate,
                 EmployerName = $"{x.workshopEmployer.Employer.FName} {x.workshopEmployer.Employer.LName}",
                 IsBlockCantracingParty = x.contractingParty.IsBlock,
-                HasSignCheckout =  x.option != null ? x.option.SignCheckout : x.workshop.SignCheckout,
-                IsUpdateNeeded = x.ch.IsUpdateNeeded,
-                CheckoutWarningMessageList = x.ch.CheckoutWarningMessageList.Select(wm => new CheckoutWarningMessageModel
-                {
-                    WarningMessage = wm.WarningMessage,
-                    TypeOfCheckoutWarning = wm.TypeOfCheckoutWarning,
-
-                }).ToList()
+                HasSignCheckout =  x.option != null ? x.option.SignCheckout : x.workshop.SignCheckout
 
             }).GroupBy(x => x.Id)
                 .Select(x => x.First()).ToList()

CompanyManagment.EFCore/Repository/CustomizeWorkshopGroupSettingsRepository.cs

@@ -19,41 +19,39 @@ using Microsoft.EntityFrameworkCore;
 
 namespace CompanyManagment.EFCore.Repository;
 
-public class CustomizeWorkshopGroupSettingsRepository(
-    CompanyContext companyContext,
-    IRollCallEmployeeRepository _rollCallEmployeeRepository)
+public class CustomizeWorkshopGroupSettingsRepository(CompanyContext companyContext, IRollCallEmployeeRepository _rollCallEmployeeRepository)
     : RepositoryBase<long, CustomizeWorkshopGroupSettings>(companyContext),
         ICustomizeWorkshopGroupSettingsRepository
 {
     private readonly CompanyContext _companyContext = companyContext;
     private readonly IRollCallEmployeeRepository _rollCallEmployeeRepository = _rollCallEmployeeRepository;
-
     public CustomizeWorkshopGroupSettings GetIncludeWorkshopSettings(long id)
     {
+
         return _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery().Include(x => x.CustomizeWorkshopSettings)
-            .FirstOrDefault(x => x.id == id);
+             .FirstOrDefault(x => x.id == id);
     }
 
     public CustomizeWorkshopGroupSettings GetWorkshopMainGroup(long workshopId)
     {
-        return _companyContext.CustomizeWorkshopGroupSettings
-            .Include(x => x.CustomizeWorkshopSettings)
-            .Include(x => x.CustomizeWorkshopEmployeeSettingsCollection)
-            .AsSplitQuery().FirstOrDefault(x => x.MainGroup && x.CustomizeWorkshopSettings.WorkshopId == workshopId);
+	   return _companyContext.CustomizeWorkshopGroupSettings
+		   .Include(x=>x.CustomizeWorkshopSettings)
+		   .Include(x=> x.CustomizeWorkshopEmployeeSettingsCollection)
+		   .AsSplitQuery().FirstOrDefault(x => x.MainGroup && x.CustomizeWorkshopSettings.WorkshopId == workshopId);
     }
 
     public List<EmployeeViewModel> GetEmployeesWithoutGroup(long customizeWorkshopSettingId)
     {
-        var workshopSettings = _companyContext.CustomizeWorkshopSettings.Find(customizeWorkshopSettingId);
+	    var workshopSettings = _companyContext.CustomizeWorkshopSettings.Find(customizeWorkshopSettingId); 
 
         if (workshopSettings == null)
             return new();
 
         var existsEmployees = _companyContext.CustomizeWorkshopEmployeeSettings
-            .AsSplitQuery().Include(x => x.CustomizeWorkshopGroupSettings)
-            .Where(x => x.WorkshopId == workshopSettings.WorkshopId && !x.CustomizeWorkshopGroupSettings.MainGroup)
-            .Select(x => x.EmployeeId).ToList();
-
+	        .AsSplitQuery().Include(x=>x.CustomizeWorkshopGroupSettings)
+	        .Where(x => x.WorkshopId == workshopSettings.WorkshopId && !x.CustomizeWorkshopGroupSettings.MainGroup)
+	        .Select(x=>x.EmployeeId).ToList();
+        
         var workshopId = workshopSettings.WorkshopId;
         var rollCallEmployees = _rollCallEmployeeRepository.GetActivePersonnelByWorkshopId(workshopId);
 
@@ -83,81 +81,79 @@ public class CustomizeWorkshopGroupSettingsRepository(
 
         var dateNow = DateTime.Now.Date;
 
-        //var existsEmployees = _companyContext.CustomizeWorkshopEmployeeSettings
-        //    .AsSplitQuery().Include(x => x.CustomizeWorkshopGroupSettings)
-        //    .Where(x => x.WorkshopId == workshopId && !x.CustomizeWorkshopGroupSettings.MainGroup)
-        //    .Select(x => x.EmployeeId).ToList();
+		//var existsEmployees = _companyContext.CustomizeWorkshopEmployeeSettings
+		//    .AsSplitQuery().Include(x => x.CustomizeWorkshopGroupSettings)
+		//    .Where(x => x.WorkshopId == workshopId && !x.CustomizeWorkshopGroupSettings.MainGroup)
+		//    .Select(x => x.EmployeeId).ToList();
 
-        //var rollCallEmployees = _rollCallEmployeeRepository.GetActivePersonnelByWorkshopId(workshopId);
+		//var rollCallEmployees = _rollCallEmployeeRepository.GetActivePersonnelByWorkshopId(workshopId);
 
-        //var employees = rollCallEmployees
-        //    .Where(x => !existsEmployees.Contains(x.EmployeeId))
-        //    .Select(x => new EmployeeViewModel()
-        //    {
-        //        EmployeeFullName = x.EmployeeFullName,
-        //        Id = x.EmployeeId
-        //    }).ToList();
+		//var employees = rollCallEmployees
+		//    .Where(x => !existsEmployees.Contains(x.EmployeeId))
+		//    .Select(x => new EmployeeViewModel()
+		//    {
+		//        EmployeeFullName = x.EmployeeFullName,
+		//        Id = x.EmployeeId
+		//    }).ToList();
 
-        var employees = _companyContext.RollCallEmployees
-            .Include(x =>
-                x.EmployeesStatus)
-            .Where(x =>
-                x.WorkshopId == workshopId &&
-                x.EmployeesStatus.Any(y => y.StartDate.Date <= dateNow && y.EndDate.Date > dateNow) &&
-                x.HasUploadedImage == "true")
-            .GroupJoin(_companyContext.CustomizeWorkshopEmployeeSettings
-                    .AsSplitQuery()
-                    .Include(x => x.CustomizeWorkshopGroupSettings)
-                    .Where(x => !x.CustomizeWorkshopGroupSettings.MainGroup && x.WorkshopId == workshopId),
-                rollCallEmployee => rollCallEmployee.EmployeeId,
-                cws => cws.EmployeeId,
-                (rollCallEmployee, cws) => new { rollCallEmployee, cws })
-            .SelectMany(x => x.cws.DefaultIfEmpty(), (x, cws) => new { x.rollCallEmployee, cws })
-            .Where(x => x.cws == null).Select(x => new EmployeeViewModel()
-            {
+		var employees = _companyContext.RollCallEmployees
+	        .Include(x =>
+		        x.EmployeesStatus)
+	        .Where(
+		        x =>
+			        x.WorkshopId == workshopId &&
+			        x.EmployeesStatus.Any(y => y.StartDate.Date <= dateNow && y.EndDate.Date > dateNow) &&
+			        x.HasUploadedImage == "true")
+	        .GroupJoin(_companyContext.CustomizeWorkshopEmployeeSettings
+			        .AsSplitQuery()
+			        .Include(x => x.CustomizeWorkshopGroupSettings)
+			        .Where(x => !x.CustomizeWorkshopGroupSettings.MainGroup && x.WorkshopId == workshopId), rollCallEmployee => rollCallEmployee.EmployeeId,
+		        cws => cws.EmployeeId,
+		        (rollCallEmployee, cws) => new { rollCallEmployee, cws })
+	        .SelectMany(x => x.cws.DefaultIfEmpty(), (x, cws) => new { x.rollCallEmployee, cws })
+	        .Where(x => x.cws == null).Select(x=> new EmployeeViewModel()
+	        {
                 EmployeeFullName = x.rollCallEmployee.EmployeeFullName,
                 Id = x.rollCallEmployee.EmployeeId
-            });
+	        });
 
-        return employees.ToList();
+		return employees.ToList();
     }
 
     public bool HasAnyEmployeeWithoutGroup(long workshopId)
     {
-        var dateNow = DateTime.Now.Date;
+	    var dateNow = DateTime.Now.Date;
         var leftWork = _companyContext.LeftWorkList.Where(x =>
             x.WorkshopId == workshopId && x.StartWorkDate <= dateNow && x.LeftWorkDate >= dateNow);
 
         var rollCallEmployeesWithoutCWS = _companyContext.RollCallEmployees
-            .Include(x =>
-                x.EmployeesStatus)
-            .Where(x =>
-                x.WorkshopId == workshopId &&
-                x.EmployeesStatus.Any(y => y.StartDate.Date <= dateNow && y.EndDate.Date > dateNow) &&
-                x.HasUploadedImage == "true" &&
-                leftWork.Any(l => l.EmployeeId == x.EmployeeId && l.WorkshopId == x.WorkshopId))
-            .GroupJoin(_companyContext.CustomizeWorkshopEmployeeSettings
-                    .AsSplitQuery()
-                    .Include(x => x.CustomizeWorkshopGroupSettings)
-                    .Where(x => !x.CustomizeWorkshopGroupSettings.MainGroup && x.WorkshopId == workshopId),
-                rollCallEmployee => rollCallEmployee.EmployeeId,
-                cws => cws.EmployeeId,
-                (rollCallEmployee, cws) => new { rollCallEmployee, cws })
-            .SelectMany(x => x.cws.DefaultIfEmpty(), (x, cws) => new { x.rollCallEmployee, cws })
-            .Any(x => x.cws == null);
+			.Include(x =>
+				x.EmployeesStatus)
+			.Where(
+				x =>
+					x.WorkshopId == workshopId &&
+					x.EmployeesStatus.Any(y => y.StartDate.Date <= dateNow && y.EndDate.Date > dateNow) &&
+					x.HasUploadedImage == "true"&&
+                    leftWork.Any(l => l.EmployeeId == x.EmployeeId && l.WorkshopId == x.WorkshopId))
+			.GroupJoin(_companyContext.CustomizeWorkshopEmployeeSettings
+					.AsSplitQuery()
+					.Include(x => x.CustomizeWorkshopGroupSettings)
+					.Where(x => !x.CustomizeWorkshopGroupSettings.MainGroup && x.WorkshopId == workshopId), rollCallEmployee => rollCallEmployee.EmployeeId,
+				cws => cws.EmployeeId,
+				(rollCallEmployee, cws) => new { rollCallEmployee, cws })
+			.SelectMany(x => x.cws.DefaultIfEmpty(), (x, cws) => new { x.rollCallEmployee, cws })
+			.Any(x => x.cws == null);
+
+		return rollCallEmployeesWithoutCWS;
 
-        return rollCallEmployeesWithoutCWS;
     }
-
     public CustomizeWorkshopGroupSettings GetWithEmployees(long groupId)
     {
-        return _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery()
-            .Include(x => x.CustomizeWorkshopEmployeeSettingsCollection)
+        return _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery().Include(x => x.CustomizeWorkshopEmployeeSettingsCollection)
             .FirstOrDefault(x => x.id == groupId);
     }
 
-    public List<CustomizeWorkshopEmployeeSettingsViewModel> GetShiftChangedEmployeeSettingsByGroupSettingsId(
-        long groupSettingsId)
+    public List<CustomizeWorkshopEmployeeSettingsViewModel> GetShiftChangedEmployeeSettingsByGroupSettingsId(long groupSettingsId)
     {
         var groupEmployeeSettingsList = _companyContext.CustomizeWorkshopGroupSettings
             .AsSplitQuery().Include(x => x.CustomizeWorkshopEmployeeSettingsCollection)
@@ -173,26 +169,23 @@ public class CustomizeWorkshopGroupSettingsRepository(
             x.id
         }).ToList();
 
-        return groupEmployeeSettingsList.Join(employees, x => x.EmployeeId, y => y.id, (x, y) =>
-            new CustomizeWorkshopEmployeeSettingsViewModel()
+        return groupEmployeeSettingsList.Join(employees, x => x.EmployeeId, y => y.id, (x, y) => new CustomizeWorkshopEmployeeSettingsViewModel()
+        {
+            EmployeeId = x.EmployeeId,
+            Id = x.id,
+            IsShiftChanged = x.IsShiftChanged,
+            IsSettingChanged = x.IsSettingChanged,
+            Name = y.FullName,
+            RollCallWorkshopShifts = x.CustomizeWorkshopEmployeeSettingsShifts.Select(z => new CustomizeWorkshopShiftViewModel()
             {
-                EmployeeId = x.EmployeeId,
-                Id = x.id,
-                IsShiftChanged = x.IsShiftChanged,
-                IsSettingChanged = x.IsSettingChanged,
-                Name = y.FullName,
-                RollCallWorkshopShifts = x.CustomizeWorkshopEmployeeSettingsShifts.Select(z =>
-                    new CustomizeWorkshopShiftViewModel()
-                    {
-                        EndTime = z.EndTime.ToString("HH:mm"),
-                        Placement = z.Placement,
-                        StartTime = z.StartTime.ToString("HH:mm")
-                    }).ToList()
-            }).ToList();
+                EndTime = z.EndTime.ToString("HH:mm"),
+                Placement = z.Placement,
+                StartTime = z.StartTime.ToString("HH:mm")
+            }).ToList()
+        }).ToList();
     }
 
-    public List<CustomizeWorkshopEmployeeSettingsViewModel> GetSettingChangedEmployeeSettingsByGroupSettingsId(
-        long groupSettingsId)
+    public List<CustomizeWorkshopEmployeeSettingsViewModel> GetSettingChangedEmployeeSettingsByGroupSettingsId(long groupSettingsId)
     {
         var groupEmployeeSettingsList = _companyContext.CustomizeWorkshopGroupSettings
             .AsSplitQuery().Include(x => x.CustomizeWorkshopEmployeeSettingsCollection)
@@ -208,52 +201,38 @@ public class CustomizeWorkshopGroupSettingsRepository(
             x.id
         }).ToList();
 
-        return groupEmployeeSettingsList.Join(employees, x => x.EmployeeId, y => y.id, (x, y) =>
-            new CustomizeWorkshopEmployeeSettingsViewModel()
+        return groupEmployeeSettingsList.Join(employees, x => x.EmployeeId, y => y.id, (x, y) => new CustomizeWorkshopEmployeeSettingsViewModel()
+        {
+            EmployeeId = x.EmployeeId,
+            Id = x.id,
+            IsSettingChanged = x.IsSettingChanged,
+            IsShiftChanged = x.IsShiftChanged,
+            Name = y.FullName,
+            RollCallWorkshopShifts = x.CustomizeWorkshopEmployeeSettingsShifts.Select(z => new CustomizeWorkshopShiftViewModel()
             {
-                EmployeeId = x.EmployeeId,
-                Id = x.id,
-                IsSettingChanged = x.IsSettingChanged,
-                IsShiftChanged = x.IsShiftChanged,
-                Name = y.FullName,
-                RollCallWorkshopShifts = x.CustomizeWorkshopEmployeeSettingsShifts.Select(z =>
-                    new CustomizeWorkshopShiftViewModel()
-                    {
-                        EndTime = z.EndTime.ToString("HH:mm"),
-                        Placement = z.Placement,
-                        StartTime = z.StartTime.ToString("HH:mm")
-                    }).ToList()
-            }).ToList();
+                EndTime = z.EndTime.ToString("HH:mm"),
+                Placement = z.Placement,
+                StartTime = z.StartTime.ToString("HH:mm")
+            }).ToList()
+        }).ToList();
     }
 
     public List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingsByGroupSettingsId(long groupSettingsId)
     {
-        var entity = _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery()
-            .Include(x => x.CustomizeWorkshopEmployeeSettingsCollection)
-            .FirstOrDefault(x => x.id == groupSettingsId);
+
+        var entity = _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery().Include(x=>x.CustomizeWorkshopEmployeeSettingsCollection)
+		        .FirstOrDefault(x => x.id == groupSettingsId);
 
         if (entity == null)
             return new();
 
         var employees = entity.CustomizeWorkshopEmployeeSettingsCollection;
-        if (employees.Count == 0)
-            return [];
-
-        var workshopId = employees.FirstOrDefault()?.WorkshopId??0;
-
-        if (workshopId == 0)
-            return [];
-        
-
-        var employeeIds = employees.Select(x => x.EmployeeId).ToList();
 
 
-        var names = _companyContext.Employees.Where(x => employeeIds.Contains(x.id))
-            .Select(x => new { x.id, x.FullName }).ToList();
+        var employeeIds = employees.Select(x => x.EmployeeId);
 
-        var leftWork = _companyContext.LeftWorkList.Where(x =>
-            x.WorkshopId == workshopId &&
-            employeeIds.Contains(x.EmployeeId)).ToList();
+
+        var names = _companyContext.Employees.Where(x => employeeIds.Contains(x.id)).Select(x => new { x.id, x.FullName }).ToList();
 
         var joinedList = employees.Join(names, x => x.EmployeeId, y => y.id, (x, y) =>
             new CustomizeWorkshopEmployeeSettingsViewModel
@@ -264,86 +243,82 @@ public class CustomizeWorkshopGroupSettingsRepository(
                 Salary = x.Salary,
                 IsSettingChanged = x.IsSettingChanged,
                 IsShiftChanged = x.IsShiftChanged,
-                RollCallWorkshopShifts = x.CustomizeWorkshopEmployeeSettingsShifts
-                    .Select(z => new CustomizeWorkshopShiftViewModel()
-                    {
-                        EndTime = z.EndTime.ToString("HH:mm"),
-                        StartTime = z.StartTime.ToString("HH:mm"),
-                        Placement = z.Placement
-                    }).ToList(),
+                RollCallWorkshopShifts = x.CustomizeWorkshopEmployeeSettingsShifts.Select(z => new CustomizeWorkshopShiftViewModel()
+                {
+                    EndTime = z.EndTime.ToString("HH:mm"),
+                    StartTime = z.StartTime.ToString("HH:mm"),
+                    Placement = z.Placement
+                }).ToList(),
                 IrregularShift = x.IrregularShift,
                 WorkshopShiftStatus = x.WorkshopShiftStatus,
                 LeavePermittedDays = x.LeavePermittedDays,
                 CustomizeRotatingShiftsViewModels = x.CustomizeRotatingShifts
-                    .Select(r => new CustomizeRotatingShiftsViewModel
-                    {
-                        StartTime = r.StartTime.ToString("HH:mm"),
-                        EndTime = r.EndTime.ToString("HH:mm")
-                    }).ToList(),
-                HasLeft = leftWork.OrderByDescending(l=>l.StartWorkDate).FirstOrDefault(l => x.EmployeeId == l.EmployeeId)?.HasLeft ?? false
+	                .Select(r=> new CustomizeRotatingShiftsViewModel(){StartTime = r.StartTime.ToString("HH:mm") , EndTime =r.EndTime.ToString("HH:mm") }).ToList()
+                
             });
-        return joinedList.OrderBy(x=>x.HasLeft).ToList();
+        return joinedList.ToList();
     }
 
     public EditCustomizeWorkshopGroupSettings GetCustomizeWorkshopGroupSettingsDetails(long groupId)
     {
+
         var entity = _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery().FirstOrDefault(x => x.id == groupId);
         return new EditCustomizeWorkshopGroupSettings()
         {
             //FridayWork = entity.FridayWork,
-            FridayPay = new() { FridayPayType = entity.FridayPay.FridayPayType, Value = entity.FridayPay.Value },
+            FridayPay = new (){ FridayPayType = entity.FridayPay.FridayPayType, Value = entity.FridayPay.Value },
             LateToWork = new()
-            {
+			{
                 LateToWorkTimeFinesVewModels = entity.LateToWork.LateToWorkTimeFines.Select(x =>
                     new LateToWorkTimeFineVewModel() { FineMoney = x.FineMoney, Minute = x.Minute }).ToList(),
                 Value = entity.LateToWork.Value, LateToWorkType = entity.LateToWork.LateToWorkType
             },
             HolidayWork = entity.HolidayWork,
             FineAbsenceDeduction = new()
-            {
+			{
                 Value = entity.FineAbsenceDeduction.Value,
                 FineAbsenceDayOfWeekViewModels = entity.FineAbsenceDeduction.FineAbsenceDayOfWeekCollection
                     .Select(x => new FineAbsenceDayOfWeekViewModel() { DayOfWeek = x.DayOfWeek }).ToList(),
                 FineAbsenceDeductionType = entity.FineAbsenceDeduction.FineAbsenceDeductionType
             },
             EarlyExit = new()
-            {
+			{
                 EarlyExitTimeFinesViewModels = entity.EarlyExit.EarlyExitTimeFines.Select(x =>
                     new EarlyExitTimeFineViewModel() { FineMoney = x.FineMoney, Minute = x.Minute }).ToList(),
                 Value = entity.EarlyExit.Value, EarlyExitType = entity.EarlyExit.EarlyExitType
             },
             BonusesPay = new()
-            {
+			{
                 Value = entity.BonusesPay.Value, BonusesPayType = entity.BonusesPay.BonusesPayType,
                 PaymentType = entity.BonusesPay.PaymentType
             },
             ShiftPay = new()
-            {
+			{
                 Value = entity.ShiftPay.Value, ShiftPayType = entity.ShiftPay.ShiftPayType,
                 ShiftType = entity.ShiftPay.ShiftType
             },
             InsuranceDeduction = new()
-            {
+			{
                 Value = entity.InsuranceDeduction.Value,
                 InsuranceDeductionType = entity.InsuranceDeduction.InsuranceDeductionType
             },
             OverTimePay = new()
-                { OverTimePayType = entity.OverTimePay.OverTimePayType, Value = entity.OverTimePay.Value },
+			{ OverTimePayType = entity.OverTimePay.OverTimePayType, Value = entity.OverTimePay.Value },
             BaseYearsPay = new()
-            {
+			{
                 BaseYearsPayType = entity.BaseYearsPay.BaseYearsPayType,
                 Value = entity.BaseYearsPay.Value
             },
             NightWorkPay = new()
-                { NightWorkingType = entity.NightWorkPay.NightWorkingType, Value = entity.NightWorkPay.Value },
-            LeavePay = new() { Value = entity.LeavePay.Value, LeavePayType = entity.LeavePay.LeavePayType },
+			{ NightWorkingType = entity.NightWorkPay.NightWorkingType, Value = entity.NightWorkPay.Value },
+            LeavePay =new() { Value = entity.LeavePay.Value, LeavePayType = entity.LeavePay.LeavePayType },
             MarriedAllowance = new()
-            {
+			{
                 Value = entity.MarriedAllowance.Value,
                 MarriedAllowanceType = entity.MarriedAllowance.MarriedAllowanceType
             },
             FamilyAllowance = new()
-            {
+			{
                 FamilyAllowanceType = entity.FamilyAllowance.FamilyAllowanceType,
                 Value = entity.FamilyAllowance.Value
             },
@@ -357,27 +332,23 @@ public class CustomizeWorkshopGroupSettingsRepository(
             IsShiftChanged = entity.IsShiftChange,
             ShiftViewModel = entity.CustomizeWorkshopGroupSettingsShifts.Select(x =>
                 new CustomizeWorkshopShiftViewModel()
-                {
-                    EndTime = x.EndTime.ToString("HH:mm"), Placement = x.Placement,
-                    StartTime = x.StartTime.ToString("HH:mm")
-                }).ToList(),
+                { EndTime = x.EndTime.ToString("HH:mm"), Placement = x.Placement, StartTime = x.StartTime.ToString("HH:mm") }).ToList(),
             LeavePermittedDays = entity.LeavePermittedDays,
-            CustomizeRotatingShiftsViewModels = entity.CustomizeRotatingShifts.Select(x =>
-                new CustomizeRotatingShiftsViewModel()
-                {
-                    EndTime = x.EndTime.ToString("HH:mm"),
-                    StartTime = x.StartTime.ToString("HH:mm")
-                }).ToList(),
-            OffDayOfWeeks = entity.WeeklyOffDays.Select(x => x.DayOfWeek).ToList()
+            CustomizeRotatingShiftsViewModels = entity.CustomizeRotatingShifts.Select(x=> new CustomizeRotatingShiftsViewModel()
+            {
+                EndTime = x.EndTime.ToString("HH:mm"),
+                StartTime = x.StartTime.ToString("HH:mm")
+            }).ToList(),
+            OffDayOfWeeks = entity.WeeklyOffDays.Select(x=>x.DayOfWeek).ToList()
         };
+
     }
 
-    public List<CustomizeWorkshopGroupSettings> GetAllGroupsIncludeEmployeeSettingsByWorkshopSettingsId(
-        long workshopSettingsId)
+    public List<CustomizeWorkshopGroupSettings> GetAllGroupsIncludeEmployeeSettingsByWorkshopSettingsId(long workshopSettingsId)
     {
-        return _companyContext.CustomizeWorkshopGroupSettings
-            .AsSplitQuery().Include(x => x.CustomizeWorkshopEmployeeSettingsCollection)
-            .Where(x => x.CustomizeWorkshopSettingId == workshopSettingsId).ToList();
+	    return _companyContext.CustomizeWorkshopGroupSettings
+		    .AsSplitQuery().Include(x => x.CustomizeWorkshopEmployeeSettingsCollection)
+		    .Where(x => x.CustomizeWorkshopSettingId == workshopSettingsId).ToList();
     }
 
     public void Remove(long groupId)
@@ -389,8 +360,7 @@ public class CustomizeWorkshopGroupSettingsRepository(
         _companyContext.SaveChanges();
     }
 
-    public CustomizeWorkshopGroupSettingsViewModel GetEmployeesGroupSettingsByEmployeeId(long employeeId,
-        long workshopId)
+    public CustomizeWorkshopGroupSettingsViewModel GetEmployeesGroupSettingsByEmployeeId(long employeeId, long workshopId)
     {
         return _companyContext.CustomizeWorkshopGroupSettings
             .Include(x => x.CustomizeWorkshopEmployeeSettingsCollection)

CompanyManagment.EFCore/Repository/EmployeeRepository .cs

@@ -1062,5 +1062,29 @@ public class EmployeeRepository : RepositoryBase<long, Employee>, IEmployeeRepos
 
 	}
 
-	#endregion
+    public async Task<List<EmployeeSelectListViewModel>> GetWorkingEmployeesSelectList(long workshopId)
+    {
+        var dateNow = DateTime.Now.Date;
+
+
+        var workshopActiveLeftWorksQuery = _context.LeftWorkList.Where(x => x.WorkshopId == workshopId &&
+                                                                            x.StartWorkDate <= dateNow && x.LeftWorkDate > dateNow);
+
+
+        var workshopActiveInsuranceLeftWorksQuery = _context.LeftWorkInsuranceList.Where(x => x.WorkshopId == workshopId &&
+            x.StartWorkDate <= dateNow && (x.LeftWorkDate > dateNow || x.LeftWorkDate == null));
+
+
+        var employeesQuery = _context.Employees.Where(x => workshopActiveLeftWorksQuery.Any(y => y.EmployeeId == x.id) ||
+                                                           workshopActiveInsuranceLeftWorksQuery.Any(y => y.EmployeeId == x.id));
+
+
+        return await employeesQuery.Select(x => new EmployeeSelectListViewModel()
+        {
+            Id = x.id,
+            EmployeeFullName = x.FullName
+        }).ToListAsync();
+    }
+
+    #endregion
 }

CompanyManagment.EFCore/Repository/FineRepository.cs

@@ -124,7 +124,7 @@ public class FineRepository : RepositoryBase<long, Fine>, IFineRepository
                 }
                 query = query.Where(x => x.EmployeeId == searchModel.EmployeeId);
 
-                var list = query.OrderByDescending(x=>x.FineDate).ToList().Select(x => new FineViewModel()
+                var list = query.ToList().Select(x => new FineViewModel()
                 {
                     Amount = x.Amount.ToMoney(),
                     AmountDouble = x.Amount,

CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs

@@ -1291,9 +1291,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     return new InstitutionContractListWorkshop()
                     {
                         EmployeeCount = w.PersonnelCount,
-                        Price = w.Price.ToMoney(),
                         WorkshopName = workshopSelected?.WorkshopName ?? w.WorkshopName,
-                        
                         WorkshopServices = new WorkshopServicesViewModel()
                         {
                             Contract = w.Services.Contract,
@@ -1302,8 +1300,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                             Insurance = w.Services.Insurance,
                             InsuranceInPerson = w.Services.InsuranceInPerson,
                             RollCall = w.Services.RollCall,
-                            RollCallInPerson = w.Services.RollCallInPerson,
-                            
+                            RollCallInPerson = w.Services.RollCallInPerson
                         }
                     };
                 }).ToList() ?? [];
@@ -2345,7 +2342,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
         await SaveChangesAsync();
 
-        await _smsService.SendInstitutionCreationVerificationLink(contractingParty.Phone, contractingPartyFullName,
+        await _smsService.SendInstitutionVerificationLink(contractingParty.Phone, contractingPartyFullName,
             entity.PublicId, contractingParty.id, entity.id);
 
 
@@ -2626,12 +2623,10 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             Id = x.id,
             Text = x.WorkshopFullName
         });
-        //کارفرما ها به غیر از آن هایی که به طرف حساب ---- وصل هستند
-        var employers = _context.Employers.Where(x=>x.ContractingPartyId != 30428)
-            .Select(x => new InstitutionContractSelectListViewModel()
+        var employers = _context.Employers.Select(x => new InstitutionContractSelectListViewModel()
         {
             Id = x.id,
-            Text = x.FullName
+            Text = x.FName + " " + x.LName
         });
         var representatives = _context.RepresentativeSet.Select(x => new InstitutionContractSelectListViewModel()
         {
@@ -2745,8 +2740,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 VerifierFullName = institution.VerifierFullName,
                 VerifierPhoneNumber = institution.VerifierPhoneNumber,
                 VerifyCode = institution.VerifyCode,
-                VerifyDate = institution.VerifyCodeCreation.ToFarsi(),
-                VerifyTime = institution.VerifyCodeCreation.ToString("HH:mm:ss"),
+                VerifyDateTime = institution.VerifyCodeCreation.ToFarsi(),
                 Workshops = institution.WorkshopGroup.CurrentWorkshops
                     .Select(x => new GetInstitutionVerificationDetailsWorkshopsViewModel()
                     {
@@ -2771,61 +2765,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         return res;
     }
 
-    public async Task<GetInstitutionContractWorkshopsDetails> GetContractWorkshopsDetails(long id)
-    {
-        var institutionContract = await _context.InstitutionContractSet
-            .Include(x => x.WorkshopGroup)
-            .ThenInclude(x => x.InitialWorkshops)
-            .FirstOrDefaultAsync(x => x.id == id);
-        if (institutionContract == null)
-            throw new NotFoundException("قرارداد مؤسسه یافت نشد");
-        
-        var workshops = institutionContract.WorkshopGroup.InitialWorkshops
-            .Select(x =>
-            {
-                var plan = _planPercentageRepository.GetInstitutionPlanForWorkshop(new WorkshopTempViewModel()
-                {
-                    CountPerson = x.PersonnelCount,
-                    ContractAndCheckout = x.Services.Contract,
-                    ContractAndCheckoutInPerson = x.Services.ContractInPerson,
-                    Insurance = x.Services.Insurance,
-                    InsuranceInPerson = x.Services.InsuranceInPerson,
-                    RollCall = x.Services.RollCall,
-                    RollCallInPerson = x.Services.RollCallInPerson,
-                    CustomizeCheckout = x.Services.CustomizeCheckout,
-                });
-                
-                return new InstitutionContractListWorkshop()
-                {
-                    EmployeeCount = x.PersonnelCount,
-                    Price = x.Price.ToMoney(),
-                    WorkshopName = x.WorkshopName,
-                    WorkshopServices = new WorkshopServicesViewModel()
-                    {
-                        Contract = x.Services.Contract,
-                        ContractPrice =plan.ContractAndCheckout ,
-                        ContractInPerson = x.Services.ContractInPerson,
-                        ContractInPersonPrice = plan.ContractAndCheckoutInPerson,
-                        CustomizeCheckout = x.Services.CustomizeCheckout,
-                        CustomizeCheckoutPrice = plan.CustomizeCheckout,
-                        Insurance = x.Services.Insurance,
-                        InsurancePrice =plan.Insurance ,
-                        InsuranceInPerson = x.Services.InsuranceInPerson,
-                        InsuranceInPersonPrice = plan.InsuranceInPerson,
-                        RollCall = x.Services.RollCall,
-                        RollCallPrice =plan.RollCall ,
-                        RollCallInPerson = x.Services.RollCallInPerson,
-                        RollCallInPersonPrice = "0",
-                    }
-                };
-            }).ToList();
-        return new GetInstitutionContractWorkshopsDetails()
-        {
-            Workshops = workshops
-        };
-
-    }
-
 
     private InstitutionContractExtensionPaymentResponse CalculateInPersonPayment(
         InstitutionContractExtensionPlanDetail selectedPlan, double baseAmount, double tenPercent,

CompanyManagment.EFCore/Repository/InsuranceListRepository.cs

@@ -7,14 +7,11 @@ using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using _0_Framework.Application;
-using _0_Framework.Application.Enums;
 using _0_Framework.InfraStructure;
 using AccountMangement.Infrastructure.EFCore;
-using Company.Domain.CheckoutAgg;
 using Company.Domain.EmployeeAgg;
 using Company.Domain.EmployeeChildrenAgg;
 using Company.Domain.EmployeeInsurancListDataAgg;
-using Company.Domain.empolyerAgg;
 using Company.Domain.InsuranceListAgg;
 using Company.Domain.InsuranceWorkshopAgg;
 using Company.Domain.InsuranceYearlySalaryAgg;
@@ -135,11 +132,6 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
                 var id = insuranceListObj.id;
                 if (command.EmployeeInsurancListDataList != null && command.EmployeeInsurancListDataList.Count > 0)
                 {
-                    var farisMonthName = Tools.ToFarsiMonthByNumber(command.Month);
-
-                    var checkouts = _context.CheckoutSet.Where(x =>
-                        x.WorkshopId == command.WorkshopId && x.Year == command.Year && x.Month == farisMonthName &&
-                        x.IsActiveString == "true");
                     foreach (var item in command.EmployeeInsurancListDataList)
                     {
                         if (item.EmployeeInsurancListDataId == 0)
@@ -166,29 +158,6 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
                                 item.LeftWorkDate, item.JobId, item.IncludeStatus, item.BaseYears,
                                 item.MarriedAllowance, item.OverTimePay, item.FamilyAllowance);
                         }
-
-
-                        if (checkouts.Any())
-                        {
-                            var checkout = checkouts.FirstOrDefault(x => x.EmployeeId == item.EmployeeId);
-                            if (checkout != null)
-                            {
-                                if (item.InsuranceShare.ToMoney() != checkout.InsuranceDeduction.ToMoney())
-                                {
-                                    checkout.SetUpdateNeeded();
-                                    if (!_context.CheckoutWarningMessages.Any(x => x.CheckoutId == checkout.id && x.TypeOfCheckoutWarning != TypeOfCheckoutWarning.InsuranceEmployeeShare))
-                                    {
-                                        var createWarrning =
-                                            new CheckoutWarningMessage(
-                                                "مبلغ بیمه سهم کارگر با مبلغ محاسبه شده در لیست بیمه مغایرت دارد", checkout.id, TypeOfCheckoutWarning.InsuranceEmployeeShare);
-                                        _context.CheckoutWarningMessages.Add(createWarrning);
-                                    }
-
-                                    _context.SaveChanges();
-                                }
-                            }
-
-                        }
                     }
 
                     _employeeInsurancListDataRepository.SaveChanges();
@@ -729,11 +698,6 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
                 var id = insuranceListObj.id;
                 if (command.EmployeeInsurancListDataList != null && command.EmployeeInsurancListDataList.Count > 0)
                 {
-                     var farisMonthName = Tools.ToFarsiMonthByNumber(command.Month);
-
-                    var checkouts = _context.CheckoutSet.Where(x =>
-                        x.WorkshopId == command.WorkshopId && x.Year == command.Year && x.Month == farisMonthName &&
-                        x.IsActiveString == "true");
                     foreach (var item in command.EmployeeInsurancListDataList)
                     {
                         var employeeInsurancListData = new EmployeeInsurancListData(id,
@@ -747,28 +711,6 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
                             item.LeftWorkDate, item.JobId, item.IncludeStatus, item.BaseYears, item.MarriedAllowance,
                             item.OverTimePay, item.FamilyAllowance);
                         _employeeInsurancListDataRepository.Create(employeeInsurancListData);
-                        if (checkouts.Any())
-                        {
-                            var checkout = checkouts.FirstOrDefault(x => x.EmployeeId == item.EmployeeId);
-                            if (checkout != null)
-                            {
-                                if (item.InsuranceShare.ToMoney() != checkout.InsuranceDeduction.ToMoney())
-                                {
-                                    checkout.SetUpdateNeeded();
-                                    if (!_context.CheckoutWarningMessages.Any(x => x.CheckoutId == checkout.id && x.TypeOfCheckoutWarning != TypeOfCheckoutWarning.InsuranceEmployeeShare))
-                                    {
-                                        var createWarrning =
-                                            new CheckoutWarningMessage(
-                                                "مبلغ بیمه سهم کارگر با مبلغ محاسبه شده در لیست بیمه مغایرت دارد", checkout.id, TypeOfCheckoutWarning.InsuranceEmployeeShare);
-                                        _context.CheckoutWarningMessages.Add(createWarrning);
-                                    }
-                    
-                                    _context.SaveChanges();
-                                }
-                            }
-                        
-                        }
-
                     }
 
                     _employeeInsurancListDataRepository.SaveChanges();
@@ -1469,27 +1411,6 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
     }
 
 
-    public List<EmployeeInsurancListDataViewModel> EmployeeInsuranceDataBy(DateTime startDate, long workshopId)
-    {
-        var res = _context.InsuranceListSet
-            .Where(x => x.StartDate <= startDate && x.EndDate >= startDate &&
-                        x.WorkshopId == workshopId)
-            .Join(_context.EmployeeInsurancListDataSet,
-                insuranceList => insuranceList.id,
-                employeeInsurancListData => employeeInsurancListData.InsuranceListId,
-                (insuranceList, employeeInsurancListData) => new EmployeeInsurancListDataViewModel
-                {
-                    InsuranceListId = insuranceList.id,
-                    EmployeeId = employeeInsurancListData.EmployeeId,
-                    WorkingDays = employeeInsurancListData.WorkingDays,
-                    BenefitsIncludedNonContinuous = employeeInsurancListData.BenefitsIncludedNonContinuous,
-                    InsuranceShare = employeeInsurancListData.InsuranceShare,
-                });
-
-        return res.ToList();
-    }
-
-
     public List<EmployeeDetailsForInsuranceListViewModel> GetEmployeeInsuranceDataForEdit(long insuranceListId,
         DateTime startDate, DateTime endDate)
     {

CompanyManagment.EFCore/Repository/LoanRepository.cs

@@ -97,7 +97,7 @@ public class LoanRepository : RepositoryBase<long, Loan>, ILoanRepository
                     query = query.Where(x => x.StartInstallmentPayment >= startDate && x.StartInstallmentPayment <= endDate);
                 }
                 query = query.Where(x => x.EmployeeId == searchModel.EmployeeId);
-                var list = query.OrderByDescending(x=>x.StartInstallmentPayment).ToList().Select(x => new LoanViewModel()
+                var list = query.ToList().Select(x => new LoanViewModel()
                 {
                     Amount = x.Amount.ToMoney(),
                     AmountDouble = x.Amount,

CompanyManagment.EFCore/Repository/RewardRepository.cs

@@ -6,7 +6,6 @@ using _0_Framework.InfraStructure;
 using Company.Domain.RewardAgg;
 using CompanyManagment.App.Contracts.Reward;
 using Microsoft.EntityFrameworkCore;
-using SharpCompress.Compressors.Xz;
 
 namespace CompanyManagment.EFCore.Repository;
 
@@ -120,12 +119,12 @@ public class RewardRepository : RepositoryBase<long, Reward>, IRewardRepository
 
 				query = query.Where(x => x.EmployeeId == searchModel.EmployeeId);
 
-				var list = query.ToList().OrderByDescending(x=>x.GrantDate).Select(x => new RewardViewModel
+				var list = query.ToList().Select(x => new RewardViewModel
 				{
 					WorkshopId = x.WorkshopId,
 					Amount = x.Amount.ToMoney(),
 					AmountDouble = x.Amount,
-					Description = x.Description ?? "",
+					Description = x.Description,
 					EmployeeFullName = employees.FirstOrDefault(e => e.id == x.EmployeeId).FullName,
 					EmployeeId = x.EmployeeId,
 					GrantDateFa = x.GrantDate.ToFarsi(),

CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs

@@ -478,8 +478,7 @@ public class RollCallEmployeeRepository : RepositoryBase<long, RollCallEmployee>
 
     public RollCallEmployee GetBy(long employeeId, long workshopId)
     {
-        return _context.RollCallEmployees.Include(x => x.EmployeesStatus)
-            .FirstOrDefault(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId);
+        return _context.RollCallEmployees.Include(x => x.EmployeesStatus).FirstOrDefault(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId);
     }
 
     #endregion

CompanyManagment.EFCore/Repository/RollCallRepository.cs

@@ -1052,11 +1052,11 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, IRollCallRepos
 
 
     //گزارش آنلاین حضور غیاب کارگاه
-    public CurrentDayRollCall GetWorkshopCurrentDayRollCalls(long workshopId)
+    public CurrentDayRollCall GetWorkshopCurrentDayRollCalls(long workshopId,
+        WorkshopCurrentDayRollCallSearchModel searchModel)
     {
         var date = DateTime.Now.Date;
-
-
+        
         //get active leaves for workshop which are active today and accepted and are either روزانه and استحقاقی or استعلاجی
         var leaves = _context.LeaveList
             .Where(x =>
@@ -1070,7 +1070,11 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, IRollCallRepos
         //var workingEmployees =
         //    _context.LeftWorkList.Where(x => x.WorkshopId == workshopId && x.StartWorkDate < date && x.LeftWorkDate.Date > date);
 
-
+        if (searchModel.PersonnelCode>0)
+        {
+            personnelCodes = personnelCodes.Where(x=>x.PersonnelCode == searchModel.PersonnelCode);
+        }
+        
 
         //get activated employees
         var activeEmployees =
@@ -1084,6 +1088,15 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, IRollCallRepos
             x.WorkshopId == workshopId && (x.ShiftDate.Date == date || x.EndDate == null) && x.RollCallModifyType != RollCallModifyType.Undefined);
 
 
+        if (searchModel.EmployeeId>0)
+        {
+            leaves = leaves.Where(x=>x.WorkshopId == searchModel.EmployeeId);
+            personnelCodes = personnelCodes.Where(x=>x.EmployeeId == searchModel.EmployeeId);
+            activeEmployees = activeEmployees.Where(x=>x.EmployeeId == searchModel.EmployeeId);
+            rollCallsQuery = rollCallsQuery.Where(x=>x.EmployeeId == searchModel.EmployeeId);
+        }
+
+       
 
 
         var mustBePresent = activeEmployees.Where(x => !leaves.Any(y => y.EmployeeId == x.EmployeeId));

CompanyManagment.EFCore/Services/SmsService.cs

@@ -18,8 +18,6 @@ public class SmsService : ISmsService
 {
     private readonly IConfiguration _configuration;
     private readonly ISmsResultRepository _smsResultRepository;
-    private readonly bool _isDevEnvironment;
-    private readonly List<string> _testNumbers;
     public SmsIr SmsIr { get; set; }
 
 
@@ -29,33 +27,6 @@ public class SmsService : ISmsService
         _smsResultRepository = smsResultRepository;
         SmsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
 
-        // خواندن تنظیمات SMS از appsettings
-        var smsSettings = _configuration.GetSection("SmsSettings");
-        _isDevEnvironment = smsSettings.GetValue<bool>("IsTestMode");
-        _testNumbers = smsSettings.GetSection("TestNumbers").Get<List<string>>() ?? new List<string>();
-    }
-
-    /// <summary>
-    /// متد مرکزی برای ارسال پیامک که محیط dev را چک می‌کند
-    /// </summary>
-    private async Task<SmsIrResult<VerifySendResult>> VerifySendSmsAsync(string number, int templateId, VerifySendParameter[] parameters)
-    {
-        // اگر محیط dev است و شماره‌های تست وجود دارد، به شماره‌های تست ارسال می‌شود
-        if (_isDevEnvironment && _testNumbers is { Count: > 0 })
-        {
-            // ارسال به همه شماره‌های تست
-            SmsIrResult<VerifySendResult> lastResult = null;
-            foreach (var testNumber in _testNumbers)
-            {
-                lastResult = await SmsIr.VerifySendAsync(testNumber, templateId, parameters);
-            }
-            return lastResult; // برگرداندن نتیجه آخرین ارسال
-        }
-        else
-        {
-            // ارسال به شماره واقعی
-            return await SmsIr.VerifySendAsync(number, templateId, parameters);
-        }
     }
 
     public void Send(string number, string message)
@@ -85,7 +56,12 @@ public class SmsService : ISmsService
     }
     public bool VerifySend(string number, string message)
     {
-        var verificationSendResult = VerifySendSmsAsync(number, 768382, new VerifySendParameter[] { new VerifySendParameter("VerificationCode", message) });
+         
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+
+        //var bulkSendResult =  smsIr.BulkSendAsync(95007079000006, "your text message", new string[] { "9120000000" });
+
+        var verificationSendResult =  smsIr.VerifySendAsync(number, 768382, new VerifySendParameter[] { new VerifySendParameter("VerificationCode", message) });
         Thread.Sleep(2000);
         if (verificationSendResult.IsCompletedSuccessfully)
         {
@@ -114,7 +90,11 @@ public class SmsService : ISmsService
 
     public bool LoginSend(string number, string message)
     {
-        var verificationSendResult = VerifySendSmsAsync(number, 635330, new VerifySendParameter[] { new VerifySendParameter("LOGINCODE", message) });
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+
+        //var bulkSendResult =  smsIr.BulkSendAsync(95007079000006, "your text message", new string[] { "9120000000" });
+
+        var verificationSendResult = smsIr.VerifySendAsync(number, 635330, new VerifySendParameter[] { new VerifySendParameter("LOGINCODE", message) });
         Thread.Sleep(2000);
         if (verificationSendResult.IsCompletedSuccessfully)
         {
@@ -139,8 +119,11 @@ public class SmsService : ISmsService
 
     public async Task<SentSmsViewModel> SendVerifyCodeToClient(string number, string code)
     {
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
         var result = new SentSmsViewModel();
-        var sendResult = await VerifySendSmsAsync(number, 768382, new VerifySendParameter[] { new VerifySendParameter("VerificationCode", code) });
+        //var bulkSendResult =  smsIr.BulkSendAsync(95007079000006, "your text message", new string[] { "9120000000" });
+
+        var sendResult = await smsIr.VerifySendAsync(number, 768382, new VerifySendParameter[] { new VerifySendParameter("VerificationCode", code) });
         Thread.Sleep(2000);
 
         if (sendResult.Message == "موفق")
@@ -165,8 +148,9 @@ public class SmsService : ISmsService
         var checkLength = fullName.Length;
         if (checkLength > 25)
             fullName = fullName.Substring(0, 24);
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
 
-        var sendResult = VerifySendSmsAsync(number, 725814, new VerifySendParameter[] { new VerifySendParameter("FULLNAME", fullName), new VerifySendParameter("USERNAME", userName),  new VerifySendParameter("PASSWORD", userName) });
+        var sendResult = smsIr.VerifySendAsync(number, 725814, new VerifySendParameter[] { new VerifySendParameter("FULLNAME", fullName), new VerifySendParameter("USERNAME", userName),  new VerifySendParameter("PASSWORD", userName) });
        
 
         Console.WriteLine(userName + " - " +  sendResult.Result.Status);
@@ -348,39 +332,18 @@ public class SmsService : ISmsService
         }
        
     }
-    
-    public async Task<bool> SendInstitutionCreationVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId)
+    public async Task<bool> SendInstitutionVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId)
     {
        var guidStr=institutionId.ToString();
        var firstPart = guidStr.Substring(0, 15);
        var secondPart = guidStr.Substring(15);
-        var verificationSendResult =await VerifySendSmsAsync(number, 527519, new VerifySendParameter[]
+        var verificationSendResult =await SmsIr.VerifySendAsync(number, 527519, new VerifySendParameter[]
         {
             new("FULLNAME", fullName),
             new("CODE1",firstPart),
             new("CODE2",secondPart)
         });
-      
-       var smsResult =  new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message,  "لینک تاییدیه ایجاد قرارداد مالی",
-            fullName, number, contractingPartyId, institutionContractId);
-        await _smsResultRepository.CreateAsync(smsResult);
-        await _smsResultRepository.SaveChangesAsync();
-        return verificationSendResult.Status == 0;
-    }
-
-    public async Task<bool> SendInstitutionAmendmentVerificationLink(string number, string fullName, Guid institutionId,
-        long contractingPartyId, long institutionContractId)
-    {
-        var guidStr=institutionId.ToString();
-        var firstPart = guidStr.Substring(0, 15);
-        var secondPart = guidStr.Substring(15);
-        var verificationSendResult =await VerifySendSmsAsync(number, 527519, new VerifySendParameter[]
-        {
-            new("FULLNAME", fullName),
-            new("CODE1",firstPart),
-            new("CODE2",secondPart)
-        });
-        var smsResult =  new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message,  "لینک تاییدیه ارتقا قرارداد مالی",
+       var smsResult =  new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message,  "لینک تاییدیه قرارداد مالی",
             fullName, number, contractingPartyId, institutionContractId);
         await _smsResultRepository.CreateAsync(smsResult);
         await _smsResultRepository.SaveChangesAsync();
@@ -390,7 +353,7 @@ public class SmsService : ISmsService
     public async Task<bool> SendInstitutionVerificationCode(string number, string code, string contractingPartyFullName,
         long contractingPartyId, long institutionContractId)
     {
-        var verificationSendResult =await VerifySendSmsAsync(number, 965348, new VerifySendParameter[]
+        var verificationSendResult =await  SmsIr.VerifySendAsync(number, 965348, new VerifySendParameter[]
         {
             new("VERIFYCODE", code)
         });

PersonalContractingParty.Config/PersonalBootstrapper.cs

@@ -220,17 +220,11 @@ using CompanyManagment.App.Contracts.PaymentInstrument;
 using CompanyManagment.App.Contracts.PaymentTransaction;
 using CompanyManagment.App.Contracts.AuthorizedPerson;
 using Company.Domain.AuthorizedPersonAgg;
-using Company.Domain.EmployeeFaceEmbeddingAgg;
 using Company.Domain.InstitutionContractExtensionTempAgg;
 using Company.Domain.LawAgg;
-using CompanyManagement.Infrastructure.Mongo.EmployeeFaceEmbeddingRepo;
 using CompanyManagement.Infrastructure.Mongo.InstitutionContractInsertTempRepo;
-using CompanyManagment.App.Contracts.EmployeeFaceEmbedding;
 using CompanyManagment.App.Contracts.Law;
 using CompanyManagment.EFCore.Repository;
-using _0_Framework.Application.FaceEmbedding;
-using _0_Framework.Infrastructure;
-using _0_Framework.InfraStructure;
 
 namespace PersonalContractingParty.Config;
 
@@ -485,10 +479,6 @@ public class PersonalBootstrapper
 
         services
             .AddTransient<IInstitutionContractExtenstionTempRepository, InstitutionContractExtenstionTempRepository>();
-        
-        services.AddTransient<IEmployeeFaceEmbeddingRepository, EmployeeFaceEmbeddingRepository>();
-        services.AddTransient<IEmployeeFaceEmbeddingApplication, EmployeeFaceEmbeddingApplication>();
-        
         #endregion
 
         #region Pooya
@@ -614,10 +604,6 @@ public class PersonalBootstrapper
         services.AddTransient<IInsuranceApplication, InsuranceApplication>();
         services.AddTransient<IInsuranceRepository, InsuranceRepository>();
 
-        // Face Embedding Services
-        services.AddTransient<IFaceEmbeddingService, FaceEmbeddingService>();
-        services.AddTransient<IFaceEmbeddingNotificationService, NullFaceEmbeddingNotificationService>();
-
         services.AddDbContext<CompanyContext>(x => x.UseSqlServer(connectionString));
     }
 }

Query/AdminReports/Handlers/GetWorkshopWithRollCallHandler.cs

@@ -9,20 +9,20 @@ using WorkFlow.Application.Contracts.WorkFlow;
 
 namespace Query.AdminReports.Handlers
 {
-    public interface IGetWorkshopWithRollCallHandler
-    {
-        List<WorkshopWithRollCallServiceQueryModel> Handle(WorkshopWithRollCallServiceQueryParameters parameters);
-    }
+	public interface IGetWorkshopWithRollCallHandler
+	{
+		List<WorkshopWithRollCallServiceQueryModel> Handle(WorkshopWithRollCallServiceQueryParameters parameters);
+	}
 
-    public class GetWorkshopWithRollCallHandler : IGetWorkshopWithRollCallHandler
-    {
+	public class GetWorkshopWithRollCallHandler: IGetWorkshopWithRollCallHandler
+	{
         private readonly CompanyContext _companyContext;
         private readonly IWorkFlowApplication workFlowApplication;
 
         public GetWorkshopWithRollCallHandler(CompanyContext companyContext, IWorkFlowApplication workFlowApplication)
         {
-            _companyContext = companyContext;
-            this.workFlowApplication = workFlowApplication;
+	        _companyContext = companyContext;
+	        this.workFlowApplication = workFlowApplication;
         }
 
         public List<WorkshopWithRollCallServiceQueryModel> Handle(WorkshopWithRollCallServiceQueryParameters parameters)
@@ -30,6 +30,7 @@ namespace Query.AdminReports.Handlers
             var now = DateTime.Now.Date;
             var lastWeek = now.AddDays(-7);
 
+
             //workshop filter by parameters
             var rollCallServiceQuery = _companyContext.RollCallServices.AsSplitQuery();
 
@@ -45,49 +46,35 @@ namespace Query.AdminReports.Handlers
                 rollCallServiceQuery = rollCallServiceQuery.Where(x => x.ServiceType == parameters.RollCallServiceType);
 
             if (parameters.FilterMode == FilterMode.Active)
-                rollCallServiceQuery =
-                    rollCallServiceQuery.Where(x => x.StartService.Date <= now && x.EndService.Date >= now);
-
+                rollCallServiceQuery = rollCallServiceQuery.Where(x => x.StartService.Date <= now && x.EndService.Date >= now);
             else if (parameters.FilterMode == FilterMode.DeActive)
-                rollCallServiceQuery =
-                    rollCallServiceQuery.Where(x => x.EndService.Date < now || x.StartService.Date > now);
+                rollCallServiceQuery = rollCallServiceQuery.Where(x => x.EndService.Date < now || x.StartService.Date > now);
 
-            var workshopsWithService = rollCallServiceQuery.Join(allWorkshops, x => x.WorkshopId, y => y.id,
-                (rcs, workshop) =>
-                    new WorkshopWithRollCallServiceQueryModel()
-                    {
-                        WorkshopId = workshop.id,
-                        RollCallServiceType = rcs.ServiceType,
-                        WorkshopName = workshop.WorkshopFullName,
-                        MaxPersonValid = rcs.MaxPersonValid,
-                        IsActive = rcs.StartService <= DateTime.Now && rcs.EndService >= DateTime.Now,
-                        ServiceStart = rcs.StartService,
-                        ServiceEnd = rcs.EndService
-                    });
+            var workshopsWithService = rollCallServiceQuery.Join(allWorkshops, x => x.WorkshopId, y => y.id, (rcs, workshop) =>
+                new WorkshopWithRollCallServiceQueryModel()
+                {
+                    WorkshopId = workshop.id,
+                    RollCallServiceType = rcs.ServiceType,
+                    WorkshopName = workshop.WorkshopFullName,
+                    MaxPersonValid = rcs.MaxPersonValid,
+                    IsActive = rcs.StartService <= DateTime.Now && rcs.EndService >= DateTime.Now,
+                    ServiceStart = rcs.StartService,
+                    ServiceEnd = rcs.EndService
+                });
 
 
             //workshop population
-            var workshopLeftWorks = _companyContext.Workshops.AsSplitQuery()
-                .Where(x => workshopsWithService.Any(y => y.WorkshopId == x.id)).Include(x => x.LeftWorks)
-                .Include(x => x.LeftWorkInsurances)
-                .Select(x => new
-                {
-                    WorkshopId = x.id,
-                    LeftWorks = x.LeftWorks.Where(y => y.StartWorkDate <= lastWeek && y.LeftWorkDate > now)
-                        .Select(y => y.EmployeeId),
-                    LeftWorkInsurances = x.LeftWorkInsurances
-                        .Where(y => y.StartWorkDate <= lastWeek && (y.LeftWorkDate > now || y.LeftWorkDate == null))
-                        .Select(y => y.EmployeeId)
-                }).ToList();
+            var workshopLeftWorks = _companyContext.Workshops.AsSplitQuery().Where(x => workshopsWithService.Any(y => y.WorkshopId == x.id)).Include(x => x.LeftWorks).Include(x => x.LeftWorkInsurances)
+            .Select(x => new
+            {
+                WorkshopId = x.id,
+                LeftWorks = x.LeftWorks.Where(y => y.StartWorkDate <= lastWeek && y.LeftWorkDate > now).Select(y => y.EmployeeId),
+                LeftWorkInsurances = x.LeftWorkInsurances.Where(y => y.StartWorkDate <= lastWeek && (y.LeftWorkDate > now || y.LeftWorkDate == null)).Select(y => y.EmployeeId)
+            }).ToList();
 
             var workshopsWorkingEmployeesList = workshopLeftWorks
-                .Select(x =>
-                    new
-                    {
-                        x.WorkshopId,
-                        TotalWorkingEmployeesCount = x.LeftWorks.Concat(x.LeftWorkInsurances).Distinct().Count(),
-                        EmployeeIds = x.LeftWorks.Concat(x.LeftWorkInsurances).Distinct()
-                    }).ToList();
+                .Select(x => new { x.WorkshopId, TotalWorkingEmployeesCount = x.LeftWorks.Concat(x.LeftWorkInsurances).Distinct().Count(), EmployeeIds = x.LeftWorks.Concat(x.LeftWorkInsurances).Distinct() }).ToList();
+
 
 
             var activeEmployees = _companyContext.RollCallEmployees.AsSplitQuery()
@@ -96,25 +83,15 @@ namespace Query.AdminReports.Handlers
                             workshopsWithService.Any(y => y.WorkshopId == x.WorkshopId))
                 .Select(x => new { x.WorkshopId, x.EmployeeId });
 
-            var lastWeekRollCalls = _companyContext.RollCalls.AsSplitQuery()
-                .Where(x => x.StartDate.HasValue &&
-                    x.StartDate.Value >= lastWeek
-                    && workshopsWithService
-                        .Any(y => y.WorkshopId == x.WorkshopId))
-                .GroupBy(x => x.EmployeeId)
-                .Select(x => x.Key);
+            var lastWeekRollCalls = _companyContext.RollCalls.AsSplitQuery().Where(x => x.StartDate.HasValue && x.StartDate.Value >= lastWeek
+            && workshopsWithService.Any(y => y.WorkshopId == x.WorkshopId)).GroupBy(x => x.EmployeeId).Select(x => x.Key);
 
 
-            var leaves = _companyContext.LeaveList.AsSplitQuery().Where(x =>
-                x.StartLeave <= lastWeek && x.EndLeave >= now &&
-                (x.LeaveType == "استعلاجی" || x.PaidLeaveType == "روزانه")
-                && workshopsWithService.Any(y => y.WorkshopId == x.WorkshopId))
-                .Select(x => x.EmployeeId);
+            var leaves = _companyContext.LeaveList.AsSplitQuery().Where(x => x.StartLeave <= lastWeek && x.EndLeave >= now && (x.LeaveType == "استعلاجی" || x.PaidLeaveType == "روزانه")
+                                                                             && workshopsWithService.Any(y => y.WorkshopId == x.WorkshopId)).Select(x => x.EmployeeId);
 
 
-            var activeEmployeesList = activeEmployees.ToList().Where(x =>
-                workshopsWorkingEmployeesList.Any(w =>
-                    w.WorkshopId == x.WorkshopId && w.EmployeeIds.Contains(x.EmployeeId)));
+            var activeEmployeesList = activeEmployees.ToList().Where(x => workshopsWorkingEmployeesList.Any(w => w.WorkshopId == x.WorkshopId && w.EmployeeIds.Contains(x.EmployeeId)));
             var lastWeekRollCallsList = lastWeekRollCalls.ToList();
             var leavesList = leaves.ToList();
             var workshopsWithServiceList = workshopsWithService.ToList();
@@ -130,13 +107,12 @@ namespace Query.AdminReports.Handlers
                     MaxPersonValid = x.MaxPersonValid,
                     WorkshopName = x.WorkshopName,
                     ActiveEmployeesCount = activeEmployeesList.Count(y => y.WorkshopId == x.WorkshopId),
-                    ActiveEmployeesWithRollCallInLastWeekCount = activeEmployeesList.Count(y =>
-                        y.WorkshopId == x.WorkshopId &&
+                    ActiveEmployeesWithRollCallInLastWeekCount = activeEmployeesList.Count(y => y.WorkshopId == x.WorkshopId &&
                         lastWeekRollCallsList.Contains(y.EmployeeId) && !leavesList.Contains(y.EmployeeId)),
-                    TotalEmployeesCount = workshopsWorkingEmployeesList
-                        .FirstOrDefault(y => y.WorkshopId == x.WorkshopId)?.TotalWorkingEmployeesCount ?? 0,
+                    TotalEmployeesCount = workshopsWorkingEmployeesList.FirstOrDefault(y => y.WorkshopId == x.WorkshopId)?.TotalWorkingEmployeesCount ?? 0,
                     //UndoneWorkFlowsCount = workFlowApplication.GetAllWorkFlowCount(x.WorkshopId).Result
                 }).OrderByDescending(x => x.IsActive).ToList();
+
         }
     }
-}
+}

Query/AdminReports/Models/WorkshopWithRollCallServiceQueryModel.cs

@@ -13,8 +13,15 @@
         public int ActiveEmployeesWithRollCallInLastWeekCount { get; set; }
 
         public int UndoneWorkFlowsCount { get; set; }
-        
-        public float ActiveEmployeesWithRollCallPercentage => ActiveEmployeesCount == 0 ? 0f : ((float)ActiveEmployeesWithRollCallInLastWeekCount / ActiveEmployeesCount) * 100f;
+
+
+        public float ActiveEmployeesWithRollCallPercentage
+        {
+            get
+            {
+                return ((float)ActiveEmployeesWithRollCallInLastWeekCount / ActiveEmployeesCount) * 100;
+            }
+        }
 
         public int MaxPersonValid { get; set; }
         public bool IsActive { get; set; }

ServiceHost/Areas/Admin/Controllers/AndroidApkController.cs

@@ -1,61 +0,0 @@
-
-using CompanyManagment.App.Contracts.AndroidApkVersion;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using ServiceHost.BaseControllers;
-
-namespace ServiceHost.Areas.Admin.Controllers;
-
-[AllowAnonymous]
-[ApiController]
-[Route("api/android-apk")] 
-public class AndroidApkController:AdminBaseController
-{
-    private readonly IAndroidApkVersionApplication _apkApp;
-    public AndroidApkController(IAndroidApkVersionApplication apkApp)
-    {
-        _apkApp = apkApp;
-    }
-
-    [HttpGet("check-update")]
-    public async Task<IActionResult> CheckUpdate([FromQuery] ApkType type, [FromQuery] int currentVersionCode = 0)
-    {
-     
-        var info = await _apkApp.GetLatestActiveInfo(type, currentVersionCode);
-        return Ok(new
-        {
-            latestVersionCode = info.LatestVersionCode,
-            latestVersionName = info.LatestVersionName,
-            shouldUpdate = info.ShouldUpdate,
-            isForceUpdate = info.IsForceUpdate,
-            downloadUrl = info.DownloadUrl,
-            releaseNotes = info.ReleaseNotes
-        });
-    }
-
-    [HttpGet("download")]
-    public async Task<IActionResult> Download([FromQuery] ApkType type)
-    {
-        // Check if APK exists
-        if (!_apkApp.HasAndroidApkToDownload(type))
-        {
-            return NotFound(new { message = $"هیچ فایل APK فعالی برای {type} یافت نشد" });
-        }
-
-        // Get the path to the latest active APK
-        var path = await _apkApp.GetLatestActiveVersionPath(type);
-        
-        if (string.IsNullOrEmpty(path) || !System.IO.File.Exists(path))
-        {
-            return NotFound(new { message = "فایل APK یافت نشد" });
-        }
-
-        // Set appropriate file name for download
-        var fileName = type == ApkType.WebView 
-            ? "Gozareshgir.apk" 
-            : "Gozareshgir-FaceDetection.apk";
-
-        // Return the file for download
-        return PhysicalFile(path, "application/vnd.android.package-archive", fileName);
-    }
-}

ServiceHost/Areas/Admin/Controllers/RollCallController.cs

@@ -1,49 +0,0 @@
-using _0_Framework.Application;
-using AccountManagement.Application.Contracts.Account;
-using Microsoft.AspNetCore.Mvc;
-using Query.AdminReports.Handlers;
-using Query.AdminReports.Models;
-using ServiceHost.BaseControllers;
-using WorkFlow.Application.Contracts.WorkFlow;
-
-namespace ServiceHost.Areas.Admin.Controllers;
-
-public class RollCallController:AdminBaseController
-{
-    private readonly IGetWorkshopWithRollCallHandler _workshopWithRollCallHandler;
-    private readonly IWorkFlowApplication _workFlowApplication;
-    private readonly long _currentAccountId;
-
-    public RollCallController(IGetWorkshopWithRollCallHandler workshopWithRollCallHandler,IAuthHelper _authHelper, IWorkFlowApplication workFlowApplication)
-    {
-        _workshopWithRollCallHandler = workshopWithRollCallHandler;
-        _workFlowApplication = workFlowApplication;
-        _currentAccountId = _authHelper.CurrentAccountId();
-    }
-
-    [HttpGet("report")]
-    public ActionResult<List<WorkshopWithRollCallServiceQueryModel>> GetRollCallReport([FromQuery] WorkshopWithRollCallServiceQueryParameters searchModel)
-    {
-        var result = _workshopWithRollCallHandler.Handle(searchModel);
-        return result;
-    }
-
-    [HttpGet("report/workshops-select-list")]
-    public ActionResult<List<WorkshopSelectList>> GetWorkshopsSelectList()
-    {
-        var result = _workshopWithRollCallHandler.Handle(new WorkshopWithRollCallServiceQueryParameters())
-            .Select(x => new WorkshopSelectList
-            {
-                Id = x.WorkshopId,
-                WorkshopFullName = x.WorkshopName
-            }).Distinct().ToList();
-        return result;
-    }
-    
-    [HttpGet("repoert/workfloecount/{workshopId}")]
-    public async Task<ActionResult<int>> GetWorkFlowCountByWorkshopId(long workshopId)
-    {
-        var result = await _workFlowApplication.GetAllWorkFlowCount(workshopId, _currentAccountId);
-        return result;
-    }
-}

ServiceHost/Areas/Admin/Controllers/institutionContractController.cs

@@ -88,12 +88,6 @@ public class institutionContractController : AdminBaseController
         return await _institutionContractApplication.GetListStats(searchModel);
     }
 
-    [HttpGet("workshops-details/{id}")]
-    public async Task<ActionResult<GetInstitutionContractWorkshopsDetails>> GetWorkshopsDetials(long id)
-    {
-        var result = await _institutionContractApplication.GetContractWorkshopsDetails(id);
-        return result;
-    }
 
     /// <summary>
     /// ویرایش
@@ -224,7 +218,6 @@ public class institutionContractController : AdminBaseController
     [HttpDelete("{id}")]
     public async Task<ActionResult<OperationResult>> Remove(long id)
     {
-        return BadRequest("امکان حذف قرارداد وجود ندارد");
         _institutionContractApplication.RemoveContract(id);
         return new OperationResult().Succcedded();
         

ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs

@@ -32,12 +32,6 @@ using ServiceHost.Hubs;
 using System.Diagnostics.Contracts;
 using WorkFlow.Application.Contracts.WorkFlow;
 using System.Globalization;
-using Company.Domain.LeftWorkInsuranceAgg;
-using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
-using Company.Domain.InsuranceListAgg;
-using CompanyManagment.App.Contracts.InsuranceList;
-using CompanyManagment.EFCore.Repository;
-using System.Linq;
 
 namespace ServiceHost.Areas.Admin.Pages.Company.Checkouts;
 
@@ -65,9 +59,6 @@ public class IndexModel : PageModel
     private readonly IYearlySalaryApplication _yearlySalaryApplication;
     private readonly IYearlySalaryRepository _yearlySalaryRepository;
     private readonly IWorkFlowApplication _workFlowApplication;
-    private readonly ILeftWorkInsuranceRepository _leftWorkInsuranceRepository;
-    private readonly IInsuranceListApplication _insuranceListApplication;
-    private readonly IInsuranceListRepository _insuranceListRepository;
 
 
     public List<CheckoutViewModel> chekoutlist;
@@ -109,7 +100,7 @@ public class IndexModel : PageModel
         ILeaveApplication leaveApplication, IHubContext<CheckoutHub> hubContext,
         IEmployeeComputeOptionsApplication employeeComputeOptionsApplication,
         IRollCallMandatoryApplication rollCallMandatoryApplication,
-        IRollCallEmployeeStatusApplication rollCallEmployeeStatusApp, IWorkFlowApplication workFlowApplication, ILeftWorkInsuranceRepository leftWorkInsuranceRepository, IInsuranceListApplication insuranceListApplication, IInsuranceListRepository insuranceListRepository)
+        IRollCallEmployeeStatusApplication rollCallEmployeeStatusApp, IWorkFlowApplication workFlowApplication)
     {
         _contractApplication = contractApplication;
         _workshopApplication = workshopApplication;
@@ -133,9 +124,6 @@ public class IndexModel : PageModel
         _rollCallMandatoryApplication = rollCallMandatoryApplication;
         _rollCallEmployeeStatusApp = rollCallEmployeeStatusApp;
         _workFlowApplication = workFlowApplication;
-        _leftWorkInsuranceRepository = leftWorkInsuranceRepository;
-        _insuranceListApplication = insuranceListApplication;
-        _insuranceListRepository = insuranceListRepository;
     }
 
     public string Message { get; set; }
@@ -177,7 +165,7 @@ public class IndexModel : PageModel
 
         var searchResult = await _checkoutApplication.SearchCheckoutOptimized(searchModel);
 
-        var result = new CompanyManagment.App.Contracts.Checkout.MainViewModel();
+        var result = new MainViewModel();
         result.IsSysManager = accountId is 2 or 3;
         result.MainList = searchResult;
         if (searchModel.WorkshopId != 0 || searchModel.EmployeeId != 0)
@@ -771,36 +759,11 @@ public class IndexModel : PageModel
         var maxNumber = Convert.ToDouble(ContractsId.Count());
         if (ContractsId.Count > 0)
         {
-            #region Insurance
-            var watch = new Stopwatch();
- 
-            watch.Start();
-            var contractpData = _contractApplication.GetDetails(ContractsId[0]);
-           
-            var startMonthFa = $"{ConvertYear}/{ConvertMonth.PadLeft(2, '0')}/01";
-            DateTime startDateGr = startMonthFa.ToGeorgianDateTime();
-            DateTime endDateGr = startMonthFa.FindeEndOfMonth().ToGeorgianDateTime();
-            int endOfMonth = Convert.ToInt32((startMonthFa.FindeEndOfMonth()).Substring(8, 2));
-
-
-            var insuranceListData =
-                _insuranceListRepository.EmployeeInsuranceDataBy(startDateGr, contractpData.WorkshopIds);
-            var yearlysaleries = _yearlySalaryApplication.GetInsuranceItems(startDateGr, endDateGr, ConvertYear);
-
-            var insuranceEmployeeData =
-                _leftWorkInsuranceRepository.GetEmployeeInsuranceLeftWorksAndInformation(contractpData.WorkshopIds, startDateGr,
-                    endDateGr);
-                Console.WriteLine("checkout-test-timer" + watch.Elapsed);
-                watch.Stop();
-            #endregion
-
-
-
             //int i = 0;
             foreach (var item in ContractsId)
             {
                 var contract = _contractApplication.GetDetails(item);
-                
+
                 //var workingHours = _workingHoursApplication.GetByContractId(contract.Id);
                 var workingHours = _workingHoursTempApplication.GetByContractIdConvertToShiftwork4(contract.Id);
                 var separation = _contractApplication.contractSeparation(ConvertYear, ConvertMonth,
@@ -1029,78 +992,7 @@ public class IndexModel : PageModel
                         officialHoliday, totalHoursH, totalHoursM, consumableItemDouble, housingAllowanceDouble,
                         familyAllowanceDouble, marriedAllowanceDouble, workshop.IsOldContract);
 
-
-                    #region Insurance
-
-                    double insuranceShare = 0;
-                    //اگر پرسنل داری شروع بکار بیمه بود
-                    var insuranceEmployeeDataItem =
-                        insuranceEmployeeData.FirstOrDefault(x => x.EmployeeId == contract.EmployeeId);
-
-                    //اگر لیست بیمه برای پرسنل ساخته شده بود
-                    var insuranceListDataWithDetails =
-                        insuranceListData.FirstOrDefault(x => x.EmployeeId == contract.EmployeeId);
-                    if (insuranceListDataWithDetails != null)
-                    {
-                        insuranceShare = insuranceListDataWithDetails.InsuranceShare;
-                    }
-                    else
-                    {
-                        if (insuranceEmployeeDataItem != null && insuranceEmployeeDataItem.StartWorkDateGr <= separation.ContractEndGr)
-                        {
-                            var workingDays = Tools.GetEmployeeInsuranceWorkingDays(insuranceEmployeeDataItem.StartWorkDateGr, separation.LeftWorkDate, startDateGr, endDateGr, insuranceEmployeeDataItem.EmployeeId);
-                            var leftWorkFa = workingDays.hasLeftWorkInMonth ? separation.LeftWorkDate.ToFarsi() : "";
-
-                            //به دست آوردن دستمزد روزانه با توجه به اینکه کارگاه مشاغل مقطوع است یا خیر
-
-                            double dailyWage = 0;
-                            if (workshop.FixedSalary)
-                            {
-                                var res = _insuranceListApplication.GetDailyWageFixedSalary(ConvertYear, workshop.Id, insuranceEmployeeDataItem.EmployeeId, startDateGr,
-                                    endDateGr, insuranceEmployeeDataItem.JobId, workshop.Population, workshop.InsuranceJobId);
-                                dailyWage = res ?? 0;
-
-                            }
-                            else
-                            {
-                                var res = _insuranceListApplication.ComputeDailyWage(yearlysaleries.DayliWage, insuranceEmployeeDataItem.EmployeeId, workshop.Id, ConvertYear);
-                                dailyWage = res;
-                            }
-
-                            //بدست آوردن پایه سنوات
-                            var baseYears = _insuranceListRepository.GetEmployeeInsuranceBaseYear(insuranceEmployeeDataItem.EmployeeId, workshop.Id,
-                                workingDays.countWorkingDays, startDateGr, endDateGr, workingDays.startWork, workingDays.endWork, workingDays.hasLeftWorkInMonth);
-
-                            //جمع مزد روزانه و پایه سنوات
-                            var dailyWagePlusBaseYears = dailyWage + baseYears.baseYear;
-
-
-                            //دستمزد ماهانه با محاسبه پایه سنوات
-                            var monthlySalary = _insuranceListApplication.GetRoundValue(dailyWagePlusBaseYears * workingDays.countWorkingDays);
-
-                            //حق تاهل
-                            var marriedAllowance = employee.MaritalStatus == "متاهل" ? yearlysaleries.MarriedAllowance : 0;
-
-                            //محاسبه مزایای ماهانه
-                            var monthlyBenefits = _insuranceListApplication.GetMonthlyBenefits(endOfMonth, yearlysaleries.ConsumableItems, yearlysaleries.HousingAllowance, marriedAllowance, workingDays.countWorkingDays, workshop.TypeOfInsuranceSend, insuranceEmployeeDataItem.JobId, insuranceEmployeeDataItem.EmployeeId, insuranceEmployeeDataItem.IncludeStatus);
-                            if (workshop.InsuranceCheckoutOvertime)
-                            {
-
-                                monthlyBenefits = _insuranceListApplication.GetRoundValue(monthlyBenefits += overTimeWorking);
-                            }
-
-                            //محاسبه  جمع مزایای مشمول و دستمزد ماهانه
-                            var benefitsIncludedContinuous = monthlyBenefits + monthlySalary;
-
-                            //محاسبه حق بیمه سهم بیمه شده 
-                            insuranceShare = (benefitsIncludedContinuous * 7) / 100;
-                        }
-                    }
-                   
-                    
-
-                    #endregion
-
+           
                     var command = new CreateCheckout
                     {
                         EmployeeFullName = employee.EmployeeFullName,
@@ -1206,11 +1098,7 @@ public class IndexModel : PageModel
 
                         DailySalaryAffected = mandatoryCompute.DailySalaryAffected,
 
-                        #region InsuranceShare
 
-                        InsuranceDeduction = _insuranceListApplication.GetRoundValue(insuranceShare),
-
-                        #endregion
 
 
 

ServiceHost/Areas/Admin/Pages/Company/Checkouts/MainSearch.cshtml

@@ -2,135 +2,8 @@
 @{
     <style>
         .btn-lime {
-        background-color: #84cc16;
-        border: 1px solid #84cc16;
-        }
-
-
-        .fulltext {
-        opacity: 0;
-        white-space: nowrap;
-        }
-
-        .ellipsed {
-        display: block;
-        width: 100%;
-        text-overflow: ellipsis;
-        overflow-x: clip;
-        white-space: nowrap;
-        }
-
-        .date-box {
-        display: flex;
-        align-items: center;
-        }
-
-        .tooltipfull-containerText {
-        cursor: pointer;
-        position: absolute;
-        display: inline-block;
-        right: -2px;
-        top: 13px;
-        }
-
-
-        .tooltip {
-            opacity: 0;
-            z-index: 99;
-            color: #fff;
-            width: 220px;
-            display: block;
-            font-size: 14px;
-            font-family: 'IranSans';
-            padding: 5px 10px;
-            border-radius: 3px;
-            text-align: center;
-            /*text-shadow: 1px 1px 2px #111;*/
-            background: #e67e22;
-            border: 1px solid #e67e22;
-            box-shadow: 0 0 3px rgba(0,0,0,0.5);
-            -webkit-transition: all .2s ease-in-out;
-            -moz-transition: all .2s ease-in-out;
-            -o-transition: all .2s ease-in-out;
-            -ms-transition: all .2s ease-in-out;
-            transition: all .2s ease-in-out;
-            -webkit-transform: scale(0);
-            -moz-transform: scale(0);
-            -o-transform: scale(0);
-            -ms-transform: scale(0);
-            transform: scale(0);
-            position: absolute;
-            right: -50px;
-            bottom: 40px;
-        }
-
-            .tooltip:before, .tooltip:after {
-                content: '';
-                border-left: 10px solid transparent;
-                border-right: 10px solid transparent;
-                border-top: 10px solid #e67e22;
-                position: absolute;
-                bottom: -10px;
-                left: 70%;
-            }
-
-        .tooltip-container:hover .tooltip, a:hover .tooltip {
-            opacity: 1;
-            -webkit-transform: scale(1);
-            -moz-transform: scale(1);
-            -o-transform: scale(1);
-            -ms-transform: scale(1);
-            transform: scale(1);
-        }
-
-        .tooltipfull {
-            opacity: 0;
-            z-index: 99;
-            color: #fff;
-            /*  width: 180px;*/
-            display: block;
-            font-size: 12px;
-            font-family: 'IranSans';
-            padding: 5px 10px;
-            border-radius: 15px;
-            text-align: center;
-            /*text-shadow: 1px 1px 2px #111;*/
-            background: #950000;
-            border: 1px solid #950000;
-            box-shadow: 0 0 3px rgba(0,0,0,0.5);
-            -webkit-transition: all .2s ease-in-out;
-            -moz-transition: all .2s ease-in-out;
-            -o-transition: all .2s ease-in-out;
-            /*  -ms-transition: all .2s ease-in-out;*/
-            transition: all .2s ease-in-out;
-            -webkit-transform: scale(0);
-            -moz-transform: scale(0);
-            -o-transform: scale(0);
-            -ms-transform: scale(0);
-            transform: scale(0);
-            position: absolute;
-            right: -2px;
-            bottom: 20px;
-            white-space: nowrap;
-        }
-
-            .tooltipfull:before, .tooltipfull:after {
-                content: '';
-                border-left: 10px solid transparent;
-                border-right: 10px solid transparent;
-                border-top: 10px solid #950000;
-                position: absolute;
-                bottom: -10px;
-                left: 50%;
-            }
-
-        .tooltipfull-containerText:hover .tooltipfull, a:hover .tooltipfull {
-            opacity: 1;
-            -webkit-transform: scale(1);
-            -moz-transform: scale(1);
-            -o-transform: scale(1);
-            -ms-transform: scale(1);
-            transform: scale(1);
+            background-color: #84cc16;
+            border: 1px solid #84cc16;
         }
     </style>
 
@@ -229,41 +102,14 @@
                 <td class="code-td">
                     <span class="ellipsed">
                         @item.Month
-                        @{
-                            <span>&nbsp;</span>
-                            if(item.IsUpdateNeeded){
-                                <i style="color: #cb1c1c; font-size:17px !important" class="fa fa-exclamation-triangle" aria-hidden="true"></i>
-                            }
-                        }
-
                     </span>
-                
                     <div class="tooltipfull-containerText">
-                        @{
-                            if (item.IsUpdateNeeded)
-                            {
-                                foreach (var warning in item.CheckoutWarningMessageList)
-                                {
-                                    <p class="fulltext">
-                                        @warning.WarningMessage
-                                    </p>
-                                    <span class="tooltipfull" style="right: -103px;bottom: 20px;">
-                                        @warning.WarningMessage
-                                    </span>
-                                }
-                            }
-                            else
-                            {
-                                <p class="fulltext">
-                                    @item.Month
-                                </p>
-                                <span class="tooltipfull">
-                                    @item.Month
-                                </span>
-                            }
-                        }
-                    
-                        
+                        <p class="fulltext">
+                            @item.Month
+                        </p>
+                        <span class="tooltipfull">
+                            @item.Month
+                        </span>
                     </div>
                 </td>
                 <td class="name-td">

ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml.cs

@@ -923,8 +923,6 @@ public class IndexModel : PageModel
     public IActionResult OnGetDownloadExcel()
     {
         var institutionContractViewModels = _institutionContract.NewSearch(new() {IsActiveString = "both", TypeOfContract = "both" });
-        
-        institutionContractViewModels= institutionContractViewModels.GroupBy(x=>x.ContractingPartyId).Select(g=>g.MaxBy(x=>x.ContractStartGr)).ToList();
         var bytes = InstitutionContractExcelGenerator.GenerateExcel(institutionContractViewModels);
         return File(bytes,
             "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",

ServiceHost/Areas/Admin/Pages/Company/Reports/Index.cshtml

@@ -287,7 +287,7 @@
 
 					<div class="textsChart">
 						<p class="alltxt">
-							<span style="width: 40px;display: inline-block;">@Model.ContractSignToBe</span> : <span style="width: 62px;display: inline-block;">کل</span>
+							<span style="width: 40px;display: inline-block;">@Model.ContrcatDone</span> : <span style="width: 62px;display: inline-block;">کل</span>
 						</p>
 						<p class="alldonetxt">
 							<span style="width: 40px;display: inline-block;">@Model.ContractSignDone</span> : <span style="width: 62px;display: inline-block;color: #283344;">انجام شده</span>
@@ -353,7 +353,7 @@
 
 					<div class="textsChart">
 						<p class="alltxt">
-								<span style="width: 40px;display: inline-block;">@Model.CheckoutSignToBe</span> : <span style="width: 62px;display: inline-block;">کل</span>
+							<span style="width: 40px;display: inline-block;">@Model.CheckoutDone</span> : <span style="width: 62px;display: inline-block;">کل</span>
 						</p>
 						<p class="alldonetxt">
 							<span style="width: 40px;display: inline-block;">@Model.CheckoutSignDone</span> : <span style="width: 62px;display: inline-block;color: #283344;">انجام شده</span>

ServiceHost/Areas/Admin/Pages/Company/Reports/Index.cshtml.cs

@@ -1,5 +1,4 @@
 using _0_Framework.Application;
-using AccountMangement.Infrastructure.EFCore;
 using CompanyManagment.App.Contracts.Report;
 using CompanyManagment.App.Contracts.Workshop;
 using CompanyManagment.App.Contracts.YearlySalary;
@@ -43,7 +42,6 @@ public class IndexModel : PageModel
 	public int ContrcatDone { get; set; }
 	public int ContractSignNotDone { get; set; }
 	public int ContractSignDone { get; set; }
-    public int ContractSignToBe { get; set; }
 
 	//تصفیه
 	public int AllCheckout { get; set; }
@@ -51,9 +49,8 @@ public class IndexModel : PageModel
 	public int CheckoutDone { get; set; }
 	public int CheckoutSignNotDone { get; set; }
 	public int CheckoutSignDone { get; set; }
-    public int CheckoutSignToBe { get; set; }
 
-    public async Task OnGet(string year, string month)
+	public async Task OnGet(string year, string month)
 	{
 		YearlyList = _yearlySalaryApplication.GetYears();
 		var allReports = await _reportApplication.GetAllReports(year, month);
@@ -76,23 +73,19 @@ public class IndexModel : PageModel
 		ContrcatDone = allReports.ContrcatDone;
 		ContractSignNotDone = allReports.ContractSignNotDone;
 		ContractSignDone = allReports.ContractSignDone;
-        ContractSignToBe = allReports.ContractSignToBe;
-
-        AllCheckout = allReports.AllCheckout;
+		AllCheckout = allReports.AllCheckout;
 		CheckoutNotDone = allReports.CheckoutNotDone;
 		CheckoutDone = allReports.CheckoutDone;
 		CheckoutSignNotDone = allReports.CheckoutSignNotDone;
 		CheckoutSignDone = allReports.CheckoutSignDone;
-        CheckoutSignToBe = allReports.CheckoutSignToBe;
-
-
+       
     }
 
 	#region workshopFirstLoad
 
 	public IActionResult OnGetWorkshopContractDone(string year, string month, long accountId, List<long> workshopList)
 	{
-		var res = _reportApplication.GetWorkshopContractDone(year, month, accountId, workshopList).GetAwaiter().GetResult();
+		var res = _reportApplication.GetWorkshopContractDone(year, month, accountId, workshopList);
 		return new JsonResult(new
 		{
 			success = true,
@@ -103,7 +96,7 @@ public class IndexModel : PageModel
 
 	public IActionResult OnGetWorkshopContractSignDone(string year, string month, long accountId, List<long> workshopList)
 	{
-		var res = _reportApplication.GetWorkshopContractSignDone(year, month, accountId, workshopList).GetAwaiter().GetResult();
+		var res = _reportApplication.GetWorkshopContractSignDone(year, month, accountId, workshopList);
 		return new JsonResult(new
 		{
 			success = true,
@@ -114,7 +107,7 @@ public class IndexModel : PageModel
 
 	public IActionResult OnGetWorkshopCheckoutDone(string year, string month, long accountId, List<long> workshopList)
 	{
-		var res = _reportApplication.GetWorkshopCheckoutDone(year, month, accountId, workshopList).GetAwaiter().GetResult();
+		var res = _reportApplication.GetWorkshopCheckoutDone(year, month, accountId, workshopList);
 		return new JsonResult(new
 		{
 			success = true,
@@ -125,7 +118,7 @@ public class IndexModel : PageModel
 
 	public IActionResult OnGetWorkshopCheckoutSignDone(string year, string month, long accountId, List<long> workshopList)
 	{
-		var res = _reportApplication.GetWorkshopCheckoutSignDone(year, month, accountId, workshopList).GetAwaiter().GetResult();
+		var res = _reportApplication.GetWorkshopCheckoutSignDone(year, month, accountId, workshopList);
 		return new JsonResult(new
 		{
 			success = true,
@@ -140,7 +133,7 @@ public class IndexModel : PageModel
 
 	public IActionResult OnGetEmployeeContract(string year, string month, long workshopId)
 	{
-		var res = _reportApplication.GetEmployeeContract(year, month, workshopId).GetAwaiter().GetResult();
+		var res = _reportApplication.GetEmployeeContract(year, month, workshopId);
 		return new JsonResult(new
 		{
 			success = true,
@@ -150,7 +143,7 @@ public class IndexModel : PageModel
 
 	public IActionResult OnGetEmployeeContractSign(string year, string month, long workshopId)
 	{
-		var res = _reportApplication.GetEmployeeContractSign(year, month, workshopId).GetAwaiter().GetResult();
+		var res = _reportApplication.GetEmployeeContractSign(year, month, workshopId);
 		return new JsonResult(new
 		{
 			success = true,
@@ -160,7 +153,7 @@ public class IndexModel : PageModel
 
 	public IActionResult OnGetEmployeeCheckout(string year, string month, long workshopId)
 	{
-		var res = _reportApplication.GetEmployeeCheckout(year, month, workshopId).GetAwaiter().GetResult();
+		var res = _reportApplication.GetEmployeeCheckout(year, month, workshopId);
 		return new JsonResult(new
 		{
 			success = true,
@@ -170,7 +163,7 @@ public class IndexModel : PageModel
 
 	public IActionResult OnGetEmployeeCheckoutSign(string year, string month, long workshopId, long accountId)
 	{
-		var res = _reportApplication.GetEmployeeCheckoutSign(year, month, workshopId).GetAwaiter().GetResult();
+		var res = _reportApplication.GetEmployeeCheckoutSign(year, month, workshopId);
 		return new JsonResult(new
 		{
 			success = true,
@@ -187,14 +180,14 @@ public class IndexModel : PageModel
     {
 
         var workshopIds = Tools.ExtractNumbers(workshopList);
-        var res = _reportApplication.GetPrintAllContractDone(year, month, accountId, workshopIds).GetAwaiter().GetResult();
+		var res = _reportApplication.GetPrintAllContractDone(year, month, accountId, workshopIds);
 		return Partial("PrintAll", res);
 	}
 
 	public IActionResult OnGetPrintAllContractSignDone(string year, string month, long accountId, string workshopList)
 	{
         var workshopIds = Tools.ExtractNumbers(workshopList);
-        var res = _reportApplication.GetPrintAllContractSignDone(year, month, accountId, workshopIds).GetAwaiter().GetResult();
+        var res = _reportApplication.GetPrintAllContractSignDone(year, month, accountId, workshopIds);
 		return Partial("PrintAll", res);
 	}
 
@@ -202,14 +195,14 @@ public class IndexModel : PageModel
 	{
         var workshopIds = Tools.ExtractNumbers(workshopList);
 
-        var res = _reportApplication.GetPrintAllCheckoutDone(year, month, accountId, workshopIds).GetAwaiter().GetResult();
+        var res = _reportApplication.GetPrintAllCheckoutDone(year, month, accountId, workshopIds);
 		return Partial("PrintAll", res);
 	}
 
 	public IActionResult OnGetPrintAllCheckoutSignDone(string year, string month, long accountId, string workshopList)
 	{
         var workshopIds = Tools.ExtractNumbers(workshopList);
-        var res = _reportApplication.GetPrintAllCheckoutSignDone(year, month, accountId, workshopIds).GetAwaiter().GetResult();
+        var res = _reportApplication.GetPrintAllCheckoutSignDone(year, month, accountId, workshopIds);
 		return Partial("PrintAll", res);
 	}
 	//================Employee
@@ -218,7 +211,7 @@ public class IndexModel : PageModel
 	public IActionResult OnGetPrintEmployeeContract(string year, string month, long workshopId, string accountFullName)
 	{
 		var workshop = _workshopApplication.GetDetails(workshopId);
-		var res = _reportApplication.GetEmployeeContract(year, month, workshopId).GetAwaiter().GetResult();
+		var res = _reportApplication.GetEmployeeContract(year, month, workshopId);
 		var next = $"{year}/{month}/01";
 		var y = Convert.ToInt32(year);
 		var m = Convert.ToInt32(month);
@@ -242,7 +235,7 @@ public class IndexModel : PageModel
 		string accountFullName)
 	{
 		var workshop = _workshopApplication.GetDetails(workshopId);
-		var res = _reportApplication.GetEmployeeContractSign(year, month, workshopId).GetAwaiter().GetResult();
+		var res = _reportApplication.GetEmployeeContractSign(year, month, workshopId);
 		var next = $"{year}/{month}/01";
 		var y = Convert.ToInt32(year);
 		var m = Convert.ToInt32(month);
@@ -265,7 +258,7 @@ public class IndexModel : PageModel
 	public IActionResult OnGetPrintEmployeeCheckout(string year, string month, long workshopId, string accountFullName)
 	{
 		var workshop = _workshopApplication.GetDetails(workshopId);
-		var res = _reportApplication.GetEmployeeCheckout(year, month, workshopId).GetAwaiter().GetResult();
+		var res = _reportApplication.GetEmployeeCheckout(year, month, workshopId);
 
 		var final = new PrintEmployeeNotDone
 		{
@@ -284,7 +277,7 @@ public class IndexModel : PageModel
 		string accountFullName)
 	{
 		var workshop = _workshopApplication.GetDetails(workshopId);
-		var res = _reportApplication.GetEmployeeCheckoutSign(year, month, workshopId).GetAwaiter().GetResult();
+		var res = _reportApplication.GetEmployeeCheckoutSign(year, month, workshopId);
 
 		var final = new PrintEmployeeNotDone
 		{