change main pages

This reverts commit da738054df.

0_Framework/0_Framework.csproj

@@ -14,6 +14,8 @@
     <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
     <PackageReference Include="PersianTools.Core" Version="2.0.4" />
     <PackageReference Include="System.Drawing.Common" Version="9.0.0" />
+    <PackageReference Include="MD.PersianDateTime.Standard" Version="2.5.0" />
+
 
   </ItemGroup>
 

0_Framework/Application/AuthHelper.cs

@@ -245,21 +245,24 @@ public class AuthHelper : IAuthHelper
 
     #region Pooya
 
-    public (long Id, UserType userType) GetUserTypeWithId()
+    public (long Id, UserType userType, long roleId) GetUserTypeWithId()
     {
         if (!IsAuthenticated())
-            return (0, UserType.Anonymous);
+            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);
+            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")
-            return (id, UserType.Admin);
+        {
+            var roleId = long.Parse(claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value ?? "0");
+            return (id, UserType.Admin, roleId);
+        }
 
-        return (id, UserType.Client);
+        return (id, UserType.Client, 0);
     }
     #endregion
 

0_Framework/Application/IAuthHelper.cs

@@ -23,5 +23,5 @@ public interface IAuthHelper
 	long CurrentSubAccountId();
     string GetWorkshopSlug();
     string GetWorkshopName();
-    (long Id, UserType userType) GetUserTypeWithId();
+    (long Id, UserType userType, long roleId) GetUserTypeWithId();
 }

0_Framework/Application/Sms/ISmsService.cs

@@ -9,10 +9,24 @@ public interface ISmsService
     void Send(string number, string message);
     bool VerifySend(string number, string message);
     bool LoginSend(string number, string message);
+    /// <summary>
+    /// ارسال کد به کلاینت برای تکمیل فرایند ثبت نام
+    /// </summary>
+    /// <param name="number"></param>
+    /// <param name="code"></param>
+    /// <returns></returns>
+    Task<SentSmsViewModel> SendVerifyCodeToClient(string number, string code);
     bool SendAccountsInfo(string number,string fullName, string userName);
     Task<ApiResultViewModel> GetByMessageId(int messId);
     Task<List<ApiResultViewModel>> GetApiResult(string startDate, string endDate);
     string DeliveryStatus(byte? dv);
     string DeliveryColorStatus(byte? dv);
     string UnixTimeStampToDateTime(int? unixTimeStamp);
+
+    #region Mahan
+
+    Task<double> GetCreditAmount();
+
+    #endregion
+
 }

0_Framework/Application/Sms/SentSmsViewModel.cs

@@ -0,0 +1,32 @@
+namespace _0_Framework.Application;
+
+public class SentSmsViewModel
+{
+    public SentSmsViewModel()
+    {
+        IsSuccedded = false;
+    }
+
+    public bool IsSuccedded { get; set; }
+    public string Message { get; set; }
+    public byte StatusCode { get; set; }
+    public int MessageId { get; set; }
+
+    public SentSmsViewModel Succedded(byte statusCode, string message, int messageId)
+    {
+        IsSuccedded = true;
+        Message = message;
+        StatusCode = statusCode;
+        MessageId = messageId;
+        return this;
+    }
+
+    public SentSmsViewModel Failed(byte statusCode, string message, int messageId)
+    {
+        IsSuccedded = false;
+        Message = message;
+        StatusCode = statusCode;
+        MessageId = messageId;
+        return this;
+    }
+}

0_Framework/Application/Sms/SmsService.cs

@@ -9,6 +9,7 @@ using IPE.SmsIrClient;
 using IPE.SmsIrClient.Models.Requests;
 using IPE.SmsIrClient.Models.Results;
 using Microsoft.Extensions.Configuration;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 
 namespace _0_Framework.Application.Sms;
@@ -16,10 +17,14 @@ namespace _0_Framework.Application.Sms;
 public class SmsService : ISmsService
 {
     private readonly IConfiguration _configuration;
+    public SmsIr SmsIr { get; set; }
+
 
     public SmsService(IConfiguration configuration)
     {
         _configuration = configuration;
+        SmsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+
     }
 
     public void Send(string number, string message)
@@ -110,6 +115,31 @@ public class SmsService : ISmsService
         }
     }
 
+    public async Task<SentSmsViewModel> SendVerifyCodeToClient(string number, string code)
+    {
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+        var result = new SentSmsViewModel();
+        //var bulkSendResult =  smsIr.BulkSendAsync(95007079000006, "your text message", new string[] { "9120000000" });
+
+        var sendResult = await smsIr.VerifySendAsync(number, 768382, new VerifySendParameter[] { new VerifySendParameter("VerificationCode", code) });
+        Thread.Sleep(2000);
+
+        if (sendResult.Message == "موفق")
+        {
+            var status = sendResult.Status;
+            var message = sendResult.Message;
+            var messaeId = sendResult.Data.MessageId;
+            return result.Succedded(status, message, messaeId);
+        }
+        else
+        {
+            var status = sendResult.Status;
+            var message = sendResult.Message;
+            var messaeId = sendResult.Data.MessageId;
+            return result.Failed(status, message, messaeId);
+        }
+    }
+
     public bool SendAccountsInfo(string number, string fullName, string userName)
     {
 
@@ -285,4 +315,23 @@ public class SmsService : ISmsService
         //var tokenService = new Token();
         //return tokenService.GetToken("x-api-key", "Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
     }
+
+    #region Mahan
+
+    public async Task<double> GetCreditAmount()
+    {
+        try
+        {
+            var credit = await SmsIr.GetCreditAsync();
+            return (double)credit.Data;
+        }
+        catch
+        {
+            return -1;
+        }
+       
+    }
+
+
+    #endregion
 }

0_Framework/Application/StaticWorkshopAccounts.cs

@@ -14,14 +14,24 @@ public static class StaticWorkshopAccounts
     /// </summary>
     public static List<long> SelectedAccountsRoleIds = [3, 5, 7, 8];
 
+    /// <summary>
+    /// لیستی آی دی نقش هایی که دردسترسی به تب افزودن پرسنل و مدارک کلاینت دارند
+    /// 3 : قرارداد ارشد
+    /// 5 : قرارداد ساده
+    /// 19 : برنامه نویسان
+    /// 1 : مدیر سیستم 
+    /// </summary>
+    public static List<long> EmployeeDocumentWorkFlowRoleIds = [1,3, 5, 19];
+
     /// <summary>
     /// لیست اکانتهایی که به همه کارگاه ها باید دسترسی داشته باشند
     /// 2 - صادق فرخی
     /// 3 - میلاد مصباح
     /// 380 - افروز نظری
     /// 381 - مهدی قربانی
+    /// 392 - عمار حسن دوست
     /// </summary>
-    public static List<long> StaticAccountIds = [2, 3, 380, 381];
+    public static List<long> StaticAccountIds = [2, 3, 380, 381, 392];
 
     /// <summary>
     /// این تاریخ در جدول اکانت لفت ورک به این معنیست

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>
     /// دریافت روزهای کارکرد پرسنل در لیست بیمه ماه مشخص شده
@@ -52,10 +69,10 @@ public static class Tools
     /// <param name="endDate"></param>
     /// <param name="employeeId"></param>
     /// <returns></returns>
-    public static (int countWorkingDays,DateTime startWork,DateTime endWork,bool hasStartWorkInMonth,bool hasLeftWorkInMonth) GetEmployeeInsuranceWorkingDays(DateTime startWork,DateTime? leftWork,DateTime startDate,
-	    DateTime endDate,long employeeId)
+    public static (int countWorkingDays, DateTime startWork, DateTime endWork, bool hasStartWorkInMonth, bool hasLeftWorkInMonth) GetEmployeeInsuranceWorkingDays(DateTime startWork, DateTime? leftWork, DateTime startDate,
+        DateTime endDate, long employeeId)
     {
-	    DateTime start = startDate;
+        DateTime start = startDate;
         DateTime end = endDate;
         bool startWorkInMonth = false;
         bool endWorkInMonth = false;
@@ -63,61 +80,61 @@ public static class Tools
         //اگر شروع بکار پرسنل در ماه مشخص شده لیست بیمه بود
         if (startWork >= startDate)
         {
-	        start = startWork;
-	        startWorkInMonth = true;
+            start = startWork;
+            startWorkInMonth = true;
         }
 
-        if(leftWork == null)
+        if (leftWork == null)
             leftWork = DateTime.MinValue;
         //اگر ترک کار پرسنل در ماه مشخص شده لیست بیمه بود
         if (leftWork != DateTime.MinValue && leftWork.Value < endDate)
         {
-	        end = leftWork.Value;
+            end = leftWork.Value;
             endWorkInMonth = true;
         }
 
-        int countDays = (int)(end - start).TotalDays +1;
+        int countDays = (int)(end - start).TotalDays + 1;
 
 
         //روزهای کارکرد پرسنل با آی دی های زیر دستی تعریف شد
         switch (employeeId)
         {
 
-	        //case 3812://ثابت- کسری حاجی پور
-	        //    countWorkingDays = 15;
-	        //    break;
-	        case 40463://ثابت
-		        countDays = 10;
-		        break;
-	        case 40469://ثابت
-		        countDays = 7;
-		        break;
-	        //case 9950://ثابت
-		       // countDays = 15;
-		        //break;
-	        case 9640://ثابت
-		        countDays = 15;
-		        break;
-	        case 40998://ثابت
-		        countDays = 15;
-		        break;
-	        case 6219://ثابت
-		        countDays = 15;
-		        break;
-		        //case 7897://ثابت
-		        //    countWorkingDays = 15;
+            //case 3812://ثابت- کسری حاجی پور
+            //    countWorkingDays = 15;
+            //    break;
+            case 40463://ثابت
+                countDays = 10;
+                break;
+            case 40469://ثابت
+                countDays = 7;
+                break;
+            //case 9950://ثابت
+            // countDays = 15;
+            //break;
+            case 9640://ثابت
+                countDays = 15;
+                break;
+            case 40998://ثابت
+                countDays = 15;
+                break;
+            case 6219://ثابت
+                countDays = 15;
+                break;
+                //case 7897://ثابت
+                //    countWorkingDays = 15;
         }
 
 
-		return (countDays,start,end,startWorkInMonth,endWorkInMonth);
+        return (countDays, start, end, startWorkInMonth, endWorkInMonth);
     }
-	/// <summary>
-	/// محاسبه سن 
-	/// </summary>
-	/// <param name="startDate"></param>
-	/// <param name="endDate"></param>
-	/// <returns></returns>
-	public static (int yearCount, int monthCount, int dayCount) GetAge(DateTime startDate, DateTime endDate)
+    /// <summary>
+    /// محاسبه سن 
+    /// </summary>
+    /// <param name="startDate"></param>
+    /// <param name="endDate"></param>
+    /// <returns></returns>
+    public static (int yearCount, int monthCount, int dayCount) GetAge(DateTime startDate, DateTime endDate)
     {
 
         var startFa = startDate.ToFarsi();
@@ -193,7 +210,7 @@ public static class Tools
                 if (yearCouner.Year == end.Year)
                 {
 
-                    var endMonthCounter = new PersianDateTime(end.Year, end.Month, (yearCouner.Day > end.Day ? end.Day :  yearCouner.Day));
+                    var endMonthCounter = new PersianDateTime(end.Year, end.Month, (yearCouner.Day > end.Day ? end.Day : yearCouner.Day));
 
                     if (yearCouner.Day <= end.Day)
                     {
@@ -244,7 +261,7 @@ public static class Tools
 
         Console.ResetColor();
         Console.WriteLine($"old: [{years} year] ، [{months} month] ، [{days} day]");
-        return (years,months,days);
+        return (years, months, days);
     }
 
     public static string ToFarsi(this DateTime? date)
@@ -397,9 +414,9 @@ public static class Tools
 
     public static DateTime ToGeorgianDateTime(this string persianDate)
     {
-        persianDate = persianDate.ToEnglishNumber();
         try
         {
+            persianDate = persianDate.ToEnglishNumber();
             var year = Convert.ToInt32(persianDate.Substring(0, 4));
             var month = Convert.ToInt32(persianDate.Substring(5, 2));
             var day = Convert.ToInt32(persianDate.Substring(8, 2));
@@ -458,25 +475,30 @@ public static class Tools
     public static double MoneyToDouble(this string myMoney)
     {
         string bb = string.Empty;
+        bool isNegative = false;
 
         for (int x = 0; x < myMoney.Length; x++)
         {
             if (char.IsDigit(myMoney[x]))
+            {
                 bb += myMoney[x];
+            }
+            else if (myMoney[x] == '-' && bb.Length == 0)
+            {
+                // اگر علامت منفی قبل از اولین عدد آمد، در نظر بگیر
+                isNegative = true;
+            }
         }
 
         if (bb.Length > 0)
         {
             double res = double.Parse(bb);
-            return res;
+            return isNegative ? -res : res;
         }
         else
         {
             return 0;
         }
-
-
-
     }
     public static string ToFileName(this DateTime date)
     {
@@ -598,90 +620,90 @@ public static class Tools
     /// <returns></returns>
     public static int YearTotalDays(this string date)
     {
-        int y2 = 365;
+        int y2 = 366;
         var year = Convert.ToInt32(date.Substring(0, 4));
 
 
         switch (year)
         {
             case 1346:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1350:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1354:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1358:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1362:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1366:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1370:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1375:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1379:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1383:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1387:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1391:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1395:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1399:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1403:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1408:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1412:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1416:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1420:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1424:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1428:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1432:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1436:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1441:
-                y2 = 366;
+                y2 = 367;
                 break;
             case 1445:
-                y2 = 366;
+                y2 = 367;
                 break;
 
             default:
-                y2 = 365;
+                y2 = 366;
                 break;
 
         }
@@ -884,30 +906,39 @@ public static class Tools
         string result = "";
         switch (value)
         {
+            case "1":
             case "01":
                 result = "فروردین";
                 break;
+            case "2":
             case "02":
                 result = "اردیبهشت";
                 break;
+            case "3":
             case "03":
                 result = "خرداد";
                 break;
+            case "4":
             case "04":
                 result = "تیر";
                 break;
+            case "5":
             case "05":
                 result = "مرداد";
                 break;
+            case "6":
             case "06":
                 result = "شهریور";
                 break;
+            case "7":
             case "07":
                 result = "مهر";
                 break;
+            case "8":
             case "08":
                 result = "آبان";
                 break;
+            case "9":
             case "09":
                 result = "آذر";
                 break;
@@ -1267,10 +1298,10 @@ public static class Tools
             var part5 = parts[5].Substring(0, 2);
 
 
-			try
+            try
             {
                 PersianCalendar pc = new PersianCalendar();
-                 dateTime = pc.ToDateTime(int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3]), int.Parse(parts[4]), int.Parse(part5), 0, 0, 0);
+                dateTime = pc.ToDateTime(int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3]), int.Parse(parts[4]), int.Parse(part5), 0, 0, 0);
 
             }
             catch (Exception e)
@@ -1384,8 +1415,8 @@ public static class Tools
     }
     public static DateTime FindFirstDayOfMonthGr(this DateTime date)
     {
-	    var pc = new PersianCalendar();
-	    return ($"{pc.GetYear(date)}/{pc.GetMonth(date):00}/01").ToGeorgianDateTime();
+        var pc = new PersianCalendar();
+        return ($"{pc.GetYear(date)}/{pc.GetMonth(date):00}/01").ToGeorgianDateTime();
     }
     #region Mahan
 
@@ -1403,6 +1434,8 @@ public static class Tools
 
             if (@char == char.Parse("ي"))
                 res += "ی";
+            else if (@char == char.Parse("ك"))
+                res += "ک";
             else
                 res += @char;
         }
@@ -1588,19 +1621,19 @@ public static class Tools
 
     public static TimeOnly CalculateOffset(ICollection<CustomizeSifts> shiftDetailsRegularShifts)
     {
-	    if (!shiftDetailsRegularShifts.Any())
-	    {
-		    return TimeOnly.MinValue;
-	    }
-	    var date = new DateOnly();
-	    var firstStartShift = new DateTime(date, shiftDetailsRegularShifts.MinBy(x => x.Placement).StartTime);
-	    var lastEndShift = new DateTime(date, shiftDetailsRegularShifts.MaxBy(x => x.Placement).EndTime);
-	    if (lastEndShift > firstStartShift)
-		    firstStartShift = firstStartShift.AddDays(1);
-	    var offSet = (firstStartShift - lastEndShift).Divide(2);
-	    return TimeOnly.FromDateTime(lastEndShift.Add(offSet));
+        if (!shiftDetailsRegularShifts.Any())
+        {
+            return TimeOnly.MinValue;
+        }
+        var date = new DateOnly();
+        var firstStartShift = new DateTime(date, shiftDetailsRegularShifts.MinBy(x => x.Placement).StartTime);
+        var lastEndShift = new DateTime(date, shiftDetailsRegularShifts.MaxBy(x => x.Placement).EndTime);
+        if (lastEndShift > firstStartShift)
+            firstStartShift = firstStartShift.AddDays(1);
+        var offSet = (firstStartShift - lastEndShift).Divide(2);
+        return TimeOnly.FromDateTime(lastEndShift.Add(offSet));
     }
-	public static DateTime GetNextDayOfWeek(this DateTime date, DayOfWeek dayOfWeek)
+    public static DateTime GetNextDayOfWeek(this DateTime date, DayOfWeek dayOfWeek)
     {
         int numberOfNextDayOfWeek = ((int)dayOfWeek - (int)date.DayOfWeek + 7) % 7;
         return date.AddDays(numberOfNextDayOfWeek == 0 ? 7 : numberOfNextDayOfWeek);
@@ -1680,6 +1713,10 @@ public static class Tools
 
     }
 
+
+
+
+
     #endregion
 
     #region Pooya
@@ -1772,75 +1809,75 @@ public static class Tools
     public static string ToFarsiHoursAndMinutes(int hours, int minutes, string emptyValue = "")
     {
 
-	    string message = emptyValue;
-	    if (hours > 0 && minutes > 0)
-	    {
+        string message = emptyValue;
+        if (hours > 0 && minutes > 0)
+        {
 
-		    message = hours + " " + "ساعت و" + " " + minutes + " " + "دقیقه";
-	    }
-	    else if (hours > 0 && minutes == 0)
-	    {
+            message = hours + " " + "ساعت و" + " " + minutes + " " + "دقیقه";
+        }
+        else if (hours > 0 && minutes == 0)
+        {
 
-		    message = hours + " " + "ساعت ";
-	    }
-	    else if (hours == 0 && minutes > 0)
-	    {
+            message = hours + " " + "ساعت ";
+        }
+        else if (hours == 0 && minutes > 0)
+        {
 
-		    message = minutes + " " + "دقیقه";
-	    }
+            message = minutes + " " + "دقیقه";
+        }
 
-	    return message;
+        return message;
     }
-	public static string ToFarsiHoursAndMinutes(this TimeSpan timeSpan, string emptyValue = "")
+    public static string ToFarsiHoursAndMinutes(this TimeSpan timeSpan, string emptyValue = "")
     {
-	    var hours = (int)timeSpan.TotalHours;
-	    var minutes = timeSpan.Minutes;
-	    string message = emptyValue;
-	    if (hours > 0 && minutes > 0)
-	    {
+        var hours = (int)timeSpan.TotalHours;
+        var minutes = timeSpan.Minutes;
+        string message = emptyValue;
+        if (hours > 0 && minutes > 0)
+        {
 
-		    message = hours + " " + "ساعت و" + " " + minutes + " " + "دقیقه";
-	    }
-	    else if (hours > 0 && minutes == 0)
-	    {
+            message = hours + " " + "ساعت و" + " " + minutes + " " + "دقیقه";
+        }
+        else if (hours > 0 && minutes == 0)
+        {
 
-		    message = hours + " " + "ساعت ";
-	    }
-	    else if (hours == 0 && minutes > 0)
-	    {
+            message = hours + " " + "ساعت ";
+        }
+        else if (hours == 0 && minutes > 0)
+        {
 
-		    message = minutes + " " + "دقیقه";
-	    }
+            message = minutes + " " + "دقیقه";
+        }
 
-	    return message;
+        return message;
     }
-	public static string ToFarsiDaysAndHoursAndMinutes(this TimeSpan timeSpan, string emptyValue = "")
-	{
-		var hours = (int)timeSpan.TotalHours;
-		var minutes = timeSpan.Minutes;
-		var days = hours / 24;
-		hours = hours % 24;
-		string message = "";
+    public static string ToFarsiDaysAndHoursAndMinutes(this TimeSpan timeSpan, string emptyValue = "")
+    {
+        var hours = (int)timeSpan.TotalHours;
+        var minutes = timeSpan.Minutes;
+        var days = hours / 24;
+        hours = hours % 24;
+        string message = "";
 
-		if (days > 0)
-			message += days + " " + "روز";
-		if (hours > 0)
-			if (message == "")
-				message += hours + " " + "ساعت";
-			else
-				message += " و " + hours + " " + "ساعت";
-		if (minutes > 0)
-			if (message == "")
-				message += minutes + " " + "دقیقه";
-			else
-				message += " و " + minutes + " " + "دقیقه";
+        if (days > 0)
+            message += days + " " + "روز";
+        if (hours > 0)
+            if (message == "")
+                message += hours + " " + "ساعت";
+            else
+                message += " و " + hours + " " + "ساعت";
+        if (minutes > 0)
+            if (message == "")
+                message += minutes + " " + "دقیقه";
+            else
+                message += " و " + minutes + " " + "دقیقه";
 
-		if (message == "")
-			message = emptyValue;
-		return message;
-	}
+        if (message == "")
+            message = emptyValue;
+        return message;
+    }
 
-	public static bool ArePropertiesEqual<T>(this T obj1, T obj2)
+    public static bool ArePropertiesEqual<T>(this T obj1, T obj2)
     {
         // If either object is null, they can't be equal
         if (obj1 == null || obj2 == null)
@@ -1873,5 +1910,44 @@ public static class Tools
         return true;
     }
 
+    #endregion
+
+    #region Davoodi
+
+    public static List<string> GetDaysBetweenDateGeorgian(DateTime startDate, DateTime? endDate)
+    {
+        var days = new List<string>();
+
+        if (endDate == null)
+            endDate = DateTime.Now;
+
+        var persianStartDate = new MD.PersianDateTime.Standard.PersianDateTime(startDate);
+        var persianEndDate = new MD.PersianDateTime.Standard.PersianDateTime(endDate);
+
+
+        while (persianEndDate - persianStartDate >= TimeSpan.FromDays(0))
+        {
+            days.Add(persianStartDate.ToShortDateString());
+            persianStartDate = persianStartDate.AddDays(1);
+        }
+
+        return days;
+    }
+
+    public static int GetWorkingDaysDifference(DateTime? fromDate, DateTime? toDate)
+    {
+        //var workingDays = PersianDateExtensions.GetWorkingDays(new PersianDateTime(fromDate.ToFarsi()), new PersianDateTime(toDate.ToFarsi()), true);
+        var workingDays = PersianDateExtensions.GetWorkingDays((DateTime)fromDate, (DateTime)toDate, true);
+
+
+        if (fromDate > toDate)
+            workingDays *= -1;
+
+
+        return workingDays;
+    }
+
+
+
     #endregion
 }

0_Framework/Application/UID/UidService.cs

@@ -32,20 +32,22 @@ public class UidService : IUidService
         var json = JsonConvert.SerializeObject(request);
         var contentType = new StringContent(json, Encoding.UTF8, "application/json");
 
+       var requestResult = await _httpClient.PostAsync("person/v2", contentType);
         try
         {
-            var requestResult = await _httpClient.PostAsync("person/v2", contentType);
             if (!requestResult.IsSuccessStatusCode)
                 return null;
             var responseResult = await requestResult.Content.ReadFromJsonAsync<PersonalInfoResponse>();
-            responseResult.BasicInformation.FirstName = responseResult.BasicInformation.FirstName.ToPersian();
-            responseResult.BasicInformation.LastName = responseResult.BasicInformation.LastName.ToPersian();
-            responseResult.BasicInformation.FatherName = responseResult.BasicInformation.FatherName.ToPersian();
-
+            if (responseResult.BasicInformation != null)
+            {
+                responseResult.BasicInformation.FirstName = responseResult.BasicInformation.FirstName?.ToPersian();
+                responseResult.BasicInformation.LastName = responseResult.BasicInformation.LastName?.ToPersian();
+                responseResult.BasicInformation.FatherName = responseResult.BasicInformation.FatherName?.ToPersian();
+            }
 
             return responseResult;
         }
-        catch (Exception)
+        catch 
         {
 
             return null;
@@ -63,19 +65,12 @@ public class UidService : IUidService
         };
         var json = JsonConvert.SerializeObject(request);
         var contentType = new StringContent(json, Encoding.UTF8, "application/json");
-        try
-        {
-            var requestResult = await _httpClient.PostAsync("mobile/owner/v2", contentType);
-            if (!requestResult.IsSuccessStatusCode)
-                return null;
 
-            var responseResult = await requestResult.Content.ReadFromJsonAsync<MatchMobileWithNationalCodeResponse>();
-            return responseResult;
-        }
-        catch (Exception e)
-        {
+        var requestResult = await _httpClient.PostAsync("mobile/owner/v2", contentType);
+        if (!requestResult.IsSuccessStatusCode)
             return null;
-        }
 
+        var responseResult = await requestResult.Content.ReadFromJsonAsync<MatchMobileWithNationalCodeResponse>();
+        return responseResult;
     }
 }

0_Framework/Application/UserType.cs

@@ -8,7 +8,8 @@ namespace _0_Framework.Application
         Client,
         SubAccount,
         Camera,
-        Admin
+        Admin,
+        System
     }
 
 }

AccountManagement.Application.Contracts/Account/IAccountApplication.cs

@@ -55,4 +55,11 @@ public interface IAccountApplication
 	#endregion
 
 	OperationResult DirectCameraLogin(long cameraAccountId);
+
+    /// <summary>
+    /// چک میکند که آیا اکانتی با این نام کاربری وجود دارد یا نه
+    /// </summary>
+    /// <param name="userName"></param>
+    /// <returns></returns>
+    public bool CheckExistClientAccount(string userName);
 }

AccountManagement.Application.Contracts/Task/CreateTask.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using IPE.SmsIrClient.Models.Results;
 using Microsoft.AspNetCore.Http;
 
 namespace AccountManagement.Application.Contracts.Task;
@@ -19,9 +20,9 @@ public class CreateTask
     #region Task Schedule
 
     public string ScheduleCount { get; set; }
-    public string ScheduleType{ get; set; }
+    public TaskScheduleType ScheduleType { get; set; }
     public bool HasSchedule { get; set; }
-    public string ScheduleUnitType { get; set; }
+    public TaskScheduleUnitType ScheduleUnitType { get; set; }
     public string ScheduleUnitNumber { get; set; }
     public long TaskScheduleId { get; set; }
     
@@ -31,3 +32,17 @@ public class CreateTask
 
 
 }
+
+public enum TaskScheduleType
+{
+    Limited,
+    Unlimited
+}
+
+public enum TaskScheduleUnitType
+{
+    Day,
+    Week,
+    Month,
+    Year
+}

AccountManagement.Application.Contracts/Task/EditTask.cs

@@ -20,4 +20,5 @@ public class EditTask:CreateTask
     public long? TicketId { get; set; }
     public List<AccountViewModel> AssignsLists { get; set; }
     public bool  HasTicket { get; set; }
+    public long TaskScheduleId { get; set; }
 }

AccountManagement.Application.Contracts/Task/ITaskApplication.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 using AccountManagement.Application.Contracts.Assign;
 using AccountManagement.Application.Contracts.TaskMessage;
@@ -24,6 +25,13 @@ public interface ITaskApplication
     List<TaskViewModel> GetSentTasks(TaskSearchModel searchModel);
     List<TaskViewModel> GetTasksHaveTicket(TaskSearchModel searchModel);
 
+    /// <summary>
+    /// لیست تسک های دوره ای ایجاد شده توسط کاربر
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    List<TaskViewModel> GetTaskScheduleList(TaskSearchModel searchModel);
+
     // گرفتن مهلت برای یک وظیفه
     OperationResult CreateRequestTime(CreateTaskTimeRequest command);
     List<TaskViewModel> GetRequestTaskHasTicket(TaskSearchModel searchModel);
@@ -46,10 +54,10 @@ public interface ITaskApplication
     OperationResult CreateTaskByPosition(CreateTask command, List<long> positionIds);
     List<TaskViewModel> GetRequestedTasks(TaskSearchModel searchModel);
     List<TaskViewModel> AllRequestedTasks(TaskSearchModel searchModel);
-    int GetRequestedTasksCount();
+    Task<int> GetRequestedTasksCount();
 
-    int TasksHaveTicketCounts(long userId);
-    int TasksHaveTicketRequestsCount(long userId);
+    Task<int> TasksHaveTicketCounts(long userId);
+    Task<int> TasksHaveTicketRequestsCount(long userId);
 
     List<TaskMessageViewModel> GetTaskMessages(long assignId);
 
@@ -63,16 +71,14 @@ public interface ITaskApplication
 
     List<AssignViewModel> GetAssignsByTaskId(long taskId);
 
-    int RequestedAndOverdueTasksCount(long userId);
+    Task<int> RequestedAndOverdueTasksCount(long userId);
 
-    /// <summary>
-    ///تعداد تسک های شخصی و دریافتی برای امروز و یا عقب افتاده
-    /// </summary>
-    /// <param name="userId"></param>
-    /// <returns></returns>
-    int OverdueTasksCount(long userId);
+    ///  <summary>
+    /// تعداد تسک های شخصی و دریافتی برای امروز و یا عقب افتاده
+    ///  </summary>
+    ///  <param name="userId"></param>
+    ///  <returns></returns>
+    Task<int> OverdueTasksCount(long userId);
 
 
-    //متد انتقال داده از تسک به ارجاعی ها
-    //OperationResult MoveDataFRomTaskToAssign();
 }

AccountManagement.Application.Contracts/Task/TaskViewModel.cs

@@ -50,5 +50,7 @@ public class TaskViewModel
     public bool CanCheckRequests { get; set; }
     public AssignViewModel AssignedReceiverViewModel { get; set; }
 
-
+    public TaskScheduleType ScheduleType { get; set; }
+    public TaskScheduleUnitType ScheduleUnitType { get; set; }
+    public long TaskScheduleId { get; set; }
 }

AccountManagement.Application.Contracts/TaskSchedule/ITaskScheduleApplication.cs

@@ -1,4 +1,6 @@
-using _0_Framework.Application;
+using System;
+using System.Threading.Tasks;
+using _0_Framework.Application;
 using AccountManagement.Application.Contracts.Task;
 
 namespace AccountManagement.Application.Contracts.TaskSchedule;
@@ -6,7 +8,8 @@ namespace AccountManagement.Application.Contracts.TaskSchedule;
 public interface ITaskScheduleApplication
 {
     OperationResult Create(CreateTask command);
-    OperationResult CreateLimitedTasks(CreateTask command);
-    OperationResult CreateUnlimitedTasks(CreateTask command);
 
+    Task<TaskScheduleDetailsViewModel> GetDetails(long id);
+
+    OperationResult Remove(long taskScheduleId);
 }

AccountManagement.Application.Contracts/TaskSchedule/TaskScheduleDetailsViewModel.cs

@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using AccountManagement.Application.Contracts.Media;
+using AccountManagement.Application.Contracts.Task;
+
+namespace AccountManagement.Application.Contracts.TaskSchedule;
+
+public class TaskScheduleDetailsViewModel
+{
+    public string SenderName { get; set; }
+    public List<string> AssignedName { get; set; }
+    public TaskScheduleType TaskScheduleType { get; set; }
+    public TaskScheduleUnitType TaskScheduleUnitType { get; set; }
+    public string UnitNumber { get; set; }
+    public string CreationDateFa { get; set; }
+    public string ContractingPartyName { get; set; }
+    public string Title { get; set; }
+    public string Description { get; set; }
+    public List<MediaViewModel> Medias { get; set; }
+
+}

AccountManagement.Application/AccountApplication.cs

@@ -549,7 +549,8 @@ public class AccountApplication : IAccountApplication
 		return operation.Succcedded(2);
     }
 
-	public AccountLeftWorkViewModel WorkshopList(long accountId)
+  
+    public AccountLeftWorkViewModel WorkshopList(long accountId)
     {
         string fullname = this._accountRepository.GetById(accountId).Fullname;
         List<WorkshopAccountlistViewModel> source =_accountLeftworkRepository.WorkshopList(accountId);
@@ -785,4 +786,10 @@ public class AccountApplication : IAccountApplication
     //}
     #endregion
 
+
+    public bool CheckExistClientAccount(string userName)
+    {
+        return _accountRepository.CheckExistClientAccount(userName);
+    }
+
 }

AccountManagement.Application/TaskApplication.cs

@@ -16,6 +16,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 
 
 namespace AccountManagement.Application;
@@ -508,6 +509,11 @@ public class TaskApplication : ITaskApplication
         return _taskRepository.GetTasksHaveTicket(searchModel);
     }
 
+    public List<TaskViewModel> GetTaskScheduleList(TaskSearchModel searchModel)
+    {
+        return _taskRepository.GetTaskScheduleList(searchModel);
+    }
+
     //ساخت درخواست مهلت
     public OperationResult CreateRequestTime(CreateTaskTimeRequest command)
     {
@@ -589,6 +595,9 @@ public class TaskApplication : ITaskApplication
         {
             return operation.Failed("تاریخی برای درخواست وظیفه ثبت نشده است");
         }
+
+     
+
         assign.AcceptTimeRequest();
         message = string.IsNullOrWhiteSpace(message) ? "درخواست شما مورد تایید قرار گرفت" : message;
         var messageEntity = new TaskMessage(message, "تایید درخواست مهلت", assign.id);
@@ -865,14 +874,14 @@ public class TaskApplication : ITaskApplication
         return _taskRepository.AllRequestedTasks(searchModel);
     }
 
-    public int TasksHaveTicketCounts(long userId)
+    public async Task<int> TasksHaveTicketCounts(long userId)
     {
-        return _taskRepository.TasksHaveTicketCounts(userId);
+        return await _taskRepository.TasksHaveTicketCounts(userId);
     }
 
-    public int TasksHaveTicketRequestsCount(long userId)
+    public async Task<int> TasksHaveTicketRequestsCount(long userId)
     {
-        return _taskRepository.TasksHaveTicketRequestsCount(userId);
+        return await _taskRepository.TasksHaveTicketRequestsCount(userId);
     }
 
 
@@ -881,9 +890,9 @@ public class TaskApplication : ITaskApplication
         return _taskMessageRepository.GetTaskMessages(assignId);
     }
 
-    public int GetRequestedTasksCount()
+    public async Task<int> GetRequestedTasksCount()
     {
-        return _taskRepository.GetRequestedTasksCount();
+        return await _taskRepository.GetRequestedTasksCount();
     }
 
     public OperationResult ChangeRequestTimeAndAccept(string time, long taskId, long assignedId, string message)
@@ -1007,15 +1016,15 @@ public class TaskApplication : ITaskApplication
         return _assignRepository.GetAssignsByTaskId(taskId);
     }
 
-    public int RequestedAndOverdueTasksCount(long userId)
+    public async Task<int> RequestedAndOverdueTasksCount(long userId)
     {
-        return _taskRepository.RequestedAndOverdueTasksCount(userId);
+        return await _taskRepository.RequestedAndOverdueTasksCount(userId);
 
     }
 
-    public int OverdueTasksCount(long userId)
+    public async Task<int> OverdueTasksCount(long userId)
     {
-        return _taskRepository.OverdueTasksCount(userId);
+        return await _taskRepository.OverdueTasksCount(userId);
     }
 
     //public OperationResult MoveDataFRomTaskToAssign()

AccountManagement.Application/TaskScheduleApplication.cs

@@ -4,222 +4,355 @@ using AccountManagement.Application.Contracts.TaskSchedule;
 using AccountManagement.Domain.TaskScheduleAgg;
 using System;
 using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Transactions;
+using AccountManagement.Domain.TaskAgg;
 using Company.Domain.HolidayItemAgg;
 
 namespace AccountManagement.Application;
 
 public class TaskScheduleApplication : ITaskScheduleApplication
 {
-	private readonly ITaskApplication _taskApplication;
-	private readonly ITaskScheduleRepository _taskScheduleRepository;
-	private readonly IHolidayItemRepository _holidayItemRepository;
+    private readonly ITaskApplication _taskApplication;
+    private readonly ITaskScheduleRepository _taskScheduleRepository;
+    private readonly IHolidayItemRepository _holidayItemRepository;
+    private readonly ITaskRepository _taskRepository;
+    public TaskScheduleApplication(ITaskApplication taskApplication, ITaskScheduleRepository taskScheduleRepository, IHolidayItemRepository holidayItemRepository, ITaskRepository taskRepository)
+    {
+        _taskApplication = taskApplication;
+        _taskScheduleRepository = taskScheduleRepository;
+        _holidayItemRepository = holidayItemRepository;
+        _taskRepository = taskRepository;
+    }
 
-	public TaskScheduleApplication(ITaskApplication taskApplication, ITaskScheduleRepository taskScheduleRepository, IHolidayItemRepository holidayItemRepository)
-	{
-		_taskApplication = taskApplication;
-		_taskScheduleRepository = taskScheduleRepository;
-		_holidayItemRepository = holidayItemRepository;
-	}
-
-	public OperationResult Create(CreateTask command)
-	{
-		OperationResult operation = new OperationResult();
+    public OperationResult Create(CreateTask command)
+    {
+        OperationResult operation = new OperationResult();
 
 
-		if (command.HasSchedule)
-		{
-			switch (command.ScheduleType)
-			{
-				case "limited":
-					if (Convert.ToInt32(command.ScheduleCount) > 60)
-					{
-						return operation.Failed("تعداد وارد شده بیشتر از حد مجاز است");
-					}
-					return CreateLimitedTasks(command);
-					break;
+        if (command.HasSchedule)
+        {
+            switch (command.ScheduleType)
+            {
+                case TaskScheduleType.Limited:
+                    if (Convert.ToInt32(command.ScheduleCount) > 60)
+                    {
+                        return operation.Failed("تعداد وارد شده بیشتر از حد مجاز است");
+                    }
+                    return CreateLimitedTasks(command);
+                    break;
 
-				case "unlimited":
-					return CreateUnlimitedTasks(command);
-					break;
+                case TaskScheduleType.Unlimited:
+                    return CreateUnlimitedTasks(command);
+                    break;
 
-				default:
-					return operation.Failed("خطای سیستمی!");
+                default:
+                    return operation.Failed("نوع وظیفه محول شده مشخص نمیباشد");
 
-			}
-		}
-		else
-		{
-			return operation.Failed("این تسک بصورت زمان بندی شده نمیباشد");
-		}
-	}
+            }
+        }
+        else
+        {
+            return operation.Failed("این تسک بصورت دوره ای نمیباشد");
+        }
+    }
 
-	public OperationResult CreateLimitedTasks(CreateTask command)
-	{
-		OperationResult operation = new OperationResult();
-		if (Convert.ToInt32(command.ScheduleCount) < 1 || string.IsNullOrWhiteSpace(command.ScheduleCount))
-		{
-			return operation.Failed("تعداد وارد شده باید بیشتر از 2 باشد");
-		}
+    public async Task<TaskScheduleDetailsViewModel> GetDetails(long id)
+    {
+        return await _taskScheduleRepository.GetDetails(id);
+    }
 
-		switch (command.ScheduleUnitType)
-		{
-			case "year":
-				if (Convert.ToInt32(command.ScheduleCount) != 1)
-				{
-					return operation.Failed("دوره نمیتواند بیشتر از 1 سال باشد");
-				}
-				break;
-			case "month":
-				if (Convert.ToInt32(command.ScheduleCount) > 12)
-				{
-					return operation.Failed("بازه وارد شده نا معتبر است");
-				}
-				break;
-			case "week":
-				if (command.ScheduleUnitNumber != "first" && command.ScheduleUnitNumber != "last")
-				{
-					return operation.Failed("بازه وارد شده نا معتبر است");
-				}
-				break;
-			case "day":
-				if (Convert.ToInt32(command.ScheduleUnitNumber) > 29)
-				{
-					return operation.Failed("بازه وارد شده نا معتبر است");
-				}
-				break;
-			default:
-				return operation.Failed("نوع بازه مشخص نمیباشد");
-				break;
+    public OperationResult Remove(long taskScheduleId)
+    {
+        var op = new OperationResult();
+        var taskSchedule = _taskScheduleRepository.Get(taskScheduleId);
+        if (taskSchedule == null)
+            return op.Failed("وظیفه مورد نظر یافت نشد");
+        var tasks = _taskRepository.GetTasksByTaskScheduleId(taskScheduleId);
+        var assigns = tasks.SelectMany(x => x.Assigns);
+        if (assigns.Any(x => x.IsCanceledRequest || x.IsDone || x.IsCancel || x.TimeRequest || x.AcceptedTimeRequest > 0))
+        {
+            taskSchedule.DeActive();
 
-		}
-		try
-		{
-			DateTime previousDateRaw = command.EndTaskDate.ToEndDayOfGeorgianDateTime();
-			DateTime previousDateEdited = command.EndTaskDate.ToEndDayOfGeorgianDateTime();
+            var removableTask = tasks.Where(x=>x.Assigns.All(a=>a.IsDone==false && a.IsCancel == false)).ToList();
+            _taskRepository.RemoveRange(removableTask);
             
-			int count = Convert.ToInt32(command.ScheduleCount);
-			bool isInt = int.TryParse(command.ScheduleUnitNumber, out int unitNumber);
-			string kindOfWeekUnit = isInt ? "" : command.ScheduleUnitNumber;
-			var taskSchedule = new TaskSchedule(command.ScheduleCount, command.ScheduleType, command.ScheduleUnitType,
-				command.ScheduleUnitNumber, previousDateEdited);
-			_taskScheduleRepository.Create(taskSchedule);
-			_taskScheduleRepository.SaveChanges();
-			command.TaskScheduleId = taskSchedule.id;
+        }
+        else
+        {
+            _taskScheduleRepository.Remove(taskSchedule);
+            _taskRepository.RemoveRange(tasks);
+        }
+        _taskRepository.SaveChanges();
+        return op.Succcedded();
+    }
 
-			switch (command.ScheduleUnitType)
-			{
-				case "year":
-					for (int i = 1; i <= count; i++)
-					{
-						command.EndTaskDate = previousDateEdited.ToFarsi();
-						operation = _taskApplication.CreateTask(command);
-						taskSchedule.SetLastEndTaskDate(previousDateEdited);
+    private OperationResult CreateLimitedTasks(CreateTask command)
+    {
+        OperationResult operation = new OperationResult();
+        if (Convert.ToInt32(command.ScheduleCount) < 1 || string.IsNullOrWhiteSpace(command.ScheduleCount))
+        {
+            return operation.Failed("تعداد وارد شده باید بیشتر از 2 باشد");
+        }
+        if (string.IsNullOrWhiteSpace(command.ScheduleUnitNumber))
+        {
+            return operation.Failed("لطفا تعداد بازه خود را مشخص کنید");
+        }
 
-						bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
-						while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
-						{
-							previousDateEdited = previousDateRaw.AddDays(1);
-							isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
+        switch (command.ScheduleUnitType)
+        {
+            case TaskScheduleUnitType.Year:
+                if (Convert.ToInt32(command.ScheduleCount) != 1)
+                {
+                    return operation.Failed("دوره نمیتواند بیشتر از 1 سال باشد");
+                }
+                break;
+            case TaskScheduleUnitType.Month:
 
-						}
-						previousDateRaw = previousDateRaw.AddYears(unitNumber);
-						previousDateEdited = previousDateRaw;
+                if (Convert.ToInt32(command.ScheduleUnitNumber) is > 12 or < 1)
+                {
+                    return operation.Failed("بازه وارد شده نا معتبر است");
+                }
 
-					}
-					break;
+                if (Convert.ToInt32(command.ScheduleCount) is > 60 or < 1)
+                {
+                    return operation.Failed("تعداد دفعات وارد شده نامعتبر است");
+                }
+                break;
+            case TaskScheduleUnitType.Week:
+                if (command.ScheduleUnitNumber != "first" && command.ScheduleUnitNumber != "last")
+                {
+                    return operation.Failed("بازه وارد شده نا معتبر است");
+                }
+                break;
+            case TaskScheduleUnitType.Day:
+                if (Convert.ToInt32(command.ScheduleUnitNumber) is > 29 or < 1)
+                {
+                    return operation.Failed("بازه وارد شده نا معتبر است");
+                }
+                break;
+            default:
+                return operation.Failed("نوع بازه مشخص نمیباشد");
+                break;
 
-				case "month":
-					for (int i = 1; i <= count; i++)
-					{
-						command.EndTaskDate = previousDateEdited.ToFarsi();
-						operation = _taskApplication.CreateTask(command);
-						taskSchedule.SetLastEndTaskDate(previousDateEdited);
-						bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
-						while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
-						{
-							previousDateEdited = previousDateRaw.AddDays(1);
-							isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
+        }
+        try
+        {
+            //using var transaction = new TransactionScope();
+            DateTime previousDateRaw = command.EndTaskDate.ToEndDayOfGeorgianDateTime();
+            DateTime previousDateEdited = command.EndTaskDate.ToEndDayOfGeorgianDateTime();
+            var day = Convert.ToInt32(command.EndTaskDate.Substring(8, 2));
+            var month = Convert.ToInt32(command.EndTaskDate.Substring(5, 2));
+            var year = Convert.ToInt32(command.EndTaskDate.Substring(0, 4));
 
-						}
-						previousDateRaw = previousDateRaw.AddMonths(unitNumber);
-						previousDateEdited = previousDateRaw;
+            int count = Convert.ToInt32(command.ScheduleCount);
+            bool isInt = int.TryParse(command.ScheduleUnitNumber, out int unitNumber);
+            string kindOfWeekUnit = isInt ? "" : command.ScheduleUnitNumber;
+            var taskSchedule = new TaskSchedule(command.ScheduleCount, command.ScheduleType, command.ScheduleUnitType,
+                command.ScheduleUnitNumber, previousDateEdited);
+            _taskScheduleRepository.Create(taskSchedule);
+            _taskScheduleRepository.SaveChanges();
+            command.TaskScheduleId = taskSchedule.id;
 
-					}
-					break;
+            switch (command.ScheduleUnitType)
+            {
+                case TaskScheduleUnitType.Year:
+                    for (int i = 1; i <= count; i++)
+                    {
+                        command.EndTaskDate = previousDateEdited.ToFarsi();
+                        operation = _taskApplication.CreateTask(command);
+                        taskSchedule.SetLastEndTaskDate(previousDateEdited);
 
-				case "week":
-					for (int i = 1; i <= count; i++)
-					{
-						if (string.IsNullOrWhiteSpace(kindOfWeekUnit))
-						{
-							throw new InvalidDataException();
-						}
+                        bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
+                        while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
+                        {
+                            previousDateEdited = previousDateRaw.AddDays(1);
+                            isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
+                        }
+                        previousDateRaw = previousDateRaw.AddYears(unitNumber);
+                        previousDateEdited = previousDateRaw;
+                    }
+                    break;
 
-						command.EndTaskDate = kindOfWeekUnit switch
-						{
-							"first" => previousDateRaw.GetNextDayOfWeek(DayOfWeek.Saturday).ToFarsi(),
-							"last" => previousDateRaw.GetNextDayOfWeek(DayOfWeek.Thursday).ToFarsi(),
-							_ => throw new InvalidDataException()
-						};
-						operation = _taskApplication.CreateTask(command);
-						taskSchedule.SetLastEndTaskDate(previousDateEdited);
-						bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
-						while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
-						{
-							previousDateEdited = previousDateRaw.AddDays(1);
-							isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
+                case TaskScheduleUnitType.Month:
+                    bool endOfMonth = day == 31;
 
-						}
-						previousDateRaw = command.EndTaskDate.ToGeorgianDateTime();
-						previousDateEdited = previousDateRaw;
+                    if (endOfMonth)
+                    {
+                        for (int i = 1; i <= count; i++)
+                        {
+                            command.EndTaskDate = previousDateEdited.ToFarsi();
+                            operation = _taskApplication.CreateTask(command);
+                            taskSchedule.SetLastEndTaskDate(previousDateEdited);
+                            if (month >= 12)
+                            {
+                                var extra = month - 12;
+                                year++;
+                                month = extra + unitNumber;
+                            }
+                            else
+                            {
+                                month = unitNumber + month;
+                            }
+                            previousDateRaw = $"{year:0000}/{month:00}/01".FindeEndOfMonth().ToGeorgianDateTime();
+                            bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
+                            while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
+                            {
+                                previousDateEdited = previousDateRaw.AddDays(1);
+                                isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
+
+                            }
 
 
-					}
-					break;
 
-				case "day":
+                            previousDateEdited = previousDateRaw;
 
-					for (int i = 1; i <= count; i++)
-					{
-						command.EndTaskDate = previousDateEdited.ToFarsi();
-						operation = _taskApplication.CreateTask(command);
-						taskSchedule.SetLastEndTaskDate(previousDateEdited);
-						previousDateRaw = previousDateRaw.AddDays(unitNumber);
-						bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
-						while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
-						{
-							previousDateEdited = previousDateRaw.AddDays(1);
-							isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
+                        }
+                    }
+                    else
+                    {
+                        for (int i = 1; i < count; i++)
+                        {
+                            command.EndTaskDate = previousDateEdited.ToFarsi();
+                            operation = _taskApplication.CreateTask(command);
+                            taskSchedule.SetLastEndTaskDate(previousDateEdited);
+                            var endDay = 0;
 
-						}
+                            if (month >= 12)
+                            {
+                                var extra = month - 12;
+                                year++;
+                                month = extra + unitNumber;
 
-						previousDateEdited = previousDateRaw;
-					}
-					break;
+                            }
+                            else
+                            {
+                                month = unitNumber + month;
+                            }
 
-			}
-			_taskScheduleRepository.SaveChanges();
-			operation = operation.Succcedded();
-			return operation;
-		}
-		catch (Exception e)
-		{
-			return operation.Failed(e.ToString());
-		}
-	}
+                            if (day == 30)
+                            {
+                                if (month == 12)
+                                {
+                                    var lastYearDay = Convert.ToInt32($"{year:0000}/{month:00}/1".FindeEndOfMonth()
+                                        .Substring(8, 2));
+                                    endDay = lastYearDay == 30 ? lastYearDay : 29;
+                                }
 
-	public OperationResult CreateUnlimitedTasks(CreateTask command)
-	{
-		var operation = _taskApplication.CreateTask(command);
-		if (!operation.IsSuccedded)
-			return operation;
-		var lastDate = command.EndTaskDate.ToGeorgianDateTime();
-		var taskSchedule = new TaskSchedule(command.ScheduleCount, command.ScheduleType, command.ScheduleUnitType,
-			command.ScheduleUnitNumber, lastDate);
-		_taskScheduleRepository.Create(taskSchedule);
-		_taskScheduleRepository.SaveChanges();
-		return operation.Succcedded();
+                            }
 
-	}
+                            previousDateEdited = endDay == 0
+                                ? $"{year:0000}/{month:00}/{day:00}".ToGeorgianDateTime()
+                                : $"{year:0000}/{month:00}/{endDay:00}".ToGeorgianDateTime();
+                        }
+
+
+                        //for (int i = 1; i <= count; i++)
+                        //{
+                        //    command.EndTaskDate = previousDateEdited.ToFarsi();
+                        //    operation = _taskApplication.CreateTask(command);
+                        //    taskSchedule.SetLastEndTaskDate(previousDateEdited);
+                        //    previousDateRaw = $"{year:0000}/{month:00}/01".FindeEndOfMonth().ToGeorgianDateTime();
+                        //    bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
+                        //    while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
+                        //    {
+                        //        previousDateEdited = previousDateRaw.AddDays(1);
+                        //        isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
+
+                        //    }
+                        //    previousDateEdited = previousDateRaw;
+
+                        //}
+                    }
+
+                    break;
+
+                case TaskScheduleUnitType.Week:
+                    for (int i = 1; i <= count; i++)
+                    {
+                        if (string.IsNullOrWhiteSpace(kindOfWeekUnit))
+                        {
+                            throw new InvalidDataException();
+                        }
+
+                        command.EndTaskDate = kindOfWeekUnit switch
+                        {
+                            "first" => previousDateRaw.GetNextDayOfWeek(DayOfWeek.Saturday).ToFarsi(),
+                            "last" => previousDateRaw.GetNextDayOfWeek(DayOfWeek.Thursday).ToFarsi(),
+                            _ => throw new InvalidDataException()
+                        };
+                        operation = _taskApplication.CreateTask(command);
+                        taskSchedule.SetLastEndTaskDate(previousDateEdited);
+                        bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
+                        while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
+                        {
+                            previousDateEdited = previousDateRaw.AddDays(1);
+                            isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
+
+                        }
+                        previousDateRaw = command.EndTaskDate.ToGeorgianDateTime();
+                        previousDateEdited = previousDateRaw;
+
+
+                    }
+                    break;
+
+                case TaskScheduleUnitType.Day:
+
+                    for (int i = 1; i <= count; i++)
+                    {
+                        command.EndTaskDate = previousDateEdited.ToFarsi();
+                        operation = _taskApplication.CreateTask(command);
+                        taskSchedule.SetLastEndTaskDate(previousDateEdited);
+                        previousDateRaw = previousDateRaw.AddDays(unitNumber);
+                        bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
+                        while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
+                        {
+                            previousDateEdited = previousDateRaw.AddDays(1);
+                            isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
+
+                        }
+
+                        previousDateEdited = previousDateRaw;
+                    }
+                    break;
+
+            }
+            _taskScheduleRepository.SaveChanges();
+            //transaction.Complete();
+            operation = operation.Succcedded();
+            return operation;
+        }
+        catch (Exception e)
+        {
+            return operation.Failed(e.ToString());
+        }
+    }
+
+    private OperationResult CreateUnlimitedTasks(CreateTask command)
+    {
+        using var transaction = new TransactionScope();
+
+        var lastDate = command.EndTaskDate.ToGeorgianDateTime();
+
+        var taskSchedule = new TaskSchedule(command.ScheduleCount, command.ScheduleType, command.ScheduleUnitType,
+            command.ScheduleUnitNumber, lastDate);
+
+        _taskScheduleRepository.Create(taskSchedule);
+        _taskScheduleRepository.SaveChanges();
+
+        command.TaskScheduleId = taskSchedule.id;
+
+        var operation = _taskApplication.CreateTask(command);
+        if (!operation.IsSuccedded)
+            return operation;
+
+
+        _taskScheduleRepository.SaveChanges();
+        transaction.Complete();
+        return operation.Succcedded();
+
+    }
 
 }

AccountManagement.Application/TaskSubjectApplication.cs

@@ -1,7 +1,9 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using _0_Framework.Application;
 using AccountManagement.Application.Contracts.TaskSubject;
 using AccountManagement.Domain.TaskSubjectAgg;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
 
 namespace AccountManagement.Application;
 

AccountManagement.Configuration/AccountManagementBootstrapper.cs

@@ -7,6 +7,7 @@ using AccountManagement.Application.Contracts.Role;
 using AccountManagement.Application.Contracts.SubAccount;
 using AccountManagement.Application.Contracts.SubAccountPermissionSubtitle;
 using AccountManagement.Application.Contracts.Task;
+using AccountManagement.Application.Contracts.TaskSchedule;
 using AccountManagement.Application.Contracts.TaskSubject;
 using AccountManagement.Application.Contracts.Ticket;
 using AccountManagement.Application.Contracts.TicketAccessAccount;
@@ -25,6 +26,7 @@ using AccountManagement.Domain.SubAccountPermissionSubtitle4Agg;
 using AccountManagement.Domain.SubAccountRoleAgg;
 using AccountManagement.Domain.TaskAgg;
 using AccountManagement.Domain.TaskMessageAgg;
+using AccountManagement.Domain.TaskScheduleAgg;
 using AccountManagement.Domain.TaskSubjectAgg;
 using AccountManagement.Domain.TicketAccessAccountAgg;
 using AccountManagement.Domain.TicketAgg;
@@ -62,6 +64,8 @@ namespace AccountManagement.Configuration
             services.AddScoped<ITaskRepository, TaskRepository>();
             services.AddTransient<ITaskApplication, TaskApplication>();
 
+            services.AddTransient<ITaskScheduleApplication, TaskScheduleApplication>();
+            services.AddTransient<ITaskScheduleRepository, TaskScheduleRepository>();
 
             services.AddTransient<ITaskSubjectRepository, TaskSubjectRepository>();
             services.AddTransient<ITaskSubjectApplication, TaskSubjectApplication>();

AccountManagement.Domain/AccountAgg/IAccountRepository.cs

@@ -33,6 +33,13 @@ namespace AccountManagement.Domain.AccountAgg
 
         List<AccountViewModel> GetAccountsToEditWorkshop(long workshopId);
 
+        /// <summary>
+        /// چک میکند که اکانتی با این ام کاربری وجود دارد یا نه
+        /// </summary>
+        /// <param name="userName"></param>
+        /// <returns></returns>
+        public bool CheckExistClientAccount(string userName);
+
     }
 
 }

AccountManagement.Domain/AssignAgg/Assign.cs

@@ -8,7 +8,7 @@ namespace AccountManagement.Domain.AssignAgg;
 
 public class Assign : EntityBase
 {
-    public Assign(long taskId, long assignerId, long assignedId, int assignerPositionValue, string assignedName, int assignedPositionValue, DateTime endTaskDate, bool firstTimeCreation = false)
+    public Assign(long taskId, long assignerId, long assignedId, int assignerPositionValue, string assignedName, int assignedPositionValue, DateTime endTaskDate, bool firstTimeCreation=false)
     {
         TaskId = taskId;
         AssignerId = assignerId;
@@ -18,7 +18,7 @@ public class Assign : EntityBase
         AssignedPositionValue = assignedPositionValue;
         EndTaskDate = endTaskDate;
         FirstTimeCreation = firstTimeCreation;
-	}
+    }
 
 	//آیدی شخص ارسال کننده
 	public long TaskId { get; private set; }
@@ -52,7 +52,9 @@ public class Assign : EntityBase
 
     public string? DoneDescription { get; private set; }
     public bool IsCanceledRequest { get; private set; }
+
     public bool FirstTimeCreation { get; private set; }
+
 	public Tasks Task { get; set; }
     public List<TaskMessage> TaskMessageList { get; set; }
 
@@ -71,9 +73,9 @@ public class Assign : EntityBase
 	{
 		TimeRequest = false;
 		AcceptedTimeRequest++;
-		EndTaskDate = RequestDate.Value;
+        EndTaskDate = RequestDate < DateTime.Today ? DateTime.Today : RequestDate.Value;
 
-	}
+    }
 	public void RejectTimeRequest()
 	{
 		TimeRequest = false;

AccountManagement.Domain/TaskAgg/ITaskRepository.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using AccountManagement.Application.Contracts.Task;
@@ -88,11 +89,22 @@ public interface ITaskRepository:IRepository<long,Tasks>
     /// <returns></returns>
     List<TaskViewModel> GetTasksHaveTicket(TaskSearchModel searchModel);
 
+
+
+
+    /// <summary>
+    /// لیست تسک های دوره ای ایجاد شده توسط کاربر
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    List<TaskViewModel> GetTaskScheduleList(TaskSearchModel searchModel);
+
+
     /// <summary>
     /// تعداد تسک های درخواستی. بدون تیکت
     /// </summary>
     /// <returns></returns>
-    int GetRequestedTasksCount();
+    Task<int> GetRequestedTasksCount();
 
     /// <summary>
     /// گرفتن جزئیات درخواست وظیفه 
@@ -114,39 +126,38 @@ public interface ITaskRepository:IRepository<long,Tasks>
     /// <returns></returns>
     bool HasOverdueTasks(long userId);
 
-    /// <summary>
-    ///مجوع تعداد تسک های عقب افتاده و درخواستی
-    /// </summary>
-    /// <param name="userId"></param>
-    /// <returns></returns>
-    int RequestedAndOverdueTasksCount(long userId);
+    ///  <summary>
+    /// مجوع تعداد تسک های عقب افتاده و درخواستی
+    ///  </summary>
+    ///  <param name="userId"></param>
+    ///  <returns></returns>
+    Task<int> RequestedAndOverdueTasksCount(long userId);
 
     /// <summary>
     /// تعداد تسک های دارای تیکت
     /// </summary>
     /// <param name="userId"></param>
     /// <returns></returns>
-    int TasksHaveTicketCounts(long userId);
+    Task<int> TasksHaveTicketCounts(long userId);
 
     /// <summary>
     /// تعداد درخواست های تسک های دارا تیکت
     /// </summary>
     /// <param name="userId"></param>
     /// <returns></returns>
-    int TasksHaveTicketRequestsCount(long userId);
+    Task<int> TasksHaveTicketRequestsCount(long userId);
 
-    /// <summary>
-    ///تعداد تسک های شخصی و دریافتی برای امروز و یا عقب افتاده
-    /// </summary>
-    /// <param name="userId"></param>
-    /// <returns></returns>
-    int OverdueTasksCount(long userId);
+    ///  <summary>
+    /// تعداد تسک های شخصی و دریافتی برای امروز و یا عقب افتاده
+    ///  </summary>
+    ///  <param name="userId"></param>
+    ///  <returns></returns>
+    Task<int> OverdueTasksCount(long userId);
 
 
     // گرفتن پیام های مربوط به هر تسک
 
+    List<Tasks> GetTasksByTaskScheduleId(long taskScheduleId);
 
-
-    //OperationResult MoveDataFRomTaskToAssign();
-
+    void RemoveRange(IEnumerable<Tasks>  tasks);
 }

AccountManagement.Domain/TaskScheduleAgg/ITaskScheduleRepository.cs

@@ -1,8 +1,11 @@
-using _0_Framework.Domain;
+using System.Threading.Tasks;
+using _0_Framework.Domain;
+using AccountManagement.Application.Contracts.TaskSchedule;
 
 namespace AccountManagement.Domain.TaskScheduleAgg;
 
-public interface ITaskScheduleRepository:IRepository<long,TaskSchedule>
+public interface ITaskScheduleRepository : IRepository<long, TaskSchedule>
 {
-    
+    Task<TaskScheduleDetailsViewModel> GetDetails(long id);
+    void Remove(TaskSchedule entity);
 }

AccountManagement.Domain/TaskScheduleAgg/TaskSchedule.cs

@@ -1,29 +1,38 @@
 using System;
 using System.Collections.Generic;
+using _0_Framework.Application;
 using _0_Framework.Domain;
+using AccountManagement.Application.Contracts.Task;
 using AccountManagement.Domain.TaskAgg;
 
 namespace AccountManagement.Domain.TaskScheduleAgg;
 
 public class TaskSchedule:EntityBase
 {
-    public TaskSchedule(string count, string type, string unitType, string unitNumber, DateTime lastEndTaskDate)
+    public TaskSchedule(string count, TaskScheduleType type, TaskScheduleUnitType unitType, string unitNumber, DateTime lastEndTaskDate)
     {
         Count = count;
         Type = type;
         UnitType = unitType;
         UnitNumber = unitNumber;
         LastEndTaskDate = lastEndTaskDate;
+        IsActive = IsActive.False;
     }
     public string Count { get; private set; }
-    public string Type { get; private set; }
-    public string UnitType { get; private set; }
+    public TaskScheduleType Type { get; private set; }
+    public TaskScheduleUnitType UnitType { get; private set; }
     public string UnitNumber { get; private set; }
     public DateTime LastEndTaskDate { get; private set; }
+    public IsActive IsActive { get; private set; }
     public List<Tasks> TasksList { get; set; }
 
     public void SetLastEndTaskDate(DateTime lastEndTaskDate)
     {
         LastEndTaskDate = lastEndTaskDate;
     }
+
+    public void DeActive()
+    {
+	    IsActive = IsActive.False;
+    }
 }

AccountMangement.Infrastructure.EFCore/AccountContext.cs

@@ -27,6 +27,7 @@ using AccountManagement.Domain.SubAccountPermissionSubtitle3Agg;
 using AccountManagement.Domain.SubAccountPermissionSubtitle4Agg;
 using AccountManagement.Domain.SubAccountRoleAgg;
 using AccountMangement.Infrastructure.EFCore.Seed;
+using AccountManagement.Domain.TaskScheduleAgg;
 
 namespace AccountMangement.Infrastructure.EFCore
 {
@@ -57,6 +58,9 @@ namespace AccountMangement.Infrastructure.EFCore
 
         public DbSet<TicketAccessAccount> TicketAccessAccounts { get; set; }
 
+        public DbSet<TaskSchedule> TaskSchedules { get; set; }
+
+
         #endregion
 
         #region Pooya

AccountMangement.Infrastructure.EFCore/Mappings/TaskScheduleMapping.cs

@@ -12,9 +12,10 @@ public class TaskScheduleMapping : IEntityTypeConfiguration<TaskSchedule>
         builder.HasKey(x => x.id);
 
         builder.Property(x => x.Count).HasMaxLength(10);
-        builder.Property(x => x.Type).HasMaxLength(12);
+        builder.Property(x => x.Type).HasConversion<string>().HasMaxLength(12);
         builder.Property(x => x.UnitNumber).HasMaxLength(10);
-        builder.Property(x => x.UnitType).HasMaxLength(10);
+        builder.Property(x => x.UnitType).HasConversion<string>().HasMaxLength(10);
+        builder.Property(x => x.IsActive).HasConversion<string>().HasMaxLength(5);
 
         builder.HasMany(x => x.TasksList).WithOne(x => x.TaskSchedule)
                                                                                 .HasForeignKey(x => x.TaskScheduleId);

AccountMangement.Infrastructure.EFCore/Migrations/20250407150638_add TaskSchedule.cs

@@ -0,0 +1,74 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace AccountMangement.Infrastructure.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addTaskSchedule : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "UnitType",
+                table: "TaskSchedules",
+                type: "nvarchar(10)",
+                maxLength: 10,
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "nvarchar(10)",
+                oldMaxLength: 10,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Type",
+                table: "TaskSchedules",
+                type: "nvarchar(12)",
+                maxLength: 12,
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "nvarchar(12)",
+                oldMaxLength: 12,
+                oldNullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "IsCanceled",
+                table: "TaskSchedules",
+                type: "nvarchar(5)",
+                maxLength: 5,
+                nullable: false,
+                defaultValue: "");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsCanceled",
+                table: "TaskSchedules");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "UnitType",
+                table: "TaskSchedules",
+                type: "nvarchar(10)",
+                maxLength: 10,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(10)",
+                oldMaxLength: 10);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Type",
+                table: "TaskSchedules",
+                type: "nvarchar(12)",
+                maxLength: 12,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(12)",
+                oldMaxLength: 12);
+        }
+    }
+}

AccountMangement.Infrastructure.EFCore/Migrations/20250416121822_taskSchedule rename isActive.cs

@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace AccountMangement.Infrastructure.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class taskSchedulerenameisActive : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "IsCanceled",
+                table: "TaskSchedules",
+                newName: "IsActive");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "IsActive",
+                table: "TaskSchedules",
+                newName: "IsCanceled");
+        }
+    }
+}

AccountMangement.Infrastructure.EFCore/Migrations/AccountContextModelSnapshot.cs

@@ -759,10 +759,16 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("IsActive")
+                        .IsRequired()
+                        .HasMaxLength(5)
+                        .HasColumnType("nvarchar(5)");
+
                     b.Property<DateTime>("LastEndTaskDate")
                         .HasColumnType("datetime2");
 
                     b.Property<string>("Type")
+                        .IsRequired()
                         .HasMaxLength(12)
                         .HasColumnType("nvarchar(12)");
 
@@ -771,6 +777,7 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations
                         .HasColumnType("nvarchar(10)");
 
                     b.Property<string>("UnitType")
+                        .IsRequired()
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
 

AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs

@@ -332,4 +332,9 @@ public class AccountRepository : RepositoryBase<long, Account>, IAccountReposito
 
     #endregion
 
+
+    public bool CheckExistClientAccount(string userName)
+    {
+        return _context.Accounts.Any(x => x.Username == userName);
+    }
 }

AccountMangement.Infrastructure.EFCore/Repository/TaskRepository.cs

@@ -4,6 +4,7 @@ using _0_Framework.InfraStructure;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using System.Linq;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 using AccountManagement.Application.Contracts.Account;
 using AccountManagement.Application.Contracts.Assign;
@@ -46,7 +47,6 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
 
     public EditTask GetDetails(long TaskId)
     {
-        var task = Get(TaskId);
 
         var userId = _authHelper.CurrentAccountId();
 
@@ -94,7 +94,8 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                         Fullname = a.Fullname,
                         Id = a.id,
 
-                    }).FirstOrDefault()
+                    }).FirstOrDefault(),
+                TaskScheduleId = x.TaskScheduleId ?? 0
 
             }).FirstOrDefault();
 
@@ -112,6 +113,17 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             res.IsCancel = res.AssignViewModels.First(x => x.AssignedId == userId).IsCancel;
         }
 
+        if (res.TaskScheduleId>0)
+        {
+            var taskSchedule = _accountContext.TaskSchedules.FirstOrDefault(x => x.id == res.TaskScheduleId);
+
+            res.ScheduleUnitType = taskSchedule.UnitType;
+            res.ScheduleType = taskSchedule.Type;
+            res.ScheduleCount = taskSchedule.Count;
+            res.ScheduleUnitNumber = taskSchedule.UnitNumber;
+		}
+
+
         //_accountContext.Tasks.Where(x => x.id == TaskId).Select(x => new EditTask()
         //{
         //    EndTaskDate = x.EndTaskDate.ToFarsi(),
@@ -968,7 +980,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                 .ThenInclude(x => x.Media)
                 .Where(x =>
                     x.Task.IsActiveString == "true" && (x.AssignerId == accountId && x.AssignedId != accountId) && (!x.IsCanceledRequest && !x.TimeRequest && !x.IsDoneRequest) && x.Task.TicketId == null &&
-                    x.Task.SenderId == accountId)
+                    x.Task.SenderId == accountId && x.Task.TaskScheduleId == null)
                 .Select(x =>
                     new TaskViewModel()
                     {
@@ -1839,7 +1851,307 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         return final;
     }
 
+    public List<TaskViewModel> GetTaskScheduleList(TaskSearchModel searchModel)
+    {
+        var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
+        var positionValue = int.Parse(_contextAccessor.HttpContext.User.FindFirst("PositionValue").Value);
+        var emptyAcc = new AccountViewModel()
+        {
+            Fullname = "-",
+            PositionValue = 0
+        };
 
+        var raw = _accountContext.Assigns.Include(x => x.Task).ThenInclude(x => x.TaskMedias)
+            .ThenInclude(x => x.Media)
+            .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);
+        if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
+        {
+            raw = raw.Where(x =>
+                (x.Task.Description != null && x.Task.Description.Contains(searchModel.GeneralSearch))
+                || x.Task.ContractingPartyName.Contains(searchModel.GeneralSearch)
+                || x.Task.Title.Contains(searchModel.GeneralSearch));
+        }
+
+
+
+
+        var query = raw.GroupBy(x => x.Task.TaskScheduleId).Select(x =>
+             new TaskViewModel()
+             {
+                 AssignedId = x.First().AssignedId,
+                 AssignerId = x.First().AssignerId,
+                 CreateDate = x.First().Task.CreationDate.ToFarsi(),
+                 EndTaskDateFA = x.First().EndTaskDate.ToFarsi(),
+                 IsDone = x.First().IsDone,
+                 EndTaskDateGE = x.First().EndTaskDate,
+                 Name = x.First().Task.Title,
+                 RequestCancel = x.First().IsCanceledRequest,
+                 RequestTime = x.First().TimeRequest,
+                 Id = x.First().Task.id,
+                 CreateTaskDateGE = x.First().Task.CreationDate,
+                 IsCancel = x.First().IsCancel,
+                 AcceptedTimeRequest = x.First().AcceptedTimeRequest,
+                 IsCancelRequest = x.First().IsCanceledRequest,
+                 ContractingPartyName = x.First().Task.ContractingPartyName,
+                 MediaCount = _accountContext.TaskMedias.Count(m => m.TaskId == x.First().Task.id),
+                 Description = x.First().Task.Description,
+                 IsDoneRequest = x.First().IsDoneRequest,
+                 ScheduleType = x.First().Task.TaskSchedule.Type,
+                 ScheduleUnitType = x.First().Task.TaskSchedule.UnitType,
+                 TaskScheduleId = (long)x.First().Task.TaskScheduleId
+
+             }
+        );
+
+        if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
+        {
+            query = query.Where(x =>
+                (x.Description != null && x.Description.Contains(searchModel.GeneralSearch))
+                || x.ContractingPartyName.Contains(searchModel.GeneralSearch)
+                || x.Name.Contains(searchModel.GeneralSearch));
+        }
+
+        var res = query.Select(x => new TaskViewModel()
+        {
+            Sender = _accountContext.Accounts.Include(a => a.Position).Select(a => new AccountViewModel()
+            {
+                PositionValue = a.Position.PositionValue,
+                Id = a.id,
+                Fullname = a.Fullname,
+            }).FirstOrDefault(a => a.Id == x.AssignerId),
+
+            SelfName = _accountContext.Accounts.FirstOrDefault(a => a.id == accountId).Fullname,
+
+            Assigned = _accountContext.Assigns.Where(a => a.TaskId == x.Id)
+                .Where(a => a.AssignedPositionValue >= positionValue).Select(a => a.AssignedId)
+                .ToList(),
+            CreateDate = x.CreateDate,
+            EndTaskDateFA = x.EndTaskDateFA,
+            IsDone = x.IsDone,
+            EndTaskDateGE = x.EndTaskDateGE,
+            Name = x.Name,
+            RequestCancel = x.RequestCancel,
+            RequestTime = x.RequestTime,
+            Id = x.Id,
+            CreateTaskDateGE = x.CreateTaskDateGE,
+            IsCancel = x.IsCancel,
+            AcceptedTimeRequest = x.AcceptedTimeRequest,
+            IsCancelRequest = x.IsCancelRequest,
+            ContractingPartyName = x.ContractingPartyName,
+            MediaCount = x.MediaCount,
+            Description = x.Description,
+            IsDoneRequest = x.IsDoneRequest,
+            ScheduleType = x.ScheduleType,
+            ScheduleUnitType = x.ScheduleUnitType,
+            TaskScheduleId = x.TaskScheduleId
+        });
+        if (!string.IsNullOrWhiteSpace(searchModel.StartDate) && !string.IsNullOrWhiteSpace(searchModel.EndDate))
+        {
+            var start = searchModel.StartDate.ToGeorgianDateTime();
+            var end = searchModel.EndDate.ToGeorgianDateTime();
+            res = res.Where(x =>
+                ((start > x.CreateTaskDateGE && x.CreateTaskDateGE < end) &&
+
+                 (end > x.EndTaskDateGE && x.EndTaskDateGE > start))
+                || ((start < x.CreateTaskDateGE && x.CreateTaskDateGE < end) &&
+
+                    (end < x.EndTaskDateGE && x.EndTaskDateGE > start))
+                || ((start < x.CreateTaskDateGE && x.CreateTaskDateGE < end) &&
+
+                    (end > x.EndTaskDateGE && x.EndTaskDateGE > start))
+                || ((start > x.CreateTaskDateGE && x.CreateTaskDateGE < end) &&
+
+                    (end < x.EndTaskDateGE && x.EndTaskDateGE > end)));
+        }
+
+        if (!string.IsNullOrWhiteSpace(searchModel.IsDoneRequest))
+        {
+            bool isDoneReq = bool.Parse(searchModel.IsDoneRequest);
+            res = res.Where(x => x.IsDoneRequest == isDoneReq);
+        }
+
+        if (!string.IsNullOrWhiteSpace(searchModel.IsDone))
+        {
+            bool isDone = bool.Parse(searchModel.IsDone);
+            res = res.Where(x => x.IsDone == isDone);
+        }
+
+        if (!string.IsNullOrWhiteSpace(searchModel.IsCanceled))
+        {
+            bool isCancel = bool.Parse(searchModel.IsCanceled);
+            res = res.Where(x => x.IsCancel == isCancel);
+        }
+
+        if (!string.IsNullOrWhiteSpace(searchModel.IsTimeRequest))
+        {
+            bool isTimeRequest = bool.Parse(searchModel.IsTimeRequest);
+            res = res.Where(x => x.RequestTime == isTimeRequest);
+        }
+
+        if (!string.IsNullOrWhiteSpace(searchModel.TimeRequestAccepted))
+        {
+            res = res.Where(x => x.AcceptedTimeRequest > 0);
+        }
+
+        if (!string.IsNullOrWhiteSpace(searchModel.IsCancelRequest))
+        {
+            bool isCancelReq = bool.Parse(searchModel.IsCancelRequest);
+            res = res.Where(x => x.IsCancelRequest == isCancelReq);
+
+        }
+
+
+
+        var result = res.AsEnumerable();
+
+
+        if (searchModel.AccountId > 0)
+        {
+            result = result.Where(x =>
+                x.Sender.Id == searchModel.AccountId || x.Assigned.Contains(searchModel.AccountId));
+        }
+
+
+        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();
+
+        final = final.Select(x => new TaskViewModel()
+        {
+            AssignViewModels = _accountContext.Accounts.Include(x => x.Position)
+                .Where(a => x.Assigned.Contains(a.id) && accountId != a.id)
+                .Select(a => new AssignViewModel()
+                {
+                    AssignedName = a.Fullname,
+                    AssignedPositionValue = a.Position.PositionValue
+                }).ToList(),
+            Sender = x.Sender,
+            SelfAssigner = x.Sender.Id == accountId ? true : false,
+            Assigned = x.Assigned,
+            SelfAssigned = x.Assigned.Any(a => a == accountId) ? true : false,
+            CreateDate = x.CreateDate,
+            EndTaskDateFA = x.EndTaskDateFA,
+            IsDone = x.IsDone,
+            EndTaskDateGE = x.EndTaskDateGE,
+            Name = x.Name,
+            RequestCancel = x.RequestCancel,
+            RequestTime = x.RequestTime,
+            Id = x.Id,
+            CreateTaskDateGE = x.CreateTaskDateGE,
+            IsCancel = x.IsCancel,
+            AcceptedTimeRequest = x.AcceptedTimeRequest,
+            IsCancelRequest = x.IsCancelRequest,
+            ContractingPartyName = x.ContractingPartyName,
+            MediaCount = x.MediaCount,
+            SelfName = x.SelfName,
+            Description = x.Description,
+            IsDoneRequest = x.IsDoneRequest,
+            ScheduleType = x.ScheduleType,
+            ScheduleUnitType = x.ScheduleUnitType,
+            TaskScheduleId = x.TaskScheduleId
+
+
+		}).ToList();
+
+
+        final = final.Select(x => new TaskViewModel()
+        {
+
+            AssignList = x.AssignViewModels.GroupBy(a => a.AssignedPositionValue).Select(a => new AssignList()
+            {
+                AssignViewModels = a.ToList(),
+                PosValue = a.Key
+            }).ToList(),
+            Sender = x.Sender,
+            Assigned = x.Assigned,
+            CreateDate = x.CreateDate,
+            EndTaskDateFA = x.EndTaskDateFA,
+            IsDone = x.IsDone,
+            EndTaskDateGE = x.EndTaskDateGE,
+            Name = x.Name,
+            RequestCancel = x.RequestCancel,
+            RequestTime = x.RequestTime,
+            Id = x.Id,
+            CreateTaskDateGE = x.CreateTaskDateGE,
+            IsCancel = x.IsCancel,
+            AcceptedTimeRequest = x.AcceptedTimeRequest,
+            IsCancelRequest = x.IsCancelRequest,
+            ContractingPartyName = x.ContractingPartyName,
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
+            MediaCount = x.MediaCount,
+            HasAttachment = x.MediaCount > 0,
+            SelfName = x.SelfName,
+            SelfAssigned = x.SelfAssigned,
+            SelfAssigner = x.SelfAssigner,
+            Description = x.Description,
+            IsDoneRequest = x.IsDoneRequest,
+            AssignViewModels = x.AssignViewModels,
+            ScheduleType = x.ScheduleType,
+            ScheduleUnitType = x.ScheduleUnitType,
+            TaskScheduleId = x.TaskScheduleId
+
+		}).ToList();
+
+        final = final.Select(x => new TaskViewModel()
+        {
+
+            AssignList = !(x.SelfAssigned || x.SelfAssigner)
+                ? AddAssign(x.AssignList, x.Sender)
+                : x.AssignList,
+            Sender = !(x.SelfAssigned || x.SelfAssigner)
+                ? new AccountViewModel()
+                {
+                    PositionValue = 0,
+                    Fullname = "-"
+                }
+                : x.Sender,
+            Assigned = x.Assigned,
+            CreateDate = x.CreateDate,
+            EndTaskDateFA = x.EndTaskDateFA,
+            IsDone = x.IsDone,
+            EndTaskDateGE = x.EndTaskDateGE,
+            Name = x.Name,
+            RequestCancel = x.RequestCancel,
+            RequestTime = x.RequestTime,
+            Id = x.Id,
+            CreateTaskDateGE = x.CreateTaskDateGE,
+            IsCancel = x.IsCancel,
+            AcceptedTimeRequest = x.AcceptedTimeRequest,
+            IsCancelRequest = x.IsCancelRequest,
+            ContractingPartyName = x.ContractingPartyName,
+            Color = x.Color,
+            MediaCount = x.MediaCount,
+            HasAttachment = x.HasAttachment,
+            SelfName = !(x.SelfAssigned || x.SelfAssigner) ? "-" : x.SelfName,
+            EndTaskTime = $"{x.EndTaskDateGE.Hour}:{x.EndTaskDateGE.Minute}:{x.EndTaskDateGE.Second}" != "23:59:59"
+                ? $"{x.EndTaskDateGE.Hour}:{x.EndTaskDateGE.Minute}"
+                : "",
+            Description = x.Description,
+            IsDoneRequest = x.IsDoneRequest,
+            CanAssign = _positionRepository.GetLastPositionValue() != positionValue,
+            CanDelete = x.Sender.Id == accountId,
+            CanEdit = x.Sender.Id == accountId && !(_accountContext.Assigns.Any(a => a.TaskId == x.Id && (a.AcceptedTimeRequest > 0 || a.IsCanceledRequest
+                || a.IsDoneRequest || a.TimeRequest || a.IsCancel || a.IsDone))),
+            Assigner = x.Sender.Id == accountId ? emptyAcc.Fullname : x.Sender.Fullname,
+            AssignedReceiverViewModel = x.AssignViewModels.Any()
+                ? x.AssignViewModels.MinBy(a => a.AssignedPositionValue)
+                : new()
+                {
+                    AssignedName = "-",
+                    AssignedPositionValue = 0
+                },
+            ScheduleType = x.ScheduleType,
+            ScheduleUnitType = x.ScheduleUnitType,
+            TaskScheduleId = x.TaskScheduleId
+
+		}).ToList();
+        return final;
+    }
 
     public string SetTasksColors(DateTime date, bool isCancel)
     {
@@ -1888,23 +2200,23 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
 
     }
 
-    public int GetRequestedTasksCount()
+    public async Task<int> GetRequestedTasksCount()
     {
         var positionValue = int.Parse(_contextAccessor.HttpContext.User.FindFirst("PositionValue").Value);
         var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
         if (positionValue == 1)
         {
-            return _accountContext.Assigns.Include(x => x.Task).Where(x =>
+            return await _accountContext.Assigns.Include(x => x.Task).Where(x =>
                     !x.IsDone && x.Task.IsActiveString == "true" && !x.IsCancel &&
                     (x.IsCanceledRequest || x.TimeRequest || x.IsDoneRequest) && (accountId == x.Task.SenderId) && x.Task.TicketId == null).GroupBy(x => x.TaskId)
-                .Select(x => x.First()).Count();
+                .Select(x => x.First()).CountAsync();
         }
         else
         {
-            return _accountContext.Assigns.Include(x => x.Task).Where(x =>
+            return await _accountContext.Assigns.Include(x => x.Task).Where(x =>
                     !x.IsDone && x.Task.IsActiveString == "true" && !x.IsCancel &&
                     (x.IsCanceledRequest || x.TimeRequest || x.IsDoneRequest) && (accountId == x.Task.SenderId) && x.Task.TicketId == null).GroupBy(x => x.TaskId)
-                .Select(x => x.First()).Count();
+                .Select(x => x.First()).CountAsync();
         }
     }
 
@@ -2001,7 +2313,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
 
     }
 
-    public int RequestedAndOverdueTasksCount(long userId)
+    public async Task<int> RequestedAndOverdueTasksCount(long userId)
     {
         var account = _accountRepository.GetIncludePositions(userId);
         if (account.Position == null)
@@ -2009,7 +2321,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
 
         DateTime now = DateTime.Now;
 
-        var overdueTasksCount = OverdueTasksCount(userId);
+        var overdueTasksCount = await OverdueTasksCount(userId);
 
 
         //overdueTasksCount = _accountContext.Tasks.Include(x =>
@@ -2018,10 +2330,10 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         //	                      !x.Assigns.Any(a => a.TimeRequest)
         //	                      && x.Assigns.Any(a => a.AssignedId == userId) &&
         //	                      (x.Assigns.First(a => a.AssignedId == userId).EndTaskDate.Date <= DateTime.Now.Date));
-        var overdueRequestsCount = GetRequestedTasksCount();
+        var overdueRequestsCount = await GetRequestedTasksCount();
 
-        var ticketRequested = TasksHaveTicketRequestsCount(userId);
-        var overdueTicket = TasksHaveTicketCounts(userId);
+        var ticketRequested = await TasksHaveTicketRequestsCount(userId);
+        var overdueTicket = await TasksHaveTicketCounts(userId);
 
         return overdueTasksCount + overdueRequestsCount + ticketRequested + overdueTicket;
     }
@@ -2036,7 +2348,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         return overdueRequestsCount;
     }
 
-    public int OverdueTasksCount(long userId)
+    public async Task<int> OverdueTasksCount(long userId)
     {
         var account = _accountRepository.GetIncludePositions(userId);
 
@@ -2048,12 +2360,12 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         int overdueTasksCount;
         if (positionValue == 1)
         {
-            overdueTasksCount = _accountContext.Assigns.Include(x => x.Task).Where(x => x.AssignedId == userId &&
+            overdueTasksCount = await _accountContext.Assigns.Include(x => x.Task).Where(x => x.AssignedId == userId &&
                     x.AssignerId == userId && x.Task.Assigns.Count == 1 &&
                     !x.IsCancel && !x.IsCanceledRequest &&
                     !x.IsDone && !x.TimeRequest && !x.IsDoneRequest && x.EndTaskDate.Date <= DateTime.Now.Date &&
                     x.Task.IsActiveString == "true" && x.Task.TicketId == null)
-                .GroupBy(x => x.TaskId).Select(x => x.First()).Count();
+                .GroupBy(x => x.TaskId).Select(x => x.First()).CountAsync();
 
             //overdueTasksCount = _accountContext.Tasks.Include(x =>
             //	x.Assigns).Count(x => !x.Assigns.Any(a => a.IsCancel) && !x.Assigns.Any(a => a.IsCanceledRequest) &&
@@ -2065,43 +2377,49 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         }
         else
         {
-            overdueTasksCount = _accountContext.Assigns.Include(x => x.Task).Where(x => x.AssignedId == userId &&
+            overdueTasksCount = await _accountContext.Assigns.Include(x => x.Task).Where(x => x.AssignedId == userId &&
                     !x.IsCancel && !x.IsCanceledRequest &&
                     !x.IsDone && !x.TimeRequest && !x.IsDoneRequest && x.EndTaskDate.Date <= DateTime.Now.Date &&
                     x.Task.IsActiveString == "true" && x.Task.TicketId == null)
-                .GroupBy(x => x.TaskId).Select(x => x.First()).Count();
+                .GroupBy(x => x.TaskId).Select(x => x.First()).CountAsync();
             ;
         }
 
         return overdueTasksCount;
     }
 
-    public int TasksHaveTicketCounts(long userId)
+    public List<Tasks> GetTasksByTaskScheduleId(long taskScheduleId)
     {
-        return _accountContext.Assigns.Include(x => x.Task).Where(x =>
+        return _accountContext.Tasks.Include(x=>x.Assigns).Where(x => x.TaskScheduleId != null && x.TaskScheduleId == taskScheduleId).ToList();
+    }
+
+
+    public async Task<int> TasksHaveTicketCounts(long userId)
+    {
+        return await _accountContext.Assigns.Include(x => x.Task).Where(x =>
             !x.IsDone && x.Task.IsActiveString == "true" && !x.IsCancel &&
             !x.IsCanceledRequest && !x.IsDoneRequest &&
             !x.TimeRequest && (x.AssignerId == userId || x.AssignedId == userId) &&
-            (x.Task.TicketId != null && x.Task.TicketId > 0)).GroupBy(x => x.TaskId).Count();
+            (x.Task.TicketId != null && x.Task.TicketId > 0)).GroupBy(x => x.TaskId).CountAsync();
     }
 
-    public int TasksHaveTicketRequestsCount(long userId)
+    public async Task<int> TasksHaveTicketRequestsCount(long userId)
     {
         var positionValue = int.Parse(_contextAccessor.HttpContext.User.FindFirst("PositionValue").Value);
         var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
         if (positionValue == 1)
         {
-            return _accountContext.Assigns.Include(x => x.Task).Where(x =>
+            return await _accountContext.Assigns.Include(x => x.Task).Where(x =>
                     !x.IsDone && x.Task.IsActiveString == "true" && !x.IsCancel &&
                     (x.IsCanceledRequest || x.TimeRequest || x.IsDoneRequest) && (accountId == x.Task.SenderId) && x.Task.TicketId != null && x.Task.TicketId > 0).GroupBy(x => x.TaskId)
-                .Select(x => x.First()).Count();
+                .Select(x => x.First()).CountAsync();
         }
         else
         {
-            return _accountContext.Assigns.Include(x => x.Task).Where(x =>
+            return await _accountContext.Assigns.Include(x => x.Task).Where(x =>
                     !x.IsDone && x.Task.IsActiveString == "true" && !x.IsCancel &&
                     (x.IsCanceledRequest || x.TimeRequest || x.IsDoneRequest) && (accountId == x.Task.SenderId) && x.Task.TicketId != null && x.Task.TicketId > 0).GroupBy(x => x.TaskId)
-                .Select(x => x.First()).Count();
+                .Select(x => x.First()).CountAsync();
         }
     }
 

AccountMangement.Infrastructure.EFCore/Repository/TaskScheduleRepository.cs

@@ -0,0 +1,66 @@
+using System.Linq;
+using System.Threading.Tasks;
+using _0_Framework.Application;
+using _0_Framework.InfraStructure;
+using AccountManagement.Application.Contracts.Media;
+using AccountManagement.Application.Contracts.TaskSchedule;
+using AccountManagement.Domain.TaskScheduleAgg;
+using Microsoft.EntityFrameworkCore;
+
+namespace AccountMangement.Infrastructure.EFCore.Repository;
+
+public class TaskScheduleRepository: RepositoryBase<long, TaskSchedule>, ITaskScheduleRepository
+{
+    private readonly AccountContext _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);
+        if (taskSchedule == null)
+        {
+            return null;
+        }
+
+        var firstTaskDetails = taskSchedule.TasksList.First();
+
+        var firstTimeAssigns = firstTaskDetails.Assigns.Where(x=>x.FirstTimeCreation).ToList();
+
+        var assignedIds = firstTimeAssigns.Select(x => x.AssignedId).ToList();
+
+        var senderId = firstTaskDetails.SenderId;
+
+
+        var assignedAccounts = await _accountContext.Accounts.Where(x => assignedIds.Contains(x.id)).ToListAsync();
+
+        var sender =
+            await _accountContext.Accounts.FirstOrDefaultAsync(x => senderId == x.id);
+
+        var viewModel = new TaskScheduleDetailsViewModel()
+        {
+            Title = firstTaskDetails.Title,
+            Description = firstTaskDetails.Description,
+            ContractingPartyName = firstTaskDetails.ContractingPartyName,
+            AssignedName = assignedAccounts.Select(x=>x.Fullname).ToList(),
+            CreationDateFa = firstTaskDetails.CreationDate.ToFarsi(),
+            SenderName = sender.Fullname,
+            TaskScheduleType = taskSchedule.Type,
+            TaskScheduleUnitType = taskSchedule.UnitType,
+            UnitNumber = taskSchedule.UnitNumber,
+            Medias = firstTaskDetails.TaskMedias.Select(x=> new MediaViewModel()
+            {
+                Category = x.Media.Category,
+                Id = x.MediaId,
+                Type = x.Media.Type,
+                Path = x.Media.Path,
+            }).ToList(),
+        };
+        return viewModel;
+
+    }
+}

Company.Domain/CheckoutAgg/ICheckoutRepository.cs

@@ -10,6 +10,16 @@ namespace Company.Domain.CheckoutAgg;
 
 public interface ICheckoutRepository : IRepository<long, Checkout>
 {
+    /// <summary>
+    /// چک میکند که آیا پرسنل در سال و ماه درخواستی در این کارگاه فیش حقوقی دارد یا خیر
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <param name="employeId"></param>
+    /// <param name="سال به صورت رشته عددی"></param>
+    /// <param name="ماه بصورت رشته عددی"></param>
+    /// <returns></returns>
+    (bool hasChekout, double FamilyAlloance, double OverTimePay) HasCheckout(long workshopId, long employeId,
+        string year, string month);
     EditCheckout GetDetails(long id);
 
     void CreateCkeckout(Checkout command);

Company.Domain/ContactUsAgg/ContactUs.cs

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

Company.Domain/ContactUsAgg/IContactUsRepository.cs

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

Company.Domain/CustomizeCheckoutAgg/CustomizeCheckout.cs

@@ -1,11 +1,13 @@
-using _0_Framework.Application;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using _0_Framework.Application;
 using _0_Framework.Domain;
+using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
+using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
 using Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 using Company.Domain.EmployeeAgg;
 using Company.Domain.WorkshopAgg;
-using System;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Authentication.Cookies;
 
 
 namespace Company.Domain.CustomizeCheckoutAgg;
@@ -15,8 +17,7 @@ namespace Company.Domain.CustomizeCheckoutAgg;
 public class CustomizeCheckout : EntityBase
 {
     private CustomizeCheckout()
-    {
-    }
+    { }
     public CustomizeCheckout(DateTime contractStart, DateTime contractEnd, long employeeId, string employeeFName,
         string employeeLName, DateTime employeeDateOfBirth,
         string employeeNationalCode, string workshopFullName, long workshopId, long? contractId,
@@ -30,7 +31,9 @@ public class CustomizeCheckout : EntityBase
         double totalPayment, string contractNo, ICollection<CustomizeCheckoutFine> checkoutFines,
         ICollection<CustomizeCheckoutLoanInstallments> customizeCheckoutLoanInstallments,
         ICollection<CustomizeCheckoutSalaryAid> customizeCheckoutSalaryAids,
-        ICollection<CustomizeCheckoutReward> customizeCheckoutRewards, TimeSpan lateToWorkValue)
+        ICollection<CustomizeCheckoutReward> customizeCheckoutRewards, TimeSpan lateToWorkValue, double settingSalary,
+        double dailyWage, WorkshopShiftStatus shiftStatus, IrregularShift irregularShift,
+        ICollection<CustomizeRotatingShift> customizeRotatingShifts, ICollection<CustomizeCheckoutRegularShift> employeeSettingsShifts)
     {
         YearInt = Convert.ToInt32(contractStart.ToFarsi().Substring(0, 4));
         MonthInt = Convert.ToInt32(contractStart.ToFarsi().Substring(5, 2));
@@ -74,6 +77,12 @@ public class CustomizeCheckout : EntityBase
         WorkshopFullName = workshopFullName;
 
         LateToWorkValue = lateToWorkValue;
+        SettingSalary = settingSalary;
+        DailyWage = dailyWage;
+        ShiftStatus = shiftStatus;
+        IrregularShift = irregularShift;
+        CustomizeRotatingShifts = customizeRotatingShifts;
+        RegularShifts = employeeSettingsShifts;
     }
 
 
@@ -249,6 +258,18 @@ public class CustomizeCheckout : EntityBase
     /// </summary>
     public double TotalPayment { get; private set; }
 
+    /// <summary>
+    /// مزد روزانه
+    /// </summary>
+    public double DailyWage { get; private set; }
+
+    /// <summary>
+    /// حقوق تعیین شده
+    /// </summary>
+    public double SettingSalary { get; private set; }
+
+    public WorkshopShiftStatus ShiftStatus { get; set; }
+
 
     #region Values
 
@@ -266,6 +287,12 @@ public class CustomizeCheckout : EntityBase
     public ICollection<CustomizeCheckoutSalaryAid> CustomizeCheckoutSalaryAids { get; set; }
     public ICollection<CustomizeCheckoutReward> CustomizeCheckoutRewards { get; set; }
 
+    public IrregularShift IrregularShift { get; set; }
+    public ICollection<CustomizeRotatingShift> CustomizeRotatingShifts { get; set; }
+    public ICollection<CustomizeCheckoutRegularShift> RegularShifts { get; set; }
+
+
+
     #endregion
 
     #region Relations
@@ -275,4 +302,78 @@ public class CustomizeCheckout : EntityBase
 
     #endregion
 
+    public void SetValueObjects(ICollection<CustomizeCheckoutFine> checkoutFines,
+        ICollection<CustomizeCheckoutLoanInstallments> customizeCheckoutLoanInstallments,
+        ICollection<CustomizeCheckoutSalaryAid> customizeCheckoutSalaryAids,
+        ICollection<CustomizeCheckoutReward> customizeCheckoutRewards)
+    {
+        CheckoutFines = checkoutFines;
+        CustomizeCheckoutLoanInstallments = customizeCheckoutLoanInstallments;
+        CustomizeCheckoutSalaryAids = customizeCheckoutSalaryAids;
+        CustomizeCheckoutRewards = customizeCheckoutRewards;
+    }
+
+    public void SetRewards(ICollection<CustomizeCheckoutReward> rewards)
+    {
+        var previousTotalAmount = CustomizeCheckoutRewards.Sum(x => x.Amount.MoneyToDouble());
+        var newTotalAmount = rewards.Sum(x => x.Amount.MoneyToDouble());
+        RewardPay = newTotalAmount;
+        IncreaseTotalPayment(previousTotalAmount, newTotalAmount);
+        RecalculateTotalClaims(previousTotalAmount, newTotalAmount);
+        CustomizeCheckoutRewards = rewards;
+    }
+
+    public void SetSalaryAids(ICollection<CustomizeCheckoutSalaryAid> salaryAids)
+    {
+        var previousTotalAmount = CustomizeCheckoutSalaryAids.Sum(x => x.Amount.MoneyToDouble());
+        var newTotalAmount = salaryAids.Sum(x => x.Amount.MoneyToDouble());
+        SalaryAidDeduction = newTotalAmount;
+        ReduceTotalPayment(previousTotalAmount, newTotalAmount);
+        RecalculateTotalDeduction(previousTotalAmount, newTotalAmount);
+        CustomizeCheckoutSalaryAids = salaryAids;
+    }
+
+    public void SetFines(ICollection<CustomizeCheckoutFine> fines)
+    {
+        var previousTotalAmount = CheckoutFines.Sum(x => x.Amount.MoneyToDouble());
+        var newTotalAmount = fines.Sum(x => x.Amount.MoneyToDouble());
+        FineDeduction = newTotalAmount;
+        ReduceTotalPayment(previousTotalAmount, newTotalAmount);
+        RecalculateTotalDeduction(previousTotalAmount, newTotalAmount);
+        CheckoutFines = fines;
+    }
+
+    public void SetLoanInstallment(ICollection<CustomizeCheckoutLoanInstallments> installments)
+    {
+        var previousTotalAmount = CustomizeCheckoutLoanInstallments.Sum(x => x.AmountForMonth.MoneyToDouble());
+        var newTotalAmount = installments.Sum(x => x.AmountForMonth.MoneyToDouble());
+        InstallmentDeduction = newTotalAmount;
+        ReduceTotalPayment(previousTotalAmount, newTotalAmount);
+        RecalculateTotalDeduction(previousTotalAmount, newTotalAmount);
+        CustomizeCheckoutLoanInstallments = installments;
+    }
+
+
+    private void RecalculateTotalClaims(double previousTotalAmount, double newTotalAmount)
+    {
+        TotalClaims = (TotalClaims.MoneyToDouble() - previousTotalAmount + newTotalAmount).ToMoney();
+    }
+
+
+    private void RecalculateTotalDeduction(double previousTotalAmount, double newTotalAmount)
+    {
+        TotalDeductions = (TotalDeductions.MoneyToDouble() - previousTotalAmount + newTotalAmount).ToMoney();
+    }
+
+    private void ReduceTotalPayment(double previousAmount, double newAmount)
+    {
+        TotalPayment = TotalPayment + previousAmount - newAmount;
+    }
+    private void IncreaseTotalPayment(double previousAmount, double newAmount)
+    {
+        TotalPayment = TotalPayment - previousAmount + newAmount;
+    }
+
+
+
 }

Company.Domain/CustomizeCheckoutAgg/ICustomizeCheckoutRepository.cs

@@ -3,6 +3,7 @@ using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.CustomizeCheckout;
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Company.Domain.CustomizeCheckoutAgg
 {
@@ -14,5 +15,12 @@ namespace Company.Domain.CustomizeCheckoutAgg
         void RemoveEmployeeCustomizeCheckoutInDates(long workshopId, long employeeId, DateTime startOfMonth, DateTime endOfMonth);
         IEnumerable<CustomizeCheckout> GetRange(long workshopId, List<long> ids);
         void RemoveRange(IEnumerable<CustomizeCheckout> entities);
+        List<CustomizeCheckout> GetByWorkshopIdEmployeeIdInDates(long workshopId, long employeeId, DateTime startDate, DateTime endDate);
+
+        Task<CustomizeCheckout> GetByWorkshopIdEmployeeIdMonthYear(long workshopId, long employeeId, int year,
+            int month);
+
+        (bool Checkout, bool CustomizeCheckout, bool CustomizeCheckoutTemp) ValidateExistsCheckouts(
+            DateTime startDate, DateTime endDate, long workshopId, List<long> employeeId);
     }
 }

Company.Domain/CustomizeCheckoutAgg/ValueObjects/CustomizeCheckoutFine.cs

@@ -5,7 +5,7 @@ namespace Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 
 public record CustomizeCheckoutFine
 {
-    public CustomizeCheckoutFine(string title, string amount, string fineDateFa, DateTime fineDateGr, IsActive isActive, DateTime creationDate)
+    public CustomizeCheckoutFine(string title, string amount, string fineDateFa, DateTime fineDateGr, IsActive isActive, DateTime creationDate, long entityId)
     {
         Title = title;
         Amount = amount;
@@ -13,6 +13,7 @@ public record CustomizeCheckoutFine
         FineDateGr = fineDateGr;
         IsActive = isActive;
         CreationDate = creationDate;
+        EntityId = entityId;
     }
 
     public string Title { get; private set; }
@@ -21,4 +22,5 @@ public record CustomizeCheckoutFine
     public DateTime FineDateGr { get; private set; }
     public IsActive IsActive { get; private set; }
     public DateTime CreationDate { get; private set; }
+    public long EntityId { get; set; }
 }

Company.Domain/CustomizeCheckoutAgg/ValueObjects/CustomizeCheckoutLoanInstallments.cs

@@ -5,7 +5,7 @@ namespace Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 
 public class CustomizeCheckoutLoanInstallments
 {
-    public CustomizeCheckoutLoanInstallments(string amountForMonth, string month, string year, IsActive isActive, string loanRemaining, string loanAmount)
+    public CustomizeCheckoutLoanInstallments(string amountForMonth, string month, string year, IsActive isActive, string loanRemaining, string loanAmount, long entityId)
     {
         AmountForMonth = amountForMonth;
         Month = month;
@@ -13,12 +13,16 @@ public class CustomizeCheckoutLoanInstallments
         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 string LoanAmount { get; set; }
     public IsActive IsActive { get; private set; }
+    public string LoanAmount { get; set; }
+    public long EntityId { get; set; }
+
+
 }

Company.Domain/CustomizeCheckoutAgg/ValueObjects/CustomizeCheckoutRegularShift.cs

@@ -0,0 +1,12 @@
+using System;
+using _0_Framework.Domain.CustomizeCheckoutShared.Base;
+using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
+
+namespace Company.Domain.CustomizeCheckoutAgg.ValueObjects;
+
+public class CustomizeCheckoutRegularShift:CustomizeSifts
+{
+    public CustomizeCheckoutRegularShift(TimeOnly startTime, TimeOnly endTime, ShiftPlacement placement) : base(startTime, endTime, placement)
+    {
+    }
+}

Company.Domain/CustomizeCheckoutAgg/ValueObjects/CustomizeCheckoutReward.cs

@@ -5,7 +5,7 @@ namespace Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 
 public class CustomizeCheckoutReward
 {
-    public CustomizeCheckoutReward(string amount, string description, DateTime grantDate, string grantDateFa, IsActive isActive, string title)
+    public CustomizeCheckoutReward(string amount, string description, DateTime grantDate, string grantDateFa, IsActive isActive, string title, long entityId)
     {
         Amount = amount;
         Description = description;
@@ -13,6 +13,7 @@ public class CustomizeCheckoutReward
         GrantDateFa = grantDateFa;
         IsActive = isActive;
         Title = title;
+        EntityId = entityId;
     }
 
     /// <summary>
@@ -39,5 +40,7 @@ public class CustomizeCheckoutReward
 
 
     public IsActive IsActive { get; private set; }
+    public long EntityId { get; set; }
+
 
 }

Company.Domain/CustomizeCheckoutAgg/ValueObjects/CustomizeCheckoutSalaryAid.cs

@@ -4,14 +4,23 @@ namespace Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 
 public class CustomizeCheckoutSalaryAid
 {
-    public CustomizeCheckoutSalaryAid(string amount, DateTime salaryAidDateTime, string salaryAidDateTimeFa)
+    public CustomizeCheckoutSalaryAid(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; }
+
 }

Company.Domain/CustomizeCheckoutTempAgg/CustomizeCheckoutTemp.cs

@@ -6,6 +6,9 @@ using Company.Domain.WorkshopAgg;
 using System;
 using System.Collections.Generic;
 using Company.Domain.CustomizeCheckoutTempAgg.ValueObjects;
+using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
+using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
+using System.Linq;
 
 
 namespace Company.Domain.CustomizeCheckoutTempAgg;
@@ -18,15 +21,23 @@ public class CustomizeCheckoutTemp : EntityBase
     {
         LateToWorkValue = lateToWorkValue;
     }
-	public CustomizeCheckoutTemp(DateTime contractStart, DateTime contractEnd, long employeeId, string employeeFName, string employeeLName, DateTime employeeDateOfBirth,
+	public CustomizeCheckoutTemp(DateTime contractStart, DateTime contractEnd, long employeeId, string employeeFName,
+		string employeeLName, DateTime employeeDateOfBirth,
 		string employeeNationalCode, string workshopFullName, long workshopId, long? contractId,
-		double monthlySalary, double fridayPay, double overTimePay, double baseYearsPay, double bonusesPay, double nightWorkPay,
-		double marriedAllowance, double shiftPay, double familyAllowance, double leavePay, double insuranceDeduction, double fineAbsenceDeduction,
-		double lateToWorkDeduction, double earlyExitDeduction, double rewardPay, double salaryAidDeduction, double installmentDeduction,
-		double fineDeduction, double taxDeduction, string sumOfWorkingDays, string totalClaims, string totalDeductions, double totalPayment, string contractNo, 
-        ICollection<CustomizeCheckoutTempFine> checkoutFines, ICollection<CustomizeCheckoutTempLoanInstallments> customizeCheckoutLoanInstallments, 
-        ICollection<CustomizeCheckoutTempSalaryAid> customizeCheckoutSalaryAids, ICollection<CustomizeCheckoutTempReward> customizeCheckoutRewards,
-        TimeSpan lateToWorkValue)
+		double monthlySalary, double fridayPay, double overTimePay, double baseYearsPay, double bonusesPay,
+		double nightWorkPay,
+		double marriedAllowance, double shiftPay, double familyAllowance, double leavePay, double insuranceDeduction,
+		double fineAbsenceDeduction,
+		double lateToWorkDeduction, double earlyExitDeduction, double rewardPay, double salaryAidDeduction,
+		double installmentDeduction,
+		double fineDeduction, double taxDeduction, string sumOfWorkingDays, string totalClaims, string totalDeductions,
+		double totalPayment, string contractNo,
+		ICollection<CustomizeCheckoutTempFine> checkoutFines,
+		ICollection<CustomizeCheckoutTempLoanInstallments> customizeCheckoutLoanInstallments,
+		ICollection<CustomizeCheckoutTempSalaryAid> customizeCheckoutSalaryAids,
+		ICollection<CustomizeCheckoutTempReward> customizeCheckoutRewards,
+		TimeSpan lateToWorkValue, double settingSalary, double dailyWage, WorkshopShiftStatus shiftStatus, IrregularShift irregularShift,
+        ICollection<CustomizeRotatingShift> customizeRotatingShifts, ICollection<CustomizeCheckoutRegularShift> employeeSettingsShifts)
 	{
 		YearInt = Convert.ToInt32(contractStart.ToFarsi().Substring(0, 4));
 		MonthInt = Convert.ToInt32(contractStart.ToFarsi().Substring(5, 2));
@@ -70,7 +81,13 @@ public class CustomizeCheckoutTemp : EntityBase
 		WorkshopFullName = workshopFullName;
 
         LateToWorkValue = lateToWorkValue;
-	}
+        SettingSalary = settingSalary;
+        DailyWage = dailyWage;
+        ShiftStatus = shiftStatus;
+        IrregularShift = irregularShift;
+        CustomizeRotatingShifts = customizeRotatingShifts;
+        RegularShifts = employeeSettingsShifts;
+    }
 
 	#region Getters
 	/// <summary>
@@ -103,6 +120,10 @@ public class CustomizeCheckoutTemp : EntityBase
     public ICollection<CustomizeCheckoutTempSalaryAid> CustomizeCheckoutSalaryAids { get; set; }
     public ICollection<CustomizeCheckoutTempReward> CustomizeCheckoutRewards { get; set; }
 
+    public IrregularShift IrregularShift { get; set; }
+    public ICollection<CustomizeRotatingShift> CustomizeRotatingShifts { get; set; }
+    public ICollection<CustomizeCheckoutRegularShift> RegularShifts { get; set; }
+
 
     #endregion
 
@@ -254,10 +275,22 @@ public class CustomizeCheckoutTemp : EntityBase
 	/// </summary>
 	public double TotalPayment { get; private set; }
 
+	/// <summary>
+	/// مزد روزانه
+	/// </summary>
+	public double DailyWage { get; private set; }
 
-    #region Values
+	/// <summary>
+	/// حقوق تعیین شده
+	/// </summary>
+	public double SettingSalary { get; private set; }
+	public WorkshopShiftStatus ShiftStatus { get; set; }
 
-    public TimeSpan LateToWorkValue { get; private set; }
+
+
+	#region Values
+
+	public TimeSpan LateToWorkValue { get; private set; }
 
 
     #endregion
@@ -271,6 +304,77 @@ public class CustomizeCheckoutTemp : EntityBase
     public Workshop Workshop { get; set; }
 	public Employee Employee { get; set; }
 
-	#endregion
+    #endregion
 
+    public void SetValueObjects(ICollection<CustomizeCheckoutTempFine> checkoutFines,
+        ICollection<CustomizeCheckoutTempLoanInstallments> customizeCheckoutLoanInstallments,
+        ICollection<CustomizeCheckoutTempSalaryAid> customizeCheckoutSalaryAids,
+        ICollection<CustomizeCheckoutTempReward> customizeCheckoutRewards)
+    {
+        CheckoutFines = checkoutFines;
+        CustomizeCheckoutLoanInstallments = customizeCheckoutLoanInstallments;
+        CustomizeCheckoutSalaryAids = customizeCheckoutSalaryAids;
+        CustomizeCheckoutRewards = customizeCheckoutRewards;
+    }
+
+    public void SetRewards(ICollection<CustomizeCheckoutTempReward> rewards)
+    {
+        var previousTotalAmount = CustomizeCheckoutRewards.Sum(x => x.Amount.MoneyToDouble());
+        var newTotalAmount = rewards.Sum(x => x.Amount.MoneyToDouble());
+        RewardPay = newTotalAmount;
+        IncreaseTotalPayment(previousTotalAmount,newTotalAmount);
+       RecalculateTotalClaims(previousTotalAmount, newTotalAmount);
+        CustomizeCheckoutRewards = rewards;
+    }
+
+    public void SetSalaryAids(ICollection<CustomizeCheckoutTempSalaryAid> salaryAids)
+    {
+        var previousTotalAmount = CustomizeCheckoutSalaryAids.Sum(x => x.Amount.MoneyToDouble());
+        var newTotalAmount = salaryAids.Sum(x => x.Amount.MoneyToDouble());
+        SalaryAidDeduction = newTotalAmount;
+        ReduceTotalPayment(previousTotalAmount,newTotalAmount);
+        RecalculateTotalDeduction(previousTotalAmount, newTotalAmount);
+        CustomizeCheckoutSalaryAids = salaryAids;
+    }
+
+    public void SetFines(ICollection<CustomizeCheckoutTempFine> fines)
+    {
+        var previousTotalAmount = CheckoutFines.Sum(x => x.Amount.MoneyToDouble());
+        var newTotalAmount = fines.Sum(x => x.Amount.MoneyToDouble());
+        FineDeduction = newTotalAmount;
+        ReduceTotalPayment(previousTotalAmount,newTotalAmount);
+        RecalculateTotalDeduction(previousTotalAmount, newTotalAmount);
+        CheckoutFines = fines;
+    }
+
+    public void SetLoanInstallment(ICollection<CustomizeCheckoutTempLoanInstallments> installments)
+    {
+        var previousTotalAmount = CustomizeCheckoutLoanInstallments.Sum(x => x.AmountForMonth.MoneyToDouble());
+        var newTotalAmount = installments.Sum(x => x.AmountForMonth.MoneyToDouble());
+        InstallmentDeduction = newTotalAmount;
+        ReduceTotalPayment(previousTotalAmount,newTotalAmount);
+        RecalculateTotalDeduction(previousTotalAmount, newTotalAmount);
+        CustomizeCheckoutLoanInstallments = installments;
+    }
+
+
+    private void RecalculateTotalClaims(double previousTotalAmount, double newTotalAmount)
+    {
+        TotalClaims = (TotalClaims.MoneyToDouble() - previousTotalAmount + newTotalAmount).ToMoney();
+    }
+
+
+    private void RecalculateTotalDeduction(double previousTotalAmount, double newTotalAmount)
+    {
+        TotalDeductions = (TotalDeductions.MoneyToDouble() - previousTotalAmount + newTotalAmount).ToMoney();
+    }
+
+    private void ReduceTotalPayment(double previousAmount, double newAmount)
+    {
+        TotalPayment = TotalPayment + previousAmount - newAmount;
+    }
+	private void IncreaseTotalPayment(double previousAmount, double newAmount)
+    {
+        TotalPayment = TotalPayment - previousAmount + newAmount;
+    }
 }

Company.Domain/CustomizeCheckoutTempAgg/ICustomizeCheckoutTempRepository.cs

@@ -4,6 +4,7 @@ using Company.Domain.CustomizeCheckoutAgg;
 using CompanyManagment.App.Contracts.CustomizeCheckout;
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Company.Domain.CustomizeCheckoutTempAgg
 {
@@ -19,5 +20,7 @@ namespace Company.Domain.CustomizeCheckoutTempAgg
 
         IEnumerable<CustomizeCheckoutTemp> GetRange(long workshopId, List<long> ids);
         void RemoveRange(IEnumerable<CustomizeCheckoutTemp> entities);
+        List<CustomizeCheckoutTemp> GetByWorkshopIdEmployeeIdInDates(long workshopId, long employeeId, DateTime startDate, DateTime endDate);
+        Task<CustomizeCheckoutTemp> GetByWorkshopIdEmployeeIdInDate(long workshopId, long employeeId, DateTime inDate);
     }
 }

Company.Domain/CustomizeCheckoutTempAgg/ValueObjects/CustomizeCheckoutSalaryAid.cs

@@ -4,14 +4,23 @@ namespace Company.Domain.CustomizeCheckoutTempAgg.ValueObjects;
 
 public class CustomizeCheckoutTempSalaryAid
 {
-    public CustomizeCheckoutTempSalaryAid(string amount, DateTime salaryAidDateTime, string salaryAidDateTimeFa)
+    public CustomizeCheckoutTempSalaryAid(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; }
+
 }

Company.Domain/CustomizeCheckoutTempAgg/ValueObjects/CustomizeCheckoutTempFine.cs

@@ -6,7 +6,7 @@ namespace Company.Domain.CustomizeCheckoutTempAgg.ValueObjects;
 
 public record CustomizeCheckoutTempFine
 {
-    public CustomizeCheckoutTempFine(string title, string amount, string fineDateFa, DateTime fineDateGr, IsActive isActive, DateTime creationDate)
+    public CustomizeCheckoutTempFine(string title, string amount, string fineDateFa, DateTime fineDateGr, IsActive isActive, DateTime creationDate, long entityId)
     {
         Title = title;
         Amount = amount;
@@ -14,7 +14,7 @@ public record CustomizeCheckoutTempFine
         FineDateGr = fineDateGr;
         IsActive = isActive;
         CreationDate = creationDate;
-
+        EntityId = entityId;
     }
     public string Title { get; private set; }
     public string Amount { get; private set; }
@@ -22,4 +22,6 @@ public record CustomizeCheckoutTempFine
     public DateTime FineDateGr { get; private set; }
     public IsActive IsActive { get; private set; }
     public DateTime CreationDate { get; private set; }
+    public long EntityId { get; set; }
+
 }

Company.Domain/CustomizeCheckoutTempAgg/ValueObjects/CustomizeCheckoutTempLoanInstallments.cs

@@ -4,7 +4,7 @@ namespace Company.Domain.CustomizeCheckoutTempAgg.ValueObjects;
 
 public class CustomizeCheckoutTempLoanInstallments
 {
-    public CustomizeCheckoutTempLoanInstallments(string amountForMonth, string month, string year, IsActive isActive, string loanRemaining, string loanAmount)
+    public CustomizeCheckoutTempLoanInstallments(string amountForMonth, string month, string year, IsActive isActive, string loanRemaining, string loanAmount, long entityId)
     {
         AmountForMonth = amountForMonth;
         Month = month;
@@ -12,6 +12,7 @@ public class CustomizeCheckoutTempLoanInstallments
         IsActive = isActive;
         LoanRemaining = loanRemaining;
         LoanAmount = loanAmount;
+        EntityId = entityId;
     }
 
     public string AmountForMonth { get; private set; }
@@ -20,5 +21,7 @@ public class CustomizeCheckoutTempLoanInstallments
     public IsActive IsActive { get; private set; }
     public string LoanRemaining { get; set; }
     public string LoanAmount { get; set; }
+    public long EntityId { get; set; }
+
 
 }

Company.Domain/CustomizeCheckoutTempAgg/ValueObjects/CustomizeCheckoutTempReward.cs

@@ -5,7 +5,7 @@ namespace Company.Domain.CustomizeCheckoutTempAgg.ValueObjects;
 
 public class CustomizeCheckoutTempReward
 {
-    public CustomizeCheckoutTempReward(string amount, string description, DateTime grantDate, string grantDateFa, IsActive isActive, string title)
+    public CustomizeCheckoutTempReward(string amount, string description, DateTime grantDate, string grantDateFa, IsActive isActive, string title, long entityId)
     {
         Amount = amount;
         Description = description;
@@ -13,6 +13,7 @@ public class CustomizeCheckoutTempReward
         GrantDateFa = grantDateFa;
         IsActive = isActive;
         Title = title;
+        EntityId = entityId;
     }
 
     /// <summary>
@@ -37,4 +38,6 @@ public class CustomizeCheckoutTempReward
 
     public IsActive IsActive { get; private set; }
     public string Title { get; set; }
+    public long EntityId { get; set; }
+
 }

Company.Domain/CustomizeWorkshopEmployeeSettingsAgg/ICustomizeWorkshopEmployeeSettingsRepository.cs

@@ -15,4 +15,5 @@ public interface ICustomizeWorkshopEmployeeSettingsRepository : IRepository<long
     List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingNotInMainGroup(long entityWorkshopId);
     void RemoveByWorkshopIdAndEmployeeId(long workshopId, long employeeId);
 
+    bool CheckEmployeeShiftHasChanged(EditCustomizeEmployeeSettings command);
 }

Company.Domain/EmployeeAgg/Employee.cs

@@ -20,14 +20,14 @@ public class Employee : EntityBase
 {
     public Employee(string fName, string lName, string fatherName,
         DateTime dateOfBirth, DateTime dateOfIssue, string placeOfIssue,
-        string nationalCode, string idNumber, string gender, string nationality,
+        string nationalCode, string idNumber, string gender, string nationality, string idNumberSerial , string idNumberSeri ,
         string phone = null, string address = null, string state = null, string city = null,
         string maritalStatus = null, string militaryService = null, string levelOfEducation = null, string fieldOfStudy = null,
         string bankCardNumber = null, string bankBranch = null, string insuranceCode = null, string insuranceHistoryByYear = null,
         string insuranceHistoryByMonth = null, string numberOfChildren = null, string officePhone = null,
         string mclsUserName = null, string mclsPassword = null,
         string eserviceUserName = null, string eservicePassword = null,
-        string taxOfficeUserName = null, string taxOfficepassword = null, string sanaUserName = null, string sanaPassword = null)
+        string taxOfficeUserName = null, string taxOfficepassword = null, string sanaUserName = null, string sanaPassword = null )
     {
         FName = fName;
         LName = lName;
@@ -146,6 +146,15 @@ public class Employee : EntityBase
     /// آیا پرسنل احراز هویت شده است
     /// </summary>
     public bool IsAuthorized { get; set; }
+    /// <summary>
+    /// سریال شناسنامه
+    /// </summary>
+    public string IdNumberSerial { get; set; }
+
+    /// <summary>
+    /// سری شناسنامه
+    /// </summary>
+    public string IdNumberSeri { get; set; }
 
     #endregion
 
@@ -234,5 +243,39 @@ public class Employee : EntityBase
         IsAuthorized = true;
     }
 
+    public void EditAuthorizeEmployee(DateTime dateOfIssue, string placeOfIssue,
+        string phone, string address, string state, string citi,
+        string maritalStatus, string militaryService, string levelOfEducation, string fieldOfStudy,
+        string bankCardNumber, string bankBranch, string insuranceCode, string insuranceHistoryByYear,
+        string insuranceHistoryByMonth, string numberOfChildren, string officePhone,
+        string mclsUserName, string mclsPassword, string eserviceUserName, string eservicePassword, string taxOfficeUserName, string taxOfficepassword, string sanaUserName, string sanaPassword)
+    {
+        DateOfIssue = dateOfIssue;
+        PlaceOfIssue = placeOfIssue;
+        Phone = phone;
+        Address = address;
+        State = state;
+        City = citi;
+        MaritalStatus = maritalStatus;
+        MilitaryService = militaryService;
+        LevelOfEducation = levelOfEducation;
+        FieldOfStudy = fieldOfStudy;
+        BankCardNumber = bankCardNumber;
+        BankBranch = bankBranch;
+        InsuranceCode = insuranceCode;
+        InsuranceHistoryByYear = insuranceHistoryByYear;
+        InsuranceHistoryByMonth = insuranceHistoryByMonth;
+        NumberOfChildren = numberOfChildren;
+        OfficePhone = OfficePhone;
+        MclsUserName = mclsUserName;
+        MclsPassword = mclsPassword;
+        EserviceUserName = eserviceUserName;
+        EservicePassword = eservicePassword;
+        TaxOfficeUserName = taxOfficeUserName;
+        TaxOfficepassword = taxOfficepassword;
+        SanaUserName = sanaUserName;
+        SanaPassword = sanaPassword;
+    }
+
     #endregion
 }

Company.Domain/EmployeeAgg/IEmployeeRepository.cs

@@ -54,6 +54,7 @@ public interface IEmployeeRepository : IRepository<long, Employee>
 
     Employee GetIgnoreQueryFilter(long id);
 
+    Task<List<EmployeeSelectListViewModel>> WorkedEmployeesInWorkshopSelectList(long workshopId);
 
 
     #endregion

Company.Domain/EmployeeAuthorizeTempAgg/EmployeeAuthorizeTemp.cs

@@ -0,0 +1,44 @@
+using System;
+using _0_Framework.Application;
+using _0_Framework.Domain;
+
+namespace Company.Domain.EmployeeAuthorizeTempAgg;
+
+public class EmployeeAuthorizeTemp:EntityBase
+{
+    public EmployeeAuthorizeTemp(Gender gender, string fName, string lName, string fatherName, DateTime birthDate, string nationalCode, string idNumber, string idNumberSerial, string idNumberSeri)
+    {
+        Gender = gender;
+        FName = fName;
+        LName = lName;
+        FatherName = fatherName;
+        BirthDate = birthDate;
+        NationalCode = nationalCode;
+        IdNumber = idNumber;
+        IdNumberSerial = idNumberSerial;
+        IdNumberSeri = idNumberSeri;
+    }
+
+    public Gender Gender { get; private set; }
+    public string FName { get; private set; }
+    public string LName { get; private set; }
+    public string FatherName { get; private set; }
+    public DateTime BirthDate { get; private set; }
+    /// <summary>
+    /// کدملی
+    /// </summary>
+    public string NationalCode { get; set; }
+    /// <summary>
+    /// شماره شناسنامه
+    /// </summary>
+    public string IdNumber { get; set; }
+    /// <summary>
+    /// سریال شناسنامه
+    /// </summary>
+    public string IdNumberSerial { get; set; }
+    /// <summary>
+    /// سری شناسنامه
+    /// </summary>
+    public string IdNumberSeri { get; set; }
+
+}

Company.Domain/EmployeeAuthorizeTempAgg/IEmployeeAuthorizeTempRepository.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Threading.Tasks;
+using _0_Framework.Domain;
+
+namespace Company.Domain.EmployeeAuthorizeTempAgg;
+
+public interface IEmployeeAuthorizeTempRepository:IRepository<long,EmployeeAuthorizeTemp>
+{
+    Task<EmployeeAuthorizeTemp> GetByNationalCode(string nationalCode);
+}

Company.Domain/EmployeeClientTempAgg/IEmployeeClientTempRepository.cs

@@ -1,4 +1,6 @@
-using _0_Framework.Domain;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.EmployeeClientTemp;
 
 namespace Company.Domain.EmployeeClientTempAgg;
@@ -8,4 +10,5 @@ public interface IEmployeeClientTempRepository : IRepository<long, EmployeeClien
     EmployeeClientTemp GetByEmployeeIdAndWorkshopId(long employeeId, long commandWorkshopId);
     EmployeeClientTempGetDetailsViewModel GetDetails(long employeeId, long workshopId);
     void Remove(EmployeeClientTemp entity);
+    Task<List<EmployeeClientTempViewModel>> GetByEmployeeId(long employeeId);
 }

Company.Domain/EmployeeComputeOptionsAgg/IEmployeeComputeOptionsRepository.cs

@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.EmployeeComputeOptions;
+using CompanyManagment.App.Contracts.Workshop;
 
 namespace Company.Domain.EmployeeComputeOptionsAgg
 {
@@ -14,5 +15,7 @@ namespace Company.Domain.EmployeeComputeOptionsAgg
         EmployeeComputeOptionsViewModel GetEmployeeOptions(long workshopId, long employeeId);
 
         List<EmployeeComputeOptionsViewModel> GetAllByWorkshopId(long workshopId);
+
+        List<WorkshopViewModel> TestBonusesBugWorkshops();
     }
 }

Company.Domain/EmployeeDocumentItemAgg/EmployeeDocumentItem.cs

@@ -7,100 +7,105 @@ using System.Collections.Generic;
 using _0_Framework.Application;
 using Microsoft.AspNetCore.JsonPatch.Operations;
 
-namespace Company.Domain.EmployeeDocumentItemAgg
+namespace Company.Domain.EmployeeDocumentItemAgg;
+
+public class EmployeeDocumentItem : EntityBase
 {
-    public class EmployeeDocumentItem : EntityBase
+    private EmployeeDocumentItem() { }
+    public long WorkshopId { get; private set; }
+    public long EmployeeId { get; private set; }
+
+    public long UploaderId { get; private set; }
+    public UserType UploaderType { get; private set; }
+    public long UploaderRoleId { get; set; }
+
+
+    public long ReviewedById { get; private set; }
+    public string RejectionReason { get; private set; }
+    public DocumentStatus DocumentStatus { get; private set; }
+    public long MediaId { get; private set; }
+
+    public DateTime? ConfirmationDateTime { get; private set; }
+    public DocumentItemLabel DocumentLabel { get; private set; }
+
+    public long EmployeeDocumentId { get; private set; }
+    public virtual EmployeeDocuments EmployeeDocuments { get; private set; }
+
+    public long? EmployeeDocumentsAdminViewId { get; private set; }
+    public EmployeeDocumentsAdminSelection EmployeeDocumentsAdminSelection { get; private set; }
+
+    public List<EmployeeDocumentItemLog> ItemLogs { get; private set; }
+
+
+    public EmployeeDocumentItem(long workshopId, long employeeId, long mediaId, long employeeDocumentId, DocumentItemLabel documentLabel, long uploaderId,
+        UserType uploaderType, long roleId, DocumentStatus documentStatus = DocumentStatus.Unsubmitted)
     {
-
-	    public long WorkshopId { get; private set; }
-	    public long EmployeeId { get; private set; }
-
-        public long UploaderId { get; private set; }
-        public UserType UploaderType { get; private set; }
-
-
-        public long ReviewedById { get; private set; }
-        public string RejectionReason { get; private set; }
-        public DocumentStatus DocumentStatus { get; private set; }
-        public long MediaId { get; private set; }
-
-        public DateTime? ConfirmationDateTime { get; private set; }
-        public DocumentItemLabel DocumentLabel { get; private set; }
-
-        public long EmployeeDocumentId { get; private set; }
-        public virtual EmployeeDocuments EmployeeDocuments { get; private set; }
-
-        public long? EmployeeDocumentsAdminViewId { get; private set; }
-        public EmployeeDocumentsAdminSelection EmployeeDocumentsAdminSelection { get; private set; }
-
-        public List<EmployeeDocumentItemLog> ItemLogs { get; private set; }
-
-
-        public EmployeeDocumentItem(long workshopId,long employeeId, long mediaId, long employeeDocumentId, DocumentItemLabel documentLabel, long uploaderId,
-	        UserType uploaderType, DocumentStatus documentStatus = DocumentStatus.Unsubmitted)
-        {
-            MediaId = mediaId;
-            UploaderId = uploaderId;
-            UploaderType = uploaderType;
-            EmployeeId = employeeId;
-            WorkshopId = workshopId;
-            DocumentStatus = documentStatus;
-            if (documentStatus == DocumentStatus.Confirmed)
-                ConfirmationDateTime = DateTime.Now;
-            DocumentLabel = documentLabel;
-            EmployeeDocumentId = employeeDocumentId;
-            ItemLogs =
-            [
-	            new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.CreatedNewItem, uploaderId, uploaderType)
-            ];
-        }
-
-
-        public void Confirm(long operatorId, UserType userType)
-        {
-            ReviewedById = operatorId;
-            DocumentStatus = DocumentStatus.Confirmed;
+        MediaId = mediaId;
+        UploaderId = uploaderId;
+        UploaderType = uploaderType;
+        UploaderRoleId = uploaderType == UserType.Admin ? roleId : -1;
+        EmployeeId = employeeId;
+        WorkshopId = workshopId;
+        DocumentStatus = documentStatus;
+        if (documentStatus == DocumentStatus.Confirmed)
             ConfirmationDateTime = DateTime.Now;
-            ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.ConfirmedItem, operatorId, userType));
-        }
-
-        public void Reject(long operatorId, string rejectionReason, UserType userType)
-        {
-            RejectionReason = rejectionReason;
-            DocumentStatus = DocumentStatus.Rejected;
-            EmployeeDocuments.UpdateHasRejectedItems();
-            ReviewedById = operatorId;
-            ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.RejectedItem, operatorId, userType, rejectionReason));
-        }
-
-        public void Delete(long operatorId, UserType operatorType)
-        {
-            DocumentStatus = DocumentStatus.Deleted;
-            ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.DeletedItem, operatorId, operatorType));
-        }
-
-        public void AdminSelect(long adminViewId)
-        {
-            EmployeeDocumentsAdminViewId = adminViewId;
-        }
-
-        public void AdminDeselect()
-        {
-            EmployeeDocumentsAdminViewId = 0;
-        }
-        public void SubmitByClient(long operatorId,UserType operatorType)
-        {
-            DocumentStatus = DocumentStatus.SubmittedByClient;
-            ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.SubmittedItems, operatorId, operatorType));
-            EmployeeDocuments.UpdateHasRejectedItems();
-        }
-
-        public void SubmitByAdmin(long operatorId, UserType operatorType)
-        {
-            DocumentStatus = DocumentStatus.SubmittedByAdmin;
-            ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.SubmittedItems, operatorId, operatorType));
-            EmployeeDocuments.UpdateHasRejectedItems();
-        }
+        DocumentLabel = documentLabel;
+        EmployeeDocumentId = employeeDocumentId;
+        ItemLogs =
+        [
+            new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.CreatedNewItem, uploaderId, uploaderType)
+        ];
     }
 
+
+    public void Confirm(long operatorId, UserType userType)
+    {
+        ReviewedById = operatorId;
+        DocumentStatus = DocumentStatus.Confirmed;
+        ConfirmationDateTime = DateTime.Now;
+        ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.ConfirmedItem, operatorId, userType));
+    }
+
+    public void Reject(long operatorId, string rejectionReason, UserType userType)
+    {
+        RejectionReason = rejectionReason;
+        DocumentStatus = DocumentStatus.Rejected;
+        EmployeeDocuments.UpdateHasRejectedItems();
+        ReviewedById = operatorId;
+        ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.RejectedItem, operatorId, userType, rejectionReason));
+    }
+
+    public void Delete(long operatorId, UserType operatorType)
+    {
+        DocumentStatus = DocumentStatus.Deleted;
+        ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.DeletedItem, operatorId, operatorType));
+    }
+
+    public void AdminSelect(long adminViewId)
+    {
+        EmployeeDocumentsAdminViewId = adminViewId;
+    }
+
+    public void AdminDeselect()
+    {
+        EmployeeDocumentsAdminViewId = 0;
+    }
+    public void SubmitByClient(long operatorId, UserType operatorType)
+    {
+        DocumentStatus = DocumentStatus.SubmittedByClient;
+        ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.SubmittedItems, operatorId, operatorType));
+        EmployeeDocuments.UpdateHasRejectedItems();
+    }
+
+    public void SubmitByAdmin(long operatorId, UserType operatorType)
+    {
+        DocumentStatus = DocumentStatus.SubmittedByAdmin;
+        ItemLogs.Add(new EmployeeDocumentItemLog(EmployeeDocumentItemOperation.SubmittedItems, operatorId, operatorType));
+        EmployeeDocuments.UpdateHasRejectedItems();
+    }
+
+    public void SetRoleId(long roleId)
+    {
+        UploaderRoleId = roleId;
+    }
 }

Company.Domain/EmployeeDocumentsAgg/EmployeeDocumentRequiredItems.cs

@@ -9,12 +9,12 @@ namespace Company.Domain.EmployeeDocumentsAgg
         {
             List<DocumentItemLabel> requiredDocuments =
             [
-                DocumentItemLabel.IdCardPage1, DocumentItemLabel.IdCardPage2, DocumentItemLabel.IdCardPage3, DocumentItemLabel.NationalCardRear,
-                DocumentItemLabel.NationalCardFront,DocumentItemLabel.EmployeePicture
+                DocumentItemLabel.IdCardPage1,/* DocumentItemLabel.IdCardPage2, DocumentItemLabel.IdCardPage3, DocumentItemLabel.NationalCardRear,*/
+                DocumentItemLabel.NationalCardFront,/*DocumentItemLabel.EmployeePicture*/
             ];
 
-            if (gender == "مرد")
-                requiredDocuments.Add(DocumentItemLabel.MilitaryServiceCard);
+            //if (gender == "مرد")
+            //    requiredDocuments.Add(DocumentItemLabel.MilitaryServiceCard);
 
             return requiredDocuments;
         }

Company.Domain/EmployeeDocumentsAgg/IEmployeeDocumentsRepository.cs

@@ -30,5 +30,76 @@ namespace Company.Domain.EmployeeDocumentsAgg
         Task<int> GetAdminWorkFlowCountForNewEmployees(List<long> workshopIds);
         Task<int> GetAdminWorkFlowCountForSubmittedAndRejectedDocuments(List<long> workshopIds);
         List<EmployeeDocumentsViewModel> GetDocumentsAwaitingReviewByWorkshopIdForCheckerWorkFlow(long workshopId);
+
+        #region Mahan
+        /// <summary>
+        /// کارگاهی که افزودن پرسنل کرده اند. بر اساس نقش فیلتر میشوند
+        /// </summary>
+        /// <param name="workshops"></param>
+        /// <param name="roleId"></param>
+        /// <returns></returns>
+        Task<ICollection<WorkshopWithEmployeeDocumentsViewModel>> GetWorkshopDocumentCreatedEmployeeForAdmin(
+            List<long> workshops, long roleId);
+
+        /// <summary>
+        ///کارگاه های مدارک های برگشت خورده براساس دسترسی افراد و نقششان. یک مدرک برگشت خورده به تمامی کسانی که به آن کارگاه دسترسی دارند و تمامی کسانی که هم نقش آپلود کننده بوده اند نمایش داده میشود
+        /// </summary>
+        /// <param name="workshops"></param>
+        /// <param name="roleId"></param>
+        /// <returns></returns>
+        Task<ICollection<WorkshopWithEmployeeDocumentsViewModel>> GetWorkshopDocumentRejectedForAdmin(
+            List<long> workshops, long roleId);
+
+        /// <summary>
+        /// مدارک های برگشت خورده براساس دسترسی افراد و نقششان. یک مدرک برگشت خورده به تمامی کسانی که به آن کارگاه دسترسی دارند و تمامی کسانی که هم نقش آپلود کننده بوده اند نمایش داده میشود
+        /// </summary>
+        /// <param name="workshopId"></param>
+        /// <param name="roleId"></param>
+        /// <returns></returns>
+        Task<List<EmployeeDocumentsViewModel>> GetRejectedItemsByWorkshopIdAndRoleForAdminWorkFlow(long workshopId,
+            long roleId);
+
+        /// <summary>
+        /// کارگاه هایی که افزودن پرسنل کرده اند و مدارک آنها ناقص است
+        /// </summary>
+        /// <param name="workshops"></param>
+        /// <param name="roleId"></param>
+        /// <returns></returns>
+        Task<List<WorkshopWithEmployeeDocumentsViewModel>> GetCreatedEmployeesWorkshopDocumentForAdmin(
+            List<long> workshops,long roleId);
+
+        /// <summary>
+        /// پرسنلی که افزوده شده اند در کارگاه و آپلود مدارک آنها ناقص است
+        /// </summary>
+        /// <param name="workshopId"></param>
+        /// <returns></returns>
+        Task<List<EmployeeDocumentsViewModel>> GetCreatedEmployeesDocumentByWorkshopIdForAdmin(long workshopId);
+
+        /// <summary>
+        /// لیست کارگاه هایی که مدارک آپلود شده توسط کلاینت برگشت خورده است در کارپوشه ادمین
+        /// </summary>
+        /// <param name="workshops"></param>
+        /// <param name="roleId"></param>
+        /// <returns></returns>
+        Task<List<WorkshopWithEmployeeDocumentsViewModel>> GetClientRejectedDocumentWorkshopsForAdmin(
+            List<long> workshops, long roleId);
+
+        /// <summary>
+        ///  مدارک های آپلود شده توسط کلاینت در کارگاه که برگشت خورده اند در کارپوشه ادمین
+        /// </summary>
+        /// <param name="workshopId"></param>
+        /// <returns></returns>
+        Task<List<EmployeeDocumentsViewModel>> GetClientRejectedDocumentByWorkshopIdForAdmin(long workshopId);
+
+        /// <summary>
+        /// مدارک های برگشت خورده برای کلاینت
+        /// </summary>
+        /// <param name="workshopId"></param>
+        /// <param name="accountId"></param>
+        /// <returns></returns>
+        Task<List<EmployeeDocumentsViewModel>> GetClientRejectedDocumentForClient(long workshopId, long accountId);
+
+        #endregion
+
     }
 }

Company.Domain/EmployeeInsurancListDataAgg/EmployeeInsurancListData.cs

@@ -12,7 +12,7 @@ public class EmployeeInsurancListData : EntityBase
 {
     public EmployeeInsurancListData(long insuranceListId, long employeeId, int workingDays, double dailyWage, double monthlySalary,
         double monthlyBenefits, double monthlyBenefitsIncluded, double benefitsIncludedContinuous, double benefitsIncludedNonContinuous,
-        double insuranceShare, DateTime startWorkDate, DateTime? leftWorkDate, long jobId,bool includeStatus, double baseYears, double marriedAllowance)
+        double insuranceShare, DateTime startWorkDate, DateTime? leftWorkDate, long jobId,bool includeStatus, double baseYears, double marriedAllowance, double overTimePay, double familyAllowance)
     {
         InsuranceListId = insuranceListId;
         EmployeeId = employeeId;
@@ -30,6 +30,8 @@ public class EmployeeInsurancListData : EntityBase
         IncludeStatus = includeStatus;
         BaseYears = baseYears;
         MarriedAllowance = marriedAllowance;
+        OverTimePay = overTimePay;
+        FamilyAllowance = familyAllowance;
         DailyWagePlusBaseYears = dailyWage + baseYears;
     }
 
@@ -110,10 +112,20 @@ public class EmployeeInsurancListData : EntityBase
     /// </summary>
     public double MarriedAllowance { get; private set; }
 
+    /// <summary>
+    /// اضافه کار فیش حقوقی
+    /// </summary>
+    public double OverTimePay { get; private set; }
+
+    /// <summary>
+    /// حق اولاد فیش حقوقی
+    /// </summary>
+    public double FamilyAllowance { get; private set; }
+
 
     public void Edit(int workingDays, double dailyWage, double monthlySalary, double monthlyBenefits, double monthlyBenefitsIncluded, 
         double benefitsIncludedContinuous, double benefitsIncludedNonContinuous, double insuranceShare, DateTime startWorkDate,
-        DateTime? leftWorkDate, long jobId, bool includeStatus, double baseYears, double marriedAllowance)
+        DateTime? leftWorkDate, long jobId, bool includeStatus, double baseYears, double marriedAllowance, double overTimePay, double familyAllowance)
     {
             
         WorkingDays = workingDays;
@@ -130,6 +142,8 @@ public class EmployeeInsurancListData : EntityBase
         IncludeStatus= includeStatus;
         BaseYears = baseYears;
         MarriedAllowance = marriedAllowance;
+        OverTimePay = overTimePay;
+        FamilyAllowance = familyAllowance;
         DailyWagePlusBaseYears = dailyWage + baseYears;
     }
 

Company.Domain/File1/IFileRepository.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using _0_Framework_b.Domain;
 using CompanyManagment.App.Contracts.Employee;
 using CompanyManagment.App.Contracts.Employer;
@@ -16,4 +17,17 @@ public interface IFileRepository : IRepository<long, File1>
     string GetEmployerFullNameById(long id);
     List<EmployeeViewModel> GetAllEmploees();
     List<EmployerViewModel> GetAllEmployers();
+
+    #region Mahan
+
+
+    Task<List<FileExcelViewModel>> GetExcelDetails();
+    Task<List<FileListViewModel>> GetList(GetFileSearchModel searchModel);
+    #endregion
+
+    Task<List<string>> GetAllArchiveNo();
+    Task<List<string>> GetAllClassFiles();
+    Task<List<EmployeeSelectListViewModel>> GetClientAndLitigation();
+    Task<EditEmployee> GetClientDetails(long fileId);
+
 }

Company.Domain/FileAlert/IFileAlertRepository.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using _0_Framework_b.Domain;
 using CompanyManagment.App.Contracts.FileAlert;
 
@@ -10,4 +11,5 @@ public interface IFileAlertRepository : IRepository<long, FileAlert>
     FileAlertViewModel GetDetails(long id);
     void Remove(long id);
     List<EditFileAlert> Search(FileAlertSearchModel searchModel);
+    Task<List<FileAlertViewModel>> GetFileAlerts(FileAlertSearchModel searchModel);
 }

Company.Domain/FineAgg/Fine.cs

@@ -6,7 +6,11 @@ namespace Company.Domain.FineAgg;
 
 public class Fine:EntityBase
 {
-    public Fine(long employeeId, long workshopId, string title, double amount,DateTime fineDate)
+    private Fine()
+    {
+	    
+    }
+    public Fine(long employeeId, long workshopId, string title, double amount,DateTime fineDate, long createdByAccountId, UserType createdByUserType)
     {
         EmployeeId = employeeId;
         WorkshopId = workshopId;
@@ -15,6 +19,9 @@ public class Fine:EntityBase
         IsActive = IsActive.True;
         FineDate = fineDate;
 
+        CreatedByUserType = createdByUserType;
+        CreatedByAccountId = createdByAccountId;
+
     }
 
     public long EmployeeId { get; private set; }
@@ -24,7 +31,23 @@ public class Fine:EntityBase
     public IsActive IsActive { get; private set; }
     public DateTime FineDate { get; private set; }
 
-    public void DeActive()
+
+    /// <summary>
+    /// شخصی که جریمه را ساخته است
+    /// </summary>
+    public long CreatedByAccountId { get; private set; }
+    public UserType CreatedByUserType { get; private set; }
+
+
+    /// <summary>
+    /// شخصی که جریمه را ویرایش کرده است
+    /// </summary>
+    public long LastModifiedByAccountId { get; private set; }
+    public UserType LastModifiedByUserType { get; private set; }
+
+
+
+	public void DeActive()
     {
         IsActive = IsActive.False;
     }
@@ -34,14 +57,15 @@ public class Fine:EntityBase
         IsActive = IsActive.True;
     }
 
-    public void Edit(long employeeId, long workshopId, string title, double amount,DateTime fineDate)
+    public void Edit(long employeeId, long workshopId, string title, double amount,DateTime fineDate, long modifiedByAccountId, UserType modifiedByUserType)
     {
         EmployeeId = employeeId;
         WorkshopId = workshopId;
         Title = title;
         Amount = amount;
         FineDate = fineDate;
-
+        LastModifiedByAccountId = modifiedByAccountId;
+        LastModifiedByUserType = modifiedByUserType;
     }
 
 }

Company.Domain/FineAgg/IFineRepository.cs

@@ -12,4 +12,14 @@ public interface IFineRepository : IRepository<long, Fine>
 	void Remove(Fine entity);
 	void RemoveRange(IEnumerable<Fine> entityEnumerable);
 
+
+	#region Pooya
+
+	/// <summary>
+	/// گروهبندی بر اساس ماه هنگام جستجو با انتخاب کارمند
+	/// </summary>
+	FinesGroupedViewModel GetSearchListAsGrouped(FineSearchViewModel searchModel);
+
+	#endregion
+
 }

Company.Domain/InstitutionPlanAgg/IPlanPercentageRepository.cs

@@ -0,0 +1,29 @@
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.InstitutionPlan;
+using CompanyManagment.App.Contracts.TemporaryClientRegistration;
+using System.Collections.Generic;
+
+namespace Company.Domain.InstitutionPlanAgg;
+
+public interface IPlanPercentageRepository : IRepository<long, PlanPercentage>
+{
+    EditInstitutionPlanPercentage GetById(long id);
+
+    EditInstitutionPlanPercentage GetByFirst();
+
+    /// <summary>
+    /// دریافت لیست 30 تایی مبالغ سرویس ها به ازای هر نفر
+    /// </summary>
+    /// <param name="pageIndex"></param>
+    /// <param name="countPeron"></param>
+    /// <returns></returns>
+    List<InstitutionPlanViewModel> GetInstitutionPlanList(int pageIndex, int countPeron);
+
+    /// <summary>
+    /// دریافت مبالغ سرویس ها برای هر کارگاه
+    /// بر اساس تعداد پرسنل کارگاه
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    InstitutionPlanViewModel GetInstitutionPlanForWorkshop(WorkshopTempViewModel command);
+}

Company.Domain/InstitutionPlanAgg/PlanPercentage.cs

@@ -0,0 +1,65 @@
+using _0_Framework.Domain;
+
+namespace Company.Domain.InstitutionPlanAgg;
+
+public class PlanPercentage : EntityBaseWithoutCreationDate
+{
+    public PlanPercentage(int contractAndCheckoutPercent, int insurancePercent, int rollCallPercent, int customizeCheckoutPercent, int contractAndCheckoutInPersonPercent, int insuranceInPersonPercent)
+    {
+        ContractAndCheckoutPercent = contractAndCheckoutPercent;
+        InsurancePercent = insurancePercent;
+        RollCallPercent = rollCallPercent;
+        CustomizeCheckoutPercent = customizeCheckoutPercent;
+        ContractAndCheckoutInPersonPercent = contractAndCheckoutInPersonPercent;
+        InsuranceInPersonPercent = insuranceInPersonPercent;
+    }
+
+    /// <summary>
+    /// قرارداد و تصفیه
+    /// درصد از مزد روزانه
+    /// </summary>
+    public int ContractAndCheckoutPercent { get; private set; }
+
+    /// <summary>
+    /// بیمه
+    /// درصد از مزد روزانه
+    /// </summary>
+    public int InsurancePercent { get; private set; }
+
+    /// <summary>
+    /// حضورغباب
+    /// درصد از مزد روزانه
+    /// </summary>
+    public int RollCallPercent { get; private set; }
+
+    /// <summary>
+    /// فیش غیر رسمی
+    /// درصد از مزد روزانه
+    /// </summary>
+    public int CustomizeCheckoutPercent { get; private set; }
+
+    /// <summary>
+    /// خدمات حضوری قرداد و تصفیه
+    /// درصد از مزد روزانه
+    /// </summary>
+    public int ContractAndCheckoutInPersonPercent { get; private set; }
+
+    /// <summary>
+    /// خدمات حضوری بیمه
+    /// درصد از مزد روزانه
+    /// </summary>
+    public int InsuranceInPersonPercent { get; private set; }
+
+
+    public void Edit(int contractAndCheckoutPercent, int insurancePercent, int rollCallPercent, int customizeCheckoutPercent, int contractAndCheckoutInPersonPercent, int insuranceInPersonPercent)
+    {
+        ContractAndCheckoutPercent = contractAndCheckoutPercent;
+        InsurancePercent = insurancePercent;
+        RollCallPercent = rollCallPercent;
+        CustomizeCheckoutPercent = customizeCheckoutPercent;
+        ContractAndCheckoutInPersonPercent = contractAndCheckoutInPersonPercent;
+        InsuranceInPersonPercent = insuranceInPersonPercent;
+    }
+
+
+}

Company.Domain/LeaveAgg/Leave.cs

@@ -8,7 +8,7 @@ public class Leave: EntityBase
 {
     public Leave(DateTime startLeave, DateTime endLeave,
         string leaveHourses, long workshopId, long employeeId,
-        string paidLeaveType, string leaveType, string employeeFullName, string workshopName, bool isAccepted, string decription, int year, int month)
+        string paidLeaveType, string leaveType, string employeeFullName, string workshopName, bool isAccepted, string decription, int year, int month, TimeSpan shiftDuration, bool hasShiftDuration)
     {
         StartLeave = startLeave;
         EndLeave = endLeave;
@@ -23,6 +23,8 @@ public class Leave: EntityBase
         Decription = decription;
         Year = year;
         Month = month;
+        ShiftDuration = shiftDuration;
+        HasShiftDuration = hasShiftDuration;
     }
 
     public DateTime StartLeave { get; private set; }
@@ -38,9 +40,13 @@ public class Leave: EntityBase
     public string Decription { get; private set; }
     public int Year { get; private set; }
     public int Month { get; private set; }
+
+    public TimeSpan ShiftDuration { get; private set; }
+    public bool HasShiftDuration { get; private set; }
+
     public void Edit(DateTime startLeave, DateTime endLeave,
         string leaveHourses, long workshopId, long employeeId,
-        string paidLeaveType, string leaveType, string employeeFullName, string workshopName, bool isAccepted, string decription, int year, int month)
+        string paidLeaveType, string leaveType, string employeeFullName, string workshopName, bool isAccepted, string decription, int year, int month,bool hasShiftDuration,TimeSpan shiftDuration)
     {
         StartLeave = startLeave;
         EndLeave = endLeave;
@@ -55,5 +61,7 @@ public class Leave: EntityBase
         Decription = decription;
         Year = year;
         Month = month;
+        ShiftDuration = shiftDuration;
+        HasShiftDuration = hasShiftDuration;
     }
 }

Company.Domain/LeftWorkTempAgg/ILeftWorkTempRepository.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.LeftWorkTemp;
 
@@ -14,4 +15,6 @@ public interface ILeftWorkTempRepository:IRepository<long,LeftWorkTemp>
     /// <returns></returns>
     Task<GetStartWorkTempDetails> GetStartAndLeftWorkDetails(long employeeId, long workshopId);
     void Remove(LeftWorkTemp entity);
+    List<LeftWorkTempViewModel> GetLeftWorksByWorkshopId(long workshopId);
+    Task<List<LeftWorkTempViewModel>> GetLeftWorkTempsByEmployeeId(long employeeId);
 }

Company.Domain/LoanAgg/Entities/Loan.cs

@@ -9,12 +9,14 @@ namespace Company.Domain.LoanAgg.Entities;
 
 public class Loan : EntityBase
 {
-    private Loan()
+    private Loan(long createdByAccountId, UserType createdByUserType)
     {
+	    CreatedByAccountId = createdByAccountId;
+	    CreatedByUserType = createdByUserType;
     }
 
     public Loan(long employeeId, long workshopId, DateTime startDateTime,
-        string count, double amount, double amountPerMonth,ICollection<LoanInstallment> loanInstallments, bool getRounded, DateTime loanGrantDate)
+        string count, double amount, double amountPerMonth,ICollection<LoanInstallment> loanInstallments, bool getRounded, DateTime loanGrantDate, long createdByAccountId, UserType createdByUserType)
     {
         EmployeeId = employeeId;
         WorkshopId = workshopId;
@@ -25,6 +27,8 @@ public class Loan : EntityBase
         LoanInstallments = loanInstallments;
         GetRounded = getRounded;
         LoanGrantDate = loanGrantDate;
+        CreatedByAccountId = createdByAccountId;
+        CreatedByUserType = createdByUserType;
         //for (int i = 0; i < Convert.ToInt32(count); i++)
         //{
         //    LoanInstallment newInstallment = new(amountPerMonth, month.ToString("00"), year.ToString("0000"));
@@ -64,7 +68,11 @@ public class Loan : EntityBase
     public bool GetRounded { get; private set; }
     public ICollection<LoanInstallment> LoanInstallments { get; private set; }
 
-    public void DeActiveInstallment(string year, string month)
+
+    public long CreatedByAccountId { get; private set; }
+    public UserType CreatedByUserType { get; private set; }
+
+	public void DeActiveInstallment(string year, string month)
     {
      
         var installment = LoanInstallments.FirstOrDefault(x => x.Month == month && x.Year == year);

Company.Domain/LoanAgg/ILoanRepository.cs

@@ -2,14 +2,17 @@
 using Company.Domain.LoanAgg.Entities;
 using CompanyManagment.App.Contracts.Loan;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Company.Domain.LoanAgg;
 
 public interface ILoanRepository:IRepository<long,Loan>
 {
 	List<LoanViewModel> GetSearchList(LoanSearchViewModel searchViewModel);
-    LoanViewModel GetDetails(long id);
+    Task<LoanDetailsViewModel> GetDetails(long id);
     void Remove(Loan entity);
     List<Loan> GetBy(IEnumerable<long> ids);
     void RemoveRange(IEnumerable<Loan> loans);
+
+    LoanGroupedViewModel GetSearchListAsGrouped(LoanSearchViewModel searchModel);
 }

Company.Domain/RewardAgg/IRewardRepository.cs

@@ -18,6 +18,6 @@ public interface IRewardRepository : IRepository<long, Reward>
 	/// <summary>
 	/// گروهبندی بر اساس ماه هنگام جستجو با انتخاب کارمند
 	/// </summary>
-	List<MonthlyGroupedEmployeeRewardsViewModel> GetSearchListByEmployee(RewardSearchModel searchModel);
+	RewardsGroupedViewModel GetSearchListAsGrouped(RewardSearchModel searchModel);
 	#endregion
 }

Company.Domain/RewardAgg/Reward.cs

@@ -8,18 +8,19 @@ namespace Company.Domain.RewardAgg;
 
 public class Reward:EntityBase
 {
-    private Reward(string title)
+    private Reward()
     {
-        Title = title;
+
     }
 
-    public Reward(long employeeId, long workshopId, double amount, string description, long rewardedByAccountId, DateTime grantDate, string title , RewardType type = RewardType.None)
+    public Reward(long employeeId, long workshopId, double amount, string description, long rewardedByAccountId,UserType userType, DateTime grantDate, string title , RewardType type = RewardType.None)
     {
         EmployeeId = employeeId;
         WorkshopId = workshopId;
         Amount = amount;
         Description = description;
-        RewardedByAccountId = rewardedByAccountId;
+        CreatedByAccountId = rewardedByAccountId;
+        CreatedByUserType = userType;
         GrantDate = grantDate;
         Title = title;
         IsActive = IsActive.True;
@@ -45,24 +46,35 @@ public class Reward:EntityBase
     public string Description { get; private set; }
 
     /// <summary>
-    /// شخصی که پاداش را داده است
+    /// شخصی که پاداش را ساخته است
     /// </summary>
-    public long RewardedByAccountId { get; private set; }
+    public long CreatedByAccountId { get; private set; }
+    public UserType CreatedByUserType { get;private set; }
+
 
     /// <summary>
-    /// تاریخ اعطای پاداش
+    /// شخصی که پاداش را ویرایش کرده است
     /// </summary>
-    public DateTime GrantDate { get; set; }
+    public long LastModifiedByAccountId { get; private set; }
+    public UserType LastModifiedByUserType { get; private set; }
+
+
+	/// <summary>
+	/// تاریخ اعطای پاداش
+	/// </summary>
+	public DateTime GrantDate { get; set; }
 
     public RewardType RewardType { get; set; }
 
     public IsActive IsActive { get; private set; }
 
-    public void Edit(double amount, string description, long rewardedByAccountId, DateTime grantDate,string title)
+
+    public void Edit(double amount, string description, long modifiedByAccountId, UserType userType, DateTime grantDate,string title)
     {
         Amount = amount;
         Description = description;
-        RewardedByAccountId = rewardedByAccountId;
+        LastModifiedByAccountId = modifiedByAccountId;
+        LastModifiedByUserType = userType;
         GrantDate = grantDate;
         Title = title;
     }

Company.Domain/RollCallAgg/DomainService/IRollCallDomainService.cs

@@ -15,6 +15,7 @@ using System.Threading.Tasks;
 using _0_Framework.Application;
 using OfficeOpenXml;
 using OfficeOpenXml.Drawing.Chart;
+using System.Collections;
 
 namespace Company.Domain.RollCallAgg.DomainService;
 
@@ -25,11 +26,15 @@ public interface IRollCallDomainService
             long workshopId);
 
     TimeOnly GetEmployeeOffSetForRegularSettings(long employeeId, long workshopId);
-    DateTime GetEmployeeShiftDateByRollCallStartDate(long workshopId, long employeeId, DateTime rollCallStartDate);
+    DateTime GetEmployeeShiftDateByRollCallStartDate(long workshopId, long employeeId, DateTime rollCallStartDate, DateTime rollCallEndDate);
 
     void CalculateTimeDifferences(RollCall rollCall);
 
     (DateTime start, DateTime end) FindRotatingShift(DateTime startRollCall, DateTime endRollCall, ICollection<CustomizeRotatingShift> rotatingShifts);
+    (DateTime start, DateTime end) FindRotatingShift(List<(DateTime StartDate, DateTime EndDate)> rollcalls, ICollection<CustomizeRotatingShift> rotatingShifts);
+
+    BreakTime GetBreakTime(long employeeId, long workshopId);
+
 }
 
 public class RollCallDomainService : IRollCallDomainService
@@ -173,7 +178,7 @@ public class RollCallDomainService : IRollCallDomainService
     }
 
     public DateTime GetEmployeeShiftDateByRollCallStartDate(long workshopId, long employeeId,
-        DateTime rollCallStartDate)
+        DateTime rollCallStartDate, DateTime rollCallEndDate)
     {
         var shiftDetails = GetEmployeeShiftDetails(employeeId, workshopId);
 
@@ -182,7 +187,7 @@ public class RollCallDomainService : IRollCallDomainService
         return shiftDetails.shiftType switch
         {
             WorkshopShiftStatus.Regular => CalculateRegularShiftDate(rollCallStartDate, offset),
-            WorkshopShiftStatus.Rotating => rollCallStartDate.Date,
+            WorkshopShiftStatus.Rotating => FindRotatingShift(rollCallStartDate, rollCallEndDate, shiftDetails.rotatingShifts).start.Date,
             WorkshopShiftStatus.Irregular => rollCallStartDate.Date,
             _ => throw new ArgumentOutOfRangeException()
         };
@@ -216,6 +221,7 @@ public class RollCallDomainService : IRollCallDomainService
         rollCalls.Remove(deletedRollCall);
         rollCalls.Add(rollCall);
 
+        rollCall.ClearTimeDiff();
         switch (shiftDetails.shiftType)
         {
             case WorkshopShiftStatus.Regular:
@@ -258,6 +264,7 @@ public class RollCallDomainService : IRollCallDomainService
 
 
 
+
                     var previousShift = employeeShifts.OrderByDescending(x => x.start)
                         .FirstOrDefault(x => x.end < employeeShift.start);
 
@@ -299,8 +306,6 @@ public class RollCallDomainService : IRollCallDomainService
 
                     var lateExitRollCall = rollCallsInShift.OrderBy(x => x.EndDate).FirstOrDefault(x => x.EndDate > employeeShift.end);
 
-      
-
                     // تعجیل در خروج - زود رفتن
                     var nextShift = employeeShifts.OrderBy(x => x.start)
                         .FirstOrDefault(x => x.start > employeeShift.end);
@@ -353,7 +358,9 @@ public class RollCallDomainService : IRollCallDomainService
 
                 var rotatingShifts = shiftDetails.rotatingShifts;
 
-                var shift = FindRotatingShift(starDateTime, endDateTime, rotatingShifts);
+                var rollCallStartEnds = rollCalls.Select(x => (x.StartDate.Value, x.EndDate.Value)).ToList();
+
+                var shift = FindRotatingShift(rollCallStartEnds, rotatingShifts);
 
                 var rotatingShiftStart = shift.start;
                 var rotatingShiftEnd = shift.end;
@@ -373,8 +380,8 @@ public class RollCallDomainService : IRollCallDomainService
                 var earlyEntryRollCallRotating = rollCallsInRotatingShift.OrderBy(x => x.StartDate).FirstOrDefault(x => x.StartDate < shift.start);
 
                 var lateEntryRollCallRotating = rollCallsInRotatingShift.OrderBy(x => x.StartDate).FirstOrDefault(x => x.StartDate > shift.start);
-
-         
+                //برای خالی کردن اولیه حضور غیاب انتخاب شده
+                earlyEntryRollCallRotating?.SetEarlyEnter(TimeSpan.Zero);
 
                 if (earlyEntryRollCallRotating != null)
                 {
@@ -403,7 +410,8 @@ public class RollCallDomainService : IRollCallDomainService
                 var earlyExitRollCallRotating = rollCallsInRotatingShift.OrderByDescending(x => x.EndDate).FirstOrDefault(x => x.EndDate < shift.end);
 
                 var lateExitRollCallRotating = rollCallsInRotatingShift.OrderBy(x => x.EndDate).FirstOrDefault(x => x.EndDate > shift.end);
-
+                //برای خالی کردن اولیه حضور غیاب انتخاب شده
+                earlyExitRollCallRotating?.SetEarlyExit(TimeSpan.Zero);
 
 
 
@@ -448,17 +456,6 @@ public class RollCallDomainService : IRollCallDomainService
         DateTime startDate = startRollCall.Date;
         DateTime endDate = endRollCall.Date;
 
-
-
-        DateTime startEntryWithDate = startDate.Add(startRollCall.TimeOfDay);
-        DateTime endEntryWithDate = endDate.Add(endRollCall.TimeOfDay);
-
-        DateTime oneHourBeforeStart = startEntryWithDate.AddHours(-1);
-        DateTime oneHourAfterStart = startEntryWithDate.AddHours(1);
-        DateTime oneHourBeforeEnd = endEntryWithDate.AddHours(-1);
-        DateTime oneHourAfterEnd = endEntryWithDate.AddHours(1);
-
-
         var shiftDateTimes = rotatingShifts.SelectMany(shift =>
         {
             var shifts = new List<(DateTime Start, DateTime End)>();
@@ -477,56 +474,69 @@ public class RollCallDomainService : IRollCallDomainService
 
         #region مقایسه شروع حضور غیاب با شیفت
 
-        var startFilteredTimes = shiftDateTimes.Where(shift =>
-            (oneHourBeforeStart <= shift.Start && oneHourAfterStart >= shift.Start) ||
-            (oneHourBeforeStart <= shift.End && oneHourAfterStart >= shift.End)).ToList();
+        //var startFilteredTimes = shiftDateTimes.Where(shift =>
+        //    (twoHourBeforeStart <= shift.Start && twoHourAfterStart >= shift.Start) ||
+        //    (twoHourBeforeStart <= shift.End && twoHourAfterStart >= shift.End)).ToList();
 
-        if (startFilteredTimes.Count == 0)
-        {
-            startFilteredTimes = shiftDateTimes;
-        }
-        else if (startFilteredTimes.Count == 1)
-        {
-            var startChosenShift = startFilteredTimes.First();
+        //if (startFilteredTimes.Count == 0)
+        //{
+        //    startFilteredTimes = shiftDateTimes;
+        //}
+        //else if (startFilteredTimes.Count == 1)
+        //{
+        //    var startChosenShift = startFilteredTimes.First();
 
-            if (startChosenShift.End < startChosenShift.Start)
-                startChosenShift.End = startChosenShift.End.AddDays(1);
+        //    if (startChosenShift.End < startChosenShift.Start)
+        //        startChosenShift.End = startChosenShift.End.AddDays(1);
 
-            return startChosenShift;
-        }
+        //    return startChosenShift;
+        //}
 
 
-        #endregion
+        //#endregion
 
-        #region مقایسه پایان حضورغیاب با شیفت
-
-        var endFilteredTimes = shiftDateTimes.Where(shift =>
-            (oneHourBeforeEnd <= shift.Start && oneHourAfterEnd >= shift.Start) ||
-            (oneHourBeforeEnd <= shift.End && oneHourAfterEnd >= shift.End)).ToList();
-        if (endFilteredTimes.Count == 0)
-        {
-            endFilteredTimes = startFilteredTimes;
-        }
-        else if (endFilteredTimes.Count == 1)
-        {
-            var endChosenShift = endFilteredTimes.First();
-            return endChosenShift;
-        }
+        //#region مقایسه پایان حضورغیاب با شیفت
 
+        //var endFilteredTimes = shiftDateTimes.Where(shift =>
+        //    (twoHourBeforeEnd <= shift.Start && twoHourAfterEnd >= shift.Start) ||
+        //    (twoHourBeforeEnd <= shift.End && twoHourAfterEnd >= shift.End)).ToList();
+        //if (endFilteredTimes.Count == 0)
+        //{
+        //    endFilteredTimes = startFilteredTimes;
+        //}
+        //else if (endFilteredTimes.Count == 1)
+        //{
+        //    var endChosenShift = endFilteredTimes.First();
+        //    return endChosenShift;
+        //}
 
         #endregion
 
         #region اشتراک حضور غیاب و شیفت
 
-        var overlapShifts = endFilteredTimes.Select(shift => new
-        {
-            Shift = shift,
-            Overlap = new TimeSpan(Math.Max(0,
-                Math.Min(shift.End.Ticks, oneHourAfterEnd.Ticks) -
-                Math.Max(shift.Start.Ticks, oneHourBeforeStart.Ticks)))
-        });
+        var overlapShifts = shiftDateTimes
+            .Select(shift => new
+            {
+                Shift = shift,
+                Overlap = new TimeSpan(Math.Max(0,
+                    Math.Min(shift.End.Ticks, endRollCall.Ticks) -
+                    Math.Max(shift.Start.Ticks, startRollCall.Ticks))),
+                // زمان حضور فرد در شیفت (مجموع Overlap با شیفت)
+                TotalTimeInShift = new TimeSpan(Math.Max(0,
+                    Math.Min(shift.End.Ticks, endRollCall.Ticks) -
+                    Math.Max(shift.Start.Ticks, startRollCall.Ticks))),
+                StartDistance = Math.Abs((shift.Start - startRollCall).Ticks),
+                EndDistance = Math.Abs((shift.End - endRollCall).Ticks),
+                TotalDistance = Math.Abs((shift.Start - startRollCall).Ticks) + Math.Abs((shift.End - endRollCall).Ticks)
+            })
+            .OrderByDescending(s => s.TotalTimeInShift)     // 1. بیشترین زمان حضور فرد
+            .ThenByDescending(s => s.Overlap)               // 2. بیشترین Overlap
+            .ThenBy(s => s.TotalDistance)
+            .ThenBy(s => s.StartDistance)
+            .ThenBy(x => x.EndDistance);                      // 3. اگر برابر بود، 
 
-        var overlapChosenShift = overlapShifts.MaxBy(s => s.Overlap);
+
+        var overlapChosenShift = overlapShifts.First();
         var end = overlapChosenShift.Shift.End;
         if (overlapChosenShift.Shift.End < overlapChosenShift.Shift.Start)
             end = overlapChosenShift.Shift.End.AddDays(1);
@@ -537,6 +547,145 @@ public class RollCallDomainService : IRollCallDomainService
         #endregion
     }
 
+    public (DateTime start, DateTime end) FindRotatingShift(List<(DateTime StartDate, DateTime EndDate)> rollCalls, ICollection<CustomizeRotatingShift> rotatingShifts)
+    {
+
+        DateTime startDate = rollCalls.MinBy(x => x.StartDate).StartDate.Date;
+        DateTime endDate = rollCalls.MaxBy(x => x.EndDate).EndDate.Date;
+
+        var shiftDateTimes = rotatingShifts.SelectMany(shift =>
+        {
+            var shifts = new List<(DateTime Start, DateTime End)>();
+            for (int i = -1; i <= 1; i++)
+            {
+                var shiftStart = startDate.AddDays(i).Date;
+                shiftStart = shiftStart.Add(shift.StartTime.ToTimeSpan());
+                var shiftEnd = shift.StartTime < shift.EndTime
+                    ? startDate.AddDays(i).Date.Add(shift.EndTime.ToTimeSpan())
+                    : startDate.AddDays(i + 1).Date.Add(shift.EndTime.ToTimeSpan());
+                shifts.Add((shiftStart, shiftEnd));
+            }
+
+            return shifts;
+        }).ToList();
+
+        //var shiftScores = shiftDateTimes
+        //    .Select(shift =>
+        //    {
+        //        var totalOverlap = TimeSpan.Zero;
+
+        //        var firstRollCall = rollCalls.MinBy(x => x.StartDate);
+        //        var lastRollCall = rollCalls.MaxBy(x => x.EndDate);
+
+        //        long totalStartDistance = Math.Abs((shift.Start - firstRollCall.StartDate).Ticks);
+        //        long totalEndDistance = Math.Abs((shift.End - lastRollCall.EndDate).Ticks);
+
+
+        //        foreach (var rollCall in rollCalls)
+        //        {
+        //            var start = rollCall.StartDate;
+        //            var end = rollCall.EndDate;
+
+        //            var overlapTicks = Math.Max(0,
+        //                Math.Min(shift.End.Ticks, end.Ticks) -
+        //                Math.Max(shift.Start.Ticks, start.Ticks));
+
+        //            totalOverlap += new TimeSpan(overlapTicks);
+        //            //totalStartDistance += Math.Abs((shift.Start - start).Ticks);
+        //            //totalEndDistance += Math.Abs((shift.End - end).Ticks);
+        //        }
+
+        //        return new
+        //        {
+        //            Shift = shift,
+        //            TotalOverlap = totalOverlap,
+        //            TotalDistance = totalStartDistance + totalEndDistance,
+        //            StartDistance = totalStartDistance,
+        //            EndDistance = totalEndDistance
+        //        };
+        //    })
+        //    .OrderBy(s => s.StartDistance)
+        //    .ThenBy(s => s.TotalDistance)
+        //    .ThenByDescending(s => s.TotalOverlap)
+        //    .ThenBy(s => s.EndDistance);
+
+
+        // مرحله 1: گروه‌بندی بر اساس نزدیکی زمان شروع به اولین حضور و غیاب
+        var groupedByStart = shiftDateTimes
+            .GroupBy(shift =>
+            {
+                var firstRollCallStart = rollCalls.Min(x => x.StartDate);
+                var ticksDiff = Math.Abs((shift.Start - firstRollCallStart).Ticks);
+                return Math.Round(TimeSpan.FromTicks(ticksDiff).TotalMinutes / 30); // گروه‌بندی هر 30 دقیقه
+            })
+            .OrderBy(g => g.Key)
+            .First(); // نزدیک‌ترین گروه به شروع
+
+        // مرحله 2 (جایگزین مرحله ۴): گروه‌بندی بر اساس نزدیکی پایان شیفت به آخرین حضور و غیاب
+        var filteredByEnd = groupedByStart
+            .Select(shift =>
+            {
+                var lastRollCallEnd = rollCalls.Max(x => x.EndDate);
+                var endDistance = Math.Abs((shift.End - lastRollCallEnd).Ticks);
+                return new { Shift = shift, EndDistance = endDistance };
+            })
+            .GroupBy(x => x.EndDistance / TimeSpan.FromMinutes(30).Ticks) // گروه‌بندی هر 30 دقیقه
+            .OrderBy(g => g.Key)
+            .First() // نزدیک‌ترین پایان
+            .ToList();
+
+        // مرحله 3: فیلتر بر اساس بیشترین همپوشانی با حضور و غیاب‌ها
+        var filteredByOverlap = filteredByEnd
+            .Select(shift =>
+            {
+                var totalOverlap = TimeSpan.Zero;
+                foreach (var rollCall in rollCalls)
+                {
+                    var overlapTicks = Math.Max(0,
+                        Math.Min(shift.Shift.End.Ticks, rollCall.EndDate.Ticks) -
+                        Math.Max(shift.Shift.Start.Ticks, rollCall.StartDate.Ticks));
+                    totalOverlap += new TimeSpan(overlapTicks);
+                }
+                return new { Shift = shift.Shift, TotalOverlap = totalOverlap };
+            })
+            .GroupBy(x => Math.Round(x.TotalOverlap.TotalMinutes /5)) // گروه‌بندی همپوشانی
+            .OrderByDescending(g => g.Key) // بیشترین همپوشانی اول
+            .First()
+            .ToList();
+
+        // مرحله 4 (جایگزین مرحله ۲): فیلتر نهایی بر اساس کمترین مجموع فاصله (TotalDistance)
+        var bestShift = filteredByOverlap
+            .Select(shift =>
+            {
+                var firstRollCall = rollCalls.MinBy(x => x.StartDate);
+                var lastRollCall = rollCalls.MaxBy(x => x.EndDate);
+                var totalDistance =
+                    Math.Abs((shift.Shift.Start - firstRollCall.StartDate).Ticks) +
+                    Math.Abs((shift.Shift.End - lastRollCall.EndDate).Ticks);
+                return new { Shift = shift.Shift, TotalDistance = totalDistance };
+            })
+            .OrderBy(x => x.TotalDistance) // کمترین فاصله کلی
+            .First(); // بهترین شیفت نهایی
+        var overlapChosenShift = bestShift;
+        var end = overlapChosenShift.Shift.End;
+        if (overlapChosenShift.Shift.End < overlapChosenShift.Shift.Start)
+            end = overlapChosenShift.Shift.End.AddDays(1);
+
+
+        return (overlapChosenShift.Shift.Start, end);
+    }
+
+    public BreakTime GetBreakTime(long employeeId, long workshopId)
+    {
+        var employeeSettings = _customizeWorkshopEmployeeSettingsRepository.GetByEmployeeIdAndWorkshopIdIncludeGroupSettings(workshopId,
+            employeeId);
+        if (employeeSettings == null)
+        {
+            return new BreakTime(false, TimeOnly.MinValue);
+        }
+
+        return employeeSettings.BreakTime;
+    }
     private DateTime CalculateRegularShiftDate(DateTime startDate, TimeOnly offset)
     {
         DateTime nextOffSetDateTime;

Company.Domain/RollCallAgg/IRollCallMandatoryRepository.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using _0_Framework.Domain;
 using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities;
 using CompanyManagment.App.Contracts.Contract;
@@ -12,14 +13,26 @@ namespace Company.Domain.RollCallAgg;
 
 public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
 {
-	ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking);
+	ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking, bool isStaticCheckout);
 	TimeSpan AfterSubtract(CreateWorkingHoursTemp command, TimeSpan sumOneDaySpan, DateTime creationDate);
 
 	List<RotatingShiftViewModel> RotatingShiftCheck(List<GroupedRollCalls> rollCallList);
 
-
+    List<RollCallViewModel> ConvertStaticHoursToRollCall(CreateWorkingHoursTemp command, bool workshopHolidyWorking);
     CustomizeCheckoutMandatoryViewModel CustomizeCheckoutMandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd);
 
     List<LateToWorkEarlyExistSpannig> LateToWorkEarlyExit(List<GroupedRollCalls> groupedRollCall,
         ICollection<CustomizeWorkshopEmployeeSettingsShift> shiftSettings, List<LeaveViewModel> leavList);
+
+    /// <summary>
+    /// گزارش نوبت کاری حضور غیاب
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <param name="employeeId"></param>
+    /// <param name="contractStart"></param>
+    /// <param name="contractEnd"></param>
+    /// <param name="shiftwork"></param>
+    /// <returns></returns>
+    Task<ComputingViewModel> RotatingShiftReport(long workshopId, long employeeId, DateTime contractStart,
+        DateTime contractEnd, string shiftwork, bool hasRollCall, CreateWorkingHoursTemp command,bool holidayWorking);
 }

Company.Domain/RollCallAgg/IRollCallRepository.cs

@@ -87,6 +87,9 @@ namespace Company.Domain.RollCallAgg
             long workshopId);
 
         Task<List<RollCall>> GetRollCallsInShiftDate(DateTime rollCallShiftDate, long employeeId, long workshopId);
+
+        Task<List<RollCall>> GetRollCallsUntilNowWithWorkshopIdEmployeeIds(long workshopId, List<long> employeeIds,
+            DateTime fromDate);
         #endregion
     }
 }

Company.Domain/RollCallAgg/RollCall.cs

@@ -4,6 +4,8 @@ using System;
 using Company.Domain.RollCallAgg.DomainService;
 using System.Linq;
 using _0_Framework.Exceptions;
+using Company.Domain.EmployeeAgg;
+using Company.Domain.WorkshopAgg;
 
 namespace Company.Domain.RollCallAgg
 {
@@ -27,8 +29,6 @@ namespace Company.Domain.RollCallAgg
             Month = month;
             RollCallModifyType = rollCallModifyType;
 
-            SetShiftDate(service);
-
             var shiftDetails = service.GetEmployeeShiftDetails(employeeId, workshopId);
 
             if (shiftDetails is { shiftType: WorkshopShiftStatus.Irregular, irregularShift: null } or
@@ -36,10 +36,10 @@ namespace Company.Domain.RollCallAgg
             {
                 throw new NotFoundException("اطلاعات گروهبندی شخص نامعتبر است");
             }
-
+            SetBreakTime(service, employeeId, workshopId);
             //if (endDate.HasValue)
             //{
-	           // Edit(StartDate.Value,endDate.Value,service);
+            // Edit(StartDate.Value,endDate.Value,service);
             //}
 
         }
@@ -200,35 +200,14 @@ namespace Company.Domain.RollCallAgg
 
 
 
-        /// <summary>
-        /// Truncates the TimeSpan to only include days, hours, and minutes.
-        /// Removes seconds, milliseconds, and smaller units.
-        /// </summary>
-        /// <param name="time">The original TimeSpan value.</param>
-        /// <returns>A truncated TimeSpan with only days, hours, and minutes.</returns>
-        private TimeSpan TruncateTimeSpan(TimeSpan time)
-        {
-            return new TimeSpan(time.Days, time.Hours, time.Minutes, 0);
-        }
-
-        /// <summary>
-        /// Truncates the DateTime to only include Years,Month,days,Hours and Minutes.
-        /// Removes seconds, milliseconds, and smaller units.
-        /// </summary>
-        /// <param name="dateTime">The original DateTime value.</param>
-        /// <returns>A truncated DateTime with only days, hours, and minutes.</returns>
-        private DateTime TruncateDateTime(DateTime dateTime)
-        {
-            return new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, dateTime.Hour,
-                dateTime.Minute, 0);
-        }
-
         
 
         public void SetEndDateTime(DateTime endDate, IRollCallDomainService service)
         {
             EndDate = endDate;
 
+            SetShiftDate(service);
+
             ShiftDurationTimeSpan = CalculateShiftDuration(StartDate!.Value, EndDate.Value, service);
 
             NightWorkTimeSpan = CalculateNightWorkDuration(StartDate.Value, endDate);
@@ -238,7 +217,7 @@ namespace Company.Domain.RollCallAgg
             ////محاسبه اختلاف زمانی(تاخیر و تعجیل)ء
             service.CalculateTimeDifferences(this);
 
-
+            SetBreakTime(service, EmployeeId, WorkshopId);
         }
 
 
@@ -259,6 +238,8 @@ namespace Company.Domain.RollCallAgg
             //محاسبه اختلاف زمانی(تاخیر و تعجیل)ء
             service.CalculateTimeDifferences(this);
 
+            SetBreakTime(service, EmployeeId, WorkshopId);
+
         }
 
 
@@ -276,9 +257,9 @@ namespace Company.Domain.RollCallAgg
             return this;
         }
 
-        private void SetShiftDate(IRollCallDomainService service)
+        public void SetShiftDate(IRollCallDomainService service)
         {
-            ShiftDate = service.GetEmployeeShiftDateByRollCallStartDate(WorkshopId, EmployeeId, StartDate!.Value);
+            ShiftDate = service.GetEmployeeShiftDateByRollCallStartDate(WorkshopId, EmployeeId, StartDate!.Value,EndDate.Value);
         }
 
         private TimeSpan CalculateShiftDuration(DateTime startRollCall, DateTime endRollCall, IRollCallDomainService service)
@@ -331,6 +312,40 @@ namespace Company.Domain.RollCallAgg
             }
         }
 
+
+
+        private void SetBreakTime(IRollCallDomainService rollCallDomainService, long employeeId, long workshopId)
+        {
+            var breakTime = rollCallDomainService.GetBreakTime(employeeId, workshopId);
+
+            if (breakTime.BreakTimeType == BreakTimeType.WithTime)
+                BreakTimeSpan = breakTime.BreakTimeValue.ToTimeSpan();
+
+
+        }
+
+        /// <summary>
+        /// Truncates the TimeSpan to only include days, hours, and minutes.
+        /// Removes seconds, milliseconds, and smaller units.
+        /// </summary>
+        /// <param name="time">The original TimeSpan value.</param>
+        /// <returns>A truncated TimeSpan with only days, hours, and minutes.</returns>
+        private TimeSpan TruncateTimeSpan(TimeSpan time)
+        {
+            return new TimeSpan(time.Days, time.Hours, time.Minutes, 0);
+        }
+
+        /// <summary>
+        /// Truncates the DateTime to only include Years,Month,days,Hours and Minutes.
+        /// Removes seconds, milliseconds, and smaller units.
+        /// </summary>
+        /// <param name="dateTime">The original DateTime value.</param>
+        /// <returns>A truncated DateTime with only days, hours, and minutes.</returns>
+        private DateTime TruncateDateTime(DateTime dateTime)
+        {
+            return new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, dateTime.Hour,
+                dateTime.Minute, 0);
+        }
         //private static (DateTime start, DateTime end) FindRotatingShift(DateTime startRollCall, DateTime endRollCall, ICollection<CustomizeRotatingShift> rotatingShifts)
         //{
 

Company.Domain/RollCallEmployeeStatusAgg/IRollCallEmployeeStatusRepository.cs

@@ -15,14 +15,16 @@ namespace Company.Domain.RollCallEmployeeStatusAgg
         ///
         /// <returns></returns>
         void AdjustRollCallStatusEndDates(List<AdjustRollCallEmployeesWithEmployeeLeftWork> command);
-		/// <summary>
-		/// دریافت وضعیت حضور غیاب پرسنل در تاریخ مشخص
-		/// </summary>
-		/// <param name="rollCallEmployeeId"></param>
-		/// <param name="date"></param>
-		/// <returns></returns>
+
+        /// <summary>
+        /// دریافت وضعیت حضور غیاب پرسنل در تاریخ مشخص
+        /// </summary>
+        /// <param name="rollCallEmployeeId"></param>
+        /// <param name="date"></param>
+        /// <returns></returns>
         RollCallEmployeeStatus GetByRollCallEmployeeIdAndDate(long rollCallEmployeeId, DateTime date);
         List<RollCallEmployeeStatusViewModel> GetActiveByWorkshopIdInDate(long workshopId, DateTime startDateGr, DateTime endDateGr);
         List<RollCallEmployeeStatusViewModel> GetByWorkshopIdInDates(long workshopId, DateTime start, DateTime end);
+        bool IsActiveInPeriod(long employeeId, long workshopId, DateTime startDate, DateTime endDate);
     }
 }

Company.Domain/SalaryAidAgg/ISalaryAidRepository.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.Reward;
 using CompanyManagment.App.Contracts.SalaryAid;
 
 namespace Company.Domain.SalaryAidAgg;
@@ -11,4 +12,13 @@ public interface ISalaryAidRepository:IRepository<long,SalaryAid>
 	void Remove(SalaryAid entity);
 	List<SalaryAid> GetBy(IEnumerable<long> ids);
 	void RemoveRange(IEnumerable<SalaryAid> salaryAids);
+
+	#region Pooya
+
+	/// <summary>
+	/// گروهبندی بر اساس ماه هنگام جستجو با انتخاب کارمند
+	/// </summary>
+
+	SalaryAidsGroupedViewModel GetSearchListAsGrouped(SalaryAidSearchViewModel searchModel); 
+	#endregion
 }

Company.Domain/SalaryAidAgg/SalaryAid.cs

@@ -1,30 +1,63 @@
 using System;
+using _0_Framework.Application;
 using _0_Framework.Domain;
 using Hangfire.Annotations;
 
 namespace Company.Domain.SalaryAidAgg;
 
-public class SalaryAid:EntityBase
+public class SalaryAid : EntityBase
 {
-    private SalaryAid(){}
+    private SalaryAid()
+    {
 
-
-    public SalaryAid(long employeeId, long workshopId, double amount, DateTime salaryAidDateTime)
+    }
+    public SalaryAid(long employeeId, long workshopId, double amount, DateTime salaryAidDateTime, long createdByAccountId, UserType createdByUserType, int calculationMonth, int calculationYear)
     {
         EmployeeId = employeeId;
         WorkshopId = workshopId;
         Amount = amount;
         SalaryAidDateTime = salaryAidDateTime;
+        CreatedByUserType = createdByUserType;
+        CreatedByAccountId = createdByAccountId;
+        CalculationDate = $"{calculationYear:0000}/{calculationMonth:00}/01".ToGeorgianDateTime();
+        CalculationMonth = calculationMonth;
+        CalculationYear = calculationYear;
     }
 
     public long EmployeeId { get; private set; }
     public long WorkshopId { get; private set; }
     public double Amount { get; private set; }
+    /// <summary>
+    /// تاریخ پرداخت
+    /// </summary>
     public DateTime SalaryAidDateTime { get; private set; }
+    /// <summary>
+    /// تاریخ محاسبه
+    /// </summary>
+    public DateTime CalculationDate { get; private set; }
 
-    public void Edit(double amount, DateTime salaryAidTime)
+    public int CalculationMonth { get; set; }
+    public int CalculationYear { get; set; }
+
+
+
+    public long CreatedByAccountId { get; private set; }
+    public UserType CreatedByUserType { get; private set; }
+
+
+
+    public long LastModifiedByAccountId { get; private set; }
+    public UserType LastModifiedByUserType { get; private set; }
+
+
+    public void Edit(double amount, DateTime salaryAidTime, long modifiedByAccountId, UserType modifiedByUserType, int calculationMonth, int calculationYear)
     {
         Amount = amount;
         SalaryAidDateTime = salaryAidTime;
+        LastModifiedByAccountId = modifiedByAccountId;
+        LastModifiedByUserType = modifiedByUserType;
+        CalculationDate = $"{calculationYear:0000}/{calculationMonth:00}/01".ToGeorgianDateTime();
+        CalculationMonth = calculationMonth;
+        CalculationYear = calculationYear;
     }
 }

Company.Domain/TemporaryClientRegistrationAgg/ContractingPartyTemp.cs

@@ -91,6 +91,10 @@ public class ContractingPartyTemp : EntityBase
     /// </summary>
     public string Address { get; private set; }
 
-
-        
+    public void UpdateAddress(string state, string city, string address)
+    {
+        this.State = state;
+        this.City = city;
+        this.Address = address;
+    }
 }

Company.Domain/TemporaryClientRegistrationAgg/IContractingPartyTempRepository.cs

@@ -20,4 +20,11 @@ public interface IContractingPartyTempRepository :IRepository<long, ContractingP
     /// <param name="nationalCode"></param>
     /// <returns></returns>
     ContractingPartyTempViewModel GetByNationalCode(string nationalCode);
+
+    /// <summary>
+    /// دریافت اطلاعات طرف حساب موقت با کد ملی
+    /// </summary>
+    /// <param name="nationalCode"></param>
+    /// <returns></returns>
+    ContractingPartyTempViewModel GetByContractingPartyTempId(long contractingPartyTempId);
 }

Company.Domain/TemporaryClientRegistrationAgg/IInstitutionContractTempRepository.cs

@@ -0,0 +1,18 @@
+using System.Threading.Tasks;
+using _0_Framework_b.Domain;
+using CompanyManagment.App.Contracts.TemporaryClientRegistration;
+
+namespace Company.Domain.TemporaryClientRegistrationAgg;
+
+public interface IInstitutionContractTempRepository : IRepository<long, InstitutionContractTemp>
+{
+    /// <summary>
+    /// دریافت قرارداد موقت
+    /// با توجه به آیدی طرف حساب
+    /// یا آیدی قرارداد
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="contractingPartyId"></param>
+    /// <returns></returns>
+    Task<InstitutionContractTempViewModel> GetInstitutionContractTemp(long id,long contractingPartyTempId);
+}

Company.Domain/TemporaryClientRegistrationAgg/IWorkshopServicesTempRepository.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.TemporaryClientRegistration;
+
+namespace Company.Domain.TemporaryClientRegistrationAgg;
+
+public interface IWorkshopServicesTempRepository : IRepository<long, WorkshopServicesTemp>
+{
+    /// <summary>
+    /// حذف کامل سرویس های کارگاه
+    /// </summary>
+    /// <param name="workshopTempId"></param>
+    public void RemoveServices(long workshopTempId);
+}

Company.Domain/TemporaryClientRegistrationAgg/IWorkshopTempRepository.cs

@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.TemporaryClientRegistration;
+
+namespace Company.Domain.TemporaryClientRegistrationAgg;
+
+public interface IWorkshopTempRepository : IRepository<long, WorkshopTemp>
+{
+    /// <summary>
+    /// دریافت کارگاه های ذخیره شده
+    /// </summary>
+    /// <param name="contractingPartyTemp"></param>
+    /// <returns></returns>
+    Task<List<WorkshopTempViewModel>> GetWorkshopTemp(long contractingPartyTemp);
+
+    System.Threading.Tasks.Task RemoveWorkshopTemps(List<long> workshopTempIds);
+
+
+}

Company.Domain/TemporaryClientRegistrationAgg/InstitutionContractTemp.cs

@@ -0,0 +1,136 @@
+using System;
+using System.Threading.Tasks;
+using _0_Framework.Application.UID;
+using _0_Framework.Domain;
+
+namespace Company.Domain.TemporaryClientRegistrationAgg;
+
+public class InstitutionContractTemp : EntityBase
+{
+    public InstitutionContractTemp(long contractingPartyTempId, string paymentModel, string periodModel, double totalPayment, DateTime contractStartGr, DateTime contractEndGr, string officialCompany, double valueAddedTax, string verifyCode, string registrationStatus, int messageId, DateTime? sendVerifyCodeTime, DateTime? verifyCodeEndTime)
+    {
+        ContractingPartyTempId = contractingPartyTempId;
+        PaymentModel = paymentModel;
+        PeriodModel = periodModel;
+        TotalPayment = totalPayment;
+        ContractStartGr = contractStartGr;
+        ContractEndGr = contractEndGr;
+        OfficialCompany = officialCompany;
+        ValueAddedTax = valueAddedTax;
+        VerifyCode = verifyCode;
+        RegistrationStatus = registrationStatus;
+        MessageId = messageId;
+        SendVerifyCodeTime = sendVerifyCodeTime;
+        VerifyCodeEndTime = verifyCodeEndTime;
+    }
+
+    /// <summary>
+    /// آیدی طرف حساب
+    /// </summary>
+    public long ContractingPartyTempId { get; private set; }
+
+    /// <summary>
+    /// مدل پرداخت
+    /// بصورت یکجا
+    /// -
+    /// بصئورت ماهیانه
+    /// OneTime
+    /// </summary>
+    public string PaymentModel { get; private set; }
+
+    /// <summary>
+    /// مدت قرارداد
+    /// چند ماهه؟
+    /// "12"
+    /// </summary>
+    public string PeriodModel { get; private set; }
+
+    /// <summary>
+    /// مبلغ کل قرارداد
+    /// </summary>
+    public double TotalPayment { get; private set; }
+
+    /// <summary>
+    /// تاریخ شرع قراداد
+    /// میلادی
+    /// </summary>
+    public DateTime ContractStartGr { get; private set; }
+
+    /// <summary>
+    /// تاریخ پایان قراداد شمسی
+    /// </summary>
+    public DateTime ContractEndGr { get; private set; }
+
+
+    /// <summary>
+    /// پرداخت بصورت رسمی با غیر رسمی
+    /// </summary>
+    public string OfficialCompany { get; private set; }
+
+    /// <summary>
+    /// مبلغ مالیات بر ارزش افزوده
+    /// </summary>
+    public double ValueAddedTax { get; private set; }
+
+    /// <summary>
+    /// کد شش رقمی ثبت قرارداد
+    /// </summary>
+    public string VerifyCode { get; set; }
+
+
+    /// <summary>
+    /// وضعیت ثبت نام
+    /// -
+    /// BeforeSendVerifyCode قبل از ارسال کد
+    /// -
+    /// VerifyCodeSent کد ارسال شده
+    /// -
+    /// Completed ثبت نام تکمیل شده
+    /// </summary>
+    public string RegistrationStatus { get; private set; }
+
+    /// <summary>
+    /// آی دی پیامک ارسال شده
+    /// </summary>
+    public int MessageId { get; private set; }
+
+    /// <summary>
+    /// ثبت زمان ارسال کد
+    /// </summary>
+    public DateTime? SendVerifyCodeTime { get; private set; }
+
+    /// <summary>
+    /// زمان پایان مهلت ارسال کد
+    /// </summary>
+    public DateTime? VerifyCodeEndTime{ get; private set; }
+
+
+    public void Edit(long contractingPartyTempId, string paymentModel, string periodModel, double totalPayment, DateTime contractStartGr, DateTime contractEndGr, string officialCompany, double valueAddedTax, string verifyCode, string registrationStatus, int messageId, DateTime? sendVerifyCodeTime, DateTime? verifyCodeEndTime)
+    {
+        ContractingPartyTempId = contractingPartyTempId;
+        PaymentModel = paymentModel;
+        PeriodModel = periodModel;
+        TotalPayment = totalPayment;
+        ContractStartGr = contractStartGr;
+        ContractEndGr = contractEndGr;
+        OfficialCompany = officialCompany;
+        ValueAddedTax = valueAddedTax;
+        VerifyCode = verifyCode;
+        RegistrationStatus = registrationStatus;
+        MessageId = messageId;
+        SendVerifyCodeTime = sendVerifyCodeTime;
+        VerifyCodeEndTime = verifyCodeEndTime;
+    }
+
+    public void Update(string verifyCode, string registrationStatus, int messageId, DateTime? sendVerifyCodeTime, DateTime? verifyCodeEndTime)
+    {
+        VerifyCode = verifyCode;
+        RegistrationStatus = registrationStatus;
+        MessageId = messageId;
+        SendVerifyCodeTime = sendVerifyCodeTime;
+        VerifyCodeEndTime = verifyCodeEndTime;
+    }
+
+   
+
+}

Company.Domain/TemporaryClientRegistrationAgg/WorkshopServicesTemp.cs

@@ -0,0 +1,34 @@
+using _0_Framework.Domain;
+
+namespace Company.Domain.TemporaryClientRegistrationAgg;
+
+public class WorkshopServicesTemp : EntityBase
+{
+    public WorkshopServicesTemp(string serviceName, int countPerson, long workshopTempId)
+    {
+        ServiceName = serviceName;
+        CountPerson = countPerson;
+        WorkshopTempId = workshopTempId;
+    }
+    /// <summary>
+    /// نام سرویس
+    /// </summary>
+    public string ServiceName { get; private set; }
+    
+    /// <summary>
+    /// تعداد پرسنل
+    /// </summary>
+    public int CountPerson { get; private set; }
+
+    /// <summary>
+    /// آی دی کارگاه موقت
+    /// </summary>
+    public long WorkshopTempId { get; private set; }
+
+    public WorkshopTemp WorkshopTemp { get; private set; }
+
+    public void UpdateService(int countPerson)
+    {
+        this.CountPerson = countPerson;
+    }
+}

Company.Domain/TemporaryClientRegistrationAgg/WorkshopTemp.cs

@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using _0_Framework.Domain;
+
+namespace Company.Domain.TemporaryClientRegistrationAgg;
+
+public class WorkshopTemp : EntityBase
+{
+    public WorkshopTemp(string workshopName, int countPerson, long contractingPartyTempId, double workshopServicesAmount)
+    {
+        WorkshopName = workshopName;
+        CountPerson = countPerson;
+        ContractingPartyTempId = contractingPartyTempId;
+        WorkshopServicesAmount = workshopServicesAmount;
+    }
+
+    /// <summary>
+    /// نام کارگاه
+    /// </summary>
+    public string WorkshopName { get; private set; }
+
+    /// <summary>
+    /// تعداد پرسنل 
+    /// </summary>
+    public int CountPerson { get; private set; }
+
+    /// <summary>
+    /// ای دی طرف حساب  
+    /// </summary>
+    public long ContractingPartyTempId { get; private set; }
+
+    /// <summary>
+    /// جمع کل مبالغ سرویس ها برای کارگاه
+    /// </summary>
+    public double WorkshopServicesAmount { get; private set; }
+
+    public List<WorkshopServicesTemp> WorkshopServicesTemps { get; private set; }
+
+
+
+    public void Edit(string workshopName, int countPerson, double workshopServicesAmount)
+    {
+        this.WorkshopName = workshopName;
+        this.CountPerson = countPerson;
+        this.WorkshopServicesAmount = workshopServicesAmount;
+    }
+
+
+}

Company.Domain/WorkshopAgg/Workshop.cs

@@ -90,7 +90,9 @@ public class Workshop : EntityBase
     //}
     public Workshop(string workshopName,string workshopSureName, string insuranceCode, string typeOfOwnership, string archiveCode, string agentName, string agentPhone, 
         string state, string city, string address, string typeOfInsuranceSend, string typeOfContract, string contractTerm,
-        string agreementNumber, bool fixedSalary, string population,long? insuranceJobId, string zoneName, bool addBonusesPay, bool addYearsPay, bool addLeavePay, bool totalPaymentHide, bool isClassified, string computeOptions, string bonusesOptions, string yearsOptions, string hasRollCallFreeVip, bool workshopHolidayWorking)
+        string agreementNumber, bool fixedSalary, string population,long? insuranceJobId, string zoneName, bool addBonusesPay, bool addYearsPay, bool addLeavePay, bool totalPaymentHide,
+        bool isClassified, string computeOptions, string bonusesOptions, string yearsOptions, string hasRollCallFreeVip, bool workshopHolidayWorking,
+        bool insuranceCheckoutOvertime, bool insuranceCheckoutFamilyAllowance)
     {
         WorkshopName = workshopName;
         WorkshopSureName = workshopSureName;
@@ -132,6 +134,8 @@ public class Workshop : EntityBase
         YearsOptions = yearsOptions;
         HasRollCallFreeVip = hasRollCallFreeVip;
         WorkshopHolidayWorking = workshopHolidayWorking;
+        InsuranceCheckoutOvertime = insuranceCheckoutOvertime;
+        InsuranceCheckoutFamilyAllowance = insuranceCheckoutFamilyAllowance;
     }
 
 
@@ -198,6 +202,14 @@ public class Workshop : EntityBase
     //کارگاه هایی که در تعطیلات رسمی باز هستند
     public bool WorkshopHolidayWorking { get; private set; }
 
+    /// <summary>
+    /// محاسبه اضافه کار فیش حقوقی در لیست بیمه
+    /// </summary>
+    public bool InsuranceCheckoutOvertime { get; private set; }
+    /// <summary>
+    /// محاسبه حق اولاد در لیست بیمه
+    /// </summary>
+    public bool InsuranceCheckoutFamilyAllowance { get; private set; }
 	//public Employer Employer { get; private set; }
 
 	public Workshop()
@@ -229,7 +241,9 @@ public class Workshop : EntityBase
 
     public void Edit(string workshopName, string workshopSureName, string insuranceCode,string typeOfOwnership, string archiveCode, string agentName, string agentPhone,
         string state, string city, string address, string typeOfInsuranceSend, string typeOfContract, string contractTerm,
-        string agreementNumber, bool fixedSalary, string population, long? insuranceJobId, string zoneName, bool addBonusesPay, bool addYearsPay, bool addLeavePay,bool totalPaymentHide, bool isClassified, string computeOptions, string bonusesOptions, string yearsOptions, string hasRollCallFreeVip, bool workshopHolidayWorking)
+        string agreementNumber, bool fixedSalary, string population, long? insuranceJobId, string zoneName, bool addBonusesPay, bool addYearsPay, bool addLeavePay,
+        bool totalPaymentHide, bool isClassified, string computeOptions, string bonusesOptions, string yearsOptions, string hasRollCallFreeVip, bool workshopHolidayWorking,
+        bool insuranceCheckoutOvertime, bool insuranceCheckoutFamilyAllowance)
     {
         WorkshopName = workshopName;
         WorkshopSureName = workshopSureName;
@@ -268,7 +282,9 @@ public class Workshop : EntityBase
         YearsOptions = yearsOptions;
         HasRollCallFreeVip = hasRollCallFreeVip;
         WorkshopHolidayWorking = workshopHolidayWorking;
-	}
+        InsuranceCheckoutOvertime = insuranceCheckoutOvertime;
+        InsuranceCheckoutFamilyAllowance = insuranceCheckoutFamilyAllowance;
+    }
 
 
     public void Active(string archiveCode)

Company.Domain/YearlySalaryAgg/IYearlySalaryRepository.cs

@@ -11,9 +11,13 @@ namespace Company.Domain.YearlySalaryAgg;
 
 public interface IYearlySalaryRepository : IRepository<long, YearlySalary>
 {
+    /// <summary>
+    /// تست محاسبه مزد پایه
+    /// </summary>
+    void TestDayliFeeCompute();
     List<string> GetYears();
     List<YearlySalaryViewModel> GetYearlySalary();
-    MontlywageBunosYearsViewModel GetMontlyBunosYears(TimeSpan weeklyTime, DateTime contractStart,DateTime contractEnd, double daylyWage, string weeklyWorkingTime, int officialholiday, int friday, string totalHoursH, string totalHorsM, string basic, int fridayStartToEnd, double dayliFeeComplete, bool hasRollCall, bool holidaysWorking);
+    MontlywageBunosYearsViewModel GetMontlyBunosYears(TimeSpan weeklyTime, DateTime contractStart,DateTime contractEnd, double daylyWage, string weeklyWorkingTime, int officialholiday, int friday, string totalHoursH, string totalHorsM, string basic, int fridayStartToEnd, double dayliFeeComplete, bool hasRollCall, bool holidaysWorking,string shiftWork);
     double GetLeavePay(DateTime contractStart, DateTime contractEnd, double daylyWage, double consumableItem, double housingAllowance, double familyAllowance , string weeklyWorkingTime, int officialholiday, int friday, string totalHoursH, string totalHorsM);
     double GetOverTimeWorking(double dayliWage, string overTimeWorkH, string overTimeWorkM);
     double GetOverNightWorking(double dayliWage, string overNightWorkH, string overNightWorkM, string weeklyWorkingTime, int officialholiday, int friday, DateTime contractStart, DateTime contractEnd, string totalHoursH, string totalHorsM);

CompanyManagement.Infrastructure.Excel/CWS/CustomizeWorkshopGroupSettingExcelGenerator.cs

@@ -0,0 +1,179 @@
+using CompanyManagement.Infrastructure.Excel.EmployeeBankInfo;
+using OfficeOpenXml.Style;
+using OfficeOpenXml;
+using System.Drawing;
+using _0_Framework.Application;
+
+namespace CompanyManagement.Infrastructure.Excel.CWS;
+public class CustomizeWorkshopGroupExcelViewModel
+{
+    public string Name { get; set; }
+    public string ShiftType { get; set; }
+    public string Shifts { get; set; }
+    public string Salary { get; set; }
+    public List<CustomizeWorkshopEmployeeExcelViewModel> EmployeeSettings { get; set; }
+}
+
+public class CustomizeWorkshopEmployeeExcelViewModel
+{
+    public string Name { get; set; }
+    public string ShiftType { get; set; }
+    public string Shifts { get; set; }
+    public int LeavePermitted { get; set; }
+    public string Salary { get; set; }
+}
+public class CustomizeWorkshopGroupSettingExcelGenerator
+{
+    public static byte[] Generate(List<CustomizeWorkshopGroupExcelViewModel> groups)
+    {
+        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        using (var package = new ExcelPackage())
+        {
+            var worksheet = package.Workbook.Worksheets.Add("GroupsAndEmployees");
+
+            // Headers
+            worksheet.Cells[1, 1].Value = "نام گروه";
+            worksheet.Cells[1, 2].Value = "نوع شیفت گروه";
+            worksheet.Cells[1, 3].Value = "شیفت گروه";
+            worksheet.Cells[1, 4].Value = "حقوق گروه";
+
+            worksheet.Cells[1, 5].Value = "نام پرسنل";
+            worksheet.Cells[1, 6].Value = "مجاز مرخصی پرسنل";
+            worksheet.Cells[1, 7].Value = "نوع شیفت پرسنل";
+            worksheet.Cells[1, 8].Value = "شیفت پرسنل";
+            worksheet.Cells[1, 9].Value = "حقوق پرسنل";
+
+            using (var range = worksheet.Cells[1, 1, 1, 9])
+            {
+                range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
+                range.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
+                range.Style.Font.Bold = true;
+                range.Style.Fill.PatternType = ExcelFillStyle.Solid;
+                range.Style.Fill.BackgroundColor.SetColor(Color.LightGray); // رنگ پس زمینه خاکستری
+
+                range.Style.Border.BorderAround(ExcelBorderStyle.Thin);
+            }
+
+            int row = 2;
+
+            foreach (var group in groups)
+            {
+                var employees = group.EmployeeSettings ?? new List<CustomizeWorkshopEmployeeExcelViewModel>();
+                int groupStartRow = row;
+                int groupEndRow = employees.Count > 0 ? (row + employees.Count - 1) : row;
+
+                if (employees.Count == 0)
+                {
+                    // گروه بدون پرسنل
+                    worksheet.Cells[row, 1].Value = group.Name;
+                    worksheet.Cells[row, 2].Value = group.ShiftType;
+                    worksheet.Cells[row, 3].Value = group.Shifts;
+                    worksheet.Cells[row, 4].Value = Convert.ToInt32(group.Salary);
+
+                    ApplyGroupStyle(worksheet, row, row);
+                    worksheet.Cells[row, 4].Style.Numberformat.Format = "#,##0";
+                    using (var thickBorderRange = worksheet.Cells[groupEndRow, 1, groupEndRow, 9])
+                    {
+                        thickBorderRange.Style.Border.Bottom.Style = ExcelBorderStyle.Thick;
+                    }
+                    row++;
+                }
+                else
+                {
+                    foreach (var employee in employees)
+                    {
+                        worksheet.Cells[row, 5].Value = employee.Name;
+                        worksheet.Cells[row, 6].Value = employee.LeavePermitted;
+                        worksheet.Cells[row, 7].Value = employee.ShiftType;
+                        worksheet.Cells[row, 8].Value = employee.Shifts;
+                        worksheet.Cells[row, 9].Value = Convert.ToInt32(employee.Salary);
+
+                        ApplyEmployeeStyle(worksheet, row);
+                        worksheet.Cells[row, 9].Style.Numberformat.Format = "#,##0";
+                        row++;
+                    }
+
+                    // Merge اطلاعات گروه برای تمام پرسنل
+                    worksheet.Cells[groupStartRow, 1, groupEndRow, 1].Merge = true;
+                    worksheet.Cells[groupStartRow, 1].Value = group.Name;
+
+                    worksheet.Cells[groupStartRow, 2, groupEndRow, 2].Merge = true;
+                    worksheet.Cells[groupStartRow, 2].Value = group.ShiftType;
+
+                    worksheet.Cells[groupStartRow, 3, groupEndRow, 3].Merge = true;
+                    worksheet.Cells[groupStartRow, 3].Value = group.Shifts;
+
+                    worksheet.Cells[groupStartRow, 4, groupEndRow, 4].Merge = true;
+                    worksheet.Cells[groupStartRow, 4].Value = Convert.ToInt32(group.Salary);
+
+                    ApplyGroupStyle(worksheet, groupStartRow, groupEndRow);
+
+                    worksheet.Cells[groupStartRow, 4, groupEndRow, 4].Style.Numberformat.Format = "#,##0";
+
+
+                    worksheet.Cells[groupEndRow, 1, groupEndRow, 9].Style.Border.Bottom.Style = ExcelBorderStyle.Thick;
+
+                }
+            }
+            worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns();
+
+            for (int i = 2; i <= worksheet.Dimension.Rows; i++)
+            {
+                worksheet.Row(i).Height = 50;
+            }
+
+            int groupShiftCol = 3;
+            int employeeShiftCol = 8;
+            int groupSalary = 4;
+            int employeeSalary = 9;
+            int employeeName =5;
+            worksheet.Columns[groupShiftCol].Width = 15;
+            worksheet.Columns[employeeShiftCol].Width = 15;
+            worksheet.Columns[groupSalary].Width = 16;
+            worksheet.Columns[employeeSalary].Width = 16;
+            worksheet.Columns[employeeName].Width = 24;
+            worksheet.View.RightToLeft = true; // فارسی
+            return package.GetAsByteArray();
+        }
+    }
+
+    private static void ApplyEmployeeStyle(ExcelWorksheet worksheet, int row)
+    {
+        using (var range = worksheet.Cells[row, 5, row, 9])
+        {
+            //range.Style.Fill.PatternType = ExcelFillStyle.Solid;
+            //range.Style.Fill.BackgroundColor.SetColor(Color.FromArgb(198, 239, 206)); // سبز خیلی روشن
+            range.Style.Border.BorderAround(ExcelBorderStyle.Thin);
+            range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
+            range.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
+
+            // اضافه کردن بوردر به همه‌ی سلول‌های ردیف پرسنل
+            range.Style.Border.Top.Style = ExcelBorderStyle.Thin;
+            range.Style.Border.Bottom.Style = ExcelBorderStyle.Thin;
+            range.Style.Border.Left.Style = ExcelBorderStyle.Thin;
+            range.Style.Border.Right.Style = ExcelBorderStyle.Thin;
+
+            range.Style.WrapText = true;
+        }
+    }
+
+    private static void ApplyGroupStyle(ExcelWorksheet worksheet, int startRow, int endRow)
+    {
+        using (var range = worksheet.Cells[startRow, 1, endRow, 4])
+        {
+            //range.Style.Fill.PatternType = ExcelFillStyle.Solid;
+            //range.Style.Fill.BackgroundColor.SetColor(Color.FromArgb(255, 255, 204)); // زرد خیلی روشن
+            range.Style.Border.BorderAround(ExcelBorderStyle.Thin);
+            range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
+            range.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
+
+            // اضافه کردن بوردر به همه‌ی سلول‌های گروه
+            range.Style.Border.Top.Style = ExcelBorderStyle.Thin;
+            range.Style.Border.Bottom.Style = ExcelBorderStyle.Thin;
+            range.Style.Border.Left.Style = ExcelBorderStyle.Thin;
+            range.Style.Border.Right.Style = ExcelBorderStyle.Thin;
+
+            range.Style.WrapText = true;
+        }
+    }
+}

CompanyManagement.Infrastructure.Excel/CaseManagement/CaseManagementExcelGenerator.cs

@@ -0,0 +1,134 @@
+using System.Drawing;
+using OfficeOpenXml.Style;
+using OfficeOpenXml;
+using CompanyManagement.Infrastructure.Excel.Checkout;
+using CompanyManagment.App.Contracts.File1;
+using Microsoft.AspNetCore.Server.HttpSys;
+using _0_Framework.Application;
+
+namespace CompanyManagement.Infrastructure.Excel.CaseManagement;
+
+public class CaseManagementExcelGenerator
+{
+    public static Dictionary<string, string> Header { get; set; } = new()
+    {
+        {"ArchiveNumber","شماره بایگانی"},
+        {"FileClass","کلاسه پرونده"},
+        {"Client","موکل"},
+        {"LitigationParty","طرف دعوی"},
+        {"DiagnosisPetitionTotalPenalty","مبلغ دادنامه تشخیص"},
+        {"DisputeResolutionTotalPenalty","مبلغ دادنامه حل اختلاف"},
+        {"MclsUsername","نام کاربری"},
+        {"MclsPassword","رمز عبور"},
+
+    };
+    public static byte[] GenerateCheckoutTempExcelInfo(List<FileExcelViewModel> data)
+    {
+        OfficeOpenXml.ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        using var package = new ExcelPackage();
+        CreateSheet(data, package,"همه");
+        CreateSheet(data.Where(x=>x.Status ==2).ToList(), package,"فعال");
+        CreateSheet(data.Where(x=>x.Status == 1).ToList(), package,"غیرفعال");
+        CreateSheet(data.Where(x=>x.Status == 3).ToList(), package,"خروج موقت");
+
+        return package.GetAsByteArray();
+    }
+
+    private static void CreateSheet(List<FileExcelViewModel> data, ExcelPackage package,string sheetName)
+    {
+        var worksheet = package.Workbook.Worksheets.Add(sheetName);
+
+        var indexCell = worksheet.Cells[1, 1];
+        indexCell.Value = "ردیف";
+        ApplyHeaderStyle(indexCell);
+
+        for (int i = 0; i < Header.Count; i++)
+        {
+            worksheet.Cells[1, i + 2].Value = Header.ElementAt(i).Value;
+            ApplyHeaderStyle(worksheet.Cells[1, i + 2]);
+        }
+        var dataRow = 2;
+        foreach (var item in data)
+        {
+            var column = 2;
+            foreach (var header in Header)
+            {
+                var property = item.GetType().GetProperty(header.Key);
+                var value = property.GetValue(item, null)?.ToString();
+
+                var cell = worksheet.Cells[dataRow, column];
+
+                // Check if the property requires MoneyToDouble()
+
+                if (RequiresMoneyToDouble(property.Name))
+                {
+                    cell.Value = MoneyToDouble(value);
+                    cell.Style.Numberformat.Format = "#,##0";
+                }
+                else
+                {
+                    cell.Value = value;
+                }
+                ApplyGeneralDataStyle(worksheet.Cells[dataRow, column]);
+                switch (item.Status)
+                {
+                    case 1:
+                        cell.Style.Fill.BackgroundColor.SetColor(System.Drawing.Color.Gray);
+                        break;
+                    case 2:
+                        cell.Style.Fill.BackgroundColor.SetColor(Color.White);
+                        break;
+                    case 3:
+                        cell.Style.Fill.BackgroundColor.SetColor(Color.Orange);
+                        break;
+                }
+                column++;
+            }
+
+
+
+            var rowCounter = worksheet.Cells[dataRow, 1];
+            rowCounter.Value = dataRow - 1;
+
+            dataRow++;
+        }
+
+        worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns();
+        worksheet.View.RightToLeft = true;
+    }
+
+    private static bool RequiresMoneyToDouble(string propertyName)
+    {
+        var propertiesRequiringConversion = new HashSet<string>
+        {
+            "DiagnosisPetitionTotalPenalty", "DisputeResolutionTotalPenalty"
+        };
+        return propertiesRequiringConversion.Contains(propertyName);
+    }
+    private static double MoneyToDouble(string value)
+    {
+        Console.WriteLine(value);
+        var min = value.Length > 1 ? value.Substring(0, 2) : "";
+        var test = min == "\u200e\u2212" ? value.MoneyToDouble() * -1 : value.MoneyToDouble();
+
+        Console.WriteLine(test);
+        return test;
+    }
+
+
+    private static void ApplyHeaderStyle(ExcelRange cell)
+    {
+        cell.Style.Font.Bold = true;
+        cell.Style.Fill.PatternType = ExcelFillStyle.Solid;
+        cell.Style.Fill.BackgroundColor.SetColor(System.Drawing.Color.LightGray);
+        cell.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
+        cell.Style.Border.BorderAround(ExcelBorderStyle.Thin);
+    }
+    private static void ApplyGeneralDataStyle(ExcelRange cell)
+    {
+        cell.Style.Border.BorderAround(ExcelBorderStyle.Thin);
+        cell.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
+        cell.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
+        cell.Style.Fill.PatternType = ExcelFillStyle.Solid;
+    }
+}

CompanyManagement.Infrastructure.Excel/CompanyManagement.Infrastructure.Excel.csproj

@@ -13,5 +13,8 @@
     <ProjectReference Include="..\AccountMangement.Infrastructure.EFCore\AccountMangement.Infrastructure.EFCore.csproj" />
     <ProjectReference Include="..\CompanyManagment.EFCore\CompanyManagment.EFCore.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="CaseManagement\" />
+  </ItemGroup>
 
 </Project>

CompanyManagement.Infrastructure.Excel/SalaryAid/SalaryAidImportExcel.cs

@@ -6,7 +6,7 @@ using LicenseContext = OfficeOpenXml.LicenseContext;
 
 namespace CompanyManagement.Infrastructure.Excel.SalaryAid;
 
-public record SalaryAidImportData(long EmployeeId, long WorkshopId, string FullName, double Amount, string AccountNumber, string NationalCode, string SalaryAidDateTime, int Row, bool Duplicated);
+public record SalaryAidImportData(long EmployeeId, long WorkshopId, string FullName, double Amount, string AccountNumber, string NationalCode, string SalaryAidDateTime, int calculationMonth, int calculationYear, int Row, bool Duplicated);
 
 public class ExcelValidation<T>
 {
@@ -80,35 +80,59 @@ public class SalaryAidImportExcel
 
 
         // بررسی اینکه هدرها همان چیزی هستند که ما انتظار داریم
-        if (worksheet.Cells[2, 1].Text != "نام و نام خانوادگی" ||
-            worksheet.Cells[2, 2].Text != "کد ملی" ||
-            worksheet.Cells[2, 3].Text != "شماره حساب" ||
-            worksheet.Cells[2, 4].Text != "مبلغ قابل پرداخت" ||
-            worksheet.Cells[1, 1].Text != "تاریخ پرداخت")
+        if (worksheet.Cells[3, 1].Text != "نام و نام خانوادگی" ||
+            worksheet.Cells[3, 2].Text != "کد ملی" ||
+            worksheet.Cells[3, 3].Text != "شماره حساب" ||
+            worksheet.Cells[3, 4].Text != "مبلغ قابل پرداخت" ||
+            worksheet.Cells[1, 3].Text != "تاریخ پرداخت" ||
+            worksheet.Cells[1, 1].Text != "سال محاسبه" ||
+            worksheet.Cells[1, 2].Text != "ماه محاسبه")
         {
             result.Errors.Add(new SalaryAidImportExcelError("ساختار فایل اکسل اشتباه است.", 0, SalaryAidExcelColumns.None.ToString()));
             return result;
         }
 
-        var salaryDateFa = worksheet.Cells[1, 4].Text;
+        var salaryDateFa = worksheet.Cells[2, 3].Text;
+
+        var calculationMonth = Convert.ToInt32(string.IsNullOrWhiteSpace(worksheet.Cells[2, 2].Text) ? "0" : worksheet.Cells[2, 2].Text);
+        var calculationYear = Convert.ToInt32(string.IsNullOrWhiteSpace(worksheet.Cells[2, 1].Text) ? "0" : worksheet.Cells[2, 1].Text);
+
 
         if (string.IsNullOrWhiteSpace(salaryDateFa))
         {
             result.Errors.Add(new SalaryAidImportExcelError("لطفا در سلول زرد رنگ تاریخ پرداخت را وارد کنید", 0, SalaryAidExcelColumns.None.ToString()));
             return result;
         }
+        if (calculationMonth == 0)
+        {
+            result.Errors.Add(new SalaryAidImportExcelError("لطفا در سلول آبی رنگ ماه محاسبه را وارد کنید", 0, SalaryAidExcelColumns.None.ToString()));
+            return result;
+        }
+        if (calculationYear == 0)
+        {
+            result.Errors.Add(new SalaryAidImportExcelError("لطفا در سلول آبی رنگ سال محاسبه را وارد کنید", 0, SalaryAidExcelColumns.None.ToString()));
+            return result;
+        }
+
+        var calculationDate = $"{calculationYear:0000}/{calculationMonth:00}/01";
 
         if (salaryDateFa.TryToGeorgianDateTime(out var salaryDateTime) == false)
         {
             result.Errors.Add(new SalaryAidImportExcelError("تاریخ وارد شده نامعتبر است", 0, SalaryAidExcelColumns.None.ToString()));
         }
+
+        if (calculationDate.TryToGeorgianDateTime(out var calculationDateTime) == false)
+        {
+            result.Errors.Add(new SalaryAidImportExcelError("تاریخ محاسبه وارد شده نامعتبر است", 0, SalaryAidExcelColumns.None.ToString()));
+        }
+
         if (salaryDateTime > DateTime.Now)
         {
             result.Errors.Add(new SalaryAidImportExcelError("تاریخ پرداخت مساعده می بایست تاریخ امروز یا قبل تر باشد", 0, SalaryAidExcelColumns.None.ToString()));
         }
         int rowCount = worksheet.Dimension.Rows;
 
-        int rowStart = 3;
+        int rowStart = 4;
 
         if (rowCount < rowStart)
         {
@@ -129,9 +153,9 @@ public class SalaryAidImportExcel
                 result.Errors.Add(new SalaryAidImportExcelError("مبلغ خالی یا نامعتبر است", row, SalaryAidExcelColumns.Amount.ToString()));
 
             }
-            result.RawData.Add(new SalaryAidImportData(0, workshopId, fullName, amount, accountNumber, nationalCode, salaryDateFa, row, false));
+            result.RawData.Add(new SalaryAidImportData(0, workshopId, fullName, amount, accountNumber, nationalCode, salaryDateFa, calculationMonth, calculationYear, row, false));
 
-			if (string.IsNullOrWhiteSpace(fullName))
+            if (string.IsNullOrWhiteSpace(fullName))
             {
                 result.Errors.Add(new SalaryAidImportExcelError(" نام و نام خانوادگی خالی است", row, SalaryAidExcelColumns.FullName.ToString()));
 
@@ -204,25 +228,61 @@ public class SalaryAidImportExcel
             var year = Convert.ToInt32(salaryDateFa.Substring(0, 4));
 
 
-            if (_companyContext.CustomizeCheckouts.Any(x => x.WorkshopId == workshopId && x.EmployeeId == employee.id && x.YearInt == year && x.MonthInt == month))
+            //if (_companyContext.CustomizeCheckouts.Any(x => x.WorkshopId == workshopId && x.EmployeeId == employee.id && x.YearInt == year && x.MonthInt == month))
+            //{
+            //    result.Errors.Add(new SalaryAidImportExcelError($" پرسنل {fullName} در تاریخ {salaryDateFa} دارای فیش حقوقی غیررسمی است.", row, SalaryAidExcelColumns.None.ToString()));
+            //}
+
+
+            _ = DateTime.Now.Date.AddMonthsFa(-1, out var oneMonthAgoGr);
+
+            if (oneMonthAgoGr > calculationDateTime)
             {
-                result.Errors.Add(new SalaryAidImportExcelError($" پرسنل {fullName} در تاریخ {salaryDateFa} دارای فیش حقوقی غیررسمی است.", row, SalaryAidExcelColumns.None.ToString()));
+                bool customizeCheckout = false;
+                bool customizeCheckoutTemp = false;
+                bool checkout = false;
+                if (_companyContext.CustomizeCheckouts.Any(x => x.WorkshopId == workshopId && employee.id == x.EmployeeId &&
+                                                                x.ContractStart <= oneMonthAgoGr && x.ContractEnd >= calculationDateTime))
+                {
+                    customizeCheckout = true;
+                }
+
+                if (_companyContext.CustomizeCheckoutTemps.Any(x => x.WorkshopId == workshopId && employee.id == x.EmployeeId &&
+                                                                    x.ContractStart <= calculationDateTime && x.ContractEnd >= oneMonthAgoGr))
+                {
+                    customizeCheckoutTemp = true;
+                }
+
+                if (_companyContext.CheckoutSet.Any(x => x.WorkshopId == workshopId && employee.id == x.EmployeeId &&
+                                                         x.ContractStart <= calculationDateTime && x.ContractEnd >= oneMonthAgoGr))
+                {
+                    checkout = true;
+                }
+                if (customizeCheckout || customizeCheckoutTemp)
+                {
+                    result.Errors.Add(new SalaryAidImportExcelError($"شما نمیتوانید به پرسنل {fullName} در تاریخ قبل از یک ماه گذشته که فیش صادر شده باشد مساعده دهید", row, SalaryAidExcelColumns.None.ToString()));
+                }
             }
 
+            //if(_companyContext.CheckoutSet.Any(x => x.WorkshopId == workshopId && employee.id == x.EmployeeId &&
+            //                                       x.ContractStart <= calculationDateTime && x.ContractEnd >= calculationDateTime))
+            //    result.Errors.Add(new SalaryAidImportExcelError($"پرسنل {fullName} در تاریخ {calculationDate} دارای فیش رسمی میباشد", row, SalaryAidExcelColumns.None.ToString()));
+
+
             if (_companyContext.SalaryAids.Any(x => x.Amount == amount && x.EmployeeId == employee.id && x.WorkshopId == workshopId && x.SalaryAidDateTime == salaryDateTime))
             {
                 // TODO MAHAN: Vafa Add this Code! Please Check it!
 
-                 result.RawData.Add(new SalaryAidImportData(employee.id, workshopId, fullName, amount, accountNumber, nationalCode, salaryDateFa, row, true));
-				continue;
+                result.RawData.Add(new SalaryAidImportData(employee.id, workshopId, fullName, amount, accountNumber, nationalCode, salaryDateFa, calculationMonth, calculationYear, row, true));
+                continue;
             }
-            result.ValidData.Add(new SalaryAidImportData(employee.id, workshopId, fullName, amount, accountNumber, nationalCode, salaryDateFa, row, false));
+            result.ValidData.Add(new SalaryAidImportData(employee.id, workshopId, fullName, amount, accountNumber, nationalCode, salaryDateFa, calculationMonth, calculationYear, row, false));
         }
 
-        result.RawData = result.RawData.GroupBy(x => x.Row).Select(x => new SalaryAidImportData(x.First().EmployeeId,
-	        x.First().WorkshopId, x.First().FullName,
-	        x.First().Amount, x.First().AccountNumber, x.First().NationalCode, x.First().SalaryAidDateTime, x.Key,
-	        x.Any(s => s.Duplicated))).ToList();
+        result.RawData = result.RawData.GroupBy(x => x.Row).Select(x => new SalaryAidImportData(x.Last().EmployeeId,
+            x.First().WorkshopId, x.First().FullName,
+            x.First().Amount, x.First().AccountNumber, x.First().NationalCode, x.First().SalaryAidDateTime, x.First().calculationMonth, x.First().calculationYear, x.Key,
+            x.Any(s => s.Duplicated))).ToList();
 
 
         //result.Errors.GroupBy(x => x.Row).Select(x => new

CompanyManagment.App.Contracts/Board/IBoardApplication.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using _0_Framework_b.Application;
+using _0_Framework.Application;
 
 namespace CompanyManagment.App.Contracts.Board;
 

CompanyManagment.App.Contracts/Checkout/CreateCheckout.cs

@@ -136,4 +136,6 @@ public class CreateCheckout
 
     public bool HolidayWorking { get; set; }
 
+    public string ShiftWork { get; set; }
+
 }

CompanyManagment.App.Contracts/Checkout/MainViewModel.cs

@@ -10,4 +10,6 @@ public class MainViewModel
 {
     public List<CheckoutViewModel> MainList { get; set; }
     public string WorkshopSearch { get; set; }
+
+    public bool IsSysManager { get; set; }
 }