add employer controller

0_Framework/0_Framework.csproj

@@ -15,8 +15,6 @@
     <PackageReference Include="PersianTools.Core" Version="2.0.4" />
     <PackageReference Include="System.Drawing.Common" Version="9.0.0" />
     <PackageReference Include="MD.PersianDateTime.Standard" Version="2.5.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="7.2.0" />
-
 
 
   </ItemGroup>

0_Framework/Application/AppSettingConfiguration.cs

@@ -1,6 +0,0 @@
-namespace _0_Framework.Application;
-
-public class AppSettingConfiguration
-{
-    public string Domain { get; set; }
-}

0_Framework/Application/AuthHelper.cs

@@ -40,9 +40,7 @@ public class AuthHelper : IAuthHelper
 		result.Mobile = claims.FirstOrDefault(x => x is { Type: "Mobile" }).Value;
 		result.SubAccountId = long.Parse(claims.FirstOrDefault(x => x.Type == "SubAccountId").Value);
 		result.WorkshopName = claims.FirstOrDefault(x => x is { Type: "WorkshopName" })?.Value;
-		result.Permissions = Tools.DeserializeFromBsonList<int>(claims.FirstOrDefault(x => x is { Type: "permissions" })?.Value);
-        result.RoleName = claims.FirstOrDefault(x => x is { Type: "RoleName" })?.Value;
-        return result;
+		return result;
 	}
 
 	public List<int> GetPermissions()

0_Framework/Application/PaymentGateway/AqayePardakhtPaymentGateway.cs

@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Security.Policy;
-using System.Security.Principal;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Options;
-
-namespace _0_Framework.Application.PaymentGateway;
-
-public class AqayePardakhtPaymentGateway:IPaymentGateway
-{
-    private static string _pin = "86EAF2C4D052F7D8759F";
-    private const string AccountNumber = "AP.1042276242";
-    private const string EncryptedKey = "130D2@D2923";
-
-    private readonly HttpClient _httpClient;
-
-    public AqayePardakhtPaymentGateway(IHttpClientFactory httpClientFactory,IOptions<AppSettingConfiguration> appSetting)
-    {
-        _httpClient = httpClientFactory.CreateClient();
-         
-        if (appSetting.Value.Domain == ".dad-mehr.ir")
-        {
-            _pin = "7349F84E81AB584862D9";
-        }
-
-    }
-
-    public async Task<PaymentGatewayResponse> Create(CreatePaymentGatewayRequest command,CancellationToken cancellationToken =default)
-    {
-        var response = await _httpClient.PostAsJsonAsync("https://panel.aqayepardakht.ir/api/v2/create", new
-        {
-            pin = _pin,
-            amount = command.Amount,
-            callback = command.CallBackUrl,
-            card_number = command.CardNumber,
-            invoice_id = command.InvoiceId,
-            mobile = command.Mobile,
-            email = command.Email,
-            description = command.Description,
-        }, cancellationToken: cancellationToken);
-
-        var result = await response.Content.ReadFromJsonAsync<PaymentGatewayResponse>(cancellationToken: cancellationToken);
-        return result;
-    }
-
-    public string GetStartPayUrl(string transactionId) =>
-        $"https://panel.aqayepardakht.ir/startpay/{transactionId}";
-
-    public async Task<PaymentGatewayResponse> Verify(VerifyPaymentGateWayRequest command, CancellationToken cancellationToken = default)
-    {
-        var response = await _httpClient.PostAsJsonAsync("https://panel.aqayepardakht.ir/api/v2/verify", new
-        {
-            pin = _pin,
-            amount = command.Amount,
-            transid = command.TransactionId,
-        }, cancellationToken: cancellationToken);
-
-        var result = await response.Content.ReadFromJsonAsync<PaymentGatewayResponse>(cancellationToken: cancellationToken);
-        return result;
-    }
-
-    public async Task<PaymentGatewayResponse> CreateSandBox(CreatePaymentGatewayRequest command, CancellationToken cancellationToken = default)
-    {
-        var response = await _httpClient.PostAsJsonAsync("https://panel.aqayepardakht.ir/api/v2/create", new
-        {
-            pin = "sandbox",
-            amount = command.Amount,
-            callback = command.CallBackUrl,
-            card_number = command.Amount,
-            invoice_id = command.InvoiceId,
-            mobile = command.Mobile,
-            email = command.Email,
-            description = command.Email,
-        }, cancellationToken: cancellationToken);
-
-        var result = await response.Content.ReadFromJsonAsync<PaymentGatewayResponse>(cancellationToken: cancellationToken);
-        return result;
-    }
-
-    public string GetStartPaySandBoxUrl(string transactionId) =>
-        $"https://panel.aqayepardakht.ir/startpay/sandbox/{transactionId}";
-
-    public async Task<WalletAmountResponse> GetWalletAmount(CancellationToken cancellationToken)
-    {
-        var response =await _httpClient.PostAsJsonAsync("https://panel.aqayepardakht.ir/api/v2/getmoney", new
-        {
-            account=AccountNumber,
-            code = EncryptedKey
-        }, cancellationToken: cancellationToken);
-        var jsonString = await response.Content.ReadAsStringAsync(cancellationToken);
-        var result = await response.Content.ReadFromJsonAsync<WalletAmountResponse>(cancellationToken);
-        return result;
-    }
-}

0_Framework/Application/PaymentGateway/IPaymentGateway.cs

@@ -1,60 +0,0 @@
-using Microsoft.AspNetCore.Server.HttpSys;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.Json.Serialization;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace _0_Framework.Application.PaymentGateway;
-
-public interface IPaymentGateway
-{
-    Task<PaymentGatewayResponse> Create(CreatePaymentGatewayRequest command, CancellationToken cancellationToken =default);
-
-    string GetStartPayUrl(string transactionId);
-    Task<PaymentGatewayResponse> Verify(VerifyPaymentGateWayRequest command, CancellationToken cancellationToken=default);
-    Task<PaymentGatewayResponse> CreateSandBox(CreatePaymentGatewayRequest command, CancellationToken cancellationToken=default);
-    string GetStartPaySandBoxUrl(string transactionId);
-    Task<WalletAmountResponse> GetWalletAmount(CancellationToken cancellationToken);
-
-}
-public class PaymentGatewayResponse
-{
-    [JsonPropertyName("status")]
-    public string Status { get; set; }
-
-    [JsonPropertyName("code")]
-    public int? ErrorCode { get; set; }
-
-    [JsonPropertyName("transid")]
-    public string TransactionId { get; set; }
-}
-
-public class WalletAmountResponse
-{
-    [JsonPropertyName("status")]
-    public string Status { get; set; }
-    [JsonPropertyName("money")]
-    public double Amount { get; set; }
-    [JsonPropertyName("code")]
-    public int Code { get; set; }
-}
-
-public class CreatePaymentGatewayRequest
-{
-    public double Amount { get; set; }
-    public string CallBackUrl { get; set; }
-    public string InvoiceId { get; set; }
-    public string CardNumber { get; set; }
-    public string Mobile { get; set; }
-    public string Email { get; set; }
-    public string Description { get; set; }
-}
-
-public class VerifyPaymentGateWayRequest
-{
-    public string TransactionId { get; set; }
-    public double Amount { get; set; }
-}

0_Framework/Application/Tools.cs

@@ -897,15 +897,7 @@ public static class Tools
             }
         }
 
-        try
-        {
-            numbers = Convert.ToInt32(num);
-        }
-        catch (Exception e)
-        {
-            return 0;
-        }
-     
+        numbers = Convert.ToInt32(num);
         return numbers;
     }
     public static string ToFarsiMonthByNumber(this string value)
@@ -1421,73 +1413,6 @@ public static class Tools
             return false;
         return true;
     }
-
-    /// <summary>
-    /// چک میکند که در دو شیفت استاتیک تداخل زمانی وجود دارد یا خیر
-    /// چک میکند که آیا ساعات وارد شده ولید هستند یا خیر
-    /// </summary>
-    /// <param name="start1"></param>
-    /// <param name="end1"></param>
-    /// <param name="start2"></param>
-    /// <param name="end2"></param>
-    /// <returns></returns>
-    public static bool InterferenceTime(string start1, string end1, string start2, string end2)
-    {
-        if (!CheckValidHm(start1))
-            return true;
-
-        if (!CheckValidHm(end1))
-            return true;
-
-        if (!CheckValidHm(start2))
-            return true;
-
-        if (!CheckValidHm(end2))
-            return true;
-
-        //اگه دو شیفت نبود
-        if (string.IsNullOrWhiteSpace(start1) || string.IsNullOrWhiteSpace(start2))
-            return false;
-
-
-        try
-        {
-            var start1Gr = Convert.ToDateTime(start1);
-            var end1Gr = Convert.ToDateTime(end1);
-
-            if (end1Gr < start1Gr)
-                end1Gr = end1Gr.AddDays(1);
-
-            var start2Gr = Convert.ToDateTime(start2);
-            var end2Gr = Convert.ToDateTime(end2);
-
-
-            start2Gr = new DateTime(end1Gr.Year, end1Gr.Month, end1Gr.Day, start2Gr.Hour, start2Gr.Minute,
-                start2Gr.Second);
-
-
-            end2Gr = new DateTime(end1Gr.Year, end1Gr.Month, end1Gr.Day, end2Gr.Hour, end2Gr.Minute,
-                end2Gr.Second);
-            if (end2Gr < start2Gr)
-                end2Gr = end2Gr.AddDays(1);
-
-            var diff = (end1Gr - start1Gr).Add((end2Gr - start2Gr));
-            if (diff > new TimeSpan(24,0,0))
-                return true;
-
-            if (start2Gr <= end1Gr)
-                return true;
-
-            return false;
-        }
-        catch (Exception)
-        {
-
-            return true;
-        }
-
-        
-    }
     public static DateTime FindFirstDayOfMonthGr(this DateTime date)
     {
         var pc = new PersianCalendar();

0_Framework/Application/UID/UidService.cs

@@ -10,70 +10,67 @@ namespace _0_Framework.Application.UID;
 
 public class UidService : IUidService
 {
-	private readonly HttpClient _httpClient;
-	private const string BaseUrl = "https://json-api.uid.ir/api/inquiry/";
+    private readonly HttpClient _httpClient;
+    private const string BaseUrl= "https://json-api.uid.ir/api/inquiry/";
 
-	public UidService()
-	{
-		_httpClient = new HttpClient()
-		{
-			BaseAddress = new Uri(BaseUrl)
-		};
-	}
+    public UidService()
+    {
+        _httpClient = new HttpClient()
+        {
+            BaseAddress = new Uri(BaseUrl)
+        };
+    }
 
-	public async Task<PersonalInfoResponse> GetPersonalInfo(string nationalCode, string birthDate)
-	{
-		var request = new PersonalInfoRequest
-		{
-			BirthDate = birthDate,
-			NationalId = nationalCode,
-			RequestContext = new UidRequestContext()
-		};
-		var json = JsonConvert.SerializeObject(request);
-		var contentType = new StringContent(json, Encoding.UTF8, "application/json");
+    public async Task<PersonalInfoResponse> GetPersonalInfo(string nationalCode, string birthDate)
+    {
+        var request = new PersonalInfoRequest
+        {
+            BirthDate = birthDate ,
+            NationalId = nationalCode,
+            RequestContext = new UidRequestContext()
+        };
+        var json = JsonConvert.SerializeObject(request);
+        var contentType = new StringContent(json, Encoding.UTF8, "application/json");
 
-		try
-		{
-			var requestResult = await _httpClient.PostAsync("person/v2", contentType);
-			if (!requestResult.IsSuccessStatusCode)
-				return null;
-			var responseResult = await requestResult.Content.ReadFromJsonAsync<PersonalInfoResponse>();
-			if (responseResult.BasicInformation != null)
-			{
-				responseResult.BasicInformation.FirstName = responseResult.BasicInformation.FirstName?.ToPersian();
-				responseResult.BasicInformation.LastName = responseResult.BasicInformation.LastName?.ToPersian();
-				responseResult.BasicInformation.FatherName = responseResult.BasicInformation.FatherName?.ToPersian();
-			}
+       var requestResult = await _httpClient.PostAsync("person/v2", contentType);
+        try
+        {
+            if (!requestResult.IsSuccessStatusCode)
+                return null;
+            var responseResult = await requestResult.Content.ReadFromJsonAsync<PersonalInfoResponse>();
+            if (responseResult.BasicInformation != null)
+            {
+                responseResult.BasicInformation.FirstName = responseResult.BasicInformation.FirstName?.ToPersian();
+                responseResult.BasicInformation.LastName = responseResult.BasicInformation.LastName?.ToPersian();
+                responseResult.BasicInformation.FatherName = responseResult.BasicInformation.FatherName?.ToPersian();
+            }
 
-			return responseResult;
-		}
-		catch
-		{
+            return responseResult;
+        }
+        catch 
+        {
 
-			return new PersonalInfoResponse(new UidBasicInformation(),
-				new IdentificationInformation(default, default, default, default, default), new RegistrationStatus(),
-				new ResponseContext(new UidStatus(14, "")));
-		}
-		
-	}
+            return null;
+        }
+    }
 
 
-	public async Task<MatchMobileWithNationalCodeResponse> IsMachPhoneWithNationalCode(string nationalCode, string phoneNumber)
-	{
-		var request = new PersonalInfoRequest
-		{
-			MobileNumber = phoneNumber,
-			NationalId = nationalCode,
-			RequestContext = new UidRequestContext()
-		};
-		var json = JsonConvert.SerializeObject(request);
-		var contentType = new StringContent(json, Encoding.UTF8, "application/json");
+    public async Task<MatchMobileWithNationalCodeResponse> IsMachPhoneWithNationalCode(string nationalCode, string phoneNumber)
+    {
+        var request = new PersonalInfoRequest
+        {
+            MobileNumber = phoneNumber,
+            NationalId = nationalCode,
+            RequestContext = new UidRequestContext()
+        };
+        var json = JsonConvert.SerializeObject(request);
+        var contentType = new StringContent(json, Encoding.UTF8, "application/json");
 
-		var requestResult = await _httpClient.PostAsync("mobile/owner/v2", contentType);
-		if (!requestResult.IsSuccessStatusCode)
-			return null;
+        var requestResult = await _httpClient.PostAsync("mobile/owner/v2", contentType);
+        if (!requestResult.IsSuccessStatusCode)
+            return null;
 
-		var responseResult = await requestResult.Content.ReadFromJsonAsync<MatchMobileWithNationalCodeResponse>();
-		return responseResult;
-	}
+        var responseResult = await requestResult.Content.ReadFromJsonAsync<MatchMobileWithNationalCodeResponse>();
+        return responseResult;
+    }
 }

0_Framework/Domain/CustomizeCheckoutShared/Base/BaseCustomizeEntity.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
 using Microsoft.EntityFrameworkCore.Design.Internal;
@@ -14,7 +12,8 @@ public class BaseCustomizeEntity : EntityBase
     }
     public BaseCustomizeEntity(FridayPay fridayPay, OverTimePay overTimePay,
         BaseYearsPay baseYearsPay, BonusesPay bonusesPay, NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
-        FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, BreakTime breakTime,int leavePermittedDays,List<WeeklyOffDay> weeklyOffDays)
+        FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
+        FridayWork fridayWork, HolidayWork holidayWork, BreakTime breakTime,int leavePermittedDays)
     {
 
         FridayPay = fridayPay;
@@ -30,10 +29,10 @@ public class BaseCustomizeEntity : EntityBase
         FineAbsenceDeduction = fineAbsenceDeduction;
         LateToWork = lateToWork;
         EarlyExit = earlyExit;
+        FridayWork = fridayWork;
         HolidayWork = holidayWork;
         BreakTime = breakTime;
         LeavePermittedDays = leavePermittedDays;
-        WeeklyOffDays = weeklyOffDays.Select(x=> new WeeklyOffDay(x.DayOfWeek)).ToList();
     }
 
     /// <summary>
@@ -118,28 +117,4 @@ public class BaseCustomizeEntity : EntityBase
 
 
 	public BreakTime BreakTime { get; protected set; }
-
-	public List<WeeklyOffDay> WeeklyOffDays { get; set; }
-
-	public void FridayWorkToWeeklyDayOfWeek()
-	{
-		if (FridayWork == FridayWork.Default && !WeeklyOffDays.Any(x => x.DayOfWeek == DayOfWeek.Friday))
-		{
-            WeeklyOffDays.Add(new WeeklyOffDay(DayOfWeek.Friday));
-		}
-            
-
-	}
-}
-
-public class WeeklyOffDay
-{
-	public WeeklyOffDay(DayOfWeek dayOfWeek)
-	{
-		DayOfWeek = dayOfWeek;
-	}
-
-	public long Id { get; set; }
-	public DayOfWeek DayOfWeek { get; set; }
-	public long ParentId { get; set; }
 }

0_Framework/Exceptions/Handler/CustomExceptionHandler.cs

@@ -1,75 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Diagnostics;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-
-
-namespace _0_Framework.Exceptions.Handler;
-
-public class CustomExceptionHandler : IExceptionHandler
-{
-    private readonly ILogger<CustomExceptionHandler> _logger;
-
-    public CustomExceptionHandler(ILogger<CustomExceptionHandler> logger)
-    {
-        _logger = logger;
-    }
-
-    public async ValueTask<bool> TryHandleAsync(HttpContext context, Exception exception, CancellationToken cancellationToken)
-    {
-        _logger.LogError(
-            "Error Message: {exceptionMessage}, Time of occurrence {time}",
-            exception.Message, DateTime.UtcNow);
-
-        (string Detail, string Title, int StatusCode) details = exception switch
-        {
-            InternalServerException =>
-            (
-                exception.Message,
-                exception.GetType().Name,
-                context.Response.StatusCode = StatusCodes.Status500InternalServerError
-            ),
-            BadRequestException =>
-            (
-                exception.Message,
-                exception.GetType().Name,
-                context.Response.StatusCode = StatusCodes.Status400BadRequest
-            ),
-            NotFoundException =>
-            (
-                exception.Message,
-                exception.GetType().Name,
-                context.Response.StatusCode = StatusCodes.Status404NotFound
-            ),
-            UnAuthorizeException =>
-            (
-                exception.Message,
-                exception.GetType().Name,
-                context.Response.StatusCode = StatusCodes.Status401Unauthorized
-            ),
-            _ =>
-            (
-                exception.Message,
-                exception.GetType().Name,
-                context.Response.StatusCode = StatusCodes.Status500InternalServerError
-            )
-        };
-
-        var problemDetails = new ProblemDetails
-        {
-            Title = details.Title,
-            Detail = details.Detail,
-            Status = details.StatusCode,
-            Instance = context.Request.Path
-        };
-
-        problemDetails.Extensions.Add("traceId", context.TraceIdentifier);
-
-        await context.Response.WriteAsJsonAsync(problemDetails, cancellationToken: cancellationToken);
-
-        return true;
-    }
-}

0_Framework/Exceptions/UnAuthorizeException.cs

@@ -1,10 +0,0 @@
-using System;
-
-namespace _0_Framework.Exceptions;
-
-public class UnAuthorizeException:Exception
-{
-    public UnAuthorizeException(string message) : base(message)
-    {
-    }
-}

AccountManagement.Domain/AssignAgg/Assign.cs

@@ -2,7 +2,6 @@
 using AccountManagement.Domain.TaskAgg;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using AccountManagement.Domain.TaskMessageAgg;
 
 namespace AccountManagement.Domain.AssignAgg;
@@ -159,24 +158,4 @@ public class Assign : EntityBase
 		IsDoneRequest=isDoneRequest;
 		DoneDescription=doneDescription;
 	}
-
-	public void ChangeAssignedId(long assignedId)
-	{
-		AssignedId = assignedId;
-	}
-
-	public void SetAssignerId(long assignerId)
-	{
-		AssignerId = assignerId;
-	}
-
-	public void ChangeSender(long senderId)
-	{
-		Task.SetSender(senderId);
-		var taskMessageItemsEnumerable =TaskMessageList.SelectMany(m => m.TaskMessageItemsList);
-		foreach (var taskMessageItems in taskMessageItemsEnumerable)
-		{
-			taskMessageItems.SetSenderId(senderId);
-		}
-	}
 }

AccountManagement.Domain/TaskAgg/Tasks.cs

@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Security.AccessControl;
 using _0_Framework.Domain;
 using AccountManagement.Domain.AssignAgg;
 using AccountManagement.Domain.TaskMediaAgg;
 using AccountManagement.Domain.TaskScheduleAgg;
-using OfficeOpenXml.Style;
 
 namespace AccountManagement.Domain.TaskAgg;
 
@@ -82,40 +80,4 @@ public class Tasks : EntityBase
         TaskScheduleId = taskScheduleId;
     }
 
-    public void ChangeSender(long senderId)
-    {
-	    var prevSender = SenderId;
-
-	    var assigners = Assigns.Where(x => x.AssignerId == prevSender).ToList();
-
-	    foreach (var assigner in assigners)
-	    {
-		    assigner.SetAssignerId(senderId);
-	    }
-
-	    var senderMessageItem = Assigns
-		    .SelectMany(x=>x.TaskMessageList
-		    .SelectMany(m=>m.TaskMessageItemsList)).Where(x=>x.SenderAccountId == prevSender).ToList();
-
-	    var receiverMessageItem = Assigns.SelectMany(x=>x.TaskMessageList
-		    .SelectMany(m=>m.TaskMessageItemsList)).Where(x=>x.ReceiverAccountId == prevSender).ToList();
-
-
-	    SenderId = senderId;
-
-	    foreach (var taskMessageItems in senderMessageItem)
-	    {
-		    taskMessageItems.SetSenderId(senderId);
-	    }
-	    foreach (var taskMessageItems in receiverMessageItem)
-	    {
-		    taskMessageItems.SetReceiver(senderId);
-	    }
-
-	}
-
-    public void SetSender(long senderId)
-    {
-	    SenderId = senderId;
-    }
 }

AccountManagement.Domain/TaskMessageItemsAgg/TaskMessageItems.cs

@@ -19,13 +19,4 @@ public class TaskMessageItems:EntityBase
     public TaskMessage TaskMessage { get; set; }
 
 
-    public void SetSenderId(long senderId)
-    {
-	    SenderAccountId = senderId;
-    }
-
-    public void SetReceiver(long receiverId)
-    {
-	    ReceiverAccountId = receiverId;
-    }
 }

Company.Domain/CheckoutAgg/Checkout.cs

@@ -3,7 +3,6 @@ using System.Collections;
 using System.Collections.Generic;
 using _0_Framework.Application;
 using _0_Framework.Domain;
-using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using Company.Domain.CheckoutAgg.ValueObjects;
 using Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 using Company.Domain.WorkshopAgg;
@@ -30,7 +29,7 @@ public class Checkout : EntityBase
         string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue,
         string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute,
         ICollection<CheckoutLoanInstallment> loanInstallments,
-        ICollection<CheckoutSalaryAid> salaryAids,CheckoutRollCall checkoutRollCall)
+        ICollection<CheckoutSalaryAid> salaryAids)
     {
         EmployeeFullName = employeeFullName;
         FathersName = fathersName;
@@ -89,7 +88,6 @@ public class Checkout : EntityBase
         TotalDayOfBunosesCompute = totalDayOfBunosesCompute;
         LoanInstallments = loanInstallments;
         SalaryAids = salaryAids;
-        CheckoutRollCall = checkoutRollCall;
     }
 
     public string EmployeeFullName { get; private set; }
@@ -198,8 +196,7 @@ public class Checkout : EntityBase
 
    public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
    public ICollection<CheckoutSalaryAid> SalaryAids { get; set; } = [];
-    public CheckoutRollCall CheckoutRollCall { get; private set; }
-    #endregion
+   #endregion
 
 
     public Workshop Workshop { get; set; }
@@ -311,149 +308,4 @@ public class Checkout : EntityBase
         LoanInstallments = lonaInstallments;
         InstallmentDeduction = installmentsAmount;
     }
-
-    public void SetCheckoutRollCall(CheckoutRollCall checkoutRollCall)
-    {
-        CheckoutRollCall = checkoutRollCall;
-    }
-}
-
-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;
-	}
-
-
-    /// <summary>
-    /// مجموع ساعت موظفی
-    /// </summary>
-	public TimeSpan TotalMandatoryTimeSpan { get; private set; }
-
-    /// <summary>
-    /// مجموع ساعت حضور
-    /// </summary>
-	public TimeSpan TotalPresentTimeSpan { get; private set; }
-
-    /// <summary>
-    /// مجموع ساعت استراحت
-    /// </summary>
-	public TimeSpan TotalBreakTimeSpan { get; private set; }
-
-    /// <summary>
-    /// مجموع ساعت کارکرد
-    /// </summary>
-	public TimeSpan TotalWorkingTimeSpan { get; private set; }
-
-    /// <summary>
-    /// مجموع ساعت مرخصی استحقاقی
-    /// </summary>
-	public TimeSpan TotalPaidLeaveTmeSpan { get; private set; }
-
-    /// <summary>
-    /// مجموع ساعت مرخصی استعلاجی
-    /// </summary>
-    public TimeSpan TotalSickLeaveTimeSpan { get; private set; }
-
-    /// <summary>
-    /// روز های حضور غیاب
-    /// </summary>
-    public ICollection<CheckoutRollCallDay> RollCallDaysCollection { get; private set; }
-}
-
-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;
-	}
-
-	public long Id { get; set; }
-
-    /// <summary>
-    /// تاریخ
-    /// </summary>
-	public DateTime Date { get; private set; }
-    /// <summary>
-    /// ورود اول 
-    /// </summary>
-	public string FirstStartDate { get; private set; }
-
-    /// <summary>
-    /// خروج اول
-    /// </summary>
-	public string FirstEndDate { get; private set; }
-
-    /// <summary>
-    /// ورود دوم
-    /// </summary>
-	public string SecondStartDate { get; private set; }
-
-    /// <summary>
-    /// خروج دوم
-    /// </summary>
-	public string SecondEndDate { get; private set; }
-
-    /// <summary>
-    /// ساعت استراحت
-    /// </summary>
-	public TimeSpan BreakTimeSpan { get; private set; }
-
-    /// <summary>
-    /// مقدار زمان کارکرد
-    /// </summary>
-	public TimeSpan WorkingTimeSpan { get; private set; }
-
-    /// <summary>
-    /// آیا منقطع است؟
-    /// </summary>
-	public bool IsSliced { get; private set; }
-
-    /// <summary>
-    /// آیا غیبت است
-    /// </summary>
-	public bool IsAbsent { get; private set; }  
-
-    /// <summary>
-    /// آیا جمعه است
-    /// </summary>
-	public bool IsFriday { get; private set; }
-
-    /// <summary>
-    /// آیا تعطیل رسمی است
-    /// </summary>
-	public bool IsHoliday { get; private set; }
-
-    /// <summary>
-    /// نوع مرخصی - درصورت نداشتن مرخصی مقدارش null میباشد
-    /// </summary>
-	public string LeaveType { get; private set; }
-
-	public long CheckoutId { get; set; }
-
 }

Company.Domain/CheckoutAgg/ICheckoutRepository.cs

@@ -59,16 +59,6 @@ public interface ICheckoutRepository : IRepository<long, Checkout>
     OperationResult DeleteAllCheckouts(List<long> ids);
     OperationResult DeleteCheckout(long id);
     List<long> CheckHasSignature(List<long> ids);
-
-    /// <summary>
-    /// لیست تصفیه حساب
-    /// جدید
-    ///
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<List<CheckoutViewModel>> SearchCheckoutOptimized(CheckoutSearchModel searchModel);
-
     Task<List<CheckoutViewModel>> SearchForMainCheckout(CheckoutSearchModel searchModel);
     #endregion
 

Company.Domain/ContarctingPartyAgg/PersonalContractingParty.cs

@@ -213,14 +213,4 @@ public class PersonalContractingParty : EntityBase
         this.Gender = gender;
         this.IsAuthenticated = true;
     }
-
-    public void RegisterComplete(string fatherName, string idNumberSeri, string idNumberSerial, DateTime dateOfBirth, Gender gender)
-    {
-        this.FatherName = fatherName;
-        this.IdNumberSeri = idNumberSeri;
-        this.IdNumberSerial = idNumberSerial;
-        this.DateOfBirth = dateOfBirth;
-        this.Gender = gender;
-        this.IsAuthenticated = true;
-    }
 }

Company.Domain/CustomizeWorkshopEmployeeSettingsAgg/Entities/CustomizeWorkshopEmployeeSettings.cs

@@ -27,13 +27,12 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
         FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, long employeeId,
         long workshopId, double salary, long customizeWorkshopGroupSettingId,
         ICollection<CustomizeWorkshopEmployeeSettingsShift> customizeWorkshopEmployeeSettingsShifts,
-        HolidayWork holidayWork, IrregularShift irregularShift, WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime,
-        int leavePermittedDays, ICollection<CustomizeRotatingShift> rotatingShifts
-        , List<WeeklyOffDay> weeklyOffDays) :
+        FridayWork fridayWork,
+        HolidayWork holidayWork, IrregularShift irregularShift, WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime, int leavePermittedDays, ICollection<CustomizeRotatingShift> rotatingShifts) :
         base(fridayPay, overTimePay,
         baseYearsPay, bonusesPay, nightWorkPay,
         marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
-        earlyExit, holidayWork, breakTime, leavePermittedDays,weeklyOffDays)
+        earlyExit, fridayWork, holidayWork, breakTime, leavePermittedDays)
     {
         CustomizeWorkshopGroupSettingId = customizeWorkshopGroupSettingId;
         IsSettingChanged = false;
@@ -83,6 +82,7 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
     /// <param name="fineAbsenceDeduction">جریمه غیبت</param>
     /// <param name="lateToWork">تاخیر در ورود</param>
     /// <param name="earlyExit">تعجیل درخروج</param>
+    /// <param name="fridayWork">آیا در روز های جمعه موظف به کار است</param>
     /// <param name="holidayWork">آیا در تعطیلات رسمی موظف به کار است</param>
     /// <param name="workshopIrregularShifts">نوع شیفت کاری </param>
     /// <param name="workshopShiftStatus">آیا شیفت منظم است یا نا منظم</param>
@@ -91,7 +91,7 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
         NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
         FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
         FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
-        HolidayWork holidayWork, IrregularShift irregularShift, bool isSettingChange, int leavePermittedDays)
+        FridayWork fridayWork, HolidayWork holidayWork, IrregularShift irregularShift, bool isSettingChange, int leavePermittedDays)
     {
         SetValueObjects(fridayPay, overTimePay, baseYearsPay, bonusesPay
             , nightWorkPay, marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction,
@@ -99,6 +99,7 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
 
         Salary = salary;
         IsSettingChanged = isSettingChange;
+        FridayWork = fridayWork;
         HolidayWork = holidayWork;
         LeavePermittedDays = leavePermittedDays;
     }
@@ -111,8 +112,8 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
     public void SimpleEdit(
         ICollection<CustomizeWorkshopEmployeeSettingsShift> employeeSettingsShift,
         IrregularShift irregularShift,
-        WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime, bool isShiftChange,HolidayWork holidayWork,
-        ICollection<CustomizeRotatingShift> rotatingShifts,List<WeeklyOffDay> weeklyOffDays)
+        WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime, bool isShiftChange, FridayWork fridayWork, HolidayWork holidayWork,
+        ICollection<CustomizeRotatingShift> rotatingShifts)
     {
         BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
         IsShiftChanged = isShiftChange;
@@ -125,8 +126,9 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
             : new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
 
         CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
+
+        FridayWork = fridayWork;
         HolidayWork = holidayWork;
-        WeeklyOffDays = weeklyOffDays;
     }
 
 
@@ -211,6 +213,7 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
             earlyExit.EarlyExitTimeFines.Select(x => new EarlyExitTimeFine(x.Minute, x.FineMoney))
                 .ToList(), earlyExit.Value);
     }
+
     public void UpdateIsShiftChange()
     {
         var groupSetting = CustomizeWorkshopGroupSettings;
@@ -268,5 +271,9 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
         IsShiftChanged = isShiftChange;
     }
 
-   
+
+    public void SetSalary(double salary)
+    {
+        Salary = salary;
+    }
 }

Company.Domain/CustomizeWorkshopGroupSettingsAgg/Entities/CustomizeWorkshopGroupSettings.cs

@@ -17,344 +17,340 @@ namespace Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities;
 
 public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
 {
-	public CustomizeWorkshopGroupSettings()
-	{
+    public CustomizeWorkshopGroupSettings()
+    {
 
-	}
+    }
 
-	public CustomizeWorkshopGroupSettings(string groupName, double salary,
-		long customizeWorkshopSettingId, ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
-		 FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay,
-		BonusesPay bonusesPay, NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
-		FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
-		FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
-		HolidayWork holidayWork, BreakTime breakTime, WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, int leavePermittedDays,
-		ICollection<CustomizeRotatingShift> rotatingShifts, List<WeeklyOffDay> weeklyOffDays) :
-		base(fridayPay, overTimePay, baseYearsPay, bonusesPay, nightWorkPay,
-		marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
-		earlyExit, holidayWork, breakTime, leavePermittedDays, weeklyOffDays)
-	{
-		GroupName = groupName;
-		Salary = salary;
-		CustomizeWorkshopSettingId = customizeWorkshopSettingId;
-		GuardGroupShifts(customizeWorkshopGroupSettingsShifts);
-		WorkshopShiftStatus = workshopShiftStatus;
+    public CustomizeWorkshopGroupSettings(string groupName, double salary,
+        long customizeWorkshopSettingId, ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
+         FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay,
+        BonusesPay bonusesPay, NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
+        FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
+        FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, FridayWork fridayWork,
+        HolidayWork holidayWork, BreakTime breakTime, WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, int leavePermittedDays, ICollection<CustomizeRotatingShift> rotatingShifts) :
+        base(fridayPay, overTimePay, baseYearsPay, bonusesPay, nightWorkPay,
+        marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
+        earlyExit, fridayWork, holidayWork, breakTime, leavePermittedDays)
+    {
+        GroupName = groupName;
+        Salary = salary;
+        CustomizeWorkshopSettingId = customizeWorkshopSettingId;
+        GuardGroupShifts(customizeWorkshopGroupSettingsShifts);
+        WorkshopShiftStatus = workshopShiftStatus;
 
-		CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
+        CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
 
-		CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
+        CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
 
-		IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
-			new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
-			: new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
-	}
+        IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
+            new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
+            : new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
+    }
 
-	private void GuardGroupShifts(ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts)
-	{
-		if (customizeWorkshopGroupSettingsShifts.Count >= 4)
-		{
-			throw new InvalidDataException("شما نمیتوانید بیشتر از سه ساعت کاری در کارگاه بگذارید");
-		}
-	}
+    private void GuardGroupShifts(ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts)
+    {
+        if (customizeWorkshopGroupSettingsShifts.Count >= 4)
+        {
+            throw new InvalidDataException("شما نمیتوانید بیشتر از سه ساعت کاری در کارگاه بگذارید");
+        }
+    }
 
-	public string GroupName { get; private set; }
-	public double Salary { get; private set; }
-	public long CustomizeWorkshopSettingId { get; private set; }
-	public WorkshopShiftStatus WorkshopShiftStatus { get; private set; }
-	public bool MainGroup { get; private set; }
-	public bool IsShiftChange { get; private set; }
-	public bool IsSettingChange { get; private set; }
-	public IrregularShift IrregularShift { get; set; }
-	public ICollection<CustomizeWorkshopGroupSettingsShift> CustomizeWorkshopGroupSettingsShifts { get; set; }
-	public ICollection<CustomizeWorkshopEmployeeSettings> CustomizeWorkshopEmployeeSettingsCollection { get; set; }
-	public ICollection<CustomizeRotatingShift> CustomizeRotatingShifts { get; set; }
-	public CustomizeWorkshopSettings CustomizeWorkshopSettings { get; set; }
+    public string GroupName { get; private set; }
+    public double Salary { get; private set; }
+    public long CustomizeWorkshopSettingId { get; private set; }
+    public WorkshopShiftStatus WorkshopShiftStatus { get; private set; }
+    public bool MainGroup { get; private set; }
+    public bool IsShiftChange { get; private set; }
+    public bool IsSettingChange { get; private set; }
+    public IrregularShift IrregularShift { get; set; }
+    public ICollection<CustomizeWorkshopGroupSettingsShift> CustomizeWorkshopGroupSettingsShifts { get; set; }
+    public ICollection<CustomizeWorkshopEmployeeSettings> CustomizeWorkshopEmployeeSettingsCollection { get; set; }
+    public ICollection<CustomizeRotatingShift> CustomizeRotatingShifts { get; set; }
+    public CustomizeWorkshopSettings CustomizeWorkshopSettings { get; set; }
 
 
 
-	public CustomizeWorkshopGroupSettings CreateMainGroup(FridayPay fridayPay,
-		OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
-		NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
-		LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
-		LateToWork lateToWork, EarlyExit earlyExit,
-		ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
-		HolidayWork holidayWork, IrregularShift irregularShift, ICollection<CustomizeRotatingShift> rotatingShifts,
-		WorkshopShiftStatus workshopShiftStatus, long customizeWorkshopSettingId, BreakTime breakTime, int leavePermittedDays)
-	{
-		GuardGroupShifts(customizeWorkshopGroupSettingsShifts);
-		GroupName = "اصلی";
-		Salary = 0;
-		FridayPay = fridayPay;
-		OverTimePay = overTimePay;
-		BaseYearsPay = baseYearsPay;
-		BonusesPay = bonusesPay;
-		NightWorkPay = nightWorkPay;
-		MarriedAllowance = marriedAllowance;
-		ShiftPay = shiftPay;
-		FamilyAllowance = familyAllowance;
-		LeavePay = leavePay;
-		InsuranceDeduction = insuranceDeduction;
-		FineAbsenceDeduction = fineAbsenceDeduction;
-		LateToWork = lateToWork;
-		EarlyExit = earlyExit;
-		HolidayWork = holidayWork;
-		LeavePermittedDays = leavePermittedDays;
-		CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
+    public CustomizeWorkshopGroupSettings CreateMainGroup(FridayPay fridayPay,
+        OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
+        NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
+        LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
+        LateToWork lateToWork, EarlyExit earlyExit,
+        ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts, FridayWork fridayWork,
+        HolidayWork holidayWork, IrregularShift irregularShift, ICollection<CustomizeRotatingShift> rotatingShifts,
+        WorkshopShiftStatus workshopShiftStatus, long customizeWorkshopSettingId, BreakTime breakTime, int leavePermittedDays)
+    {
+        GuardGroupShifts(customizeWorkshopGroupSettingsShifts);
+        GroupName = "اصلی";
+        Salary = 0;
+        FridayPay = fridayPay;
+        OverTimePay = overTimePay;
+        BaseYearsPay = baseYearsPay;
+        BonusesPay = bonusesPay;
+        NightWorkPay = nightWorkPay;
+        MarriedAllowance = marriedAllowance;
+        ShiftPay = shiftPay;
+        FamilyAllowance = familyAllowance;
+        LeavePay = leavePay;
+        InsuranceDeduction = insuranceDeduction;
+        FineAbsenceDeduction = fineAbsenceDeduction;
+        LateToWork = lateToWork;
+        EarlyExit = earlyExit;
+        FridayWork = fridayWork;
+        HolidayWork = holidayWork;
+        LeavePermittedDays = leavePermittedDays;
+        CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
 
-		CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
+        CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
 
-		IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
-			new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
-			: new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
-		WorkshopShiftStatus = workshopShiftStatus;
-		CustomizeWorkshopSettingId = customizeWorkshopSettingId;
-		MainGroup = true;
-		BreakTime = breakTime;
-		CustomizeWorkshopEmployeeSettingsCollection = [];
+        IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
+            new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
+            : new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
+        WorkshopShiftStatus = workshopShiftStatus;
+        CustomizeWorkshopSettingId = customizeWorkshopSettingId;
+        MainGroup = true;
+        BreakTime = breakTime;
+        CustomizeWorkshopEmployeeSettingsCollection = [];
 
-		return this;
+        return this;
 
-	}
+    }
 
 
 
-	public void EditAndOverwriteOnEmployees(string groupName, double salary, IEnumerable<long> employeeIds,
-		FridayPay fridayPay,
-		OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
-		NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
-		LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
-		LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
-	{
-		GroupName = groupName;
-		Salary = salary;
-		FridayPay = fridayPay;
-		OverTimePay = overTimePay;
-		BaseYearsPay = baseYearsPay;
-		BonusesPay = bonusesPay;
-		NightWorkPay = nightWorkPay;
-		MarriedAllowance = marriedAllowance;
-		ShiftPay = shiftPay;
-		FamilyAllowance = familyAllowance;
-		LeavePay = leavePay;
-		InsuranceDeduction = insuranceDeduction;
-		FineAbsenceDeduction = fineAbsenceDeduction;
-		LateToWork = lateToWork;
-		EarlyExit = earlyExit;
-		HolidayWork = holidayWork;
-		IsSettingChange = isSettingChange;
-		LeavePermittedDays = leavePermittedDays;
+    public void EditAndOverwriteOnEmployees(string groupName, double salary, IEnumerable<long> employeeIds,
+        FridayPay fridayPay,
+        OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
+        NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
+        LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
+        LateToWork lateToWork, EarlyExit earlyExit, FridayWork fridayWork, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
+    {
+        GroupName = groupName;
+        Salary = salary;
+        FridayPay = fridayPay;
+        OverTimePay = overTimePay;
+        BaseYearsPay = baseYearsPay;
+        BonusesPay = bonusesPay;
+        NightWorkPay = nightWorkPay;
+        MarriedAllowance = marriedAllowance;
+        ShiftPay = shiftPay;
+        FamilyAllowance = familyAllowance;
+        LeavePay = leavePay;
+        InsuranceDeduction = insuranceDeduction;
+        FineAbsenceDeduction = fineAbsenceDeduction;
+        LateToWork = lateToWork;
+        EarlyExit = earlyExit;
+        FridayWork = fridayWork;
+        HolidayWork = holidayWork;
+        IsSettingChange = isSettingChange;
+        LeavePermittedDays = leavePermittedDays;
 
 
-		var employeeSettingsShift = CustomizeWorkshopGroupSettingsShifts
-			.Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
+        var employeeSettingsShift = CustomizeWorkshopGroupSettingsShifts
+            .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
 
-		var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
-		foreach (var item in permittedToOverWrite)
-		{
-			item.EditEmployees(Salary, FridayPay, OverTimePay, BaseYearsPay, BonusesPay
-				, NightWorkPay, MarriedAllowance, ShiftPay, FamilyAllowance, LeavePay, InsuranceDeduction, FineAbsenceDeduction,
-				LateToWork, EarlyExit, HolidayWork, IrregularShift, false, leavePermittedDays);
-		}
-	}
-	public void EditAndOverwriteOnAllEmployees(string groupName, double salary,
-		FridayPay fridayPay,
-		OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
-		NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
-		LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
-		LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
-	{
-		SetValueObjects(fridayPay, overTimePay, baseYearsPay, bonusesPay
-			, nightWorkPay, marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction,
-			lateToWork, earlyExit);
-		GroupName = groupName;
-		Salary = salary;
-		HolidayWork = holidayWork;
-		IsSettingChange = isSettingChange;
-		LeavePermittedDays = leavePermittedDays;
+        var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
+        foreach (var item in permittedToOverWrite)
+        {
+            item.EditEmployees(Salary, FridayPay, OverTimePay, BaseYearsPay, BonusesPay
+                , NightWorkPay, MarriedAllowance, ShiftPay, FamilyAllowance, LeavePay, InsuranceDeduction, FineAbsenceDeduction,
+                LateToWork, EarlyExit, FridayWork, HolidayWork, IrregularShift, false, leavePermittedDays);
+        }
+    }
+    public void EditAndOverwriteOnAllEmployees(string groupName, double salary,
+        FridayPay fridayPay,
+        OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
+        NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
+        LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
+        LateToWork lateToWork, EarlyExit earlyExit, FridayWork fridayWork, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
+    {
+        SetValueObjects(fridayPay, overTimePay, baseYearsPay, bonusesPay
+            , nightWorkPay, marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction,
+            lateToWork, earlyExit);
+        GroupName = groupName;
+        Salary = salary;
+        FridayWork = fridayWork;
+        HolidayWork = holidayWork;
+        IsSettingChange = isSettingChange;
+        LeavePermittedDays = leavePermittedDays;
 
 
-		var employeeSettingsShift = CustomizeWorkshopGroupSettingsShifts
-			.Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
+        var employeeSettingsShift = CustomizeWorkshopGroupSettingsShifts
+            .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
 
-		foreach (var item in CustomizeWorkshopEmployeeSettingsCollection)
-		{
-			item.EditEmployees(Salary, FridayPay, OverTimePay, BaseYearsPay, BonusesPay
-				, NightWorkPay, MarriedAllowance, ShiftPay, FamilyAllowance, LeavePay, InsuranceDeduction, FineAbsenceDeduction,
-				LateToWork, EarlyExit, HolidayWork, IrregularShift, false, leavePermittedDays);
-		}
-	}
+        foreach (var item in CustomizeWorkshopEmployeeSettingsCollection)
+        {
+            item.EditEmployees(Salary, FridayPay, OverTimePay, BaseYearsPay, BonusesPay
+                , NightWorkPay, MarriedAllowance, ShiftPay, FamilyAllowance, LeavePay, InsuranceDeduction, FineAbsenceDeduction,
+                LateToWork, EarlyExit, FridayWork, HolidayWork, IrregularShift, false, leavePermittedDays);
+        }
+    }
 
-	public void RemoveEmployeeFromGroup(long employeeId)
-	{
-		var currentItem = CustomizeWorkshopEmployeeSettingsCollection.FirstOrDefault(x => x.EmployeeId == employeeId);
-		if (currentItem != null)
-			CustomizeWorkshopEmployeeSettingsCollection.Remove(currentItem);
-	}
+    public void RemoveEmployeeFromGroup(long employeeId)
+    {
+        var currentItem = CustomizeWorkshopEmployeeSettingsCollection.FirstOrDefault(x => x.EmployeeId == employeeId);
+        if (currentItem != null)
+            CustomizeWorkshopEmployeeSettingsCollection.Remove(currentItem);
+    }
 
-	public void EditSimpleAndOverwriteOnEmployee(string groupName, IEnumerable<long> employeeIds,
-		ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts, WorkshopShiftStatus workshopShiftStatus,
-		IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange, HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts, List<WeeklyOffDay> weeklyOffDays)
-	{
-		GroupName = groupName;
-		CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
-		WorkshopShiftStatus = workshopShiftStatus;
+    public void EditSimpleAndOverwriteOnEmployee(string groupName, IEnumerable<long> employeeIds,
+        ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts, WorkshopShiftStatus workshopShiftStatus,
+        IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange, FridayWork fridayWork, HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts)
+    {
+        GroupName = groupName;
+        CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
+        WorkshopShiftStatus = workshopShiftStatus;
 
-		IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
-			new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
-			: new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
-		CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
+        IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
+            new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
+            : new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
+        CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
 
 
-		BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
-		IsShiftChange = isShiftChange;
+        BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
+        IsShiftChange = isShiftChange;
+        FridayWork = fridayWork;
+        HolidayWork = holidayWork;
 
-		HolidayWork = holidayWork;
+        //var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
+        // .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
+        if (isShiftChange)
+        {
 
-		WeeklyOffDays = weeklyOffDays;
+        }
 
-		//var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
-		// .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
-		if (isShiftChange)
-		{
+        var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
 
-		}
+        foreach (var item in permittedToOverWrite)
+        {
+            var newRotatingShifts = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime))
+                .ToList();
+            item.SimpleEdit(customizeWorkshopGroupSettingsShifts
+                .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList(),
+                IrregularShift, WorkshopShiftStatus, BreakTime, false, FridayWork, HolidayWork, newRotatingShifts);
+        }
 
-		var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
+    }
 
-		foreach (var item in permittedToOverWrite)
-		{
-			var employeeWeeklyOffDays = WeeklyOffDays.Select(x => new WeeklyOffDay(x.DayOfWeek)).ToList();
-			var newRotatingShifts = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime))
-				.ToList();
-			item.SimpleEdit(customizeWorkshopGroupSettingsShifts
-				.Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList(),
-				IrregularShift, WorkshopShiftStatus, BreakTime, false, HolidayWork, newRotatingShifts, employeeWeeklyOffDays);
-		}
+    public void EditSimpleAndOverwriteOnAllEmployees(string groupName,
+        ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
+        WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange,
+        FridayWork fridayWork, HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts)
+    {
+        GroupName = groupName;
+        CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
+        WorkshopShiftStatus = workshopShiftStatus;
 
-	}
+        IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
+            new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
+            : new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
 
-	public void EditSimpleAndOverwriteOnAllEmployees(string groupName,
-		ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
-		WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange,
-		HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts, List<WeeklyOffDay> weeklyOffDays)
-	{
-		GroupName = groupName;
-		CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
-		WorkshopShiftStatus = workshopShiftStatus;
-
-		IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
-			new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
-			: new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
-
-		CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
+        CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
 
 
-		BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
-		IsShiftChange = isShiftChange;
-		HolidayWork = holidayWork;
+        BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
+        IsShiftChange = isShiftChange;
+        HolidayWork = holidayWork;
+        FridayWork = fridayWork;
 
-		WeeklyOffDays = weeklyOffDays;
-		//var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
-		// .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
+        //var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
+        // .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
+
+        foreach (var item in CustomizeWorkshopEmployeeSettingsCollection)
+        {
+            var newRotatingShifts = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime))
+                .ToList();
+            item.SimpleEdit(customizeWorkshopGroupSettingsShifts
+                .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList(),
+                irregularShift, workshopShiftStatus, breakTime, false, FridayWork, HolidayWork, newRotatingShifts);
+        }
+
+    }
+
+    public void AddEmployeeSettingToGroupWithGroupData(long employeeId, long workshopId)
+    {
+        var shifts = CustomizeWorkshopGroupSettingsShifts
+            .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
+
+        FridayPay fridayPay = new(FridayPay.FridayPayType, FridayPay.Value);
+        OverTimePay overTimePay = new(OverTimePay.OverTimePayType, OverTimePay.Value);
+        BaseYearsPay baseYearsPay = new(BaseYearsPay.BaseYearsPayType, BaseYearsPay.Value, BaseYearsPay.PaymentType);
+        BonusesPay bonusesPay = new(BonusesPay.BonusesPayType, BonusesPay.Value, BonusesPay.PaymentType);
+        NightWorkPay nightWorkPay = new(NightWorkPay.NightWorkingType, NightWorkPay.Value);
+        MarriedAllowance marriedAllowance = new(MarriedAllowance.MarriedAllowanceType, MarriedAllowance.Value);
+        ShiftPay shiftPay = new(ShiftType.None, ShiftPayType.None, 0);
+        FamilyAllowance familyAllowance = new(FamilyAllowance.FamilyAllowanceType, FamilyAllowance.Value);
+        LeavePay leavePay = new(LeavePay.LeavePayType, LeavePay.Value);
+        InsuranceDeduction insuranceDeduction = new(InsuranceDeduction.InsuranceDeductionType, InsuranceDeduction.Value);
+        FineAbsenceDeduction fineAbsenceDeduction = new(
+            FineAbsenceDeduction.FineAbsenceDeductionType, FineAbsenceDeduction.Value,
+            FineAbsenceDeduction.FineAbsenceDayOfWeekCollection
+                .Select(x => new FineAbsenceDayOfWeek(x.DayOfWeek)).ToList()
+        );
+        LateToWork lateToWork = new(
+            LateToWork.LateToWorkType,
+            LateToWork.LateToWorkTimeFines.Select(x => new LateToWorkTimeFine(x.Minute, x.FineMoney))
+                .ToList(), LateToWork.Value
+        );
+        EarlyExit earlyExit = new(EarlyExit.EarlyExitType,
+            EarlyExit.EarlyExitTimeFines.Select(x => new EarlyExitTimeFine(x.Minute, x.FineMoney))
+                .ToList(), EarlyExit.Value);
+        IrregularShift irregularShift = new(IrregularShift.StartTime, IrregularShift.EndTime,
+            IrregularShift.WorkshopIrregularShifts);
+        BreakTime breakTime = new(BreakTime.HasBreakTimeValue, BreakTime.BreakTimeValue);
+
+        var rotatingShift = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime)).ToList();
+
+        var customizeWorkshopEmployeeSettings = new CustomizeWorkshopEmployeeSettings(fridayPay, overTimePay, baseYearsPay, bonusesPay, nightWorkPay,
+            marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
+            earlyExit, employeeId, workshopId, Salary, id, shifts, FridayWork, HolidayWork, irregularShift,
+            WorkshopShiftStatus, breakTime, LeavePermittedDays, rotatingShift);
+
+        CustomizeWorkshopEmployeeSettingsCollection.Add(customizeWorkshopEmployeeSettings);
+    }
 
 
-		foreach (var item in CustomizeWorkshopEmployeeSettingsCollection)
-		{
-			var employeeWeeklyOffDays = WeeklyOffDays.Select(x => new WeeklyOffDay(x.DayOfWeek)).ToList();
-			var newRotatingShifts = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime))
-				.ToList();
-			item.SimpleEdit(customizeWorkshopGroupSettingsShifts
-				.Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList(),
-				irregularShift, workshopShiftStatus, breakTime, false, HolidayWork, newRotatingShifts, employeeWeeklyOffDays);
-		}
-
-	}
-
-	public void AddEmployeeSettingToGroupWithGroupData(long employeeId, long workshopId)
-	{
-		var shifts = CustomizeWorkshopGroupSettingsShifts
-			.Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
-
-		FridayPay fridayPay = new(FridayPay.FridayPayType, FridayPay.Value);
-		OverTimePay overTimePay = new(OverTimePay.OverTimePayType, OverTimePay.Value);
-		BaseYearsPay baseYearsPay = new(BaseYearsPay.BaseYearsPayType, BaseYearsPay.Value, BaseYearsPay.PaymentType);
-		BonusesPay bonusesPay = new(BonusesPay.BonusesPayType, BonusesPay.Value, BonusesPay.PaymentType);
-		NightWorkPay nightWorkPay = new(NightWorkPay.NightWorkingType, NightWorkPay.Value);
-		MarriedAllowance marriedAllowance = new(MarriedAllowance.MarriedAllowanceType, MarriedAllowance.Value);
-		ShiftPay shiftPay = new(ShiftType.None, ShiftPayType.None, 0);
-		FamilyAllowance familyAllowance = new(FamilyAllowance.FamilyAllowanceType, FamilyAllowance.Value);
-		LeavePay leavePay = new(LeavePay.LeavePayType, LeavePay.Value);
-		InsuranceDeduction insuranceDeduction = new(InsuranceDeduction.InsuranceDeductionType, InsuranceDeduction.Value);
-		FineAbsenceDeduction fineAbsenceDeduction = new(
-			FineAbsenceDeduction.FineAbsenceDeductionType, FineAbsenceDeduction.Value,
-			FineAbsenceDeduction.FineAbsenceDayOfWeekCollection
-				.Select(x => new FineAbsenceDayOfWeek(x.DayOfWeek)).ToList()
-		);
-		LateToWork lateToWork = new(
-			LateToWork.LateToWorkType,
-			LateToWork.LateToWorkTimeFines.Select(x => new LateToWorkTimeFine(x.Minute, x.FineMoney))
-				.ToList(), LateToWork.Value
-		);
-		EarlyExit earlyExit = new(EarlyExit.EarlyExitType,
-			EarlyExit.EarlyExitTimeFines.Select(x => new EarlyExitTimeFine(x.Minute, x.FineMoney))
-				.ToList(), EarlyExit.Value);
-		IrregularShift irregularShift = new(IrregularShift.StartTime, IrregularShift.EndTime,
-			IrregularShift.WorkshopIrregularShifts);
-		BreakTime breakTime = new(BreakTime.HasBreakTimeValue, BreakTime.BreakTimeValue);
-		List<WeeklyOffDay> weeklyOffDays = WeeklyOffDays.Select(x => new WeeklyOffDay(x.DayOfWeek)).ToList();
-
-		var rotatingShift = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime)).ToList();
-
-		var customizeWorkshopEmployeeSettings = new CustomizeWorkshopEmployeeSettings(fridayPay, overTimePay, baseYearsPay, bonusesPay, nightWorkPay,
-			marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
-			earlyExit, employeeId, workshopId, Salary, id, shifts, HolidayWork, irregularShift,
-			WorkshopShiftStatus, breakTime, LeavePermittedDays, rotatingShift, weeklyOffDays);
-
-		CustomizeWorkshopEmployeeSettingsCollection.Add(customizeWorkshopEmployeeSettings);
-	}
+    private void SetValueObjects(FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay,
+        BonusesPay bonusesPay
+        , NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
+        FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
+        FineAbsenceDeduction fineAbsenceDeduction,
+        LateToWork lateToWork, EarlyExit earlyExit)
+    {
+        FridayPay = new(fridayPay.FridayPayType, fridayPay.Value);
+        OverTimePay = new(overTimePay.OverTimePayType, overTimePay.Value);
+        BaseYearsPay = new(baseYearsPay.BaseYearsPayType, baseYearsPay.Value, baseYearsPay.PaymentType);
+        BonusesPay = new(bonusesPay.BonusesPayType, bonusesPay.Value, bonusesPay.PaymentType);
+        NightWorkPay = new(nightWorkPay.NightWorkingType, nightWorkPay.Value);
+        MarriedAllowance = new(marriedAllowance.MarriedAllowanceType, marriedAllowance.Value);
+        ShiftPay = new(shiftPay.ShiftType, shiftPay.ShiftPayType, shiftPay.Value);
+        FamilyAllowance = new(familyAllowance.FamilyAllowanceType, familyAllowance.Value);
+        LeavePay = new(leavePay.LeavePayType, leavePay.Value);
+        InsuranceDeduction = new(insuranceDeduction.InsuranceDeductionType, insuranceDeduction.Value);
+        FineAbsenceDeduction = new(
+            fineAbsenceDeduction.FineAbsenceDeductionType, fineAbsenceDeduction.Value,
+            fineAbsenceDeduction.FineAbsenceDayOfWeekCollection
+                .Select(x => new FineAbsenceDayOfWeek(x.DayOfWeek)).ToList()
+        );
+        LateToWork = new(
+            lateToWork.LateToWorkType,
+            lateToWork.LateToWorkTimeFines.Select(x => new LateToWorkTimeFine(x.Minute, x.FineMoney))
+                .ToList(), lateToWork.Value
+        );
+        EarlyExit = new(earlyExit.EarlyExitType,
+            earlyExit.EarlyExitTimeFines.Select(x => new EarlyExitTimeFine(x.Minute, x.FineMoney))
+                .ToList(), earlyExit.Value);
+    }
 
 
-	private void SetValueObjects(FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay,
-		BonusesPay bonusesPay
-		, NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
-		FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
-		FineAbsenceDeduction fineAbsenceDeduction,
-		LateToWork lateToWork, EarlyExit earlyExit)
-	{
-		FridayPay = new(fridayPay.FridayPayType, fridayPay.Value);
-		OverTimePay = new(overTimePay.OverTimePayType, overTimePay.Value);
-		BaseYearsPay = new(baseYearsPay.BaseYearsPayType, baseYearsPay.Value, baseYearsPay.PaymentType);
-		BonusesPay = new(bonusesPay.BonusesPayType, bonusesPay.Value, bonusesPay.PaymentType);
-		NightWorkPay = new(nightWorkPay.NightWorkingType, nightWorkPay.Value);
-		MarriedAllowance = new(marriedAllowance.MarriedAllowanceType, marriedAllowance.Value);
-		ShiftPay = new(shiftPay.ShiftType, shiftPay.ShiftPayType, shiftPay.Value);
-		FamilyAllowance = new(familyAllowance.FamilyAllowanceType, familyAllowance.Value);
-		LeavePay = new(leavePay.LeavePayType, leavePay.Value);
-		InsuranceDeduction = new(insuranceDeduction.InsuranceDeductionType, insuranceDeduction.Value);
-		FineAbsenceDeduction = new(
-			fineAbsenceDeduction.FineAbsenceDeductionType, fineAbsenceDeduction.Value,
-			fineAbsenceDeduction.FineAbsenceDayOfWeekCollection
-				.Select(x => new FineAbsenceDayOfWeek(x.DayOfWeek)).ToList()
-		);
-		LateToWork = new(
-			lateToWork.LateToWorkType,
-			lateToWork.LateToWorkTimeFines.Select(x => new LateToWorkTimeFine(x.Minute, x.FineMoney))
-				.ToList(), lateToWork.Value
-		);
-		EarlyExit = new(earlyExit.EarlyExitType,
-			earlyExit.EarlyExitTimeFines.Select(x => new EarlyExitTimeFine(x.Minute, x.FineMoney))
-				.ToList(), earlyExit.Value);
-	}
-
-
-	//public void OverWriteEmployeesShiftAndSalary(IEnumerable<long> ids,ICollection<RollCallWorkshopEmployeeSettingsShift> employeeSettingsShifts,double salary)
-	//{
-	//    var  permittedToOverWrite= RollCallWorkshopEmployeeSettingsCollection.Where(x => ids.Contains(x.id));
-	//    foreach (var item in permittedToOverWrite)
-	//    {
-	//        item.OverWriteSalaryAndShift(employeeSettingsShifts, salary);
-	//    }
-	//}
+    //public void OverWriteEmployeesShiftAndSalary(IEnumerable<long> ids,ICollection<RollCallWorkshopEmployeeSettingsShift> employeeSettingsShifts,double salary)
+    //{
+    //    var  permittedToOverWrite= RollCallWorkshopEmployeeSettingsCollection.Where(x => ids.Contains(x.id));
+    //    foreach (var item in permittedToOverWrite)
+    //    {
+    //        item.OverWriteSalaryAndShift(employeeSettingsShifts, salary);
+    //    }
+    //}
 
 
 }

Company.Domain/CustomizeWorkshopSettingsAgg/Entities/CustomizeWorkshopSettings.cs

@@ -17,7 +17,7 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 
 	public CustomizeWorkshopSettings(long workshopId,
 		ICollection<CustomizeWorkshopSettingsShift> customizeWorkshopSettingsShifts, int leavePermittedDays,
-		WorkshopShiftStatus workshopShiftStatus,HolidayWork holidayWork, List<WeeklyOffDay> weeklyOffDays)
+		WorkshopShiftStatus workshopShiftStatus,FridayWork fridayWork,HolidayWork holidayWork)
 	{
 		FridayPay = new FridayPay(FridayPayType.None, 0);
 		OverTimePay = new OverTimePay(OverTimePayType.None, 0);
@@ -38,10 +38,11 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 		OverTimeThresholdMinute = 0;
 		Currency = Currency.Rial;
 		MaxMonthDays = MaxMonthDays.Default;
+		FridayWork = fridayWork;
+		HolidayWork = holidayWork;
 		BonusesPaysInEndOfMonth = BonusesPaysInEndOfYear.EndOfYear;
 		WorkshopShiftStatus = workshopShiftStatus;
-		WeeklyOffDays = weeklyOffDays;
-		HolidayWork = holidayWork;
+
 		if (workshopShiftStatus == WorkshopShiftStatus.Irregular)
 			return;
 
@@ -91,7 +92,8 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 	public void Edit(FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay,
 		NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
 		FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
-		FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, BonusesPaysInEndOfYear bonusesPaysInEndOfYear,
+		FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
+		FridayWork fridayWork, HolidayWork holidayWork, BonusesPaysInEndOfYear bonusesPaysInEndOfYear,
 		int leavePermittedDays, BaseYearsPayInEndOfYear baseYearsPayInEndOfYear, int overTimeThresholdMinute)
 	{
 		FridayPay = fridayPay;
@@ -107,6 +109,7 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 		FineAbsenceDeduction = fineAbsenceDeduction;
 		LateToWork = lateToWork;
 		EarlyExit = earlyExit;
+		FridayWork = fridayWork;
 		HolidayWork = holidayWork;
 		BonusesPaysInEndOfMonth = bonusesPaysInEndOfYear;
 		LeavePermittedDays = leavePermittedDays;
@@ -124,18 +127,19 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 	}
 
 	public void ChangeWorkshopShifts(ICollection<CustomizeWorkshopSettingsShift> customizeWorkshopSettingsShifts,
-        WorkshopShiftStatus workshopShiftStatus,HolidayWork holidayWork, List<WeeklyOffDay> weeklyOffDays)
+        WorkshopShiftStatus workshopShiftStatus,FridayWork fridayWork,HolidayWork holidayWork)
 	{
 		WorkshopShiftStatus = workshopShiftStatus;
         HolidayWork = holidayWork;
+        FridayWork = fridayWork;
 		CustomizeWorkshopSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopSettingsShifts : new List<CustomizeWorkshopSettingsShift>();
-		WeeklyOffDays = weeklyOffDays;
-
 		if (workshopShiftStatus == WorkshopShiftStatus.Regular)
 		{
 			var date = new DateOnly();
 			var firstStartShift = new DateTime(date, CustomizeWorkshopSettingsShifts.MinBy(x => x.Placement).StartTime);
 			var lastEndShift = new DateTime(date, CustomizeWorkshopSettingsShifts.MaxBy(x => x.Placement).EndTime);
+         
+          
             if (lastEndShift > firstStartShift)
                 firstStartShift = firstStartShift.AddDays(1);
             var offSet = (firstStartShift - lastEndShift).Divide(2);

Company.Domain/EmployeeAgg/IEmployeeRepository.cs

@@ -71,12 +71,7 @@ public interface IEmployeeRepository : IRepository<long, Employee>
     Task<GetEditEmployeeInEmployeeDocumentViewModel> GetEmployeeEditInEmployeeDocumentWorkFlow(long employeeId,
         long workshopId);
 
-	#endregion
-
-	#region Api
-	Task<List<EmployeeSelectListViewModel>> GetSelectList(string searchText);
-	Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel);
-	#endregion
+    #endregion
 
 
 }

Company.Domain/EmployeeComputeOptionsAgg/EmployeeComputeOptions.cs

@@ -3,110 +3,36 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using _0_Framework.Application;
 using _0_Framework.Domain;
 
 namespace Company.Domain.EmployeeComputeOptionsAgg
 {
     public class EmployeeComputeOptions : EntityBase
     {
-		public EmployeeComputeOptions(long workshopId, long employeeId, string computeOptions, string bonusesOptions, string yearsOptions,
-		   bool createContract, bool signContract, bool createCheckout, bool signCheckout, string contractTerm, IsActive cutContractEndOfYear)
-		{
-			WorkshopId = workshopId;
-			EmployeeId = employeeId;
-			ComputeOptions = computeOptions;
-			BonusesOptions = bonusesOptions;
-			YearsOptions = yearsOptions;
-            ContractTerm = contractTerm;
-            CutContractEndOfYear = contractTerm == "1" ? IsActive.None : cutContractEndOfYear;
+        public EmployeeComputeOptions(long workshopId, long employeeId, string computeOptions, string bonusesOptions, string yearsOptions)
+        {
+            WorkshopId = workshopId;
+            EmployeeId = employeeId;
+            ComputeOptions = computeOptions;
+            BonusesOptions = bonusesOptions;
+            YearsOptions = yearsOptions;
+        }
 
-            SetContractAndCheckoutOptions(createContract, signContract, createCheckout, signCheckout);
-		}
+        public long WorkshopId { get; private set;}
+        public long EmployeeId { get; private set;}
 
+        //نحوه محاسبه مزد مرخصی
+        public string ComputeOptions { get; private set; }
+        //نحوه محاسبه عیدی
+        public string BonusesOptions { get; private set; }
+        //نحوه محاسبه سنوات
+        public string YearsOptions { get; private set; }
 
-
-		public long WorkshopId { get; private set; }
-		public long EmployeeId { get; private set; }
-
-		//نحوه محاسبه مزد مرخصی
-		public string ComputeOptions { get; private set; }
-		//نحوه محاسبه عیدی
-		public string BonusesOptions { get; private set; }
-		//نحوه محاسبه سنوات
-		public string YearsOptions { get; private set; }
-
-		/// <summary>
-		/// ایجاد قرارداد
-		/// </summary>
-		public bool CreateContract { get; private set; }
-
-		/// <summary>
-		/// امضای قرارداد
-		/// </summary>
-		public bool SignContract { get; private set; }
-		/// <summary>
-		/// ایجاد تصفیه
-		/// </summary>
-		public bool CreateCheckout { get; private set; }
-		/// <summary>
-		/// امضای تصفیه
-		/// </summary>
-		public bool SignCheckout { get; private set; }
-
-		/// <summary>
-		/// مدت قرارداد
-		/// </summary>
-        public string ContractTerm { get; private set; }
-
-        /// <summary>
-        /// اگر قرارداد بیش از یک ماه باشد و  گزینه انتخاب شده منتهی به پایان سال باشد
-        /// این آیتم
-        /// True
-        /// است
-        /// </summary>
-        public IsActive CutContractEndOfYear { get; private set; }
-
-    
-
-        public void Edit(string computeOptions, string bonusesOptions, string yearsOptions, bool createContract, bool signContract, bool createCheckout,
-			bool signCheckout, string contractTerm, IsActive cutContractEndOfYear)
-		{
-			ComputeOptions = computeOptions;
-			BonusesOptions = bonusesOptions;
-			YearsOptions = yearsOptions;
-
-            ContractTerm = contractTerm;
-            CutContractEndOfYear = contractTerm == "1" ? IsActive.None : cutContractEndOfYear;
-            SetContractAndCheckoutOptions(createContract, signContract, createCheckout, signCheckout);
-		}
-
-
-
-		private void SetContractAndCheckoutOptions(bool createContract, bool signContract, bool createCheckout,
-			bool signCheckout)
-		{
-			CreateContract = createContract;
-			if (createContract)
-			{
-				SignContract = signContract;
-				CreateCheckout = createCheckout;
-				if (createCheckout)
-				{
-					SignCheckout = signCheckout;
-				}
-				else
-				{
-					SignCheckout = false;
-				}
-			}
-			else
-			{
-				SignContract = false;
-				CreateCheckout = false;
-				SignCheckout = false;
-			}
-		}
-	}
+        public void Edit(string computeOptions, string bonusesOptions, string yearsOptions)
+        {
+            ComputeOptions = computeOptions;
+            BonusesOptions = bonusesOptions;
+            YearsOptions = yearsOptions;
+        }
+    }
 }
-

Company.Domain/FinancialStatmentAgg/IFinancialStatmentRepository.cs

@@ -13,8 +13,4 @@ public interface IFinancialStatmentRepository : IRepository<long, FinancialStatm
 
     FinancialStatmentViewModel GetDetailsByContractingPartyId(long contractingPartyId);
     List<FinancialStatmentViewModel> Search(FinancialStatmentSearchModel searchModel);
-    Task<ClientFinancialStatementViewModel> GetClientFinancialStatement(long accountId,
-        ClientFinancialStatementSearchModel searchModel);
-
-    Task<double> GetClientDebtAmount(long accountId);
 }

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -13,8 +13,7 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     
     EditInstitutionContract GetDetails(long id);
     EditInstitutionContract GetFirstContract(long contractingPartyId, string typeOfContract);
-    List<InstitutionContractViewModel> InstitutionContractsWithoutAccount();
-    List<InstitutionContractViewModel> ContractWithoutValidContactInfo();
+
     List<InstitutionContractViewModel> Search(InstitutionContractSearchModel searchModel);
     List<InstitutionContractViewModel> NewSearch(InstitutionContractSearchModel searchModel);
     List<InstitutionContractViewModel> PrintAll(List<long> id);

Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs

@@ -64,9 +64,9 @@ public interface IInsuranceListRepository:IRepository<long, InsuranceList>
     #region Mahan
     Task<InsuranceListConfirmOperation> GetInsuranceOperationDetails(long id);
 
-	Task<InsuranceListTabsCountViewModel> GetTabCounts(InsuranceListSearchModel searchModel);
+    Task<InsuranceListTabsCountViewModel> GetTabCounts(long accountId,int month,int year);
 
-	#endregion
+    #endregion
 }
 
 

Company.Domain/LeftWorkAgg/ILeftWorkRepository.cs

@@ -5,7 +5,6 @@ using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.LeftWork;
 using CompanyManagment.App.Contracts.PersonnleCode;
-using CompanyManagment.App.Contracts.Workshop.DTOs;
 
 namespace Company.Domain.LeftWorkAgg;
 
@@ -47,11 +46,4 @@ public interface ILeftWorkRepository : IRepository<long, LeftWork>
 
     Task<LeftWork> GetLastLeftWork(long employeeId, long workshopId);
     List<LeftWorkViewModel> SearchCreateContract(LeftWorkSearchModel searchModel);
-
-    /// <summary>
-    /// دریافت اطلاعات کارگاه و پرسنل برای ایجاد قرارداد
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    AutoExtensionDto AutoExtentionEmployees(long workshopId);
 }

Company.Domain/PaymentTransactionAgg/IPaymentTransactionRepository.cs

@@ -1,12 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.PaymentTransaction;
-
-namespace Company.Domain.PaymentTransactionAgg;
-
-public interface IPaymentTransactionRepository:IRepository<long,PaymentTransaction>
-{
-    Task<List<GetPaymentTransactionListViewModel>> GetPaymentTransactionList(
-        GetPaymentTransactionListSearchModel searchModel);
-}

Company.Domain/PaymentTransactionAgg/PaymentTransaction.cs

@@ -1,104 +0,0 @@
-using System;
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.PaymentTransaction;
-
-namespace Company.Domain.PaymentTransactionAgg
-{
-    /// <summary>
-    /// نمایانگر یک تراکنش پرداخت شامل جزئیات طرف قرارداد، اطلاعات بانکی، وضعیت تراکنش و مبلغ.
-    /// </summary>
-    public class PaymentTransaction:EntityBase
-    {
-        /// <summary>
-        /// سازنده کلاس PaymentTransaction با دریافت اطلاعات تراکنش.
-        /// </summary>
-        /// <param name="contractingPartyId">شناسه طرف قرارداد</param>
-        /// <param name="bankAccountHolderName">نام صاحب حساب بانکی</param>
-        /// <param name="bankName">نام بانک</param>
-        /// <param name="cardNumber">شماره کارت</param>
-        /// <param name="shebaNumber">شماره شبا</param>
-        /// <param name="accountNumber">شماره حساب بانکی</param>
-        /// <param name="status">وضعیت تراکنش پرداخت</param>
-        /// <param name="amount">مبلغ تراکنش</param>
-        /// <param name="transactionId">شناسه یکتای تراکنش</param>
-        /// <param name="contractingPartyName"></param>
-        public PaymentTransaction(long contractingPartyId,
-            string bankAccountHolderName,
-            string bankName,
-            string cardNumber,
-            string shebaNumber,
-            string accountNumber,
-            PaymentTransactionStatus status,
-            double amount,
-            string transactionId,
-            string contractingPartyName)
-        {
-            TransactionDate = DateTime.Now;
-            ContractingPartyId = contractingPartyId;
-            BankAccountHolderName = bankAccountHolderName;
-            BankName = bankName;
-            CardNumber = cardNumber;
-            ShebaNumber = shebaNumber;
-            AccountNumber = accountNumber;
-            Status = status;
-            Amount = amount;
-            TransactionId = transactionId;
-            ContractingPartyName = contractingPartyName;
-        }
-
-        /// <summary>
-        /// تاریخ و زمان انجام پرداخت
-        /// </summary>
-        public DateTime TransactionDate { get; set; }
-
-        /// <summary>
-        /// شناسه طرف حساب
-        /// </summary>
-        public long ContractingPartyId { get; set; }
-
-        /// <summary>
-        /// نام طرف حساب
-        /// </summary>
-        public string ContractingPartyName { get; set; }
-
-        /// <summary>
-        /// نام صاحب حساب بانکی
-        /// </summary>
-        public string BankAccountHolderName { get; set; }
-
-        /// <summary>
-        /// نام بانک
-        /// </summary>
-        public string BankName { get; set; }
-
-        /// <summary>
-        /// شماره کارت
-        /// </summary>
-        public string CardNumber { get; set; }
-
-        /// <summary>
-        /// شماره شبا
-        /// </summary>
-        public string ShebaNumber { get; set; }
-
-        /// <summary>
-        /// شماره حساب بانکی
-        /// </summary>
-        public string AccountNumber { get; set; }
-
-        /// <summary>
-        /// وضعیت تراکنش پرداخت
-        /// </summary>
-        public PaymentTransactionStatus Status { get; set; }
-
-        /// <summary>
-        /// مبلغ تراکنش
-        /// </summary>
-        public double Amount { get; set; }
-
-        /// <summary>
-        /// شناسه یکتای تراکنش
-        /// </summary>
-        public string TransactionId { get; set; }
-    }
-}

Company.Domain/RepresentativeAgg/IRepresentativeRepository.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.PersonalContractingParty;
@@ -21,10 +20,4 @@ public interface IRepresentativeRepository : IRepository<long, Representative>
 
     #endregion
 
-    #region Api
-    Task<ICollection<RepresentativeGetListViewModel>> GetList(RepresentativeGetListSearchModel searchModel);
-    bool HasAnyContractingParty(long id);
-    Task<List<GetSelectListRepresentativeViewModel>> GetSelectList(); 
-    #endregion
-
 }

Company.Domain/RollCallAgg/IRollCallMandatoryRepository.cs

@@ -15,7 +15,7 @@ namespace Company.Domain.RollCallAgg;
 
 public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
 {
-	ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking, bool isStaticCheckout, bool rotatingShiftCompute);
+	ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking, bool isStaticCheckout);
 
     /// <summary>
     /// محاسبه ساعات کارکرد پرسنل در صورت داشتن حضور غیاب
@@ -38,6 +38,12 @@ public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
     List<LateToWorkEarlyExistSpannig> LateToWorkEarlyExit(List<GroupedRollCalls> groupedRollCall,
         ICollection<CustomizeWorkshopEmployeeSettingsShift> shiftSettings, List<LeaveViewModel> leavList);
 
+    List<LoanInstallmentViewModel> LoanInstallmentForCheckout(long employeeId, long workshopId, DateTime contractStart,
+        DateTime contractEnd);
+
+    List<SalaryAidViewModel> SalaryAidsForCheckout(long employeeId, long workshopId, DateTime checkoutStart,
+        DateTime checkoutEnd);
+
     /// <summary>
     /// گزارش نوبت کاری حضور غیاب
     /// </summary>
@@ -47,12 +53,6 @@ public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
     /// <param name="contractEnd"></param>
     /// <param name="shiftwork"></param>
     /// <returns></returns>
-    List<LoanInstallmentViewModel> LoanInstallmentForCheckout(long employeeId, long workshopId, DateTime contractStart,
-        DateTime contractEnd);
-
-    List<SalaryAidViewModel> SalaryAidsForCheckout(long employeeId, long workshopId, DateTime checkoutStart,
-        DateTime checkoutEnd);
-
     Task<ComputingViewModel> RotatingShiftReport(long workshopId, long employeeId, DateTime contractStart,
         DateTime contractEnd, string shiftwork, bool hasRollCall, CreateWorkingHoursTemp command,bool holidayWorking);
 }

Company.Domain/SalaryAidAgg/SalaryAid.cs

@@ -23,7 +23,6 @@ public class SalaryAid : EntityBase
         CalculationMonth = calculationMonth;
         CalculationYear = calculationYear;
     }
-
     public long EmployeeId { get; private set; }
     public long WorkshopId { get; private set; }
     public double Amount { get; private set; }

Company.Domain/TemporaryClientRegistrationAgg/IInstitutionContractTempRepository.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using _0_Framework_b.Domain;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 
@@ -16,11 +15,4 @@ public interface IInstitutionContractTempRepository : IRepository<long, Institut
     /// <param name="contractingPartyId"></param>
     /// <returns></returns>
     Task<InstitutionContractTempViewModel> GetInstitutionContractTemp(long id,long contractingPartyTempId);
-
-    /// <summary>
-    /// دریافت لیست طرف حساب هایی که ثبت نام آنها تکمیل شده
-    /// جهت نمایش در کارپوشه
-    /// </summary>
-    /// <returns></returns>
-    Task<List<RegistrationWorkflowMainList>> GetAllCompletedRegistration();
 }

Company.Domain/TemporaryClientRegistrationAgg/InstitutionContractTemp.cs

@@ -131,9 +131,6 @@ public class InstitutionContractTemp : EntityBase
         VerifyCodeEndTime = verifyCodeEndTime;
     }
 
-    public void ChangeRegistrationStatus(string registrationStatus)
-    {
-        RegistrationStatus = registrationStatus;
-    }
+   
 
 }

Company.Domain/WorkshopAgg/Workshop.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Security.AccessControl;
-using _0_Framework.Application;
 using _0_Framework.Domain;
 using Company.Domain.CheckoutAgg;
 using Company.Domain.ClientEmployeeWorkshopAgg;
@@ -77,13 +76,23 @@ public class Workshop : EntityBase
         ClientEmployeeWorkshopList = new List<ClientEmployeeWorkshop>();
     }
 
-
-
+  
+    //public Workshop()
+    //{
+    //    Contracts2 = new List<Contract>();
+    //    WorkshopEmployers = new List<WorkshopEmployer>();
+    //    LeftWorks = new List<LeftWork>();
+    //    LeftWorkInsurances = new List<LeftWorkInsurance>();
+    //    EmployersList = new List<Employer>();
+    //    WorkshopEmployers = new List<WorkshopEmployer>();
+    //    EmployersList = new List<Employer>();
+    //    PersonnelCodeList = new List<PersonnelCodeDomain>();
+    //}
     public Workshop(string workshopName,string workshopSureName, string insuranceCode, string typeOfOwnership, string archiveCode, string agentName, string agentPhone, 
         string state, string city, string address, string typeOfInsuranceSend, string typeOfContract, string contractTerm,
         string agreementNumber, bool fixedSalary, string population,long? insuranceJobId, string zoneName, bool addBonusesPay, bool addYearsPay, bool addLeavePay, bool totalPaymentHide,
         bool isClassified, string computeOptions, string bonusesOptions, string yearsOptions, string hasRollCallFreeVip, bool workshopHolidayWorking,
-        bool insuranceCheckoutOvertime, bool insuranceCheckoutFamilyAllowance, bool createContract, bool signContract, bool createCheckout, bool signCheckout, IsActive cutContractEndOfYear, bool rotatingShiftCompute, bool isStaticCheckout)
+        bool insuranceCheckoutOvertime, bool insuranceCheckoutFamilyAllowance)
     {
         WorkshopName = workshopName;
         WorkshopSureName = workshopSureName;
@@ -127,13 +136,6 @@ public class Workshop : EntityBase
         WorkshopHolidayWorking = workshopHolidayWorking;
         InsuranceCheckoutOvertime = insuranceCheckoutOvertime;
         InsuranceCheckoutFamilyAllowance = insuranceCheckoutFamilyAllowance;
-        CreateContract = createContract;
-        SignContract = signContract;
-        CreateCheckout = createCheckout;
-        SignCheckout = signCheckout;
-        CutContractEndOfYear = cutContractEndOfYear;
-        RotatingShiftCompute = rotatingShiftCompute;
-        IsStaticCheckout = isStaticCheckout;
     }
 
 
@@ -208,32 +210,9 @@ public class Workshop : EntityBase
     /// محاسبه حق اولاد در لیست بیمه
     /// </summary>
     public bool InsuranceCheckoutFamilyAllowance { get; private set; }
-
-    public bool CreateContract { get; private set; }
-    public bool SignContract { get; private set; }
-    public bool CreateCheckout { get; private set; }
-    public bool SignCheckout { get; private set; }
-
-    /// <summary>
-    /// اگر قرارداد بیش از یک ماه باشد و  گزینه انتخاب شده منتهی به پایان سال باشد
-    /// این آیتم
-    /// True
-    /// است
-    /// </summary>
-    public IsActive CutContractEndOfYear { get; private set; }
 	//public Employer Employer { get; private set; }
 
-    /// <summary>
-    /// محاسبه نوبت کاری در فیش حقوقی
-    /// </summary>
-    public bool RotatingShiftCompute { get; private set; }
-
-    /// <summary>
-    /// تصفیه حساب بصورت استاتیک محاصبه شود
-    /// </summary>
-    public bool IsStaticCheckout { get; private set; }
-
-    public Workshop()
+	public Workshop()
     {
         RollCallServicesList = new List<RollCallService>();
         CustomizeCheckouts = new List<CustomizeCheckout>();
@@ -264,7 +243,7 @@ public class Workshop : EntityBase
         string state, string city, string address, string typeOfInsuranceSend, string typeOfContract, string contractTerm,
         string agreementNumber, bool fixedSalary, string population, long? insuranceJobId, string zoneName, bool addBonusesPay, bool addYearsPay, bool addLeavePay,
         bool totalPaymentHide, bool isClassified, string computeOptions, string bonusesOptions, string yearsOptions, string hasRollCallFreeVip, bool workshopHolidayWorking,
-        bool insuranceCheckoutOvertime, bool insuranceCheckoutFamilyAllowance, bool createContract, bool signContract, bool createCheckout, bool signCheckout, IsActive cutContractEndOfYear, bool rotatingShiftCompute, bool isStaticCheckout)
+        bool insuranceCheckoutOvertime, bool insuranceCheckoutFamilyAllowance)
     {
         WorkshopName = workshopName;
         WorkshopSureName = workshopSureName;
@@ -305,13 +284,6 @@ public class Workshop : EntityBase
         WorkshopHolidayWorking = workshopHolidayWorking;
         InsuranceCheckoutOvertime = insuranceCheckoutOvertime;
         InsuranceCheckoutFamilyAllowance = insuranceCheckoutFamilyAllowance;
-        CreateContract = createContract;
-        SignContract = signContract;
-        CreateCheckout = createCheckout;
-        SignCheckout = signCheckout;
-        CutContractEndOfYear = cutContractEndOfYear;
-        RotatingShiftCompute = rotatingShiftCompute;
-        IsStaticCheckout = isStaticCheckout;
     }
 
 

Company.Domain/empolyerAgg/IEmployerRepository.cs

@@ -68,5 +68,4 @@ public interface IEmployerRepository : IRepository<long, Employer>
 	#endregion
 
 
-
 }

CompanyManagement.Infrastructure.Excel/InstitutionContract/InstitutionContractExcelGenerator.cs

@@ -1,262 +0,0 @@
-using _0_Framework.Application;
-using CompanyManagement.Infrastructure.Excel.CWS;
-using CompanyManagment.App.Contracts.InstitutionContract;
-using OfficeOpenXml;
-using OfficeOpenXml.Style;
-using System.Drawing;
-using System.Text.RegularExpressions;
-
-namespace CompanyManagement.Infrastructure.Excel.InstitutionContract;
-
-public class InstitutionContractExcelGenerator
-{
-
-    public static byte[] GenerateExcel(List<InstitutionContractViewModel> institutionContractViewModels)
-    {
-        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
-        using var package = new ExcelPackage();
-        var allWorksheet = package.Workbook.Worksheets.Add("همه");
-
-        var blueWorksheet = package.Workbook.Worksheets.Add("آبی");
-        blueWorksheet.TabColor = Color.LightBlue;
-
-        var grayWorksheet = package.Workbook.Worksheets.Add("خاکستری");
-        grayWorksheet.TabColor = Color.LightGray;
-
-        var redWorksheet = package.Workbook.Worksheets.Add("قرمز");
-        redWorksheet.TabColor = Color.LightCoral;
-
-        var purpleWorksheet = package.Workbook.Worksheets.Add("بنفش");
-        purpleWorksheet.TabColor = Color.MediumPurple;
-
-        var blackWorksheet = package.Workbook.Worksheets.Add("مشکی");
-        blackWorksheet.TabColor = Color.DimGray;
-
-        var yellowWorksheet = package.Workbook.Worksheets.Add("زرد");
-        yellowWorksheet.TabColor = Color.Yellow;
-            
-        var whiteWorksheet = package.Workbook.Worksheets.Add("سفید");
-        whiteWorksheet.TabColor = Color.White;
-
-
-        CreateExcelSheet(institutionContractViewModels, allWorksheet);
-
-        var blueContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "blue").ToList();
-        CreateExcelSheet(blueContracts, blueWorksheet);
-        institutionContractViewModels = institutionContractViewModels.Except(blueContracts).ToList();
-
-        var grayContracts = institutionContractViewModels.Where(x => x.IsContractingPartyBlock == "true").ToList();
-        CreateExcelSheet(grayContracts, grayWorksheet);
-        institutionContractViewModels = institutionContractViewModels.Except(grayContracts).ToList();
-
-        var redContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "red").ToList();
-        CreateExcelSheet(redContracts, redWorksheet);
-        institutionContractViewModels = institutionContractViewModels.Except(redContracts).ToList();
-
-        var purpleContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "purple").ToList();
-        CreateExcelSheet(purpleContracts, purpleWorksheet);
-        institutionContractViewModels = institutionContractViewModels.Except(purpleContracts).ToList();
-        
-        var blackContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "black").ToList();
-        CreateExcelSheet(blackContracts, blackWorksheet);
-        institutionContractViewModels = institutionContractViewModels.Except(blackContracts).ToList();
-
-        var yellowContracts = institutionContractViewModels
-            .Where(x => string.IsNullOrWhiteSpace(x.ExpireColor) && x.WorkshopCount == "0").ToList();
-        CreateExcelSheet(yellowContracts, yellowWorksheet);
-        institutionContractViewModels = institutionContractViewModels.Except(yellowContracts).ToList();
-
-        var otherContracts = institutionContractViewModels;
-        CreateExcelSheet(otherContracts, whiteWorksheet);
-
-        return package.GetAsByteArray();
-    }
-
-    private static void CreateExcelSheet(List<InstitutionContractViewModel> institutionContractViewModels, ExcelWorksheet worksheet)
-    {
-        // Headers
-        worksheet.Cells[1, 1].Value = "شماره قرارداد";
-        worksheet.Cells[1, 2].Value = "طرف حساب";
-        worksheet.Cells[1, 3].Value = "شماره کارفرما";
-        worksheet.Cells[1, 4].Value = "کارفرما ها";
-        worksheet.Cells[1, 5].Value = "کارگاه ها";
-        worksheet.Cells[1, 6].Value = "مجبوع پرسنل";
-        worksheet.Cells[1, 7].Value = "شروع قرارداد";
-        worksheet.Cells[1, 8].Value = "پایان قرارداد";
-        worksheet.Cells[1, 9].Value = "مبلغ قرارداد (بدون کارگاه)";
-        worksheet.Cells[1, 10].Value = "مبلغ قرارداد";
-        worksheet.Cells[1, 11].Value = "وضعیت مالی";
-
-        using (var range = worksheet.Cells[1, 1, 1, 11])
-        {
-            range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
-            range.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
-            range.Style.Font.Bold = true;
-            range.Style.Fill.PatternType = ExcelFillStyle.Solid;
-            range.Style.Fill.BackgroundColor.SetColor(Color.LightGray); // رنگ پس زمینه خاکستری
-
-            // اعمال بوردر به همه خطوط
-            range.Style.Border.Top.Style = ExcelBorderStyle.Thin;
-            range.Style.Border.Bottom.Style = ExcelBorderStyle.Thin;
-            range.Style.Border.Left.Style = ExcelBorderStyle.Thin;
-            range.Style.Border.Right.Style = ExcelBorderStyle.Thin;
-
-            // اعمال رنگ مشکی برای بوردرها
-            range.Style.Border.Top.Color.SetColor(Color.Black);
-            range.Style.Border.Bottom.Color.SetColor(Color.Black);
-            range.Style.Border.Left.Color.SetColor(Color.Black);
-            range.Style.Border.Right.Color.SetColor(Color.Black);
-        }
-
-        int row = 2;
-
-        for (int i = 0; i < institutionContractViewModels.Count; i++)
-        {
-            var contract = institutionContractViewModels[i];
-            var employers = contract.EmployerViewModels?.ToList() ?? new();
-            var workshops = contract.WorkshopViewModels?.ToList() ?? new();
-
-            int maxRows = Math.Max(employers.Count, workshops.Count);
-            maxRows = Math.Max(1, maxRows);
-
-            int startRow = row;
-            int endRow = row + maxRows - 1;
-
-            // 🎨 دریافت رنگ پس‌زمینه از مقدار رنگ موجود در داده
-            string colorName = contract.ExpireColor.ToLower();
-            var fillColor = GetColorByName(colorName, contract.WorkshopCount, contract.IsContractingPartyBlock);
-
-            for (int j = 0; j < maxRows; j++)
-            {
-                int currentRow = row + j;
-
-                worksheet.Cells[currentRow, 4].Value = j < employers.Count ? employers[j].FullName : null;
-                worksheet.Cells[currentRow, 5].Value = j < workshops.Count ? workshops[j].WorkshopFullName : null;
-
-                for (int col = 1; col <= 11; col++)
-                {
-                    var cell = worksheet.Cells[currentRow, col];
-
-                    // 📏 بوردرهای داخلی نازک / نقطه‌چین
-                    cell.Style.Border.Top.Style = ExcelBorderStyle.Dotted;
-                    cell.Style.Border.Bottom.Style = ExcelBorderStyle.Dotted;
-                    cell.Style.Border.Left.Style = ExcelBorderStyle.Thin;
-                    cell.Style.Border.Right.Style = ExcelBorderStyle.Thin;
-
-                    // 🎯 تراز متن
-                    cell.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
-                    cell.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
-
-                    // 🎨 اعمال رنگ پس‌زمینه
-                    cell.Style.Fill.PatternType = ExcelFillStyle.Solid;
-                    cell.Style.Fill.BackgroundColor.SetColor(fillColor);
-                }
-            }
-
-            // 🧱 مرج و مقداردهی ستون‌های اصلی
-            worksheet.Cells[startRow, 1, endRow, 1].Merge = true;
-            worksheet.Cells[startRow, 1].Value = contract.ContractNo;
-
-            worksheet.Cells[startRow, 2, endRow, 2].Merge = true;
-            worksheet.Cells[startRow, 2].Value = contract.ContractingPartyName;
-
-            worksheet.Cells[startRow, 3, endRow, 3].Merge = true;
-            worksheet.Cells[startRow, 3].Value = contract.ArchiveCode;
-
-            worksheet.Cells[startRow, 6, endRow, 6].Merge = true;
-            worksheet.Cells[startRow, 6].Value = contract.EmployeeCount;
-
-            worksheet.Cells[startRow, 7, endRow, 7].Merge = true;
-            worksheet.Cells[startRow, 7].Value = contract.ContractStartFa;
-
-            worksheet.Cells[startRow, 8, endRow, 8].Merge = true;
-            worksheet.Cells[startRow, 8].Value = contract.ContractEndFa;
-
-            worksheet.Cells[startRow, 9, endRow, 9].Merge = true;
-            var contractWithoutWorkshopAmountCell = worksheet.Cells[startRow, 9];
-            contractWithoutWorkshopAmountCell.Value = contract.WorkshopCount == "0" ? MoneyToDouble(contract.ContractAmount) : "";
-            contractWithoutWorkshopAmountCell.Style.Numberformat.Format = "#,##0";
-
-
-            worksheet.Cells[startRow, 10, endRow, 10].Merge = true;
-            var contractAmountCell = worksheet.Cells[startRow, 10];
-            contractAmountCell.Value = contract.WorkshopCount != "0" ? MoneyToDouble(contract.ContractAmount) : "";
-            contractAmountCell.Style.Numberformat.Format = "#,##0";
-
-
-            worksheet.Cells[startRow, 11, endRow, 11].Merge = true;
-            var balance = MoneyToDouble(contract.BalanceStr);
-            var balanceCell = worksheet.Cells[startRow, 11];
-            balanceCell.Value = balance;
-            balanceCell.Style.Numberformat.Format = "#,##0";
-
-            if (balance > 0)
-                balanceCell.Style.Font.Color.SetColor(Color.Red);
-            else if (balance < 0)
-                balanceCell.Style.Font.Color.SetColor(Color.Green);
-
-            // 📦 بوردر ضخیم خارجی برای هر سطر
-            var boldRange = worksheet.Cells[startRow, 1, endRow, 11];
-            boldRange.Style.Border.BorderAround(ExcelBorderStyle.Medium);
-
-            row += maxRows;
-        }
-
-
-
-        worksheet.PrinterSettings.PaperSize = ePaperSize.A4;
-        worksheet.PrinterSettings.Orientation = eOrientation.Landscape;
-        worksheet.PrinterSettings.FitToPage = true;
-        worksheet.PrinterSettings.FitToWidth = 1;
-        worksheet.PrinterSettings.FitToHeight = 0;
-        worksheet.PrinterSettings.Scale = 85;
-        int contractNoCol = 1;
-        int contractingPartyNameCol = 2;
-        int archiveNoCol = 3;
-        int employersCol = 4;
-        int workshopsCol = 5;
-        int employeeCountCol = 6;
-        int startContractCol = 7;
-        int endContractCol = 8;
-        int contractWithoutWorkshopAmountCol = 9;
-        int contractAmountCol = 10;
-        int balanceCol = 11;
-        worksheet.Columns[contractNoCol].Width = 17;
-        worksheet.Columns[contractingPartyNameCol].Width = 40;
-        worksheet.Columns[archiveNoCol].Width = 10;
-        worksheet.Columns[employersCol].Width = 40;
-        worksheet.Columns[workshopsCol].Width = 45;
-        worksheet.Columns[employeeCountCol].Width = 12;
-        worksheet.Columns[startContractCol].Width = 12;
-        worksheet.Columns[endContractCol].Width = 12;
-        worksheet.Columns[contractWithoutWorkshopAmountCol].Width = 18;
-        worksheet.Columns[contractAmountCol].Width = 12;
-        worksheet.Columns[balanceCol].Width = 12;
-        worksheet.View.RightToLeft = true; // فارسی
-        //worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns();
-    }
-
-    private static double MoneyToDouble(string value)
-    {
-        Console.WriteLine(value);
-        var min = value.Length > 1 ? value.Substring(0, 2) : "";
-        var test = min == "\u200e\u2212" ? value.MoneyToDouble() * -1 : value.MoneyToDouble();
-
-        Console.WriteLine(test);
-        return test;
-    }
-    private static Color GetColorByName(string name, string workshopCount, string IsContractingPartyBlock)
-    {
-        return name switch
-        {
-            "blue" => Color.LightBlue,
-            _ when IsContractingPartyBlock == "true" => Color.LightGray,
-            "red" => Color.LightCoral,
-            "purple" => Color.MediumPurple,
-            "black" => Color.DimGray,
-            var n when string.IsNullOrWhiteSpace(n) && workshopCount == "0" => Color.Yellow,
-            _ => Color.White
-        };
-    }
-
-}

CompanyManagment.App.Contracts/Checkout/CheckoutViewModel.cs

@@ -132,118 +132,7 @@ public class CheckoutViewModel
     /// مدت مرخصی استحقاقی
     /// </summary>
     public string TotalPaidLeave { get; set; }
-
-
-    public bool HasSignCheckout { get; set; }    
-
-    public TimeSpan TotalHourlyLeave { get; set; }
 	public List<CheckoutDailyRollCallViewModel> MonthlyRollCall { get; set; }
     public List<LoanInstallmentViewModel> InstallmentViewModels { get; set; }
     public List<SalaryAidViewModel> SalaryAidViewModels { get; set; }
-    public CheckoutRollCallViewModel CheckoutRollCall { get; set; }
-
-}
-
-public class CheckoutRollCallViewModel
-{
-	/// <summary>
-	/// مجموع ساعت موظفی
-	/// </summary>
-	public TimeSpan TotalMandatoryTimeSpan { get; set; }
-
-	/// <summary>
-	/// مجموع ساعت حضور
-	/// </summary>
-	public TimeSpan TotalPresentTimeSpan { get; set; }
-
-	/// <summary>
-	/// مجموع ساعت استراحت
-	/// </summary>
-	public TimeSpan TotalBreakTimeSpan { get; set; }
-
-	/// <summary>
-	/// مجموع ساعت کارکرد
-	/// </summary>
-	public TimeSpan TotalWorkingTimeSpan { get; set; }
-
-	/// <summary>
-	/// مجموع ساعت مرخصی استحقاقی
-	/// </summary>
-	public TimeSpan TotalPaidLeaveTmeSpan { get; set; }
-
-	/// <summary>
-	/// مجموع ساعت مرخصی استعلاجی
-	/// </summary>
-	public TimeSpan TotalSickLeaveTimeSpan { get; set; }
-
-	/// <summary>
-	/// روز های حضور غیاب
-	/// </summary>
-	public ICollection<CheckoutRollCallDayViewModel> RollCallDaysCollection { get; set; }
-}
-
-public class CheckoutRollCallDayViewModel
-{
-	public long Id { get; set; }
-
-	/// <summary>
-	/// تاریخ
-	/// </summary>
-	public DateTime Date { get; set; }
-	/// <summary>
-	/// ورود اول 
-	/// </summary>
-	public string FirstStartDate { get; set; }
-
-	/// <summary>
-	/// خروج اول
-	/// </summary>
-	public string FirstEndDate { get; set; }
-
-	/// <summary>
-	/// ورود دوم
-	/// </summary>
-	public string SecondStartDate { get; set; }
-
-	/// <summary>
-	/// خروج دوم
-	/// </summary>
-	public string SecondEndDate { get; set; }
-
-	/// <summary>
-	/// ساعت استراحت
-	/// </summary>
-	public TimeSpan BreakTimeSpan { get; set; }
-
-	/// <summary>
-	/// مقدار زمان کارکرد
-	/// </summary>
-	public TimeSpan WorkingTimeSpan { get; set; }
-
-	/// <summary>
-	/// آیا منقطع است؟
-	/// </summary>
-	public bool IsSliced { get; set; }
-
-	/// <summary>
-	/// آیا غیبت است
-	/// </summary>
-	public bool IsAbsent { get; set; }
-
-	/// <summary>
-	/// آیا جمعه است
-	/// </summary>
-	public bool IsFriday { get; set; }
-
-	/// <summary>
-	/// آیا تعطیل رسمی است
-	/// </summary>
-	public bool IsHoliday { get; set; }
-
-	/// <summary>
-	/// نوع مرخصی - درصورت نداشتن مرخصی مقدارش null میباشد
-	/// </summary>
-	public string LeaveType { get; set; }
-
-	public long CheckoutId { get; set; }
 }

CompanyManagment.App.Contracts/Checkout/CreateCheckout.cs

@@ -5,7 +5,6 @@ using System.Text;
 using System.Threading.Tasks;
 using CompanyManagment.App.Contracts.Contract;
 using CompanyManagment.App.Contracts.Employee;
-using CompanyManagment.App.Contracts.RollCall;
 using CompanyManagment.App.Contracts.YearlySalary;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
@@ -139,20 +138,4 @@ public class CreateCheckout
 
     public string ShiftWork { get; set; }
 
-    /// <summary>
-    /// محاسبه اضافه کار در بیمه
-    /// </summary>
-    public bool HasInsuranceChekoutOverTime {get; set; }
-
-
-    public List<GroupedRollCalls> GroupedRollCalls { get; set; }
-
-    public TimeSpan TotalWorkingTimeSpan { get; set; }
-
-    public TimeSpan TotalBreakTimeSpan { get; set; }
-
-    public TimeSpan TotalPresentTimeSpan { get; set; }
-    public TimeSpan TotalPaidLeave { get; set; }
-    public TimeSpan TotalSickLeave { get; set; }
-
 }

CompanyManagment.App.Contracts/Checkout/CreateCheckoutListViewModel.cs

@@ -39,11 +39,7 @@ public class CreateCheckoutListViewModel
 
 
     public string Description { get; set; }
-    /// <summary>
-    /// آیا پرسنل اجازه ایجاد قرارداد دارد
-    /// </summary>
-    public bool EmployeeHasCreateCheckout { get; set; }
 
-    public bool HasWorkFlow { get; set; }
+
     public List<CreateCheckoutListViewModel> CreateCheckoutList { get; set; }
 }

CompanyManagment.App.Contracts/Checkout/ICheckoutApplication.cs

@@ -27,14 +27,6 @@ public interface ICheckoutApplication
     Task<CreateCheckoutListViewModel> GetContractResultToCreateCheckout(long workshopId, long employeeId, string year,
         string month,
         string contractStart, string contractEnd);
-    /// <summary>
-    /// لیست تصفیه حساب
-    /// جدید
-    ///
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<List<CheckoutViewModel>> SearchCheckoutOptimized(CheckoutSearchModel searchModel);
     Task<List<CheckoutViewModel>> Search(CheckoutSearchModel searchModel);
     List<CheckoutViewModel> SimpleSearch(CheckoutSearchModel searchModel);
     List<CheckoutViewModel> PrintAll(List<long> id);

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

@@ -1,22 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-	</PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="PersianTools.Core" Version="2.0.4" />
-	</ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="PersianTools.Core" Version="2.0.4" />
+  </ItemGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\0_Framework\0_Framework.csproj" />
-		<ProjectReference Include="..\AccountManagement.Application.Contracts\AccountManagement.Application.Contracts.csproj" />
-		<ProjectReference Include="..\_0_Framework\_0_Framework_b.csproj" />
-	</ItemGroup>
-
-	<Target Name="CopyDocs" AfterTargets="Build">
-		<Copy SourceFiles="$(OutputPath)CompanyManagment.App.Contracts.xml" DestinationFolder="../ServiceHost\bin\Debug\net8.0\" />
-	</Target>
+  <ItemGroup>
+    <ProjectReference Include="..\0_Framework\0_Framework.csproj" />
+    <ProjectReference Include="..\AccountManagement.Application.Contracts\AccountManagement.Application.Contracts.csproj" />
+    <ProjectReference Include="..\_0_Framework\_0_Framework_b.csproj" />
+  </ItemGroup>
 
 </Project>

CompanyManagment.App.Contracts/Contract/ComputingViewModel.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using CompanyManagment.App.Contracts.Loan;
-using CompanyManagment.App.Contracts.RollCall;
 using CompanyManagment.App.Contracts.SalaryAid;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;
 
@@ -46,15 +45,6 @@ public class ComputingViewModel
 
     public bool HasRotatingShift { get; set; }
 
-    public List<GroupedRollCalls> GroupedRollCalls { get; set; }
-
-    public TimeSpan TotalWorkingTimeSpan { get; set; }
-
-    public TimeSpan TotalBreakTimeSpan { get; set; }
-
-    public TimeSpan TotalPresentTimeSpan { get; set; }
-    public TimeSpan TotalPaidLeave { get; set; }
-    public TimeSpan TotalSickLeave { get; set; }
 
     //public List<string> holidays;
 }

CompanyManagment.App.Contracts/Contract/ContractViweModel.cs

@@ -63,10 +63,6 @@ public class ContractViweModel
     public string EmployeeLName { get; set; }
 
     public string IsBlockCantracingParty { get; set; }
-    /// <summary>
-    /// آیا مجاز به امضاء قرادا می باشد
-    /// </summary>
-    public bool HasSignContract { get; set; }
     public IQueryable<WorkshopEmployerViewModel> WorkshopEmployerList { get; set; }
     public List<EmployerViewModel> Employers { get; set; }
     public List<WorkshopViewModel> Workshops { get; set; }

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CreateCustomizeWorkshopGroupSettings.cs

@@ -1,5 +1,4 @@
 
-using System;
 using System.Collections.Generic;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
@@ -17,9 +16,8 @@ public class CreateCustomizeWorkshopGroupSettings
     public IrregularShift IrregularShift { get; set; }
     public BreakTime BreakTime { get; set; }
     public int LeavePermittedDays { get; set; }
-    //public FridayWork FridayWork { get; set; }
+    public FridayWork FridayWork { get; set; }
     public HolidayWork HolidayWork { get; set; }
-    public List<DayOfWeek> OffDayOfWeeks { get; set; }
     public ICollection<CustomizeRotatingShiftsViewModel> CustomizeRotatingShiftsViewModels { get; set; }
 
 }

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CreateCustomizeWorkshopSettings.cs

@@ -1,5 +1,4 @@
-using System;
-using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
+using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using CompanyManagment.App.Contracts.CustomizeWorkshopSettings.ValueObjectsViewModel;
 using System.Collections.Generic;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
@@ -21,18 +20,16 @@ public class CreateCustomizeWorkshopSettings
     public BreakTime BreakTime { get; set; }
 
 
-    ///// <summary>
-    ///// آیا جمعه کار میکند یا نه
-    ///// </summary>
-    //public FridayWork FridayWork { get; set; }
+    /// <summary>
+    /// آیا جمعه کار میکند یا نه
+    /// </summary>
+    public FridayWork FridayWork { get; set; }
 
     /// <summary>
     /// آیا در روز های تعطیل  کار میکند
     /// </summary>
     public HolidayWork HolidayWork { get; set; }
 
-    public List<DayOfWeek> OffDays { get; set; }
-
 
 
 

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CustomizeWorkshopEmployeeSettingsViewModel.cs

@@ -1,5 +1,4 @@
-using System;
-using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
+using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
 using System.Collections.Generic;
 
@@ -21,8 +20,7 @@ public class CustomizeWorkshopEmployeeSettingsViewModel
     public bool ChangeSettingEmployeeShiftIsChange { get; set; }
     public BreakTime BreakTime { get; set; }
     public HolidayWork HolidayWork { get; set; }
-    //public FridayWork FridayWork { get; set; }
+    public FridayWork FridayWork { get; set; }
     public int LeavePermittedDays { get; set; }
     public ICollection<CustomizeRotatingShiftsViewModel> CustomizeRotatingShiftsViewModels { get; set; }
-    public List<DayOfWeek> WeeklyOffDays { get; set; }
 }

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CustomizeWorkshopGroupSettingsViewModel.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using _0_Framework.Domain.CustomizeCheckoutShared.Base;
+using System.Collections.Generic;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
 
@@ -10,6 +8,7 @@ public class CustomizeWorkshopGroupSettingsViewModel
 {
 	public long Id { get; set; }
 	public double Salary { get; set; }
+	public string SalaryStr { get; set; }
     public string GroupName { get; set; }
     public bool MainGroup { get; set; }
     public List<CustomizeWorkshopShiftViewModel> RollCallWorkshopShifts { get; set; }
@@ -20,5 +19,5 @@ public class CustomizeWorkshopGroupSettingsViewModel
     public BreakTime BreakTime { get; set; }
     public FridayWork FridayWork { get; set; }
     public HolidayWork HolidayWork { get; set; }
-    public List<DayOfWeek> OffDayOfWeeks { get; set; }
+    public int LeavePermitted { get; set; }
 }

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/EditCustomizeEmployeeSettings.cs

@@ -1,5 +1,4 @@
-using System;
-using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
+using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using CompanyManagment.App.Contracts.CustomizeWorkshopSettings.ValueObjectsViewModel;
 using System.Collections.Generic;
 using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
@@ -73,19 +72,17 @@ public class EditCustomizeEmployeeSettings:CreateCustomizeEmployeeSettings
     /// </summary>
     public EarlyExitViewModel EarlyExit { get;  set; }
 
-    ///// <summary>
-    ///// آیا جمعه کار میکند یا نه
-    ///// </summary>
-    //public FridayWork FridayWork { get; set; }
+    /// <summary>
+    /// آیا جمعه کار میکند یا نه
+    /// </summary>
+    public FridayWork FridayWork { get; set; }
 
     /// <summary>
     /// آیا در روز های تعطیل  کار میکند
     /// </summary>
     public HolidayWork HolidayWork { get; set; }
 
-    public List<DayOfWeek> WeeklyOffDays { get; set; }
-
-	public long Id { get; set; }
+    public long Id { get; set; }
     public string Salary { get; set; }
     public string NameGroup { get; set; }
     public string EmployeeFullName { get; set; }
@@ -94,5 +91,4 @@ public class EditCustomizeEmployeeSettings:CreateCustomizeEmployeeSettings
     public IEnumerable<CustomizeWorkshopShiftViewModel> ShiftViewModel { get; set; }
     public ICollection<CustomizeRotatingShiftsViewModel> CustomizeRotatingShifts{ get; set; }
     public BreakTime BreakTime { get; set; }
-
 }

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/EditCustomizeWorkshopGroupSettings.cs

@@ -1,8 +1,6 @@
-using System;
-using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
+using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using CompanyManagment.App.Contracts.CustomizeWorkshopSettings.ValueObjectsViewModel;
 using System.Collections.Generic;
-using _0_Framework.Domain.CustomizeCheckoutShared.Base;
 
 namespace CompanyManagment.App.Contracts.CustomizeWorkshopSettings;
 
@@ -77,18 +75,16 @@ public class EditCustomizeWorkshopGroupSettings : CreateCustomizeWorkshopGroupSe
     /// </summary>
     public EarlyExitViewModel EarlyExit { get; set; }
 
-    ///// <summary>
-    ///// آیا جمعه کار میکند یا نه
-    ///// </summary>
-    //public FridayWork FridayWork { get; set; }
+    /// <summary>
+    /// آیا جمعه کار میکند یا نه
+    /// </summary>
+    public FridayWork FridayWork { get; set; }
 
     /// <summary>
     /// آیا در روز های تعطیل  کار میکند
     /// </summary>
     public HolidayWork HolidayWork { get; set; }
 
-    //public List<DayOfWeek> WeeklyOffDays { get; set; }
-
     public bool IsShiftChanged { get; set; }
     public bool IsSettingChanged { get; set; }
 }

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/ICustomizeWorkshopSettingsApplication.cs

@@ -1,5 +1,4 @@
-using System;
-using _0_Framework.Application;
+using _0_Framework.Application;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
 using CompanyManagment.App.Contracts.Employee;
@@ -52,14 +51,11 @@ public interface ICustomizeWorkshopSettingsApplication
     /// </summary>
     /// <param name="shiftViewModels">شیفت هت</param>
     /// <param name="customizeWorkshopSettingsId">آیدی تنظیمات کارگاه</param>
-    /// <param name="workshopShiftStatus"></param>
-    /// <param name="holidayWork"></param>
-    /// <param name="weeklyOffDays"></param>
     /// <param name="replaceChangedGroups"></param>
+    /// <param name="workshopShiftStatus"></param>
     /// <returns></returns>
     OperationResult EditWorkshopSettingShifts(List<CustomizeWorkshopShiftViewModel> shiftViewModels,
-	    long customizeWorkshopSettingsId, WorkshopShiftStatus workshopShiftStatus,
-	    HolidayWork holidayWork, List<DayOfWeek> weeklyOffDays);
+	    long customizeWorkshopSettingsId,WorkshopShiftStatus workshopShiftStatus,FridayWork fridayWork,HolidayWork holidayWork);
 
 	// It will Get the Workshop Settings with its groups and the employees of groups.
 	CustomizeWorkshopSettingsViewModel GetWorkshopSettingsByWorkshopId(long workshopId, AuthViewModel auth);

CompanyManagment.App.Contracts/Employee/CreateEmployeeByClient.cs

@@ -28,8 +28,10 @@ public class CreateEmployeeByClient
     public List<AddEmployeeDocumentItem> EmployeeDocumentItems { get; set; }
     public bool HasEmployeeDocument { get; set; }
     public bool HasRollCallService { get; set; }
-    public bool CanceledAuthorize { get; set; }
-    public string BirthDate { get; set; }
+    public bool HasCustomizeCheckoutService { get; set; }
+
+
+
 }
 
 

CompanyManagment.App.Contracts/Employee/EmployeeByNationalCodeInWorkshopViewModel.cs

@@ -17,7 +17,6 @@ public record EmployeeByNationalCodeInWorkshopViewModel
     public long PersonnelCode { get; set; }
     public List<EmployeeByNationalCodeEmployeeBankInfoViewModel> EmployeeBankInfos { get; set; }
     public EmployeeByNationalCodeEmployeeDocumentViewModel EmployeeDocument { get; set; }
-    public bool AuthorizedCanceled { get; set; }
 
 }
 

CompanyManagment.App.Contracts/Employee/EmployeeDataFromApiViewModel.cs

@@ -26,5 +26,4 @@ public class EmployeeDataFromApiViewModel
     /// </summary>
     public string IdNumberSeri { get; set; }
 
-    public bool AuthorizedCanceled { get; set; }
 }

CompanyManagment.App.Contracts/Employee/GetEmployeeListSearchModel.cs

@@ -1,38 +0,0 @@
-using _0_Framework.Application.Enums;
-
-namespace CompanyManagment.App.Contracts.Employee;
-
-/// <summary>
-/// مدل جستجو در لیست پرسنل در ادمین
-/// </summary>
-public class GetEmployeeListSearchModel
-{
-	/// <summary>
-	/// آیدی کارفرما
-	/// </summary>
-	public long EmployerId { get; set; }
-	/// <summary>
-	/// آیدی کارگاه
-	/// </summary>
-	public long WorkshopId { get; set; }
-	/// <summary>
-	/// آیدی پرسنل
-	/// </summary>
-	public long EmployeeId { get; set; }
-	/// <summary>
-	/// کدملی
-	/// </summary>
-	public string NationalCode { get; set; }
-	/// <summary>
-	/// شماره بیمه
-	/// </summary>
-	public string InsuranceCode { get; set; }
-	/// <summary>
-	/// وضعیت پرسنل
-	/// </summary>
-	public ActivationStatus EmployeeStatus { get; set; }
-	/// <summary>
-	/// ایندکس جستجو
-	/// </summary>
-	public int PageIndex { get; set; }
-}

CompanyManagment.App.Contracts/Employee/GetEmployeeListViewModel.cs

@@ -1,44 +0,0 @@
-using _0_Framework.Application;
-using _0_Framework.Application.Enums;
-
-namespace CompanyManagment.App.Contracts.Employee;
-
-/// <summary>
-/// ویو مدل لیست پرسنل ادمین
-/// </summary>
-public class GetEmployeeListViewModel
-{
-	/// <summary>
-	/// آیدی پرسنل
-	/// </summary>
-	public long Id { get; set; }
-	/// <summary>
-	/// نام و نام خانوادگی پرسنل
-	/// </summary>
-	public string EmployeeFullName { get; set; }
-	/// <summary>
-	/// کدملی
-	/// </summary>
-	public string NationalCode { get; set; }
-
-	/// <summary>
-	/// تعداد فرزندان
-	/// </summary>
-	public string ChildrenCount { get; set; }
-	/// <summary>
-	/// جنسیت
-	/// </summary>
-	public Gender Gender { get; set; }
-	/// <summary>
-	/// تاریخ تولد
-	/// </summary>
-	public string BirthDate { get; set; }
-	/// <summary>
-	/// شماره بیمه
-	/// </summary>
-	public string InsuranceCode { get; set; }
-	/// <summary>
-	/// وضعیت پرسنل
-	/// </summary>
-	public ActivationStatus EmployeeStatus { get; set; }
-}

CompanyManagment.App.Contracts/Employee/IEmployeeApplication.cs

@@ -77,23 +77,6 @@ public interface IEmployeeApplication
 
     Task<OperationResult<EmployeeDataFromApiViewModel>> GetEmployeeDataFromApi(string nationalCode, string birthDate);
 
-	#endregion
-
-	#region Api
-
-	/// <summary>
-	/// لیست پرسنل برای جستجو 
-	/// </summary>
-	/// <param name="searchText"></param>
-	/// <returns></returns>
-	Task<List<EmployeeSelectListViewModel>> GetSelectList(string searchText);
-
-	/// <summary>
-	/// لیست کل پرسنل
-	/// </summary>
-	/// <returns></returns>
-	Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel);
-
-	#endregion
+    #endregion
 
 }

CompanyManagment.App.Contracts/EmployeeComputeOptions/CreateEmployeeComputeOptions.cs

@@ -1,5 +1,4 @@
-using _0_Framework.Application;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -18,35 +17,5 @@ namespace CompanyManagment.App.Contracts.EmployeeComputeOptions
         public string BonusesOptions { get; set; }
         //نحوه محاسبه سنوات
         public string YearsOptions { get; set; }
-
-        /// <summary>
-        /// ایجاد قرارداد
-        /// </summary>
-        public bool CreateContract { get; set; }
-        /// <summary>
-        /// امضای قرارداد
-        /// </summary>
-        public bool SignContract { get; set; }
-        /// <summary>
-        /// ایجاد تصفیه
-        /// </summary>
-        public bool CreateCheckout { get; set; }
-        /// <summary>
-        /// امضای تصفیه
-        /// </summary>
-        public bool SignCheckout { get; set; }
-
-        /// <summary>
-        /// مدت قرارداد
-        /// </summary>
-        public string ContractTerm { get; set; }
-
-        /// <summary>
-        /// اگر قرارداد بیش از یک ماه باشد و  گزینه انتخاب شده منتهی به پایان سال باشد
-        /// این آیتم
-        /// True
-        /// است
-        /// </summary>
-        public IsActive CutContractEndOfYear { get; set; }
     }
 }

CompanyManagment.App.Contracts/EmployeeComputeOptions/EmployeeComputeOptionsViewModel.cs

@@ -1,6 +1,4 @@
-using _0_Framework.Application;
-
-namespace CompanyManagment.App.Contracts.EmployeeComputeOptions;
+namespace CompanyManagment.App.Contracts.EmployeeComputeOptions;
 
 public class EmployeeComputeOptionsViewModel
 {
@@ -14,34 +12,4 @@ public class EmployeeComputeOptionsViewModel
     public string BonusesOptions { get; set; }
     //نحوه محاسبه سنوات
     public string YearsOptions { get; set; }
-    /// <summary>
-    /// ایجاد قرارداد
-    /// </summary>
-    public bool CreateContract { get; set; }
-    /// <summary>
-    /// امضای قرارداد
-    /// </summary>
-    public bool SignContract { get; set; }
-    /// <summary>
-    /// ایجاد تصفیه
-    /// </summary>
-    public bool CreateCheckout { get; set; }
-    /// <summary>
-    /// امضای تصفیه
-    /// </summary>
-    public bool SignCheckout { get; set; }
-
-
-    /// <summary>
-    /// مدت قرارداد
-    /// </summary>
-    public string ContractTerm { get; set; }
-
-    /// <summary>
-    /// اگر قرارداد بیش از یک ماه باشد و  گزینه انتخاب شده منتهی به پایان سال باشد
-    /// این آیتم
-    /// True
-    /// است
-    /// </summary>
-    public IsActive CutContractEndOfYear { get; set; }
 }

CompanyManagment.App.Contracts/Employer/IEmployerApplication.cs

@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.Checkout;
-using CompanyManagment.App.Contracts.Employee;
 
 
 namespace CompanyManagment.App.Contracts.Employer;
@@ -20,7 +19,7 @@ public interface IEmployerApplication
 
     OperationResult Active(long id);
     OperationResult DeActive(long id);
-    OperationResult Remove_Old(long id);
+    OperationResult Remove(long id);
 
     List<EmployerViewModel> GetEmployers();
     List<EmployerViewModel> Search(EmployerSearchModel searchModel);
@@ -37,13 +36,7 @@ public interface IEmployerApplication
     #region Mahan
 
     List<EmployerViewModel> GetEmployersHasWorkshop();
-
-    /// <summary>
-    /// لیست نام کارفرما ها برای جستجو
-    /// </summary>
-    /// <param name="search"></param>
-    /// <returns></returns>
-	Task<List<EmployerSelectListViewModel>> GetSelectList(string search);
+    Task<List<EmployerSelectListViewModel>> GetSelectList(string search);
 
     #endregion
     #region NewByHeydari
@@ -60,10 +53,10 @@ public interface IEmployerApplication
 
 	(string employerName, bool isLegal) InsuranceEmployerByWorkshopId(long workshopId);
 
-
-
 	#endregion
+
 	#region Api
+
 	/// <summary>
 	/// لیست کارفرما ها
 	/// </summary>
@@ -113,15 +106,20 @@ public interface IEmployerApplication
 	/// <returns></returns>
 	Task<OperationResult> EditLegal(EditLegalEmployer command);
 
-
+	///// <summary>
+	///// لیست نام کارفرما ها برای جستجو
+	///// </summary>
+	///// <param name="search"></param>
+	///// <returns></returns>
+	//public Task<List<EmployerSelectListViewModel>> GetSelectList(string search);
 
 	/// <summary>
 	/// حذف کارفرما - درصورت داشتن کارگاه کارفرما غیرفعال میشود
 	/// </summary>
 	/// <param name="id"></param>
 	/// <returns></returns>
-	public Task<OperationResult<string>> Remove(long id);
+	public Task<OperationResult<string>> RemoveApi(long id);
 
 	#endregion
+}
 
-}

CompanyManagment.App.Contracts/FinancialStatment/IFinancialStatmentApplication.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using _0_Framework.Application;
-using CompanyManagment.App.Contracts.FinancilTransaction;
 
 namespace CompanyManagment.App.Contracts.FinancialStatment;
 
@@ -14,130 +13,4 @@ public interface IFinancialStatmentApplication
 
     List<FinancialStatmentViewModel> Search(FinancialStatmentSearchModel searchModel);
     FinancialStatmentViewModel GetDetailsByContractingPartyId(long contractingPartyId);
-
-    /// <summary>
-    /// نمایش اطلاعات صورت حساب مالی کلاینت
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <param name="accountId"></param>
-    /// <returns>مدل صورت حساب مالی کلاینت</returns>
-    Task<ClientFinancialStatementViewModel> GetClientFinancialStatement(ClientFinancialStatementSearchModel searchModel,
-        long accountId);
-
-    /// <summary>
-    /// مقدار بدهی کلاینت را برمی گرداند
-    /// </summary>
-    /// <param name="AccountId"></param>
-    /// <returns></returns>
-    Task<double> GetClientDebtAmount(long AccountId);
-}
-
-public class ClientFinancialStatementSearchModel
-{
-    /// <summary>
-    /// از تاریخ
-    /// </summary>
-    public string FromDate { get; set; }
-    /// <summary>
-    /// تا تاریخ
-    /// </summary>
-    public string ToDate { get; set; }
-    /// <summary>
-    /// از مبلغ
-    /// </summary>
-    public double FromAmount { get; set; }
-    /// <summary>
-    /// تا مبلغ
-    /// </summary>
-    public double ToAmount { get; set; }
-    /// <summary>
-    /// نوع عملیات تراکنش
-    /// </summary>
-    public FinancialTransactionType? Type { get; set; }
-    
-    /// <summary>
-    /// صفحه بندی
-    /// </summary>
-    public int PageIndex { get; set; }
-
-}
-
-public enum FinancialTransactionType
-{
-    /// <summary>
-    /// ایجاد درآمد
-    /// </summary>
-    Debt,
-    /// <summary>
-    /// دریافت درآمد
-    /// </summary>
-    Credit
-}
-
-public class ClientFinancialStatementViewModel
-{
-    /// <summary>
-    /// آیدی FinancialStatement
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// جمع بدهکاری
-    /// </summary>
-    public double TotalDebt { get; set; }
-    /// <summary>
-    /// جمع بستانکاری
-    /// </summary>
-    public double TotalCredit { get; set; }
-    /// <summary>
-    /// مبلغ قابل پرداخت
-    /// </summary>
-    public double TotalAmountPayable { get; set; }
-
-    /// <summary>
-    /// تراکنش ها
-    /// </summary>
-    public List<ClientFinancialTransactionViewModel> Transactions { get; set; }
-}
-
-public class ClientFinancialTransactionViewModel
-{
-    /// <summary>
-    /// زمان و تاریخ میلادی
-    /// </summary>
-    public DateTime DateTimeGr { get; set; }
-    /// <summary>
-    /// تاریخ 
-    /// </summary>
-    public string DateFa { get; set; }
-    /// <summary>
-    /// زمان
-    /// </summary>
-    public string TimeFa { get; set; }
-    /// <summary>
-    /// شرح
-    /// </summary>
-    public string Description { get; set; }
-    /// <summary>
-    /// نوع عملیات پرداخت
-    /// </summary>
-    public FinancialTransactionType Type { get; set; }
-
-    /// <summary>
-    /// نوع عملیات پرداخت به صورت استرینگ
-    /// </summary>
-    public string TypeStr { get; set; }
-    /// <summary>
-    /// بدهکار
-    /// </summary>
-    public double Debtor { get; set; }
-    /// <summary>
-    /// بستانکار
-    /// </summary>
-    public double Creditor { get; set; }
-    /// <summary>
-    /// باقی مانده
-    /// </summary>
-    public double Balance { get; set; }
-}
-
+}

CompanyManagment.App.Contracts/InsuranceList/EmployeeDetailsForInsuranceListViewModel.cs

@@ -298,6 +298,4 @@ public class EmployeeDetailsForInsuranceListViewModel
     ///// DSK_SPOUSE
     ///// </summary>
     //public double SumOfMarriedAllowance { get; set; }
-    public string Month { get; set; }
-    public string Year { get; set; }
 }

CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs

@@ -44,7 +44,7 @@ public interface IInsuranceListApplication
     Task<OperationResult> ConfirmInsuranceOperation(InsuranceListConfirmOperation command);
     Task<InsuranceListConfirmOperation> GetInsuranceOperationDetails(long id);
 
-	Task<InsuranceListTabsCountViewModel> GetTabCounts(InsuranceListSearchModel searchModel);
+    Task<InsuranceListTabsCountViewModel> GetTabCounts(long accountId, int month, int year);
 
-	#endregion
+    #endregion
 }

CompanyManagment.App.Contracts/InsuranceList/InsuranceListViewModel.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using CompanyManagment.App.Contracts.InsuranceList.Enums;
 
 namespace CompanyManagment.App.Contracts.InsuranceList;
 
@@ -33,13 +32,6 @@ public class InsuranceListViewModel
     public bool InspectionDone { get; set; }
     /// <summary>وضعیت بدهی</summary>
     public bool DebtDone { get; set; }
-    /// <summary>تاییدیه کارفرما</summary>
+    /// <summary>وضعیت تاییدیه کارفرما</summary>
     public bool EmployerApproved { get; set; }
-
-    /// <summary>
-    /// نوع تاییدیه کارفرما 
-    /// </summary>
-    public InsuranceListEmployerApprovalStatus EmployerApprovalStatus { get; set; }
-
-    public string ArchiveCode { get; set; }
 }

CompanyManagment.App.Contracts/LeftWork/ILeftWorkApplication.cs

@@ -5,7 +5,6 @@ using System.Text;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.PersonnleCode;
-using CompanyManagment.App.Contracts.Workshop.DTOs;
 using Microsoft.AspNetCore.Mvc;
 
 namespace CompanyManagment.App.Contracts.LeftWork;
@@ -31,10 +30,4 @@ public interface ILeftWorkApplication
     OperationResult CreateLeftWorkByLeftWorkGroups(string employeeFullName, long commandEmployeeId, List<PersonnelCodeViewModel> commandPersonnelCode, List<LeftWorkGroup> leftWorkGroups);
     OperationResult CheckDeleteLeftWork(long workshopId, long employeeId, string date, int type);
     OperationResult CheckEditLeftWork(long workshopId, long employeeId, string date, int type);
-    /// <summary>
-    /// دریافت اطلاعات کارگاه و پرسنل برای ایجاد قرارداد
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    AutoExtensionDto AutoExtentionEmployees(long workshopId);
 }

CompanyManagment.App.Contracts/PaymentTransaction/CreatePaymentTransaction.cs

@@ -1,54 +0,0 @@
-namespace CompanyManagment.App.Contracts.PaymentTransaction;
-
-public class CreatePaymentTransaction
-{
-    /// <summary>
-    /// شناسه طرف قرارداد
-    /// </summary>
-    public long ContractingPartyId { get; set; }
-
-    /// <summary>
-    /// نام صاحب حساب بانکی
-    /// </summary>
-    public string BankAccountHolderName { get; set; }
-
-    /// <summary>
-    /// نام بانک
-    /// </summary>
-    public string BankName { get; set; }
-
-    /// <summary>
-    /// شماره کارت
-    /// </summary>
-    public string CardNumber { get; set; }
-
-    /// <summary>
-    /// شماره شبا
-    /// </summary>
-    public string ShebaNumber { get; set; }
-
-    /// <summary>
-    /// شماره حساب بانکی
-    /// </summary>
-    public string AccountNumber { get; set; }
-
-    /// <summary>
-    /// وضعیت تراکنش پرداخت
-    /// </summary>
-    public PaymentTransactionStatus Status { get; set; }
-
-    /// <summary>
-    /// مبلغ تراکنش
-    /// </summary>
-    public double Amount { get; set; }
-
-    /// <summary>
-    /// شناسه یکتای تراکنش
-    /// </summary>
-    public string TransactionId { get; set; }
-
-    /// <summary>
-    /// نام طرف حساب
-    /// </summary>
-    public string ContractingPartyName { get; set; }
-}

CompanyManagment.App.Contracts/PaymentTransaction/GetPaymentTransactionListSearchModel.cs

@@ -1,43 +0,0 @@
-namespace CompanyManagment.App.Contracts.PaymentTransaction;
-
-/// <summary>
-/// مدل جستجو برای دریافت لیست تراکنش‌های پرداخت.
-/// شامل فیلترهایی مانند نام طرف قرارداد یا صاحب حساب، بازه تاریخ، بازه مبلغ و وضعیت تراکنش.
-/// </summary>
-public class GetPaymentTransactionListSearchModel
-{
-    /// <summary>
-    /// آیدی طرف حساب
-    /// </summary>
-    public long ContractingPartyId{ get; set; }
-
-    /// <summary>
-    /// تاریخ شروع بازه جستجو (به صورت رشته)
-    /// </summary>
-    public string FromDate { get; set; }
-
-    /// <summary>
-    /// تاریخ پایان بازه جستجو (به صورت رشته)
-    /// </summary>
-    public string ToDate { get; set; }
-
-    /// <summary>
-    /// حداقل مبلغ تراکنش جهت جستجو
-    /// </summary>
-    public double FromAmount { get; set; }
-
-    /// <summary>
-    /// حداکثر مبلغ تراکنش جهت جستجو
-    /// </summary>
-    public double ToAmount { get; set; }
-
-    /// <summary>
-    /// وضعیت تراکنش جهت فیلتر کردن نتایج
-    /// </summary>
-    public PaymentTransactionStatus? StatusEnum { get; set; }
-
-    /// <summary>
-    /// شماره صفحه برای پیاده‌سازی pagination
-    /// </summary>
-    public int PageIndex { get; set; }
-}

CompanyManagment.App.Contracts/PaymentTransaction/GetPaymentTransactionListViewModel.cs

@@ -1,73 +0,0 @@
-namespace CompanyManagment.App.Contracts.PaymentTransaction;
-
-/// <summary>
-/// مدل نمایش اطلاعات هر تراکنش پرداخت در لیست تراکنش‌ها.
-/// شامل جزئیاتی مانند تاریخ و زمان پرداخت، نام طرف حساب، اطلاعات بانکی، وضعیت و مبلغ تراکنش.
-/// </summary>
-public class GetPaymentTransactionListViewModel
-{
-    /// <summary>
-    /// آیدی تراکنش پرداخت
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// تاریخ پرداخت
-    /// </summary>
-    public string PaymentDate { get; set; }
-
-    /// <summary>
-    /// زمان پرداخت
-    /// </summary>
-    public string PaymentTime { get; set; }
-
-    /// <summary>
-    /// نام طرف حساب
-    /// </summary>
-    public string ContractingPartyName { get; set; }
-
-    /// <summary>
-    /// نام صاحب حساب بانکی
-    /// </summary>
-    public string BankAccountHolderName { get; set; }
-
-    /// <summary>
-    /// نام بانک
-    /// </summary>
-    public string BankName { get; set; }
-
-    /// <summary>
-    /// شماره کارت
-    /// </summary>
-    public string CardNumber { get; set; }
-
-    /// <summary>
-    /// شماره شبا
-    /// </summary>
-    public string ShebaNumber { get; set; }
-
-    /// <summary>
-    /// شماره حساب بانکی
-    /// </summary>
-    public string AccountNumber { get; set; }
-
-    /// <summary>
-    /// وضعیت تراکنش به صورت متنی
-    /// </summary>
-    public string Status { get; set; }
-
-    /// <summary>
-    /// وضعیت تراکنش به صورت Enum
-    /// </summary>
-    public PaymentTransactionStatus StatusEnum { get; set; }
-
-    /// <summary>
-    /// مبلغ تراکنش
-    /// </summary>
-    public double Amount { get; set; }
-
-    /// <summary>
-    /// شناسه یکتای تراکنش
-    /// </summary>
-    public string TransactionId { get; set; }
-}

CompanyManagment.App.Contracts/PaymentTransaction/IPaymentTransactionApplication.cs

@@ -1,30 +0,0 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using _0_Framework.Application;
-using _0_Framework.Application.PaymentGateway;
-
-namespace CompanyManagment.App.Contracts.PaymentTransaction;
-
-/// <summary>
-/// 
-/// </summary>
-public interface IPaymentTransactionApplication
-{
-    /// <summary>
-    /// لیست تراکنش های پرداخت را بر اساس فیلتر مشخص شده برمی گرداند.
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<List<GetPaymentTransactionListViewModel>> GetPaymentTransactionList(
-        GetPaymentTransactionListSearchModel searchModel);
-    /// <summary>
-    /// ایجاد تراکنش 
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    Task<OperationResult> Create(CreatePaymentTransaction command);
-
-    Task<WalletAmountResponse> GetWalletAmount(CancellationToken cancellationToken);
-
-}

CompanyManagment.App.Contracts/PaymentTransaction/PaymentTransactionStatus.cs

@@ -1,17 +0,0 @@
-namespace CompanyManagment.App.Contracts.PaymentTransaction;
-
-/// <summary>
-/// وضعیت تراکنش درگاه پرداخت
-/// </summary>
-public enum PaymentTransactionStatus
-{
-    /// <summary>
-    /// تراکنش با شکست مواجه شد.
-    /// </summary>
-    Failed,
-    /// <summary>
-    /// تراکنش با موفقیت انجام شد.
-    /// </summary>
-    Success,
-
-}

CompanyManagment.App.Contracts/Representative/CreateLegalRepresentative.cs

@@ -1,46 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace CompanyManagment.App.Contracts.Representative;
-
-public class CreateLegalRepresentative
-{
-
-    /// <summary>
-    /// نام حقوقی
-    /// </summary>
-    [Required(ErrorMessage = "این مقدار نمی تواند خالی باشد")]
-    public string LegalName { get; set; }
-
-
-    /// <summary>
-    /// شناسه ثبت
-    /// </summary>
-    [RegularExpression("^[0-9]*$", ErrorMessage = "لطفا فقط عدد وارد کنید")]
-    public string RegisterId { get; set; }
-
-
-    /// <summary>
-    /// شناسه ملی
-    /// </summary>
-    [RegularExpression("[0-9]{11}", ErrorMessage = "لطفا فقط عدد 11 رقمی وارد کنید")]
-    public string NationalId { get; set; }
-
-
-    /// <summary>
-    /// شماره تلفن
-    /// </summary>
-    [DataType(DataType.PhoneNumber)]
-    [RegularExpression(@"^\(?([0-9]{4})\)?[-. ]?([0-9]{3})[-. ]?([0-9]{4})$", ErrorMessage = "لطفا شماره تلفن معتبر وارد کنید")]
-    public string Phone { get; set; }
-
-    /// <summary>
-    /// شماره تلفن نماینده
-    /// </summary>
-    [RegularExpression("^[0-9]*$", ErrorMessage = "لطفا فقط عدد وارد کنید")]
-    public string AgentPhone { get; set; }
-
-    /// <summary>
-    /// آدرس
-    /// </summary>
-    public string Address { get; set; }
-}

CompanyManagment.App.Contracts/Representative/CreateRealRepresentative.cs

@@ -1,54 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace CompanyManagment.App.Contracts.Representative;
-
-public class CreateRealRepresentative
-{
-
-
-    /// <summary>
-    /// نام کوچک
-    /// </summary>
-    [Required(ErrorMessage = "این مقدار نمی تواند خالی باشد")]
-    public string FName { get; set; }
-
-    /// <summary>
-    /// نام خانوادگی
-    /// </summary>
-    [Required(ErrorMessage = "این مقدار نمی تواند خالی باشد")]
-    public string LName { get; set; }
-
-
-    /// <summary>
-    /// کد ملی
-    /// </summary>
-    [RegularExpression("^[0-9]*$", ErrorMessage = "لطفا فقط عدد وارد کنید")]
-    public string Nationalcode { get; set; }
-
-
-    /// <summary>
-    /// شماره شناسنامه
-    /// </summary>
-    [MaxLength(12)]
-    [MinLength(1)]
-    [RegularExpression("^[0-9]*$", ErrorMessage = "لطفا فقط عدد وارد کنید")]
-    public string IdNumber { get; set; }
-
-
-    /// <summary>
-    /// شماره تلفن
-    /// </summary>
-    [DataType(DataType.PhoneNumber)]
-    [RegularExpression(@"^\(?([0-9]{4})\)?[-. ]?([0-9]{3})[-. ]?([0-9]{4})$", ErrorMessage = "لطفا شماره تلفن معتبر وارد کنید")]
-    public string Phone { get; set; }
-
-
-    [RegularExpression("^[0-9]*$", ErrorMessage = "لطفا فقط عدد وارد کنید")]
-    public string AgentPhone { get; set; }
-
-    /// <summary>
-    /// آدرس
-    /// </summary>
-    public string Address { get; set; }
-
-}

CompanyManagment.App.Contracts/Representative/EditLegalRepresentative.cs

@@ -1,6 +0,0 @@
-namespace CompanyManagment.App.Contracts.Representative;
-
-public class EditLegalRepresentative : CreateLegalRepresentative
-{
-    public long Id { get; set; }
-}

CompanyManagment.App.Contracts/Representative/EditRealRepresentative.cs

@@ -1,6 +0,0 @@
-namespace CompanyManagment.App.Contracts.Representative;
-
-public class EditRealRepresentative : CreateRealRepresentative
-{
-    public long Id { get; set; }
-}

CompanyManagment.App.Contracts/Representative/GetSelectListRepresentativeViewModel.cs

@@ -1,17 +0,0 @@
-namespace CompanyManagment.App.Contracts.Representative;
-
-/// <summary>
-/// ویو مدل سلکت لیست برای معرف
-/// </summary>
-public class GetSelectListRepresentativeViewModel
-{
-	/// <summary>
-	/// آیدی
-	/// </summary>
-	public long Id { get; set; }
-
-	/// <summary>
-	/// نام معرف
-	/// </summary>
-	public string Name { get; set; }
-}

CompanyManagment.App.Contracts/Representative/IRepresentativeApplication.cs

@@ -24,27 +24,8 @@ public interface IRepresentativeApplication
     OperationResult DeleteRepresentative(long id);
     OperationResult Active(long id);
     OperationResult DeActive(long id);
-	#endregion
+    #endregion 
 
-	#region Api
-
-	Task<List<RepresentativeGetListViewModel>> GetList(RepresentativeGetListSearchModel searchModel);
-
-	bool HasAnyContractingParty(long id);
-
-
-	OperationResult CreateReal(CreateRealRepresentative command);
-	OperationResult CreateLegal(CreateLegalRepresentative command);
-	OperationResult EditReal(EditRealRepresentative command);
-	OperationResult EditLegal(EditLegalRepresentative command);
-
-	/// <summary>
-	/// لیست نام های معرف برای سلکت لیست
-	/// </summary>
-	/// <returns></returns>
-	Task<List<GetSelectListRepresentativeViewModel>> GetSelectList();
-
-	#endregion
 
 
 }

CompanyManagment.App.Contracts/Representative/RepresentativeGetListSearchModel.cs

@@ -1,41 +0,0 @@
-using _0_Framework.Application.Enums;
-
-namespace CompanyManagment.App.Contracts.Representative;
-
-public class RepresentativeGetListSearchModel
-{
-
-    public int PageIndex { get; set; }
-
-    /// <summary>
-    /// نام شرکت یا نام و نام خانوادگی
-    /// </summary>
-    public string CompanyNameOrFullName { get; set; }
-
-    /// <summary>
-    /// شناسه ملی یا کدملی
-    /// </summary>
-    public string NationalCodeOrNationalId { get; set; }
-
-    /// <summary>
-    /// شماره شناسنامه
-    /// </summary>
-    public string IdNumber { get; set; }
-
-    /// <summary>
-    /// آیدی طرف حساب
-    /// </summary>
-    public long ContractingPartyId { get; set; }
-
-    /// <summary>
-    /// نوع معرف
-    /// </summary>
-    public LegalType RepresentativeType { get; set; }
-
-
-    /// <summary>
-    /// وضعیت معرف
-    /// </summary>
-    public ActivationStatus RepresentativeStatus { get; set; }
-
-}

CompanyManagment.App.Contracts/Representative/RepresentativeGetListViewModel.cs

@@ -1,29 +0,0 @@
-using _0_Framework.Application.Enums;
-
-namespace CompanyManagment.App.Contracts.Representative;
-
-public class RepresentativeGetListViewModel
-{
-    /// <summary>
-    /// آیدی معرف
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// نام حقیقی یا نام حقوقی
-    /// </summary>
-    public string RealNameOrLegalName { get; set; }
-
-    /// <summary>
-    /// کدملی یا شناسه ملی
-    /// </summary>
-    public string NationalIdOrNationalCode { get; set; }
-
-    /// <summary>
-    /// آیا این معرف طرف حسابی دارد؟
-    /// </summary>
-    public bool HasAnyContractingParty { get; set; }
-
-    public ActivationStatus RepresentativeStatus { get; set; }
-    public LegalType RepresentativeType { get; set; }
-}

CompanyManagment.App.Contracts/RollCall/GroupedRollCalls.cs

@@ -13,10 +13,6 @@ public class GroupedRollCalls
 	public TimeSpan BreakTime { get; set; }
 	public DateTime ShiftDate { get; set; }
 
-    /// <summary>
-    /// تاریخ های جمع کاری
-    /// </summary>
-    public DateTime? Fridays { get; set; }
     /// <summary>
     /// تاخیر در ورود (مدت زمانی که کارمند با تأخیر وارد شده است)
     /// </summary>

CompanyManagment.App.Contracts/RollCall/IRollCallMandatoryApplication.cs

@@ -8,7 +8,7 @@ namespace CompanyManagment.App.Contracts.RollCall;
 public interface IRollCallMandatoryApplication
 {
 	bool HasRollCallRecord(long employeeId, long workshopId, DateTime contractStart);
-	ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking, bool isStaticCheckout, bool rotatingShiftCompute);
+	ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking, bool isStaticCheckout);
 
     /// <summary>
     /// گزارش نوبت کاری حضور غیاب

CompanyManagment.App.Contracts/RollCall/ShiftList.cs

@@ -6,12 +6,10 @@ public class ShiftList
 {
 	public DateTime Start { get; set; }
 	public DateTime End { get; set; }
-
-	public DateTime EndWithOutResTime { get; set; }
-	/// <summary>
-	/// تاخیر در ورود (مدت زمانی که کارمند با تأخیر وارد شده است)
-	/// </summary>
-	public TimeSpan LateEntryDuration { get; set; }
+    /// <summary>
+    /// تاخیر در ورود (مدت زمانی که کارمند با تأخیر وارد شده است)
+    /// </summary>
+    public TimeSpan LateEntryDuration { get; set; }
 
     /// <summary>
     /// تعجیل در ورود (مدت زمانی که کارمند زودتر از زمان مشخص وارد شده است)

CompanyManagment.App.Contracts/RollCallEmployee/RollCallEmployeeViewModel.cs

@@ -35,6 +35,4 @@ public class RollCallEmployeeViewModel : EditRollCallEmployee
     public string EmployeeFName { get; set; }
     public long RollCallEmployeeId { get; set; }
     public bool CreatedByClient { get; set; }
-    public string RollCallEmployeeName { get; set; }
-    public bool HasChangedName { get; set; }
 }

CompanyManagment.App.Contracts/TemporaryClientRegistration/ITemporaryClientRegistrationApplication.cs

@@ -93,11 +93,4 @@ public interface ITemporaryClientRegistrationApplication
     /// <param name="verifyCode"></param>
     /// <returns></returns>
     Task<OperationResult> PayOffCompleted(long contractingPartyTempId);
-
-    /// <summary>
-    /// دریافت لیست طرف حساب هایی که ثبت نام آنها تکمیل شده
-    /// جهت نمایش در کارپوشه
-    /// </summary>
-    /// <returns></returns>
-    Task<List<RegistrationWorkflowMainList>> RegistrationWorkflowMainList();
 }

CompanyManagment.App.Contracts/TemporaryClientRegistration/RegistrationWorkflowMainList.cs

@@ -1,21 +0,0 @@
-namespace CompanyManagment.App.Contracts.TemporaryClientRegistration;
-
-public class RegistrationWorkflowMainList
-{
-    /// <summary>
-    /// آی دی طرف حساب ثبت شده موقت
-    /// </summary>
-    public long ContractingPartyTempId { get; set; }
-
-
-    /// <summary>
-    /// نام کامل طرف حساب
-    /// </summary>
-    public string ContractingPartyFullName { get; set; }
-
-    /// <summary>
-    /// شماره همراه
-    /// </summary>
-    public string Phone { get; set; }
-
-}

CompanyManagment.App.Contracts/Workshop/ConnectedPersonnelViewModel.cs

@@ -1,5 +1,4 @@
-using _0_Framework.Application;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -27,34 +26,4 @@ public class ConnectedPersonnelViewModel
     public string BonusesOptions { get; set; }
     //نحوه محاسبه سنوات
     public string YearsOptions { get; set; }
-
-    /// <summary>
-    /// ایجاد قرارداد
-    /// </summary>
-    public bool CreateContract { get; set; }
-    /// <summary>
-    /// امضای قرارداد
-    /// </summary>
-    public bool SignContract { get; set; }
-    /// <summary>
-    /// ایجاد تصفیه
-    /// </summary>
-    public bool CreateCheckout { get; set; }
-    /// <summary>
-    /// امضای تصفیه
-    /// </summary>
-    public bool SignCheckout { get; set; }
-
-    /// <summary>
-    /// مدت قرارداد
-    /// </summary>
-    public string ContractTerm { get; set; }
-
-    /// <summary>
-    /// اگر قرارداد بیش از یک ماه باشد و  گزینه انتخاب شده منتهی به پایان سال باشد
-    /// این آیتم
-    /// True
-    /// است
-    /// </summary>
-    public IsActive CutContractEndOfYear { get; set; }
 }

CompanyManagment.App.Contracts/Workshop/CreateWorkshop.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using _0_Framework.Application;
 using AccountManagement.Application.Contracts.Account;
 using CompanyManagment.App.Contracts.Employer;
 using CompanyManagment.App.Contracts.InsuranceJob;
@@ -117,39 +116,4 @@ public class CreateWorkshop
     /// </summary>
     public bool InsuranceCheckoutFamilyAllowance { get;  set; }
 
-    /// <summary>
-    /// ایجاد قرارداد
-    /// </summary>
-    public bool CreateContract { get; set; }
-    /// <summary>
-    /// امضاء قراداد
-    /// </summary>
-    public bool SignContract { get; set; }
-    /// <summary>
-    /// ایجات تصفیه حساب
-    /// </summary>
-    public bool CreateCheckout { get; set; }
-    /// <summary>
-    /// امضاء تصفیه حساب
-    /// </summary>
-    public bool SignCheckout { get; set; }
-
-    /// <summary>
-    /// اگر قرارداد بیش از یک ماه باشد و  گزینه انتخاب شده منتهی به پایان سال باشد
-    /// این آیتم
-    /// True
-    /// است
-    /// </summary>
-    public IsActive CutContractEndOfYear { get; set; }
-
-    /// <summary>
-    /// محاسبه نوبت کاری در فیش حقوقی
-    /// </summary>
-    public bool RotatingShiftCompute { get; set; }
-
-    /// <summary>
-    /// تصفیه حساب بصورت استاتیک محاصبه شود
-    /// </summary>
-    public bool IsStaticCheckout { get; set; }
-
 }

CompanyManagment.App.Contracts/Workshop/DTOs/AutoExtensionDto.cs

@@ -1,64 +0,0 @@
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Mvc.Rendering;
-
-namespace CompanyManagment.App.Contracts.Workshop.DTOs;
-
-public class AutoExtensionDto
-{
-    /// <summary>
-    /// نام کارگاه
-    /// </summary>
-    public string WorkshopName { get; set; }
-
-    /// <summary>
-    /// آیا کارفرما خطای اطلاعات هویتی دارد
-    /// </summary>
-    public bool EmployerWarning { get; set; }
-
-    /// <summary>
-    /// پیام خطاهای کارفرما
-    /// </summary>
-    public string EmployerWarningMessage { get; set; }
-
-    /// <summary>
-    /// آیا کارگاه پرسنل دارد
-    /// </summary>
-    public bool HavingPersonel { get; set; }
-
-    /// <summary>
-    ///  آی دی کارگاه
-    /// </summary>
-    public long WorkshopId  { get; set; }
-
-    /// <summary>
-    /// کد بایگانی کارگاه
-    /// </summary>
-    public string ArchiveCode  { get; set; }
-    /// <summary>
-    /// آدرس کارگاه
-    /// </summary>
-    public string WAddress1  { get; set; }
-
-    /// <summary>
-    /// آی دی کارفرما
-    /// </summary>
-    public long EmployerId { get; set; }
-
-    /// <summary>
-    /// سلکت لیست پرسنل
-    /// </summary>
-    public SelectList EmployeeSelectList { get; set; }
-
-    /// <summary>
-    /// لیست پرسنل
-    /// </summary>
-    public List<AutoExtensionEmployeeListDto> EmployeeList { get; set; }
-
-    /// <summary>
-    /// آیا مجاز به ایجاد قراداد است؟
-    /// </summary>
-    public bool CreateContract { get; set; }
-
- 
-
-}

CompanyManagment.App.Contracts/Workshop/DTOs/AutoExtensionEmployeeListDto.cs

@@ -1,38 +0,0 @@
-namespace CompanyManagment.App.Contracts.Workshop.DTOs;
-
-public class AutoExtensionEmployeeListDto
-{
-    /// <summary>
-    /// آی دی پرسنل
-    /// </summary>
-    public long EmployeeId  { get; set; }
-    /// <summary>
-    /// نام کامل پرسنل
-    /// </summary>
-    public string EmployeeName  { get; set; }
-
-    /// <summary>
-    /// کد پرسنلی
-    /// </summary>
-    public long PersonnelCode { get; set; }
-
-    /// <summary>
-    /// سمت
-    /// </summary>
-    public string JobType  { get; set; }
-
-    /// <summary>
-    /// آی دی شغل
-    /// </summary>
-    public long JobTypeId  { get; set; }
-
-    /// <summary>
-    /// آیا پرسنل اجازه ایجاد قرارداد دارد
-    /// </summary>
-    public bool EmployeeHasCreateContract { get; set; }
-
-
-    public string ContarctStart { get; set; }
-    public string ContractEnd { get; set; }
-
-}

CompanyManagment.App.Contracts/Workshop/WorkshopViewModel.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using _0_Framework.Application;
 using CompanyManagment.App.Contracts.Employee;
 using CompanyManagment.App.Contracts.Employer;
 using CompanyManagment.App.Contracts.LeftWork;
@@ -81,31 +80,5 @@ public class WorkshopViewModel
 
     public string HasRollCallFreeVip { get; set; }
 
-	#endregion
-
-
-	/// <summary>
-	/// ایجاد قرارداد
-	/// </summary>
-	public bool CreateContract { get; set; }
-	/// <summary>
-	/// امضاء قراداد
-	/// </summary>
-	public bool SignContract { get; set; }
-	/// <summary>
-	/// ایجات تصفیه حساب
-	/// </summary>
-	public bool CreateCheckout { get; set; }
-	/// <summary>
-	/// امضاء تصفیه حساب
-	/// </summary>
-	public bool SignCheckout { get; set; }
-
-	/// <summary>
-	/// اگر قرارداد بیش از یک ماه باشد و  گزینه انتخاب شده منتهی به پایان سال باشد
-	/// این آیتم
-	/// True
-	/// است
-	/// </summary>
-	public IsActive CutContractEndOfYear { get; set; }
+    #endregion
 }

CompanyManagment.App.Contracts/YearlySalary/IYearlySalaryApplication.cs

@@ -25,5 +25,4 @@ public interface IYearlySalaryApplication
     InsuranceYearlySalaryModel GetInsuranceItems(DateTime startDate, DateTime endDate, string year);
 
     #endregion
-
 }

CompanyManagment.Application/AndroidApkVersionApplication.cs

@@ -48,9 +48,9 @@ public class AndroidApkVersionApplication : IAndroidApkVersionApplication
 
         Directory.CreateDirectory(path);
 
-        //var apk = new ApkReader.ApkReader().Read(file.OpenReadStream());
+        var apk = new ApkReader.ApkReader().Read(file.OpenReadStream());
 
-        string uniqueFileName = $"{Path.GetFileNameWithoutExtension(file.FileName)}{Path.GetExtension(file.FileName)}";
+        string uniqueFileName = $"{Path.GetFileNameWithoutExtension(file.FileName)}.v{apk.VersionName}{Path.GetExtension(file.FileName)}";
 
 
         string filepath = Path.Combine(path, uniqueFileName);
@@ -60,7 +60,7 @@ public class AndroidApkVersionApplication : IAndroidApkVersionApplication
             await file.CopyToAsync(stream);
         }
 
-        var entity = new AndroidApkVersion("0", "0", IsActive.True, filepath);
+        var entity = new AndroidApkVersion(apk.VersionName, apk.VersionCode, IsActive.True, filepath);
         _androidApkVersionRepository.Create(entity);
         _androidApkVersionRepository.SaveChanges();
         return op.Succcedded();

CompanyManagment.Application/ContractApplication.cs

@@ -12,7 +12,6 @@ using Company.Domain.YearlySalaryAgg;
 using Company.Domain.YearlySalaryItemsAgg;
 using CompanyManagment.App.Contracts.Contract;
 using CompanyManagment.App.Contracts.Employee;
-using CompanyManagment.App.Contracts.EmployeeComputeOptions;
 using CompanyManagment.App.Contracts.Employer;
 using CompanyManagment.App.Contracts.LeftWork;
 using CompanyManagment.App.Contracts.PersonalContractingParty;
@@ -40,7 +39,6 @@ public class ContractApplication : IContractApplication
     private readonly IPersonnelCodeRepository _personnelCodeRepository;
     private readonly IWorkingHoursTempApplication _workingHoursTempApplication;
     private readonly IPersonalContractingPartyApp _contractingPartyApp;
-    private readonly IEmployeeComputeOptionsApplication _employeeComputeOptionsApplication;
 
     public List<EmployerViewModel> EmpList;
 
@@ -56,7 +54,7 @@ public class ContractApplication : IContractApplication
         IYearlySalaryRepository yearlySalaryRepository,
         IYearlySalaryItemRepository yearlySalaryItemRepository
         , IEmployeeApplication employeeApplication, IEmployerApplication employerApplication, IWorkshopApplication workshopApplication, IEmployerRepository employerRepository,
-        IWorkingHoursApplication workingHoursApplication, IWorkingHoursItemsApplication workingHoursItemsApplication, ILeftWorkRepository leftWorkRepository, IPersonnelCodeRepository personnelCodeRepository, IWorkingHoursTempApplication workingHoursTempApplication, IPersonalContractingPartyApp contractingPartyApp, IEmployeeComputeOptionsApplication employeeComputeOptionsApplication)
+        IWorkingHoursApplication workingHoursApplication, IWorkingHoursItemsApplication workingHoursItemsApplication, ILeftWorkRepository leftWorkRepository, IPersonnelCodeRepository personnelCodeRepository, IWorkingHoursTempApplication workingHoursTempApplication, IPersonalContractingPartyApp contractingPartyApp)
     {
         _contractRepository = contractRepository;
         _holidayItemRepository = holidayItemRepository;
@@ -72,7 +70,6 @@ public class ContractApplication : IContractApplication
         _personnelCodeRepository = personnelCodeRepository;
         _workingHoursTempApplication = workingHoursTempApplication;
         _contractingPartyApp = contractingPartyApp;
-        _employeeComputeOptionsApplication = employeeComputeOptionsApplication;
 
         //_leftWorkApplication = leftWorkApplication;
     }
@@ -3158,7 +3155,7 @@ public class ContractApplication : IContractApplication
             EmployeeFName = x.EmployeeFName,
             EmployeeLName = x.EmployeeLName,
             IsBlockCantracingParty = _contractingPartyApp.IsBlockByEmployerId(x.EmployerId),
-            HasSignContract = _employeeComputeOptionsApplication.GetEmployeeOptions(x.WorkshopIds,x.EmployeeId).SignContract
+
 
         }).ToList();
 

CompanyManagment.Application/EmployeeAplication.cs

@@ -1,35 +1,38 @@
-using System;
-using System.IO;
-using System.Collections.Generic;
+using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using Company.Domain.EmployeeAgg;
-using CompanyManagment.App.Contracts.Employee;
-using CompanyManagment.EFCore;
-using _0_Framework.Application;
-using CompanyManagment.App.Contracts.EmployeeInsuranceRecord;
-using Company.Domain.EmployeeInsuranceRecordAgg;
+using Company.Domain.LeftWorkAgg;
 using Company.Domain.WorkshopAgg;
+using CompanyManagment.App.Contracts.Employee;
+using CompanyManagment.App.Contracts.EmployeeInsuranceRecord;
+using CompanyManagment.EFCore;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Transactions;
+using Company.Domain.EmployeeClientTempAgg;
 using Company.Domain.PersonnelCodeAgg;
+using EmployeeInsuranceRecord = Company.Domain.EmployeeInsuranceRecordAgg.EmployeeInsuranceRecord;
+using Microsoft.AspNetCore.Hosting;
+using System.IO;
+using _0_Framework.Application.UID;
+using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg;
+using Company.Domain.CustomizeWorkshopGroupSettingsAgg;
+using Company.Domain.EmployeeDocumentsAgg;
+using Company.Domain.LeftWorkTempAgg;
+using Company.Domain.RollCallEmployeeAgg;
 using CompanyManagment.App.Contracts.CustomizeWorkshopSettings;
 using CompanyManagment.App.Contracts.EmployeeBankInformation;
 using CompanyManagment.App.Contracts.EmployeeDocuments;
 using CompanyManagment.App.Contracts.RollCallEmployeeStatus;
-using Microsoft.AspNetCore.Hosting;
-using System.IO;
-using System.Transactions;
-using Company.Domain.EmployeeClientTempAgg;
-using Company.Domain.LeftWorkTempAgg;
-using CompanyManagment.App.Contracts.LeftWorkTemp;
-using _0_Framework.Application.UID;
-using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg;
-using Company.Domain.EmployeeDocumentsAgg;
-using Company.Domain.RollCallEmployeeAgg;
-using Company.Domain.CustomizeWorkshopGroupSettingsAgg;
-using Company.Domain.LeftWorkAgg;
+using RollCallEmployee = Company.Domain.RollCallEmployeeAgg.RollCallEmployee;
 using CompanyManagment.App.Contracts.Employee.DTO;
+using CompanyManagment.App.Contracts.LeftWorkTemp;
+using System.Reflection;
 using Company.Domain.EmployeeAuthorizeTempAgg;
+using Company.Domain.RollCallServiceAgg;
+using Microsoft.Extensions.Configuration;
 using Company.Domain.LeftWorkInsuranceAgg;
 
 namespace CompanyManagment.Application;
@@ -38,6 +41,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 {
     private readonly IEmployeeRepository _EmployeeRepository;
     private readonly IWorkshopRepository _WorkShopRepository;
+    private readonly ILeftWorkRepository _leftWorkRepository;
+    private readonly IPersonnelCodeRepository _personnelCodeRepository;
+    private readonly IEmployeeClientTempRepository _employeeClientTempRepository;
     private readonly CompanyContext _context;
     public bool nationalCodValid = false;
     public bool idnumberIsOk = true;
@@ -55,17 +61,32 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
     private readonly ILeftWorkTempRepository _leftWorkTempRepository;
     private readonly IUidService _uidService;
     private readonly ICustomizeWorkshopEmployeeSettingsRepository _customizeWorkshopEmployeeSettingsRepository;
-    private readonly ILeftWorkRepository _leftWorkRepository;
-    private readonly IPersonnelCodeRepository _personnelCodeRepository;
-    private readonly IEmployeeClientTempRepository _employeeClientTempRepository;
-    private readonly ICustomizeWorkshopGroupSettingsRepository _customizeWorkshopGroupSettingsRepository;
     private readonly IEmployeeAuthorizeTempRepository _employeeAuthorizeTempRepository;
-    private readonly ILeftWorkInsuranceRepository _leftWorkInsuranceRepository;
+    private readonly ILeftWorkInsuranceRepository _leftWorkInsuranceRepository ;
+    private readonly IRollCallServiceRepository _rollCallServiceRepository;
 
-    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)
+    public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context,
+        IWorkshopRepository workShopRepository,
+        ILeftWorkRepository leftWorkRepository, IPersonnelCodeRepository personnelCodeRepository,
+        IEmployeeClientTempRepository employeeClientTempRepository, IWebHostEnvironment webHostEnvironment,
+        IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication,
+        IRollCallEmployeeRepository rollCallEmployeeRepository,
+        ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository,
+        ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication,
+        IEmployeeDocumentsApplication employeeDocumentsApplication,
+        IEmployeeBankInformationApplication employeeBankInformationApplication,
+        ILeftWorkTempRepository leftWorkTempRepository,
+        IUidService uidService,
+        ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository,
+        IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository,
+        IRollCallServiceRepository rollCallServiceRepository, ILeftWorkInsuranceRepository leftWorkInsuranceRepository) : base(context)
     {
         _context = context;
         _WorkShopRepository = workShopRepository;
+        _EmployeeRepository = employeeRepository;
+        this._leftWorkRepository = leftWorkRepository;  
+        _personnelCodeRepository = personnelCodeRepository;
+        _employeeClientTempRepository = employeeClientTempRepository;
         _webHostEnvironment = webHostEnvironment;
         _rollCallEmployeeStatusApplication = rollCallEmployeeStatusApplication;
         _rollCallEmployeeRepository = rollCallEmployeeRepository;
@@ -75,19 +96,17 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         _leftWorkTempRepository = leftWorkTempRepository;
         _uidService = uidService;
         _customizeWorkshopEmployeeSettingsRepository = customizeWorkshopEmployeeSettingsRepository;
-        _personnelCodeRepository = personnelCodeRepository;
-        _employeeClientTempRepository = employeeClientTempRepository;
-        _leftWorkRepository = leftWorkRepository;
         _employeeAuthorizeTempRepository = employeeAuthorizeTempRepository;
         _leftWorkInsuranceRepository = leftWorkInsuranceRepository;
         _EmployeeRepository = employeeRepository;
+        _rollCallServiceRepository = rollCallServiceRepository;
     }
 
     public OperationResult Create(CreateEmployee command)
     {
         var opration = new OperationResult();
         if (_EmployeeRepository.Exists(x =>
-                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.NationalCode != null && x.IsActiveString == "true"))
+                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.NationalCode != null))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
 
         //if (_EmployeeRepository.Exists(x => x.IdNumber == command.IdNumber && x.IdNumber !=null))
@@ -144,8 +163,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 {
                     case "0000000000":
                     case "1111111111":
-                    case "22222222222":
-                    case "33333333333":
+                    case "2222222222":
+                    case "3333333333":
                     case "4444444444":
                     case "5555555555":
                     case "6666666666":
@@ -200,7 +219,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
 
 
-
         string initial = "1300/10/11";
         var dateOfBirth = command.DateOfBirth != null ? command.DateOfBirth.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
         var dateOfIssue = command.DateOfIssue != null ? command.DateOfIssue.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
@@ -228,6 +246,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
     }
 
+
     public OperationResult Edit(EditEmployee command)
     {
         var opration = new OperationResult();
@@ -236,7 +255,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             return opration.Failed("رکورد مورد نظر یافت نشد");
 
         if (_EmployeeRepository.Exists(x =>
-                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.id != command.Id && x.IsActiveString == "true"))
+                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.id != command.Id))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
         //if (_EmployeeRepository.Exists(x => x.IdNumber == command.IdNumber && x.IdNumber != null && x.id != command.Id))
         //    return opration.Failed("شماره شناسنامه وارد شده تکراری است");
@@ -278,8 +297,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 {
                     case "0000000000":
                     case "1111111111":
-                    case "22222222222":
-                    case "33333333333":
+                    case "2222222222":
+                    case "3333333333":
                     case "4444444444":
                     case "5555555555":
                     case "6666666666":
@@ -361,6 +380,11 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         return _EmployeeRepository.GetDetails(id);
     }
 
+    public EditEmployee GetDetailsIgnoreQueryFilter(long id)
+    {
+        return _EmployeeRepository.GetDetails(id);
+    }
+
     public OperationResult Active(long id)
     {
         var opration = new OperationResult();
@@ -691,8 +715,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 {
                     case "0000000000":
                     case "1111111111":
-                    case "22222222222":
-                    case "33333333333":
+                    case "2222222222":
+                    case "3333333333":
                     case "4444444444":
                     case "5555555555":
                     case "6666666666":
@@ -821,8 +845,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 {
                     case "0000000000":
                     case "1111111111":
-                    case "22222222222":
-                    case "33333333333":
+                    case "2222222222":
+                    case "3333333333":
                     case "4444444444":
                     case "5555555555":
                     case "6666666666":
@@ -902,11 +926,17 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         return res;
     }
+
     #endregion
 
-
     #region Pooya
 
+
+    public List<EmployeeViewModel> GetWorkingEmployeesByWorkshopId(long workshopId)
+    {
+        return _EmployeeRepository.GetWorkingEmployeesByWorkshopId(workshopId);
+    }
+
     public EmployeeViewModel GetEmployeeByNationalCodeIfHasActiveLeftWork(string nationalCode, List<long> workshopIds)
     {
         if (nationalCode.NationalCodeValid() != "valid")
@@ -914,7 +944,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         var workshopEmployeesWithLeftWork = _EmployeeRepository.GetWorkingEmployeesByWorkshopIdsAndNationalCodeAndDate(workshopIds, nationalCode, DateTime.Now.Date);
         return workshopEmployeesWithLeftWork.FirstOrDefault();
     }
-
     public EmployeeViewModel GetEmployeeByNationalCodeIfHasLeftWork(string nationalCode, List<long> workshopIds)
     {
         if (nationalCode.NationalCodeValid() != "valid")
@@ -922,11 +951,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         var workshopEmployeesWithLeftWork = _EmployeeRepository.GetWorkedEmployeesByWorkshopIdsAndNationalCodeAndDate(workshopIds, nationalCode, DateTime.Now.Date);
         return workshopEmployeesWithLeftWork.FirstOrDefault();
     }
-    public List<EmployeeViewModel> GetWorkingEmployeesByWorkshopId(long workshopId)
-    {
-        return _EmployeeRepository.GetWorkingEmployeesByWorkshopId(workshopId);
 
-    }
+
 
     public List<EmployeeViewModel> GetRangeByIds(IEnumerable<long> employeeIds)
     {
@@ -962,6 +988,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         }).ToList();
     }
 
+
     #endregion
 
     #region Mahan
@@ -997,22 +1024,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         //    return op.Failed("این پرسنل قبلا افزوده شده است و در انتظار تایید میباشد");
         //}
 
-
         var employee = _EmployeeRepository.GetByNationalCodeIgnoreQueryFilter(command.NationalCode);
-
         var workshop = _WorkShopRepository.GetDetails(command.WorkshopId);
-
-        if (employee == null && command.CanceledAuthorize)
-        {
-            var birthDate = command.BirthDate.ToGeorgianDateTime();
-            var dateOfIssue = new DateTime(1922, 1, 1);
-
-            employee = new Employee(command.FirstName, command.LastName, null, birthDate,
-                dateOfIssue, null, command.NationalCode, null, command.Gender, "ایرانی", null, null);
-            _EmployeeRepository.Create(employee);
-            _EmployeeRepository.SaveChanges();
-
-        }
         if (employee == null)
         {
             return op.Failed("خطای سیستمی. لطفا دوباره تلاش کنید . درصورت تکرار این مشکل با تیم پشتیبان تماس بگیرید");
@@ -1027,9 +1040,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         var startLeftWork = command.StartLeftWork.ToGeorgianDateTime();
 
         var leftWorkViewModel = _leftWorkRepository.GetLastLeftWorkByEmployeeIdAndWorkshopId(command.WorkshopId, employee.id);
+       
 
-
-        PersonnelCodeDomain personnelCode = null;
+		PersonnelCodeDomain personnelCode = null;
         if (leftWorkViewModel != null)
         {
             if (leftWorkViewModel.HasLeft == false && leftWorkViewModel.LeftWorkDate > DateTime.Now)
@@ -1044,16 +1057,16 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         }
         else
         {
-            var insuranceLeftWork =
-                _leftWorkInsuranceRepository.GetLastLeftWorkByEmployeeIdAndWorkshopId(command.WorkshopId, employee.id);
-            if (insuranceLeftWork == null)
-            {
-                var lastPersonnelCodeByWorkshop =
-                    _personnelCodeRepository.GetLastPersonnelCodeByWorkshop(command.WorkshopId);
+	        var insuranceLeftWork =
+		        _leftWorkInsuranceRepository.GetLastLeftWorkByEmployeeIdAndWorkshopId(command.WorkshopId, employee.id);
+	        if (insuranceLeftWork == null)
+	        {
+		        var lastPersonnelCodeByWorkshop =
+			        _personnelCodeRepository.GetLastPersonnelCodeByWorkshop(command.WorkshopId);
 
-                personnelCode = new PersonnelCodeDomain(command.WorkshopId,
-                    employee.id, lastPersonnelCodeByWorkshop + 1);
-            }
+		        personnelCode = new PersonnelCodeDomain(command.WorkshopId,
+			        employee.id, lastPersonnelCodeByWorkshop + 1);
+	        }
         }
 
         var leftWorkTemp = LeftWorkTemp.CreateStartWork(command.WorkshopId, employee.id, startLeftWork, command.JobId);
@@ -1067,10 +1080,10 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             _personnelCodeRepository.SaveChanges();
         }
 
+        var rollCallService = _rollCallServiceRepository.GetActiveServiceByWorkshopId(command.WorkshopId);
 
-        if ((string.IsNullOrWhiteSpace(command.RollCallUploadEmployeePicture?.Picture1) == false &&
-             string.IsNullOrWhiteSpace(command.RollCallUploadEmployeePicture?.Picture2) == false) &&
-            command.CreateCustomizeEmployeeSettings.GroupId > 0)
+        if (string.IsNullOrWhiteSpace(command.RollCallUploadEmployeePicture?.Picture1) == false &&
+            string.IsNullOrWhiteSpace(command.RollCallUploadEmployeePicture?.Picture2) == false)
         {
             var directoryPath = $"{_webHostEnvironment.ContentRootPath}\\Faces\\{command.WorkshopId}\\{employee.id}";
             if (!Directory.Exists(directoryPath))
@@ -1117,11 +1130,20 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
             if (command.CreateCustomizeEmployeeSettings.GroupId > 0)
             {
+                if (rollCallService?.HasCustomizeCheckoutService == "true")
+                {
+                    var employeeSalary = command.CreateCustomizeEmployeeSettings.Salary?.MoneyToDouble() ?? 0;
+
+                    if (employeeSalary < 1)
+                    {
+                        return op.Failed("لطفا حقوق پرسنل را وارد کنید");
+                    }
+
+                }
                 if (_customizeWorkshopEmployeeSettingsRepository
                     .Exists(x => x.WorkshopId == workshop.Id && x.EmployeeId == employee.id))
                 {
-                    _customizeWorkshopEmployeeSettingsRepository.RemoveByWorkshopIdAndEmployeeId(workshop.Id,
-                        employee.id);
+                    _customizeWorkshopEmployeeSettingsRepository.RemoveByWorkshopIdAndEmployeeId(workshop.Id, employee.id);
                 }
 
                 command.CreateCustomizeEmployeeSettings.EmployeeIds = [employee.id];
@@ -1143,52 +1165,59 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 }
             }
         }
-        else if (command.CreateCustomizeEmployeeSettings.GroupId > 0 ||
-                 (string.IsNullOrWhiteSpace(command.RollCallUploadEmployeePicture?.Picture1) == false &&
-                  string.IsNullOrWhiteSpace(command.RollCallUploadEmployeePicture?.Picture2) == false))
+        else if (command.CreateCustomizeEmployeeSettings.GroupId > 0)
         {
-            return op.Failed("برای استفاده از حضورغیاب، تب گروهبندی و آپلودعکس را تکمیل کنید");
-            //if (_customizeWorkshopEmployeeSettingsRepository
-            //    .Exists(x => x.WorkshopId == workshop.Id && x.EmployeeId == employee.id))
-            //{
-            //    _customizeWorkshopEmployeeSettingsRepository.RemoveByWorkshopIdAndEmployeeId(workshop.Id, employee.id);
-            //}
+            if (rollCallService?.HasCustomizeCheckoutService == "true")
+            {
+                var employeeSalary = command.CreateCustomizeEmployeeSettings.Salary?.MoneyToDouble() ?? 0;
 
-            //command.CreateCustomizeEmployeeSettings.EmployeeIds = [employee.id];
-            //command.CreateCustomizeEmployeeSettings.WorkshopId = command.WorkshopId;
-            //var resultCreateEmployeeSettings =
-            //    _customizeWorkshopSettingsApplication.CreateEmployeesSettingsAndSetChanges(
-            //        command.CreateCustomizeEmployeeSettings);
-            //if (resultCreateEmployeeSettings.IsSuccedded == false)
-            //{
-            //    return resultCreateEmployeeSettings;
-            //}
+                if (employeeSalary < 1)
+                {
+                    return op.Failed("لطفا حقوق پرسنل را وارد کنید");
+                }
+
+            }
+            if (_customizeWorkshopEmployeeSettingsRepository
+                .Exists(x => x.WorkshopId == workshop.Id && x.EmployeeId == employee.id))
+            {
+                _customizeWorkshopEmployeeSettingsRepository.RemoveByWorkshopIdAndEmployeeId(workshop.Id, employee.id);
+            }
+
+            command.CreateCustomizeEmployeeSettings.EmployeeIds = [employee.id];
+            command.CreateCustomizeEmployeeSettings.WorkshopId = command.WorkshopId;
+            var resultCreateEmployeeSettings =
+                _customizeWorkshopSettingsApplication.CreateEmployeesSettingsAndSetChanges(
+                    command.CreateCustomizeEmployeeSettings);
+            if (resultCreateEmployeeSettings.IsSuccedded == false)
+            {
+                return resultCreateEmployeeSettings;
+            }
 
 
-            //var rollCallEmployee =
-            //    _rollCallEmployeeRepository.GetBy(employee.id, command.WorkshopId);
+            var rollCallEmployee =
+                _rollCallEmployeeRepository.GetBy(employee.id, command.WorkshopId);
 
-            //if (rollCallEmployee == null)
-            //{
-            //    if (_employeeClientTempRepository.Exists(x =>
-            //            x.EmployeeId == employee.id && x.WorkshopId == command.WorkshopId))
-            //    {
+            if (rollCallEmployee == null)
+            {
+                if (_employeeClientTempRepository.Exists(x =>
+                        x.EmployeeId == employee.id && x.WorkshopId == command.WorkshopId))
+                {
 
-            //        rollCallEmployee = new RollCallEmployee(command.WorkshopId, employee.id, employee.FName,
-            //            employee.LName);
-            //    }
-            //    else
-            //    {
-            //        rollCallEmployee =
-            //            new RollCallEmployee(command.WorkshopId, employee.id, employee.FName, employee.LName);
-            //    }
-            //    _rollCallEmployeeRepository.Create(rollCallEmployee);
-            //    _rollCallEmployeeRepository.SaveChanges();
+                    rollCallEmployee = new RollCallEmployee(command.WorkshopId, employee.id, employee.FName,
+                        employee.LName);
+                }
+                else
+                {
+                    rollCallEmployee =
+                        new RollCallEmployee(command.WorkshopId, employee.id, employee.FName, employee.LName);
+                }
+                _rollCallEmployeeRepository.Create(rollCallEmployee);
+                _rollCallEmployeeRepository.SaveChanges();
 
+            }
         }
 
 
-
         command.EmployeeDocumentItems = command.EmployeeDocumentItems ?? [];
 
         var employeeDocumentResult = _employeeDocumentsApplication.AddRangeEmployeeDocumentItemsByClient(command.WorkshopId,
@@ -1241,6 +1270,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         byte[] bytes = Convert.FromBase64String(subBase64);
         System.IO.File.WriteAllBytes(filePath, bytes);
     }
+
     public async Task<OperationResult<EmployeeByNationalCodeInWorkshopViewModel>>
         ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(string nationalCode, string birthDate, long workshopId)
     {
@@ -1261,11 +1291,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         if (employee == null)
         {
             var personalInfo = await _uidService.GetPersonalInfo(nationalCode, birthDate);
-
-            if (personalInfo.ResponseContext.Status.Code == 14)
-            {
-                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید", new EmployeeByNationalCodeInWorkshopViewModel() { AuthorizedCanceled = true });
-            }
             if (personalInfo.ResponseContext.Status.Code != 0)
             {
                 return op.Failed("کد ملی و تاریخ تولد با هم همخانی ندارند");
@@ -1564,11 +1589,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             if (employee.IsAuthorized == false)
             {
                 var apiResult = await _uidService.GetPersonalInfo(nationalCode, birthDate);
-                if (apiResult.ResponseContext.Status.Code == 14)
-                {
-                    return op.Failed("این پرسنل در بانک اطلاعات موجود میباشد");
 
-                }
                 if (apiResult.ResponseContext.Status.Code != 0)
                 {
                     return op.Failed("کد ملی و تاریخ تولد با هم همخانی ندارند");
@@ -1624,16 +1645,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 return op.Succcedded(data);
             }
             var apiResult = await _uidService.GetPersonalInfo(nationalCode, birthDate);
-            if (apiResult.ResponseContext.Status.Code == 14)
-            {
-                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید", new EmployeeDataFromApiViewModel() { AuthorizedCanceled = true });
 
-            }
-
-            if (apiResult.ResponseContext.Status.Code == 3)
-            {
-                return op.Failed("کد ملی نامعتبر است");
-            }
             if (apiResult.ResponseContext.Status.Code != 0)
             {
                 return op.Failed("کد ملی و تاریخ تولد با هم همخانی ندارند");
@@ -1664,20 +1676,5 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
     }
 
-
-    #endregion
-
-    #region Api
-
-    public async Task<List<EmployeeSelectListViewModel>> GetSelectList(string searchText)
-    {
-        return await _EmployeeRepository.GetSelectList(searchText);
-    }
-
-    public async Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel)
-    {
-        return await _EmployeeRepository.GetList(searchModel);
-    }
-
     #endregion
 }

CompanyManagment.Application/EmployeeComputeOptionsApplication.cs

@@ -21,54 +21,41 @@ public class EmployeeComputeOptionsApplication : IEmployeeComputeOptionsApplicat
 
     public OperationResult Create(CreateEmployeeComputeOptions command)
     {
-
-	    var opration = new OperationResult();
-        if (command.CreateContract && command.ContractTerm != "1" && command.CutContractEndOfYear == IsActive.None)
-            return opration.Failed("لطفا تعیین کنید که قراداد منتهی به پایان سال یاشد یا نباشد");
-
-        if (command.ContractTerm == "1")
-            command.CutContractEndOfYear = IsActive.None;
-
-
+        var opration = new OperationResult();
         try
-	    {
-		    if (_employeeComputeOptionsRepository.Exists(x =>
-			        x.EmployeeId == command.EmployeeId && x.WorkshopId == command.WorkshopId))
-		    {
-			    var query = GetEmployeeOptions(command.WorkshopId, command.EmployeeId);
-			    var editOptions = _employeeComputeOptionsRepository.Get(query.Id);
-
-			    editOptions.Edit(command.ComputeOptions, command.BonusesOptions, command.YearsOptions,
-				    command.CreateContract, command.SignContract, command.CreateCheckout, command.SignCheckout, command.ContractTerm, command.CutContractEndOfYear);
-
-			    _employeeComputeOptionsRepository.SaveChanges();
-			    return opration.Succcedded();
-		    }
-		    else
-		    {
-			    var createOptions = new EmployeeComputeOptions(command.WorkshopId, command.EmployeeId,
-				    command.ComputeOptions, command.BonusesOptions, command.YearsOptions, command.CreateContract,
-				    command.SignContract, command.CreateCheckout, command.SignCheckout, command.ContractTerm, command.CutContractEndOfYear);
-
-			    _employeeComputeOptionsRepository.Create(createOptions);
-			    _employeeComputeOptionsRepository.SaveChanges();
-			    return opration.Succcedded();
-		    }
-	    }
-	    catch (Exception a)
-	    {
-		    return opration.Failed("ثبت با خطا مواجه شد");
-	    }
-
+        {
+            if (_employeeComputeOptionsRepository.Exists(x =>
+                    x.EmployeeId == command.EmployeeId && x.WorkshopId == command.WorkshopId))
+            {
+                var query = GetEmployeeOptions(command.WorkshopId, command.EmployeeId);
+                var editOptions = _employeeComputeOptionsRepository.Get(query.Id);
+                editOptions.Edit(command.ComputeOptions, command.BonusesOptions, command.YearsOptions);
+                _employeeComputeOptionsRepository.SaveChanges();
+                return opration.Succcedded();
+            }
+            else
+            {
+                var createOptions = new EmployeeComputeOptions(command.WorkshopId, command.EmployeeId,
+                    command.ComputeOptions, command.BonusesOptions, command.YearsOptions);
+                _employeeComputeOptionsRepository.Create(createOptions);
+                _employeeComputeOptionsRepository.SaveChanges();
+                return opration.Succcedded();
+            }
+        }
+        catch (Exception a)
+        {
+            return opration.Failed("ثبت با خطا مواجه شد");
+        }
+           
     }
 
     public EmployeeComputeOptionsViewModel GetEmployeeOptions(long workshopId, long employeeId)
     {
-	    return _employeeComputeOptionsRepository.GetEmployeeOptions(workshopId, employeeId);
+        return _employeeComputeOptionsRepository.GetEmployeeOptions(workshopId, employeeId);
     }
 
     public List<EmployeeComputeOptionsViewModel> GetAllByWorkshopId(long workshopId)
     {
-	    return _employeeComputeOptionsRepository.GetAllByWorkshopId(workshopId);
+        return _employeeComputeOptionsRepository.GetAllByWorkshopId(workshopId);
     }
 }

CompanyManagment.Application/EmployerApplication.cs

@@ -240,7 +240,7 @@ public class EmployerApplication : IEmployerApplication
         return opration.Succcedded();
     }
 
-    public OperationResult Remove_Old(long id)
+    public OperationResult Remove(long id)
     {
         var opration = new OperationResult();
 
@@ -895,10 +895,10 @@ public class EmployerApplication : IEmployerApplication
         return _EmployerRepository.GetEmployersHasWorkshop();
     }
 
-    //public async Task<List<EmployerSelectListViewModel>> GetSelectList(string search)
-    //{
-    //    return await _EmployerRepository.GetSelectList(search);
-    //}
+    public async Task<List<EmployerSelectListViewModel>> GetSelectList(string search)
+    {
+        return await _EmployerRepository.GetSelectList(search);
+    }
     #endregion
 
     #region NewByHeydari
@@ -958,7 +958,6 @@ public class EmployerApplication : IEmployerApplication
 	}
 
 	#endregion
-
 	#region Api
 	public async Task<List<GetEmployerListViewModel>> GetEmployerList(GetEmployerSearchModel searchModel)
 	{
@@ -972,6 +971,7 @@ public class EmployerApplication : IEmployerApplication
 			throw new NotFoundException("کارفرمای مورد نطر یافت نشد");
 		}
 		return employer;
+
 	}
 
 	public async Task<GetRealEmployerDetailViewModel> GetRealEmployerDetail(long id)
@@ -1185,12 +1185,12 @@ public class EmployerApplication : IEmployerApplication
 		return opration.Succcedded();
 	}
 
-	public async Task<List<EmployerSelectListViewModel>> GetSelectList(string search)
-	{
-		return await _EmployerRepository.GetSelectList(search);
-	}
+	//public async Task<List<EmployerSelectListViewModel>> GetSelectList(string search)
+	//{
+	//	return await _EmployerRepository.GetSelectList(search);
+	//}
 
-	async Task<OperationResult<string>> IEmployerApplication.Remove(long id)
+	async Task<OperationResult<string>> IEmployerApplication.RemoveApi(long id)
 	{
 		var employer = _EmployerRepository.Get(id);
 		if (employer == null)
@@ -1208,5 +1208,6 @@ public class EmployerApplication : IEmployerApplication
 		return new OperationResult<string>().Succcedded("Deleted");
 
 	}
-	#endregion
+
+#endregion
 }

CompanyManagment.Application/FinancialStatmentApplication.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using _0_Framework.Application;
 using Company.Domain.FinancialStatmentAgg;
 using CompanyManagment.App.Contracts.FinancialStatment;
@@ -111,15 +110,4 @@ public class FinancialStatmentApplication : IFinancialStatmentApplication
     {
         return _financialStatmentRepository.GetDetailsByContractingPartyId(contractingPartyId);
     }
-
-    public async Task<ClientFinancialStatementViewModel> GetClientFinancialStatement(
-        ClientFinancialStatementSearchModel searchModel, long accountId)
-    {
-        return await _financialStatmentRepository.GetClientFinancialStatement(accountId, searchModel);
-    }
-
-    public async Task<double> GetClientDebtAmount(long accountId)
-    {
-        return await _financialStatmentRepository.GetClientDebtAmount(accountId);
-    }
 }

CompanyManagment.Application/LeftWorkApplication.cs

@@ -15,7 +15,6 @@ using CompanyManagment.App.Contracts.PersonnleCode;
 using CompanyManagment.App.Contracts.RollCallEmployee;
 using CompanyManagment.App.Contracts.WorkingHours;
 using CompanyManagment.App.Contracts.WorkingHoursItems;
-using CompanyManagment.App.Contracts.Workshop.DTOs;
 using PersianTools.Core;
 
 namespace CompanyManagment.Application;
@@ -601,11 +600,6 @@ public class LeftWorkApplication : ILeftWorkApplication
         return _leftWorkRepository.CheckEditLeftWork(workshopId, employeeId, date.ToGeorgianDateTime(), type);
     }
 
-    public AutoExtensionDto AutoExtentionEmployees(long workshopId)
-    {
-        return _leftWorkRepository.AutoExtentionEmployees(workshopId);
-    }
-
     #region Pooya
     //این متد ترک کار های کارمند را با فعالیت حضور غیاب یکپارچه می کند
     private void IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(long employeeId)

CompanyManagment.Application/LeftWorkTempApplication.cs

@@ -19,7 +19,6 @@ using CompanyManagment.App.Contracts.LeftWork;
 using CompanyManagment.App.Contracts.LeftWorkTemp;
 using CompanyManagment.App.Contracts.ReportClient;
 using CompanyManagment.App.Contracts.RollCallEmployee;
-using CompanyManagment.EFCore.Migrations;
 using OperationResult = _0_Framework.Application.OperationResult;
 using Tools = _0_Framework.Application.Tools;
 
@@ -175,19 +174,8 @@ public class LeftWorkTempApplication : ILeftWorkTempApplication
 
 		await _leftWorkRepository.CreateAsync(newLeftWork);
 		_leftWorkTempRepository.Remove(leftWorkTemp);
-		var rollCallEmployee = _rollCallEmployeeRepository.GetBy(leftWorkTemp.EmployeeId, leftWorkTemp.WorkshopId);
-
-		var rollCallStatus = rollCallEmployee?.EmployeesStatus.MaxBy(x => x.StartDate);
-
-		if (rollCallStatus != null)
-		{
-			var startWork = newLeftWork.StartWorkDate;
-			rollCallStatus.Edit(startWork, rollCallStatus.EndDate);
-
-		}
 		await _leftWorkRepository.SaveChangesAsync();
 		await _leftWorkTempRepository.SaveChangesAsync();
-
 		return op.Succcedded();
 	}
 

CompanyManagment.Application/PaymentTransactionApplication.cs

@@ -1,58 +0,0 @@
-using _0_Framework.Application;
-using _0_Framework.Application.PaymentGateway;
-using Company.Domain.PaymentTransactionAgg;
-using CompanyManagment.App.Contracts.PaymentTransaction;
-using Microsoft.Extensions.Options;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CompanyManagment.Application;
-
-public class PaymentTransactionApplication : IPaymentTransactionApplication
-{
-    private readonly IPaymentTransactionRepository _paymentTransactionRepository;
-    private readonly IPaymentGateway _paymentGateway;
-
-    public PaymentTransactionApplication(IPaymentTransactionRepository paymentTransactionRepository,IHttpClientFactory httpClientFactory, IOptions<AppSettingConfiguration> appSetting)
-    {
-        _paymentTransactionRepository = paymentTransactionRepository;
-        _paymentGateway = new AqayePardakhtPaymentGateway(httpClientFactory, appSetting);
-    }
-
-    public async Task<List<GetPaymentTransactionListViewModel>> GetPaymentTransactionList(
-        GetPaymentTransactionListSearchModel searchModel)
-    {
-        return await _paymentTransactionRepository.GetPaymentTransactionList(searchModel);
-    }
-
-    public async Task<OperationResult> Create(CreatePaymentTransaction command)
-    {
-        var operationResult = new OperationResult();
-        var entity = new PaymentTransaction(
-            command.ContractingPartyId,
-            command.BankAccountHolderName,
-            command.BankName,
-            command.CardNumber,
-            command.ShebaNumber,
-            command.AccountNumber,
-            command.Status,
-            command.Amount,
-            command.TransactionId,
-            command.ContractingPartyName);
-
-        await _paymentTransactionRepository.CreateAsync(entity);
-        await _paymentTransactionRepository.SaveChangesAsync();
-        return operationResult.Succcedded();
-    }
-
-    
-
-    public async Task<WalletAmountResponse> GetWalletAmount(CancellationToken cancellationToken)
-    {
-        var result = await _paymentGateway.GetWalletAmount(cancellationToken);
-        return result;
-    }
-}