change

# Conflicts:
#	CompanyManagment.EFCore/Repository/FinancialStatmentRepository.cs

.github/workflows/dotnet-developPublish.yml

@@ -0,0 +1,48 @@
+name: Deploy Development ASP.NET Core App to IIS
+
+on:
+  push:
+    branches:
+      - Main
+
+env:
+  DOTNET_ENVIRONMENT: Development
+
+jobs:
+  build-and-deploy:
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Setup .NET SDK
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '8.0.x' # یا نسخه پروژه‌ت
+
+    - name: Restore dependencies
+      run: dotnet restore
+
+    - name: Build
+      run: dotnet build --configuration Release 
+
+    - name: Publish
+      run: dotnet publish --configuration Release --output ./publish /p:EnvironmentName=Development --no-build
+
+    - name: Deploy to IIS via Web Deploy
+      shell: powershell
+      run: |
+        $publishFolder = Resolve-Path ./publish
+        & "C:\Program Files\IIS\Microsoft Web Deploy V3\msdeploy.exe" `
+          -verb:sync `
+          -source:contentPath="$publishFolder" `
+          -dest:contentPath="dadmehrg",computerName="https://171.22.24.15:8172/msdeploy.axd?site=dadmehrg",userName=".\deployuser",password="R2rNpdnetP3j>q5b18",authType="Basic" `
+          -allowUntrusted `
+          -enableRule:AppOffline
+
+
+      env:
+        SERVER_HOST: your-server-ip-or-domain
+        DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+        DEPLOY_PASSWORD: ${{ secrets.DEPLOY_PASSWORD }}

.gitignore

@@ -361,4 +361,4 @@ MigrationBackup/
 
 # # Fody - auto-generated XML schema
 # FodyWeavers.xsd
-
+.idea

0_Framework/0_Framework.csproj

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

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

0_Framework/Application/AuthHelper.cs

@@ -40,7 +40,10 @@ 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;
-		return result;
+		result.Permissions = Tools.DeserializeFromBsonList<int>(claims.FirstOrDefault(x => x is { Type: "permissions" })?.Value);
+        result.RoleName = claims.FirstOrDefault(x => x is { Type: "RoleName" })?.Value;
+        result.WorkshopId = long.Parse(claims.FirstOrDefault(x => x.Type == "WorkshopId")?.Value??"0");
+        return result;
 	}
 
 	public List<int> GetPermissions()
@@ -74,7 +77,7 @@ public class AuthHelper : IAuthHelper
 
 	#region Vafa
 
-	public void UpdateWorkshopSlugClaim(string newWorkshopSlug, string newWorkshopName)
+	public void UpdateWorkshopSlugClaim(string newWorkshopSlug, string newWorkshopName,long newWorkshopId)
 	{
 		var user = _contextAccessor.HttpContext.User;
 
@@ -83,6 +86,7 @@ public class AuthHelper : IAuthHelper
 			var claimsIdentity = (ClaimsIdentity)user.Identity;
 			var existingClaimSlug = claimsIdentity.FindFirst("WorkshopSlug");
 			var existingClaimName = claimsIdentity.FindFirst("WorkshopName");
+			var existingWorkshopId = claimsIdentity.FindFirst("WorkshopId");
 
 			if (existingClaimSlug != null)
 			{
@@ -94,9 +98,14 @@ public class AuthHelper : IAuthHelper
 				claimsIdentity.RemoveClaim(existingClaimName);
 			}
 
+			if (existingWorkshopId != null)
+			{
+				claimsIdentity.RemoveClaim(existingWorkshopId);
+			}
 
 			claimsIdentity.AddClaim(new Claim("WorkshopSlug", newWorkshopSlug));
 			claimsIdentity.AddClaim(new Claim("WorkshopName", newWorkshopName));
+			claimsIdentity.AddClaim(new Claim("WorkshopId",newWorkshopId.ToString()));
 
 
 			var authProperties = new AuthenticationProperties
@@ -126,8 +135,16 @@ public class AuthHelper : IAuthHelper
 
 		return "";
 	}
+
+
 	#endregion
 
+	public long GetWorkshopId()
+	{
+		return long.Parse(_contextAccessor.HttpContext?.User.Claims.FirstOrDefault(x => x.Type == "WorkshopId")?.Value ?? "0");
+		
+		
+	}
 
 	public string CurrentAccountRole()
 	{
@@ -180,6 +197,7 @@ public class AuthHelper : IAuthHelper
             //mahanChanges
             new("workshopList",workshopBson),
 			new("WorkshopSlug",slug),
+			new("WorkshopId", account.WorkshopId.ToString()),
 			new("WorkshopName",account.WorkshopName??"")
 
 		};

0_Framework/Application/AuthViewModel.cs

@@ -20,6 +20,7 @@ public class AuthViewModel
 
     public int? PositionValue { get; set; }
     public string WorkshopSlug { get; set; }
+    public long WorkshopId { get; set; }
     public string WorkshopName { get; set; }
 	public List<WorkshopClaim> WorkshopList { get; set; }
 

0_Framework/Application/ClassificationRangeOfGroupRate.cs

@@ -0,0 +1,237 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace _0_Framework.Application;
+
+/// <summary>
+/// دامنه امتیازات گروه های طبقه بندی مشاغل
+/// </summary>
+public static class ClassificationRangeOfGroupRate
+{
+
+    /// <summary>
+    /// دریافت فاصله امتیاز گروه
+    /// </summary>
+    /// <param name="groupNo"></param>
+    /// <returns></returns>
+    public static ClassificationGroupRate GetGroupDistanceRate(string groupNo)
+    {
+    
+        switch (groupNo)
+        {
+            case "1":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 0,
+                    HighRate = 80,
+                    DistanceRate = 0,
+                }; 
+                break;
+            case "2":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 81,
+                    HighRate = 95,
+                    DistanceRate = 15,
+                }; 
+                break;
+            case "3":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 96,
+                    HighRate = 110,
+                    DistanceRate = 30, //فاصله سقف این گروه تا سقف گروه یک
+                };
+                break;
+            case "4":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 111,
+                    HighRate = 125,
+                    DistanceRate = 45, //فاصله سقف این گروه تا سقف گروه یک
+                };
+                break;
+            case "5":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 126,
+                    HighRate = 145,
+                    DistanceRate = 65, //فاصله سقف این گروه تا سقف گروه یک
+                };
+                break;
+            case "6":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 146,
+                    HighRate = 165,
+                    DistanceRate = 85, 
+                };
+                break;
+            case "7":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 166,
+                    HighRate = 185,
+                    DistanceRate = 105,
+                };
+                break;
+            case "8":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 186,
+                    HighRate = 210,
+                    DistanceRate = 130,
+                };
+                break;
+            case "9":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 211,
+                    HighRate = 235,
+                    DistanceRate = 155,
+                };
+                break;
+            case "10":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 236,
+                    HighRate = 265,
+                    DistanceRate = 185,
+                };
+                break;
+            case "11":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 266,
+                    HighRate = 295,
+                    DistanceRate = 215,
+                };
+                break;
+            case "12":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 296,
+                    HighRate = 325,
+                    DistanceRate = 245,
+                };
+                break;
+            case "13":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 326,
+                    HighRate = 365,
+                    DistanceRate = 285,
+                };
+                break;
+            case "14":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 366,
+                    HighRate = 405,
+                    DistanceRate = 325,
+                };
+                break;
+            case "15":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 406,
+                    HighRate = 445,
+                    DistanceRate = 365,
+                };
+                break;
+            case "16":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 446,
+                    HighRate = 495,
+                    DistanceRate = 415,
+                };
+                break;
+            case "17":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 496,
+                    HighRate = 545,
+                    DistanceRate = 465,
+                };
+                break;
+            case "18":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 546,
+                    HighRate = 605,
+                    DistanceRate = 525,
+                };
+                break;
+            case "19":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 606,
+                    HighRate = 665,
+                    DistanceRate = 585,
+                };
+                break;
+            case "20":
+                return new ClassificationGroupRate()
+                {
+                    GroupNo = groupNo,
+                    LowRate = 666,
+                    HighRate = 740,
+                    DistanceRate = 660,
+                };
+                break;
+        }
+
+
+        return new ClassificationGroupRate();
+    }
+}
+
+/// <summary>
+/// دیتای امتیازات هر گرو
+/// </summary>
+public class ClassificationGroupRate
+{
+
+    /// <summary>
+    /// شمازه گروه
+    /// </summary>
+    public string GroupNo { get; set; }
+
+    /// <summary>
+    /// امتیاز کف
+    /// </summary>
+    public int LowRate { get; set; }
+
+    /// <summary>
+    /// امتیاز سقف
+    /// </summary>
+    public int HighRate { get; set; }
+
+    /// <summary>
+    /// فاصله امتیاز
+    /// </summary>
+    public int DistanceRate { get; set; }
+}

0_Framework/Application/Enums/ActivationStatus.cs

@@ -0,0 +1,8 @@
+namespace _0_Framework.Application.Enums;
+
+public enum ActivationStatus
+{
+    None = 0,
+    Active = 1,
+    DeActive = 2
+}

0_Framework/Application/Enums/LegalType.cs

@@ -0,0 +1,8 @@
+namespace _0_Framework.Application.Enums;
+
+public enum LegalType
+{
+    None = 0,
+    Real = 1,
+    Legal = 2
+}

0_Framework/Application/Enums/TypeOfCoefficient.cs

@@ -0,0 +1,14 @@
+namespace _0_Framework.Application.Enums;
+
+public enum TypeOfCoefficient
+{
+    /// <summary>
+    /// ضریب ریالی طرح
+    /// </summary>
+    RialCoefficient,
+
+    /// <summary>
+    /// ضریب ریالی اداره کار
+    /// </summary>
+    JobOrganization,
+}

0_Framework/Application/IAuthHelper.cs

@@ -17,11 +17,12 @@ public interface IAuthHelper
 
 	#region Vafa
 
-	void UpdateWorkshopSlugClaim(string workshopSlug, string workshopName);
+	void UpdateWorkshopSlugClaim(string workshopSlug, string workshopName, long workshopId);
 
 	#endregion
 	long CurrentSubAccountId();
     string GetWorkshopSlug();
     string GetWorkshopName();
+    long GetWorkshopId();
     (long Id, UserType userType, long roleId) GetUserTypeWithId();
 }

0_Framework/Application/PagedResult.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace _0_Framework.Application;
+
+
+public class PagedResult<T> where T : class
+{
+    public int TotalCount  { get; set; }
+    public List<T> List { get; set; }
+}
+public class PagedResult<T,TMeta>:PagedResult<T> where T : class
+{
+    public TMeta? Meta { get; set; }
+}

0_Framework/Application/PaginationRequest.cs

@@ -0,0 +1,7 @@
+namespace _0_Framework.Application;
+
+public class PaginationRequest
+{
+    public int PageIndex { get; set; } = 1;
+    public int PageSize { get; set; } = 30;
+}

0_Framework/Application/PaymentGateway/AqayePardakhtPaymentGateway.cs

@@ -0,0 +1,100 @@
+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 == ".dadmehrg.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 resStr = await response.Content.ReadAsStringAsync(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

@@ -0,0 +1,62 @@
+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 bool IsSuccess => Status == "success";
+}
+
+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/SelectListViewModel.cs

@@ -0,0 +1,7 @@
+namespace _0_Framework.Application;
+
+public class SelectListViewModel
+{
+    public long Id { get; set; }
+    public string Text { get; set; }
+}

0_Framework/Application/StaticWorkshopAccounts.cs

@@ -30,8 +30,9 @@ public static class StaticWorkshopAccounts
     /// 380 - افروز نظری
     /// 381 - مهدی قربانی
     /// 392 - عمار حسن دوست
+    /// 20 - سمیرا الهی نیا
     /// </summary>
-    public static List<long> StaticAccountIds = [2, 3, 380, 381, 392];
+    public static List<long> StaticAccountIds = [2, 3, 380, 381, 392, 20];
 
     /// <summary>
     /// این تاریخ در جدول اکانت لفت ورک به این معنیست

0_Framework/Application/Tools.cs

@@ -33,6 +33,35 @@ public static class Tools
     public static string[] DayNames = { "شنبه", "یکشنبه", "دو شنبه", "سه شنبه", "چهار شنبه", "پنج شنبه", "جمعه" };
     public static string[] DayNamesG = { "یکشنبه", "دو شنبه", "سه شنبه", "چهار شنبه", "پنج شنبه", "جمعه", "شنبه" };
 
+    /// <summary>
+    /// نام ستون از جدول  مزد سنوات طبثه بندی را میگیرد و دیتای داخل آن ستون را برمیگرداند
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <param name="propertyName"></param>
+    /// <returns></returns>
+    public static double? GetDynamicDouble(object obj, string propertyName)
+    {
+        if (obj == null || string.IsNullOrWhiteSpace(propertyName))
+            return null;
+
+        var propertyInfo = obj.GetType().GetProperty(propertyName);
+        if (propertyInfo == null)
+            return null;
+
+        var value = propertyInfo.GetValue(obj);
+        if (value == null)
+            return null;
+
+        try
+        {
+            return Convert.ToDouble(value);
+        }
+        catch
+        {
+            return null;
+        }
+    }
+
 
     public static bool IsMobileValid(this string mobileNo)
     {
@@ -41,6 +70,23 @@ public static class Tools
         return Regex.IsMatch(mobileNo, "^((09))(\\d{9})$");
     }
 
+    /// <summary>
+    /// تاریخ شروع و تعداد ماه را میگیرد و تاریخ پایان قراردا را بر میگرداند
+    /// </summary>
+    /// <param name="startDate"></param>
+    /// <param name="monthPlus"></param>
+    /// <returns></returns>
+    public static (DateTime endDateGr, string endDateFa) FindEndOfContract(string startDate, string monthPlus)
+    {
+
+        int startYear = Convert.ToInt32(startDate.Substring(0, 4));
+        int startMonth = Convert.ToInt32(startDate.Substring(5, 2));
+        int startDay = Convert.ToInt32(startDate.Substring(8, 2));
+        var start = new PersianDateTime(startYear, startMonth, startDay);
+        var end = (start.AddMonths(Convert.ToInt32(monthPlus))).AddDays(-1);
+        return ($"{end}".ToGeorgianDateTime(), $"{end}");
+
+    }
 
     /// <summary>
     /// دریافت روزهای کارکرد پرسنل در لیست بیمه ماه مشخص شده
@@ -460,26 +506,42 @@ public static class Tools
         string bb = string.Empty;
         bool isNegative = false;
 
-        for (int x = 0; x < myMoney.Length; x++)
+        try
         {
-            if (char.IsDigit(myMoney[x]))
+            if (!string.IsNullOrWhiteSpace(myMoney))
             {
-                bb += myMoney[x];
-            }
-            else if (myMoney[x] == '-' && bb.Length == 0)
-            {
-                // اگر علامت منفی قبل از اولین عدد آمد، در نظر بگیر
-                isNegative = true;
-            }
-        }
+                for (int x = 0; x < myMoney.Length; x++)
+                {
+                    if (char.IsDigit(myMoney[x]))
+                    {
+                        bb += myMoney[x];
+                    }
+                    else if (myMoney[x] == '-' && bb.Length == 0)
+                    {
+                        // اگر علامت منفی قبل از اولین عدد آمد، در نظر بگیر
+                        isNegative = true;
+                    }
+                }
 
-        if (bb.Length > 0)
-        {
-            double res = double.Parse(bb);
-            return isNegative ? -res : res;
+                if (bb.Length > 0)
+                {
+                    double res = double.Parse(bb);
+                    return isNegative ? -res : res;
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+            else
+            {
+                return 0;
+            }
+            
         }
-        else
+        catch (Exception)
         {
+
             return 0;
         }
     }
@@ -880,7 +942,15 @@ public static class Tools
             }
         }
 
-        numbers = Convert.ToInt32(num);
+        try
+        {
+            numbers = Convert.ToInt32(num);
+        }
+        catch (Exception e)
+        {
+            return 0;
+        }
+     
         return numbers;
     }
     public static string ToFarsiMonthByNumber(this string value)
@@ -1396,6 +1466,73 @@ 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/IUidService.cs

@@ -38,7 +38,7 @@ public class UidBasicInformation
     {
         "GENDER_MALE" => Application.Gender.Male,
         "GENDER_FEMALE" => Application.Gender.Female,
-        _ => throw new ArgumentOutOfRangeException()
+        _ => Application.Gender.None
     };
 }
 public record IdentificationInformation(string NationalId, string BirthDate, string ShenasnameSeri, string ShenasnameSerial, string ShenasnamehNumber);

0_Framework/Application/UID/UidService.cs

@@ -10,67 +10,70 @@ 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");
 
-       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();
-            }
+		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();
+			}
 
-            return responseResult;
-        }
-        catch 
-        {
+			return responseResult;
+		}
+		catch
+		{
 
-            return null;
-        }
-    }
+			return new PersonalInfoResponse(new UidBasicInformation(),
+				new IdentificationInformation(default, default, default, default, default), new RegistrationStatus(),
+				new ResponseContext(new UidStatus(14, "")));
+		}
+		
+	}
 
 
-    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,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
 using Microsoft.EntityFrameworkCore.Design.Internal;
@@ -12,8 +14,7 @@ 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,
-        FridayWork fridayWork, HolidayWork holidayWork, BreakTime breakTime,int leavePermittedDays)
+        FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, BreakTime breakTime,int leavePermittedDays,List<WeeklyOffDay> weeklyOffDays)
     {
 
         FridayPay = fridayPay;
@@ -29,10 +30,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>
@@ -117,4 +118,28 @@ 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/Domain/IRepository.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore.Storage;
 
 namespace _0_Framework.Domain;
 
@@ -17,4 +18,6 @@ public interface IRepository<TKey, T> where  T:class
     bool Exists(Expression<Func<T, bool>> expression);
     void SaveChanges();
     Task SaveChangesAsync();
+	Task<IDbContextTransaction> BeginTransactionAsync();
+    
 }

0_Framework/Exceptions/Handler/CustomExceptionHandler.cs

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

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

0_Framework/InfraStructure/QueryableExtensions.cs

@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace _0_Framework.InfraStructure;
+
+public static class QueryableExtensions
+{
+    public static IQueryable<T> ApplyPagination<T>(this IQueryable<T> query, int page, int pageSize = 30)
+    {
+        if (page <= 0) page = 1;
+        if (pageSize <= 0) pageSize = 10;
+
+        return query.Skip((page - 1) * pageSize).Take(pageSize);
+    }
+    public static IEnumerable<T> ApplyPagination<T>(this IEnumerable<T> source, int page, int pageSize = 30)
+    {
+        if (page <= 0) page = 1;
+        if (pageSize <= 0) pageSize = 10;
+
+        return source.Skip((page - 1) * pageSize).Take(pageSize);
+    }
+}

0_Framework/InfraStructure/RepositoryBase.cs

@@ -6,6 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using _0_Framework.Domain;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Storage;
 
 namespace _0_Framework.InfraStructure
 {
@@ -70,5 +71,10 @@ namespace _0_Framework.InfraStructure
         {
             await _context.SaveChangesAsync();
         }
+
+        public async Task<IDbContextTransaction> BeginTransactionAsync()
+        {
+            return await _context.Database.BeginTransactionAsync();
+        }
     }
 }

AccountManagement.Application/AccountApplication.cs

@@ -259,7 +259,8 @@ public class AccountApplication : IAccountApplication
 					var workshop = workshopList.First();
 					authViewModel.WorkshopName = workshop.Name;
 					authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
-				}
+                    authViewModel.WorkshopId = workshop.Id;
+                }
 			}
 
             _authHelper.Signin(authViewModel);
@@ -317,6 +318,7 @@ public class AccountApplication : IAccountApplication
 				var workshop = workshopList.First();
 				authViewModel.WorkshopName = workshop.WorkshopName;
 				authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.WorkshopId);
+                authViewModel.WorkshopId = workshop.WorkshopId;
 			}
 			_authHelper.Signin(authViewModel);
 			idAutoriz = 2;
@@ -368,6 +370,7 @@ public class AccountApplication : IAccountApplication
 				var workshop = workshopList.First();
 				authViewModel.WorkshopName = workshop.Name;
 				authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
+                authViewModel.WorkshopId = workshop.Id;
 			}
 		}
 
@@ -515,6 +518,7 @@ public class AccountApplication : IAccountApplication
 			var workshop = authViewModel.WorkshopList.First();
 			authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
 			authViewModel.WorkshopName = workshop.Name;
+            authViewModel.WorkshopId = workshop.Id;
 		}
 		_authHelper.Signin(authViewModel);
         return operation.Succcedded(2);

AccountManagement.Domain/AssignAgg/Assign.cs

@@ -2,6 +2,7 @@
 using AccountManagement.Domain.TaskAgg;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using AccountManagement.Domain.TaskMessageAgg;
 
 namespace AccountManagement.Domain.AssignAgg;
@@ -158,4 +159,24 @@ 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,10 +1,12 @@
 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;
 
@@ -80,4 +82,40 @@ 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,4 +19,13 @@ 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,6 +3,7 @@ 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;
@@ -29,7 +30,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)
+        ICollection<CheckoutSalaryAid> salaryAids,CheckoutRollCall checkoutRollCall,TimeSpan employeeMandatoryHours)
     {
         EmployeeFullName = employeeFullName;
         FathersName = fathersName;
@@ -88,8 +89,11 @@ public class Checkout : EntityBase
         TotalDayOfBunosesCompute = totalDayOfBunosesCompute;
         LoanInstallments = loanInstallments;
         SalaryAids = salaryAids;
+        CheckoutRollCall = checkoutRollCall;
+        EmployeeMandatoryHours = employeeMandatoryHours;
     }
 
+
     public string EmployeeFullName { get; private set; }
     public string IsActiveString { get; private set; }
     public string Signature { get; private set; }
@@ -191,12 +195,22 @@ public class Checkout : EntityBase
    /// </summary>
    public string TotalDayOfBunosesCompute { get; private set; }
 
+   /// <summary>
+   /// دارای تداخل مبلغ است. این در زمانی اتفاق می افتد که فیش مبلغ آن تغییر کرده ولی به دلیل مسائل قانونی امکان صدور دوباره آن وجود ندارد
+   /// </summary>
+   public bool HasAmountConflict { get; private set; }
 
+   /// <summary>
+   /// ساعت موظفی پرسنل در ماه
+   /// </summary>
+    public TimeSpan EmployeeMandatoryHours { get; set; }
+   
    #region valueObjects
 
    public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
    public ICollection<CheckoutSalaryAid> SalaryAids { get; set; } = [];
-   #endregion
+    public CheckoutRollCall CheckoutRollCall { get; private set; }
+    #endregion
 
 
     public Workshop Workshop { get; set; }
@@ -308,4 +322,159 @@ public class Checkout : EntityBase
         LoanInstallments = lonaInstallments;
         InstallmentDeduction = installmentsAmount;
     }
+
+    public void SetCheckoutRollCall(CheckoutRollCall checkoutRollCall)
+    {
+        CheckoutRollCall = checkoutRollCall;
+    }
+
+    public void SetAmountConflict(bool hasAmountConflict)
+    {
+	    HasAmountConflict = hasAmountConflict;
+    }
+
+    public void SetEmployeeMandatoryHours(TimeSpan employeeMandatoryHours)
+    {
+        EmployeeMandatoryHours = employeeMandatoryHours;
+    }
+}
+
+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

@@ -18,7 +18,7 @@ public interface ICheckoutRepository : IRepository<long, Checkout>
     /// <param name="سال به صورت رشته عددی"></param>
     /// <param name="ماه بصورت رشته عددی"></param>
     /// <returns></returns>
-    (bool hasChekout, double FamilyAlloance, double OverTimePay) HasCheckout(long workshopId, long employeId,
+    (bool hasChekout, double FamilyAlloance, double OverTimePay, double RotatingShift, double Nightwork, double Fridaywork, double YraesPay) HasCheckout(long workshopId, long employeId,
         string year, string month);
     EditCheckout GetDetails(long id);
 
@@ -59,6 +59,16 @@ 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
 
@@ -68,4 +78,6 @@ public interface ICheckoutRepository : IRepository<long, Checkout>
         long workshopId, DateTime start, DateTime end);
 
     #endregion
+
+    Task<Checkout> GetByWorkshopIdEmployeeIdInDate(long workshopId, long employeeId, DateTime inDate);
 }

Company.Domain/ClassificationSchemeAgg/ClassificationEmployee.cs

@@ -0,0 +1,80 @@
+using _0_Framework.Domain;
+using System;
+
+namespace Company.Domain.ClassificationSchemeAgg;
+
+public class ClassificationEmployee : EntityBase
+{
+
+    /// <summary>
+    /// ایجاد پرسنل طرح
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <param name="employeeId"></param>
+    /// <param name="classificationSchemeId"></param>
+    /// <param name="classificationGroupId"></param>
+    /// <param name="classificationGroupJobId"></param>
+
+    public ClassificationEmployee(long workshopId, long employeeId, long classificationSchemeId, long classificationGroupId, long classificationGroupJobId)
+    {
+        WorkshopId = workshopId;
+        EmployeeId = employeeId;
+        ClassificationSchemeId = classificationSchemeId;
+        ClassificationGroupId = classificationGroupId;
+        ClassificationGroupJobId = classificationGroupJobId;
+   
+    }
+
+    /// <summary>
+    /// آی دی کارگاه
+    /// </summary>
+    public long WorkshopId { get; private set; }
+
+    /// <summary>
+    /// آی دی پرسنل
+    /// </summary>
+    public long EmployeeId { get; private set; }
+
+    /// <summary>
+    /// آی دی طرح
+    /// </summary>
+    public long ClassificationSchemeId { get; private set; }
+
+    /// <summary>
+    /// آی دی گروه
+    /// </summary>
+    public long ClassificationGroupId { get; private set; }
+
+    /// <summary>
+    /// آی دی شغل
+    /// </summary>
+    public long ClassificationGroupJobId { get; private set; }
+
+
+    /// <summary>
+    ///  تاریخ شروع استفاده از گروه
+    /// </summary>
+    public DateTime? StartGroupDate{ get; private set; }
+
+    /// <summary>
+    /// تاریخ پایان استفاده از گروه
+    /// </summary>
+    public DateTime? EndGroupDate { get; private set; }
+
+    public ClassificationGroup ClassificationGroup { get; set; }
+
+    /// <summary>
+    /// ویرایش پرسنل طرح
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <param name="employeeId"></param>
+    /// <param name="classificationSchemeId"></param>
+    /// <param name="classificationGroupId"></param>
+    /// <param name="classificationGroupJobId"></param>
+    public void Edit(long classificationGroupId, long classificationGroupJobId)
+    {
+        ClassificationGroupId = classificationGroupId;
+        ClassificationGroupJobId = classificationGroupJobId;
+    }
+
+}

Company.Domain/ClassificationSchemeAgg/ClassificationGroup.cs

@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using _0_Framework.Domain;
+
+namespace Company.Domain.ClassificationSchemeAgg;
+
+
+public class ClassificationGroup : EntityBase
+{
+    /// <summary>
+    /// ایجاد گروه های بیست گانه طرح طبقه بندی 
+    /// </summary>
+    /// <param name="groupNo"></param>
+    /// <param name="workshopId"></param>
+    /// <param name="classificationSchemeId"></param>
+    public ClassificationGroup(string groupNo, long workshopId, long classificationSchemeId)
+    {
+        GroupNo = groupNo;
+        WorkshopId = workshopId;
+        ClassificationSchemeId = classificationSchemeId;
+    }
+
+    /// <summary>
+    /// شماره گروه
+    /// </summary>
+    public string GroupNo { get; private set; }
+
+    /// <summary>
+    /// آی دی کارگاه
+    /// </summary>
+    public long WorkshopId { get; private set; }
+    /// <summary>
+    /// آی دی طرح
+    /// </summary>
+    public long ClassificationSchemeId { get; private set; }
+
+    public ClassificationScheme ClassificationScheme { get; set; }
+
+
+    public List<ClassificationGroupJob> ClassificationGroupJobs { get; set; }
+    public List<ClassificationGroupSalary> ClassificationGroupSalaries { get; set; }
+
+    public List<ClassificationEmployee> ClassificationEmployees { get; set; }
+}

Company.Domain/ClassificationSchemeAgg/ClassificationGroupJob.cs

@@ -0,0 +1,55 @@
+using _0_Framework.Domain;
+using _0_Framework_b.Domain;
+
+namespace Company.Domain.ClassificationSchemeAgg;
+
+public class ClassificationGroupJob : EntityBaseWithoutCreationDate
+{
+    /// <summary>
+    /// ایجاد لیست مشغال برای گروه های طرح طبقه بندی
+    /// </summary>
+    /// <param name="jobId"></param>
+    /// <param name="jobName"></param>
+    /// <param name="jobCode"></param>
+    /// <param name="classificationGroupId"></param>
+    /// <param name="groupNo"></param>
+    public ClassificationGroupJob(long jobId, string jobName, string jobCode, long classificationGroupId, string groupNo)
+    {
+        JobId = jobId;
+        JobName = jobName;
+        JobCode = jobCode;
+        ClassificationGroupId = classificationGroupId;
+        GroupNo = groupNo;
+
+    }
+
+    /// <summary>
+    /// آی دی شغل
+    /// </summary>
+    public long JobId { get; private set; }
+
+    /// <summary>
+    /// نام شغل
+    /// </summary>
+    public string JobName { get; private set; }
+  
+    /// <summary>
+    /// کد شغل
+    /// </summary>
+    public string JobCode { get; private set; }
+
+    /// <summary>
+    /// آی دی گروه
+    /// </summary>
+    public long ClassificationGroupId { get; private set; }
+
+    /// <summary>
+    /// شماره گروه
+    /// </summary>
+    public string GroupNo { get; private set; }
+
+
+    public ClassificationGroup ClassificationGroup { get; set; }
+
+
+}

Company.Domain/ClassificationSchemeAgg/ClassificationGroupSalary.cs

@@ -0,0 +1,82 @@
+using _0_Framework.Domain;
+using System;
+
+namespace Company.Domain.ClassificationSchemeAgg;
+
+public class ClassificationGroupSalary : EntityBase
+{
+   
+
+    /// <summary>
+    /// ایجاد دستمزد برای گروه
+    /// </summary>
+    /// <param name="classificationGroupId"></param>
+    /// <param name="groupNo"></param>
+    /// <param name="groupSalary"></param>
+    /// <param name="startDate"></param>
+    /// <param name="endDate"></param>
+    /// <param name="year"></param>
+    public ClassificationGroupSalary(long classificationGroupId, string groupNo, double groupSalary, DateTime startDate, DateTime endDate, int year, long schemeId)
+    {
+        ClassificationGroupId = classificationGroupId;
+        GroupNo = groupNo;
+        GroupSalary = groupSalary;
+        StartDate = startDate;
+        EndDate = endDate;
+        Year = year;
+        SchemeId = schemeId;
+    }
+
+    /// <summary>
+    /// آی دی گروه
+    /// </summary>
+    public long ClassificationGroupId { get; private set; }
+
+    /// <summary>
+    /// شماره گروه
+    /// </summary>
+    public string GroupNo { get; private set; }
+
+    /// <summary>
+    /// دستمزد گروه
+    /// </summary>
+    public double GroupSalary { get; private set; }
+
+
+    /// <summary>
+    /// تاریخ شروع
+    /// </summary>
+    public DateTime StartDate { get; private set; }
+
+    /// <summary>
+    /// تاریخ پایان
+    /// </summary>
+    public DateTime EndDate { get; private set; }
+
+    /// <summary>
+    /// سال
+    /// </summary>
+    public int Year { get; private set; }
+
+    public long SchemeId { get; private set; }
+
+
+    public ClassificationGroup ClassificationGroup { get; set; }
+
+    /// <summary>
+    /// ویرایش دستمزد گروه
+    /// </summary>
+
+    /// <param name="groupSalary"></param>
+    /// <param name="startDate"></param>
+    /// <param name="endDate"></param>
+    /// <param name="year"></param>
+    public void Edit(double groupSalary, DateTime startDate, DateTime endDate, int year)
+    {
+
+        GroupSalary = groupSalary;
+        StartDate = startDate;
+        EndDate = endDate;
+        Year = year;
+    }
+}

Company.Domain/ClassificationSchemeAgg/ClassificationRialCoefficient.cs

@@ -0,0 +1,68 @@
+using System;
+using _0_Framework.Domain;
+
+namespace Company.Domain.ClassificationSchemeAgg;
+
+public class ClassificationRialCoefficient : EntityBaseWithoutCreationDate
+{
+    /// <summary>
+    /// ایچاد ضریب ریالی
+    /// </summary>
+    /// <param name="classificationSchemeId"></param>
+    /// <param name="rialCoefficient"></param>
+    /// <param name="startDate"></param>
+    /// <param name="endDate"></param>
+    /// <param name="year"></param>
+    public ClassificationRialCoefficient(long classificationSchemeId, double rialCoefficient, DateTime startDate, DateTime endDate, int year)
+    {
+        ClassificationSchemeId = classificationSchemeId;
+        RialCoefficient = rialCoefficient;
+        StartDate = startDate;
+        EndDate = endDate;
+        Year = year;
+    }
+
+    //آی دی طرح
+    public long ClassificationSchemeId { get; private set; }
+
+    /// <summary>
+    /// ضریب ریالی
+    /// </summary>
+    public double RialCoefficient { get; private set; }
+
+    /// <summary>
+    /// تاریخ شروع
+    /// </summary>
+    public DateTime StartDate { get; private set; }
+
+    /// <summary>
+    /// تاریخ پایان
+    /// </summary>
+    public DateTime EndDate { get; private set; }
+
+    /// <summary>
+    /// سال
+    /// </summary>
+    public int Year { get; private set; }
+
+
+    public ClassificationScheme ClassificationScheme { get; set; }
+
+    /// <summary>
+    /// ویرایش ضریب ریالی
+    /// </summary>
+    /// <param name="classificationSchemeId"></param>
+    /// <param name="rialCoefficient"></param>
+    /// <param name="startDate"></param>
+    /// <param name="endDate"></param>
+    /// <param name="year"></param>
+    public void Edit(double rialCoefficient, DateTime startDate, DateTime endDate, int year)
+    {
+
+        RialCoefficient = rialCoefficient;
+        StartDate = startDate;
+        EndDate = endDate;
+        Year = year;
+    }
+
+}

Company.Domain/ClassificationSchemeAgg/ClassificationScheme.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using _0_Framework.Application.Enums;
+using _0_Framework.Domain;
+
+namespace Company.Domain.ClassificationSchemeAgg;
+
+public class ClassificationScheme : EntityBase
+{
+    ///  <summary>
+    /// ایجاد طرح طبقه بندی مشاغل 
+    ///  </summary>
+    ///  <param name="includingDateGr"></param>
+    ///  <param name="executionDateGr"></param>
+    ///  <param name="designerFullName"></param>
+    ///  <param name="designerPhone"></param>
+    ///  <param name="workshopId"></param>
+    ///  <param name="typeOfCoefficient"></param>
+    public ClassificationScheme(DateTime includingDateGr, DateTime executionDateGr, string designerFullName, string designerPhone, long workshopId, TypeOfCoefficient typeOfCoefficient)
+    {
+        IncludingDateGr = includingDateGr;
+        ExecutionDateGr = executionDateGr;
+        DesignerFullName = designerFullName;
+        DesignerPhone = designerPhone;
+        WorkshopId = workshopId;
+        TypeOfCoefficient = typeOfCoefficient;
+    }
+
+    /// <summary>
+    /// تاریخ شمول طرح
+    /// </summary>
+    public DateTime IncludingDateGr { get; private set; }
+
+    /// <summary>
+    /// تاریخ اجرای طرح
+    /// </summary>
+    public DateTime ExecutionDateGr { get; private set; }
+
+    /// <summary>
+    /// تاریخ پایان طرح
+    /// </summary>
+    public DateTime? EndSchemeDateGr { get; private set; }
+
+
+    /// <summary>
+    /// نام کامل طراح
+    /// </summary>
+    public string DesignerFullName { get; private set; }
+
+    /// <summary>
+    /// شماره همراه طراح
+    /// </summary>
+    public string DesignerPhone { get; private set; }
+
+    /// <summary>
+    /// آی دی کارگاه
+    /// </summary>
+    public long WorkshopId { get; private set; }
+
+
+    /// <summary>
+    /// نوع ضریب
+    /// </summary>
+    public TypeOfCoefficient TypeOfCoefficient { get; private set; }
+
+
+    public List<ClassificationGroup> ClassificationGroups { get; set; }
+
+    public List<ClassificationRialCoefficient> ClassificationRialCoefficients { get; set; }
+
+    /// <summary>
+    /// ویرایش طرح
+    /// </summary>
+    /// <param name="includingDateGr"></param>
+    /// <param name="executionDateGr"></param>
+    /// <param name="designerFullName"></param>
+    /// <param name="designerPhone"></param>
+    /// <param name="workshopId"></param>
+    public void Edit(DateTime includingDateGr, DateTime executionDateGr,string designerFullName, string designerPhone, TypeOfCoefficient typeOfCoefficient)
+    {
+        IncludingDateGr = includingDateGr;
+        ExecutionDateGr = executionDateGr;
+        DesignerFullName = designerFullName;
+        DesignerPhone = designerPhone;
+        TypeOfCoefficient = typeOfCoefficient;
+
+    }
+}

Company.Domain/ClassificationSchemeAgg/IClassificationEmployeeRepository.cs

@@ -0,0 +1,25 @@
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.ClassificationScheme;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Company.Domain.ClassificationSchemeAgg;
+
+public interface IClassificationEmployeeRepository : IRepository<long, ClassificationEmployee>
+{
+    /// <summary>
+    /// دریافت لیست پرسنل کارگاه
+    /// تب افزودن پرسنل
+    /// </summary>
+    /// <param name="schemeId"></param>
+    /// <returns></returns>
+    Task<List<EmployeeInfoList>> GetEmployeeListData(long schemeId);
+
+
+    /// <summary>
+    ///  دریافت اطلاعات عضویتی پرسنل در گروه
+    /// </summary>
+    /// <param name="employeeId"></param>
+    /// <returns></returns>
+    Task<ClassificationEmployee> GetEmployeeMemberizeData(long employeeId);
+}

Company.Domain/ClassificationSchemeAgg/IClassificationGroupRepository.cs

@@ -0,0 +1,61 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.ClassificationScheme;
+
+namespace Company.Domain.ClassificationSchemeAgg;
+
+public interface IClassificationGroupRepository : IRepository<long, ClassificationGroup>
+{
+    /// <summary>
+    /// دریافت گروه های طرح
+    /// </summary>
+    /// <param name="schemeId"></param>
+    /// <returns></returns>
+    Task<List<ClassificationGroupList>> GetGroups(long schemeId);
+
+    /// <summary>
+    /// دریافت گروه ها و مشاغلشان برای تب تعیین مشاغل
+    /// </summary>
+    /// <param name="schemeId"></param>
+    /// <returns></returns>
+    Task<List<ClassificationGroupAndJobModel>> GetGroupAndJobs(long schemeId);
+
+
+    /// <summary>
+    /// دریافت مشاغل گروه توسط آی دی گروه
+    /// </summary>
+    /// <param name="groupId"></param>
+    /// <returns></returns>
+    Task<List<EditClassificationGroupJob>> GetGroupJobs(long groupId);
+
+    /// <summary>
+    /// چک میکند که آی پرسنلی وجود دارد که این شغل به او نسبت داده شده
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="groupId"></param>
+    /// <returns></returns>
+    Task<bool> CheckEmployeeHasThisJob(long id, long groupId);
+
+    /// <summary>
+    /// ایجاد مشاغل
+    /// </summary>
+    /// <param name="createClassificationGroupJob"></param>
+    /// <param name="deleteJobList"></param>
+    /// <returns></returns>
+    Task<bool> CreateJobs(List<ClassificationGroupJob> createClassificationGroupJob, List<long> deleteJobList);
+
+
+    /// <summary>
+    /// در یافت اطلاعات گروه برای لود مودال ایجاد دستمزد های
+    /// </summary>
+    /// <returns></returns>
+    Task<SalaryAndRialCoefficientModel> GetGroupToCreateSalariesModal(long schemeId);
+
+    /// <summary>
+    /// ایجاد گروه های بیست گانه
+    /// </summary>
+    /// <param name="groupList"></param>
+    /// <returns></returns>
+    Task CreateGroups(List<ClassificationGroup> groupList);
+}

Company.Domain/ClassificationSchemeAgg/IClassificationGroupSalariesRepository.cs

@@ -0,0 +1,34 @@
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.ClassificationScheme;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Company.Domain.ClassificationSchemeAgg;
+
+public interface IClassificationGroupSalariesRepository : IRepository<long, ClassificationGroupSalary>
+{
+    /// <summary>
+    /// ایجاد دستمزدهای گروه ها
+    /// </summary>
+    /// <param name="createClassificationGroupSalary"></param>
+    /// <returns></returns>
+    Task CreateSalaries(List<ClassificationGroupSalary> createClassificationGroupSalary);
+
+
+    /// <summary>
+    /// دریافت دستمزدها و ضریب ریالی برای مودال ویرایش
+    /// </summary>
+    /// <param name="schemeId"></param>
+    /// <param name="startDate"></param>
+    /// <param name="endDate"></param>
+    /// <returns></returns>
+    Task<SalaryAndRialCoefficientModel> GetEditSalariesData(long schemeId, string startDate, string endDate);
+
+    /// <summary>
+    /// لیست دستمزدها بر اساس تاریخ و سال برای تب دستمزدها
+    /// </summary>
+    /// <param name="schemeId"></param>
+    /// <returns></returns>
+    Task<SalaryAndRialCoefficientTab> GetSalariesTabData(long schemeId);
+}
+    

Company.Domain/ClassificationSchemeAgg/IClassificationRialCoefficientRepository.cs

@@ -0,0 +1,8 @@
+using _0_Framework.Domain;
+
+namespace Company.Domain.ClassificationSchemeAgg;
+
+public interface IClassificationRialCoefficientRepository : IRepository<long, ClassificationRialCoefficient>
+{
+    
+}

Company.Domain/ClassificationSchemeAgg/IClassificationSchemeRepository.cs

@@ -0,0 +1,42 @@
+using _0_Framework.Application;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.ClassificationScheme;
+using CompanyManagment.App.Contracts.YearlySalary;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Company.Domain.ClassificationSchemeAgg;
+
+public interface IClassificationSchemeRepository : IRepository<long, ClassificationScheme>
+{
+    /// <summary>
+    /// پارشیال صفحه ایجاد طرح
+    /// </summary>
+    /// <param name="worskhopId"></param>
+    /// <returns></returns> 
+    Task<ClassificationSchemePartialModel> ClassificationSchemePartialModel(long workshopId);
+
+
+    /// <summary>
+    /// دریافت اطلاعات طرح برای ویرایش
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<EditClassificationScheme> GetClassificationScheme(long id);
+
+
+    /// <summary>
+    /// متد محاسبه پایه سنوات برا افراد تک گروه
+    /// </summary>
+    /// <param name="schemeStart">تاریخ شروع طرح</param>
+    /// <param name="schemeEnd">تاریخ پاین طرح، اجباری نیست</param>
+    /// <param name="contractStart">تاریخ شروع قراداد</param>
+    /// <param name="contractEnd">تاریخ پایان قراداد</param>
+    /// <param name="groupNo">شماره گروه</param>
+    /// <param name="employeeId">آی دی پرسنل</param>
+    /// <param name="workshopId">آی دی کارگاه</param>
+    /// <returns></returns>
+    Task<BaseYearDataViewModel> BaseYearComputeOneGroup(DateTime schemeStart, DateTime? schemeEnd,
+        DateTime contractStart, DateTime contractEnd, string groupNo, long employeeId, long workshopId);
+}

Company.Domain/ClassifiedSalaryAgg/ClassifiedSalary.cs

@@ -10,6 +10,7 @@ namespace Company.Domain.ClassifiedSalaryAgg
 {
     public class ClassifiedSalary : EntityBase
     {
+        //test//test
         public ClassifiedSalary(double group1, double group2, double group3, double group4, double group5, double group6, double group7, double group8, double group9, double group10, double group11, double group12, double group13, double group14, double group15, double group16, double group17, double group18, double group19, double group20, DateTime startDate, DateTime endDate, int year)
         {
             Group1 = group1;

Company.Domain/ContactUsAgg/ContactUs.cs

@@ -0,0 +1,26 @@
+using _0_Framework.Domain;
+
+namespace Company.Domain.ContactUsAgg;
+
+public class ContactUs:EntityBase
+{
+    public ContactUs(string firstName, string lastName, string email, string phoneNumber, string title, string message)
+    {
+        FirstName = firstName.Trim();
+        LastName = lastName.Trim();
+        Email = email;
+        PhoneNumber = phoneNumber;
+        Title = title;
+        Message = message;
+        FullName = FirstName + " " + LastName;
+    }
+
+    public string FirstName { get; private set; }
+    public string LastName { get; private set; }
+    public string Email { get; private set; }
+    public string PhoneNumber { get; private set; }
+    public string Title { get; private set; }   
+    public string Message { get; private set; }
+    public string FullName { get; private set; }
+    
+}

Company.Domain/ContactUsAgg/IContactUsRepository.cs

@@ -0,0 +1,8 @@
+using _0_Framework.Domain;
+
+namespace Company.Domain.ContactUsAgg;
+
+public interface IContactUsRepository : IRepository<long, ContactUs>
+{
+
+}

Company.Domain/ContarctingPartyAgg/IPersonalContractingPartyRepository.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using AccountManagement.Application.Contracts.Account;
+using System.Threading.Tasks;
 
 namespace Company.Domain.ContarctingPartyAgg;
 
@@ -42,6 +43,35 @@ public interface IPersonalContractingPartyRepository :IRepository<long, Personal
 
     #endregion
 
+    /// <summary>
+    /// لیست طرف حساب ها
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    Task<ICollection<ContractingPartyGetListViewModel>> GetList(ContractingPartyGetListSearchModel searchModel);
 
+    /// <summary>
+    /// لیست طرف حساب برای سلکت لیست سرچ
+    /// </summary>
+    /// <param name="search"></param>
+    /// <returns></returns>
+    Task<List<ContractingPartySelectListViewModel>> GetSelectList(string search,long id);
+
+    /// <summary>
+    /// لیستی از شماره ملی یا شناسه ملی بر اساس حقیقی یا حقوقی بودن
+    /// </summary>
+    /// <returns></returns>
+    Task<List<GetContractingPartyNationalCodeOrNationalIdViewModel>> GetNationalCodeOrNationalId();
+
+    /// <summary>
+    /// غیرفعال کردن طرف حساب و زیرمجموعه های آن
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<OperationResult<string>> DeactivateWithSubordinates(long id);
+
+    void Remove(PersonalContractingParty entity);
+    Task<GetRealContractingPartyDetailsViewModel> GetRealDetails(long id);
+    Task<GetLegalContractingPartyDetailsViewModel> GetLegalDetails(long id);
 
 }

Company.Domain/ContarctingPartyAgg/PersonalContractingParty.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Security.Cryptography.X509Certificates;
 using _0_Framework.Application;
 using _0_Framework.Domain;
+using Company.Domain.ContractingPartyBankAccountsAgg;
 using Company.Domain.empolyerAgg;
 using Company.Domain.RepresentativeAgg;
 
@@ -83,6 +84,7 @@ public class PersonalContractingParty : EntityBase
 
     public List<Employer> Employers { get; private set; }
     public Representative Representative { get; set; }
+    public List<ContractingPartyBankAccount> ContractingPartyBankAccounts { get; set; }
 
     public PersonalContractingParty()
     {
@@ -213,4 +215,14 @@ 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/ContractAgg/Contract.cs

@@ -17,7 +17,7 @@ public class Contract : EntityBase
     public Contract(long personnelCode, long employeeId, long employerId, 
         long workshopIds, long yearlySalaryId, DateTime contarctStart, DateTime contractEnd, string dayliWage,
         string archiveCode, DateTime getWorkDate, DateTime setContractDate, string jobType,
-        string contractType, string workshopAddress1, string workshopAddress2, string consumableItems, long jobTypeId, string housingAllowance, string agreementSalary, string workingHoursWeekly, string familyAllowance, string contractPeriod)
+        string contractType, string workshopAddress1, string workshopAddress2, string consumableItems, long jobTypeId, string housingAllowance, string agreementSalary, string workingHoursWeekly, string familyAllowance, string contractPeriod, double dailySalaryAffected, double baseYearAffected, double dailySalaryUnAffected, double baseYearUnAffected, bool hasManualDailyWage, string dailyWageType)
     {
         PersonnelCode = personnelCode;
         EmployeeId = employeeId;
@@ -45,6 +45,19 @@ public class Contract : EntityBase
         WorkingHoursWeekly = workingHoursWeekly;
         FamilyAllowance = familyAllowance;
         ContractPeriod = contractPeriod;
+        
+        //پراپرتی های جدید برای دستمزد دلخواه
+        #region NewManualDailyWage
+        DailySalaryAffected = dailySalaryAffected;
+        BaseYearAffected = baseYearAffected;
+        DailySalaryUnAffected = dailySalaryUnAffected;
+        BaseYearUnAffected = baseYearUnAffected;
+        HasManualDailyWage = hasManualDailyWage;
+        DailyWageType = dailyWageType;
+
+        #endregion
+
+
         Signature = "0";
 
 
@@ -65,7 +78,42 @@ public class Contract : EntityBase
     public DateTime SetContractDate { get; private set; }
     public string JobType { get; private set; }
     public string ContractType { get; private set; }
+    /// <summary>
+    /// مزد تجمیعی یعد از تاثیر ساعت کار
+    /// </summary>
     public string DayliWage { get; private set; }
+
+    /// <summary>
+    ///  دستمزد روزانه خام بعد از تاثیر ساعت کار
+    /// </summary>
+    public double DailySalaryAffected { get; set; }
+
+    /// <summary>
+    /// پایه سنوات بعد از تاثیر ساعت کار
+    /// </summary>
+    public double BaseYearAffected { get; set; }
+
+
+    /// <summary>
+    /// دستمزد روزانه قبل از تاثیر ساعت کار
+    /// </summary>
+    public double DailySalaryUnAffected { get; set; }
+
+    /// <summary>
+    /// پایه سنوات قبل از تاثیر ساعت کار
+    /// </summary>
+    public double BaseYearUnAffected { get; set; }
+
+    /// <summary>
+    /// آیا دستمزد روزانه دستی وارد شده است؟
+    /// </summary>
+    public bool HasManualDailyWage { get; set; }
+
+    /// <summary>
+    /// نوع دستمزد انتخاب شده
+    /// </summary>
+    public string DailyWageType { get; set; }
+
     public string IsActiveString { get; private set; }
     public string ArchiveCode { get; private set; }
     public string WorkshopAddress1 { get; private set; }
@@ -89,6 +137,7 @@ public class Contract : EntityBase
 
     public Contract()
     {
+     
         WorkingHoursList = new List<WorkingHours>();
     }
     public void Edit(long pesrsonnelCode, long employeeId, long employerId, long workshopId, long yearlySalaryId,

Company.Domain/ContractAgg/IContractRepository.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.Contract;
@@ -9,6 +10,24 @@ namespace Company.Domain.ContractAgg;
 
 public interface IContractRepository : IRepository<long, Contract>
 {
+    /// <summary>
+    /// دریافت مزد ارتقاء یافته
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <param name="employeeId"></param>
+    /// <param name="yearlySalaryId"></param>
+    /// <returns></returns>
+    Task<double> GetManualDailWage(long workshopId, long employeeId, long yearlySalaryId, DateTime contractStart);
+
+    /// <summary>
+    /// دریافت لیست مزد ارتقاء یافته
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <param name="employeeId"></param>
+    /// <param name="contractStart"></param>
+    /// <returns></returns>
+    Task<UpgradeManualDailyWageModel> GetManualDailWageList(long workshopId, long employeeId,
+        DateTime contractStart);
     EditContract GetDetails(long id);
     EditContract GetContractByStartEnd(DateTime start, DateTime end, long workshopId, long employeeId);
 

Company.Domain/ContractingPartyBankAccountsAgg/ContractingPartyBankAccount.cs

@@ -0,0 +1,27 @@
+using _0_Framework.Domain;
+using Company.Domain.ContarctingPartyAgg;
+
+namespace Company.Domain.ContractingPartyBankAccountsAgg;
+
+public class ContractingPartyBankAccount : EntityBase
+{
+    public long ContractingPartyId { get; private set; }
+
+    public PersonalContractingParty ContractingParty { get; private set; }
+    public string CardNumber { get; private set; }
+    public string AccountHolderName { get; private set; }
+    public string AccountNumber { get; private set; }
+    public string IBan { get; private set; }
+    public bool IsAuth { get; private set; }
+
+    public ContractingPartyBankAccount(long contractingPartyId, string cardNumber, string accountHolderName,
+        string accountNumber, string iBan , bool isAuth)
+    {
+        ContractingPartyId = contractingPartyId;
+        CardNumber = cardNumber;
+        AccountHolderName = accountHolderName;
+        AccountNumber = accountNumber;
+        IBan = iBan;
+        IsAuth = isAuth;
+    }
+}

Company.Domain/ContractingPartyBankAccountsAgg/IContractingPartyBankAccountsRepository.cs

@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using _0_Framework.Application;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.ContractingPartyBankAccounts;
+
+namespace Company.Domain.ContractingPartyBankAccountsAgg;
+
+public interface IContractingPartyBankAccountsRepository:IRepository<long,ContractingPartyBankAccount>
+{
+    Task<GetContractingPartyBankAccountViewModel> GetList(ContractingPartyBankAccountSearchModel searchModel);
+    Task<List<string>> ContractingPartyOrAccountHolderNameSelectList(string search, string selected);
+    Task<List<string>> IBanSelectList(string search, string selected);
+
+    Task<List<string>> CardNumberSelectList(string search, string selected);
+    Task<List<string>> AccountNumberSelectList(string search, string selected);
+    Task<List<string>> GetAccountHolderNameSelectList(string search, string selected);
+    Task<List<string>> ContractingPartyNamesSelectList(string search, string selected);
+}

Company.Domain/CustomizeCheckoutAgg/CustomizeCheckout.cs

@@ -374,6 +374,13 @@ public class CustomizeCheckout : EntityBase
         TotalPayment = TotalPayment - previousAmount + newAmount;
     }
 
+    /// <summary>
+    /// آیا مغایرت مبلغ دارد
+    /// </summary>
+    public bool HasAmountConflict { get; private set; }
 
-
+    public void SetHasAmountConflict(bool hasConflict)
+    {
+        HasAmountConflict = hasConflict;
+    }
 }

Company.Domain/CustomizeCheckoutTempAgg/CustomizeCheckoutTemp.cs

@@ -377,4 +377,16 @@ public class CustomizeCheckoutTemp : EntityBase
     {
         TotalPayment = TotalPayment - previousAmount + newAmount;
     }
+	
+    /// <summary>
+    /// آیا مغایرت مبلغ دارد
+    /// </summary>
+    public bool HasAmountConflict { get; private set; }
+
+    
+
+    public void SetHasAmountConflict(bool hasConflict)
+    {
+        HasAmountConflict = hasConflict;
+    }
 }

Company.Domain/CustomizeWorkshopEmployeeSettingsAgg/Entities/CustomizeWorkshopEmployeeSettings.cs

@@ -27,12 +27,13 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
         FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, long employeeId,
         long workshopId, double salary, long customizeWorkshopGroupSettingId,
         ICollection<CustomizeWorkshopEmployeeSettingsShift> customizeWorkshopEmployeeSettingsShifts,
-        FridayWork fridayWork,
-        HolidayWork holidayWork, IrregularShift irregularShift, WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime, int leavePermittedDays, ICollection<CustomizeRotatingShift> rotatingShifts) :
+        HolidayWork holidayWork, IrregularShift irregularShift, WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime,
+        int leavePermittedDays, ICollection<CustomizeRotatingShift> rotatingShifts
+        , List<WeeklyOffDay> weeklyOffDays) :
         base(fridayPay, overTimePay,
         baseYearsPay, bonusesPay, nightWorkPay,
         marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
-        earlyExit, fridayWork, holidayWork, breakTime, leavePermittedDays)
+        earlyExit, holidayWork, breakTime, leavePermittedDays,weeklyOffDays)
     {
         CustomizeWorkshopGroupSettingId = customizeWorkshopGroupSettingId;
         IsSettingChanged = false;
@@ -82,7 +83,6 @@ 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,
-        FridayWork fridayWork, HolidayWork holidayWork, IrregularShift irregularShift, bool isSettingChange, int leavePermittedDays)
+        HolidayWork holidayWork, IrregularShift irregularShift, bool isSettingChange, int leavePermittedDays)
     {
         SetValueObjects(fridayPay, overTimePay, baseYearsPay, bonusesPay
             , nightWorkPay, marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction,
@@ -99,7 +99,6 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
 
         Salary = salary;
         IsSettingChanged = isSettingChange;
-        FridayWork = fridayWork;
         HolidayWork = holidayWork;
         LeavePermittedDays = leavePermittedDays;
     }
@@ -112,8 +111,8 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
     public void SimpleEdit(
         ICollection<CustomizeWorkshopEmployeeSettingsShift> employeeSettingsShift,
         IrregularShift irregularShift,
-        WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime, bool isShiftChange, FridayWork fridayWork, HolidayWork holidayWork,
-        ICollection<CustomizeRotatingShift> rotatingShifts)
+        WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime, bool isShiftChange,HolidayWork holidayWork,
+        ICollection<CustomizeRotatingShift> rotatingShifts,List<WeeklyOffDay> weeklyOffDays)
     {
         BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
         IsShiftChanged = isShiftChange;
@@ -126,9 +125,8 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
             : new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
 
         CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
-
-        FridayWork = fridayWork;
         HolidayWork = holidayWork;
+        WeeklyOffDays = weeklyOffDays;
     }
 
 
@@ -269,4 +267,6 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
 
         IsShiftChanged = isShiftChange;
     }
+
+   
 }

Company.Domain/CustomizeWorkshopGroupSettingsAgg/Entities/CustomizeWorkshopGroupSettings.cs

@@ -17,340 +17,344 @@ 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, 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;
+	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;
 
-        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, 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 : [];
+	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 : [];
 
-        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, 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;
+	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;
 
 
-        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, 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 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 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, FridayWork, 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, 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, FridayWork fridayWork, HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts)
-    {
-        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, 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 : [];
+		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;
-        FridayWork = fridayWork;
-        HolidayWork = holidayWork;
+		BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
+		IsShiftChange = isShiftChange;
 
-        //var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
-        // .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
-        if (isShiftChange)
-        {
+		HolidayWork = holidayWork;
 
-        }
+		WeeklyOffDays = weeklyOffDays;
 
-        var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
+		//var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
+		// .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
+		if (isShiftChange)
+		{
 
-        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));
 
-    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;
+		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);
+		}
 
-        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 : [];
+	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 : [];
 
 
-        BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
-        IsShiftChange = isShiftChange;
-        HolidayWork = holidayWork;
-        FridayWork = fridayWork;
+		BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
+		IsShiftChange = isShiftChange;
+		HolidayWork = holidayWork;
 
-        //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);
-    }
+		WeeklyOffDays = weeklyOffDays;
+		//var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
+		// .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
 
 
-    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);
-    }
+		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);
+	}
 
 
-    //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);
-    //    }
-    //}
+	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);
+	//    }
+	//}
 
 
 }

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,FridayWork fridayWork,HolidayWork holidayWork)
+		WorkshopShiftStatus workshopShiftStatus,HolidayWork holidayWork, List<WeeklyOffDay> weeklyOffDays)
 	{
 		FridayPay = new FridayPay(FridayPayType.None, 0);
 		OverTimePay = new OverTimePay(OverTimePayType.None, 0);
@@ -38,11 +38,10 @@ 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;
 
@@ -92,8 +91,7 @@ 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,
-		FridayWork fridayWork, HolidayWork holidayWork, BonusesPaysInEndOfYear bonusesPaysInEndOfYear,
+		FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, BonusesPaysInEndOfYear bonusesPaysInEndOfYear,
 		int leavePermittedDays, BaseYearsPayInEndOfYear baseYearsPayInEndOfYear, int overTimeThresholdMinute)
 	{
 		FridayPay = fridayPay;
@@ -109,7 +107,6 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 		FineAbsenceDeduction = fineAbsenceDeduction;
 		LateToWork = lateToWork;
 		EarlyExit = earlyExit;
-		FridayWork = fridayWork;
 		HolidayWork = holidayWork;
 		BonusesPaysInEndOfMonth = bonusesPaysInEndOfYear;
 		LeavePermittedDays = leavePermittedDays;
@@ -127,19 +124,18 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 	}
 
 	public void ChangeWorkshopShifts(ICollection<CustomizeWorkshopSettingsShift> customizeWorkshopSettingsShifts,
-        WorkshopShiftStatus workshopShiftStatus,FridayWork fridayWork,HolidayWork holidayWork)
+        WorkshopShiftStatus workshopShiftStatus,HolidayWork holidayWork, List<WeeklyOffDay> weeklyOffDays)
 	{
 		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,7 +71,12 @@ public interface IEmployeeRepository : IRepository<long, Employee>
     Task<GetEditEmployeeInEmployeeDocumentViewModel> GetEmployeeEditInEmployeeDocumentWorkFlow(long employeeId,
         long workshopId);
 
-    #endregion
+	#endregion
+
+	#region Api
+	Task<List<EmployeeSelectListViewModel>> GetSelectList(string searchText,long id);
+	Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel);
+	#endregion
 
 
 }

Company.Domain/EmployeeComputeOptionsAgg/EmployeeComputeOptions.cs

@@ -3,36 +3,110 @@ 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)
-        {
-            WorkshopId = workshopId;
-            EmployeeId = employeeId;
-            ComputeOptions = computeOptions;
-            BonusesOptions = bonusesOptions;
-            YearsOptions = yearsOptions;
-        }
+		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 long WorkshopId { get; private set;}
-        public long EmployeeId { get; private set;}
+            SetContractAndCheckoutOptions(createContract, signContract, createCheckout, signCheckout);
+		}
 
-        //نحوه محاسبه مزد مرخصی
-        public string ComputeOptions { get; private set; }
-        //نحوه محاسبه عیدی
-        public string BonusesOptions { get; private set; }
-        //نحوه محاسبه سنوات
-        public string YearsOptions { get; private set; }
 
-        public void Edit(string computeOptions, string bonusesOptions, string yearsOptions)
-        {
-            ComputeOptions = computeOptions;
-            BonusesOptions = bonusesOptions;
-            YearsOptions = yearsOptions;
-        }
-    }
+
+		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;
+			}
+		}
+	}
 }
+

Company.Domain/FinancialStatmentAgg/FinancialStatment.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -15,7 +16,7 @@ public class FinancialStatment : EntityBase
     {
         ContractingPartyId = contractingPartyId;
         ContractingPartyName = contractingPartyName;
- 
+        PublicId = Guid.NewGuid();
     }
 
     public FinancialStatment()
@@ -24,9 +25,16 @@ public class FinancialStatment : EntityBase
     }
     public long ContractingPartyId { get; private set; }
     public string ContractingPartyName { get; private set; }
+    public Guid PublicId { get; private set; }
 
+    [NotMapped]
+    public string PublicIdStr => PublicId.ToString("N");
 
     public List<FinancialTransaction> FinancialTransactionList { get; set; }
 
-  
+
+    public void SetPublicId()
+    {
+        PublicId = Guid.NewGuid();
+    }
 }

Company.Domain/FinancialStatmentAgg/IFinancialStatmentRepository.cs

@@ -3,14 +3,24 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.FinancialStatment;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Company.Domain.FinancialStatmentAgg;
 
 public interface IFinancialStatmentRepository : IRepository<long, FinancialStatment>
 {
 
+    [Obsolete("این متد منسوخ شده است. لطفاً از متد GetDetailsByContractingParty استفاده کنید.")]
     FinancialStatmentViewModel GetDetailsByContractingPartyId(long contractingPartyId);
     List<FinancialStatmentViewModel> Search(FinancialStatmentSearchModel searchModel);
+    Task<ClientFinancialStatementViewModel> GetClientFinancialStatement(long accountId,
+        FinancialStatementSearchModel searchModel);
+
+    Task<OperationResult<ClientFinancialStatementViewModel>> GetDetailsByPublicId(string publicId);
+    Task<GetFinancialStatementBalanceAmount> GetBalanceAmount(long id);
+    Task<double> GetClientDebtAmount(long accountId);
+    Task<FinancialStatmentDetailsByContractingPartyViewModel> GetDetailsByContractingParty(long contractingPartyId,FinancialStatementSearchModel searchModel);
 }

Company.Domain/FinancialTransactionAgg/IFinancialTransactionRepository.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.FinancilTransaction;
 
@@ -13,4 +14,15 @@ public interface IFinancialTransactionRepository : IRepository<long, FinancialTr
 {
     EditFinancialTransaction GetDetails(long id);
     void RemoveFinancialTransaction(long id);
+
+    /// <summary>
+    /// ایجاد بدهی استند حضور غیاب برای اکسل
+    /// </summary>
+    /// <param name="contractingPartyId"></param>
+    /// <param name="transactionDate"></param>
+    /// <param name="debt"></param>
+    /// <param name="description"></param>
+    /// <returns></returns>
+    OperationResult CreateDebtFromExcel(long contractingPartyId, string transactionDate, double debt,
+        string description);
 }

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.Workshop;
@@ -13,7 +14,8 @@ 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);
@@ -32,4 +34,17 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
 
     int ArchiveCodeFinder(List<WorkshopViewModel> workshopViewModels);
     InstitutionContract InstitutionContractByEmployerId(long employerId);
+
+
+    /// <summary>
+    /// ایجاد سند مالی حضور غیاب
+    /// </summary>
+    /// <param name="now"></param>
+    /// <param name="endOfMonthGr"></param>
+    /// <param name="endOfMonth"></param>
+    /// <param name="description"></param>
+    void RollcallServiceCreateTransaction();
+
+    Task<PagedResult<GetInstitutionContractListItemsViewModel>> GetList(InstitutionContractListSearchModel searchModel);
+    Task<GetInstitutionContractListStatsViewModel> GetListStats(InstitutionContractListSearchModel searchModel);
 }

Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs

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

Company.Domain/JobAgg/IJobRepository.cs

@@ -11,6 +11,13 @@ public interface IJobRepository : IRepository<long, Job>
     EditJob GetDetails(long id);
     List<JobViewModel> Search(JobSearchModel searchModel);
     List<JobViewModel> SearchJobForMain(JobSearchModel searchModel);
+
+    /// <summary>
+    /// جستجوس مشاغل 
+    /// </summary>
+    /// <param name="searchtText"></param>
+    /// <returns></returns>
+    Task<List<JobViewModel>> JobSearchSelect(string searchtText);
     // Task<List<JobViewModel>> GetJobListByText(string searchtText);
     List<JobViewModel> GetJobListByText(string searchtText);
     List<JobViewModel> GetJobListByWorkshopId(long workshopId);

Company.Domain/LeaveAgg/ILeaveRepository.cs

@@ -22,7 +22,7 @@ public interface ILeaveRepository : IRepository<long, Leave>
 
     bool CheckContractExist(DateTime myDate,long employeeId, long workshopId);
 
-    LeavErrorViewModel CheckErrors(DateTime startLeav, DateTime endLeav, long employeeId, long workshopId);
+    LeavErrorViewModel CheckErrors(DateTime startLeav, DateTime endLeav, long employeeId, long workshopId,bool isInvalid);
     LeaveViewModel LeavOnChekout(DateTime starContract, DateTime endContract, long employeeId, long workshopId);
     List<LeaveMainViewModel> searchClient(LeaveSearchModel searchModel);
     LeavePrintViewModel PrintOne(long id);

Company.Domain/LeaveAgg/Leave.cs

@@ -8,7 +8,9 @@ public class Leave: EntityBase
 {
     public Leave(DateTime startLeave, DateTime endLeave,
         string leaveHourses, long workshopId, long employeeId,
-        string paidLeaveType, string leaveType, string employeeFullName, string workshopName, bool isAccepted, string decription, int year, int month, TimeSpan shiftDuration, bool hasShiftDuration)
+        string paidLeaveType, string leaveType, string employeeFullName, string workshopName,
+        bool isAccepted, string decription, int year, int month, TimeSpan shiftDuration, 
+        bool hasShiftDuration,bool isInvalid)
     {
         StartLeave = startLeave;
         EndLeave = endLeave;
@@ -25,6 +27,7 @@ public class Leave: EntityBase
         Month = month;
         ShiftDuration = shiftDuration;
         HasShiftDuration = hasShiftDuration;
+        IsInvalid = isInvalid;
     }
 
     public DateTime StartLeave { get; private set; }
@@ -43,6 +46,10 @@ public class Leave: EntityBase
 
     public TimeSpan ShiftDuration { get; private set; }
     public bool HasShiftDuration { get; private set; }
+    /// <summary>
+    ///آیا فاقد اعتبار است. فاقد اعتبار ها فقط برای فیش های غیررسمی مورد استفاده قرار میگیرند 
+    /// </summary>
+    public bool IsInvalid { get; private set; }
 
     public void Edit(DateTime startLeave, DateTime endLeave,
         string leaveHourses, long workshopId, long employeeId,

Company.Domain/LeftWorkAgg/ILeftWorkRepository.cs

@@ -5,6 +5,7 @@ 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;
 
@@ -46,4 +47,11 @@ 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/PaymentInstrumentAgg/IPaymentInstrumentGroupRepository.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.PaymentInstrument;
+
+namespace Company.Domain.PaymentInstrumentAgg;
+
+public interface IPaymentInstrumentGroupRepository:IRepository<long,PaymentInstrumentGroup>
+{
+    void Remove(PaymentInstrumentGroup paymentInstrumentGroup);
+    Task<List<PaymentInstrumentGroupsViewModel>> GetList();
+}

Company.Domain/PaymentInstrumentAgg/IPaymentInstrumentRepository.cs

@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using _0_Framework.Application;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.PaymentInstrument;
+
+namespace Company.Domain.PaymentInstrumentAgg;
+
+public interface IPaymentInstrumentRepository:IRepository<long,PaymentInstrument>
+{
+    Task<GetPaymentInstrumentListViewModel> GetList(PaymentInstrumentSearchModel searchModel);
+    Task<List<PosTerminalSelectListViewModel>> GetPosTerminalSelectList(string search);
+    Task<List<string>> PosTerminalIdSelectList(string search, string selected);
+    Task<List<string>> IbanSelectList(string search, string selected);
+    Task<List<string>> AccountNumberSelectList(string search, string selected);
+    Task<List<string>> CardNumberSelectList(string search, string selected);
+    Task<List<string>> AccountHolderNameSelectList(string search, string selected);
+   
+}

Company.Domain/PaymentInstrumentAgg/PaymentInstrument.cs

@@ -0,0 +1,52 @@
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.PaymentInstrument;
+
+namespace Company.Domain.PaymentInstrumentAgg;
+
+public class PaymentInstrument:EntityBase
+{
+    private  PaymentInstrument(string cardNumber, string accountHolderName, string accountNumber,string iBan,bool isAuth,long paymentInstrumentGroupId)
+    {
+        CardNumber = cardNumber;
+        AccountHolderName = accountHolderName;
+        AccountNumber = accountNumber;
+        IBan = iBan;
+        IsAuth = isAuth;
+        PaymentInstrumentGroupId = paymentInstrumentGroupId;
+        Type = PaymentInstrumentType.BankAccount;
+    }
+
+    private PaymentInstrument(string posTerminalId , string description,long paymentInstrumentGroupId)
+    {
+        PosTerminalId = posTerminalId;
+        Description = description;
+        PaymentInstrumentGroupId = paymentInstrumentGroupId;
+        Type = PaymentInstrumentType.Pos;
+    }
+
+    public static PaymentInstrument CreatePosType(string posTerminalId, string description, long paymentInstrumentGroupId)
+    {
+        return new PaymentInstrument(posTerminalId, description, paymentInstrumentGroupId);
+    }
+
+    public static PaymentInstrument CreateBankAccount(string cardNumber, string accountHolderName, string accountNumber,
+        string iBan, bool isAuth, long paymentInstrumentGroupId)
+    {
+        return new PaymentInstrument(cardNumber, accountHolderName, accountNumber, iBan, isAuth, paymentInstrumentGroupId);
+    }
+
+    public string CardNumber { get; private set; }
+    public string AccountHolderName { get; private set; }
+    public string AccountNumber { get; private set; }
+    public string IBan { get; private set; }
+
+    public string PosTerminalId { get; private set; }
+    public string Description { get; set; }
+
+    public PaymentInstrumentType Type { get; private set; }
+    
+    public bool IsAuth { get; private set; }
+    
+    public long PaymentInstrumentGroupId { get; private set; }
+    public PaymentInstrumentGroup PaymentInstrumentGroup { get; private set; }
+}

Company.Domain/PaymentInstrumentAgg/PaymentInstrumentGroup.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using _0_Framework.Application;
+using _0_Framework.Domain;
+
+namespace Company.Domain.PaymentInstrumentAgg;
+
+public class PaymentInstrumentGroup:EntityBase
+{
+    public PaymentInstrumentGroup(string name)
+    {
+        Name = name;
+        IsActive = IsActive.True;
+    }
+
+    public string Name { get; private set; }
+    public IsActive IsActive { get; private set; }
+    public List<PaymentInstrument> PaymentInstruments { get; set; }
+
+    public void Edit(string name)
+    {
+        Name = name;
+    }
+
+    public void DeActive()
+    {
+        IsActive = IsActive.False;
+    }
+}

Company.Domain/PaymentTransactionAgg/IPaymentTransactionRepository.cs

@@ -0,0 +1,14 @@
+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);
+
+    Task<PaymentTransactionDetailsViewModel> GetDetails(long id);
+}

Company.Domain/PaymentTransactionAgg/PaymentTransaction.cs

@@ -0,0 +1,88 @@
+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="amount">مبلغ تراکنش</param>
+    /// <param name="contractingPartyName"></param>
+    /// <param name="callBackUrl"></param>
+    public PaymentTransaction(long contractingPartyId,
+        double amount,
+        string contractingPartyName,string callBackUrl)
+    {
+        ContractingPartyId = contractingPartyId;
+        Status = PaymentTransactionStatus.Pending;
+        Amount = amount;
+        ContractingPartyName = contractingPartyName;
+        CallBackUrl = callBackUrl;
+    }
+
+    /// <summary>
+    /// تاریخ و زمان انجام پرداخت
+    /// </summary>
+    public DateTime TransactionDate { get; private set; }
+
+    /// <summary>
+    /// شناسه طرف حساب
+    /// </summary>
+    public long ContractingPartyId { get; private set; }
+
+    /// <summary>
+    /// نام طرف حساب
+    /// </summary>
+    public string ContractingPartyName { get; private set; }
+
+    /// <summary>
+    /// نام بانک
+    /// </summary>
+    public string BankName { get; private set; }
+
+    /// <summary>
+    /// شماره کارت
+    /// </summary>
+    public string CardNumber { get; private set; }
+
+    /// <summary>
+    /// وضعیت تراکنش پرداخت
+    /// </summary>
+    public PaymentTransactionStatus Status { get; private set; }
+
+    /// <summary>
+    /// مبلغ تراکنش
+    /// </summary>
+    public double Amount { get; private set; }
+
+    /// <summary>
+    /// شناسه یکتای تراکنش
+    /// </summary>
+    public string TransactionId { get; private set; }
+
+    public string CallBackUrl { get; private set; }
+
+    public void SetPaid(string cardNumber,string bankName)
+    {
+        Status = PaymentTransactionStatus.Success;
+        TransactionDate = DateTime.Now;
+        CardNumber = cardNumber;
+        BankName = bankName;
+    }
+    public void SetFailed()
+    {
+        Status = PaymentTransactionStatus.Failed;
+        TransactionDate = DateTime.Now;
+    }
+    public void SetTransactionId(string transactionId)
+    {
+        TransactionId = transactionId;
+    }
+}

Company.Domain/RepresentativeAgg/IRepresentativeRepository.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.PersonalContractingParty;
@@ -20,4 +21,10 @@ 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);
+	ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking, bool isStaticCheckout, bool rotatingShiftCompute, double dailyWageUnAffected, bool totalLeaveCompute);
 
     /// <summary>
     /// محاسبه ساعات کارکرد پرسنل در صورت داشتن حضور غیاب

Company.Domain/SalaryAidAgg/ISalaryAidRepository.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.Reward;
 using CompanyManagment.App.Contracts.SalaryAid;
@@ -21,4 +22,5 @@ public interface ISalaryAidRepository:IRepository<long,SalaryAid>
 
 	SalaryAidsGroupedViewModel GetSearchListAsGrouped(SalaryAidSearchViewModel searchModel); 
 	#endregion
+
 }

Company.Domain/TemporaryClientRegistrationAgg/IInstitutionContractTempRepository.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using _0_Framework_b.Domain;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 
@@ -15,4 +16,11 @@ 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/IWorkshopTempRepository.cs

@@ -14,5 +14,7 @@ public interface IWorkshopTempRepository : IRepository<long, WorkshopTemp>
     /// <returns></returns>
     Task<List<WorkshopTempViewModel>> GetWorkshopTemp(long contractingPartyTemp);
 
+    System.Threading.Tasks.Task RemoveWorkshopTemps(List<long> workshopTempIds);
+
 
 }

Company.Domain/TemporaryClientRegistrationAgg/InstitutionContractTemp.cs

@@ -34,12 +34,14 @@ public class InstitutionContractTemp : EntityBase
     /// بصورت یکجا
     /// -
     /// بصئورت ماهیانه
+    /// OneTime
     /// </summary>
     public string PaymentModel { get; private set; }
 
     /// <summary>
     /// مدت قرارداد
     /// چند ماهه؟
+    /// "12"
     /// </summary>
     public string PeriodModel { get; private set; }
 
@@ -129,6 +131,9 @@ public class InstitutionContractTemp : EntityBase
         VerifyCodeEndTime = verifyCodeEndTime;
     }
 
-   
+    public void ChangeRegistrationStatus(string registrationStatus)
+    {
+        RegistrationStatus = registrationStatus;
+    }
 
 }

Company.Domain/WorkshopAgg/IWorkshopRepository.cs

@@ -69,7 +69,7 @@ public interface IWorkshopRepository : IRepository<long, Workshop>
     Task<int> GetWorkshopsForEmployeeStartWorkCount(long accountId);
     Task<List<WorkshopWithLeftWorkTempEmployeesDto>> GetWorkshopsForLeftWorkTemp(long accountId);
     Task<int> GetWorkshopsForLeftWorkTempCount(long accountId);
-    Task<List<WorkshopSelectListViewModel>> GetSelectList(string search);
+    Task<List<WorkshopSelectListViewModel>> GetSelectList(string search, long id);
 
 
     #endregion

Company.Domain/WorkshopAgg/Workshop.cs

@@ -1,6 +1,7 @@
 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;
@@ -76,23 +77,13 @@ 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 insuranceCheckoutOvertime, bool insuranceCheckoutFamilyAllowance, bool createContract, bool signContract, bool createCheckout, bool signCheckout, IsActive cutContractEndOfYear, bool rotatingShiftCompute, bool isStaticCheckout)
     {
         WorkshopName = workshopName;
         WorkshopSureName = workshopSureName;
@@ -136,6 +127,13 @@ public class Workshop : EntityBase
         WorkshopHolidayWorking = workshopHolidayWorking;
         InsuranceCheckoutOvertime = insuranceCheckoutOvertime;
         InsuranceCheckoutFamilyAllowance = insuranceCheckoutFamilyAllowance;
+        CreateContract = createContract;
+        SignContract = signContract;
+        CreateCheckout = createCheckout;
+        SignCheckout = signCheckout;
+        CutContractEndOfYear = cutContractEndOfYear;
+        RotatingShiftCompute = rotatingShiftCompute;
+        IsStaticCheckout = isStaticCheckout;
     }
 
 
@@ -187,8 +185,17 @@ public class Workshop : EntityBase
     public bool AddLeavePay { get; private set; }
     public string ZoneName { get; private set; }
     public bool TotalPaymentHide { get; private set; }
+
+    /// <summary>
+    /// آیا  طبقه بندی شده است
+    /// [کارگاه دارای طرح طبقه بندی می باشد ؟]
+    /// </summary>
     public bool IsClassified { get; private set; }
 
+    /// <summary>
+    /// آیا طرح طبقه بندی تکمیل شده است 
+    /// </summary>
+    public bool IsClassificationSchemeCompleted { get; private set; }
 
     //نحوه محاسبه مزد مرخصی
     public string ComputeOptions { get; private set; }
@@ -210,9 +217,32 @@ 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; }
 
-	public Workshop()
+    /// <summary>
+    /// محاسبه نوبت کاری در فیش حقوقی
+    /// </summary>
+    public bool RotatingShiftCompute { get; private set; }
+
+    /// <summary>
+    /// تصفیه حساب بصورت استاتیک محاصبه شود
+    /// </summary>
+    public bool IsStaticCheckout { get; private set; }
+
+    public Workshop()
     {
         RollCallServicesList = new List<RollCallService>();
         CustomizeCheckouts = new List<CustomizeCheckout>();
@@ -243,7 +273,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 insuranceCheckoutOvertime, bool insuranceCheckoutFamilyAllowance, bool createContract, bool signContract, bool createCheckout, bool signCheckout, IsActive cutContractEndOfYear, bool rotatingShiftCompute, bool isStaticCheckout)
     {
         WorkshopName = workshopName;
         WorkshopSureName = workshopSureName;
@@ -284,6 +314,13 @@ 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/YearlySalaryAgg/IYearlySalaryRepository.cs

@@ -6,6 +6,7 @@ using CompanyManagment.App.Contracts.YearlySalary;
 using System.Threading.Tasks;
 using CompanyManagment.App.Contracts.Checkout;
 using CompanyManagment.App.Contracts.Holiday;
+using CompanyManagment.App.Contracts.Contract;
 
 namespace Company.Domain.YearlySalaryAgg;
 
@@ -17,10 +18,50 @@ public interface IYearlySalaryRepository : IRepository<long, YearlySalary>
     void TestDayliFeeCompute();
     List<string> GetYears();
     List<YearlySalaryViewModel> GetYearlySalary();
+
+    /// <summary>
+    /// دریافت مزد روزانه فیش حقوقی
+    /// </summary>
+    /// <param name="contract"></param>
+    /// <param name="checkoutStart"></param>
+    /// <param name="checkoutEnd"></param>
+    /// <returns></returns>
+    Task<double> GetCheckoutDailyWage(EditContract contract, DateTime checkoutStart, DateTime checkoutEnd);
+
+    /// <summary>
+    /// دریافت مزد روزانه بر اساس تاریخ شروع و پایان
+    /// </summary>
+    /// <param name="start"></param>
+    /// <param name="end"></param>
+    /// <returns></returns>
+    Task<(double dailyWage, long yearlySalaryId)> GetDailyWageByStartEnd(DateTime start, DateTime end);
+
     MontlywageBunosYearsViewModel GetMontlyBunosYears(TimeSpan weeklyTime, DateTime contractStart,DateTime contractEnd, double daylyWage, string weeklyWorkingTime, int officialholiday, int friday, string totalHoursH, string totalHorsM, string basic, int fridayStartToEnd, double dayliFeeComplete, bool hasRollCall, bool holidaysWorking,string shiftWork);
     double GetLeavePay(DateTime contractStart, DateTime contractEnd, double daylyWage, double consumableItem, double housingAllowance, double familyAllowance , string weeklyWorkingTime, int officialholiday, int friday, string totalHoursH, string totalHorsM);
     double GetOverTimeWorking(double dayliWage, string overTimeWorkH, string overTimeWorkM);
     double GetOverNightWorking(double dayliWage, string overNightWorkH, string overNightWorkM, string weeklyWorkingTime, int officialholiday, int friday, DateTime contractStart, DateTime contractEnd, string totalHoursH, string totalHorsM);
+
+    /// <summary>
+    /// متد ارتقاء مزد  دلخواه
+    /// </summary>
+    /// <param name="newContractStart"></param>
+    /// <param name="lastContractStart"></param>
+    /// <param name="lastContractManualDailyWage"></param>
+    /// <returns></returns>
+    Task<UpgradeManualDailyWageModel> UpgradeManualDailyWage(DateTime newContractStart, DateTime lastContractStart,
+        double lastContractManualDailyWage);
+
+    /// <summary>
+    /// متد محاسبه پایه سنوات و لیست پایه سنوات های پرسنل
+    /// </summary>
+    /// <param name="contractStart"></param>
+    /// <param name="contractEnd"></param>
+    /// <param name="employeeId"></param>
+    /// <param name="workshopId"></param>
+    /// <param name="leftWorkList"></param>
+    /// <returns></returns>
+    Task<BaseYearDataViewModel> BaseYearCompute(DateTime contractStart, DateTime contractEnd, long employeeId,
+        long workshopId, List<LeftWorkViewModel> leftWorkList);
     DayliFeeViewModel DayliFeeComputing(DateTime startDateW,DateTime contractStart, DateTime endDateW, long employeeId, long workshopId,List<LeftWorkViewModel> leftWorkList);
     Task<DayliFeeViewModel> DayliFeeComputingAsync(DateTime startDateW, DateTime contractStart, DateTime endDateW, long employeeId, long workshopId, List<LeftWorkViewModel> leftWorkList);
     string ConsumableItems(DateTime endDateW);

Company.Domain/empolyerAgg/IEmployerRepository.cs

@@ -34,7 +34,7 @@ public interface IEmployerRepository : IRepository<long, Employer>
 
     List<EmployerViewModel> GetEmployersHasWorkshop();
 
-    Task<List<EmployerSelectListViewModel>> GetSelectList(string search);
+    Task<List<EmployerSelectListViewModel>> GetSelectList(string search,long id);
 
 
     #endregion
@@ -56,6 +56,17 @@ public interface IEmployerRepository : IRepository<long, Employer>
 
 	#endregion
 
+	#region Api
+	Task<List<GetEmployerListViewModel>> GetEmployerList(GetEmployerSearchModel searchModel);
+
+	Task<GetLegalEmployerDetailViewModel> GetLegalEmployerDetail(long id);
+	Task<GetRealEmployerDetailViewModel> GetRealEmployerDetail(long id);
+	//Task<List<EmployerSelectListViewModel>> GetSelectList(string search);
+	Task<OperationResult<string>> DeactivateWithSubordinates(long id);
+
+
+	#endregion
+
 
 
 }

CompanyManagement.Infrastructure.Excel/InstitutionContract/InstitutionContractExcelGenerator.cs

@@ -0,0 +1,262 @@
+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,7 +132,120 @@ 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 bool HasAmountConflict { get; set; }
+    public string EmployeeMandatoryHoursStr { get; set; }
+    public TimeSpan EmployeeMandatoryHoursTimeSpan { 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,6 +5,7 @@ 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;
 
@@ -134,8 +135,62 @@ public class CreateCheckout
     /// </summary>
     public string TotalDayOfBunosesCompute { get; set; }
 
+    /// <summary>
+    /// ساعت موظفی پرسنل برای این ماه
+    /// </summary>
+    public TimeSpan EmployeeMandatoryHours { get; set; }
+
     public bool HolidayWorking { get; set; }
 
     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; }
+
+    public bool HasLeft { get; set; }
+
+
+    /// <summary>
+    ///  دستمزد روزانه خام بعد از تاثیر ساعت کار
+    /// </summary>
+    public double DailySalaryAffected { get; set; }
+
+    /// <summary>
+    /// پایه سنوات بعد از تاثیر ساعت کار
+    /// </summary>
+    public double BaseYearAffected { get; set; }
+
+
+    /// <summary>
+    /// دستمزد روزانه قبل از تاثیر ساعت کار
+    /// </summary>
+    public double DailySalaryUnAffected { get; set; }
+
+    /// <summary>
+    /// دستمزد روزانه  دریافت شده از سمت فرانت
+    /// </summary>
+    public string DailySalaryUnAffectedStr { get; set; }
+
+    /// <summary>
+    /// مزد سالانه نرمال دریافت از سمت فرانت
+    /// </summary>
+    public string NormalDailyWage { get; set; }
+
+    /// <summary>
+    /// پایه سنوات قبل از تاثیر ساعت کار
+    /// </summary>
+    public double BaseYearUnAffected { get; set; }
 }

CompanyManagment.App.Contracts/Checkout/CreateCheckoutListViewModel.cs

@@ -39,7 +39,11 @@ 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,6 +27,14 @@ 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/ClassificationScheme/AddEmployeeToGroup.cs

@@ -0,0 +1,84 @@
+using System.Collections.Generic;
+
+namespace CompanyManagment.App.Contracts.ClassificationScheme;
+
+/// <summary>
+/// مدل برای مدال افزودن پرسنل ب گروه
+/// </summary>
+public class AddEmployeeToGroup
+{
+    /// <summary>
+    /// آی دی 
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// نام کامل پرسنل
+    /// </summary>
+    public string EmployeeFullName { get; set; }
+
+    /// <summary>
+    /// آی دی پرسنل
+    /// </summary>
+    public long EmployeeId { get; set; }
+
+    /// <summary>
+    /// آی دی طرح
+    /// </summary>
+    public long SchemeId { get; set; }
+
+    /// <summary>
+    /// آی دی گروه
+    /// </summary>
+    public long GroupId { get; set; }
+
+    /// <summary>
+    /// شماره گروه
+    /// </summary>
+    public string GoroupNo { get; set; }
+
+    /// <summary>
+    /// آی دی شغل
+    /// </summary>
+    public long JobId { get; set; }
+
+    /// <summary>
+    /// نام شغل
+    /// </summary>
+    public string JobName { get; set; }
+
+    /// <summary>
+    /// کد شغل
+    /// </summary>
+    public string JobCode { get; set; }
+
+
+    /// <summary>
+    /// لیست گروه ها
+    /// </summary>
+    public List<ClassificationGroupList> ClassificationGroupList{ get; set; }
+}
+
+/// <summary>
+/// لیست گروه ها
+/// </summary>
+public class ClassificationGroupList
+{
+    /// <summary>
+    /// آی دی گروه
+    /// </summary>
+    public long GroupId { get; set; }
+
+    /// <summary>
+    /// شماره گروه
+    /// استرینگ
+    /// </summary>
+    public string GroupNo { get; set; }
+
+
+    /// <summary>
+    /// شماره گروه
+    /// اینتیجر
+    /// </summary>
+    public int GroupNoInt { get; set; }
+}

CompanyManagment.App.Contracts/ClassificationScheme/ClassificationGroupAndJobModel.cs

@@ -0,0 +1,104 @@
+using System.Collections.Generic;
+
+namespace CompanyManagment.App.Contracts.ClassificationScheme;
+
+/// <summary>
+/// ایجاد گروه
+/// </summary>
+public class ClassificationGroupAndJobModel
+{
+    /// <summary>
+    /// آی دی گروه
+    /// </summary>
+    public long GroupId { get; set; }
+    /// <summary>
+    /// شماره گروه
+    /// استرینگ
+    /// </summary>
+    public string GroupNo { get; set; }
+
+    /// <summary>
+    /// شماره گروه نوع عددی
+    /// </summary>
+    public int GroupNoInt { get; set; }
+
+    /// <summary>
+    /// آی دی کارگاه
+    /// </summary>
+    public long WorkshopId { get; set; }
+    /// <summary>
+    /// آی دی طرح
+    /// </summary>
+    public long ClassificationSchemeId { get; set; }
+
+    /// <summary>
+    /// لیست مشاغل
+    /// </summary>
+    public List<EditClassificationGroupJob> EditClassificationGroupJob { get; set; }
+}
+
+/// <summary>
+/// ایجاد مشاغل گروه
+/// </summary>
+public class CreateClassificationGroupJob
+{
+    /// <summary>
+    /// آی دی شغل
+    /// </summary>
+    public long JobId { get; set; }
+
+    /// <summary>
+    /// نام شغل
+    /// </summary>
+    public string JobName { get; set; }
+
+    /// <summary>
+    /// کد شغل
+    /// </summary>
+    public string JobCode { get; set; }
+
+    /// <summary>
+    /// آی دی گروه
+    /// </summary>
+    public long ClassificationGroupId { get; set; }
+
+    /// <summary>
+    /// شماره گروه
+    /// </summary>
+    public string GroupNo { get; set; }
+}
+
+/// <summary>
+/// ویرایش مشاغل گروه
+/// </summary>
+public class EditClassificationGroupJob : CreateClassificationGroupJob
+{
+    /// <summary>
+    /// ای دی شغل
+    /// </summary>
+    public long Id { get; set; }
+}
+
+/// <summary>
+/// ایجاد یا ویرایش مشاغل
+/// </summary>
+public class CreateOrEditGroupJobs
+{
+    /// <summary>
+    /// آی دی گروه
+    /// </summary>
+    public long GroupId { get; set; }
+ 
+    /// <summary>
+    /// شماره گروه
+    /// استرینگ
+    /// </summary>
+    public string GroupNo { get; set; }
+
+    /// <summary>
+    /// آی دی مشاغل
+    /// </summary>
+    public List<long> JobIdList { get; set; }
+}
+
+

CompanyManagment.App.Contracts/ClassificationScheme/ClassificationSchemePartialModel.cs

@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace CompanyManagment.App.Contracts.ClassificationScheme;
+
+/// <summary>
+/// پارشیال صفحه ایجاد طرح
+/// </summary>
+public class ClassificationSchemePartialModel
+{
+    /// <summary>
+    /// آیا طرح دارد
+    /// </summary>
+    public bool HasScheme { get; set; }
+
+    /// <summary>
+    /// آی دی کارگاه
+    /// </summary>
+    public long WorkshopId { get; set; }
+
+    /// <summary>
+    /// لیست طرح
+    /// </summary>
+    public List<EditClassificationScheme> ClassificationSchemesList { get; set; }
+}

CompanyManagment.App.Contracts/ClassificationScheme/CreateClassificationGroupSalaryAndRialCoeficient.cs

@@ -0,0 +1,204 @@
+using _0_Framework.Application.Enums;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CompanyManagment.App.Contracts.ClassificationScheme;
+
+/// <summary>
+/// ایجاد دستمزد گروه و ضریب ریالی
+/// </summary>
+public class CreateClassificationGroupSalaryAndRialCoefficient
+{
+
+    /// <summary>
+    /// آی دی گروه
+    /// </summary>
+    public long ClassificationGroupId { get; set; }
+
+    /// <summary>
+    /// شماره گروه
+    /// </summary>
+    public string GroupNo { get; set; }
+
+    /// <summary>
+    /// دستمزد گروه
+    /// </summary>
+    public double GroupSalary { get; set; }
+
+
+    /// <summary>
+    /// تاریخ شروع
+    /// </summary>
+    public DateTime StartDate { get; set; }
+
+    /// <summary>
+    /// تاریخ پایان
+    /// </summary>
+    public DateTime EndDate { get; set; }
+
+    /// <summary>
+    /// سال
+    /// </summary>
+    public int Year { get; set; }
+
+
+
+}
+
+/// <summary>
+/// ویرایش دستمزد
+/// </summary>
+public class EditClassificationGroupSalaryAndRialCoefficient : CreateClassificationGroupSalaryAndRialCoefficient
+{
+    /// <summary>
+    /// آی دی
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// تاریخ شروع
+    /// شمسی
+    /// </summary>
+   [DataType(DataType.Text)]
+    public string StartDateFa { get; set; }
+
+    /// <summary>   
+    /// تاریخ پایان
+    /// شمسی
+    /// </summary>
+    [DataType(DataType.Text)]
+    public string EndDateFa { get; set; }
+
+    /// <summary>
+    /// دستمزد گروه
+    /// </summary>
+    public string GroupSalaryStr { get; set; }
+}
+
+/// <summary>
+/// لیست دستمزدها و ضرایب ریالی
+/// </summary>
+public class SalaryAndRialCoefficientModel
+{
+    /// <summary>
+    /// تاریخ شروع
+    /// میلادی
+    /// </summary>
+    public DateTime StartDate { get; set; }
+
+    /// <summary>
+    /// تاریخ شروع
+    /// شمسی
+    /// </summary>
+    [DataType(DataType.Text)]
+    public string StartDateFa { get; set; }
+
+    /// <summary>
+    /// تاریخ پایان
+    /// میلادی
+    /// </summary>
+    public DateTime EndDate { get; set; }
+
+    /// <summary>   
+    /// تاریخ پایان
+    /// شمسی
+    /// </summary>
+    [DataType(DataType.Text)]
+    public string EndDateFa { get; set; }
+
+    /// <summary>
+    /// سال
+    /// </summary>
+    public int Year { get; set; }
+
+
+    /// <summary>
+    /// ضریب ریالی
+    /// string
+    /// </summary>
+    public string RialCoefficientStr { get; set; }
+
+    /// <summary>
+    /// ضریب ریالی
+    /// double
+    /// </summary>
+    public double RialCoefficient { get; set; }
+
+    /// <summary>
+    /// آی دی طرح
+    /// </summary>
+    public long SchemeId { get; set; }
+
+    /// <summary>
+    /// نوع ضریب
+    /// </summary>
+    public TypeOfCoefficient TypeOfCoefficient { get; set; }
+
+    /// <summary>
+    /// آی دی ضریب ریالی
+    /// </summary>
+    public long CoefficientId { get; set; }
+
+    /// <summary>
+    /// لیست دستمزدها و ضرایب بر اساس سال
+    /// </summary>
+    public List<EditClassificationGroupSalaryAndRialCoefficient> SalariesAndCoefficientList { get; set; }
+}
+
+
+/// <summary>
+/// تب دستمزد ها و ضرایب ریالی
+/// </summary>
+public class SalaryAndRialCoefficientTab
+{
+    /// <summary>
+    /// آی دی طرح
+    /// </summary>
+    public long SchemeId { get; set; }
+
+    /// <summary>
+    /// آیا دستمزدی قبلا ایجاد شده است؟
+    /// </summary>
+    public bool HasAnySalaries { get; set; }
+
+    /// <summary>
+    /// لیست دستمزدها و ضرایب
+    /// </summary>
+    public List<SalaryAndRialCoefficientTabDataList> SalaryAndRialCoefficientTabDataList { get; set; }
+}
+
+/// <summary>
+/// لیست دستمزدها
+/// </summary>
+public class SalaryAndRialCoefficientTabDataList
+{
+    /// <summary>
+    /// تاریخ شروع
+    /// شمسی
+    /// </summary>
+    [DataType(DataType.Text)]
+    public string StartDateFa { get; set; }
+
+    /// <summary>   
+    /// تاریخ پایان
+    /// شمسی
+    /// </summary>
+    [DataType(DataType.Text)]
+    public string EndDateFa { get; set; }
+
+    /// <summary>
+    /// سال
+    /// </summary>
+    public int Year { get; set; }
+
+    /// <summary>
+    /// ضریب ریالی
+    /// string
+    /// </summary>
+    public string RialCoefficientStr { get; set; }
+}
+

CompanyManagment.App.Contracts/ClassificationScheme/CreateClassificationScheme.cs

@@ -0,0 +1,63 @@
+using _0_Framework.Application.Enums;
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace CompanyManagment.App.Contracts.ClassificationScheme;
+
+/// <summary>
+/// ایجاد طرح 
+/// </summary>
+public class CreateClassificationScheme
+{
+    /// <summary>
+    /// تاریخ شمول طرح
+    /// میلادی
+    /// </summary>
+    public DateTime IncludingDateGr { get; set; }
+    
+    /// <summary>
+    /// تاریخ شمول طرح
+    /// شمسی
+    /// </summary>
+    public string IncludingDateFa { get; set; }
+
+    /// <summary>
+    /// تاریخ اجرای طرح
+    /// میلادی
+    /// </summary>
+    public DateTime ExecutionDateGr { get; set; }
+
+    /// <summary>
+    /// تاریخ اجرای طرح
+    /// شمسی
+    /// </summary>
+    public string ExecutionDateFa { get; set; }
+
+    /// <summary>
+    /// تاریخ پایان طرح
+    /// </summary>
+    public DateTime? EndSchemeDateGr { get; set; }
+
+
+    /// <summary>
+    /// نام کامل طراح
+    /// </summary>
+    public string DesignerFullName { get; set; }
+
+    /// <summary>
+    /// شماره همراه طراح
+    /// </summary>
+    [RegularExpression("^[0-9]*$", ErrorMessage = "لطفا فقط عدد وارد کنید")]
+    public string DesignerPhone { get; set; }
+
+    /// <summary>
+    /// آی دی کارگاه
+    /// </summary>
+    public long WorkshopId { get; set; }
+
+
+    /// <summary>
+    /// نوع ضریب
+    /// </summary>
+    public TypeOfCoefficient TypeOfCoefficient { get; set; }
+}

CompanyManagment.App.Contracts/ClassificationScheme/EditClassificationScheme.cs

@@ -0,0 +1,12 @@
+namespace CompanyManagment.App.Contracts.ClassificationScheme;
+
+/// <summary>
+/// ویرایش طرح
+/// </summary>
+public class EditClassificationScheme : CreateClassificationScheme
+{
+    /// <summary>
+    /// آی دی طرح
+    /// </summary>
+    public long Id { get; set; }
+}

CompanyManagment.App.Contracts/ClassificationScheme/EmployeeInfoTab.cs

@@ -0,0 +1,110 @@
+using System.Collections.Generic;
+
+namespace CompanyManagment.App.Contracts.ClassificationScheme;
+
+/// <summary>
+/// جستجوی پرسنل
+/// تب افزودن پرسنل طبقه بندی مشاغل
+/// </summary>
+public class EmployeeInfoTab
+{
+    /// <summary>
+    /// آی دی کارگاه
+    /// </summary>
+    public long WorkshopId { get; set; }
+
+    /// <summary>
+    /// آی دی پرسنل
+    /// </summary>
+    public long EmployeeId { get; set; }
+
+    /// <summary>
+    /// نام کامل پرسنل
+    /// </summary>
+    public string FullName { get; set; }
+
+    /// <summary>
+    /// آی دی طرح
+    /// </summary>
+    public long SchemeId { get; set; }
+
+    /// <summary>
+    /// لیست پرسنل
+    /// </summary>
+    public List<EmployeeInfoList> EmployeeInfoList { get; set; }
+
+    public List<string> YearlyList { get; set; }
+}
+
+/// <summary>
+/// لیست پرسنل
+/// تب افزودن پرسنل طبقه بندی مشاغل
+/// </summary>
+public class EmployeeInfoList
+{
+    /// <summary>
+    /// آی دی پرسنل
+    /// </summary>
+    public long EmployeeId { get; set; }
+
+    /// <summary>
+    /// نام کامل پرسنل
+    /// </summary>
+    public string FullName { get; set; }
+
+    /// <summary>
+    /// شماره گروه یا گره هایی که پرسنل در آن اضافه شده
+    /// </summary>
+    public string GroupNo { get; set; }
+
+    /// <summary>
+    /// آیا پرسنل هیچ گروهی دارد؟
+    /// </summary>
+    public bool HasGroup { get; set; }
+
+
+    /// <summary>
+    /// آخرین تاریخ شروع بکار قراداد
+    /// </summary>
+    public string LastStartContractWork { get; set; }
+
+    /// <summary>
+    /// آخرین تاریخ ترک کار قراداد
+    /// </summary>
+    public string LastLeftContractWork { get; set; }
+
+    /// <summary>
+    /// آخرین تاریخ شروع بکار بیمه
+    /// </summary>
+    public string LastStartInsuranceWork { get; set; }
+
+    /// <summary>
+    /// آخرین تاریخ ترک کار بیمه
+    /// </summary>
+    public string LastLeftInsuranceWork { get; set; }
+
+    /// <summary>
+    /// آیا پرسنل قرداد است
+    /// </summary>
+    public bool ContractPerson { get; set; }
+
+    /// <summary>
+    /// آیا پرسنل بیمه است
+    /// </summary>
+    public bool InsurancePerson { get; set; }
+
+    /// <summary>
+    /// آیا ترک کار قرارداد دارد
+    /// </summary>
+    public bool ContractLeft { get; set; }
+
+    /// <summary>
+    /// آیا ترک کار بیمه دارد
+    /// </summary>
+    public bool InsuranceLeft { get; set; }
+
+    /// <summary>
+    /// آیا کلا ترک کار کرده است
+    /// </summary>
+    public bool Black { get; set; }
+}

CompanyManagment.App.Contracts/ClassificationScheme/IClassificationSchemeApplication.cs

@@ -0,0 +1,167 @@
+using _0_Framework.Application;
+using CompanyManagment.App.Contracts.TemporaryClientRegistration;
+using CompanyManagment.App.Contracts.YearlySalary;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace CompanyManagment.App.Contracts.ClassificationScheme;
+
+/// <summary>
+/// اپلیکیش طرح طبقه بندی مشاغل
+/// </summary>
+public interface IClassificationSchemeApplication
+{
+    /// <summary>
+    /// پارشیال صفحه ایجاد طرح
+    /// </summary>
+    /// <param name="worskhopId"></param>
+    /// <returns></returns> 
+    Task<ClassificationSchemePartialModel> ClassificationSchemePartialModel(long workshopId);
+
+    /// <summary>
+    /// ایجاد طرح
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<OperationResult> CreateClassificationScheme(CreateClassificationScheme command);
+
+    /// <summary>
+    /// دریافت اطلاعات طرح برای مودال ویرایش
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<EditClassificationScheme> GetClassificationScheme(long id);
+
+    /// <summary>
+    /// ویرایش طرح
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<OperationResult> EditClassificationScheme(EditClassificationScheme command);
+
+
+
+    /// <summary>
+    /// دریافت گروه ها و مشاغلشان برای تب تعیین مشاغل
+    /// </summary>
+    /// <param name="schemeId"></param>
+    /// <returns></returns>
+    Task<List<ClassificationGroupAndJobModel>> GetGroupAndJobs(long schemeId);
+
+
+    /// <summary>
+    /// دریافت مشاغل گروه توسط آی دی گروه
+    /// </summary>
+    /// <param name="groupId"></param>
+    /// <returns></returns>
+    Task<List<EditClassificationGroupJob>> GetGroupJobs(long groupId);
+
+    /// <summary>
+    /// چک میکند که آی پرسنلی وجود دارد که این شغل به او نسبت داده شده
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="groupId"></param>
+    /// <returns></returns>
+    Task<bool> CheckEmployeeHasThisJob(long id, long groupId);
+
+    /// <summary>
+    /// ایجاد مشاغل گروه
+    /// </summary>
+    /// <param name="createClassificationGroupJob"></param>
+    /// <param name="deleteJobList"></param>
+    /// <returns></returns>
+    Task<bool> CreateGroupJobs(List<CreateClassificationGroupJob> createClassificationGroupJob, List<long> deleteJobList);
+
+
+    /// <summary>
+    /// چک میکند که آیا برای این طرح تابحال دستمزدی ایجاد شده یا نه
+    /// </summary>
+    /// <param name="schemeId"></param>
+    /// <returns></returns>
+    Task<SalaryAndRialCoefficientTab> GetSalariesTabData(long schemeId);
+
+    /// <summary>
+    /// در یافت اطلاعات گروه برای لود مودال ایجاد دستمزد های
+    /// </summary>
+    /// <returns></returns>
+    Task<SalaryAndRialCoefficientModel> GetGroupToCreateSalariesModal(long schemeId);
+
+    /// <summary>
+    /// ایجاد دستمزدها و ضرایب ریالی هر گروه در هر سال
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<OperationResult> CreateGroupSalaryAndCoefficient(SalaryAndRialCoefficientModel command);
+
+
+
+    /// <summary>
+    /// دریافت دستمزدها و ضریب ریالی برای مودال ویرایش
+    /// </summary>
+    /// <param name="schemeId"></param>
+    /// <param name="startDate"></param>
+    /// <param name="endDate"></param>
+    /// <returns></returns>
+    Task<SalaryAndRialCoefficientModel> GetEditSalariesData(long schemeId, string startDate, string endDate);
+
+    /// <summary>
+    /// ثبت ویرایش دستمزدها و ضریب
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<OperationResult> EditGroupSalaryAndCoefficient(SalaryAndRialCoefficientModel command);
+
+
+    /// <summary>
+    /// دریافت لیست پرسنل برای تب افزودن پرسنل
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<EmployeeInfoTab> GetEmployeeDataTab(EmployeeInfoTab command);
+
+
+    /// <summary>
+    /// دریافت گروه های طرح
+    /// </summary>
+    /// <param name="schemeId"></param>
+    /// <returns></returns>
+    Task<List<ClassificationGroupList>> GetGroups(long schemeId);
+
+    /// <summary>
+    /// ذخیره پرسنل افزوده شده در گروه
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<OperationResult> AddEmployeeToGroup(AddEmployeeToGroup command);
+
+    /// <summary>
+    /// ذخیره ویرایش گروه پرسنل
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<OperationResult> EditGroupMember(AddEmployeeToGroup command);
+
+    /// <summary>
+    ///  دریافت اطلاعات عضویتی پرسنل در گروه
+    /// </summary>
+    /// <param name="employeeId"></param>
+    /// <returns></returns>
+    Task<AddEmployeeToGroup> GetEmployeeMemberizeData(long employeeId);
+
+
+    /// <summary>
+    /// متد محاسبه پایه سنوات برا افراد تک گروه
+    /// </summary>
+    /// <param name="schemeStart">تاریخ شروع طرح</param>
+    /// <param name="schemeEnd">تاریخ پاین طرح، اجباری نیست</param>
+    /// <param name="contractStart">تاریخ شروع قراداد</param>
+    /// <param name="contractEnd">تاریخ پایان قراداد</param>
+    /// <param name="groupNo">شماره گروه</param>
+    /// <param name="employeeId">آی دی پرسنل</param>
+    /// <param name="workshopId">آی دی کارگاه</param>
+    /// <returns></returns>
+    Task<BaseYearDataViewModel> BaseYearComputeOneGroup(DateTime schemeStart, DateTime? schemeEnd,
+        DateTime contractStart, DateTime contractEnd, string groupNo, long employeeId, long workshopId);
+
+}

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

@@ -1,17 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+	</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>
+	<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>
 
 </Project>

CompanyManagment.App.Contracts/ContactUs/IContactUsApplication.cs

@@ -0,0 +1,18 @@
+using _0_Framework.Application;
+
+namespace CompanyManagment.App.Contracts.ContactUs;
+
+public interface IContactUsApplication
+{
+    OperationResult Create(CreateContactUs command);
+}
+
+public class CreateContactUs
+{
+    public string FirstName { get; set; }
+    public string LastName { get; set; }
+    public string Email { get; set; }
+    public string PhoneNumber { get; set; }
+    public string Title { get; set; }
+    public string Message { get; set; }
+}

CompanyManagment.App.Contracts/Contract/ComputingViewModel.cs

@@ -1,6 +1,7 @@
 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;
 
@@ -45,6 +46,38 @@ 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; }
+
+    /// <summary>
+    /// ساعت موظفی پرسنل برای این ماه
+    /// </summary>
+    public TimeSpan EmployeeMandatoryHours { get; set; }
+
+
+    /// <summary>
+    /// پایه سنوات قبل از تاثیر ساعت کار
+    /// </summary>
+    public double BaseYearUnAffected { get; set; }
+
+
+    /// <summary>
+    /// پایه سنوات بعد از تاثیر ساعت کار
+    /// </summary>
+    public double BaseYearAffected { get; set; }
+
+
+    /// <summary>
+    ///  دستمزد روزانه خام بعد از تاثیر ساعت کار
+    /// </summary>
+    public double DailySalaryAffected { get; set; }
 
     //public List<string> holidays;
 }