change main pages

fix step4 bug
change some styles
2025-06-01 18:23:51 +03:30 · 2025-05-20 17:45:43 +03:30 · 2025-05-19 18:04:47 +03:30 · 2025-05-19 18:04:36 +03:30 · 2025-05-18 17:54:55 +03:30 · 2025-05-18 17:52:33 +03:30
359 changed files with 40825 additions and 95772 deletions
--- a/0_Framework/Application/AuthHelper.cs
+++ b/0_Framework/Application/AuthHelper.cs
@@ -12,65 +12,65 @@ namespace _0_Framework.Application;

 public class AuthHelper : IAuthHelper
 {
-	private readonly IHttpContextAccessor _contextAccessor;
+    private readonly IHttpContextAccessor _contextAccessor;
+        
+    public AuthHelper(IHttpContextAccessor contextAccessor)
+    {
+        _contextAccessor = contextAccessor;
+    }

-	public AuthHelper(IHttpContextAccessor contextAccessor)
-	{
-		_contextAccessor = contextAccessor;
-	}
+    public AuthViewModel CurrentAccountInfo()
+    {
+        var result = new AuthViewModel();
+        if (!IsAuthenticated())
+            return result;

-	public AuthViewModel CurrentAccountInfo()
-	{
-		var result = new AuthViewModel();
-		if (!IsAuthenticated())
-			return result;
-
-		var claims = _contextAccessor.HttpContext.User.Claims.ToList();
-		result.Id = long.Parse(claims.FirstOrDefault(x => x.Type == "AccountId").Value);
-		result.Username = claims.FirstOrDefault(x => x.Type == "Username")?.Value;
-		result.ProfilePhoto = claims.FirstOrDefault(x => x.Type == "ProfilePhoto")?.Value;
-		result.RoleId = long.Parse(claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value);
-		result.Fullname = claims.FirstOrDefault(x => x.Type == ClaimTypes.Name)?.Value;
-		result.Role = claims.FirstOrDefault(x => x.Type == "RoleName")?.Value;
-		result.ClientAriaPermission = claims.FirstOrDefault(x => x.Type == "ClientAriaPermission").Value;
-		result.AdminAreaPermission = claims.FirstOrDefault(x => x.Type == "AdminAreaPermission").Value;
-		result.PositionValue = !string.IsNullOrWhiteSpace(claims.FirstOrDefault(x => x.Type == "PositionValue")?.Value) ? int.Parse(claims.FirstOrDefault(x => x.Type == "PositionValue")?.Value) : 0;
-		result.WorkshopList = Tools.DeserializeFromBsonList<WorkshopClaim>(claims.FirstOrDefault(x => x is { Type: "workshopList" })?.Value);
-		result.WorkshopSlug = claims.FirstOrDefault(x => x is { Type: "WorkshopSlug" }).Value;
-		result.Mobile = claims.FirstOrDefault(x => x is { Type: "Mobile" }).Value;
+        var claims = _contextAccessor.HttpContext.User.Claims.ToList();
+        result.Id = long.Parse(claims.FirstOrDefault(x => x.Type == "AccountId").Value);
+        result.Username = claims.FirstOrDefault(x => x.Type == "Username")?.Value;
+        result.ProfilePhoto = claims.FirstOrDefault(x => x.Type == "ProfilePhoto")?.Value;
+        result.RoleId = long.Parse(claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value);
+        result.Fullname = claims.FirstOrDefault(x => x.Type == ClaimTypes.Name)?.Value;
+        result.Role = claims.FirstOrDefault(x => x.Type == "RoleName")?.Value;
+        result.ClientAriaPermission =claims.FirstOrDefault(x => x.Type == "ClientAriaPermission").Value;
+        result.AdminAreaPermission = claims.FirstOrDefault(x => x.Type == "AdminAreaPermission").Value;
+        result.PositionValue = !string.IsNullOrWhiteSpace(claims.FirstOrDefault(x => x.Type == "PositionValue")?.Value) ? int.Parse(claims.FirstOrDefault(x => x.Type == "PositionValue")?.Value) : 0;
+        result.WorkshopList = Tools.DeserializeFromBsonList<WorkshopClaim>(claims.FirstOrDefault(x => x is { Type: "workshopList" })?.Value);
+        result.WorkshopSlug = claims.FirstOrDefault(x => x is { Type: "WorkshopSlug" }).Value;
+        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;
-	}
+    }

-	public List<int> GetPermissions()
-	{
-		if (!IsAuthenticated())
-			return new List<int>();
+    public List<int> GetPermissions()
+    {
+        if (!IsAuthenticated())
+            return new List<int>();

-		var permissions = _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == "permissions")
-			?.Value;
-		return Tools.DeserializeFromBsonList<int>(permissions); //Mahan
-	}
+        var permissions = _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == "permissions")
+            ?.Value;
+        return Tools.DeserializeFromBsonList<int>(permissions); //Mahan
+    }

-	public long CurrentAccountId()
-	{
-		return IsAuthenticated()
-			? long.Parse(_contextAccessor.HttpContext.User.Claims.First(x => x.Type == "AccountId")?.Value)
-			: 0;
-	}
-	public long CurrentSubAccountId()
-	{
-		return IsAuthenticated()
-			? long.Parse(_contextAccessor.HttpContext.User.Claims.First(x => x.Type == "SubAccountId")?.Value)
-			: 0;
-	}
+    public long CurrentAccountId()
+    {
+        return IsAuthenticated()
+            ? long.Parse(_contextAccessor.HttpContext.User.Claims.First(x => x.Type == "AccountId")?.Value)
+            : 0;
+    }
+    public long CurrentSubAccountId()
+    {
+	    return IsAuthenticated()
+		    ? long.Parse(_contextAccessor.HttpContext.User.Claims.First(x => x.Type == "SubAccountId")?.Value)
+		    : 0;
+    }
 	public string CurrentAccountMobile()
-	{
-		return IsAuthenticated()
-			? _contextAccessor.HttpContext.User.Claims.First(x => x.Type == "Mobile")?.Value
-			: "";
-	}
+    {
+        return IsAuthenticated()
+            ? _contextAccessor.HttpContext.User.Claims.First(x => x.Type == "Mobile")?.Value
+            : "";
+    }

 	#region Vafa

@@ -111,166 +111,160 @@ public class AuthHelper : IAuthHelper
 	}

 	public string GetWorkshopSlug()
-	{
-		return CurrentAccountInfo().ClientAriaPermission == "true"
-			? _contextAccessor.HttpContext.User.Claims.First(x => x.Type == "WorkshopSlug")?.Value
-			: "";
-	}
-	public string GetWorkshopName()
-	{
-		var workshopName = _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == "ClientAriaPermission")?.Value == "true";
-		if (workshopName)
-		{
-			return _contextAccessor.HttpContext.User.Claims.First(x => x.Type == "WorkshopName")?.Value;
-		}
+    {
+        return CurrentAccountInfo().ClientAriaPermission == "true"
+            ? _contextAccessor.HttpContext.User.Claims.First(x => x.Type == "WorkshopSlug")?.Value
+            : "";
+    }
+    public string GetWorkshopName()
+    {
+	    var workshopName = _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == "ClientAriaPermission")?.Value == "true";
+	    if (workshopName)
+	    {
+		    return _contextAccessor.HttpContext.User.Claims.First(x => x.Type == "WorkshopName")?.Value;
+	    }

-		return "";
-	}
+	    return "";
+    }
 	#endregion


 	public string CurrentAccountRole()
-	{
-		if (IsAuthenticated())
-			return _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value;
-		return null;
-	}
+    {
+        if (IsAuthenticated())
+            return _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value;
+        return null;
+    }

-	public bool IsAuthenticated()
-	{
-		return _contextAccessor.HttpContext.User.Identity.IsAuthenticated;
-		//var claims = _contextAccessor.HttpContext.User.Claims.ToList();
-		//if (claims.Count > 0)
-		//    return true;
-		//return false;
-		//return claims.Count > 0;
-	}
+    public bool IsAuthenticated()
+    {
+        return _contextAccessor.HttpContext.User.Identity.IsAuthenticated;
+        //var claims = _contextAccessor.HttpContext.User.Claims.ToList();
+        //if (claims.Count > 0)
+        //    return true;
+        //return false;
+        //return claims.Count > 0;
+    }

-	public void Signin(AuthViewModel account)
-	{
-		#region MahanChanges
+    public void Signin(AuthViewModel account)
+    {
+        #region MahanChanges

-		if (account.Id == 322)
-			account.Permissions.AddRange([3060301, 30603, 30604, 30605]);
+        var permissions = account.Permissions is { Count: > 0 } ? Tools.SerializeToBson(account.Permissions) : "";
+        var workshopBson = account.WorkshopList is { Count: > 0 } ? Tools.SerializeToBson(account.WorkshopList) : "";
+        var slug = account.WorkshopSlug ?? "";

-		var permissions = account.Permissions is { Count: > 0 } ? Tools.SerializeToBson(account.Permissions) : "";
+        #endregion

-
-
-		var workshopBson = account.WorkshopList is { Count: > 0 } ? Tools.SerializeToBson(account.WorkshopList) : "";
-		var slug = account.WorkshopSlug ?? "";
-
-		#endregion
-
-		var claims = new List<Claim>
-		{
-			new Claim("AccountId", account.Id.ToString()),
-			new Claim(ClaimTypes.Name, account.Fullname),
-			new Claim(ClaimTypes.Role, account.RoleId.ToString()),
-			new Claim("Username", account.Username), // Or Use ClaimTypes.NameIdentifier
+        var claims = new List<Claim>
+        {
+            new Claim("AccountId", account.Id.ToString()),
+            new Claim(ClaimTypes.Name, account.Fullname),
+            new Claim(ClaimTypes.Role, account.RoleId.ToString()),
+            new Claim("Username", account.Username), // Or Use ClaimTypes.NameIdentifier
            new Claim("permissions", permissions),
-			new Claim("Mobile", account.Mobile),
-			new Claim("ProfilePhoto", account.ProfilePhoto ),
-			new Claim("RoleName", account.RoleName),
-			new Claim("SubAccountId", account.SubAccountId.ToString()),
+            new Claim("Mobile", account.Mobile),
+            new Claim("ProfilePhoto", account.ProfilePhoto ),
+            new Claim("RoleName", account.RoleName),
+            new Claim("SubAccountId", account.SubAccountId.ToString()),
 			new Claim("AdminAreaPermission", account.AdminAreaPermission.ToString()),
-			new Claim("ClientAriaPermission", account.ClientAriaPermission.ToString()),
-			new Claim("IsCamera", "false"),
-			new Claim("PositionValue",account.PositionValue.ToString()),
+            new Claim("ClientAriaPermission", account.ClientAriaPermission.ToString()),
+            new Claim("IsCamera", "false"),
+            new Claim("PositionValue",account.PositionValue.ToString()),
            //mahanChanges
            new("workshopList",workshopBson),
-			new("WorkshopSlug",slug),
-			new("WorkshopName",account.WorkshopName??"")
+            new("WorkshopSlug",slug),
+            new("WorkshopName",account.WorkshopName??"")

 		};

-		var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
+        var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);

-		var authProperties = new AuthenticationProperties
-		{
-			ExpiresUtc = DateTimeOffset.UtcNow.AddDays(1)
-		};
+        var authProperties = new AuthenticationProperties
+        {
+            ExpiresUtc = DateTimeOffset.UtcNow.AddDays(1)
+        };

-		_contextAccessor.HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme,
-			new ClaimsPrincipal(claimsIdentity),
-			authProperties);
-	}
+        _contextAccessor.HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme,
+            new ClaimsPrincipal(claimsIdentity),
+            authProperties);
+    }

-	#region Camera
-	public void CameraSignIn(CameraAuthViewModel account)
-	{
-		var claims = new List<Claim>
-		{
-			new Claim("AccountId", account.Id.ToString()),
-			new Claim("Username", account.Username), // Or Use ClaimTypes.NameIdentifier
+    #region Camera
+    public void CameraSignIn(CameraAuthViewModel account)
+    {
+        var claims = new List<Claim>
+        {
+            new Claim("AccountId", account.Id.ToString()),
+            new Claim("Username", account.Username), // Or Use ClaimTypes.NameIdentifier
            new Claim("WorkshopId", account.WorkshopId.ToString()),
-			new Claim("WorkshopName", account.WorkshopName),
-			new Claim("Mobile", account.Mobile),
-			new Claim("AccountId", account.AccountId.ToString()),
-			new Claim("IsActiveString", account.IsActiveString),
-			new Claim("IsCamera", "true"),
+            new Claim("WorkshopName", account.WorkshopName),
+            new Claim("Mobile", account.Mobile),
+            new Claim("AccountId", account.AccountId.ToString()),
+            new Claim("IsActiveString", account.IsActiveString),
+            new Claim("IsCamera", "true"),

-		};
-		var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
+        };
+        var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);

-		var authProperties = new AuthenticationProperties
-		{
+        var authProperties = new AuthenticationProperties
+        {

-			//ExpiresUtc = DateTimeOffset.UtcNow.AddDays(30)
-			ExpiresUtc = new DateTimeOffset(year: 2100, month: 1, day: 1, hour: 0, minute: 0, second: 0, offset: TimeSpan.Zero)
-		};
+            //ExpiresUtc = DateTimeOffset.UtcNow.AddDays(30)
+            ExpiresUtc = new DateTimeOffset(year: 2100, month: 1, day: 1, hour: 0, minute: 0, second: 0, offset: TimeSpan.Zero)
+        };

-		_contextAccessor.HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme,
-			new ClaimsPrincipal(claimsIdentity),
-			authProperties);
-	}
+        _contextAccessor.HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme,
+            new ClaimsPrincipal(claimsIdentity),
+            authProperties);
+    }

-	public CameraAuthViewModel CameraAccountInfo()
-	{
-		var result = new CameraAuthViewModel();
-		if (!IsAuthenticated())
-			return result;
+    public CameraAuthViewModel CameraAccountInfo()
+    {
+        var result = new CameraAuthViewModel();
+        if (!IsAuthenticated())
+            return result;

-		var claims = _contextAccessor.HttpContext.User.Claims.ToList();
-		result.Id = long.Parse(claims.FirstOrDefault(x => x.Type == "AccountId").Value);
-		result.Username = claims.FirstOrDefault(x => x.Type == "Username")?.Value;
-		result.WorkshopId = long.Parse(claims.FirstOrDefault(x => x.Type == "WorkshopId")?.Value);
-		result.WorkshopName = claims.FirstOrDefault(x => x.Type == "WorkshopName").Value;
-		result.Mobile = claims.FirstOrDefault(x => x.Type == "Mobile").Value;
-		result.AccountId = long.Parse(claims.FirstOrDefault(x => x.Type == "AccountId")?.Value);
-		result.IsActiveString = claims.FirstOrDefault(x => x.Type == "IsActiveString").Value;
-		return result;
-	}
-	#endregion
+        var claims = _contextAccessor.HttpContext.User.Claims.ToList();
+        result.Id = long.Parse(claims.FirstOrDefault(x => x.Type == "AccountId").Value);
+        result.Username = claims.FirstOrDefault(x => x.Type == "Username")?.Value;
+        result.WorkshopId = long.Parse(claims.FirstOrDefault(x => x.Type == "WorkshopId")?.Value);
+        result.WorkshopName = claims.FirstOrDefault(x => x.Type == "WorkshopName").Value;
+        result.Mobile = claims.FirstOrDefault(x => x.Type == "Mobile").Value;
+        result.AccountId = long.Parse(claims.FirstOrDefault(x => x.Type == "AccountId")?.Value);
+        result.IsActiveString = claims.FirstOrDefault(x => x.Type == "IsActiveString").Value;
+        return result;
+    }
+    #endregion

-	public void SignOut()
-	{
-		_contextAccessor.HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-	}
+    public void SignOut()
+    {
+        _contextAccessor.HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+    }


-	#region Pooya
+    #region Pooya

-	public (long Id, UserType userType, long roleId) GetUserTypeWithId()
-	{
-		if (!IsAuthenticated())
-			return (0, UserType.Anonymous, 0);
-		var claims = _contextAccessor.HttpContext.User.Claims.ToList();
+    public (long Id, UserType userType, long roleId) GetUserTypeWithId()
+    {
+        if (!IsAuthenticated())
+            return (0, UserType.Anonymous, 0);
+        var claims = _contextAccessor.HttpContext.User.Claims.ToList();

-		var subAccountId = long.Parse(claims.FirstOrDefault(x => x.Type == "SubAccountId")?.Value ?? "0");
-		if (subAccountId > 0)
-			return (subAccountId, UserType.SubAccount, 0);
+        var subAccountId = long.Parse(claims.FirstOrDefault(x => x.Type == "SubAccountId")?.Value ?? "0");
+        if (subAccountId > 0)
+            return (subAccountId, UserType.SubAccount, 0);

-		var id = long.Parse(_contextAccessor.HttpContext.User.Claims.First(x => x.Type == "AccountId")?.Value);
-		if (claims.FirstOrDefault(x => x.Type == "AdminAreaPermission")?.Value == "true")
-		{
-			var roleId = long.Parse(claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value ?? "0");
-			return (id, UserType.Admin, roleId);
-		}
+        var id = long.Parse(_contextAccessor.HttpContext.User.Claims.First(x => x.Type == "AccountId")?.Value);
+        if (claims.FirstOrDefault(x => x.Type == "AdminAreaPermission")?.Value == "true")
+        {
+            var roleId = long.Parse(claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value ?? "0");
+            return (id, UserType.Admin, roleId);
+        }

-		return (id, UserType.Client, 0);
-	}
-	#endregion
+        return (id, UserType.Client, 0);
+    }
+    #endregion


 }
--- a/0_Framework/Application/IsActive.cs
+++ b/0_Framework/Application/IsActive.cs
@@ -4,5 +4,5 @@ public enum IsActive
 {
 	False,
 	True,
-    None
+   
 }
--- a/0_Framework/Application/OperationResult.cs
+++ b/0_Framework/Application/OperationResult.cs
@@ -51,11 +51,4 @@ public class OperationResult<T>
        Message = message;
        return this;
    }
-    public OperationResult<T> Failed(string message, T data)
-    {
-        IsSuccedded = false;
-        Message = message;
-        Data = data;
-        return this;
-    }
 }
--- a/0_Framework/Application/SubAccountPermissionHelper.cs
+++ b/0_Framework/Application/SubAccountPermissionHelper.cs
@@ -385,27 +385,11 @@
        /// </summary>
        public const int SetWorkshopWorkingHoursPermissionCode = 10606;

-        #region حساب کاربری دوربین
-
        /// <summary>
        /// تنظیمات حساب کاربری دوربین
        /// </summary>
        public const int CameraAccountSettingsPermissionCode = 10607;

-        /// <summary>
-        /// فعال/غیرفعال اکانت دوربین
-        /// </summary>
-        public const int CameraAccountActivationBtnPermissionCode = 1060701;
-
-        /// <summary>
-        /// ویرایش اکانت دوربین
-        /// </summary>
-        public const int CameraAccountEditPermissionCode = 1060702;
-        #endregion
-
-
-
-
        #endregion

        #region کارپوشه
@@ -760,22 +744,6 @@
            Code = CameraAccountSettingsPermissionCode,
            ParentId = RollCallOperationsPermissionCode
        };
-
-        public static SubAccountPermissionDto CameraAccountActivationBtn { get; } = new()
-        {
-            Id = CameraAccountActivationBtnPermissionCode,
-            Name = "فعال/غیرفعال حساب کاربری دوربین",
-            Code = CameraAccountActivationBtnPermissionCode,
-            ParentId = CameraAccountSettingsPermissionCode
-        };
-
-        public static SubAccountPermissionDto CameraAccountEdit { get; } = new()
-        {
-            Id = CameraAccountEditPermissionCode,
-            Name = "ویراش حساب کاربری دوربین",
-            Code = CameraAccountEditPermissionCode,
-            ParentId = CameraAccountSettingsPermissionCode
-        };
        #endregion

        #region کارپوشه,ParentId = WorkFlowOperationsPermissionCode
--- a/0_Framework/Application/Tools.cs
+++ b/0_Framework/Application/Tools.cs
@@ -41,6 +41,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>
    /// دریافت روزهای کارکرد پرسنل در لیست بیمه ماه مشخص شده
--- a/0_Framework/Domain/CustomizeCheckoutShared/Base/BaseCustomizeEntity.cs
+++ b/0_Framework/Domain/CustomizeCheckoutShared/Base/BaseCustomizeEntity.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
 using Microsoft.EntityFrameworkCore.Design.Internal;
@@ -14,7 +12,8 @@ public class BaseCustomizeEntity : EntityBase
    }
    public BaseCustomizeEntity(FridayPay fridayPay, OverTimePay overTimePay,
        BaseYearsPay baseYearsPay, BonusesPay bonusesPay, NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
-        FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, BreakTime breakTime,int leavePermittedDays,List<WeeklyOffDay> weeklyOffDays)
+        FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
+        FridayWork fridayWork, HolidayWork holidayWork, BreakTime breakTime,int leavePermittedDays)
    {

        FridayPay = fridayPay;
@@ -30,10 +29,10 @@ public class BaseCustomizeEntity : EntityBase
        FineAbsenceDeduction = fineAbsenceDeduction;
        LateToWork = lateToWork;
        EarlyExit = earlyExit;
+        FridayWork = fridayWork;
        HolidayWork = holidayWork;
        BreakTime = breakTime;
        LeavePermittedDays = leavePermittedDays;
-        WeeklyOffDays = weeklyOffDays.Select(x=> new WeeklyOffDay(x.DayOfWeek)).ToList();
    }

    /// <summary>
@@ -118,28 +117,4 @@ public class BaseCustomizeEntity : EntityBase


 	public BreakTime BreakTime { get; protected set; }
-
-	public List<WeeklyOffDay> WeeklyOffDays { get; set; }
-
-	public void FridayWorkToWeeklyDayOfWeek()
-	{
-		if (FridayWork == FridayWork.Default && !WeeklyOffDays.Any(x => x.DayOfWeek == DayOfWeek.Friday))
-		{
-            WeeklyOffDays.Add(new WeeklyOffDay(DayOfWeek.Friday));
-		}
-            
-
-	}
-}
-
-public class WeeklyOffDay
-{
-	public WeeklyOffDay(DayOfWeek dayOfWeek)
-	{
-		DayOfWeek = dayOfWeek;
-	}
-
-	public long Id { get; set; }
-	public DayOfWeek DayOfWeek { get; set; }
-	public long ParentId { get; set; }
 }
--- a/AccountManagement.Application.Contracts/Account/AccountSelectListViewModel.cs
+++ b/AccountManagement.Application.Contracts/Account/AccountSelectListViewModel.cs
@@ -1,9 +0,0 @@
-namespace AccountManagement.Application.Contracts.Account;
-
-public class AccountSelectListViewModel
-{
-    public long Id { get; set; }
-    public string Name { get; set; }
-
-    public long RoleId { get; set; }
-}
--- a/AccountManagement.Application.Contracts/Account/IAccountApplication.cs
+++ b/AccountManagement.Application.Contracts/Account/IAccountApplication.cs
@@ -41,8 +41,6 @@ public interface IAccountApplication
    List<AccountViewModel> GetAccountsByPositionId(long positionId);

    List<AccountViewModel> GetAccountEqualToLowerPositionValue();
-    Task<List<AccountSelectListViewModel>> GetAdminSelectList();
-
    OperationResult ReLogin();

    #endregion
--- a/AccountManagement.Application.Contracts/SubAccount/CreateSubAccount.cs
+++ b/AccountManagement.Application.Contracts/SubAccount/CreateSubAccount.cs
@@ -15,6 +15,6 @@ namespace AccountManagement.Application.Contracts.SubAccount
        public string PhoneNumber { get; set; }
        public string Username { get; set; }
        public string ProfilePhoto { get; set; }
-        //public List<long> WorkshopIds { get; set; }
+        public List<long> WorkshopIds { get; set; }
    }
 }
--- a/AccountManagement.Application.Contracts/SubAccount/CreateSubAccountRole.cs
+++ b/AccountManagement.Application.Contracts/SubAccount/CreateSubAccountRole.cs
@@ -8,6 +8,5 @@ namespace AccountManagement.Application.Contracts.SubAccount
        public string Title { get; set; }
        public long AccountId { get; set; }
        public List<int> Permissions { get; set; }
-        public List<long> WorkshopIds { get; set; }
    }
 }
--- a/AccountManagement.Application.Contracts/SubAccount/EditSubAccount.cs
+++ b/AccountManagement.Application.Contracts/SubAccount/EditSubAccount.cs
@@ -13,7 +13,7 @@ namespace AccountManagement.Application.Contracts.SubAccount
        public string PhoneNumber { get; set; }
        public string RePassword { get; set; }
        public long SubAccountRoleId { get; set; }
-        //public List<long> WorkshopIds { get; set; }
+        public List<long> WorkshopIds { get; set; }


    }
--- a/AccountManagement.Application.Contracts/SubAccount/SubAccountRoleViewModel.cs
+++ b/AccountManagement.Application.Contracts/SubAccount/SubAccountRoleViewModel.cs
@@ -7,6 +7,5 @@ namespace AccountManagement.Application.Contracts.SubAccount
        public long Id { get; set; }
        public string Title { get; set; }
        public List<int> Permissions { get; set; }
-        public List<long> WorkshopIds { get; set; }
    }
 }
--- a/AccountManagement.Application.Contracts/Task/EditTask.cs
+++ b/AccountManagement.Application.Contracts/Task/EditTask.cs
@@ -21,5 +21,4 @@ public class EditTask:CreateTask
    public List<AccountViewModel> AssignsLists { get; set; }
    public bool  HasTicket { get; set; }
    public long TaskScheduleId { get; set; }
-    public bool HasRequest { get; set; }
 }
--- a/AccountManagement.Application.Contracts/Task/TaskViewModel.cs
+++ b/AccountManagement.Application.Contracts/Task/TaskViewModel.cs
@@ -48,7 +48,6 @@ public class TaskViewModel
    public bool CanDelete { get; set; }
    public bool CanAssign { get; set; }
    public bool CanCheckRequests { get; set; }
-    public bool HasRequest { get; set; }
    public AssignViewModel AssignedReceiverViewModel { get; set; }

    public TaskScheduleType ScheduleType { get; set; }
--- a/AccountManagement.Application.Contracts/TaskSchedule/TaskScheduleDetailsViewModel.cs
+++ b/AccountManagement.Application.Contracts/TaskSchedule/TaskScheduleDetailsViewModel.cs
@@ -15,8 +15,6 @@ public class TaskScheduleDetailsViewModel
    public string ContractingPartyName { get; set; }
    public string Title { get; set; }
    public string Description { get; set; }
-    public string Count { get; set; }
-    public string FirstEndTaskDate { get; set; }
    public List<MediaViewModel> Medias { get; set; }

 }
--- a/AccountManagement.Application/AccountApplication.cs
+++ b/AccountManagement.Application/AccountApplication.cs
@@ -308,7 +308,7 @@ public class AccountApplication : IAccountApplication
 			{
 				Slug = _passwordHasher.SlugHasher(x.WorkshopId),
 				Name = x.WorkshopName,
-				PersonnelCount = x.PersonnelCount,
+				PersonnelCount = 0,
 				Id = x.WorkshopId
 			}).ToList();

@@ -627,10 +627,7 @@ public class AccountApplication : IAccountApplication

    }

-    public async Task<List<AccountSelectListViewModel>> GetAdminSelectList()
-    {
-        return await _accountRepository.GetAdminSelectList();
-    }
+

    #endregion
    #region Pooya
--- a/AccountManagement.Application/SubAccountApplication.cs
+++ b/AccountManagement.Application/SubAccountApplication.cs
@@ -113,12 +113,12 @@ namespace AccountManagement.Application
            if (cmd.PhoneNumber.Length != 11)
                return op.Failed("شماره تلفن همراه نامعتبر است");

-            //if (!cmd.WorkshopIds.Any())
-            //    return op.Failed("حداقل یک کارگاه را انتخاب کنید");
+            if (!cmd.WorkshopIds.Any())
+                return op.Failed("حداقل یک کارگاه را انتخاب کنید");


-            //if (!cmd.WorkshopIds.All(x => accountWorkshopsList.Contains(x)))
-            //    return op.Failed("خطای سیستمی");
+            if (!cmd.WorkshopIds.All(x => accountWorkshopsList.Contains(x)))
+                return op.Failed("خطای سیستمی");


            if (cmd.SubAccountRoleId == 0 || !_subAccountRoleRepository.Exists(x => cmd.SubAccountRoleId == x.id))
@@ -131,10 +131,6 @@ namespace AccountManagement.Application
            _cameraAccountRepository.Exists(x => x.Username == cmd.Username))
                return op.Failed("نام کاربری نمی تواند تکراری باشد");

-            var role = _subAccountRoleRepository.Get(cmd.SubAccountRoleId);
-            var workshopId = role.RoleWorkshops.Select(x => x.WorkshopId).ToList();
-
-
            var entity = new SubAccount(cmd.AccountId, cmd.SubAccountRoleId, cmd.NationalCode, cmd.FName, cmd.LName, cmd.PhoneNumber, cmd.Username, _passwordHasher.Hash(cmd.Password),
                 cmd.ProfilePhoto);

@@ -146,7 +142,7 @@ namespace AccountManagement.Application
            _subAccountRepository.SaveChanges();


-            var workshops = workshopId.Select(x => new WorkshopSubAccount(x, entity.id));
+            var workshops = cmd.WorkshopIds.Select(x => new WorkshopSubAccount(x, entity.id));

            foreach (var w in workshops)
                _workshopSubAccountRepository.Create(w);
@@ -179,22 +175,22 @@ namespace AccountManagement.Application



-            //if (!cmd.WorkshopIds.All(x => accountWorkshopsList.Contains(x)))
-            //    return op.Failed("خطای سیستمی");
+            if (!cmd.WorkshopIds.All(x => accountWorkshopsList.Contains(x)))
+                return op.Failed("خطای سیستمی");


            if (cmd.SubAccountRoleId == 0 || !_subAccountRoleRepository.Exists(x => cmd.SubAccountRoleId == x.id))
                return op.Failed("نقش مورد نظر وجود ندارد");

-            //var workshopSubAccounts = _workshopSubAccountRepository.GetWorkshopsSubAccountEntityBySubAccountId(entity.id);
-            //foreach (var workshopSubAccount in workshopSubAccounts)
-            //    _workshopSubAccountRepository.Remove(workshopSubAccount);
+            var workshopSubAccounts = _workshopSubAccountRepository.GetWorkshopsSubAccountEntityBySubAccountId(entity.id);
+            foreach (var workshopSubAccount in workshopSubAccounts)
+                _workshopSubAccountRepository.Remove(workshopSubAccount);


-            //var workshops = cmd.WorkshopIds.Select(x => new WorkshopSubAccount(x, entity.id));
+            var workshops = cmd.WorkshopIds.Select(x => new WorkshopSubAccount(x, entity.id));

-            //foreach (var w in workshops)
-            //    _workshopSubAccountRepository.Create(w);
+            foreach (var w in workshops)
+                _workshopSubAccountRepository.Create(w);

            entity.Edit(cmd.SubAccountRoleId, cmd.NationalCode, cmd.FName, cmd.LName, cmd.ProfilePhoto);
            _workshopSubAccountRepository.SaveChanges();
@@ -231,8 +227,7 @@ namespace AccountManagement.Application
            {
                Id = entity.id,
                Title = entity.Title,
-                Permissions = entity.RolePermissions.Select(x => x.PermissionCode).ToList(),
-                WorkshopIds = entity.RoleWorkshops.Select(x=>x.WorkshopId).ToList()
+                Permissions = entity.RolePermissions.Select(x => x.PermissionCode).ToList()
            };
        }

@@ -246,7 +241,7 @@ namespace AccountManagement.Application
            OperationResult op = new();
            if (_subAccountRoleRepository.Exists(x => x.AccountId == command.AccountId && x.Title.Trim() == command.Title.Trim()))
                return op.Failed("یک نقش با این عنوان وجود دارد");
-            var role = new SubAccountRole(command.Title, command.Permissions, command.AccountId,command.WorkshopIds);
+            var role = new SubAccountRole(command.Title, command.Permissions, command.AccountId);
            _subAccountRoleRepository.Create(role);
            _subAccountRoleRepository.SaveChanges();
            return op.Succcedded(role.id);
@@ -259,26 +254,8 @@ namespace AccountManagement.Application
            var entity = _subAccountRoleRepository.Get(cmd.Id);
            if (entity == null)
                return op.Failed(ApplicationMessages.RecordNotFound);
-            entity.Edit(cmd.Title, cmd.Permissions,cmd.WorkshopIds);
-
-            var subAccountRoles = _subAccountRepository.GetBySubAccountRole(cmd.Id);
-
-            foreach (var subAccount in subAccountRoles)
-            {
-                var workshopSubAccounts = _workshopSubAccountRepository.GetWorkshopsSubAccountEntityBySubAccountId(subAccount.id);
-                foreach (var workshopSubAccount in workshopSubAccounts)
-                    _workshopSubAccountRepository.Remove(workshopSubAccount);
-
-
-                var workshops = cmd.WorkshopIds.Select(x => new WorkshopSubAccount(x, subAccount.id));
-
-                foreach (var w in workshops)
-                    _workshopSubAccountRepository.Create(w);
-            }
-
-			_subAccountRoleRepository.SaveChanges();
-            _workshopSubAccountRepository.SaveChanges();
-
+            entity.Edit(cmd.Title, cmd.Permissions);
+            _subAccountRoleRepository.SaveChanges();
            return op.Succcedded();
        }
        public OperationResult AssignRoleToSubAccount(AssignSubAccountRole command)
--- a/AccountManagement.Application/TaskApplication.cs
+++ b/AccountManagement.Application/TaskApplication.cs
@@ -597,7 +597,7 @@ public class TaskApplication : ITaskApplication
        }

     
-        
+
        assign.AcceptTimeRequest();
        message = string.IsNullOrWhiteSpace(message) ? "درخواست شما مورد تایید قرار گرفت" : message;
        var messageEntity = new TaskMessage(message, "تایید درخواست مهلت", assign.id);
@@ -622,7 +622,6 @@ public class TaskApplication : ITaskApplication
        {
            return operation.Failed("چنین وظیفه ای درخواستی برای مهلت ندارد");
        }
-
        assign.RejectTimeRequest();
        if (assign.EndTaskDate.Date <= DateTime.Now.Date)
        {
--- a/AccountManagement.Domain/AccountAgg/IAccountRepository.cs
+++ b/AccountManagement.Domain/AccountAgg/IAccountRepository.cs
@@ -27,8 +27,6 @@ namespace AccountManagement.Domain.AccountAgg
        List<AccountViewModel> GetAccountEqualToLowerPositionValue();
        AccountViewModel GetAccountViewModel(long id);
        List<AccountViewModel> GetAccountsDeactivePositionValue(long Positionid);
-        Task<List<AccountSelectListViewModel>> GetAdminSelectList();
-
        #endregion

        List<AccountViewModel> GetAdminAccountsNew();
--- a/AccountManagement.Domain/AssignAgg/Assign.cs
+++ b/AccountManagement.Domain/AssignAgg/Assign.cs
@@ -71,16 +71,14 @@ public class Assign : EntityBase

 	public void AcceptTimeRequest()
 	{
-        ClearRequests();
-        TimeRequest = false;
+		TimeRequest = false;
 		AcceptedTimeRequest++;
        EndTaskDate = RequestDate < DateTime.Today ? DateTime.Today : RequestDate.Value;

    }
 	public void RejectTimeRequest()
 	{
-        ClearRequests();
-        TimeRequest = false;
+		TimeRequest = false;
 		TimeRequestDescription = null;
 		RequestDate = null;
 	}
@@ -94,36 +92,31 @@ public class Assign : EntityBase
 	}
 	public void AcceptCancelRequest()
 	{
-        ClearRequests();
-        IsCanceledRequest = false;
+		IsCanceledRequest = false;
 		IsCancel = true;


 	}
 	public void RejectCancel()
 	{
-        ClearRequests();
-        CancelDescription = null;
+		CancelDescription = null;
 		IsCanceledRequest = false;
 	}

 	public void CompleteRequest(string? doneDescription)
 	{
-        ClearRequests();
-        DoneDescription = doneDescription;
+		DoneDescription = doneDescription;
 		IsDoneRequest = true;
 	}

 	public void RejectCompleteRequest()
 	{
-        ClearRequests();
-        IsDoneRequest = false;
+		IsDoneRequest = false;
 		DoneDescription = null;
 	}
 	public void Completed()
 	{
-        ClearRequests();
-        IsDoneRequest = false;
+		IsDoneRequest = false;
 		IsDone = true;
 	}

@@ -135,13 +128,6 @@ public class Assign : EntityBase
 		TimeRequest = false;
 	}

-    public void ClearRequests()
-    {
-        IsDoneRequest = false;
-        IsCanceledRequest = false;
-        TimeRequest = false;
-    }
-
 	public void InsertNewData(DateTime endTaskDate,bool timeRequest,int acceptedTimeRequest,DateTime? requestDate, string timeRequestDescription, bool isCanceledRequest,
 		bool isCancel,string cancelDescription,bool isDone,bool isDoneRequest,string? doneDescription)
 	{
--- a/AccountManagement.Domain/SubAccountAgg/ISubAccountRepository.cs
+++ b/AccountManagement.Domain/SubAccountAgg/ISubAccountRepository.cs
@@ -2,7 +2,6 @@
 using _0_Framework.Domain;
 using AccountManagement.Application.Contracts.SubAccount;
 using System.Collections.Generic;
-using System.Collections.Specialized;

 namespace AccountManagement.Domain.SubAccountAgg
 {
@@ -14,6 +13,5 @@ namespace AccountManagement.Domain.SubAccountAgg
        SubAccount GetDetails(long subAccountId);
        SubAccount GetBy(string commandUsername);
        SubAccountViewModel GetByVerifyCodeAndPhoneNumber(string code, string phone);
-        List<SubAccount> GetBySubAccountRole(long subAccountRoleId);
    }
 }
--- a/AccountManagement.Domain/SubAccountRoleAgg/SubAccountRole.cs
+++ b/AccountManagement.Domain/SubAccountRoleAgg/SubAccountRole.cs
@@ -13,21 +13,17 @@ namespace AccountManagement.Domain.SubAccountRoleAgg

        public List<SubAccountRolePermission> RolePermissions { get; private set; }
        public List<SubAccount> SubAccounts { get; private set; }
-        public List<SubAccountRoleWorkshop> RoleWorkshops { get; set; }

        private SubAccountRole()
        {
        }

-        public SubAccountRole(string title, List<int> permissions, long accountId, List<long> workshopIds)
+        public SubAccountRole(string title, List<int> permissions, long accountId)
        {
            Title = title;
            RolePermissions = permissions.Select(x => new SubAccountRolePermission(x, id)).ToList();
            AccountId = accountId;
-            RoleWorkshops = workshopIds.Select(x => new SubAccountRoleWorkshop(x, id)).ToList();
-
        }
-
        public void ChangeTitle(string title)
        {
            Title = title;
@@ -36,12 +32,10 @@ namespace AccountManagement.Domain.SubAccountRoleAgg
        {
            RolePermissions.AddRange(permissionIds.Select(x => new SubAccountRolePermission(x, id)));
        }
-        public void Edit(string title, List<int> permissions,List<long> workshopIds)
+        public void Edit(string title, List<int> permissions)
        {
            Title = title;
            RolePermissions = permissions.Select(x => new SubAccountRolePermission(x, id)).ToList();
-            RoleWorkshops = workshopIds.Select(x => new SubAccountRoleWorkshop(x, id)).ToList();
-
-		}
-	}
+        }
+    }
 }
--- a/AccountManagement.Domain/SubAccountRoleAgg/SubAccountRoleWorkshop.cs
+++ b/AccountManagement.Domain/SubAccountRoleAgg/SubAccountRoleWorkshop.cs
@@ -1,16 +0,0 @@
-using _0_Framework.Domain;
-
-namespace AccountManagement.Domain.SubAccountRoleAgg;
-
-public class SubAccountRoleWorkshop:EntityBase
-{
-	public SubAccountRoleWorkshop(long workshopId, long subAccountId)
-	{
-		WorkshopId = workshopId;
-		SubAccountId = subAccountId;
-	}
-
-	public long WorkshopId { get; set; }
-	public long SubAccountId { get; set; }
-	public SubAccountRole SubAccountRole { get; set; }
-}
--- a/AccountManagement.Domain/TaskScheduleAgg/TaskSchedule.cs
+++ b/AccountManagement.Domain/TaskScheduleAgg/TaskSchedule.cs
@@ -16,7 +16,7 @@ public class TaskSchedule:EntityBase
        UnitType = unitType;
        UnitNumber = unitNumber;
        LastEndTaskDate = lastEndTaskDate;
-        IsActive = IsActive.True;
+        IsActive = IsActive.False;
    }
    public string Count { get; private set; }
    public TaskScheduleType Type { get; private set; }
--- a/AccountMangement.Infrastructure.EFCore/Mappings/SubAccountRoleMapping.cs
+++ b/AccountMangement.Infrastructure.EFCore/Mappings/SubAccountRoleMapping.cs
@@ -21,10 +21,6 @@ namespace AccountMangement.Infrastructure.EFCore.Mappings
                opt.WithOwner(x => x.SubAccountRole);
            });

-            builder.OwnsMany(x => x.RoleWorkshops, roleWorkshop =>
-            {
-	            roleWorkshop.WithOwner(x => x.SubAccountRole).HasForeignKey(x => x.SubAccountId);
-            });
        }
    }
 }
--- a/AccountMangement.Infrastructure.EFCore/Migrations/20250530133036_add
+++ b/AccountMangement.Infrastructure.EFCore/Migrations/20250530133036_add
--- a/AccountMangement.Infrastructure.EFCore/Migrations/20250530133036_add
+++ b/AccountMangement.Infrastructure.EFCore/Migrations/20250530133036_add
@@ -1,43 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace AccountMangement.Infrastructure.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addworkshoptosubAccountRole : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "SubAccountRoleWorkshop",
-                columns: table => new
-                {
-                    id = table.Column<long>(type: "bigint", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SubAccountId = table.Column<long>(type: "bigint", nullable: false),
-                    WorkshopId = table.Column<long>(type: "bigint", nullable: false),
-                    CreationDate = table.Column<DateTime>(type: "datetime2", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_SubAccountRoleWorkshop", x => new { x.SubAccountId, x.id });
-                    table.ForeignKey(
-                        name: "FK_SubAccountRoleWorkshop_SubAccountRoles_SubAccountId",
-                        column: x => x.SubAccountId,
-                        principalTable: "SubAccountRoles",
-                        principalColumn: "id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "SubAccountRoleWorkshop");
-        }
-    }
-}
--- a/AccountMangement.Infrastructure.EFCore/Migrations/AccountContextModelSnapshot.cs
+++ b/AccountMangement.Infrastructure.EFCore/Migrations/AccountContextModelSnapshot.cs
@@ -1078,33 +1078,6 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations

            modelBuilder.Entity("AccountManagement.Domain.SubAccountRoleAgg.SubAccountRole", b =>
                {
-                    b.OwnsMany("AccountManagement.Domain.SubAccountRoleAgg.SubAccountRoleWorkshop", "RoleWorkshops", b1 =>
-                        {
-                            b1.Property<long>("SubAccountId")
-                                .HasColumnType("bigint");
-
-                            b1.Property<long>("id")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("bigint");
-
-                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("id"));
-
-                            b1.Property<DateTime>("CreationDate")
-                                .HasColumnType("datetime2");
-
-                            b1.Property<long>("WorkshopId")
-                                .HasColumnType("bigint");
-
-                            b1.HasKey("SubAccountId", "id");
-
-                            b1.ToTable("SubAccountRoleWorkshop");
-
-                            b1.WithOwner("SubAccountRole")
-                                .HasForeignKey("SubAccountId");
-
-                            b1.Navigation("SubAccountRole");
-                        });
-
                    b.OwnsMany("AccountManagement.Domain.SubAccountRoleAgg.SubAccountRolePermission", "RolePermissions", b1 =>
                        {
                            b1.Property<long>("id")
@@ -1132,8 +1105,6 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations
                        });

                    b.Navigation("RolePermissions");
-
-                    b.Navigation("RoleWorkshops");
                });

            modelBuilder.Entity("AccountManagement.Domain.TaskAgg.Tasks", b =>
--- a/AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs
+++ b/AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs
@@ -312,17 +312,6 @@ public class AccountRepository : RepositoryBase<long, Account>, IAccountReposito
                IsActiveString = x.IsActive ? "true" : "false",
            }).ToList();
    }
-
-    public async Task<List<AccountSelectListViewModel>> GetAdminSelectList()
-    {
-        return await _context.Accounts.Where(x => x.AdminAreaPermission == "true").Select(x => new AccountSelectListViewModel()
-        {
-            Id = x.id,
-            Name = x.Fullname,
-            RoleId = x.RoleId
-        }).ToListAsync();
-    }
-
    //public List<AccountViewModel> GetAdminAccounts()
    //{
    // return _context.Accounts.Where(x=>x.AdminAreaPermission == "true" && x.IsActiveString == "true").Select(x => new AccountViewModel()
--- a/AccountMangement.Infrastructure.EFCore/Repository/SubAccountRepository.cs
+++ b/AccountMangement.Infrastructure.EFCore/Repository/SubAccountRepository.cs
@@ -77,10 +77,5 @@ namespace AccountMangement.Infrastructure.EFCore.Repository
                Username = entity.Username
            };
        }
-
-        public List<SubAccount> GetBySubAccountRole(long subAccountRoleId)
-        {
-	        return _context.SubAccounts.Where(x => x.SubAccountRoleId == subAccountRoleId).ToList();
-        }
    }
 }
--- a/AccountMangement.Infrastructure.EFCore/Repository/TaskRepository.cs
+++ b/AccountMangement.Infrastructure.EFCore/Repository/TaskRepository.cs
@@ -106,16 +106,14 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
        {
            res.EndTaskDate = _accountContext.Assigns.First(a => a.TaskId == res.Id && a.AssignedId == userId)
                .EndTaskDate.ToFarsi();
-            var userAssign = res.AssignViewModels.First(x => x.AssignedId == userId);
+

            res.AssignViewModels = res.AssignViewModels.Where(x => x.AssignedId == userId).ToList();
-            res.IsDone = userAssign.IsDone;
-            res.IsCancel = userAssign.IsCancel;
-            res.HasRequest = userAssign.IsCanceledRequest || userAssign.TimeRequest ||
-                             userAssign.IsDoneRequest;
+            res.IsDone = res.AssignViewModels.First(x => x.AssignedId == userId).IsDone;
+            res.IsCancel = res.AssignViewModels.First(x => x.AssignedId == userId).IsCancel;
        }

-        if (res.TaskScheduleId > 0)
+        if (res.TaskScheduleId>0)
        {
            var taskSchedule = _accountContext.TaskSchedules.FirstOrDefault(x => x.id == res.TaskScheduleId);

@@ -123,7 +121,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            res.ScheduleType = taskSchedule.Type;
            res.ScheduleCount = taskSchedule.Count;
            res.ScheduleUnitNumber = taskSchedule.UnitNumber;
-        }
+		}


        //_accountContext.Tasks.Where(x => x.id == TaskId).Select(x => new EditTask()
@@ -162,6 +160,8 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
        Remove(task);
    }

+
+
    public List<TaskViewModel> GetRequestedTasks(TaskSearchModel searchModel)
    {
        var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
@@ -900,7 +900,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            AcceptedTimeRequest = x.AcceptedTimeRequest,
            IsCancelRequest = x.IsCancelRequest,
            ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel,false),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
            MediaCount = x.MediaCount,
            HasAttachment = x.MediaCount > 0,
            SelfName = x.SelfName,
@@ -1229,7 +1229,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            AcceptedTimeRequest = x.AcceptedTimeRequest,
            IsCancelRequest = x.IsCancelRequest,
            ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
            MediaCount = x.MediaCount,
            HasAttachment = x.MediaCount > 0,
            SelfName = x.SelfName,
@@ -1788,7 +1788,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            AcceptedTimeRequest = x.AcceptedTimeRequest,
            IsCancelRequest = x.IsCancelRequest,
            ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
            MediaCount = x.MediaCount,
            HasAttachment = x.MediaCount > 0,
            SelfName = x.SelfName,
@@ -1866,7 +1866,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            .Include(x => x.Task).ThenInclude(x => x.TaskSchedule)
            .Where(x =>
                x.Task.IsActiveString == "true" && x.Task.SenderId == accountId
-                                                && x.Task.TaskScheduleId != null && x.Task.TaskScheduleId > 0 && (!x.IsCanceledRequest && !x.TimeRequest && !x.IsDoneRequest) && x.Task.TaskSchedule.IsActive== IsActive.True);
+                                                && x.Task.TaskScheduleId != null && x.Task.TaskScheduleId > 0 && (!x.IsCanceledRequest && !x.TimeRequest && !x.IsDoneRequest) && x.Task.TaskSchedule.IsActive == IsActive.True);
        if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
        {
            raw = raw.Where(x =>
@@ -2056,7 +2056,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            TaskScheduleId = x.TaskScheduleId


-        }).ToList();
+		}).ToList();


        final = final.Select(x => new TaskViewModel()
@@ -2082,7 +2082,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            AcceptedTimeRequest = x.AcceptedTimeRequest,
            IsCancelRequest = x.IsCancelRequest,
            ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
            MediaCount = x.MediaCount,
            HasAttachment = x.MediaCount > 0,
            SelfName = x.SelfName,
@@ -2095,7 +2095,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            ScheduleUnitType = x.ScheduleUnitType,
            TaskScheduleId = x.TaskScheduleId

-        }).ToList();
+		}).ToList();

        final = final.Select(x => new TaskViewModel()
        {
@@ -2149,15 +2149,12 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            ScheduleUnitType = x.ScheduleUnitType,
            TaskScheduleId = x.TaskScheduleId

-        }).ToList();
+		}).ToList();
        return final;
    }

-    public string SetTasksColors(DateTime date, bool isCancel,bool hasRequest)
+    public string SetTasksColors(DateTime date, bool isCancel)
    {
-        if (hasRequest)
-            return "red";
-
        if (isCancel)
        {
            //return "brown";
@@ -2393,7 +2390,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository

    public List<Tasks> GetTasksByTaskScheduleId(long taskScheduleId)
    {
-        return _accountContext.Tasks.Include(x => x.Assigns).Where(x => x.TaskScheduleId != null && x.TaskScheduleId == taskScheduleId).ToList();
+        return _accountContext.Tasks.Include(x=>x.Assigns).Where(x => x.TaskScheduleId != null && x.TaskScheduleId == taskScheduleId).ToList();
    }


@@ -2661,7 +2658,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            AcceptedTimeRequest = x.AcceptedTimeRequest,
            IsCancelRequest = x.IsCancelRequest,
            ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
            MediaCount = x.MediaCount,
            HasAttachment = x.MediaCount > 0,
            SelfName = x.SelfName,
@@ -2725,7 +2722,6 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
    {
        var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
        var positionValue = int.Parse(_contextAccessor.HttpContext.User.FindFirst("PositionValue").Value);
-        var today = DateTime.Today;
        var emptyAcc = new AccountViewModel()
        {
            Fullname = "-",
@@ -2735,7 +2731,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
        var raw = _accountContext.Assigns.Include(x => x.Task).ThenInclude(x => x.TaskMedias)
            .ThenInclude(x => x.Media)
            .Where(x =>
-                x.Task.IsActiveString == "true" && x.AssignedId == accountId  && x.Task.TicketId == null &&!x.IsDoneRequest && !x.IsCanceledRequest);
+                x.Task.IsActiveString == "true" && x.AssignedId == accountId && (!x.IsCanceledRequest && !x.TimeRequest && !x.IsDoneRequest) && x.Task.TicketId == null);
        if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
        {
            raw = raw.Where(x =>
@@ -2768,7 +2764,6 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                MediaCount = _accountContext.TaskMedias.Count(m => m.TaskId == x.Task.id),
                Description = x.Task.Description,
                IsDoneRequest = x.IsDoneRequest,
-                
            });
        if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
        {
@@ -2807,8 +2802,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            ContractingPartyName = x.ContractingPartyName,
            MediaCount = x.MediaCount,
            Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest,
-            HasRequest = x.IsCancelRequest || x.RequestTime || x.IsDoneRequest
+            IsDoneRequest = x.IsDoneRequest
        });
        if (!string.IsNullOrWhiteSpace(searchModel.StartDate) && !string.IsNullOrWhiteSpace(searchModel.EndDate))
        {
@@ -2877,10 +2871,8 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
        }


-        var orderResult = result.OrderBy(x => x.IsDone || x.IsCancel)
-            .ThenByDescending(x => x.EndTaskDateGE <= today.AddDays(1) && !x.RequestTime)
-            .ThenByDescending(x => x.RequestTime)
-            .ThenBy(x => x.EndTaskDateGE); // مرتب‌سازی داخلی بر اساس تاریخ
+        var orderResult = result.OrderByDescending(x => x.IsCancel ? 0 : 1).ThenBy(x => x.IsDone ? 1 : 0)
+            .ThenBy(x => x.EndTaskDateGE);


        var final = orderResult.Skip(searchModel.PageIndex).Take(30).ToList();
@@ -2914,7 +2906,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            MediaCount = x.MediaCount,
            SelfName = x.SelfName,
            Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest,
+            IsDoneRequest = x.IsDoneRequest

        }).ToList();

@@ -2942,7 +2934,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            AcceptedTimeRequest = x.AcceptedTimeRequest,
            IsCancelRequest = x.IsCancelRequest,
            ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel,x.RequestTime),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
            MediaCount = x.MediaCount,
            HasAttachment = x.MediaCount > 0,
            SelfName = x.SelfName,
@@ -3001,8 +2993,6 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                    AssignedName = "-",
                    AssignedPositionValue = 0
                },
-            HasRequest = x.IsCancelRequest || x.RequestTime || x.IsDoneRequest
-
        }).ToList();
        return final;
    }
--- a/AccountMangement.Infrastructure.EFCore/Repository/TaskScheduleRepository.cs
+++ b/AccountMangement.Infrastructure.EFCore/Repository/TaskScheduleRepository.cs
@@ -3,26 +3,25 @@ using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using AccountManagement.Application.Contracts.Media;
-using AccountManagement.Application.Contracts.Task;
 using AccountManagement.Application.Contracts.TaskSchedule;
 using AccountManagement.Domain.TaskScheduleAgg;
 using Microsoft.EntityFrameworkCore;

 namespace AccountMangement.Infrastructure.EFCore.Repository;

-public class TaskScheduleRepository : RepositoryBase<long, TaskSchedule>, ITaskScheduleRepository
+public class TaskScheduleRepository: RepositoryBase<long, TaskSchedule>, ITaskScheduleRepository
 {
    private readonly AccountContext _accountContext;

-    public TaskScheduleRepository(AccountContext accountContext) : base(accountContext)
+    public TaskScheduleRepository(AccountContext accountContext):base(accountContext)
    {
        _accountContext = accountContext;
    }

    public async Task<TaskScheduleDetailsViewModel> GetDetails(long id)
    {
-        var taskSchedule = await _accountContext.TaskSchedules.Include(x => x.TasksList).ThenInclude(x => x.Assigns)
-            .Include(x => x.TasksList).ThenInclude(x => x.TaskMedias).ThenInclude(x => x.Media).FirstOrDefaultAsync(x => x.id == id);
+        var taskSchedule=await _accountContext.TaskSchedules.Include(x=>x.TasksList).ThenInclude(x=>x.Assigns)
+            .Include(x=>x.TasksList).ThenInclude(x=>x.TaskMedias).ThenInclude(x=>x.Media).FirstOrDefaultAsync(x => x.id == id);
        if (taskSchedule == null)
        {
            return null;
@@ -30,7 +29,7 @@ public class TaskScheduleRepository : RepositoryBase<long, TaskSchedule>, ITaskS

        var firstTaskDetails = taskSchedule.TasksList.First();

-        var firstTimeAssigns = firstTaskDetails.Assigns.Where(x => x.FirstTimeCreation).ToList();
+        var firstTimeAssigns = firstTaskDetails.Assigns.Where(x=>x.FirstTimeCreation).ToList();

        var assignedIds = firstTimeAssigns.Select(x => x.AssignedId).ToList();

@@ -47,15 +46,13 @@ public class TaskScheduleRepository : RepositoryBase<long, TaskSchedule>, ITaskS
            Title = firstTaskDetails.Title,
            Description = firstTaskDetails.Description,
            ContractingPartyName = firstTaskDetails.ContractingPartyName,
-            AssignedName = assignedAccounts.Select(x => x.Fullname).ToList(),
+            AssignedName = assignedAccounts.Select(x=>x.Fullname).ToList(),
            CreationDateFa = firstTaskDetails.CreationDate.ToFarsi(),
            SenderName = sender.Fullname,
            TaskScheduleType = taskSchedule.Type,
            TaskScheduleUnitType = taskSchedule.UnitType,
            UnitNumber = taskSchedule.UnitNumber,
-            Count = taskSchedule.Type == TaskScheduleType.Limited ? taskSchedule.Count : "نامحدود",
-            FirstEndTaskDate = firstTaskDetails.Assigns.FirstOrDefault()?.EndTaskDate.ToFarsi() ?? "",
-            Medias = firstTaskDetails.TaskMedias.Select(x => new MediaViewModel()
+            Medias = firstTaskDetails.TaskMedias.Select(x=> new MediaViewModel()
            {
                Category = x.Media.Category,
                Id = x.MediaId,
--- a/Company.Domain/AdminMonthlyOverviewAgg/AdminMonthlyOverview.cs
+++ b/Company.Domain/AdminMonthlyOverviewAgg/AdminMonthlyOverview.cs
@@ -1,55 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.AdminMonthlyOverview;
-using Microsoft.AspNetCore.JsonPatch.Operations;
-
-namespace Company.Domain.AdminMonthlyOverviewAgg;
-
-public class AdminMonthlyOverview:EntityBase
-{
-    public AdminMonthlyOverview(long workshopId, int month, int year, AdminMonthlyOverviewStatus status)
-    {
-        WorkshopId = workshopId;
-        Month = month;
-        Year = year;
-        Status = status;
-    }
-
-    public long WorkshopId { get; set; }
-    public int Month { get; set; }
-    public int Year { get; set; }
-    public AdminMonthlyOverviewStatus Status { get; set; }
-
-    public void Next()
-    {
-        var maxValue = Enum.GetValues(typeof(AdminMonthlyOverviewStatus))
-            .Cast<AdminMonthlyOverviewStatus>()
-            .Max();
-
-        if (Status >= maxValue)
-        {
-            throw new InvalidDataException("تغییر وضعیت وارد شده نامعتبر است");
-        }
-        Status += 1;
-    }
-
-    public void Back()
-    {
-        var minValue = Enum.GetValues(typeof(AdminMonthlyOverviewStatus))
-            .Cast<AdminMonthlyOverviewStatus>()
-            .Min();
-
-        if (Status <= minValue)
-        {
-            throw new InvalidDataException("تغییر وضعیت وارد شده نامعتبر است");
-        }
-        Status -= 1;
-    }
-
-    public void SetStatus(AdminMonthlyOverviewStatus status)
-    {
-        Status = status;
-    }
-}
--- a/Company.Domain/AdminMonthlyOverviewAgg/IAdminMonthlyOverviewRepository.cs
+++ b/Company.Domain/AdminMonthlyOverviewAgg/IAdminMonthlyOverviewRepository.cs
@@ -1,12 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.AdminMonthlyOverview;
-
-namespace Company.Domain.AdminMonthlyOverviewAgg;
-
-public interface IAdminMonthlyOverviewRepository:IRepository<long, AdminMonthlyOverview>
-{
-    Task<List<AdminMonthlyOverviewListViewModel>> GetWorkshopStatus(AdminMonthlyOverviewSearchModel searchModel);
-    Task<AdminMonthlyOverViewCounterVm> GetCounter(int year, int month, long accountId);
-}
--- a/Company.Domain/CheckoutAgg/Checkout.cs
+++ b/Company.Domain/CheckoutAgg/Checkout.cs
@@ -1,10 +1,6 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using _0_Framework.Application;
 using _0_Framework.Domain;
-using Company.Domain.CheckoutAgg.ValueObjects;
-using Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 using Company.Domain.WorkshopAgg;

 namespace Company.Domain.CheckoutAgg;
@@ -25,11 +21,7 @@ public class Checkout : EntityBase
        double salaryAidDeduction, double absenceDeduction, string sumOfWorkingDays
        , string archiveCode, string personnelCode, 
        string totalClaims, string totalDeductions, double totalPayment, string signature, double marriedAllowance, bool leaveCheckout,
-        double creditLeaves, double absencePeriod, double averageHoursPerDay, bool hasRollCall, string overTimeWorkvalue,
-        string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue,
-        string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute,
-        ICollection<CheckoutLoanInstallment> loanInstallments,
-        ICollection<CheckoutSalaryAid> salaryAids)
+        double creditLeaves, double absencePeriod, double averageHoursPerDay, bool hasRollCall, string overTimeWorkvalue, string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue, string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute)
    {
        EmployeeFullName = employeeFullName;
        FathersName = fathersName;
@@ -86,8 +78,6 @@ public class Checkout : EntityBase
        TotalDayOfLeaveCompute = totalDayOfLeaveCompute;
        TotalDayOfYearsCompute = totalDayOfYearsCompute;
        TotalDayOfBunosesCompute = totalDayOfBunosesCompute;
-        LoanInstallments = loanInstallments;
-        SalaryAids = salaryAids;
    }

    public string EmployeeFullName { get; private set; }
@@ -191,15 +181,7 @@ public class Checkout : EntityBase
   /// </summary>
   public string TotalDayOfBunosesCompute { get; private set; }

-
-   #region valueObjects
-
-   public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
-   public ICollection<CheckoutSalaryAid> SalaryAids { get; set; } = [];
-   #endregion
-
-
-    public Workshop Workshop { get; set; }
+	public Workshop Workshop { get; set; }
    //public WorkingHours WorkingHours { get; set; }

    public void Edit(string employeeFullName, string fathersName, string nationalCode, string dateOfBirth,
@@ -296,16 +278,4 @@ public class Checkout : EntityBase
        this.TotalDeductions = totalDeductions;
        this.TotalPayment = totalPayment;
    }
-
-
-    public void SetSalaryAid(ICollection<CheckoutSalaryAid> salaryAids,double salaryAidAmount)
-    {
-        SalaryAids = salaryAids;
-        SalaryAidDeduction = salaryAidAmount;
-    }
-    public void SetLoanInstallment(ICollection<CheckoutLoanInstallment> lonaInstallments, double installmentsAmount)
-    {
-        LoanInstallments = lonaInstallments;
-        InstallmentDeduction = installmentsAmount;
-    }
 }
--- a/Company.Domain/CheckoutAgg/ICheckoutRepository.cs
+++ b/Company.Domain/CheckoutAgg/ICheckoutRepository.cs
@@ -22,24 +22,7 @@ public interface ICheckoutRepository : IRepository<long, Checkout>
        string year, string month);
    EditCheckout GetDetails(long id);

-    Task CreateCkeckout(Checkout command);
-    /// <summary>
-    /// لود لیست اولیه جهت ایجاد فیش حقوقی
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <param name="employeeId"></param>
-    /// <param name="year"></param>
-    /// <param name="month"></param>
-    /// <param name="contractStart"></param>
-    /// <param name="contractEnd"></param>
-    /// <returns></returns>
-    /// <exception cref="NotImplementedException"></exception>
-    Task<CreateCheckoutListViewModel> GetContractResultToCreateCheckout(long workshopId, long employeeId, string year,
-        string month,
-        string contractStart, string contractEnd);
-    //void CreateCkeckout(Checkout command);
-
-
+    void CreateCkeckout(Checkout command);

    Task<List<CheckoutViewModel>> Search(CheckoutSearchModel searchModel);

--- a/Company.Domain/CheckoutAgg/ValueObjects/CheckoutLoanInstallment.cs
+++ b/Company.Domain/CheckoutAgg/ValueObjects/CheckoutLoanInstallment.cs
@@ -1,25 +0,0 @@
-using _0_Framework.Application;
-
-namespace Company.Domain.CheckoutAgg.ValueObjects;
-
-public class CheckoutLoanInstallment
-{
-    public CheckoutLoanInstallment(string amountForMonth, string month, string year, IsActive isActive, string loanRemaining, string loanAmount, long entityId)
-    {
-        AmountForMonth = amountForMonth;
-        Month = month;
-        Year = year;
-        IsActive = isActive;
-        LoanRemaining = loanRemaining;
-        LoanAmount = loanAmount;
-        EntityId = entityId;
-    }
-
-    public string AmountForMonth { get; private set; }
-    public string Month { get; private set; }
-    public string Year { get; private set; }
-    public string LoanRemaining { get; set; }
-    public IsActive IsActive { get; private set; }
-    public string LoanAmount { get; set; }
-    public long EntityId { get; set; }
-}
--- a/Company.Domain/CheckoutAgg/ValueObjects/CheckoutSalaryAid.cs
+++ b/Company.Domain/CheckoutAgg/ValueObjects/CheckoutSalaryAid.cs
@@ -1,24 +0,0 @@
-using System;
-using AccountManagement.Domain.AccountAgg;
-
-namespace Company.Domain.CheckoutAgg.ValueObjects;
-
-public class CheckoutSalaryAid
-{
-    public CheckoutSalaryAid(string amount, DateTime salaryAidDateTime, string salaryAidDateTimeFa, DateTime calculationDateTime, string calculationDateTimeFa, long entityId)
-    {
-        Amount = amount;
-        SalaryAidDateTime = salaryAidDateTime;
-        SalaryAidDateTimeFa = salaryAidDateTimeFa;
-        CalculationDateTime = calculationDateTime;
-        CalculationDateTimeFa = calculationDateTimeFa;
-        EntityId = entityId;
-    }
-    public string Amount { get; private set; }
-    public DateTime SalaryAidDateTime { get; private set; }
-    public string SalaryAidDateTimeFa { get; private set; }
-
-    public DateTime CalculationDateTime { get; private set; }
-    public string CalculationDateTimeFa { get; private set; }
-    public long EntityId { get; set; }
-}
--- a/Company.Domain/Company.Domain.csproj
+++ b/Company.Domain/Company.Domain.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
@@ -14,8 +14,4 @@
    <ProjectReference Include="..\CompanyManagment.App.Contracts\CompanyManagment.App.Contracts.csproj" />
  </ItemGroup>

-  <ItemGroup>
-    <Folder Include="CheckoutAgg\ValueObjects\" />
-  </ItemGroup>
-
 </Project>
--- a/Company.Domain/ContactUsAgg/ContactUs.cs
+++ b/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; }
+    
+}
--- a/Company.Domain/ContactUsAgg/IContactUsRepository.cs
+++ b/Company.Domain/ContactUsAgg/IContactUsRepository.cs
@@ -0,0 +1,8 @@
+using _0_Framework.Domain;
+
+namespace Company.Domain.ContactUsAgg;
+
+public interface IContactUsRepository : IRepository<long, ContactUs>
+{
+
+}
--- a/Company.Domain/CustomizeWorkshopEmployeeSettingsAgg/Entities/CustomizeWorkshopEmployeeSettings.cs
+++ b/Company.Domain/CustomizeWorkshopEmployeeSettingsAgg/Entities/CustomizeWorkshopEmployeeSettings.cs
@@ -27,13 +27,12 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
        FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, long employeeId,
        long workshopId, double salary, long customizeWorkshopGroupSettingId,
        ICollection<CustomizeWorkshopEmployeeSettingsShift> customizeWorkshopEmployeeSettingsShifts,
-        HolidayWork holidayWork, IrregularShift irregularShift, WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime,
-        int leavePermittedDays, ICollection<CustomizeRotatingShift> rotatingShifts
-        , List<WeeklyOffDay> weeklyOffDays) :
+        FridayWork fridayWork,
+        HolidayWork holidayWork, IrregularShift irregularShift, WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime, int leavePermittedDays, ICollection<CustomizeRotatingShift> rotatingShifts) :
        base(fridayPay, overTimePay,
        baseYearsPay, bonusesPay, nightWorkPay,
        marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
-        earlyExit, holidayWork, breakTime, leavePermittedDays,weeklyOffDays)
+        earlyExit, fridayWork, holidayWork, breakTime, leavePermittedDays)
    {
        CustomizeWorkshopGroupSettingId = customizeWorkshopGroupSettingId;
        IsSettingChanged = false;
@@ -83,6 +82,7 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
    /// <param name="fineAbsenceDeduction">جریمه غیبت</param>
    /// <param name="lateToWork">تاخیر در ورود</param>
    /// <param name="earlyExit">تعجیل درخروج</param>
+    /// <param name="fridayWork">آیا در روز های جمعه موظف به کار است</param>
    /// <param name="holidayWork">آیا در تعطیلات رسمی موظف به کار است</param>
    /// <param name="workshopIrregularShifts">نوع شیفت کاری </param>
    /// <param name="workshopShiftStatus">آیا شیفت منظم است یا نا منظم</param>
@@ -91,7 +91,7 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
        NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
        FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
        FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
-        HolidayWork holidayWork, IrregularShift irregularShift, bool isSettingChange, int leavePermittedDays)
+        FridayWork fridayWork, HolidayWork holidayWork, IrregularShift irregularShift, bool isSettingChange, int leavePermittedDays)
    {
        SetValueObjects(fridayPay, overTimePay, baseYearsPay, bonusesPay
            , nightWorkPay, marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction,
@@ -99,6 +99,7 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity

        Salary = salary;
        IsSettingChanged = isSettingChange;
+        FridayWork = fridayWork;
        HolidayWork = holidayWork;
        LeavePermittedDays = leavePermittedDays;
    }
@@ -111,8 +112,8 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
    public void SimpleEdit(
        ICollection<CustomizeWorkshopEmployeeSettingsShift> employeeSettingsShift,
        IrregularShift irregularShift,
-        WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime, bool isShiftChange,HolidayWork holidayWork,
-        ICollection<CustomizeRotatingShift> rotatingShifts,List<WeeklyOffDay> weeklyOffDays)
+        WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime, bool isShiftChange, FridayWork fridayWork, HolidayWork holidayWork,
+        ICollection<CustomizeRotatingShift> rotatingShifts)
    {
        BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
        IsShiftChanged = isShiftChange;
@@ -125,8 +126,9 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
            : new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);

        CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
+
+        FridayWork = fridayWork;
        HolidayWork = holidayWork;
-        WeeklyOffDays = weeklyOffDays;
    }


@@ -211,62 +213,6 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
            earlyExit.EarlyExitTimeFines.Select(x => new EarlyExitTimeFine(x.Minute, x.FineMoney))
                .ToList(), earlyExit.Value);
    }
-    public void UpdateIsShiftChange()
-    {
-        var groupSetting = CustomizeWorkshopGroupSettings;
-        if (groupSetting == null)
-            return;
-        bool isShiftChange;


-        if (WorkshopShiftStatus == WorkshopShiftStatus.Regular)
-        {
-
-
-
-            if (CustomizeWorkshopEmployeeSettingsShifts.All(x => groupSetting.CustomizeWorkshopGroupSettingsShifts.Any(y => x.Equals(y)))
-                && WorkshopShiftStatus == groupSetting.WorkshopShiftStatus && FridayWork == groupSetting.FridayWork &&
-                HolidayWork == groupSetting.HolidayWork && BreakTime == groupSetting.BreakTime)
-            {
-                isShiftChange = false;
-            }
-
-            else
-            {
-                isShiftChange = true;
-            }
-        }
-        else if (WorkshopShiftStatus == WorkshopShiftStatus.Irregular)
-        {
-            if (WorkshopShiftStatus == groupSetting.WorkshopShiftStatus && BreakTime == groupSetting.BreakTime &&
-                IrregularShift == groupSetting.IrregularShift && FridayWork == groupSetting.FridayWork &&
-                HolidayWork == groupSetting.HolidayWork)
-            {
-                isShiftChange = false;
-            }
-            else
-            {
-                isShiftChange = true;
-            }
-        }
-        else
-        {
-            if (CustomizeRotatingShifts.All(x => groupSetting.CustomizeRotatingShifts.Any(y => x.Equals(y)))
-                && WorkshopShiftStatus == groupSetting.WorkshopShiftStatus && FridayWork == groupSetting.FridayWork &&
-                HolidayWork == groupSetting.HolidayWork && BreakTime == groupSetting.BreakTime)
-            {
-                isShiftChange = false;
-            }
-
-            else
-            {
-                isShiftChange = true;
-            }
-
-        }
-
-        IsShiftChanged = isShiftChange;
-    }
-
-   
 }
--- a/Company.Domain/CustomizeWorkshopGroupSettingsAgg/Entities/CustomizeWorkshopGroupSettings.cs
+++ b/Company.Domain/CustomizeWorkshopGroupSettingsAgg/Entities/CustomizeWorkshopGroupSettings.cs
@@ -27,12 +27,11 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay,
        BonusesPay bonusesPay, NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
        FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
-        FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
-        HolidayWork holidayWork, BreakTime breakTime, WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, int leavePermittedDays,
-        ICollection<CustomizeRotatingShift> rotatingShifts, List<WeeklyOffDay> weeklyOffDays) :
+        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, holidayWork, breakTime, leavePermittedDays,weeklyOffDays)
+        earlyExit, fridayWork, holidayWork, breakTime, leavePermittedDays)
    {
        GroupName = groupName;
        Salary = salary;
@@ -77,7 +76,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
        NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
        LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
        LateToWork lateToWork, EarlyExit earlyExit,
-        ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
+        ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts, FridayWork fridayWork,
        HolidayWork holidayWork, IrregularShift irregularShift, ICollection<CustomizeRotatingShift> rotatingShifts,
        WorkshopShiftStatus workshopShiftStatus, long customizeWorkshopSettingId, BreakTime breakTime, int leavePermittedDays)
    {
@@ -97,6 +96,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
        FineAbsenceDeduction = fineAbsenceDeduction;
        LateToWork = lateToWork;
        EarlyExit = earlyExit;
+        FridayWork = fridayWork;
        HolidayWork = holidayWork;
        LeavePermittedDays = leavePermittedDays;
        CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
@@ -123,7 +123,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
        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)
+        LateToWork lateToWork, EarlyExit earlyExit, FridayWork fridayWork, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
    {
        GroupName = groupName;
        Salary = salary;
@@ -140,6 +140,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
        FineAbsenceDeduction = fineAbsenceDeduction;
        LateToWork = lateToWork;
        EarlyExit = earlyExit;
+        FridayWork = fridayWork;
        HolidayWork = holidayWork;
        IsSettingChange = isSettingChange;
        LeavePermittedDays = leavePermittedDays;
@@ -153,7 +154,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
        {
            item.EditEmployees(Salary, FridayPay, OverTimePay, BaseYearsPay, BonusesPay
                , NightWorkPay, MarriedAllowance, ShiftPay, FamilyAllowance, LeavePay, InsuranceDeduction, FineAbsenceDeduction,
-                LateToWork, EarlyExit, HolidayWork, IrregularShift, false, leavePermittedDays);
+                LateToWork, EarlyExit, FridayWork, HolidayWork, IrregularShift, false, leavePermittedDays);
        }
    }
    public void EditAndOverwriteOnAllEmployees(string groupName, double salary,
@@ -161,13 +162,14 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
        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)
+        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;
@@ -180,7 +182,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
        {
            item.EditEmployees(Salary, FridayPay, OverTimePay, BaseYearsPay, BonusesPay
                , NightWorkPay, MarriedAllowance, ShiftPay, FamilyAllowance, LeavePay, InsuranceDeduction, FineAbsenceDeduction,
-                LateToWork, EarlyExit, HolidayWork, IrregularShift, false, leavePermittedDays);
+                LateToWork, EarlyExit, FridayWork, HolidayWork, IrregularShift, false, leavePermittedDays);
        }
    }

@@ -193,7 +195,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity

    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)
+        IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange, FridayWork fridayWork, HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts)
    {
        GroupName = groupName;
        CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
@@ -207,11 +209,9 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity

        BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
        IsShiftChange = isShiftChange;
-
+        FridayWork = fridayWork;
        HolidayWork = holidayWork;

-        WeeklyOffDays = weeklyOffDays;
-
        //var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
        // .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
        if (isShiftChange)
@@ -219,7 +219,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity

        }

-        var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
+        var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.id));

        foreach (var item in permittedToOverWrite)
        {
@@ -227,15 +227,15 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
                .ToList();
            item.SimpleEdit(customizeWorkshopGroupSettingsShifts
                .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList(),
-                IrregularShift, WorkshopShiftStatus, BreakTime, false, HolidayWork, newRotatingShifts,WeeklyOffDays.ToList());
+                IrregularShift, WorkshopShiftStatus, BreakTime, false, FridayWork, HolidayWork, newRotatingShifts);
        }

    }

    public void EditSimpleAndOverwriteOnAllEmployees(string groupName,
        ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
-        WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange, 
-        HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts ,List<WeeklyOffDay> weeklyOffDays)
+        WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange,
+        FridayWork fridayWork, HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts)
    {
        GroupName = groupName;
        CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
@@ -251,8 +251,8 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
        BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
        IsShiftChange = isShiftChange;
        HolidayWork = holidayWork;
+        FridayWork = fridayWork;

-        WeeklyOffDays = weeklyOffDays;
        //var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
        // .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();

@@ -262,7 +262,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
                .ToList();
            item.SimpleEdit(customizeWorkshopGroupSettingsShifts
                .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList(),
-                irregularShift, workshopShiftStatus, breakTime, false, HolidayWork, newRotatingShifts,WeeklyOffDays.ToList());
+                irregularShift, workshopShiftStatus, breakTime, false, FridayWork, HolidayWork, newRotatingShifts);
        }

    }
@@ -298,14 +298,13 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
        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);
+            earlyExit, employeeId, workshopId, Salary, id, shifts, FridayWork, HolidayWork, irregularShift,
+            WorkshopShiftStatus, breakTime, LeavePermittedDays, rotatingShift);

        CustomizeWorkshopEmployeeSettingsCollection.Add(customizeWorkshopEmployeeSettings);
    }
--- a/Company.Domain/CustomizeWorkshopSettingsAgg/Entities/CustomizeWorkshopSettings.cs
+++ b/Company.Domain/CustomizeWorkshopSettingsAgg/Entities/CustomizeWorkshopSettings.cs
@@ -17,7 +17,7 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity

 	public CustomizeWorkshopSettings(long workshopId,
 		ICollection<CustomizeWorkshopSettingsShift> customizeWorkshopSettingsShifts, int leavePermittedDays,
-		WorkshopShiftStatus workshopShiftStatus,HolidayWork holidayWork, List<WeeklyOffDay> weeklyOffDays)
+		WorkshopShiftStatus workshopShiftStatus,FridayWork fridayWork,HolidayWork holidayWork)
 	{
 		FridayPay = new FridayPay(FridayPayType.None, 0);
 		OverTimePay = new OverTimePay(OverTimePayType.None, 0);
@@ -38,10 +38,11 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 		OverTimeThresholdMinute = 0;
 		Currency = Currency.Rial;
 		MaxMonthDays = MaxMonthDays.Default;
+		FridayWork = fridayWork;
+		HolidayWork = holidayWork;
 		BonusesPaysInEndOfMonth = BonusesPaysInEndOfYear.EndOfYear;
 		WorkshopShiftStatus = workshopShiftStatus;
-		WeeklyOffDays = weeklyOffDays;
-		HolidayWork = holidayWork;
+
 		if (workshopShiftStatus == WorkshopShiftStatus.Irregular)
 			return;

@@ -91,7 +92,8 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 	public void Edit(FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay,
 		NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
 		FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
-		FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, BonusesPaysInEndOfYear bonusesPaysInEndOfYear,
+		FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
+		FridayWork fridayWork, HolidayWork holidayWork, BonusesPaysInEndOfYear bonusesPaysInEndOfYear,
 		int leavePermittedDays, BaseYearsPayInEndOfYear baseYearsPayInEndOfYear, int overTimeThresholdMinute)
 	{
 		FridayPay = fridayPay;
@@ -107,6 +109,7 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 		FineAbsenceDeduction = fineAbsenceDeduction;
 		LateToWork = lateToWork;
 		EarlyExit = earlyExit;
+		FridayWork = fridayWork;
 		HolidayWork = holidayWork;
 		BonusesPaysInEndOfMonth = bonusesPaysInEndOfYear;
 		LeavePermittedDays = leavePermittedDays;
@@ -124,18 +127,19 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 	}

 	public void ChangeWorkshopShifts(ICollection<CustomizeWorkshopSettingsShift> customizeWorkshopSettingsShifts,
-        WorkshopShiftStatus workshopShiftStatus,HolidayWork holidayWork, List<WeeklyOffDay> weeklyOffDays)
+        WorkshopShiftStatus workshopShiftStatus,FridayWork fridayWork,HolidayWork holidayWork)
 	{
 		WorkshopShiftStatus = workshopShiftStatus;
        HolidayWork = holidayWork;
+        FridayWork = fridayWork;
 		CustomizeWorkshopSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopSettingsShifts : new List<CustomizeWorkshopSettingsShift>();
-		WeeklyOffDays = weeklyOffDays;
-
 		if (workshopShiftStatus == WorkshopShiftStatus.Regular)
 		{
 			var date = new DateOnly();
 			var firstStartShift = new DateTime(date, CustomizeWorkshopSettingsShifts.MinBy(x => x.Placement).StartTime);
 			var lastEndShift = new DateTime(date, CustomizeWorkshopSettingsShifts.MaxBy(x => x.Placement).EndTime);
+         
+          
            if (lastEndShift > firstStartShift)
                firstStartShift = firstStartShift.AddDays(1);
            var offSet = (firstStartShift - lastEndShift).Divide(2);
--- a/Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
+++ b/Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
@@ -25,7 +25,7 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC

    double GetcontractAmount(int countPerson);

-    (string result, string isExpier) ExpColor(DateTime contractEndGr, double contractAmount,
+    string ExpColor(DateTime contractEndGr, double contractAmount,
        string isActiveString);

    TotalbalancViewModel TotalBalance(long contractingPartyId);
--- a/Company.Domain/InsurancJobAgg/IInsuranceJobRepositpry.cs
+++ b/Company.Domain/InsurancJobAgg/IInsuranceJobRepositpry.cs
@@ -6,7 +6,6 @@ using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.InsuranceJob;
-using CompanyManagment.App.Contracts.InsuranceJobItem;

 namespace Company.Domain.InsurancJobAgg;

@@ -14,16 +13,10 @@ public interface IInsuranceJobRepositpry:IRepository<long, InsuranceJob>
 {
    //OperationResult Create(CreateInsurancJob command);
    // OperationResult Edit(EditInsurancJob command);
-    EditInsuranceJob GetDetails(long id, string year, string month);
+    EditInsuranceJob GetDetails(long id);
    List<InsuranceJobViewModel> GetInsurancJob();
    List<InsuranceJobViewModel> Search(InsuranceJobSearchModel searchModel);
    OperationResult CreateInsuranceJob(CreateInsuranceJob command);
-    List<(long id, string date)> GetOldYersInsuranceItemIds();
-    OperationResult CopyFromLastYear(CopyFromLastYearViewModel command);
-    OperationResult RecoveryOldData1403();
    OperationResult Remove(long id);
    OperationResult EditInsuranceJob(EditInsuranceJob command);
-
-
-}
-
+}
--- a/Company.Domain/InsuranceJobItemAgg/IInsuranceJobItemRepositpry.cs
+++ b/Company.Domain/InsuranceJobItemAgg/IInsuranceJobItemRepositpry.cs
@@ -14,11 +14,8 @@ public interface IInsuranceJobItemRepositpry : IRepository<long, InsuranceJobIte
 {
    void CreateInsuranceJobItem(InsuranceJobItemViewModel model);
    DetailsInsuranceJobItem GetDetails(long id);
-    List<InsuranceJobItemViewModel> GetInsuranceJobItemByInsuranceJobId(long Id, string year, string month);
+    List<InsuranceJobItemViewModel> GetInsuranceJobItemByInsuranceJobId(long Id);
    List<InsuranceJobItemViewModel> Search(InsuranceJobItemSearchModel searchModel);
-    InsuranceJobItemViewModel GetInsuranceJobItemByInsuranceJobIdForFixedSalary(long insuranceJobId, long jobId,
-        string year, string month);
-
-    (List<string> workshopList, bool hasAnyWorkshop) GetWorkshopUsedThisInsuranceJob(long insuranceJobId);
+    InsuranceJobItemViewModel GetInsuranceJobItemByInsuranceJobIdForFixedSalary(long insuranceJobId, long jobId); 

 }
--- a/Company.Domain/InsuranceJobItemAgg/InsuranceJobItem.cs
+++ b/Company.Domain/InsuranceJobItemAgg/InsuranceJobItem.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using _0_Framework.Domain;
 using Company.Domain.InsuranceJobAndJobsAgg;
 using Company.Domain.InsurancJobAgg;
@@ -9,15 +8,13 @@ namespace Company.Domain.InsuranceJobItemAgg;

 public class InsuranceJobItem : EntityBase
 {
-    public InsuranceJobItem(double percentageLessThan, double salaeyLessThan, double percentageMoreThan, double salaryMoreThan, long insuranceJobId, DateTime? startDate, DateTime? endDate)
+    public InsuranceJobItem(double percentageLessThan, double salaeyLessThan, double percentageMoreThan, double salaryMoreThan, long insuranceJobId)
    {
        PercentageLessThan = percentageLessThan;
        SalaeyLessThan = salaeyLessThan;
        PercentageMoreThan = percentageMoreThan;
        SalaryMoreThan = salaryMoreThan;
        InsuranceJobId = insuranceJobId;
-        StartDate = startDate;
-        EndDate = endDate;
    }

    public double PercentageLessThan { get; private set; }
@@ -25,9 +22,6 @@ public class InsuranceJobItem : EntityBase
    public double PercentageMoreThan { get; private set; }
    public double SalaryMoreThan { get; private set; }

-    public DateTime? StartDate { get; private set; }
-    public DateTime? EndDate { get; private set; }
-
    public long InsuranceJobId { get; private set; }
    public InsuranceJob InsuranceJob { get; set; }
    public List<InsuranceJobAndJobs> InsuranceJobAndJobs { get; set; }
@@ -37,14 +31,12 @@ public class InsuranceJobItem : EntityBase
        InsuranceJobAndJobs = new List<InsuranceJobAndJobs>();
    }

-    public void Edit(double percentageLessThan, double salaeyLessThan, double percentageMoreThan, double salaryMoreThan, long insuranceJobId, DateTime? startDate, DateTime? endDate)
+    public void Edit(double percentageLessThan, double salaeyLessThan, double percentageMoreThan, double salaryMoreThan, long insuranceJobId)
    {
        PercentageLessThan = percentageLessThan;
        SalaeyLessThan = salaeyLessThan;
        PercentageMoreThan = percentageMoreThan;
        SalaryMoreThan = salaryMoreThan;
        InsuranceJobId = insuranceJobId;
-        StartDate = startDate;
-        EndDate = endDate;
    }
 }
--- a/Company.Domain/LeftWorkAgg/ILeftWorkRepository.cs
+++ b/Company.Domain/LeftWorkAgg/ILeftWorkRepository.cs
@@ -45,5 +45,4 @@ public interface ILeftWorkRepository : IRepository<long, LeftWork>
    #endregion

    Task<LeftWork> GetLastLeftWork(long employeeId, long workshopId);
-    List<LeftWorkViewModel> SearchCreateContract(LeftWorkSearchModel searchModel);
 }
--- a/Company.Domain/LeftWorkInsuranceAgg/ILeftWorkInsuranceRepository.cs
+++ b/Company.Domain/LeftWorkInsuranceAgg/ILeftWorkInsuranceRepository.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.InsuranceList;
-using CompanyManagment.App.Contracts.LeftWork;
 using CompanyManagment.App.Contracts.LeftWorkInsurance;
 using CompanyManagment.App.Contracts.PersonnleCode;

@@ -41,19 +40,5 @@ public interface ILeftWorkInsuranceRepository : IRepository<long, LeftWorkInsura
    /// <returns></returns>
 	List<EmployeeDetailsForInsuranceListViewModel> GetEmployeeInsuranceLeftWorksAndInformation(long workshopId, DateTime startDate, DateTime endDate);

-    #endregion
-
-    #region Mahan
-
-    /// <summary>
-    /// پرسنل هایی که در قرارداد ترک کار دارند ولی در بیمه ترک کاری برایشان نخورده
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    List<LeftWorkViewModel> GetEmployeesWithContractExitOnly(long workshopId);
-
-    LeftWorkInsurance GetLastLeftWorkByEmployeeIdAndWorkshopId(long workshopId, long employeeId);
-
-    #endregion
-
+	#endregion
 }
--- a/Company.Domain/RollCallAgg/IRollCallMandatoryRepository.cs
+++ b/Company.Domain/RollCallAgg/IRollCallMandatoryRepository.cs
@@ -6,9 +6,7 @@ using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities;
 using CompanyManagment.App.Contracts.Contract;
 using CompanyManagment.App.Contracts.CustomizeCheckout;
 using CompanyManagment.App.Contracts.Leave;
-using CompanyManagment.App.Contracts.Loan;
 using CompanyManagment.App.Contracts.RollCall;
-using CompanyManagment.App.Contracts.SalaryAid;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;

 namespace Company.Domain.RollCallAgg;
@@ -16,19 +14,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);
-
-    /// <summary>
-    /// محاسبه ساعات کارکرد پرسنل در صورت داشتن حضور غیاب
-    /// </summary>
-    /// <param name="employeeId"></param>
-    /// <param name="workshopId"></param>
-    /// <param name="contractStart"></param>
-    /// <param name="contractEnd"></param>
-    /// <returns></returns>
-    (bool hasRollCall, TimeSpan sumOfSpan) GetRollCallWorkingSpan(long employeeId, long workshopId,
-        DateTime contractStart, DateTime contractEnd);
-
-    TimeSpan AfterSubtract(CreateWorkingHoursTemp command, TimeSpan sumOneDaySpan, DateTime creationDate);
+	TimeSpan AfterSubtract(CreateWorkingHoursTemp command, TimeSpan sumOneDaySpan, DateTime creationDate);

 	List<RotatingShiftViewModel> RotatingShiftCheck(List<GroupedRollCalls> rollCallList);

@@ -47,12 +33,6 @@ public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
    /// <param name="contractEnd"></param>
    /// <param name="shiftwork"></param>
    /// <returns></returns>
-    List<LoanInstallmentViewModel> LoanInstallmentForCheckout(long employeeId, long workshopId, DateTime contractStart,
-        DateTime contractEnd);
-
-    List<SalaryAidViewModel> SalaryAidsForCheckout(long employeeId, long workshopId, DateTime checkoutStart,
-        DateTime checkoutEnd);
-
    Task<ComputingViewModel> RotatingShiftReport(long workshopId, long employeeId, DateTime contractStart,
        DateTime contractEnd, string shiftwork, bool hasRollCall, CreateWorkingHoursTemp command,bool holidayWorking);
 }
--- a/Company.Domain/RollCallEmployeeAgg/IRollCallEmployeeRepository.cs
+++ b/Company.Domain/RollCallEmployeeAgg/IRollCallEmployeeRepository.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.RollCallEmployee;

@@ -7,7 +6,6 @@ namespace Company.Domain.RollCallEmployeeAgg;

 public interface IRollCallEmployeeRepository : IRepository<long, RollCallEmployee>
 {
-    bool HasRollCallRecord(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd);
    List<RollCallEmployeeViewModel> GetByWorkshopId(long workshopId);
    EditRollCallEmployee GetDetails(long id);
    RollCallEmployeeViewModel GetByEmployeeIdAndWorkshopId(long employeeId, long workshopId);
--- a/Company.Domain/TemporaryClientRegistrationAgg/IWorkshopTempRepository.cs
+++ b/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);
+

 }
--- a/Company.Domain/TemporaryClientRegistrationAgg/InstitutionContractTemp.cs
+++ b/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; }

--- a/Company.Domain/WorkshopAgg/IWorkshopRepository.cs
+++ b/Company.Domain/WorkshopAgg/IWorkshopRepository.cs
@@ -69,8 +69,6 @@ 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);
-

    #endregion

--- a/Company.Domain/empolyerAgg/IEmployerRepository.cs
+++ b/Company.Domain/empolyerAgg/IEmployerRepository.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.Checkout;
@@ -34,9 +33,6 @@ public interface IEmployerRepository : IRepository<long, Employer>

    List<EmployerViewModel> GetEmployersHasWorkshop();

-    Task<List<EmployerSelectListViewModel>> GetSelectList(string search);
-
-
    #endregion

    #region NewByHeydari
--- a/CompanyManagment.App.Contracts/AdminMonthlyOverview/AdminMonthlyOverviewStatus.cs
+++ b/CompanyManagment.App.Contracts/AdminMonthlyOverview/AdminMonthlyOverviewStatus.cs
@@ -1,17 +0,0 @@
-namespace CompanyManagment.App.Contracts.AdminMonthlyOverview;
-
-public enum AdminMonthlyOverviewStatus
-{
-    /// <summary>
-    /// تنظیم مستندات - فیش و قرارداد
-    /// </summary>
-    CreateDocuments = 0,
-    /// <summary> در انتظار مراجعه </summary>
-    VisitPending = 1,
-    /// <summary> در حال مراجعه </summary>
-    VisitInProgress = 2,
-    /// <summary> اتمام مراجعه </summary>
-    VisitCompleted = 3,
-    /// <summary> بایگانی شد </summary>
-    Archived = 4
-}
--- a/CompanyManagment.App.Contracts/AdminMonthlyOverview/IAdminMonthlyOverviewApplication.cs
+++ b/CompanyManagment.App.Contracts/AdminMonthlyOverview/IAdminMonthlyOverviewApplication.cs
@@ -1,82 +0,0 @@
-using System.Collections.Generic;
-using System.Security.Cryptography;
-using System.Threading.Tasks;
-using _0_Framework.Application;
-using Microsoft.EntityFrameworkCore.Metadata;
-
-namespace CompanyManagment.App.Contracts.AdminMonthlyOverview;
-
-public interface IAdminMonthlyOverviewApplication
-{
-    /// <summary>
-    /// نمایش لیست ماهانه کارگاه ها - درصورت وجود نداشتن اطلاعات در این ماه، یک رکورد جدید ایجاد میکند
-    /// </summary>
-    /// <returns></returns>
-    Task<List<AdminMonthlyOverviewListViewModel>> GetWorkshopListByStatus(AdminMonthlyOverviewSearchModel searchModel);
-
-    /// <summary>
-    /// شمارش تعداد هر تب 
-    /// </summary>
-    /// <param name="year"></param>
-    /// <param name="month"></param>
-    /// <param name="accountId"></param>
-    /// <returns></returns>
-    Task<AdminMonthlyOverViewCounterVm> GetCounter(int year, int month, long accountId);
-
-    /// <summary>
-    /// رفتن به مرحله بعدی
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    Task<OperationResult> Next(long id);
-
-    /// <summary>
-    /// برگشت به مرحله قبل
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    Task<OperationResult> Back(long id);
-}
-
-public class AdminMonthlyOverViewCounterVm
-{
-    public int CreateDocument { get; set; }
-    public int VisitPending { get; set; }
-    public int VisitInProgress { get; set; }
-    public int VisitCompleted { get; set; }
-    public int Archived { get; set; }
-    public int All { get; set; }
-    
-
-}
-
-public class AdminMonthlyOverviewSearchModel
-{
-    public int Year { get; set; }
-    public int Month { get; set; }
-    public long WorkshopId { get; set; }
-    public long EmployerId { get; set; }
-    public long AdminAccountId { get; set; }
-    public IsActive ActivationStatus { get; set; }
-
-}
-
-public class AdminMonthlyOverviewListViewModel
-{
-    public long Id { get; set; }
-    public long WorkshopId { get; set; }
-    public string WorkshopName { get; set; }
-    public string WorkshopArchiveCode { get; set; }
-    public int WorkshopArchiveCodeInt { get; set; }
-    public string Province { get; set; }
-    public string City { get; set; }
-    public string Address { get; set; }
-    public string AgentPhoneNumber { get; set; }
-    public string AdminFullName { get; set; }
-    public string EmployerName { get; set; }
-    public string EmployerPhoneNumber { get; set; }
-    public int ContractEmployeeCount { get; set; }
-    public int CheckoutEmployeeCount { get; set; }
-    public AdminMonthlyOverviewStatus Status { get; set; }
-    public bool IsBlock { get; set; }
-}
--- a/CompanyManagment.App.Contracts/Checkout/CheckoutViewModel.cs
+++ b/CompanyManagment.App.Contracts/Checkout/CheckoutViewModel.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using CompanyManagment.App.Contracts.Employer;
-using CompanyManagment.App.Contracts.Loan;
 using CompanyManagment.App.Contracts.RollCall;
-using CompanyManagment.App.Contracts.SalaryAid;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;

 namespace CompanyManagment.App.Contracts.Checkout;
@@ -122,17 +120,5 @@ public class CheckoutViewModel
    /// تعداد روزهای محاسبه شده برای عیدی و پاداش
    /// </summary>
    public string TotalDayOfBunosesCompute { get; set; }
-
-    /// <summary>
-    /// مدت مرخصی استعلاجی 
-    /// </summary>
-    public string TotalSickLeave { get; set; }
-
-    /// <summary>
-    /// مدت مرخصی استحقاقی
-    /// </summary>
-    public string TotalPaidLeave { get; set; }
 	public List<CheckoutDailyRollCallViewModel> MonthlyRollCall { get; set; }
-    public List<LoanInstallmentViewModel> InstallmentViewModels { get; set; }
-    public List<SalaryAidViewModel> SalaryAidViewModels { get; set; }
 }
--- a/CompanyManagment.App.Contracts/Checkout/CreateCheckoutListViewModel.cs
+++ b/CompanyManagment.App.Contracts/Checkout/CreateCheckoutListViewModel.cs
@@ -1,45 +0,0 @@
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.Checkout;
-
-public class CreateCheckoutListViewModel
-{
-    public long Id { get; set; }
-
-    public long PersonnelCode { get; set; }
-
-    public long EmployeeId { get; set; }
-
-    public string ContractNo { get; set; }
-
-    public string EmployerName { get; set; }
-
-    public string WorkshopName { get; set; }
-    public string EmployeeName { get; set; }
-
-    public string ContractStart { get; set; }
-
-    public string ContractEnd { get; set; }
-
-    public string LeftWorkDate { get; set; }
-
-    //public string NextMonthStart { get; set; }
-
-    //public bool RedColor { get; set; }
-
-    public bool LaterThanEnd { get; set; }
-
-    public bool Extension { get; set; }
-
-    public bool HasCheckout { get; set; }
-
-    //public bool MoreThanOneMonth { get; set; }
-
-    //public bool Waiting { get; set; }
-
-
-    public string Description { get; set; }
-
-
-    public List<CreateCheckoutListViewModel> CreateCheckoutList { get; set; }
-}
--- a/CompanyManagment.App.Contracts/Checkout/ICheckoutApplication.cs
+++ b/CompanyManagment.App.Contracts/Checkout/ICheckoutApplication.cs
@@ -13,20 +13,7 @@ public interface ICheckoutApplication
    OperationResult Edit(EditCheckout command);
    EditCheckout GetDetails(long id);

-    /// <summary>
-    /// لود لیست اولیه جهت ایجاد فیش حقوقی
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <param name="employeeId"></param>
-    /// <param name="year"></param>
-    /// <param name="month"></param>
-    /// <param name="contractStart"></param>
-    /// <param name="contractEnd"></param>
-    /// <returns></returns>
-    /// <exception cref="NotImplementedException"></exception>
-    Task<CreateCheckoutListViewModel> GetContractResultToCreateCheckout(long workshopId, long employeeId, string year,
-        string month,
-        string contractStart, string contractEnd);
+
    Task<List<CheckoutViewModel>> Search(CheckoutSearchModel searchModel);
    List<CheckoutViewModel> SimpleSearch(CheckoutSearchModel searchModel);
    List<CheckoutViewModel> PrintAll(List<long> id);
--- a/CompanyManagment.App.Contracts/ContactUs/IContactUsApplication.cs
+++ b/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; }
+}
--- a/CompanyManagment.App.Contracts/Contract/ComputingViewModel.cs
+++ b/CompanyManagment.App.Contracts/Contract/ComputingViewModel.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using CompanyManagment.App.Contracts.Loan;
-using CompanyManagment.App.Contracts.SalaryAid;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;

 namespace CompanyManagment.App.Contracts.Contract;
--- a/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CreateCustomizeWorkshopGroupSettings.cs
+++ b/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CreateCustomizeWorkshopGroupSettings.cs
@@ -1,5 +1,4 @@

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

 }
--- a/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CreateCustomizeWorkshopSettings.cs
+++ b/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CreateCustomizeWorkshopSettings.cs
@@ -1,5 +1,4 @@
-using System;
-using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
+using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using CompanyManagment.App.Contracts.CustomizeWorkshopSettings.ValueObjectsViewModel;
 using System.Collections.Generic;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
@@ -21,18 +20,16 @@ public class CreateCustomizeWorkshopSettings
    public BreakTime BreakTime { get; set; }


-    ///// <summary>
-    ///// آیا جمعه کار میکند یا نه
-    ///// </summary>
-    //public FridayWork FridayWork { get; set; }
+    /// <summary>
+    /// آیا جمعه کار میکند یا نه
+    /// </summary>
+    public FridayWork FridayWork { get; set; }

    /// <summary>
    /// آیا در روز های تعطیل  کار میکند
    /// </summary>
    public HolidayWork HolidayWork { get; set; }

-    public List<DayOfWeek> OffDays { get; set; }
-



--- a/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CustomizeWorkshopEmployeeSettingsViewModel.cs
+++ b/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CustomizeWorkshopEmployeeSettingsViewModel.cs
@@ -1,5 +1,4 @@
-using System;
-using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
+using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
 using System.Collections.Generic;

@@ -21,8 +20,7 @@ public class CustomizeWorkshopEmployeeSettingsViewModel
    public bool ChangeSettingEmployeeShiftIsChange { get; set; }
    public BreakTime BreakTime { get; set; }
    public HolidayWork HolidayWork { get; set; }
-    //public FridayWork FridayWork { get; set; }
+    public FridayWork FridayWork { get; set; }
    public int LeavePermittedDays { get; set; }
    public ICollection<CustomizeRotatingShiftsViewModel> CustomizeRotatingShiftsViewModels { get; set; }
-    public List<DayOfWeek> WeeklyOffDays { get; set; }
 }
--- a/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/EditCustomizeEmployeeSettings.cs
+++ b/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/EditCustomizeEmployeeSettings.cs
@@ -1,5 +1,4 @@
-using System;
-using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
+using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using CompanyManagment.App.Contracts.CustomizeWorkshopSettings.ValueObjectsViewModel;
 using System.Collections.Generic;
 using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
@@ -73,19 +72,17 @@ public class EditCustomizeEmployeeSettings:CreateCustomizeEmployeeSettings
    /// </summary>
    public EarlyExitViewModel EarlyExit { get;  set; }

-    ///// <summary>
-    ///// آیا جمعه کار میکند یا نه
-    ///// </summary>
-    //public FridayWork FridayWork { get; set; }
+    /// <summary>
+    /// آیا جمعه کار میکند یا نه
+    /// </summary>
+    public FridayWork FridayWork { get; set; }

    /// <summary>
    /// آیا در روز های تعطیل  کار میکند
    /// </summary>
    public HolidayWork HolidayWork { get; set; }

-    public List<DayOfWeek> WeeklyOffDays { get; set; }
-
-	public long Id { get; set; }
+    public long Id { get; set; }
    public string Salary { get; set; }
    public string NameGroup { get; set; }
    public string EmployeeFullName { get; set; }
@@ -94,5 +91,4 @@ public class EditCustomizeEmployeeSettings:CreateCustomizeEmployeeSettings
    public IEnumerable<CustomizeWorkshopShiftViewModel> ShiftViewModel { get; set; }
    public ICollection<CustomizeRotatingShiftsViewModel> CustomizeRotatingShifts{ get; set; }
    public BreakTime BreakTime { get; set; }
-
 }
--- a/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/EditCustomizeWorkshopGroupSettings.cs
+++ b/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/EditCustomizeWorkshopGroupSettings.cs
@@ -1,8 +1,6 @@
-using System;
-using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
+using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using CompanyManagment.App.Contracts.CustomizeWorkshopSettings.ValueObjectsViewModel;
 using System.Collections.Generic;
-using _0_Framework.Domain.CustomizeCheckoutShared.Base;

 namespace CompanyManagment.App.Contracts.CustomizeWorkshopSettings;

@@ -77,18 +75,16 @@ public class EditCustomizeWorkshopGroupSettings : CreateCustomizeWorkshopGroupSe
    /// </summary>
    public EarlyExitViewModel EarlyExit { get; set; }

-    ///// <summary>
-    ///// آیا جمعه کار میکند یا نه
-    ///// </summary>
-    //public FridayWork FridayWork { get; set; }
+    /// <summary>
+    /// آیا جمعه کار میکند یا نه
+    /// </summary>
+    public FridayWork FridayWork { get; set; }

    /// <summary>
    /// آیا در روز های تعطیل  کار میکند
    /// </summary>
    public HolidayWork HolidayWork { get; set; }

-    //public List<DayOfWeek> WeeklyOffDays { get; set; }
-
    public bool IsShiftChanged { get; set; }
    public bool IsSettingChanged { get; set; }
 }
--- a/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/ICustomizeWorkshopSettingsApplication.cs
+++ b/CompanyManagment.App.Contracts/CustomizeWorkshopSettings/ICustomizeWorkshopSettingsApplication.cs
@@ -1,5 +1,4 @@
-using System;
-using _0_Framework.Application;
+using _0_Framework.Application;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
 using CompanyManagment.App.Contracts.Employee;
@@ -34,7 +33,7 @@ public interface ICustomizeWorkshopSettingsApplication
    //Remove the Employee From the Group Settings
    OperationResult RemoveEmployeeFromRollCallWorkshopGroup(long employeeId, long groupId, long workshopId);

-    OperationResult EditSimpleRollCallGroupSetting(EditCustomizeWorkshopGroupSettings command, List<ReCalculateRollCallValues> reCalculateCommand);
+    OperationResult EditSimpleRollCallGroupSetting(EditCustomizeWorkshopGroupSettings command);

    #region Vafa
    OperationResult EditSimpleRollCallEmployeeSetting(EditCustomizeEmployeeSettings command,
@@ -52,14 +51,11 @@ public interface ICustomizeWorkshopSettingsApplication
    /// </summary>
    /// <param name="shiftViewModels">شیفت هت</param>
    /// <param name="customizeWorkshopSettingsId">آیدی تنظیمات کارگاه</param>
-    /// <param name="workshopShiftStatus"></param>
-    /// <param name="holidayWork"></param>
-    /// <param name="weeklyOffDays"></param>
    /// <param name="replaceChangedGroups"></param>
+    /// <param name="workshopShiftStatus"></param>
    /// <returns></returns>
    OperationResult EditWorkshopSettingShifts(List<CustomizeWorkshopShiftViewModel> shiftViewModels,
-	    long customizeWorkshopSettingsId, WorkshopShiftStatus workshopShiftStatus,
-	    HolidayWork holidayWork, List<DayOfWeek> weeklyOffDays);
+	    long customizeWorkshopSettingsId,WorkshopShiftStatus workshopShiftStatus,FridayWork fridayWork,HolidayWork holidayWork);

 	// It will Get the Workshop Settings with its groups and the employees of groups.
 	CustomizeWorkshopSettingsViewModel GetWorkshopSettingsByWorkshopId(long workshopId, AuthViewModel auth);
@@ -94,13 +90,7 @@ public interface ICustomizeWorkshopSettingsApplication
    List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingsByWorkshopId(long workshopId);
    CustomizeWorkshopGroupSettingsViewModel GetEmployeesGroupSettingsByEmployeeId(long employeeId, long workshopId);

-    /// <summary>
-    /// این متد برای قبل از ویرایش گروهی و محاسبه مجدد گروهی استفاده میشود برای اینکه پرسنل هایی که دارای فیش هستند رو فرانت نمایش بده
-    /// </summary>
-    /// <param name="command"></param>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    OperationResult<List<long>> ValidateReCalculateValueForGroupEdit(List<ReCalculateRollCallValues> command, long workshopId);
+
    bool HasAnyEmployeeWithoutGroup(long workshopId);

    /// <summary>
--- a/CompanyManagment.App.Contracts/DateSalary/DateSalaryViewModel.cs
+++ b/CompanyManagment.App.Contracts/DateSalary/DateSalaryViewModel.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace CompanyManagment.App.Contracts.DateSalary;
+namespace CompanyManagment.App.Contracts.DateSalary;

 public class DateSalaryViewModel
 {
@@ -9,6 +7,4 @@ public class DateSalaryViewModel
    public string Month { get; set; }
    public string StartDateFa { get; set; }
    public string EndDateFa { get; set; }
-    public DateTime StartDateGr { get; set; }
-    public DateTime EndDateGr { get; set; }
 }
--- a/CompanyManagment.App.Contracts/Employer/EmployerSelectListViewModel.cs
+++ b/CompanyManagment.App.Contracts/Employer/EmployerSelectListViewModel.cs
@@ -1,7 +0,0 @@
-namespace CompanyManagment.App.Contracts.Employer;
-
-public class EmployerSelectListViewModel
-{
-    public long Id { get; set; }
-    public string Name { get; set; }
-}
--- a/CompanyManagment.App.Contracts/Employer/IEmployerApplication.cs
+++ b/CompanyManagment.App.Contracts/Employer/IEmployerApplication.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.Checkout;

@@ -36,8 +35,6 @@ public interface IEmployerApplication
    #region Mahan

    List<EmployerViewModel> GetEmployersHasWorkshop();
-    Task<List<EmployerSelectListViewModel>> GetSelectList(string search);
-
    #endregion
    #region NewByHeydari
    OperationResult DeleteEmployer(long id);
--- a/CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractViewModel.cs
+++ b/CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractViewModel.cs
@@ -69,5 +69,4 @@ public class InstitutionContractViewModel
    public double ValueAddedTax { get; set; }
    public int LeftWorkEmployeeCount { get; set; }
    public int InsuranceLeftWorkEmployeeCount { get; set; }
-    public string IsExpier { get; set; }
 }
--- a/CompanyManagment.App.Contracts/InsuranceJob/CopyFromLastYearViewModel.cs
+++ b/CompanyManagment.App.Contracts/InsuranceJob/CopyFromLastYearViewModel.cs
@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using CompanyManagment.App.Contracts.InsuranceJobItem;
-using Microsoft.AspNetCore.Mvc.Rendering;
-
-namespace CompanyManagment.App.Contracts.InsuranceJob;
-
-public class CopyFromLastYearViewModel
-{
-    public string StartDate { get; set; }
-    public string EndDate { get; set; }
-
-    public long InsuranceJobItemId { get; set; }
-
-    public SelectList InsuranceJobItemViewModels { get; set; }
-}
--- a/CompanyManagment.App.Contracts/InsuranceJob/CreateInsuranceJob.cs
+++ b/CompanyManagment.App.Contracts/InsuranceJob/CreateInsuranceJob.cs
@@ -5,7 +5,6 @@ using System.Text;
 using System.Threading.Tasks;
 using CompanyManagment.App.Contracts.InsuranceJobItem;
 using CompanyManagment.App.Contracts.Job;
-using Microsoft.AspNetCore.Mvc.Rendering;

 namespace CompanyManagment.App.Contracts.InsuranceJob;

@@ -15,20 +14,7 @@ public class CreateInsuranceJob
    public long YearlySalaryId { get; set; }
    public string EconomicCode { get; set; }
    public string Year { get; set; }
-    public string Month { get; set; }
    public long JobId { get; set; }
-
-    public string StartDateFa { get; set; }
-    public string EndDateFa { get; set; }
    public List<JobViewModel> Jobs { get; set; }
    public List<InsuranceJobItemViewModel> InsuranceJobItems { get; set; }
-
-    public List<string> WorkshopList { get; set; }
-    public bool HasAnyWorkshop { get; set; }
-
-    public long InsuranceJobItemId { get; set; }
-
-    public SelectList InsuranceJobItemViewModels { get; set; }
-
-
 }
--- a/CompanyManagment.App.Contracts/InsuranceJob/IInsuranceJobApplication.cs
+++ b/CompanyManagment.App.Contracts/InsuranceJob/IInsuranceJobApplication.cs
@@ -10,12 +10,9 @@ namespace CompanyManagment.App.Contracts.InsuranceJob;

 public interface IInsuranceJobApplication
 {
-    List<(long id, string date)> GetOldYersInsuranceItemIds();
-    OperationResult CopyFromLastYear(CopyFromLastYearViewModel command);
-    OperationResult RecoveryOldData1403();
    OperationResult Create(CreateInsuranceJob command);
    OperationResult Edit(EditInsuranceJob command);
-    EditInsuranceJob GetDetails(long id,string year, string month);
+    EditInsuranceJob GetDetails(long id);
    List<InsuranceJobViewModel> GetInsurancJob();
 
    List<InsuranceJobViewModel> Search(InsuranceJobSearchModel searchModel);
--- a/CompanyManagment.App.Contracts/InsuranceJob/InsuranceJobViewModel.cs
+++ b/CompanyManagment.App.Contracts/InsuranceJob/InsuranceJobViewModel.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using CompanyManagment.App.Contracts.InsuranceJobItem;

 namespace CompanyManagment.App.Contracts.InsuranceJob;

@@ -14,7 +13,4 @@ public class InsuranceJobViewModel
    //public long YearlySalaryId { get; set; }
    public string EconomicCode { get; set; }
    public string Year { get; set; }
-    public string Month { get; set; }
-    public List<InsuranceJobItemViewModel> InsuranceJobItemViewModels { get; set; }
-
 }
--- a/CompanyManagment.App.Contracts/InsuranceJobItem/InsuranceJobItemViewModel.cs
+++ b/CompanyManagment.App.Contracts/InsuranceJobItem/InsuranceJobItemViewModel.cs
@@ -11,32 +11,14 @@ namespace CompanyManagment.App.Contracts.InsuranceJobItem;
 public class InsuranceJobItemViewModel
 {
    public long Id { get; set; }
-
-   
-
-    /// <summary>
-    /// آیای این درصد در لیست مبالغ مبلغ پر شده دارد
-    /// </summary>
-    public bool IsPercentageLessThanUse { get; set; }
    public double PercentageLessThan { get; set; }
-
-  
-
-    /// <summary>
-    /// آیای این درصد در لیست مبالغ مبلغ پر شده دارد
-    /// </summary>
-    public bool IsPercentageMoreThanUse { get; set; }
    public double PercentageMoreThan { get; set; }
-
    public double SalaeyLessThan { get; set; }
    public double SalaryMoreThan { get; set; }
    public string SalaeyLessThanString { get; set; }
    public string SalaryMoreThanString { get; set; }
    public long InsuranceJobId { get; set; }

-    public DateTime? StartDate { get; set; }
-    public DateTime? EndDate { get; set; }
-
    public List<long> JobIds { get; set; }
    public List<JobViewModel> JobList { get; set; }
 }
--- a/CompanyManagment.App.Contracts/InsuranceList/EditInsuranceList.cs
+++ b/CompanyManagment.App.Contracts/InsuranceList/EditInsuranceList.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using CompanyManagment.App.Contracts.LeftWork;

 namespace CompanyManagment.App.Contracts.InsuranceList;

@@ -15,8 +14,4 @@ public class EditInsuranceList:CreateInsuranceList
    public string Population { get; set; }
    public long? InsuranceJobId { get; set; }

-    /// <summary>
-    /// پرسنل هایی که قرارداد ترک کار کرده اند ولی ترک کار بیمه ندارند
-    /// </summary>
-    public List<LeftWorkViewModel> LeftWorkEmployees { get; set; }
 }
--- a/CompanyManagment.App.Contracts/LeftWork/ILeftWorkApplication.cs
+++ b/CompanyManagment.App.Contracts/LeftWork/ILeftWorkApplication.cs
@@ -16,9 +16,6 @@ public interface ILeftWorkApplication
    EditLeftWork GetDetails(long id);
    LeftWorkViewModel CheckoutleftWorkCheck(DateTime contractStart, long workshopId, long employeeId);
    List<LeftWorkViewModel> search(LeftWorkSearchModel searchModel);
-
-
-    List<LeftWorkViewModel> SearchCreateContract(LeftWorkSearchModel searchModel);
    Task<List<LeftWorkViewModel>> searchAsync(LeftWorkSearchModel searchModel);
    string StartWork(long employeeId, long workshopId, string leftWork);
    OperationResult RemoveLeftWork(long id);
--- a/CompanyManagment.App.Contracts/RollCall/RollCallViewModel.cs
+++ b/CompanyManagment.App.Contracts/RollCall/RollCallViewModel.cs
@@ -65,6 +65,4 @@ public class RollCallViewModel
    /// مدت زمان استراحت
    /// </summary>
    public TimeSpan BreakTimeSpan { get; set; }
-
-    public DateTime? ShiftEndWithoutRest { get; set; }
 }
--- a/CompanyManagment.App.Contracts/RollCallEmployee/IRollCallEmployeeApplication.cs
+++ b/CompanyManagment.App.Contracts/RollCallEmployee/IRollCallEmployeeApplication.cs
@@ -38,5 +38,4 @@ public interface IRollCallEmployeeApplication
    (int activeEmployees, int deActiveEmployees) GetActiveAndDeActiveRollCallEmployees(long workshopId);
    bool HasEmployees(long workshopId);
    #endregion
-
 }
--- a/CompanyManagment.App.Contracts/RollCallEmployeeStatus/IRollCallEmployeeStatusApplication.cs
+++ b/CompanyManagment.App.Contracts/RollCallEmployeeStatus/IRollCallEmployeeStatusApplication.cs
@@ -17,7 +17,5 @@ namespace CompanyManagment.App.Contracts.RollCallEmployeeStatus
        List<RollCallEmployeeStatusViewModel> GetActiveByWorkshopIdInDate(long workshopId, DateTime startDateGr, DateTime endDateGr);

        bool IsActiveInPeriod(long employeeId, long workshopId, DateTime startDate, DateTime endDate);
-        void SyncRollCallEmployeeWithLeftWork(long rollCallEmployeeId);
-
-	}
+    }
 }
--- a/CompanyManagment.App.Contracts/SalaryAid/CreateSalaryAidViewModel.cs
+++ b/CompanyManagment.App.Contracts/SalaryAid/CreateSalaryAidViewModel.cs
@@ -8,7 +8,6 @@ public class CreateSalaryAidViewModel
 	public long WorkshopId { get; set; }
 	public string Amount { get; set; }
 	public string SalaryDateTime { get; set; }
-	public string CalculationDateTime { get; set; }
    public string NationalCode { get; set; }
    public int CalculationMonth { get; set; }
    public int CalculationYear { get; set; }
--- a/CompanyManagment.App.Contracts/SalaryAid/SalaryAidGroupedByDateViewModel.cs
+++ b/CompanyManagment.App.Contracts/SalaryAid/SalaryAidGroupedByDateViewModel.cs
@@ -6,8 +6,6 @@ public class SalaryAidGroupedByDateViewModel
 {
    public string MonthFa { get; set; }
    public string YearFa { get; set; }
-    public int Month { get; set; }
-    public int Year { get; set; }
    public List<SalaryAidGroupedByDateViewModelItems> SalaryAidViewModels { get; set; }
    public string TotalAmount { get; set; }

--- a/CompanyManagment.App.Contracts/SalaryAid/SalaryAidViewModel.cs
+++ b/CompanyManagment.App.Contracts/SalaryAid/SalaryAidViewModel.cs
@@ -15,8 +15,7 @@ public class SalaryAidViewModel
    public string CalculationDateTimeFa { get; set; }
    public DateTime CalculationDateTimeGe { get; set; }

-    public int Month { get; set; }
-    public int Year { get; set; }
+

    public string EmployeeFullName { get; set; }
    public string PersonnelCode { get; set; }
--- a/CompanyManagment.App.Contracts/TemporaryClientRegistration/ITemporaryClientRegistrationApplication.cs
+++ b/CompanyManagment.App.Contracts/TemporaryClientRegistration/ITemporaryClientRegistrationApplication.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.InstitutionPlan;
@@ -38,7 +39,7 @@ public interface ITemporaryClientRegistrationApplication
    /// </summary>
    /// <param name="command"></param>
    /// <returns></returns>
-    Task<OperationResult> CreateOrUpdateWorkshopTemp(List<WorkshopTempViewModel> command);
+    Task<OperationResult> CreateOrUpdateWorkshopTemp(List<WorkshopTempViewModel> command, long contractingPartyTempId);

    /// <summary>
    /// دریافت جمع کل خدمات برای یک کارگاه
@@ -55,14 +56,14 @@ public interface ITemporaryClientRegistrationApplication
    /// <param name="paymentModel"></param>
    /// <returns></returns>
    Task<ReviewAndPaymentViewModel> GetTotalPaymentAndWorkshopList(long contractingPartyTempId,
-        string periodModel = "12", string paymentModel = "OneTime");
+        string periodModel = "12", string paymentModel = "OneTime", string contractStartType = "currentMonth");

    /// <summary>
    /// ایجاد یا ویرایش قرارداد موقت
    /// </summary>
    /// <param name="contractingPartyTempId"></param>
    /// <returns></returns>
-    Task<OperationResult> CreateOrUpdateInstitutionContractTemp(long contractingPartyTempId, string periodModel, string paymentModel, double totalPayment, double valueAddedTax);
+    Task<OperationResult> CreateOrUpdateInstitutionContractTemp(long contractingPartyTempId, string periodModel, string paymentModel, double totalPayment, double valueAddedTax, DateTime contractStart);

    /// <summary>
    /// دریافت کد برای کلاینت
--- a/CompanyManagment.App.Contracts/TemporaryClientRegistration/MonthlyInstallment.cs
+++ b/CompanyManagment.App.Contracts/TemporaryClientRegistration/MonthlyInstallment.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CompanyManagment.App.Contracts.TemporaryClientRegistration;
+
+public class MonthlyInstallment
+{
+    /// <summary>
+    /// مبلغ قسط ماهانه
+    /// </summary>
+    public string InstallmentAmountStr { get; set; }
+
+    /// <summary>
+    /// تاریخ قسط ماهانه
+    /// </summary>
+    public string InstalmentDate { get; set; }
+
+    /// <summary>
+    /// شمارنده قسط
+    /// </summary>
+    public string InstallmentCounter{ get; set; }
+}
--- a/CompanyManagment.App.Contracts/TemporaryClientRegistration/ReviewAndPaymentViewModel.cs
+++ b/CompanyManagment.App.Contracts/TemporaryClientRegistration/ReviewAndPaymentViewModel.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;

 namespace CompanyManagment.App.Contracts.TemporaryClientRegistration;

@@ -23,28 +24,54 @@ public class ReviewAndPaymentViewModel
    /// مبلغ پرداخت بدون مالیات
    /// Double
    /// </summary>
-    public double WithoutTaxPaymentDouble { get; set; }
+    public double OneTimeWithoutTaxPaymentDouble { get; set; }

    /// <summary>
    /// مبلغ پرداخت بدون مالیات
    /// string
    /// </summary>
-    public string WithoutTaxPaymentStr { get; set; }
+    public string OneTimeWithoutTaxPaymentStr { get; set; }


    /// <summary>
    /// مبلغ پرداخت کامل
    /// Double
    /// </summary>
-    public double TotalPaymentDouble { get; set; }
+    public double OneTimeTotalPaymentDouble { get; set; }

    /// <summary>
    /// مبلغ پرداخت کامل
    /// string
    /// </summary>
-    public string TotalPaymentStr { get; set; }
+    public string OneTimeTotalPaymentStr { get; set; }


+
+    /// <summary>
+    /// مبلغ پرداخت بدون مالیات
+    /// Double
+    /// </summary>
+    public double MonthlyWithoutTaxPaymentDouble { get; set; }
+
+    /// <summary>
+    /// مبلغ پرداخت بدون مالیات
+    /// string
+    /// </summary>
+    public string MonthlyWithoutTaxPaymentStr { get; set; }
+
+
+    /// <summary>
+    /// مبلغ پرداخت کامل
+    /// Double
+    /// </summary>
+    public double MonthlyTotalPaymentDouble { get; set; }
+
+    /// <summary>
+    /// مبلغ پرداخت کامل
+    /// string
+    /// </summary>
+    public string MonthlyTotalPaymentStr { get; set; }
+
    /// <summary>
    /// مالیات بر ارزش افزوده
    /// Double
@@ -83,4 +110,52 @@ public class ReviewAndPaymentViewModel
    /// آی دی طرف حساب
    /// </summary>
    public long ContractingPartTempId { get; set; }
+
+    /// <summary>
+    /// لیست اقساط ماهیانه
+    /// </summary>
+    public List<MonthlyInstallment> MonthlyInstallments { get; set; }
+
+
+    /// <summary>
+    /// تاریخ شروع قرارداد در اول ماه جاری
+    /// -
+    /// شمسی
+    /// </summary>
+    public string ContractStartCurrentMonthFa { get; set; }
+
+    /// <summary>
+    /// تاریخ شروع قرارداد در اول ماه جاری
+    /// -
+    /// میلادی
+    /// </summary>
+    public DateTime ContractStartCurrentMonthGr { get; set; }
+
+    /// <summary>
+    /// تاریخ شروع قرارداد در اول ماه بعد
+    /// -
+    /// شمسی
+    /// </summary>
+    public string ContractStartNextMonthFa{ get; set; }
+
+    /// <summary>
+    /// تاریخ شروع قرارداد در اول ماه بعد
+    /// -
+    /// میلادی
+    /// </summary>
+    public DateTime ContractStartNextMonthGr { get; set; }
+
+    /// <summary>
+    /// تاریخ پایان قرارداد
+    /// -
+    /// میلادی
+    /// </summary>
+    public DateTime ContractEndGr { get; set; }
+
+    /// <summary>
+    /// تاریخ پایان قرارداد
+    /// -
+    /// شمسی
+    /// </summary>
+    public string ContractEndFa { get; set; }
 }
--- a/CompanyManagment.App.Contracts/Workshop/IWorkshopApplication.cs
+++ b/CompanyManagment.App.Contracts/Workshop/IWorkshopApplication.cs
@@ -85,8 +85,6 @@ public interface IWorkshopApplication

    Task<List<WorkshopWithLeftWorkTempEmployeesDto>> GetWorkshopsForLeftWorkTemp(long accountId);
    Task<int> GetWorkshopsForLeftWorkTempCount(long accountId);
-    Task<List<WorkshopSelectListViewModel>> GetSelectList(string search);
-

    #endregion
 }
--- a/CompanyManagment.App.Contracts/Workshop/WorkshopSelectListViewModel.cs
+++ b/CompanyManagment.App.Contracts/Workshop/WorkshopSelectListViewModel.cs
@@ -1,8 +0,0 @@
-namespace CompanyManagment.App.Contracts.Workshop;
-
-public class WorkshopSelectListViewModel
-{
-    public long Id { get; set; }
-    public string Name { get; set; }
-    public string ArchiveCode { get; set; }
-}
--- a/CompanyManagment.App.Contracts/Workshop/WorkshopSubAccountViewModel.cs
+++ b/CompanyManagment.App.Contracts/Workshop/WorkshopSubAccountViewModel.cs
@@ -7,6 +7,5 @@ namespace CompanyManagment.App.Contracts.Workshop
        public string WorkshopName { get; set; }
        public long SubAccountId { get; set; }
        public string IsActive { get; set; }
-        public int PersonnelCount { get; set; }
    }
 }
--- a/CompanyManagment.Application/AdminMonthlyOverviewApplication.cs
+++ b/CompanyManagment.Application/AdminMonthlyOverviewApplication.cs
@@ -1,86 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using _0_Framework.Application;
-using Company.Domain.AdminMonthlyOverviewAgg;
-using CompanyManagment.App.Contracts.AdminMonthlyOverview;
-
-namespace CompanyManagment.Application;
-
-public class AdminMonthlyOverviewApplication:IAdminMonthlyOverviewApplication
-{
-    private readonly IAdminMonthlyOverviewRepository _adminMonthlyOverviewRepository;
-
-    public AdminMonthlyOverviewApplication(IAdminMonthlyOverviewRepository adminMonthlyOverviewRepository)
-    {
-        _adminMonthlyOverviewRepository = adminMonthlyOverviewRepository;
-    }
-
-    public async Task<List<AdminMonthlyOverviewListViewModel>> GetWorkshopListByStatus(AdminMonthlyOverviewSearchModel searchModel)
-    {
-        return await _adminMonthlyOverviewRepository.GetWorkshopStatus(searchModel);
-    }
-
-    public async Task<AdminMonthlyOverViewCounterVm> GetCounter(int year, int month, long accountId)
-    {
-        return await _adminMonthlyOverviewRepository.GetCounter(year, month, accountId);
-    }
-
-    public async Task<OperationResult> Next(long id)
-    {
-        var operation= new OperationResult();
-        var monthlyOverview = _adminMonthlyOverviewRepository.Get(id);
-        if (monthlyOverview == null)
-        {
-            return operation.Failed("آیتم موردنظر یافت نشد");
-        }
-
-        if (monthlyOverview.Status== AdminMonthlyOverviewStatus.CreateDocuments)
-        {
-            return operation.Failed("شما نمیتوانید تا زمانی که قرارداد و تصفیه را تنظیم نکردید به مرحله بعد بروید");
-        }
-
-        var maxValue = Enum.GetValues(typeof(AdminMonthlyOverviewStatus))
-            .Cast<AdminMonthlyOverviewStatus>()
-            .Max();
-
-        if (monthlyOverview.Status >= maxValue)
-        {
-           return operation.Failed("مرحله بعدی انتخاب شده نامعتبر است");
-        }
-
-        monthlyOverview.Next();
-      await  _adminMonthlyOverviewRepository.SaveChangesAsync();
-        return operation.Succcedded();
-    }
-
-    public async Task<OperationResult> Back(long id)
-    {
-        var operation = new OperationResult();
-        var monthlyOverview = _adminMonthlyOverviewRepository.Get(id);
-        if (monthlyOverview == null)
-        {
-            return operation.Failed("آیتم موردنظر یافت نشد");
-        }
-
-        if (monthlyOverview.Status == AdminMonthlyOverviewStatus.CreateDocuments+1)
-        {
-            return operation.Failed("شما امکان برگشت به مرحله قبل را ندارید");
-        }
-
-        var minValue = Enum.GetValues(typeof(AdminMonthlyOverviewStatus))
-            .Cast<AdminMonthlyOverviewStatus>()
-            .Min();
-
-        if (monthlyOverview.Status <= minValue)
-        {
-            return operation.Failed("مرحله قبلی انتخاب شده نامعتبر است");
-        }
-
-        monthlyOverview.Back();
-        await _adminMonthlyOverviewRepository.SaveChangesAsync();
-
-        return operation.Succcedded();
-    }
-}
--- a/CompanyManagment.Application/CheckoutApplication.cs
+++ b/CompanyManagment.Application/CheckoutApplication.cs
@@ -5,11 +5,9 @@ using System.Linq;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using Company.Domain.CheckoutAgg;
-using Company.Domain.CheckoutAgg.ValueObjects;
 using Company.Domain.LeftWorkAgg;
 using Company.Domain.YearlySalaryAgg;
 using Company.Domain.empolyerAgg;
-using Company.Domain.RollCallAgg;
 using CompanyManagment.App.Contracts.Checkout;
 using CompanyManagment.App.Contracts.PersonalContractingParty;
 using CompanyManagment.App.Contracts.Leave;
@@ -26,12 +24,11 @@ public class CheckoutApplication : ICheckoutApplication
    private readonly IPersonalContractingPartyApp _contractingPartyApp;
    private readonly ILeaveApplication _leaveApplication;
    private readonly IMandatoryHoursApplication _mandatoryHoursApplication;
-    private readonly IRollCallMandatoryRepository _rollCallMandatoryRepository;


    public CheckoutApplication(ICheckoutRepository checkoutRepository, IYearlySalaryRepository yearlySalaryRepository,
        ILeftWorkRepository leftWorkRepository,
-        IEmployerRepository employerRepository, IPersonalContractingPartyApp contractingPartyApp, ILeaveApplication leaveApplication, IMandatoryHoursApplication mandatoryHoursApplication, IRollCallMandatoryRepository rollCallMandatoryRepository)
+        IEmployerRepository employerRepository, IPersonalContractingPartyApp contractingPartyApp, ILeaveApplication leaveApplication, IMandatoryHoursApplication mandatoryHoursApplication)
    {
        _checkoutRepository = checkoutRepository;
        _yearlySalaryRepository = yearlySalaryRepository;
@@ -40,7 +37,6 @@ public class CheckoutApplication : ICheckoutApplication
        _contractingPartyApp = contractingPartyApp;
        _leaveApplication = leaveApplication;
        _mandatoryHoursApplication = mandatoryHoursApplication;
-        _rollCallMandatoryRepository = rollCallMandatoryRepository;
    }

    [SuppressMessage("ReSharper.DPA", "DPA0007: Large number of DB records", MessageId = "count: 241")]
@@ -52,85 +48,73 @@ public class CheckoutApplication : ICheckoutApplication
        string month = string.Empty;
        switch (smonth)
        {
-            case 1:
-                month = "فروردین";
+            case 1: month = "فروردین";
                break;
-            case 2:
-                month = "اردیبهشت";
+            case 2: month = "اردیبهشت";
                break;
-            case 3:
-                month = "خرداد";
+            case 3:month = "خرداد";
                break;
-            case 4:
-                month = "تیر";
+            case 4: month = "تیر";
                break;
-            case 5:
-                month = "مرداد";
+            case 5: month = "مرداد";
                break;
-            case 6:
-                month = "شهریور";
+            case 6: month = "شهریور";
                break;
-            case 7:
-                month = "مهر";
+            case 7:month = "مهر";
                break;
-            case 8:
-                month = "آبان";
+            case 8: month = "آبان";
                break;
-            case 9:
-                month = "آذر";
+            case 9: month = "آذر";
                break;
-            case 10:
-                month = "دی";
+            case 10: month = "دی";
                break;
-            case 11:
-                month = "بهمن";
+            case 11: month = "بهمن";
                break;
-            case 12:
-                month = "اسفند";
+            case 12: month = "اسفند";
                break;
        }
        var year = syear.ToString();

-        #region SickLeav
+		#region SickLeav

-        //var serachModel = new LeaveSearchModel()
-        //{
-        //	EmployeeId = command.EmployeeId,
-        //	WorkshopId = command.WorkshopId,
-        //	LeaveType = "استعلاجی",
-        //	StartLeave = command.ContractStart,
-        //	EndLeave = command.ContractEnd,
-        //	IsAccepted = true,
-        //};
-        //var leavList = _leaveApplication.search(serachModel);
-        //      int sickLeaveCount = 0;
-        //if (leavList.Count > 0)
-        //{
+		//var serachModel = new LeaveSearchModel()
+		//{
+		//	EmployeeId = command.EmployeeId,
+		//	WorkshopId = command.WorkshopId,
+		//	LeaveType = "استعلاجی",
+		//	StartLeave = command.ContractStart,
+		//	EndLeave = command.ContractEnd,
+		//	IsAccepted = true,
+		//};
+		//var leavList = _leaveApplication.search(serachModel);
+  //      int sickLeaveCount = 0;
+		//if (leavList.Count > 0)
+		//{
+			
+		//	foreach (var leave in leavList)
+		//	{
+		//		if (leave.StartLeaveGr < command.ContractStartGr && leave.EndLeaveGr <= command.ContractEndGr)
+		//		{
+  //                  int res = (int)((leave.EndLeaveGr - command.ContractStartGr).TotalDays +1);
+  //                  sickLeaveCount += res;
+		//		}
+		//		else if (leave.StartLeaveGr >= command.ContractStartGr && leave.EndLeaveGr > command.ContractEndGr)
+		//		{
+		//			int res = (int)((command.ContractEndGr - leave.StartLeaveGr).TotalDays + 1);
+		//			sickLeaveCount += res;
+		//		}
+		//		else
+		//		{
+		//			int res = (int)((leave.EndLeaveGr - leave.StartLeaveGr).TotalDays + 1);
+		//			sickLeaveCount += res;
+		//		}
+				
+		//	}
+		//}

-        //	foreach (var leave in leavList)
-        //	{
-        //		if (leave.StartLeaveGr < command.ContractStartGr && leave.EndLeaveGr <= command.ContractEndGr)
-        //		{
-        //                  int res = (int)((leave.EndLeaveGr - command.ContractStartGr).TotalDays +1);
-        //                  sickLeaveCount += res;
-        //		}
-        //		else if (leave.StartLeaveGr >= command.ContractStartGr && leave.EndLeaveGr > command.ContractEndGr)
-        //		{
-        //			int res = (int)((command.ContractEndGr - leave.StartLeaveGr).TotalDays + 1);
-        //			sickLeaveCount += res;
-        //		}
-        //		else
-        //		{
-        //			int res = (int)((leave.EndLeaveGr - leave.StartLeaveGr).TotalDays + 1);
-        //			sickLeaveCount += res;
-        //		}
+		#endregion

-        //	}
-        //}
-
-        #endregion
-
-        var dayliWage = command.DayliWage.MoneyToDouble();
+		var dayliWage = command.DayliWage.MoneyToDouble();
        // کمک هزینه اقلام
        var consumableItem = command.ConsumableItems.MoneyToDouble();
        //حق اولاد
@@ -140,8 +124,8 @@ public class CheckoutApplication : ICheckoutApplication
        //حق تاهل
        var marriedAllowance = command.MarriedAllowance.MoneyToDouble();
        var MontlyYearsBunos =
-            _yearlySalaryRepository.GetMontlyBunosYears(command.WeeklyTime, command.ContractStartGr, command.ContractEndGr, dayliWage, command.WorkingWeeklyTime, command.officialholiday, command.friday, command.TotalHolidaysAndNotH, command.TotalHolidaysAndNotM, command.Basic, command.FridayStarttoEnd, command.DailFeeComplete, command.HasRollCall, command.HolidayWorking, command.ShiftWork);
-        //دستمزد ماهانه
+            _yearlySalaryRepository.GetMontlyBunosYears(command.WeeklyTime, command.ContractStartGr, command.ContractEndGr, dayliWage,command.WorkingWeeklyTime,command.officialholiday,command.friday, command.TotalHolidaysAndNotH, command.TotalHolidaysAndNotM, command.Basic, command.FridayStarttoEnd,command.DailFeeComplete,command.HasRollCall, command.HolidayWorking, command.ShiftWork);
+       //دستمزد ماهانه
        var monthlyWage = MontlyYearsBunos.MontlyWage;
        //سنوات
        var years = command.YearsPay;
@@ -159,7 +143,7 @@ public class CheckoutApplication : ICheckoutApplication
        //حق بیمه سهم کارگر
        var insuranceDeduction = (monthlyWage + bacicYears + consumableItem + housingAllowance + marriedAllowance) * 7 / 100;

-        if (command.OvertimePay > 0 && command.AbsenceDeduction > 0)
+        if (command.OvertimePay > 0 && command.AbsenceDeduction>0)
        {
            if (command.AbsenceDeduction >= command.OvertimePay)
            {
@@ -173,26 +157,12 @@ public class CheckoutApplication : ICheckoutApplication
            }

        }
-        var checkoutStart = $"{command.Year}/{command.Month}/01";
-        var checkoutEnd = checkoutStart.FindeEndOfMonth();
-        var salaryAids =
-            _rollCallMandatoryRepository.SalaryAidsForCheckout(command.EmployeeId, command.WorkshopId, checkoutStart.ToGeorgianDateTime(), checkoutEnd.ToGeorgianDateTime())
-                .Select(x => new CheckoutSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa, x.CalculationDateTimeGe, x.CalculationDateTimeFa, x.Id)).ToList();
-
-        command.SalaryAidDeduction = salaryAids.Sum(x => x.Amount.MoneyToDouble());
-
-
-        var loanInstallments = _rollCallMandatoryRepository.LoanInstallmentForCheckout(command.EmployeeId,
-                command.WorkshopId, command.ContractStartGr, command.ContractEndGr)
-            .Select(x => new CheckoutLoanInstallment(x.Amount, x.Month, x.Year, x.IsActive, x.RemainingAmount, x.LoanAmount, x.Id)).ToList();
-
-        command.InstallmentDeduction = loanInstallments.Sum(x => x.AmountForMonth.MoneyToDouble());


        var totalClaimsDouble = monthlyWage + bacicYears + consumableItem + housingAllowance + marriedAllowance + command.OvertimePay +
                                command.NightworkPay + familyAllowance + bunos + years + command.LeavePay + command.FridayPay + command.ShiftPay;
        var totalClaims = totalClaimsDouble.ToMoney();
-        var totalDeductionDouble = insuranceDeduction + command.AbsenceDeduction + command.InstallmentDeduction + command.SalaryAidDeduction;
+        var totalDeductionDouble = insuranceDeduction + command.AbsenceDeduction;
        var totalDeductions = totalDeductionDouble.ToMoney();
        var totalPayment = totalClaimsDouble - totalDeductionDouble;

@@ -207,16 +177,14 @@ public class CheckoutApplication : ICheckoutApplication
            {
                command.Signature = "0";
            }
-
-
-
-            var checkout = new Checkout(command.EmployeeFullName, command.FathersName, command.NationalCode
+                  
+            var checkout = new Checkout(command.EmployeeFullName, command.FathersName ,command.NationalCode
                , command.DateOfBirth, command.EmployeeId, command.WorkshopName, command.WorkshopId, command.ContractNo, command.ContractStartGr, command.ContractEndGr, month, year,
                command.ContractId, command.WorkingHoursId, monthlyWage, bacicYears, consumableItem, housingAllowance
-                , command.OvertimePay, command.NightworkPay, command.FridayPay, 0, command.ShiftPay, familyAllowance, bunos, years, command.LeavePay, insuranceDeduction, 0, command.InstallmentDeduction, command.SalaryAidDeduction, command.AbsenceDeduction, sumOfWorkingDays,
-                command.ArchiveCode, command.PersonnelCode, totalClaims, totalDeductions, totalPayment, command.Signature, marriedAllowance, command.LeaveCheckout, command.CreditLeaves, command.AbsencePeriod, command.AverageHoursPerDay, command.HasRollCall, command.OverTimeWorkValue, command.OverNightWorkValue
-                , command.FridayWorkValue, command.RotatingShiftValue, command.AbsenceValue, command.TotalDayOfLeaveCompute, command.TotalDayOfYearsCompute, command.TotalDayOfBunosesCompute, loanInstallments, salaryAids);
-            _checkoutRepository.CreateCkeckout(checkout).GetAwaiter().GetResult();
+                , command.OvertimePay, command.NightworkPay, command.FridayPay, 0, command.ShiftPay, familyAllowance, bunos, years, command.LeavePay, insuranceDeduction, 0, 0, 0, command.AbsenceDeduction, sumOfWorkingDays,
+                command.ArchiveCode, command.PersonnelCode, totalClaims, totalDeductions, totalPayment, command.Signature,marriedAllowance,command.LeaveCheckout,command.CreditLeaves,command.AbsencePeriod,command.AverageHoursPerDay,command.HasRollCall,command.OverTimeWorkValue,command.OverNightWorkValue
+                ,command.FridayWorkValue, command.RotatingShiftValue,command.AbsenceValue,command.TotalDayOfLeaveCompute,command.TotalDayOfYearsCompute,command.TotalDayOfBunosesCompute);
+            _checkoutRepository.CreateCkeckout(checkout);
            //_checkoutRepository.SaveChanges();

            //var employeeFullName = new SqlParameter("@EmployeeFullName", SqlDbType.NVarChar, 50);
@@ -226,7 +194,7 @@ public class CheckoutApplication : ICheckoutApplication

        }

-
+           
    }

    public OperationResult Edit(EditCheckout command)
@@ -239,17 +207,10 @@ public class CheckoutApplication : ICheckoutApplication
        return _checkoutRepository.GetDetails(id);
    }

-    public async Task<CreateCheckoutListViewModel> GetContractResultToCreateCheckout(long workshopId, long employeeId, string year, string month,
-        string contractStart, string contractEnd)
-    {
-        return await _checkoutRepository.GetContractResultToCreateCheckout(workshopId, employeeId, year, month, contractStart,
-            contractEnd);
-
-    }
    public async Task<List<CheckoutViewModel>> Search(CheckoutSearchModel searchModel)
    {
        var result = new List<CheckoutViewModel>();
-        var query = await _checkoutRepository.SearchForMainCheckout(searchModel);
+        var query =await _checkoutRepository.SearchForMainCheckout(searchModel);
        query = query.Select(x => new CheckoutViewModel()
        {
            Id = x.Id,
@@ -287,7 +248,7 @@ public class CheckoutApplication : ICheckoutApplication
        //    //        .Select(x => x.EmployerId).FirstOrDefault();
        //    //var employerName = _context.Employers?.FirstOrDefault(x => x.id == employeId).FullName;
        //    // = employerName;
-
+                
        //}

        return query;
@@ -307,30 +268,31 @@ public class CheckoutApplication : ICheckoutApplication
            return new();
        result.ForEach(x =>
        {
-
-
-            int yearFa;
-            int monthFa;
-            try
+            if (x.HasRollCall)
            {
-                yearFa = int.Parse(oneRecord.Year);
-                monthFa = oneRecord.Month.ToMonthByStringValue();
-            }
-            catch (Exception e)
-            {
-                return;
-            }
-            double mandatoryHours = _mandatoryHoursApplication.GetMandatoryHoursByYearAndMonth(yearFa, monthFa);
-            int mandatoryWholeHours = (int)mandatoryHours;
-            int mandatoryMinutes = (int)((mandatoryHours - mandatoryWholeHours) * 60);
-            var totalWorking = new TimeSpan(x.MonthlyRollCall.Sum(y => y.TotalhourseSpan.Ticks));
-            var totalBreakTime = new TimeSpan(x.MonthlyRollCall.Sum(y => y.BreakTimeTimeSpan.Ticks));
-            var totalPresent = totalWorking + totalBreakTime;
-            x.TotalWorkingTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalWorking.TotalHours, totalWorking.Minutes, "-");
-            x.TotalBreakTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalBreakTime.TotalHours, totalBreakTime.Minutes, "-");
-            x.TotalPresentTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalPresent.TotalHours, totalPresent.Minutes, "-");
-            x.TotalMandatoryTimeStr = Tools.ToFarsiHoursAndMinutes(mandatoryWholeHours, mandatoryMinutes, "-");

+                int yearFa;
+                int monthFa;
+                try
+                {
+                    yearFa = int.Parse(oneRecord.Year);
+                    monthFa = oneRecord.Month.ToMonthByStringValue();
+                }
+                catch (Exception e)
+                {
+                    return;
+                }
+                double mandatoryHours = _mandatoryHoursApplication.GetMandatoryHoursByYearAndMonth(yearFa, monthFa);
+                int mandatoryWholeHours = (int)mandatoryHours;
+                int mandatoryMinutes = (int)((mandatoryHours - mandatoryWholeHours) * 60);
+                var totalWorking = new TimeSpan(x.MonthlyRollCall.Sum(y => y.TotalhourseSpan.Ticks));
+                var totalBreakTime = new TimeSpan(x.MonthlyRollCall.Sum(y => y.BreakTimeTimeSpan.Ticks));
+                var totalPresent = totalWorking + totalBreakTime;
+                x.TotalWorkingTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalWorking.TotalHours, totalWorking.Minutes, "-");
+                x.TotalBreakTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalBreakTime.TotalHours, totalBreakTime.Minutes, "-");
+                x.TotalPresentTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalPresent.TotalHours, totalPresent.Minutes, "-");
+                x.TotalMandatoryTimeStr = Tools.ToFarsiHoursAndMinutes(mandatoryWholeHours, mandatoryMinutes, "-");
+            }
        });
        return result;
    }
@@ -339,41 +301,31 @@ public class CheckoutApplication : ICheckoutApplication
    {
        var result = _checkoutRepository.PrintOne(id);

-        int yearFa;
-        int monthFa;
-        try
-        {
-            yearFa = int.Parse(result.Year);
-            monthFa = result.Month.ToMonthByStringValue();
-        }
-        catch (Exception e)
-        {
-            return new();
-        }
-        double mandatoryHours = _mandatoryHoursApplication.GetMandatoryHoursByYearAndMonth(yearFa, monthFa);
-        int mandatoryWholeHours = (int)mandatoryHours;
-        int mandatoryMinutes = (int)((mandatoryHours - mandatoryWholeHours) * 60);
-        TimeSpan totalWorking;
-        TimeSpan totalBreakTime;
-        TimeSpan totalPresent;
        if (result.HasRollCall)
        {
-            totalWorking = new TimeSpan(result.MonthlyRollCall.Sum(x => x.TotalhourseSpan.Ticks));
-            totalBreakTime = new TimeSpan(result.MonthlyRollCall.Sum(x => x.BreakTimeTimeSpan.Ticks));
-            totalPresent = totalWorking + totalBreakTime;
-        }
-        else
-        {
-            totalBreakTime = new TimeSpan(result.MonthlyRollCall.Sum(x => x.BreakTimeTimeSpan.Ticks));
-            totalPresent = new TimeSpan(result.MonthlyRollCall.Sum(x => x.TotalhourseSpan.Ticks));
-            totalWorking = totalPresent - totalBreakTime;
-        }
-
-        result.TotalWorkingTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalWorking.TotalHours, totalWorking.Minutes, "-");
-        result.TotalBreakTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalBreakTime.TotalHours, totalBreakTime.Minutes, "-");
-        result.TotalPresentTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalPresent.TotalHours, totalPresent.Minutes, "-");
-        result.TotalMandatoryTimeStr = Tools.ToFarsiHoursAndMinutes(mandatoryWholeHours, mandatoryMinutes, "-");
+            int yearFa;
+            int monthFa;
+            try
+            {
+                yearFa = int.Parse(result.Year);
+                monthFa = result.Month.ToMonthByStringValue();
+            }
+            catch (Exception e)
+            {
+                return new();
+            }
+            double mandatoryHours = _mandatoryHoursApplication.GetMandatoryHoursByYearAndMonth(yearFa, monthFa);
+            int mandatoryWholeHours = (int)mandatoryHours;
+            int mandatoryMinutes = (int)((mandatoryHours - mandatoryWholeHours) * 60);
+            var totalWorking = new TimeSpan(result.MonthlyRollCall.Sum(x => x.TotalhourseSpan.Ticks));
+            var totalBreakTime = new TimeSpan(result.MonthlyRollCall.Sum(x => x.BreakTimeTimeSpan.Ticks));
+            var totalPresent = totalWorking + totalBreakTime;

+            result.TotalWorkingTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalWorking.TotalHours, totalWorking.Minutes, "-");
+            result.TotalBreakTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalBreakTime.TotalHours, totalBreakTime.Minutes, "-");
+            result.TotalPresentTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalPresent.TotalHours, totalPresent.Minutes, "-");
+            result.TotalMandatoryTimeStr = Tools.ToFarsiHoursAndMinutes(mandatoryWholeHours, mandatoryMinutes, "-");
+        }
        return result;
    }

@@ -436,7 +388,7 @@ public class CheckoutApplication : ICheckoutApplication


        _checkoutRepository.SaveChanges();
-
+         
        return opration.Succcedded();
    }

@@ -451,7 +403,7 @@ public class CheckoutApplication : ICheckoutApplication
        var checkout = _checkoutRepository.Get(id);
        var totalClaimsDouble = checkout.TotalClaims.MoneyToDouble();
        var totalDeductionsDouble = checkout.TotalDeductions.MoneyToDouble();
-        totalClaimsDouble = (double)(totalClaimsDouble - checkout.RewardPay);
+        totalClaimsDouble = (double) (totalClaimsDouble - checkout.RewardPay);
        totalDeductionsDouble = totalDeductionsDouble - checkout.SalaryAidDeduction;

        var totalClaims = totalClaimsDouble + rewardPay;
--- a/CompanyManagment.Application/ContactUsApplication.cs
+++ b/CompanyManagment.Application/ContactUsApplication.cs
@@ -0,0 +1,70 @@
+using System.Text.RegularExpressions;
+using _0_Framework.Application;
+using Company.Domain.ContactUsAgg;
+using CompanyManagment.App.Contracts.ContactUs;
+
+namespace CompanyManagment.Application;
+
+public class ContactUsApplication : IContactUsApplication
+{
+    private readonly IContactUsRepository _contactUsRepository;
+
+    public ContactUsApplication(IContactUsRepository contactUsRepository)
+    {
+        _contactUsRepository = contactUsRepository;
+    }
+
+    public OperationResult Create(CreateContactUs command)
+    {
+        var op = new OperationResult();
+        if (string.IsNullOrWhiteSpace(command.FirstName))
+        {
+            return op.Failed("لطفا نام خود را وارد کنید");
+        }
+
+        if (string.IsNullOrWhiteSpace(command.LastName))
+        {
+            return op.Failed("لطفا نام خانوادگی خود را وارد کنید");
+        }
+
+        if (string.IsNullOrWhiteSpace(command.Email))
+        {
+            return op.Failed("لطفا ایمیل خود را وارد کنید");
+        }
+
+        if (string.IsNullOrWhiteSpace(command.PhoneNumber))
+        {
+            return op.Failed("لطفا شماره تماس خود را وارد کنید");
+        }
+
+        if (!Regex.IsMatch(command.PhoneNumber, @"^(\+98|0)?9\d{9}$"))
+        {
+            return op.Failed("شماره تماس وارد شده نامعتبر است");
+        }
+
+        if (!Regex.IsMatch(command.Email, @"^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$"))
+        {
+            return op.Failed("ایمیل وارد شده نامعتبر است");
+        }
+
+        if (string.IsNullOrWhiteSpace(command.Title))
+        {
+            return op.Failed("لطفا عنوان پیغام خود را وارد کنید");
+        }
+
+        if (string.IsNullOrWhiteSpace(command.Message))
+        {
+            return op.Failed("لطفا پیغام خود را وارد کنید");
+        }
+
+        var entity = new ContactUs(command.FirstName, command.LastName, command.Email, command.PhoneNumber,
+            command.Title, command.Message);
+
+        _contactUsRepository.Create(entity);
+
+        _contactUsRepository.SaveChanges();
+
+        return op.Succcedded();
+
+    }
+}
--- a/CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs
+++ b/CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs
--- a/CompanyManagment.Application/EmployeeAplication.cs
+++ b/CompanyManagment.Application/EmployeeAplication.cs
@@ -30,7 +30,6 @@ using Company.Domain.CustomizeWorkshopGroupSettingsAgg;
 using Company.Domain.LeftWorkAgg;
 using CompanyManagment.App.Contracts.Employee.DTO;
 using Company.Domain.EmployeeAuthorizeTempAgg;
-using Company.Domain.LeftWorkInsuranceAgg;

 namespace CompanyManagment.Application;

@@ -60,9 +59,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
    private readonly IEmployeeClientTempRepository _employeeClientTempRepository;
    private readonly ICustomizeWorkshopGroupSettingsRepository _customizeWorkshopGroupSettingsRepository;
    private readonly IEmployeeAuthorizeTempRepository _employeeAuthorizeTempRepository;
-    private readonly ILeftWorkInsuranceRepository _leftWorkInsuranceRepository ;

-    public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context, IWorkshopRepository workShopRepository, IWebHostEnvironment webHostEnvironment, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, IRollCallEmployeeRepository rollCallEmployeeRepository, ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication, IEmployeeDocumentsApplication employeeDocumentsApplication, IEmployeeDocumentsRepository employeeDocumentsRepository, IEmployeeBankInformationApplication employeeBankInformationApplication, ILeftWorkTempRepository leftWorkTempRepository, IUidService uidService, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository, IPersonnelCodeRepository personnelCodeRepository, IEmployeeClientTempRepository employeeClientTempRepository, ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository, ILeftWorkRepository leftWorkRepository, IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository, ILeftWorkInsuranceRepository leftWorkInsuranceRepository) : base(context)
+    public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context, IWorkshopRepository workShopRepository, IWebHostEnvironment webHostEnvironment, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, IRollCallEmployeeRepository rollCallEmployeeRepository, ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication, IEmployeeDocumentsApplication employeeDocumentsApplication, IEmployeeDocumentsRepository employeeDocumentsRepository, IEmployeeBankInformationApplication employeeBankInformationApplication, ILeftWorkTempRepository leftWorkTempRepository, IUidService uidService, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository, IPersonnelCodeRepository personnelCodeRepository, IEmployeeClientTempRepository employeeClientTempRepository, ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository, ILeftWorkRepository leftWorkRepository, IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository) : base(context)
    {
        _context = context;
        _WorkShopRepository = workShopRepository;
@@ -79,7 +77,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
        _employeeClientTempRepository = employeeClientTempRepository;
        _leftWorkRepository = leftWorkRepository;
        _employeeAuthorizeTempRepository = employeeAuthorizeTempRepository;
-        _leftWorkInsuranceRepository = leftWorkInsuranceRepository;
        _EmployeeRepository = employeeRepository;
    }

@@ -1012,9 +1009,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
        var startLeftWork = command.StartLeftWork.ToGeorgianDateTime();

        var leftWorkViewModel = _leftWorkRepository.GetLastLeftWorkByEmployeeIdAndWorkshopId(command.WorkshopId, employee.id);
-       
-
-		PersonnelCodeDomain personnelCode = null;
+        PersonnelCodeDomain personnelCode = null;
        if (leftWorkViewModel != null)
        {
            if (leftWorkViewModel.HasLeft == false && leftWorkViewModel.LeftWorkDate > DateTime.Now)
@@ -1029,16 +1024,10 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
        }
        else
        {
-	        var insuranceLeftWork =
-		        _leftWorkInsuranceRepository.GetLastLeftWorkByEmployeeIdAndWorkshopId(command.WorkshopId, employee.id);
-	        if (insuranceLeftWork == null)
-	        {
-		        var lastPersonnelCodeByWorkshop =
-			        _personnelCodeRepository.GetLastPersonnelCodeByWorkshop(command.WorkshopId);
+            var lastPersonnelCodeByWorkshop = _personnelCodeRepository.GetLastPersonnelCodeByWorkshop(command.WorkshopId);

-		        personnelCode = new PersonnelCodeDomain(command.WorkshopId,
-			        employee.id, lastPersonnelCodeByWorkshop + 1);
-	        }
+            personnelCode = new PersonnelCodeDomain(command.WorkshopId,
+                employee.id, lastPersonnelCodeByWorkshop + 1);
        }

        var leftWorkTemp = LeftWorkTemp.CreateStartWork(command.WorkshopId, employee.id, startLeftWork, command.JobId);
--- a/CompanyManagment.Application/EmployerApplication.cs
+++ b/CompanyManagment.Application/EmployerApplication.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using _0_Framework.Application;
 using Company.Domain.empolyerAgg;
 using Company.Domain.WorkshopAgg;
@@ -893,11 +892,6 @@ public class EmployerApplication : IEmployerApplication
    {
        return _EmployerRepository.GetEmployersHasWorkshop();
    }
-
-    public async Task<List<EmployerSelectListViewModel>> GetSelectList(string search)
-    {
-        return await _EmployerRepository.GetSelectList(search);
-    }
    #endregion

    #region NewByHeydari
--- a/CompanyManagment.Application/InsuranceJobApplication.cs
+++ b/CompanyManagment.Application/InsuranceJobApplication.cs
@@ -19,21 +19,6 @@ public class InsuranceJobApplication: IInsuranceJobApplication
        _insuranceJobItemRepositpry = insuranceJobItemRepositpry;
    }

-    public List<(long id, string date)> GetOldYersInsuranceItemIds()
-    {
-        return _insuranceJobRepositpry.GetOldYersInsuranceItemIds();
-    }
-
-    public OperationResult CopyFromLastYear(CopyFromLastYearViewModel command)
-    {
-        return _insuranceJobRepositpry.CopyFromLastYear(command);
-    }
-
-    public OperationResult RecoveryOldData1403()
-    {
-        return _insuranceJobRepositpry.RecoveryOldData1403();
-    }
-
    public OperationResult Create(CreateInsuranceJob command)
    {
        var opration = new OperationResult();
@@ -47,10 +32,6 @@ public class InsuranceJobApplication: IInsuranceJobApplication
        if (_insuranceJobRepositpry.Exists(x => x.InsuranceJobTitle == command.InsuranceJobTitle))
            return opration.Failed("عنوان صنف و درجه تکراری است");

-   
-        if (command.InsuranceJobItemId == 0)
-            return opration.Failed("بازه را انتخاب کنید");
-
        //if (_insuranceJobRepositpry.Exists(x => x.EconomicCode == command.EconomicCode))
        //    return opration.Failed("کد اقتصادی تکراری است");

@@ -135,9 +116,9 @@ public class InsuranceJobApplication: IInsuranceJobApplication
            return opration.Failed("ویرایش با خطا مواجه شد.");
        }
    }
-    public EditInsuranceJob GetDetails(long id, string year, string month)
+    public EditInsuranceJob GetDetails(long id)
    {
-        return _insuranceJobRepositpry.GetDetails(id, year,month);
+        return _insuranceJobRepositpry.GetDetails(id);
    }

    public List<InsuranceJobViewModel> GetInsurancJob()
--- a/CompanyManagment.Application/InsuranceListApplication.cs
+++ b/CompanyManagment.Application/InsuranceListApplication.cs
@@ -292,12 +292,12 @@ public class InsuranceListApplication: IInsuranceListApplication
        var consumableItems = new YearlysalaryItemViewModel();
        if (yearSalaryObj != null)
        {
-            yearlysalaryItem = _yearlySalaryItemApplication
-                .GetItemsByYearlySalaryId(yearSalaryObj.Id).FirstOrDefault(x => x.ItemName == "مزد روزانه");
-            housingAllowance = _yearlySalaryItemApplication
-                .GetItemsByYearlySalaryId(yearSalaryObj.Id).FirstOrDefault(x => x.ItemName == "کمک هزینه مسکن");
-            consumableItems = _yearlySalaryItemApplication
-                .GetItemsByYearlySalaryId(yearSalaryObj.Id).FirstOrDefault(x => x.ItemName == "کمک هزینه اقلام");
+            yearlysalaryItem = _yearlySalaryItemApplication.GetItemsByYearlySalaryId(yearSalaryObj.Id)
+                .Where(x => x.ItemName == "مزد روزانه").FirstOrDefault();
+            housingAllowance = _yearlySalaryItemApplication.GetItemsByYearlySalaryId(yearSalaryObj.Id)
+                .Where(x => x.ItemName == "کمک هزینه مسکن").FirstOrDefault();
+            consumableItems = _yearlySalaryItemApplication.GetItemsByYearlySalaryId(yearSalaryObj.Id)
+                .Where(x => x.ItemName == "کمک هزینه اقلام").FirstOrDefault();
        }

        foreach (var item in insuranceListDetails.EmployeeDetailsForInsuranceList)
@@ -341,10 +341,6 @@ public class InsuranceListApplication: IInsuranceListApplication
        insuranceListDetails.AllInsuredShare = insuranceListDetails.InsuredShare +
                                               insuranceListDetails.EmployerShare +
                                               insuranceListDetails.UnEmploymentInsurance;
-
-        insuranceListDetails.LeftWorkEmployees =
-            _leftWorkInsuranceRepository.GetEmployeesWithContractExitOnly(insuranceListDetails.WorkshopId);
-
        return insuranceListDetails;
    }

@@ -1680,7 +1676,6 @@ public class InsuranceListApplication: IInsuranceListApplication
    {
       
        double? result = 0;
-        string month = $"{startDateGr.ToFarsi()}".Substring(5, 2);
        //اگر مشاغل مقطوع بود و شغلش کارفرما بود 
        // در جدول لیست بیمه قبلی چک شود
        try
@@ -1727,7 +1722,7 @@ public class InsuranceListApplication: IInsuranceListApplication

                {
                    var inJob = _insuranceJobItemRepository
-                        .GetInsuranceJobItemByInsuranceJobId((long)workshop.InsuranceJobId,year, month);
+                        .GetInsuranceJobItemByInsuranceJobId((long)workshop.InsuranceJobId);
                    if (workshop.Population == "MoreThan500")
                    {
                        var max = inJob.MaxBy(x => x.PercentageMoreThan);
@@ -1776,9 +1771,9 @@ public class InsuranceListApplication: IInsuranceListApplication
            else
            {

-            var searchModel = new InsuranceJobItemSearchModel();
-            searchModel.InsuranceJobId = (long)insuranceJobId;
-            var JobItem = _insuranceJobItemRepository.GetInsuranceJobItemByInsuranceJobIdForFixedSalary((long)insuranceJobId, jobId, year, month);
+                var searchModel = new InsuranceJobItemSearchModel();
+                searchModel.InsuranceJobId = (long)insuranceJobId;
+                var JobItem = _insuranceJobItemRepository.GetInsuranceJobItemByInsuranceJobIdForFixedSalary((long)insuranceJobId, jobId);

                if (JobItem != null && JobItem.Id != 0)
                {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mahan Ch	5fa49a4988	change main pages	2025-06-01 18:23:51 +03:30
MahanCh	99e807fa23	fix step4 bug	2025-05-20 17:45:43 +03:30
MahanCh	2ce17dcac9	change some styles	2025-05-19 18:04:47 +03:30
MahanCh	233c1a3aa9	merge from master	2025-05-19 18:04:36 +03:30
MahanCh	37cd07c2b8	fix conflict	2025-05-18 17:54:55 +03:30
MahanCh	6201492879	change step4	2025-05-18 17:52:33 +03:30
SamSys	489528d076	new version of Register	2025-05-14 21:24:06 +03:30
MahanCh	3a6f87eaca	fix some register financial bugs	2025-05-07 22:45:42 +03:30
MahanCh	ec277629fb	fix register financial problems	2025-05-04 20:58:45 +03:30
MahanCh	faeb297f5c	fix register problems	2025-04-28 15:49:56 +03:30
MahanCh	c3457881b0	add register part	2025-04-23 23:22:26 +03:30