complete method for weeklyDayOfweek...

0_Framework/Application/Enums/ActivationStatus.cs

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

0_Framework/Application/Enums/LegalType.cs

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

0_Framework/Application/SelectListViewModel.cs

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

0_Framework/Application/Tools.cs

@@ -41,23 +41,6 @@ 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>
     /// دریافت روزهای کارکرد پرسنل در لیست بیمه ماه مشخص شده

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

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

AccountManagement.Application.Contracts/Media/IMediaApplication.cs

@@ -4,13 +4,12 @@ using System.Collections.Generic;
 
 namespace AccountManagement.Application.Contracts.Media
 {
-    public interface IMediaApplication
-    {
-        MediaViewModel Get(long id);
-        OperationResult UploadFile(IFormFile file, string fileLabel, string relativePath, int maximumFileLength,
-            List<string> allowedExtensions, string category);
-        OperationResult MoveFile(long mediaId, string newRelativePath);
-        OperationResult DeleteFile(long mediaId);
-        List<MediaViewModel> GetRange(IEnumerable<long> select);
-    }
-}
+	public interface IMediaApplication
+	{
+		MediaViewModel Get(long id);
+		OperationResult UploadFile(IFormFile file, string fileLabel, string relativePath, int maximumFileLength, List<string> allowedExtensions);
+		OperationResult MoveFile(long mediaId, string newRelativePath);
+		OperationResult DeleteFile(long mediaId);
+		List<MediaViewModel> GetRange(IEnumerable<long> select);
+	}
+}

AccountManagement.Application/MediaApplication.cs

@@ -9,113 +9,147 @@ using Microsoft.AspNetCore.Http;
 
 namespace AccountManagement.Application
 {
-    public class MediaApplication : IMediaApplication
-    {
+	public class MediaApplication:IMediaApplication
+	{
 
 
-        private const string _basePath = "Medias";
-        private readonly IMediaRepository _mediaRepository;
+		private const string _basePath = "Medias";
+		private readonly IMediaRepository _mediaRepository;
 
-        public MediaApplication(IMediaRepository mediaRepository)
-        {
-            _mediaRepository = mediaRepository;
-        }
+		public MediaApplication(IMediaRepository mediaRepository)
+		{
+			_mediaRepository = mediaRepository;
+		}
 
 
-        /// <summary>
-        /// دریافت فایل و نوشتن آن در مسیر داده شده، و ثبت مدیا
-        /// </summary>
-        /// <param name="file">فایل</param>
-        /// <param name="fileLabel">برچسب فایل که در نام فایل ظاهر می شود</param>
-        /// <param name="relativePath">مسیر فایل</param>
-        /// <param name="maximumFileLength">حداکثر حجم فایل به مگابایت</param>
-        /// <param name="allowedExtensions">[.png,.jpg,.jpeg] پسوند های مجاز مثلا </param>
-        /// <param name="category"></param>
-        /// <returns></returns>
-        public OperationResult UploadFile(IFormFile file, string fileLabel, string relativePath, int maximumFileLength,
-            List<string> allowedExtensions, string category)
-        {
-            return _mediaRepository.UploadFile(file, fileLabel, relativePath, maximumFileLength, allowedExtensions, category);
-        }
+		/// <summary>
+		/// دریافت فایل و نوشتن آن در مسیر داده شده، و ثبت مدیا
+		/// </summary>
+		/// <param name="file">فایل</param>
+		/// <param name="fileLabel">برچسب فایل که در نام فایل ظاهر می شود</param>
+		/// <param name="relativePath">مسیر فایل</param>
+		/// <param name="allowedExtensions">[.png,.jpg,.jpeg] پسوند های مجاز مثلا </param>
+		/// <param name="maximumFileLength">حداکثر حجم فایل به مگابایت</param>
+		/// <returns></returns>
+		public OperationResult UploadFile(IFormFile file, string fileLabel, string relativePath,int maximumFileLength,List<string> allowedExtensions)
+		{
+			OperationResult op = new();
+			var path = Path.Combine(_basePath, relativePath);
+			var fileExtension = Path.GetExtension(file.FileName);
+
+			if (file == null || file.Length == 0)
+				return op.Failed("خطای سیستمی");
+
+			if (file.Length > (maximumFileLength * 1024 * 1024))
+				return op.Failed($"حجم فایل نمی تواند بیشتر از " +
+				                 $"{maximumFileLength}" +
+				                 $"مگابایت باشد");
+
+			if (!allowedExtensions.Contains(fileExtension.ToLower()))
+			{
+				var operationMessage = ":فرمت فایل باید یکی از موارد زیر باشد";
+				operationMessage += "\n";
+				operationMessage += string.Join(" ", allowedExtensions);
+				return op.Failed(operationMessage);
+			}
 
 
-        /// <summary>
-        /// حذف فایل
-        /// </summary>
-        public OperationResult DeleteFile(long mediaId)
-        {
-            OperationResult op = new();
-            var media = _mediaRepository.Get(mediaId);
-            if (media == null)
-                return op.Failed("رکورد مورد نظر یافت نشد");
-            try
-            {
-                if (File.Exists(media.Path))
-                    File.Delete(media.Path);
-                else
-                    return op.Failed("فایل یافت نشد");
-            }
-            catch
-            {
-                return op.Failed("خطایی در حذف فایل رخ داده است");
-            }
+			Directory.CreateDirectory(path);
 
-            _mediaRepository.Remove(media.id);
-            _mediaRepository.SaveChanges();
-            return op.Succcedded();
-        }
+			var extension = Path.GetExtension(file.FileName);
 
-        /// <summary>
-        /// جابجا کردن فایل 
-        /// </summary>
-        public OperationResult MoveFile(long mediaId, string newRelativePath)
-        {
-            OperationResult op = new();
-            var media = _mediaRepository.Get(mediaId);
-            var oldPath = media.Path;
-            var path = Path.Combine(_basePath, newRelativePath);
-            Directory.CreateDirectory(path);
+			var uniqueFileName = $"{fileLabel}-{DateTime.Now.Ticks}{extension}";
+			var filePath = Path.Combine(path, uniqueFileName);
+			using (var fileStream = new FileStream(filePath, FileMode.CreateNew))
+			{
+				file.CopyTo(fileStream);
+			}
+			var mediaEntity = new Media(filePath, extension, "فایل", "EmployeeDocuments");
+			_mediaRepository.Create(mediaEntity);
+			_mediaRepository.SaveChanges();
 
-            string filepath = Path.Combine(path, Path.GetFileName(oldPath));
-            try
-            {
-                File.Move(oldPath, filepath);
-            }
-            catch
-            {
-                return op.Failed("در جابجایی فایل خطایی رخ داده است");
-            }
+			return op.Succcedded(mediaEntity.id);
 
-            media.Edit(filepath, media.Type, media.Category);
-            _mediaRepository.SaveChanges();
-            return op.Succcedded();
-        }
+		}
 
-        public MediaViewModel Get(long id)
-        {
-            var media = _mediaRepository.Get(id);
-            if (media == null)
-                return new();
-            return new MediaViewModel()
-            {
-                Category = media.Category,
-                Path = media.Path,
-                Id = media.id,
-                Type = media.Type
-            };
-        }
 
-        public List<MediaViewModel> GetRange(IEnumerable<long> ids)
-        {
-            var medias = _mediaRepository.GetRange(ids);
-            return medias.Select(x => new MediaViewModel()
-            {
-                Category = x.Category,
-                Path = x.Path,
-                Id = x.id,
-                Type = x.Type,
-            }).ToList();
-        }
+		/// <summary>
+		/// حذف فایل
+		/// </summary>
+		public OperationResult DeleteFile(long mediaId)
+		{
+			OperationResult op = new();
+			var media = _mediaRepository.Get(mediaId);
+			if (media == null)
+				return op.Failed("رکورد مورد نظر یافت نشد");
+			try
+			{
+				if (File.Exists(media.Path))
+					File.Delete(media.Path);
+				else
+					return op.Failed("فایل یافت نشد");
+			}
+			catch
+			{
+				return op.Failed("خطایی در حذف فایل رخ داده است");
+			}
 
-    }
+			_mediaRepository.Remove(media.id);
+			_mediaRepository.SaveChanges();
+			return op.Succcedded();
+		}
+
+		/// <summary>
+		/// جابجا کردن فایل 
+		/// </summary>
+		public OperationResult MoveFile(long mediaId, string newRelativePath)
+		{
+			OperationResult op = new();
+			var media = _mediaRepository.Get(mediaId);
+			var oldPath = media.Path;
+			var path = Path.Combine(_basePath, newRelativePath);
+			Directory.CreateDirectory(path);
+
+			string filepath = Path.Combine(path, Path.GetFileName(oldPath));
+			try
+			{
+				File.Move(oldPath, filepath);
+			}
+			catch
+			{
+				return op.Failed("در جابجایی فایل خطایی رخ داده است");
+			}
+
+			media.Edit(filepath, media.Type, media.Category);
+			_mediaRepository.SaveChanges();
+			return op.Succcedded();
+		}
+
+		public MediaViewModel Get(long id)
+		{
+			var media = _mediaRepository.Get(id);
+			if (media == null)
+				return new();
+			return new MediaViewModel()
+			{
+				Category = media.Category,
+				Path = media.Path,
+				Id = media.id,
+				Type = media.Type
+			};
+		}
+
+		public List<MediaViewModel> GetRange(IEnumerable<long> ids)
+		{
+			var medias = _mediaRepository.GetRange(ids);
+			return medias.Select(x=>new MediaViewModel()
+			{
+				Category = x.Category,
+				Path = x.Path,
+				Id = x.id,
+				Type = x.Type,
+			}).ToList();
+		}
+
+	}
 }

AccountManagement.Domain/MediaAgg/IMediaRepository.cs

@@ -1,15 +1,12 @@
 using System.Collections.Generic;
-using _0_Framework.Application;
 using _0_Framework.Domain;
 using AccountManagement.Application.Contracts.Media;
-using Microsoft.AspNetCore.Http;
 
 
 namespace AccountManagement.Domain.MediaAgg;
 
-public interface IMediaRepository : IRepository<long, Media>
+public interface IMediaRepository:IRepository<long,Media>
 {
-    public string BasePath { get; protected set; }
     void CreateMediaWithTaskMedia(long taskId, long mediaId);
     List<MediaViewModel> GetMediaByTaskId(long taskId);
     void Remove(long id);
@@ -26,6 +23,4 @@ public interface IMediaRepository : IRepository<long, Media>
 
     #endregion
 
-    OperationResult UploadFile(IFormFile file, string fileLabel, string relativePath, int maximumFileLength,
-        List<string> allowedExtensions, string category);
 }

AccountMangement.Infrastructure.EFCore/Repository/MediaRepository.cs

@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.Collections.Generic;
 using System.Linq;
-using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using AccountManagement.Application.Contracts.Media;
 using AccountManagement.Domain.AdminResponseMediaAgg;
@@ -10,35 +7,27 @@ using AccountManagement.Domain.ClientResponseMediaAgg;
 using AccountManagement.Domain.MediaAgg;
 using AccountManagement.Domain.TaskMediaAgg;
 using AccountManagement.Domain.TicketMediasAgg;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 
 namespace AccountMangement.Infrastructure.EFCore.Repository;
 
-public class MediaRepository : RepositoryBase<long, Media>, IMediaRepository
+public class MediaRepository:RepositoryBase<long,Media>,IMediaRepository
 {
-    private const string _basePath = "Storage/Medias";
-    public string BasePath { get; set; }
-
-
     private readonly AccountContext _accountContext;
-    public MediaRepository(AccountContext taskManagerContext, IWebHostEnvironment webHostEnvironment) : base(taskManagerContext)
+    public MediaRepository( AccountContext taskManagerContext) : base(taskManagerContext)
     {
         _accountContext = taskManagerContext;
-        BasePath = webHostEnvironment.ContentRootPath + "/Storage";
     }
     //ساخت جدول واسط بین مدیا و نسک
     //نکته: این متد ذخیره انجام نمیدهد
-
     public void CreateMediaWithTaskMedia(long taskId, long mediaId)
     {
-        var Taskmedias = new TaskMedia(taskId, mediaId);
+        var Taskmedias = new TaskMedia(taskId,mediaId);
         _accountContext.Add(Taskmedias);
     }
     public void Remove(long id)
     {
-        var media = Get(id);
+	    var media = Get(id);
         Remove(media);
     }
 
@@ -88,48 +77,6 @@ public class MediaRepository : RepositoryBase<long, Media>, IMediaRepository
     {
         return _accountContext.Medias.Where(x => mediaIds.Contains(x.id)).ToList();
     }
-
-    public OperationResult UploadFile(IFormFile file, string fileLabel, string relativePath, int maximumFileLength,
-        List<string> allowedExtensions, string category)
-    {
-        OperationResult op = new();
-        var path = Path.Combine(_basePath, relativePath);
-        var fileExtension = Path.GetExtension(file.FileName);
-
-        if (file == null || file.Length == 0)
-            return op.Failed("خطای سیستمی");
-
-        if (file.Length > (maximumFileLength * 1024 * 1024))
-            return op.Failed($"حجم فایل نمی تواند بیشتر از " +
-                             $"{maximumFileLength}" +
-                             $"مگابایت باشد");
-
-        if (!allowedExtensions.Contains(fileExtension.ToLower()))
-        {
-            var operationMessage = ":فرمت فایل باید یکی از موارد زیر باشد";
-            operationMessage += "\n";
-            operationMessage += string.Join(" ", allowedExtensions);
-            return op.Failed(operationMessage);
-        }
-
-
-        Directory.CreateDirectory(path);
-
-        var extension = Path.GetExtension(file.FileName);
-
-        var uniqueFileName = $"{fileLabel}-{DateTime.Now.Ticks}{extension}";
-        var filePath = Path.Combine(path, uniqueFileName);
-        using (var fileStream = new FileStream(filePath, FileMode.CreateNew))
-        {
-            file.CopyTo(fileStream);
-        }
-        var mediaEntity = new Media(filePath, extension, "فایل", category);
-        Create(mediaEntity);
-        SaveChanges();
-
-        return op.Succcedded(mediaEntity.id);
-
-    }
 }
 
 #endregion

Company.Domain/ContactUsAgg/ContactUs.cs

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

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

Company.Domain/ContarctingPartyAgg/IPersonalContractingPartyRepository.cs

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

Company.Domain/CustomizeWorkshopEmployeeSettingsAgg/Entities/CustomizeWorkshopEmployeeSettings.cs

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

Company.Domain/CustomizeWorkshopGroupSettingsAgg/Entities/CustomizeWorkshopGroupSettings.cs

@@ -27,11 +27,12 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
          FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay,
         BonusesPay bonusesPay, NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
         FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
-        FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, FridayWork fridayWork,
-        HolidayWork holidayWork, BreakTime breakTime, WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, int leavePermittedDays, ICollection<CustomizeRotatingShift> rotatingShifts) :
+        FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
+        HolidayWork holidayWork, BreakTime breakTime, WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, int leavePermittedDays,
+        ICollection<CustomizeRotatingShift> rotatingShifts, List<WeeklyOffDay> weeklyOffDays) :
         base(fridayPay, overTimePay, baseYearsPay, bonusesPay, nightWorkPay,
         marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
-        earlyExit, fridayWork, holidayWork, breakTime, leavePermittedDays)
+        earlyExit, holidayWork, breakTime, leavePermittedDays,weeklyOffDays)
     {
         GroupName = groupName;
         Salary = salary;
@@ -76,7 +77,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
         LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
         LateToWork lateToWork, EarlyExit earlyExit,
-        ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts, FridayWork fridayWork,
+        ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
         HolidayWork holidayWork, IrregularShift irregularShift, ICollection<CustomizeRotatingShift> rotatingShifts,
         WorkshopShiftStatus workshopShiftStatus, long customizeWorkshopSettingId, BreakTime breakTime, int leavePermittedDays)
     {
@@ -96,7 +97,6 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         FineAbsenceDeduction = fineAbsenceDeduction;
         LateToWork = lateToWork;
         EarlyExit = earlyExit;
-        FridayWork = fridayWork;
         HolidayWork = holidayWork;
         LeavePermittedDays = leavePermittedDays;
         CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
@@ -123,7 +123,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
         NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
         LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
-        LateToWork lateToWork, EarlyExit earlyExit, FridayWork fridayWork, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
+        LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
     {
         GroupName = groupName;
         Salary = salary;
@@ -140,7 +140,6 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         FineAbsenceDeduction = fineAbsenceDeduction;
         LateToWork = lateToWork;
         EarlyExit = earlyExit;
-        FridayWork = fridayWork;
         HolidayWork = holidayWork;
         IsSettingChange = isSettingChange;
         LeavePermittedDays = leavePermittedDays;
@@ -154,7 +153,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         {
             item.EditEmployees(Salary, FridayPay, OverTimePay, BaseYearsPay, BonusesPay
                 , NightWorkPay, MarriedAllowance, ShiftPay, FamilyAllowance, LeavePay, InsuranceDeduction, FineAbsenceDeduction,
-                LateToWork, EarlyExit, FridayWork, HolidayWork, IrregularShift, false, leavePermittedDays);
+                LateToWork, EarlyExit, HolidayWork, IrregularShift, false, leavePermittedDays);
         }
     }
     public void EditAndOverwriteOnAllEmployees(string groupName, double salary,
@@ -162,14 +161,13 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
         NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
         LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
-        LateToWork lateToWork, EarlyExit earlyExit, FridayWork fridayWork, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
+        LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
     {
         SetValueObjects(fridayPay, overTimePay, baseYearsPay, bonusesPay
             , nightWorkPay, marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction,
             lateToWork, earlyExit);
         GroupName = groupName;
         Salary = salary;
-        FridayWork = fridayWork;
         HolidayWork = holidayWork;
         IsSettingChange = isSettingChange;
         LeavePermittedDays = leavePermittedDays;
@@ -182,7 +180,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         {
             item.EditEmployees(Salary, FridayPay, OverTimePay, BaseYearsPay, BonusesPay
                 , NightWorkPay, MarriedAllowance, ShiftPay, FamilyAllowance, LeavePay, InsuranceDeduction, FineAbsenceDeduction,
-                LateToWork, EarlyExit, FridayWork, HolidayWork, IrregularShift, false, leavePermittedDays);
+                LateToWork, EarlyExit, HolidayWork, IrregularShift, false, leavePermittedDays);
         }
     }
 
@@ -195,7 +193,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
 
     public void EditSimpleAndOverwriteOnEmployee(string groupName, IEnumerable<long> employeeIds,
         ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts, WorkshopShiftStatus workshopShiftStatus,
-        IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange, FridayWork fridayWork, HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts)
+        IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange, HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts, List<WeeklyOffDay> weeklyOffDays)
     {
         GroupName = groupName;
         CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
@@ -209,9 +207,11 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
 
         BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
         IsShiftChange = isShiftChange;
-        FridayWork = fridayWork;
+
         HolidayWork = holidayWork;
 
+        WeeklyOffDays = weeklyOffDays;
+
         //var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
         // .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
         if (isShiftChange)
@@ -227,15 +227,15 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
                 .ToList();
             item.SimpleEdit(customizeWorkshopGroupSettingsShifts
                 .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList(),
-                IrregularShift, WorkshopShiftStatus, BreakTime, false, FridayWork, HolidayWork, newRotatingShifts);
+                IrregularShift, WorkshopShiftStatus, BreakTime, false, HolidayWork, newRotatingShifts,WeeklyOffDays.ToList());
         }
 
     }
 
     public void EditSimpleAndOverwriteOnAllEmployees(string groupName,
         ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
-        WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange,
-        FridayWork fridayWork, HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts)
+        WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange, 
+        HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts ,List<WeeklyOffDay> weeklyOffDays)
     {
         GroupName = groupName;
         CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
@@ -251,8 +251,8 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
         IsShiftChange = isShiftChange;
         HolidayWork = holidayWork;
-        FridayWork = fridayWork;
 
+        WeeklyOffDays = weeklyOffDays;
         //var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
         // .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
 
@@ -262,7 +262,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
                 .ToList();
             item.SimpleEdit(customizeWorkshopGroupSettingsShifts
                 .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList(),
-                irregularShift, workshopShiftStatus, breakTime, false, FridayWork, HolidayWork, newRotatingShifts);
+                irregularShift, workshopShiftStatus, breakTime, false, HolidayWork, newRotatingShifts,WeeklyOffDays.ToList());
         }
 
     }
@@ -298,13 +298,14 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
         IrregularShift irregularShift = new(IrregularShift.StartTime, IrregularShift.EndTime,
             IrregularShift.WorkshopIrregularShifts);
         BreakTime breakTime = new(BreakTime.HasBreakTimeValue, BreakTime.BreakTimeValue);
+        List<WeeklyOffDay> weeklyOffDays = WeeklyOffDays.Select(x => new WeeklyOffDay(x.DayOfWeek)).ToList();
 
         var rotatingShift = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime)).ToList();
 
         var customizeWorkshopEmployeeSettings = new CustomizeWorkshopEmployeeSettings(fridayPay, overTimePay, baseYearsPay, bonusesPay, nightWorkPay,
             marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
-            earlyExit, employeeId, workshopId, Salary, id, shifts, FridayWork, HolidayWork, irregularShift,
-            WorkshopShiftStatus, breakTime, LeavePermittedDays, rotatingShift);
+            earlyExit, employeeId, workshopId, Salary, id, shifts, HolidayWork, irregularShift,
+            WorkshopShiftStatus, breakTime, LeavePermittedDays, rotatingShift, weeklyOffDays);
 
         CustomizeWorkshopEmployeeSettingsCollection.Add(customizeWorkshopEmployeeSettings);
     }

Company.Domain/CustomizeWorkshopSettingsAgg/Entities/CustomizeWorkshopSettings.cs

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

Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs

@@ -60,13 +60,4 @@ public interface IInsuranceListRepository:IRepository<long, InsuranceList>
     #region client
     List<InsuranceListViewModel> SearchForClient(InsuranceListSearchModel searchModel);
     #endregion
-
-    #region Mahan
-    Task<InsuranceListConfirmOperation> GetInsuranceOperationDetails(long id);
-
-    Task<InsuranceListTabsCountViewModel> GetTabCounts(long accountId,int month,int year);
-
-    #endregion
-}
-
-
+}

Company.Domain/InsuranceListAgg/InsuranceList.cs

@@ -4,9 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using _0_Framework.Domain;
-using Company.Domain.InsuranceListAgg.ValueObjects;
 using Company.Domain.InsuranceWorkshopAgg;
-using CompanyManagment.App.Contracts.InsuranceList.Enums;
 
 namespace Company.Domain.InsuranceListAgg;
 
@@ -153,21 +151,6 @@ public class InsuranceList : EntityBase
     /// </summary>
     public double SumOfMarriedAllowance { get; private set; }
 
-    #region Mahan
-    /// <summary>
-    /// بازرسی
-    /// </summary>
-    public InsuranceListInspection Inspection { get; set; }  =new (InsuranceListInspectionType.None,DateTime.MinValue, 0);
-    /// <summary>
-    /// بدهی
-    /// </summary>
-    public InsuranceListDebt Debt { get; set; } = new(InsuranceListDebtType.None, DateTime.MinValue, 0, 0);
-    /// <summary>
-    /// تاییدیه کارفرما
-    /// </summary>
-    public InsuranceListEmployerApproval EmployerApproval { get; set; } = new(InsuranceListEmployerApprovalStatus.None, string.Empty);
-    #endregion
-
     public List<InsuranceListWorkshop> InsuranceListWorkshops { get; set; }
 
     public void Edit(int sumOfEmployees, int sumOfWorkingDays, double sumOfSalaries, double sumOfBenefitsIncluded, double included, 
@@ -191,22 +174,4 @@ public class InsuranceList : EntityBase
         SumOfDailyWagePlusBaseYears = sumOfDailyWage + sumOfBaseYears;
     }
 
-
-    public void SetDebt(InsuranceListDebt debt)
-    {
-        Debt = debt;
-    }
-    public void SetInspection(InsuranceListInspection inspection)
-    {
-        Inspection = inspection;
-    }
-    public void SetEmployerApproval(InsuranceListEmployerApproval employerApproval)
-    {
-        EmployerApproval = employerApproval;
-    }
-    public void SetConfirmSentlist(bool confirmSentlist)
-    {
-        ConfirmSentlist = confirmSentlist;
-    }
-
-}
+}

Company.Domain/InsuranceListAgg/ValueObjects/InsuranceListDebt.cs

@@ -1,31 +0,0 @@
-using System;
-using CompanyManagment.App.Contracts.InsuranceList.Enums;
-
-namespace Company.Domain.InsuranceListAgg.ValueObjects;
-
-public class InsuranceListDebt
-{
-    public InsuranceListDebt(InsuranceListDebtType type, DateTime debtDate, double amount, long mediaId)
-    {
-        Type = type;
-        if (type == InsuranceListDebtType.None)
-        {
-            DebtDate = DateTime.MinValue;
-            Amount = 0;
-            MediaId = 0;
-        }
-        else
-        {
-            DebtDate = debtDate;
-            Amount = amount;
-            MediaId = mediaId;
-            IsDone = true;
-        }
-    }
-
-    public InsuranceListDebtType Type { get; set; }
-    public DateTime DebtDate { get; set; }
-    public double Amount { get; set; }
-    public long MediaId { get; set; }
-    public bool IsDone { get; set; }
-}

Company.Domain/InsuranceListAgg/ValueObjects/InsuranceListEmployerApproval.cs

@@ -1,26 +0,0 @@
-using System.Security.Cryptography;
-using CompanyManagment.App.Contracts.InsuranceList.Enums;
-
-namespace Company.Domain.InsuranceListAgg.ValueObjects;
-
-public class InsuranceListEmployerApproval
-{
-    public InsuranceListEmployerApproval(InsuranceListEmployerApprovalStatus status, string description)
-    {
-        Status = status;
-        if (status == InsuranceListEmployerApprovalStatus.None)
-        {
-            Description = string.Empty;
-        }
-        else
-        {
-            
-            Description = description;
-            IsDone = true;
-        }
-    }
-
-    public InsuranceListEmployerApprovalStatus Status { get; set; }
-    public string Description { get; set; }
-    public bool IsDone { get; set; }
-}

Company.Domain/InsuranceListAgg/ValueObjects/InsuranceListInspection.cs

@@ -1,29 +0,0 @@
-using System;
-using CompanyManagment.App.Contracts.InsuranceList.Enums;
-
-namespace Company.Domain.InsuranceListAgg.ValueObjects;
-
-public class InsuranceListInspection
-{
-    public InsuranceListInspection(InsuranceListInspectionType type, DateTime lastInspectionDateTime, long mediaId)
-    {
-        Type = type;
-        if (type == InsuranceListInspectionType.None)
-        {
-            LastInspectionDateTime = DateTime.MinValue;
-            MediaId = 0;
-        }
-        else
-        {
-            LastInspectionDateTime = lastInspectionDateTime;
-            MediaId = mediaId;
-            IsDone = true;
-        }
-    }
-
-    public InsuranceListInspectionType Type { get; set; }
-    public DateTime LastInspectionDateTime { get; set; }
-    public long MediaId { get; set; }
-    public bool IsDone { get; set; }
-
-}

Company.Domain/RollCallAgg/IRollCallMandatoryRepository.cs

@@ -38,12 +38,6 @@ public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
     List<LateToWorkEarlyExistSpannig> LateToWorkEarlyExit(List<GroupedRollCalls> groupedRollCall,
         ICollection<CustomizeWorkshopEmployeeSettingsShift> shiftSettings, List<LeaveViewModel> leavList);
 
-    List<LoanInstallmentViewModel> LoanInstallmentForCheckout(long employeeId, long workshopId, DateTime contractStart,
-        DateTime contractEnd);
-
-    List<SalaryAidViewModel> SalaryAidsForCheckout(long employeeId, long workshopId, DateTime checkoutStart,
-        DateTime checkoutEnd);
-
     /// <summary>
     /// گزارش نوبت کاری حضور غیاب
     /// </summary>
@@ -53,6 +47,12 @@ public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
     /// <param name="contractEnd"></param>
     /// <param name="shiftwork"></param>
     /// <returns></returns>
+    List<LoanInstallmentViewModel> LoanInstallmentForCheckout(long employeeId, long workshopId, DateTime contractStart,
+        DateTime contractEnd);
+
+    List<SalaryAidViewModel> SalaryAidsForCheckout(long employeeId, long workshopId, DateTime checkoutStart,
+        DateTime checkoutEnd);
+
     Task<ComputingViewModel> RotatingShiftReport(long workshopId, long employeeId, DateTime contractStart,
         DateTime contractEnd, string shiftwork, bool hasRollCall, CreateWorkingHoursTemp command,bool holidayWorking);
 }

Company.Domain/SalaryAidAgg/SalaryAid.cs

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

Company.Domain/TemporaryClientRegistrationAgg/IWorkshopTempRepository.cs

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

Company.Domain/TemporaryClientRegistrationAgg/InstitutionContractTemp.cs

@@ -34,14 +34,12 @@ public class InstitutionContractTemp : EntityBase
     /// بصورت یکجا
     /// -
     /// بصئورت ماهیانه
-    /// OneTime
     /// </summary>
     public string PaymentModel { get; private set; }
 
     /// <summary>
     /// مدت قرارداد
     /// چند ماهه؟
-    /// "12"
     /// </summary>
     public string PeriodModel { get; private set; }
 

Company.Domain/empolyerAgg/IEmployerRepository.cs

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

CompanyManagment.App.Contracts/ContactUs/IContactUsApplication.cs

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

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CreateCustomizeWorkshopGroupSettings.cs

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

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CreateCustomizeWorkshopSettings.cs

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

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CustomizeWorkshopEmployeeSettingsViewModel.cs

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

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CustomizeWorkshopGroupSettingsViewModel.cs

@@ -8,7 +8,6 @@ public class CustomizeWorkshopGroupSettingsViewModel
 {
 	public long Id { get; set; }
 	public double Salary { get; set; }
-	public string SalaryStr { get; set; }
     public string GroupName { get; set; }
     public bool MainGroup { get; set; }
     public List<CustomizeWorkshopShiftViewModel> RollCallWorkshopShifts { get; set; }
@@ -19,5 +18,4 @@ public class CustomizeWorkshopGroupSettingsViewModel
     public BreakTime BreakTime { get; set; }
     public FridayWork FridayWork { get; set; }
     public HolidayWork HolidayWork { get; set; }
-    public int LeavePermitted { get; set; }
 }

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/EditCustomizeEmployeeSettings.cs

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

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/EditCustomizeWorkshopGroupSettings.cs

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

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/ICustomizeWorkshopSettingsApplication.cs

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

CompanyManagment.App.Contracts/Employee/CreateEmployeeByClient.cs

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

CompanyManagment.App.Contracts/Employer/CreateLegalEmployer.cs

@@ -1,84 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using _0_Framework.Application;
-using _0_Framework.Application.Enums;
-
-namespace CompanyManagment.App.Contracts.Employer;
-
-/// <summary>
-/// ایجاد کارفرمای حقیقی
-/// </summary>
-public class CreateLegalEmployer
-{
-    /// <summary>
-    /// آیدی طرف حساب
-    /// </summary>
-    [Required]
-    public long ContractingPartyId { get; set; }
-
-    /// <summary>
-    /// نام شرکت
-    /// </summary>
-    public string CompanyName { get; set; }
-
-    /// <summary>
-    /// شناسه ملی
-    /// </summary>
-    public string NationalId { get; set; }
-
-    /// <summary>
-    /// شماره ثبت
-    /// </summary>
-    public string RegisterId { get; set; }
-
-    /// <summary>
-    /// شماره تلفن همراه
-    /// </summary>
-    public string PhoneNumber { get; set; }
-
-    /// <summary>
-    /// شماره تلفن ثابت
-    /// </summary>
-    public string TelephoneNumber { get; set; }
-
-    /// <summary>
-    /// نام مدیر عامل
-    /// </summary>
-    public string EmployerFName { get; set; }
-    /// <summary>
-    /// نام خانوادگی مدیر عامل
-    /// </summary>
-    public string EmployerLName { get; set; }
-    /// <summary>
-    /// جنسیت مدیر عامل
-    /// </summary>
-    public Gender EmployerGender { get; set; }
-    /// <summary>
-    /// کد ملی مدیر عامل
-    /// </summary>
-    public string EmployerNationalCode { get; set; }
-    /// <summary>
-    /// شماره شناسنامه مدیر عامل
-    /// </summary>
-    public string EmployerIdNumber { get; set; }
-    /// <summary>
-    /// نام پدر مدیر عامل
-    /// </summary>
-    public string EmployerFatherName { get; set; }
-    /// <summary>
-    /// تاریخ تولد مدیر عامل
-    /// </summary>
-    public string EmployerDateOfBirth { get; set; }
-    /// <summary>
-    /// تاریخ صدور شناسنامه مدیر عامل
-    /// </summary>
-    public string EmployerDateOfIssue { get; set; }
-    /// <summary>
-    /// محل صدور شناسنامه مدیر عامل
-    /// </summary>
-    public string EmployerPlaceOfIssue { get; set; }
-
-    /// <summary>
-    /// اطلاعات سامانه ای
-    /// </summary>
-    public GovernmentSystemInfo GovernmentSystemInfo { get; set; }
-}

CompanyManagment.App.Contracts/Employer/CreateRealEmployer.cs

@@ -1,80 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using _0_Framework.Application;
-using _0_Framework.Application.Enums;
-
-namespace CompanyManagment.App.Contracts.Employer;
-
-/// <summary>
-/// ایجاد کارفرما حقیقی
-/// </summary>
-public class CreateRealEmployer
-{
-    /// <summary>
-    /// آیدی طرف حساب
-    /// </summary>
-    [Required]
-    public long ContractingPartyId { get; set; }
-
-    /// <summary>
-    /// جنسیت
-    /// </summary>
-    [Required]
-    public Gender Gender { get; set; }
-
-    /// <summary>
-    /// نام
-    /// </summary>
-    [Required]
-    public string FName { get; set; }
-
-    /// <summary>
-    ///نام خانوادگی
-    /// </summary>
-    [Required]
-    public string LName { get; set; }
-
-    /// <summary>
-    /// کد ملی
-    /// </summary>
-    public string NationalCode { get; set; }
-
-    /// <summary>
-    /// شماره شناسنامه
-    /// </summary>
-    public string IdNumber { get; set; }
-
-    /// <summary>
-    /// شماره تلفن همراه
-    /// </summary>
-    public string PhoneNumber { get; set; }
-
-    /// <summary>
-    /// شماره تلفن ثابت
-    /// </summary>
-    public string Telephone { get; set; }
-
-    /// <summary>
-    /// تاریخ صدور شناسنامه
-    /// </summary>
-    public string DateOfIssue { get; set; }
-
-    /// <summary>
-    /// محل صدور شناسنامه
-    /// </summary>
-    public string PlaceOfIssue { get; set; }
-
-    /// <summary>
-    /// تاریخ تولد
-    /// </summary>
-    public string DateOfBirth { get; set; }
-
-    /// <summary>
-    /// نام پدر
-    /// </summary>
-    public string FatherName { get; set; }
-
-    /// <summary>
-    /// اطلاعات سامانه ای
-    /// </summary>
-    public GovernmentSystemInfo GovernmentSystemInfo { get; set; }
-}

CompanyManagment.App.Contracts/Employer/EditLegalEmployer.cs

@@ -1,9 +0,0 @@
-namespace CompanyManagment.App.Contracts.Employer;
-
-public class EditLegalEmployer: CreateLegalEmployer
-{
-	/// <summary>
-	/// آیدی کارفرما
-	/// </summary>
-	public long Id { get; set; }
-}

CompanyManagment.App.Contracts/Employer/EditRealEmployer.cs

@@ -1,12 +0,0 @@
-namespace CompanyManagment.App.Contracts.Employer;
-
-/// <summary>
-/// ویرایش کارفرما حقیقی
-/// </summary>
-public class EditRealEmployer:CreateRealEmployer
-{
-    /// <summary>
-    /// آیدی کارفرما
-    /// </summary>
-    public long Id { get; set; }
-}

CompanyManagment.App.Contracts/Employer/GetEmployerListViewModel.cs

@@ -1,50 +0,0 @@
-using System.Collections.Generic;
-using _0_Framework.Application.Enums;
-
-namespace CompanyManagment.App.Contracts.Employer;
-
-/// <summary>
-/// مدل برای گرفتن لیست کارفرما
-/// </summary>
-public class GetEmployerListViewModel
-{
-    /// <summary>
-    /// آیدی کارفرما
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// کدملی / شناسه ملی
-    /// </summary>
-    public string NationalCodeOrNationalId { get; set; }
-
-    /// <summary>
-    /// نام کارفرما
-    /// </summary>
-    public string FullName { get; set; }
-
-    /// <summary>
-    /// نام های کارگاه
-    /// </summary>
-    public ICollection<string> WorkshopNames { get; set; }
-
-    /// <summary>
-    /// دارای طرف حساب
-    /// </summary>
-    public bool HasContractingParty { get; set; }
-
-    /// <summary>
-    /// طرف حساب بلاک شده یا نه
-    /// </summary>
-    public bool HasBlockContractingParty { get; set; }
-
-    /// <summary>
-    /// نوع کارفرما
-    /// </summary>
-    public LegalType LegalType { get; set; }
-
-    /// <summary>
-    /// وضعیت کارفرما
-    /// </summary>
-    public ActivationStatus EmployerStatus { get; set; }
-}

CompanyManagment.App.Contracts/Employer/GetEmployerSearchModel.cs

@@ -1,44 +0,0 @@
-using _0_Framework.Application.Enums;
-
-namespace CompanyManagment.App.Contracts.Employer;
-
-/// <summary>
-/// مدل جستجوی لیست کارفرما
-/// </summary>
-public class GetEmployerSearchModel
-{
-    /// <summary>
-    /// نام شرکت / نام و نام خانوادگی
-    /// </summary>
-    public string FullNameOrCompanyName { get; set; }
-
-    /// <summary>
-    /// کدملی/ شناسه ملی
-    /// </summary>
-    public string NationalCodeOrNationalId { get; set; }
-
-    /// <summary>
-    /// شماره شناسنامه یا شماره ثبت
-    /// </summary>
-    public string IdNumberOrRegisterId { get; set; }
-
-    /// <summary>
-    /// نام طرف حساب
-    /// </summary>
-    public string ContractingPartyName { get; set; }
-
-    /// <summary>
-    /// وضعیت کارفرما
-    /// </summary>
-    public ActivationStatus EmployerStatus { get; set; }
-
-    /// <summary>
-    /// نوع کارفرما
-    /// </summary>
-    public LegalType EmployerType { get; set; }
-
-    /// <summary>
-    /// پیج ایندکس برای دسته بندی سی تایی
-    /// </summary>
-    public int PageIndex { get; set; }
-}

CompanyManagment.App.Contracts/Employer/GetLegalEmployerDetailViewModel.cs

@@ -1,120 +0,0 @@
-using _0_Framework.Application;
-using _0_Framework.Application.Enums;
-
-namespace CompanyManagment.App.Contracts.Employer;
-
-/// <summary>
-/// اطلاعات کارفرمای حقوقی
-/// </summary>
-public class GetLegalEmployerDetailViewModel
-{
-    /// <summary>
-    /// آیدی کارفرما
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// نام شرکت
-    /// </summary>
-    public string CompanyName { get; set; }
-
-    /// <summary>
-    /// شناسه ملی
-    /// </summary>
-    public string NationalId { get; set; }
-
-    /// <summary>
-    /// شماره ثبت
-    /// </summary>
-    public string RegisterId { get; set; }
-
-    /// <summary>
-    /// شماره تلفن همراه
-    /// </summary>
-    public string PhoneNumber { get; set; }
-
-    /// <summary>
-    /// شماره تلفن ثابت
-    /// </summary>
-    public string TelephoneNumber { get; set; }
-
-    /// <summary>
-    /// کد کارفرما
-    /// </summary>
-    public string EmployerNo { get; set; }
-
-    /// <summary>
-    /// نام کارفرما
-    /// </summary>
-    public string ContractingPartyName { get; set; }
-
-    /// <summary>
-    /// نام کارفرما
-    /// </summary>
-    public long ContractingPartyId { get; set; }
-
-    /// <summary>
-    /// نام و خانوادگی مدیر عامل
-    /// </summary>
-    public string CeoFullName { get; set; }
-
-    /// <summary>
-    /// نام و خانوادگی مدیر عامل
-    /// </summary>
-    public string CeoFName { get; set; }
-
-    /// <summary>
-    /// نام و خانوادگی مدیر عامل
-    /// </summary>
-    public string CeoLName { get; set; }
-
-    /// <summary>
-    /// جنسیت مدیر عامل
-    /// </summary>
-    public Gender Gender { get; set; }
-
-	/// <summary>
-	/// جنیست
-	/// </summary>
-	public string GenderStr { get; set; }
-
-    /// <summary>
-    /// ملیت
-    /// </summary>
-    public string Nationality { get; set; }
-
-    /// <summary>
-    /// نام پدر
-    /// </summary>
-    public string FatherName { get; set; }
-
-    /// <summary>
-    /// کد ملی
-    /// </summary>
-    public string NationalCode { get; set; }
-
-    /// <summary>
-    /// شماره شناسنامه
-    /// </summary>
-    public string IdNumber { get; set; }
-
-    /// <summary>
-    /// تاریخ تولد
-    /// </summary>
-    public string DateOfBirth { get; set; }
-    /// <summary>
-    /// تاریخ صدور شناسنامه
-    /// </summary>
-    public string DateOfIssue { get; set; }
-
-    /// <summary>
-    /// محل صدور شناسنامه
-    /// </summary>
-    public string PlaceOfIssue { get; set; }
-
-    /// <summary>
-    /// اطلاعات سامانه های دولتی
-    /// </summary>
-    public GovernmentSystemInfo GovernmentSystemInfo { get; set; }
-
-}

CompanyManagment.App.Contracts/Employer/GetRealEmployerDetailViewModel.cs

@@ -1,107 +0,0 @@
-using _0_Framework.Application;
-using _0_Framework.Application.Enums;
-
-namespace CompanyManagment.App.Contracts.Employer;
-
-/// <summary>
-/// اطلاعات کارفرمای حقوقی
-/// </summary>
-public class GetRealEmployerDetailViewModel
-{
-    /// <summary>
-    /// آیدی کارفرما
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// نام و نام خانوادگی
-    /// </summary>
-    public string FullName { get; set; }  
-    
-    /// <summary>
-    /// نام 
-    /// </summary>
-    public string FName{ get; set; }
-    
-    /// <summary>
-    /// نام خانوادگی
-    /// </summary>
-    public string LName { get; set; }
-
-    /// <summary>
-    /// کدملی
-    /// </summary>
-    public string NationalCode { get; set; }
-
-    /// <summary>
-    /// جنسیت فارسی
-    /// </summary>
-    public string GenderStr { get; set; }
-
-    /// <summary>
-    /// جنسیت
-    /// </summary>
-	public Gender Gender { get; set; }
-
-    /// <summary>
-    /// ملیت
-    /// </summary>
-    public string Nationality { get; set; }
-
-    /// <summary>
-    /// شماره تلفن همراه
-    /// </summary>
-    public string PhoneNumber { get; set; }
-
-    /// <summary>
-    /// نام پدر
-    /// </summary>
-    public string FatherName { get; set; }
-
-    /// <summary>
-    /// شماره شناسنامه
-    /// </summary>
-    public string IdNumber { get; set; }
-
-    /// <summary>
-    /// تاریخ تولد
-    /// </summary>
-    public string DateOfBirth { get; set; }
-
-    /// <summary>
-    /// نام طرف حساب
-    /// </summary>
-    public string ContractingPartyName { get; set; }  
-    
-    
-    /// <summary>
-    /// آیدی طرف حساب
-    /// </summary>
-    public long ContractingPartyId { get; set; }
-
-    /// <summary>
-    /// کد کارفرما
-    /// </summary>
-    public string EmployerNo { get; set; }
-
-
-    /// <summary>
-    /// شماره تلفن ثابت
-    /// </summary>
-    public string TelephoneNumber { get; set; }
-
-    /// <summary>
-    /// تاریخ صدور شناسنامه
-    /// </summary>
-    public string DateOfIssue { get; set; }
-
-    /// <summary>
-    /// محل صدور شناسنامه
-    /// </summary>
-    public string PlaceOfIssue { get; set; }
-
-    /// <summary>
-    /// اطلاعات سامانه های دولتی
-    /// </summary>
-    public GovernmentSystemInfo GovernmentSystemInfo { get; set; }
-}

CompanyManagment.App.Contracts/Employer/GovernmentSystemInfo.cs

@@ -1,54 +0,0 @@
-using System;
-
-namespace CompanyManagment.App.Contracts.Employer;
-
-/// <summary>
-/// اطلاعات سامانه های دولتی
-/// </summary>
-public class GovernmentSystemInfo
-{
-    #region MCL
-    /// <summary>
-    /// نام کاربری اداره کار
-    /// </summary>
-    public string MclUsername { get; set; }
-    /// <summary>
-    /// رمز عبور اداره کار
-    /// </summary>
-    public string MclPassword { get; set; }
-    #endregion
-
-    #region E-Service تامین اجتماعی
-    /// <summary>
-    /// نام کاربری سازمان تامین اجتماعی
-    /// </summary>
-    public string EServiceUsername { get; set; }
-    /// <summary>
-    /// رمز عبور سازمان تامین اجتماعی
-    /// </summary>
-    public string EServicePassword { get; set; }
-    #endregion
-
-    #region Tax سامانه مالیاتی
-    /// <summary>
-    /// نام کاربری سامانه مالیاتی
-    /// </summary>
-    public string TaxUsername { get; set; }
-    /// <summary>
-    /// رمز عبور سامانه مالیاتی
-    /// </summary>
-    public string TaxPassword { get; set; }
-    #endregion
-
-    #region Sana سامانه ثنا
-    /// <summary>
-    /// نام کاربری ثنا
-    /// </summary>
-    public string SanaUsername { get; set; }
-    /// <summary>
-    /// رمز عبور ثنا
-    /// </summary>
-    public string SanaPassword { get; set; } 
-    #endregion
-     
-}

CompanyManagment.App.Contracts/Employer/IEmployerApplication.cs

@@ -55,71 +55,4 @@ public interface IEmployerApplication
 
 	#endregion
 
-	#region Api
-
-	/// <summary>
-	/// لیست کارفرما ها
-	/// </summary>
-	/// <returns></returns>
-	Task<List<GetEmployerListViewModel>> GetEmployerList(GetEmployerSearchModel searchModel);
-
-	/// <summary>
-	/// جزئیات کارفرما حقوقی
-	/// </summary>
-	/// <param name="id"></param>
-	/// <returns></returns>
-	Task<GetLegalEmployerDetailViewModel> GetLegalEmployerDetail(long id);
-
-	/// <summary>
-	/// جزئیات کارفرما حقیقی
-	/// </summary>
-	/// <param name="id"></param>
-	/// <returns></returns>
-	Task<GetRealEmployerDetailViewModel> GetRealEmployerDetail(long id);
-
-	/// <summary>
-	/// ایجاد کارفرمای حقیقی
-	/// </summary>
-	/// <param name="command"></param>
-	/// <returns></returns>
-	Task<OperationResult> CreateReal(CreateRealEmployer command);
-
-	/// <summary>
-	/// ایجاد کارفرمای حقوقی
-	/// </summary>
-	/// <param name="command"></param>
-	/// <returns></returns>
-	Task<OperationResult> CreateLegal(CreateLegalEmployer command);
-
-	/// <summary>
-	/// ویرایش کارفرمای حقیقی
-	/// </summary>
-	/// <param name="command"></param>
-	/// <returns></returns>
-	Task<OperationResult> EditReal(EditRealEmployer command);
-
-
-	/// <summary>
-	/// ویرایش کارفرمای حقوقی
-	/// </summary>
-	/// <param name="command"></param>
-	/// <returns></returns>
-	Task<OperationResult> EditLegal(EditLegalEmployer command);
-
-	///// <summary>
-	///// لیست نام کارفرما ها برای جستجو
-	///// </summary>
-	///// <param name="search"></param>
-	///// <returns></returns>
-	//public Task<List<EmployerSelectListViewModel>> GetSelectList(string search);
-
-	/// <summary>
-	/// حذف کارفرما - درصورت داشتن کارگاه کارفرما غیرفعال میشود
-	/// </summary>
-	/// <param name="id"></param>
-	/// <returns></returns>
-	public Task<OperationResult<string>> RemoveApi(long id);
-
-	#endregion
-}
-
+}

CompanyManagment.App.Contracts/InsuranceList/EditInsuranceList.cs

@@ -14,6 +14,9 @@ public class EditInsuranceList:CreateInsuranceList
     public bool FixedSalary { get; set; }
     public string Population { get; set; }
     public long? InsuranceJobId { get; set; }
-    public List<LeftWorkViewModel> LeftWorkEmployees { get; set; }
 
+    /// <summary>
+    /// پرسنل هایی که قرارداد ترک کار کرده اند ولی ترک کار بیمه ندارند
+    /// </summary>
+    public List<LeftWorkViewModel> LeftWorkEmployees { get; set; }
 }

CompanyManagment.App.Contracts/InsuranceList/Enums/InsuranceListDebtType.cs

@@ -1,8 +0,0 @@
-namespace CompanyManagment.App.Contracts.InsuranceList.Enums;
-
-public enum InsuranceListDebtType
-{
-    None,
-    Old,
-    New
-}

CompanyManagment.App.Contracts/InsuranceList/Enums/InsuranceListEmployerApprovalStatus.cs

@@ -1,14 +0,0 @@
-namespace CompanyManagment.App.Contracts.InsuranceList.Enums;
-
-public enum InsuranceListEmployerApprovalStatus
-{
-    None,
-    /// <summary>
-    /// تاییدیه شفاهی (اذنی)
-    /// </summary>
-    VerbalApproval,
-    /// <summary>
-    /// تاییدیه کاغذی
-    /// </summary>
-    WrittenApproval
-}

CompanyManagment.App.Contracts/InsuranceList/Enums/InsuranceListInspectionType.cs

@@ -1,8 +0,0 @@
-namespace CompanyManagment.App.Contracts.InsuranceList.Enums;
-
-public enum InsuranceListInspectionType
-{
-    None,
-    Old,
-    New
-}

CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs

@@ -5,7 +5,6 @@ using System.Text;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.InsuranceList;
-using Microsoft.AspNetCore.Http;
 
 namespace CompanyManagment.App.Contracts.InsuranceList;
 
@@ -18,9 +17,9 @@ public interface IInsuranceListApplication
     MainEmployeeDetailsViewModel SearchEmployeeForCreateInsuranceList(EmployeeForCreateInsuranceListSearchModel searchModel);
 
     double MarriedAllowance(string maritalStatus, long jobId, bool includedStatus,
-        int countWorkingDays, double marriedAlowance, int endMonthCurrentDay);
+	    int countWorkingDays, double marriedAlowance, int endMonthCurrentDay);
 
-    OperationResult CreateEmployeeDetailsInfo(EmployeeDetailsForInsuranceListViewModel command);
+	OperationResult CreateEmployeeDetailsInfo(EmployeeDetailsForInsuranceListViewModel command);
     OperationResult EditEmployeeDetailsInfo(EmployeeDetailsForInsuranceListViewModel command);
     OperationResult Remove(long id);
     EditInsuranceList GetDetailsForEdit(long id);
@@ -35,16 +34,4 @@ public interface IInsuranceListApplication
     //farokhiChanges
     (double basic, int totalYear) BasicYear(long employeeId, long worshopId, DateTime startDate);
     double GetMonthlyBaseYear(double dayliBase, int countWorkingDays);
-
-    #region Mahan
-    /// <summary>
-    /// مراحل اجرایی برای تکمیل و ارسال لیست بیمه
-    /// </summary>
-    /// <returns></returns>
-    Task<OperationResult> ConfirmInsuranceOperation(InsuranceListConfirmOperation command);
-    Task<InsuranceListConfirmOperation> GetInsuranceOperationDetails(long id);
-
-    Task<InsuranceListTabsCountViewModel> GetTabCounts(long accountId, int month, int year);
-
-    #endregion
 }

CompanyManagment.App.Contracts/InsuranceList/InsuranceListConfirmOperation.cs

@@ -1,48 +0,0 @@
-using CompanyManagment.App.Contracts.InsuranceList.Enums;
-using Microsoft.AspNetCore.Http;
-
-namespace CompanyManagment.App.Contracts.InsuranceList;
-
-public class InsuranceListConfirmOperation
-{
-    public long InsuranceListId { get; set; }
-    /// <summary>
-    /// بازرسی
-    /// </summary>
-    public CreateInsuranceListInspection Inspection { get; set; }
-    /// <summary>
-    /// بدهی
-    /// </summary>
-    public CreateInsuranceListDebt Debt { get; set; }
-    /// <summary>
-    /// تاییدیه کارفرما
-    /// </summary>
-    public CreateInsuranceListApproval Approval { get; set; }
-    public bool ConfirmSentList { get; set; }
-}
-public class CreateInsuranceListApproval
-{
-    public InsuranceListEmployerApprovalStatus ApprovalStatus { get; set; }
-    public string Description { get; set; }
-}
-
-public class CreateInsuranceListDebt
-{
-    public InsuranceListDebtType Type { get; set; }
-    public string DebtDate { get; set; }
-    public string Amount { get; set; }
-    public IFormFile DebtFile { get; set; }
-    public long DebtFileMediaId { get; set; }
-    public string FilePath { get; set; }
-}
-
-public class CreateInsuranceListInspection
-{
-    public InsuranceListInspectionType Type { get; set; }
-    public string LastInspectionDate { get; set; }
-    public IFormFile InspectionFile { get; set; }
-    public long InspectionFileMediaId { get; set; }
-    public string FilePath { get; set; }
-
-
-}

CompanyManagment.App.Contracts/InsuranceList/InsuranceListSearchModel.cs

@@ -25,29 +25,4 @@ public class InsuranceListSearchModel
     public int PageIndex { get; set; }
 
     public bool SearchAll { get; set; }
-
-    public InsuranceListSearchStatus Status { get; set; }
-}
-
-public enum InsuranceListSearchStatus
-{
-    /// <summary>
-    /// انجام نشده
-    /// </summary>
-    NotStarted = 0,
-
-    /// <summary>
-    /// در حال انجام امور
-    /// </summary>
-    InProgress = 1,
-
-    /// <summary>
-    /// آماده ارسال لیست
-    /// </summary>
-    ReadyToSendList = 2,
-
-    /// <summary>
-    /// انجام بیمه
-    /// </summary>
-    Done = 3
 }

CompanyManagment.App.Contracts/InsuranceList/InsuranceListTabsCountViewModel.cs

@@ -1,24 +0,0 @@
-namespace CompanyManagment.App.Contracts.InsuranceList;
-
-public class InsuranceListTabsCountViewModel
-{
-    /// <summary>
-    /// انجام نشده
-    /// </summary>
-    public int NotStarted { get; set; }
-
-    /// <summary>
-    /// در حال انجام امور
-    /// </summary>
-    public int InProgress { get; set; }
-
-    /// <summary>
-    /// آماده ارسال لیست
-    /// </summary>
-    public int ReadyToSendList { get; set; }
-
-    /// <summary>
-    /// انجام بیمه
-    /// </summary>
-    public int Done { get; set; }
-}

CompanyManagment.App.Contracts/InsuranceList/InsuranceListViewModel.cs

@@ -27,11 +27,4 @@ public class InsuranceListViewModel
     public long WorkShopId { get; set; }
     public string IsBlockCantracingParty { get; set; }
     public long EmployerId { get; set; }
-
-    /// <summary>وضعیت بازرسی</summary>
-    public bool InspectionDone { get; set; }
-    /// <summary>وضعیت بدهی</summary>
-    public bool DebtDone { get; set; }
-    /// <summary>وضعیت تاییدیه کارفرما</summary>
-    public bool EmployerApproved { get; set; }
 }

CompanyManagment.App.Contracts/PersonalContractingParty/ContractingPartyGetListSearchModel.cs

@@ -1,37 +0,0 @@
-using _0_Framework.Application.Enums;
-
-namespace CompanyManagment.App.Contracts.PersonalContractingParty;
-
-public class ContractingPartyGetListSearchModel
-{
-    /// <summary>
-    /// تعدادی که برای لیست بعدی آیتم باید رد کنه
-    /// </summary>
-    public int PageIndex { get; set; }
-
-    /// <summary>
-    /// نام شرکت یا نام و نام خانوادگی طرف حساب
-    /// </summary>
-    public string FullNameOrCompanyName { get; set; }
-
-    /// <summary>
-    /// شناسه ملی یا شماره ملی
-    /// </summary>
-    public string NationalIdOrNationalCode { get; set; }
-
-    /// <summary>
-    /// نام معرف
-    /// </summary>
-    public string RepresentativeName { get; set; }
-
-    /// <summary>
-    /// نوع طرف حساب
-    /// </summary>
-    public LegalType ContractingPartyType { get; set; }
-
-    /// <summary>
-    /// وضعیت طرف حساب
-    /// </summary>
-    public ActivationStatus ContractingPartyStatus { get; set; }
-
-}

CompanyManagment.App.Contracts/PersonalContractingParty/ContractingPartyGetListViewModel.cs

@@ -1,60 +0,0 @@
-using System.Collections.Generic;
-using _0_Framework.Application.Enums;
-
-namespace CompanyManagment.App.Contracts.PersonalContractingParty;
-
-public record ContractingPartyGetListEmployerViewModel(long EmployerId, string EmployerName);
-
-public class ContractingPartyGetListViewModel
-{
-    /// <summary>
-    /// آیدی طرف حساب
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// کد طرف حساب
-    /// </summary>
-    public int ArchiveCode { get; set; }
-
-    /// <summary>
-    /// شناسه ملی یا شماره ملی
-    /// </summary>
-    public string NationalIdOrNationalCode { get; set; }
-
-    /// <summary>
-    /// نام طرف حساب
-    /// </summary>
-    public string ContractingPartyName { get; set; }
-
-    /// <summary>
-    /// لیست کارفرما ها
-    /// </summary>
-    public ICollection<ContractingPartyGetListEmployerViewModel> Employers { get; set; }
-
-    /// <summary>
-    /// تعداد بلاک
-    /// </summary>
-    public int BlockTimes { get; set; }
-
-    /// <summary>
-    /// آیا بلاک هست
-    /// </summary>
-    public bool IsBlock { get; set; }
-
-    /// <summary>
-    /// آیا دارای قرارداد مالی است
-    /// </summary>
-    public bool HasInstitutionContract { get; set; }
-
-    /// <summary>
-    /// نوع طرف حساب
-    /// </summary>
-    public LegalType ContractingPartyType { get; set; }
-
-    /// <summary>
-    /// وضعیت طرف حساب
-    /// </summary>
-    public ActivationStatus Status { get; set; }
-
-}

CompanyManagment.App.Contracts/PersonalContractingParty/ContractingPartySelectListViewModel.cs

@@ -1,8 +0,0 @@
-using _0_Framework.Application;
-
-namespace CompanyManagment.App.Contracts.PersonalContractingParty;
-
-public class ContractingPartySelectListViewModel: SelectListViewModel
-{
-
-}

CompanyManagment.App.Contracts/PersonalContractingParty/CreateLegalContractingParty.cs

@@ -1,74 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace CompanyManagment.App.Contracts.PersonalContractingParty;
-
-public class CreateLegalContractingParty
-{
-    /// <summary>
-    /// آیدی معرف
-    /// </summary>
-    [Required]
-    public long RepresentativeId { get; set; }
-
-    /// <summary>
-    /// نام شرکت
-    /// </summary>
-    [Required]
-    public string CompanyName { get; set; }
-
-    /// <summary>
-    /// شناسه ملی
-    /// </summary>
-    [Required]
-    public string NationalId { get; set; }
-
-    /// <summary>
-    /// کد طرف حساب
-    /// </summary>
-    [Required]
-    public int ArchiveCode { get; set; }
-
-    /// <summary>
-    /// نام مستعار
-    /// </summary>
-    public string SureName { get; set; }
-
-    /// <summary>
-    /// شماره ثبت
-    /// </summary>
-    public string RegisterId { get; set; }
-
- 
-
-    /// <summary>
-    /// شماره تلفن
-    /// </summary>
-    public string PhoneNumber { get; set; }
-
-    /// <summary>
-    /// شماره تلفن نماینده
-    /// </summary>
-    public string AgentPhone { get; set; }
-
-    /// <summary>
-    /// استان
-    /// </summary>
-    public string State { get; set; }
-
-    /// <summary>
-    /// شهر
-    /// </summary>
-    public string City { get; set; }
-
-    /// <summary>
-    /// محله
-    /// </summary>
-    public string Zone { get; set; }
-
-    /// <summary>
-    /// نشانی
-    /// </summary>
-    public string Address { get; set; }
-
-
-}

CompanyManagment.App.Contracts/PersonalContractingParty/CreateRealContractingParty.cs

@@ -1,77 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace CompanyManagment.App.Contracts.PersonalContractingParty;
-
-public class CreateRealContractingParty
-{
-    /// <summary>
-    /// نام
-    /// </summary>
-    [Required]
-    public string FName { get; set; }
-
-    /// <summary>
-    /// نام خانوادگی
-    /// </summary>
-    [Required]
-    public string LName { get; set; }
-
-    /// <summary>
-    /// آیدی معرف
-    /// </summary>
-    [Required]
-    public long RepresentativeId { get; set; }
-
-    /// <summary>
-    /// کد ملی
-    /// </summary>
-    [Required]
-    public string NationalCode { get; set; }
-
-    /// <summary>
-    /// شماره شناسنامه
-    /// </summary>
-    [Required]
-    public string IdNumber { get; set; }
-
-    /// <summary>
-    /// کد طرف حساب
-    /// </summary>
-    [Required]
-    public int ArchiveCode { get; set; }
-
-    /// <summary>
-    /// نام مستعار
-    /// </summary>
-    public string SureName { get; set; }
-
-    /// <summary>
-    /// شماره تلفن
-    /// </summary>
-    public string PhoneNumber { get; set; }
-
-    /// <summary>
-    /// شماره تلفن نماینده
-    /// </summary>
-    public string AgentPhone { get; set; }
-
-    /// <summary>
-    /// استان
-    /// </summary>
-    public string State { get; set; }
-
-    /// <summary>
-    /// شهر
-    /// </summary>
-    public string City { get; set; }
-
-    /// <summary>
-    /// محله
-    /// </summary>
-    public string Zone { get; set; }
-
-    /// <summary>
-    /// نشانی
-    /// </summary>
-    public string Address { get; set; }
-}

CompanyManagment.App.Contracts/PersonalContractingParty/EditLegalContractingParty.cs

@@ -1,12 +0,0 @@
-namespace CompanyManagment.App.Contracts.PersonalContractingParty;
-
-/// <summary>
-/// ویرایش طرف حساب حقوقی
-/// </summary>
-public class EditLegalContractingParty:CreateLegalContractingParty
-{
-    /// <summary>
-    /// آیدی طرف حساب
-    /// </summary>
-    public long Id { get; set; }
-}

CompanyManagment.App.Contracts/PersonalContractingParty/EditRealContractingParty.cs

@@ -1,13 +0,0 @@
-namespace CompanyManagment.App.Contracts.PersonalContractingParty;
-
-/// <summary>
-/// ویرایش طرف حساب حقیقی
-/// </summary>
-public class EditRealContractingParty:CreateRealContractingParty
-{
-    /// <summary>
-    /// آیدی طرف حساب
-    /// </summary>
-    public long Id { get; set; }
-
-}

CompanyManagment.App.Contracts/PersonalContractingParty/GetContractingPartyNationalCodeOrNationalIdViewModel.cs

@@ -1,12 +0,0 @@
-namespace CompanyManagment.App.Contracts.PersonalContractingParty;
-
-/// <summary>
-/// شماره ملی یا شناسه ملی بر اساس حقیقی یا حقوقی بودن
-/// </summary>
-public class GetContractingPartyNationalCodeOrNationalIdViewModel
-{
-    /// <summary>
-    /// شماره ملی یا شناسه ملی
-    /// </summary>
-    public string NationalCodeOrNationalId { get; set; }
-}

CompanyManagment.App.Contracts/PersonalContractingParty/GetLegalContractingPartyDetailsViewModel.cs

@@ -1,83 +0,0 @@
-namespace CompanyManagment.App.Contracts.PersonalContractingParty;
-
-/// <summary>
-/// ویو مدل جزئیات طرف حساب حقوقی
-/// </summary>
-public class GetLegalContractingPartyDetailsViewModel
-{
-    /// <summary>
-    /// آیدی طرف حساب
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// نام کامل شرکت(به همراه نام مستعار)ء
-    /// </summary>
-    public string CompanyFullName { get; set; }
-
-    /// <summary>
-    /// نام شرکت (بدون نام مستعار)ء
-    /// </summary>
-    public string CompanyName { get; set; }
-
-    /// <summary>
-    /// نام مستعار
-    /// </summary>
-    public string SureName { get; set; }
-
-    /// <summary>
-    /// شماره ثبت
-    /// </summary>
-    public string RegisterId { get; set; }
-
-    /// <summary>
-    /// شماره ملی
-    /// </summary>
-    public string NationalId { get; set; }
-
-    /// <summary>
-    /// شماره تماس
-    /// </summary>
-    public string PhoneNumber { get; set; }
-
-    /// <summary>
-    /// شماره تماس نماینده
-    /// </summary>
-    public string AgentPhone { get; set; }
-
-    /// <summary>
-    /// آدرس
-    /// </summary>
-    public string Address { get; set; }
-
-    /// <summary>
-    /// معرف
-    /// </summary>
-    public string RepresentativeName { get; set; }
-
-    /// <summary>
-    /// آیدی معرف
-    /// </summary>
-    public long RepresentativeId { get; set; }
-
-    /// <summary>
-    /// کد طرف حساب
-    /// </summary>
-    public int ArchiveCode { get; set; }
-
-    /// <summary>
-    /// استان
-    /// </summary>
-    public string State { get; set; }
-
-    /// <summary>
-    /// شهر
-    /// </summary>
-    public string City { get; set; }
-
-    /// <summary>
-    /// محله
-    /// </summary>
-    public string Zone { get; set; }
-
-}

CompanyManagment.App.Contracts/PersonalContractingParty/GetRealContractingPartyDetailsViewModel.cs

@@ -1,94 +0,0 @@
-using System.Runtime.CompilerServices;
-using Microsoft.AspNetCore.Builder;
-
-namespace CompanyManagment.App.Contracts.PersonalContractingParty;
-
-/// <summary>
-/// ویو مدل جزئیات طرف حساب حقیقی
-/// </summary>
-public class GetRealContractingPartyDetailsViewModel
-{
-    /// <summary>
-    /// آیدی طرف حساب
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// نام
-    /// </summary>
-    public string FName { get; set; }
-
-    /// <summary>
-    /// نام خانوادگی
-    /// </summary>
-    public string LName { get; set; }
-
-    /// <summary>
-    /// نام و نام خانوادگی
-    /// </summary>
-    public string FullName { get; set; }
-
-    /// <summary>
-    /// کد ملی
-    /// </summary>
-    public string NationalCode { get; set; }
-
-    /// <summary>
-    /// شماره شناسنامه
-    /// </summary>
-    public string IdNumber { get; set; }
-
-    /// <summary>
-    /// شماره تلفن
-    /// </summary>
-    public string PhoneNumber { get; set; }
-
-    /// <summary>
-    /// شماره تلفن نماینده
-    /// </summary>
-    public string AgentPhone { get; set; }
-
-    /// <summary>
-    /// آدرس
-    /// </summary>
-    public string Address { get; set; }
-
-
-    /// <summary>
-    /// نام معرف
-    /// </summary>
-    public string RepresentativeName { get; set; }
-
-    /// <summary>
-    /// آیدی معرف
-    /// </summary>
-    public long RepresentativeId { get; set; }
-
-    /// <summary>
-    /// نام مستعار
-    /// </summary>
-    public string SureName { get; set; }
-
-    /// <summary>
-    /// کد طرف حساب
-    /// </summary>
-    public int ArchiveCode { get; set; }
-
-    
-    /// <summary>
-    /// استان
-    /// </summary>
-    public string State { get; set; }
-
-    /// <summary>
-    /// شهر
-    /// </summary>
-    public string City { get; set; }
-
-    /// <summary>
-    /// محله
-    /// </summary>
-    public string Zone { get; set; }
-    
-
-}

CompanyManagment.App.Contracts/PersonalContractingParty/IPersonalContractingPartyApp.cs

@@ -1,6 +1,5 @@
 using _0_Framework.Application;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 
 
 namespace CompanyManagment.App.Contracts.PersonalContractingParty;
@@ -55,79 +54,4 @@ public interface IPersonalContractingPartyApp
 
     #endregion
 
-
-    #region Api
-    /// <summary>
-    /// لیست طرف حساب ها
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<ICollection<ContractingPartyGetListViewModel>> GetList(ContractingPartyGetListSearchModel searchModel);
-
-    /// <summary>
-    /// لیست طرف حساب برای سلکت لیست سرچ
-    /// </summary>
-    /// <returns></returns>
-    Task<List<ContractingPartySelectListViewModel>> GetSelectList();
-
-    /// <summary>
-    /// ایجاد طرف حساب حقیقی
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    Task<OperationResult> CreateReal(CreateRealContractingParty command);
-
-    /// <summary>
-    /// ایجاد ظرف حساب حقوقی
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    Task<OperationResult> CreateLegal(CreateLegalContractingParty command);
-
-
-    /// <summary>
-    /// لیستی از شماره ملی یا شناسه ملی بر اساس حقیقی یا حقوقی بودن
-    /// </summary>
-    /// <returns></returns>
-    Task<List<GetContractingPartyNationalCodeOrNationalIdViewModel>> GetNationalCodeOrNationalId();
-
-
-    /// <summary>
-    /// حذف طرف حساب. در صورتی که طرف حساب دارای قرارداد مالی یا دارای کارفرما باشد غیرفعال میشود
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    Task<OperationResult<string>> Delete(long id);
-
-    /// <summary>
-    /// ویرایش طرف حساب حقیقی
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    OperationResult EditRealApi(EditRealContractingParty command);
-
-
-    /// <summary>
-    /// ویرایش طرف حساب حقوقی
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    OperationResult EditLegal(EditLegalContractingParty command);
-
-    /// <summary>
-    /// گرفتن جزئیات طرف حساب حقوقی
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    Task<GetRealContractingPartyDetailsViewModel> GetRealDetails(long id);
-
-    /// <summary>
-    /// گرفتن جزئیات طرف حساب حقوقی
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    Task<GetLegalContractingPartyDetailsViewModel> GetLegalDetails(long id);
-
-    #endregion
-
 }

CompanyManagment.App.Contracts/PersonalContractingParty/PersonalContractingPartyViewModel.cs

@@ -47,6 +47,4 @@ public class PersonalContractingPartyViewModel
     public bool IsAuthenticated { get; set; }
     public List<EmployerViewModel> EmployerList { get; set; }
 
-
-
 }

CompanyManagment.App.Contracts/TemporaryClientRegistration/ITemporaryClientRegistrationApplication.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.InstitutionPlan;
@@ -39,7 +38,7 @@ public interface ITemporaryClientRegistrationApplication
     /// </summary>
     /// <param name="command"></param>
     /// <returns></returns>
-    Task<OperationResult> CreateOrUpdateWorkshopTemp(List<WorkshopTempViewModel> command, long contractingPartyTempId);
+    Task<OperationResult> CreateOrUpdateWorkshopTemp(List<WorkshopTempViewModel> command);
 
     /// <summary>
     /// دریافت جمع کل خدمات برای یک کارگاه
@@ -56,14 +55,14 @@ public interface ITemporaryClientRegistrationApplication
     /// <param name="paymentModel"></param>
     /// <returns></returns>
     Task<ReviewAndPaymentViewModel> GetTotalPaymentAndWorkshopList(long contractingPartyTempId,
-        string periodModel = "12", string paymentModel = "OneTime", string contractStartType = "currentMonth");
+        string periodModel = "12", string paymentModel = "OneTime");
 
     /// <summary>
     /// ایجاد یا ویرایش قرارداد موقت
     /// </summary>
     /// <param name="contractingPartyTempId"></param>
     /// <returns></returns>
-    Task<OperationResult> CreateOrUpdateInstitutionContractTemp(long contractingPartyTempId, string periodModel, string paymentModel, double totalPayment, double valueAddedTax, DateTime contractStart);
+    Task<OperationResult> CreateOrUpdateInstitutionContractTemp(long contractingPartyTempId, string periodModel, string paymentModel, double totalPayment, double valueAddedTax);
 
     /// <summary>
     /// دریافت کد برای کلاینت

CompanyManagment.App.Contracts/TemporaryClientRegistration/MonthlyInstallment.cs

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

CompanyManagment.App.Contracts/TemporaryClientRegistration/ReviewAndPaymentViewModel.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace CompanyManagment.App.Contracts.TemporaryClientRegistration;
 
@@ -24,54 +23,28 @@ public class ReviewAndPaymentViewModel
     /// مبلغ پرداخت بدون مالیات
     /// Double
     /// </summary>
-    public double OneTimeWithoutTaxPaymentDouble { get; set; }
+    public double WithoutTaxPaymentDouble { get; set; }
 
     /// <summary>
     /// مبلغ پرداخت بدون مالیات
     /// string
     /// </summary>
-    public string OneTimeWithoutTaxPaymentStr { get; set; }
+    public string WithoutTaxPaymentStr { get; set; }
 
 
     /// <summary>
     /// مبلغ پرداخت کامل
     /// Double
     /// </summary>
-    public double OneTimeTotalPaymentDouble { get; set; }
+    public double TotalPaymentDouble { get; set; }
 
     /// <summary>
     /// مبلغ پرداخت کامل
     /// string
     /// </summary>
-    public string OneTimeTotalPaymentStr { get; set; }
+    public string TotalPaymentStr { get; set; }
 
 
-
-    /// <summary>
-    /// مبلغ پرداخت بدون مالیات
-    /// Double
-    /// </summary>
-    public double MonthlyWithoutTaxPaymentDouble { get; set; }
-
-    /// <summary>
-    /// مبلغ پرداخت بدون مالیات
-    /// string
-    /// </summary>
-    public string MonthlyWithoutTaxPaymentStr { get; set; }
-
-
-    /// <summary>
-    /// مبلغ پرداخت کامل
-    /// Double
-    /// </summary>
-    public double MonthlyTotalPaymentDouble { get; set; }
-
-    /// <summary>
-    /// مبلغ پرداخت کامل
-    /// string
-    /// </summary>
-    public string MonthlyTotalPaymentStr { get; set; }
-
     /// <summary>
     /// مالیات بر ارزش افزوده
     /// Double
@@ -110,52 +83,4 @@ public class ReviewAndPaymentViewModel
     /// آی دی طرف حساب
     /// </summary>
     public long ContractingPartTempId { get; set; }
-
-    /// <summary>
-    /// لیست اقساط ماهیانه
-    /// </summary>
-    public List<MonthlyInstallment> MonthlyInstallments { get; set; }
-
-
-    /// <summary>
-    /// تاریخ شروع قرارداد در اول ماه جاری
-    /// -
-    /// شمسی
-    /// </summary>
-    public string ContractStartCurrentMonthFa { get; set; }
-
-    /// <summary>
-    /// تاریخ شروع قرارداد در اول ماه جاری
-    /// -
-    /// میلادی
-    /// </summary>
-    public DateTime ContractStartCurrentMonthGr { get; set; }
-
-    /// <summary>
-    /// تاریخ شروع قرارداد در اول ماه بعد
-    /// -
-    /// شمسی
-    /// </summary>
-    public string ContractStartNextMonthFa{ get; set; }
-
-    /// <summary>
-    /// تاریخ شروع قرارداد در اول ماه بعد
-    /// -
-    /// میلادی
-    /// </summary>
-    public DateTime ContractStartNextMonthGr { get; set; }
-
-    /// <summary>
-    /// تاریخ پایان قرارداد
-    /// -
-    /// میلادی
-    /// </summary>
-    public DateTime ContractEndGr { get; set; }
-
-    /// <summary>
-    /// تاریخ پایان قرارداد
-    /// -
-    /// شمسی
-    /// </summary>
-    public string ContractEndFa { get; set; }
 }

CompanyManagment.Application/BankApplication.cs

@@ -55,7 +55,7 @@ namespace CompanyManagment.Application
 			if(command.BankLogoPictureFile  != null && command.BankLogoPictureFile.Length >0 )
 			{
 				var uploadResult = _mediaApplication.UploadFile(command.BankLogoPictureFile, command.BankName,
-					_basePath, 10, [".jpg", ".jpeg", ".png",".svg"], "Bank");
+					_basePath, 10, [".jpg", ".jpeg", ".png",".svg"]);
 				if (uploadResult.IsSuccedded == false)
 					return uploadResult;
 				mediaId = uploadResult.SendId;
@@ -81,7 +81,7 @@ namespace CompanyManagment.Application
 			if (command.BankLogoPictureFile != null && command.BankLogoPictureFile.Length > 0)
 			{
 				var uploadResult = _mediaApplication.UploadFile(command.BankLogoPictureFile, command.BankName,
-					_basePath, 10, [".jpg", ".jpeg", ".png",".svg"], "Bank");
+					_basePath, 10, [".jpg", ".jpeg", ".png",".svg"]);
 				if (uploadResult.IsSuccedded == false)
 					return uploadResult;
 				_mediaApplication.DeleteFile(entity.BankLogoMediaId);

CompanyManagment.Application/ContactUsApplication.cs

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

CompanyManagment.Application/EmployeeAplication.cs

@@ -1,38 +1,35 @@
-using _0_Framework.Application;
+using System;
+using System.IO;
+using System.Collections.Generic;
 using _0_Framework.InfraStructure;
 using Company.Domain.EmployeeAgg;
-using Company.Domain.LeftWorkAgg;
-using Company.Domain.WorkshopAgg;
 using CompanyManagment.App.Contracts.Employee;
-using CompanyManagment.App.Contracts.EmployeeInsuranceRecord;
 using CompanyManagment.EFCore;
-using System;
-using System.Collections.Generic;
+using _0_Framework.Application;
+using CompanyManagment.App.Contracts.EmployeeInsuranceRecord;
+using Company.Domain.EmployeeInsuranceRecordAgg;
+using Company.Domain.WorkshopAgg;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Transactions;
-using Company.Domain.EmployeeClientTempAgg;
 using Company.Domain.PersonnelCodeAgg;
-using EmployeeInsuranceRecord = Company.Domain.EmployeeInsuranceRecordAgg.EmployeeInsuranceRecord;
-using Microsoft.AspNetCore.Hosting;
-using System.IO;
-using _0_Framework.Application.UID;
-using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg;
-using Company.Domain.CustomizeWorkshopGroupSettingsAgg;
-using Company.Domain.EmployeeDocumentsAgg;
-using Company.Domain.LeftWorkTempAgg;
-using Company.Domain.RollCallEmployeeAgg;
 using CompanyManagment.App.Contracts.CustomizeWorkshopSettings;
 using CompanyManagment.App.Contracts.EmployeeBankInformation;
 using CompanyManagment.App.Contracts.EmployeeDocuments;
 using CompanyManagment.App.Contracts.RollCallEmployeeStatus;
-using RollCallEmployee = Company.Domain.RollCallEmployeeAgg.RollCallEmployee;
-using CompanyManagment.App.Contracts.Employee.DTO;
+using Microsoft.AspNetCore.Hosting;
+using System.IO;
+using System.Transactions;
+using Company.Domain.EmployeeClientTempAgg;
+using Company.Domain.LeftWorkTempAgg;
 using CompanyManagment.App.Contracts.LeftWorkTemp;
-using System.Reflection;
+using _0_Framework.Application.UID;
+using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg;
+using Company.Domain.EmployeeDocumentsAgg;
+using Company.Domain.RollCallEmployeeAgg;
+using Company.Domain.CustomizeWorkshopGroupSettingsAgg;
+using Company.Domain.LeftWorkAgg;
+using CompanyManagment.App.Contracts.Employee.DTO;
 using Company.Domain.EmployeeAuthorizeTempAgg;
-using Company.Domain.RollCallServiceAgg;
-using Microsoft.Extensions.Configuration;
 using Company.Domain.LeftWorkInsuranceAgg;
 
 namespace CompanyManagment.Application;
@@ -41,9 +38,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 {
     private readonly IEmployeeRepository _EmployeeRepository;
     private readonly IWorkshopRepository _WorkShopRepository;
-    private readonly ILeftWorkRepository _leftWorkRepository;
-    private readonly IPersonnelCodeRepository _personnelCodeRepository;
-    private readonly IEmployeeClientTempRepository _employeeClientTempRepository;
     private readonly CompanyContext _context;
     public bool nationalCodValid = false;
     public bool idnumberIsOk = true;
@@ -61,32 +55,17 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
     private readonly ILeftWorkTempRepository _leftWorkTempRepository;
     private readonly IUidService _uidService;
     private readonly ICustomizeWorkshopEmployeeSettingsRepository _customizeWorkshopEmployeeSettingsRepository;
+    private readonly ILeftWorkRepository _leftWorkRepository;
+    private readonly IPersonnelCodeRepository _personnelCodeRepository;
+    private readonly IEmployeeClientTempRepository _employeeClientTempRepository;
+    private readonly ICustomizeWorkshopGroupSettingsRepository _customizeWorkshopGroupSettingsRepository;
     private readonly IEmployeeAuthorizeTempRepository _employeeAuthorizeTempRepository;
     private readonly ILeftWorkInsuranceRepository _leftWorkInsuranceRepository ;
-    private readonly IRollCallServiceRepository _rollCallServiceRepository;
 
-    public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context,
-        IWorkshopRepository workShopRepository,
-        ILeftWorkRepository leftWorkRepository, IPersonnelCodeRepository personnelCodeRepository,
-        IEmployeeClientTempRepository employeeClientTempRepository, IWebHostEnvironment webHostEnvironment,
-        IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication,
-        IRollCallEmployeeRepository rollCallEmployeeRepository,
-        ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository,
-        ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication,
-        IEmployeeDocumentsApplication employeeDocumentsApplication,
-        IEmployeeBankInformationApplication employeeBankInformationApplication,
-        ILeftWorkTempRepository leftWorkTempRepository,
-        IUidService uidService,
-        ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository,
-        IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository,
-        IRollCallServiceRepository rollCallServiceRepository, ILeftWorkInsuranceRepository leftWorkInsuranceRepository) : base(context)
+    public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context, IWorkshopRepository workShopRepository, IWebHostEnvironment webHostEnvironment, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, IRollCallEmployeeRepository rollCallEmployeeRepository, ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication, IEmployeeDocumentsApplication employeeDocumentsApplication, IEmployeeDocumentsRepository employeeDocumentsRepository, IEmployeeBankInformationApplication employeeBankInformationApplication, ILeftWorkTempRepository leftWorkTempRepository, IUidService uidService, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository, IPersonnelCodeRepository personnelCodeRepository, IEmployeeClientTempRepository employeeClientTempRepository, ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository, ILeftWorkRepository leftWorkRepository, IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository, ILeftWorkInsuranceRepository leftWorkInsuranceRepository) : base(context)
     {
         _context = context;
         _WorkShopRepository = workShopRepository;
-        _EmployeeRepository = employeeRepository;
-        this._leftWorkRepository = leftWorkRepository;  
-        _personnelCodeRepository = personnelCodeRepository;
-        _employeeClientTempRepository = employeeClientTempRepository;
         _webHostEnvironment = webHostEnvironment;
         _rollCallEmployeeStatusApplication = rollCallEmployeeStatusApplication;
         _rollCallEmployeeRepository = rollCallEmployeeRepository;
@@ -96,17 +75,19 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         _leftWorkTempRepository = leftWorkTempRepository;
         _uidService = uidService;
         _customizeWorkshopEmployeeSettingsRepository = customizeWorkshopEmployeeSettingsRepository;
+        _personnelCodeRepository = personnelCodeRepository;
+        _employeeClientTempRepository = employeeClientTempRepository;
+        _leftWorkRepository = leftWorkRepository;
         _employeeAuthorizeTempRepository = employeeAuthorizeTempRepository;
         _leftWorkInsuranceRepository = leftWorkInsuranceRepository;
         _EmployeeRepository = employeeRepository;
-        _rollCallServiceRepository = rollCallServiceRepository;
     }
 
     public OperationResult Create(CreateEmployee command)
     {
         var opration = new OperationResult();
         if (_EmployeeRepository.Exists(x =>
-                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.NationalCode != null))
+                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.NationalCode != null && x.IsActiveString == "true"))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
 
         //if (_EmployeeRepository.Exists(x => x.IdNumber == command.IdNumber && x.IdNumber !=null))
@@ -124,7 +105,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         //}
 
-
+       
 
         if (command.Address != null && command.State == null)
         {
@@ -163,8 +144,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 {
                     case "0000000000":
                     case "1111111111":
-                    case "2222222222":
-                    case "3333333333":
+                    case "22222222222":
+                    case "33333333333":
                     case "4444444444":
                     case "5555555555":
                     case "6666666666":
@@ -216,9 +197,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 return opration.Failed("کد ملی وارد شده تکراری است");
             }
         }
+                
 
-
-
+           
         string initial = "1300/10/11";
         var dateOfBirth = command.DateOfBirth != null ? command.DateOfBirth.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
         var dateOfIssue = command.DateOfIssue != null ? command.DateOfIssue.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
@@ -243,10 +224,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         return opration.Succcedded(employeeData.id);
 
-
+          
     }
 
-
     public OperationResult Edit(EditEmployee command)
     {
         var opration = new OperationResult();
@@ -255,11 +235,11 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             return opration.Failed("رکورد مورد نظر یافت نشد");
 
         if (_EmployeeRepository.Exists(x =>
-                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.id != command.Id))
+                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.id != command.Id && x.IsActiveString == "true"))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
         //if (_EmployeeRepository.Exists(x => x.IdNumber == command.IdNumber && x.IdNumber != null && x.id != command.Id))
         //    return opration.Failed("شماره شناسنامه وارد شده تکراری است");
-
+           
         if (command.Address != null && command.State == null)
         {
             StatCity = false;
@@ -297,8 +277,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 {
                     case "0000000000":
                     case "1111111111":
-                    case "2222222222":
-                    case "3333333333":
+                    case "22222222222":
+                    case "33333333333":
                     case "4444444444":
                     case "5555555555":
                     case "6666666666":
@@ -351,7 +331,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             }
         }
 
-
+            
         string initial = "1300/10/11";
         var dateOfBirth = command.DateOfBirth != null ? command.DateOfBirth.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
         var dateOfIssue = command.DateOfIssue != null ? command.DateOfIssue.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
@@ -359,7 +339,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             dateOfIssue,
             command.PlaceOfIssue, command.NationalCode, command.IdNumber, command.Gender, command.Nationality,
             command.Phone, command.Address,
-            command.State, command.City, command.MaritalStatus, command.MilitaryService, command.LevelOfEducation,
+            command.State,command.City, command.MaritalStatus, command.MilitaryService, command.LevelOfEducation,
             command.FieldOfStudy, command.BankCardNumber,
             command.BankBranch, command.InsuranceCode, command.InsuranceHistoryByYear,
             command.InsuranceHistoryByMonth, command.NumberOfChildren, command.OfficePhone
@@ -372,7 +352,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         return opration.Succcedded();
 
-
+         
     }
 
     public EditEmployee GetDetails(long id)
@@ -380,11 +360,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         return _EmployeeRepository.GetDetails(id);
     }
 
-    public EditEmployee GetDetailsIgnoreQueryFilter(long id)
-    {
-        return _EmployeeRepository.GetDetails(id);
-    }
-
     public OperationResult Active(long id)
     {
         var opration = new OperationResult();
@@ -423,8 +398,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
     public async Task<List<EmployeeViewModel>> Search(EmployeeSearchModel searchModel)
     {
-        var res = await _EmployeeRepository.Search(searchModel);
-
+        var res=await _EmployeeRepository.Search(searchModel);
+     
         foreach (var item in res)
         {
             var children = _context.EmployeeChildrenSet.Count(x => x.EmployeeId == item.Id);
@@ -715,8 +690,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 {
                     case "0000000000":
                     case "1111111111":
-                    case "2222222222":
-                    case "3333333333":
+                    case "22222222222":
+                    case "33333333333":
                     case "4444444444":
                     case "5555555555":
                     case "6666666666":
@@ -845,8 +820,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 {
                     case "0000000000":
                     case "1111111111":
-                    case "2222222222":
-                    case "3333333333":
+                    case "22222222222":
+                    case "33333333333":
                     case "4444444444":
                     case "5555555555":
                     case "6666666666":
@@ -926,17 +901,11 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         return res;
     }
-
     #endregion
 
+
     #region Pooya
 
-
-    public List<EmployeeViewModel> GetWorkingEmployeesByWorkshopId(long workshopId)
-    {
-        return _EmployeeRepository.GetWorkingEmployeesByWorkshopId(workshopId);
-    }
-
     public EmployeeViewModel GetEmployeeByNationalCodeIfHasActiveLeftWork(string nationalCode, List<long> workshopIds)
     {
         if (nationalCode.NationalCodeValid() != "valid")
@@ -944,6 +913,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         var workshopEmployeesWithLeftWork = _EmployeeRepository.GetWorkingEmployeesByWorkshopIdsAndNationalCodeAndDate(workshopIds, nationalCode, DateTime.Now.Date);
         return workshopEmployeesWithLeftWork.FirstOrDefault();
     }
+
     public EmployeeViewModel GetEmployeeByNationalCodeIfHasLeftWork(string nationalCode, List<long> workshopIds)
     {
         if (nationalCode.NationalCodeValid() != "valid")
@@ -951,8 +921,11 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         var workshopEmployeesWithLeftWork = _EmployeeRepository.GetWorkedEmployeesByWorkshopIdsAndNationalCodeAndDate(workshopIds, nationalCode, DateTime.Now.Date);
         return workshopEmployeesWithLeftWork.FirstOrDefault();
     }
+    public List<EmployeeViewModel> GetWorkingEmployeesByWorkshopId(long workshopId)
+    {
+        return _EmployeeRepository.GetWorkingEmployeesByWorkshopId(workshopId);
 
-
+    }
 
     public List<EmployeeViewModel> GetRangeByIds(IEnumerable<long> employeeIds)
     {
@@ -988,7 +961,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         }).ToList();
     }
 
-
     #endregion
 
     #region Mahan
@@ -1080,7 +1052,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             _personnelCodeRepository.SaveChanges();
         }
 
-        var rollCallService = _rollCallServiceRepository.GetActiveServiceByWorkshopId(command.WorkshopId);
 
         if (string.IsNullOrWhiteSpace(command.RollCallUploadEmployeePicture?.Picture1) == false &&
             string.IsNullOrWhiteSpace(command.RollCallUploadEmployeePicture?.Picture2) == false)
@@ -1090,14 +1061,14 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 Directory.CreateDirectory(directoryPath);
 
             var filePath1 = Path.Combine(directoryPath) + $@"\1.jpg";
-
-            CreateImageFromBase64(command.RollCallUploadEmployeePicture.Picture1, filePath1);
-
+         
+                CreateImageFromBase64(command.RollCallUploadEmployeePicture.Picture1, filePath1);
+            
 
             var filePath2 = Path.Combine(directoryPath) + $@"\2.jpg";
-
-            CreateImageFromBase64(command.RollCallUploadEmployeePicture.Picture2, filePath2);
-
+            
+                CreateImageFromBase64(command.RollCallUploadEmployeePicture.Picture2, filePath2);
+            
 
 
             var rollCallEmployee =
@@ -1130,16 +1101,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
             if (command.CreateCustomizeEmployeeSettings.GroupId > 0)
             {
-                if (rollCallService?.HasCustomizeCheckoutService == "true")
-                {
-                    var employeeSalary = command.CreateCustomizeEmployeeSettings.Salary?.MoneyToDouble() ?? 0;
-
-                    if (employeeSalary < 1)
-                    {
-                        return op.Failed("لطفا حقوق پرسنل را وارد کنید");
-                    }
-
-                }
                 if (_customizeWorkshopEmployeeSettingsRepository
                     .Exists(x => x.WorkshopId == workshop.Id && x.EmployeeId == employee.id))
                 {
@@ -1167,16 +1128,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         }
         else if (command.CreateCustomizeEmployeeSettings.GroupId > 0)
         {
-            if (rollCallService?.HasCustomizeCheckoutService == "true")
-            {
-                var employeeSalary = command.CreateCustomizeEmployeeSettings.Salary?.MoneyToDouble() ?? 0;
-
-                if (employeeSalary < 1)
-                {
-                    return op.Failed("لطفا حقوق پرسنل را وارد کنید");
-                }
-
-            }
             if (_customizeWorkshopEmployeeSettingsRepository
                 .Exists(x => x.WorkshopId == workshop.Id && x.EmployeeId == employee.id))
             {
@@ -1270,7 +1221,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         byte[] bytes = Convert.FromBase64String(subBase64);
         System.IO.File.WriteAllBytes(filePath, bytes);
     }
-
     public async Task<OperationResult<EmployeeByNationalCodeInWorkshopViewModel>>
         ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(string nationalCode, string birthDate, long workshopId)
     {
@@ -1560,9 +1510,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         {
             employee.EditAuthorizeEmployee(employee.DateOfIssue, employee.PlaceOfIssue,
                 employee.Phone, employee.Address, employee.State, employee.City, command.MaritalStatus,
-                command.MilitaryService, employee.LevelOfEducation, employee.FieldOfStudy,
+                command.MilitaryService, employee.LevelOfEducation, employee.FieldOfStudy, 
                 employee.BankCardNumber, employee.BankBranch, employee.InsuranceCode,
-                employee.InsuranceHistoryByYear, employee.InsuranceHistoryByMonth, employee.NumberOfChildren,
+                employee.InsuranceHistoryByYear, employee.InsuranceHistoryByMonth, employee.NumberOfChildren, 
                 employee.OfficePhone, employee.MclsUserName, employee.MclsPassword,
                 employee.EserviceUserName, employee.EservicePassword, employee.TaxOfficeUserName,
                 employee.TaxOfficepassword, employee.SanaUserName, employee.SanaPassword);
@@ -1676,5 +1626,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
     }
 
+
     #endregion
 }

CompanyManagment.Application/EmployerApplication.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using _0_Framework.Application;
-using _0_Framework.Exceptions;
 using Company.Domain.empolyerAgg;
 using Company.Domain.WorkshopAgg;
 using CompanyManagment.App.Contracts.Checkout;
@@ -958,256 +957,4 @@ public class EmployerApplication : IEmployerApplication
 	}
 
 	#endregion
-	#region Api
-	public async Task<List<GetEmployerListViewModel>> GetEmployerList(GetEmployerSearchModel searchModel)
-	{
-		return await _EmployerRepository.GetEmployerList(searchModel);
-	}
-	public async Task<GetLegalEmployerDetailViewModel> GetLegalEmployerDetail(long id)
-	{
-		var employer = await _EmployerRepository.GetLegalEmployerDetail(id);
-		if (employer == null)
-		{
-			throw new NotFoundException("کارفرمای مورد نطر یافت نشد");
-		}
-		return employer;
-
-	}
-
-	public async Task<GetRealEmployerDetailViewModel> GetRealEmployerDetail(long id)
-	{
-		var employer = await _EmployerRepository.GetRealEmployerDetail(id);
-		if (employer == null)
-		{
-			throw new NotFoundException("کارفرمای مورد نطر یافت نشد");
-		}
-		return employer;
-	}
-
-	public async Task<OperationResult> CreateReal(CreateRealEmployer command)
-	{
-		var opration = new OperationResult();
-		if (_EmployerRepository.Exists(x =>
-				(x.FName == command.FName && x.LName == command.LName) && x.Nationalcode == command.NationalCode && x.Nationalcode != null))
-			return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
-
-		if (string.IsNullOrWhiteSpace(command.FName))
-			return opration.Failed("لطفا نام را وارد کنید");
-
-		if (!string.IsNullOrWhiteSpace(command.NationalCode))
-		{
-			if (command.NationalCode.NationalCodeValid() != "valid")
-			{
-				return opration.Failed("کدملی وارد شده نامعتبر است");
-			}
-			if (_EmployerRepository.Exists(x => x.Nationalcode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode)))
-			{
-				return opration.Failed("کد ملی وارد شده تکراری است");
-			}
-		}
-		string initial = "1300/10/11";
-		var dateOfBirth = command.DateOfBirth?.ToGeorgianDateTime() ?? initial.ToGeorgianDateTime();
-		var dateOfIssue = command.DateOfIssue?.ToGeorgianDateTime() ?? initial.ToGeorgianDateTime();
-
-		var gender = command.Gender switch
-		{
-			Gender.Male => "مرد",
-			Gender.Female => "زن",
-			Gender.None => null,
-			_ => throw new BadRequestException("جنسیت وارد شده نامعتبر است")
-		};
-
-		var employerData = new Employer(command.FName, command.LName, command.ContractingPartyId, gender,
-			command.NationalCode, command.IdNumber, "ایرانی", command.FatherName, dateOfBirth,
-			dateOfIssue, command.PlaceOfIssue, "*", "*", "*", "حقیقی", command.PhoneNumber,
-			command.Telephone, "true", command.GovernmentSystemInfo.MclUsername, command.GovernmentSystemInfo.MclPassword, command.GovernmentSystemInfo.EServiceUsername, command.GovernmentSystemInfo.EServicePassword,
-			command.GovernmentSystemInfo.TaxUsername, command.GovernmentSystemInfo.TaxPassword, command.GovernmentSystemInfo.SanaUsername, command.GovernmentSystemInfo.SanaPassword);
-
-		await _EmployerRepository.CreateAsync(employerData);
-		await _EmployerRepository.SaveChangesAsync();
-
-		return opration.Succcedded();
-	}
-
-	public async Task<OperationResult> CreateLegal(CreateLegalEmployer command)
-	{
-		if (string.IsNullOrWhiteSpace(command.EmployerLName))
-			command.EmployerLName = "#";
-		var opration = new OperationResult();
-		if (_EmployerRepository.Exists(x =>
-				x.LName == command.CompanyName && x.NationalId == command.NationalId && x.EmployerLName == command.EmployerLName))
-			return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
-
-		if (_EmployerRepository.Exists(x => x.NationalId == command.NationalId && !string.IsNullOrWhiteSpace(command.NationalId) && x.NationalId != null))
-		{
-			return opration.Failed(" شناسه ملی وارد شده تکراری است");
-		}
-		if (_EmployerRepository.Exists(x => x.LName == command.CompanyName))
-		{
-			return opration.Failed("نام شرکت وارد شده تکراری است");
-		}
-		if (_EmployerRepository.Exists(x => x.RegisterId == command.RegisterId && !string.IsNullOrWhiteSpace(command.RegisterId) && x.RegisterId != null))
-		{
-			return opration.Failed(" شماره ثبت وارد شده تکراری است");
-		}
-
-		if (!string.IsNullOrEmpty(command.NationalId) && command.NationalId.Length != 11)
-		{
-			return opration.Failed(" شناسه ملی باید 11 رقم باشد");
-		}
-
-		if (!string.IsNullOrWhiteSpace(command.EmployerNationalCode))
-		{
-			if (command.EmployerNationalCode.NationalCodeValid() != "valid")
-			{
-				return opration.Failed("کد ملی وارد شده نا معتبر است");
-			}
-		}
-
-		string initial = "1300/10/11";
-		var dateOfBirth = command.EmployerDateOfBirth?.ToGeorgianDateTime() ?? initial.ToGeorgianDateTime();
-		var dateOfIssue = command.EmployerDateOfIssue?.ToGeorgianDateTime() ?? initial.ToGeorgianDateTime();
-
-		var gender = command.EmployerGender switch
-		{
-			Gender.Male => "مرد",
-			Gender.Female => "زن",
-			Gender.None => null,
-			_ => throw new BadRequestException("جنسیت وارد شده نامعتبر است")
-		};
-
-
-		var legalEmployerData = new Employer(command.EmployerFName, command.CompanyName, command.ContractingPartyId, gender,
-			command.EmployerNationalCode, command.EmployerIdNumber, "ایرانی", command.EmployerFatherName, dateOfBirth,
-			dateOfIssue, command.EmployerPlaceOfIssue, command.RegisterId, command.NationalId, command.EmployerLName, "حقوقی", command.PhoneNumber,
-			command.TelephoneNumber, "true", command.GovernmentSystemInfo.MclUsername, command.GovernmentSystemInfo.MclPassword,
-			command.GovernmentSystemInfo.EServiceUsername, command.GovernmentSystemInfo.EServicePassword,
-			command.GovernmentSystemInfo.TaxUsername, command.GovernmentSystemInfo.TaxPassword, command.GovernmentSystemInfo.SanaUsername, command.GovernmentSystemInfo.SanaPassword);
-
-		await _EmployerRepository.CreateAsync(legalEmployerData);
-		await _EmployerRepository.SaveChangesAsync();
-
-		return opration.Succcedded();
-	}
-
-	public async Task<OperationResult> EditReal(EditRealEmployer command)
-	{
-		var opration = new OperationResult();
-		var employer = _EmployerRepository.Get(command.Id);
-		if (employer == null)
-			return opration.Failed("رکورد مورد نظر یافت نشد");
-
-		if (_EmployerRepository.Exists(x =>
-				(x.FName == command.FName && x.LName == command.LName) && x.Nationalcode == command.NationalCode && x.id != command.Id))
-			return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
-		if (!string.IsNullOrWhiteSpace(command.NationalCode))
-		{
-			if (command.NationalCode.NationalCodeValid() != "valid")
-			{
-				return opration.Failed("کد ملی وارد شده نا معتبر است");
-			}
-		}
-
-		if (_EmployerRepository.Exists(x => x.Nationalcode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.id != command.Id))
-		{
-
-			return opration.Failed("  کد ملی  وارد شده تکراری است");
-		}
-
-
-
-		string initial = "1300/10/11";
-
-		var dateOfBirth = command.DateOfBirth?.ToGeorgianDateTime() ?? initial.ToGeorgianDateTime();
-		var dateOfIssue = command.DateOfIssue?.ToGeorgianDateTime() ?? initial.ToGeorgianDateTime();
-
-		var gender = command.Gender switch
-		{
-			Gender.Male => "مرد",
-			Gender.Female => "زن",
-			Gender.None => null,
-			_ => throw new BadRequestException("جنسیت وارد شده نامعتبر است")
-		};
-
-		employer.Edit(command.FName, command.LName, command.ContractingPartyId,
-			gender, command.NationalCode, command.IdNumber, "ایرانی", command.FatherName,
-			dateOfBirth, dateOfIssue, command.PlaceOfIssue, command.PhoneNumber, command.Telephone,
-			command.GovernmentSystemInfo.MclUsername, command.GovernmentSystemInfo.MclPassword, command.GovernmentSystemInfo.EServiceUsername, command.GovernmentSystemInfo.EServicePassword,
-			command.GovernmentSystemInfo.TaxUsername, command.GovernmentSystemInfo.TaxPassword, command.GovernmentSystemInfo.SanaUsername, command.GovernmentSystemInfo.SanaPassword, null);
-
-		await _EmployerRepository.SaveChangesAsync();
-		return opration.Succcedded();
-	}
-
-	public async Task<OperationResult> EditLegal(EditLegalEmployer command)
-	{
-		var opration = new OperationResult();
-		var legalEmployer = _EmployerRepository.Get(command.Id);
-		if (legalEmployer == null)
-			return opration.Failed("رکورد مورد نظر یافت نشد");
-
-		if (_EmployerRepository.Exists(x =>
-				x.LName == command.CompanyName && x.NationalId == command.NationalId && !string.IsNullOrWhiteSpace(command.NationalId) && x.id != command.Id))
-			return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
-
-
-		if (!string.IsNullOrEmpty(command.NationalId) && command.NationalId.Length != 11)
-		{
-			return opration.Failed(" شناسه ملی باید 11 رقم باشد");
-		}
-
-		if (!string.IsNullOrWhiteSpace(command.EmployerNationalCode))
-		{
-			if (command.EmployerNationalCode.NationalCodeValid() != "valid")
-			{
-				return opration.Failed("کد ملی وارد شده نا معتبر است");
-			}
-		}
-
-		var gender = command.EmployerGender switch
-		{
-			Gender.Male => "مرد",
-			Gender.Female => "زن",
-			Gender.None => null,
-			_ => throw new BadRequestException("جنسیت وارد شده نامعتبر است")
-		};
-
-		string initial = "1300/10/11";
-		var dateOfBirth = command.EmployerDateOfBirth?.ToGeorgianDateTime() ?? initial.ToGeorgianDateTime();
-		var dateOfIssue = command.EmployerDateOfIssue?.ToGeorgianDateTime() ?? initial.ToGeorgianDateTime();
-		legalEmployer.EditLegal(command.EmployerFName, command.CompanyName, command.ContractingPartyId, gender,
-			command.EmployerNationalCode, command.EmployerIdNumber, "ایرانی", command.EmployerFatherName, dateOfBirth,
-			dateOfIssue, command.EmployerPlaceOfIssue, command.RegisterId, command.NationalId, command.EmployerLName,
-			command.PhoneNumber, command.TelephoneNumber, command.GovernmentSystemInfo.MclUsername, command.GovernmentSystemInfo.MclUsername, command.GovernmentSystemInfo.EServiceUsername, command.GovernmentSystemInfo.EServicePassword,
-			command.GovernmentSystemInfo.TaxUsername, command.GovernmentSystemInfo.TaxPassword, command.GovernmentSystemInfo.SanaUsername, command.GovernmentSystemInfo.SanaPassword, null);
-
-		await _EmployerRepository.SaveChangesAsync();
-		return opration.Succcedded();
-	}
-
-	//public async Task<List<EmployerSelectListViewModel>> GetSelectList(string search)
-	//{
-	//	return await _EmployerRepository.GetSelectList(search);
-	//}
-
-	async Task<OperationResult<string>> IEmployerApplication.RemoveApi(long id)
-	{
-		var employer = _EmployerRepository.Get(id);
-		if (employer == null)
-			throw new NotFoundException("دیتای مورد نظر یافت نشد");
-
-		var workshops = _workshopRepository.GetWorkshopsByEmployerId([id]);
-
-		if (workshops.Any())
-		{
-			return await _EmployerRepository.DeactivateWithSubordinates(id);
-		}
-
-		_EmployerRepository.Remove(id);
-
-		return new OperationResult<string>().Succcedded("Deleted");
-
-	}
-
-#endregion
 }

CompanyManagment.Application/PersonalContractingPartyApplication.cs

@@ -1,19 +1,17 @@
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.PersonalContractingParty;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.empolyerAgg;
 using CompanyManagment.App.Contracts.Representative;
 using Company.Domain.InstitutionContractAgg;
-using CompanyManagment.EFCore.Repository;
 
 namespace CompanyManagment.Application;
 
 public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
 {
-    private readonly IPersonalContractingPartyRepository _personalContractingPartyRepository;
+    private readonly IPersonalContractingPartyRepository _personalContractingPartyRepository2;
     private readonly IRepresentativeApplication _representativeApplication;
     private readonly IEmployerRepository _employerRepository;
     private readonly IInstitutionContractRepository _institutionContractRepository;
@@ -28,7 +26,7 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
     public PersonalContractingPartyApplication(
         IPersonalContractingPartyRepository personalContractingPartyRepository, IRepresentativeApplication representativeApplication, IEmployerRepository employerRepository,  IInstitutionContractRepository institutionContractRepository)
     {
-        _personalContractingPartyRepository = personalContractingPartyRepository;
+        _personalContractingPartyRepository2 = personalContractingPartyRepository;
         _representativeApplication = representativeApplication;
         _employerRepository = employerRepository;
         _institutionContractRepository = institutionContractRepository;
@@ -38,7 +36,7 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
     public OperationResult Create(CreatePersonalContractingParty command)
     {
         var opration = new OperationResult();
-        if (_personalContractingPartyRepository.Exists(x =>
+        if (_personalContractingPartyRepository2.Exists(x =>
                 x.LName == command.LName && x.Nationalcode == command.Nationalcode && x.SureName == command.SureName ))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
         if (command.RepresentativeId < 1)
@@ -56,14 +54,14 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
         //    return opration.Failed("نام خانوادگی وارد شده تکراری است");
 
         //}
-        if (_personalContractingPartyRepository.Exists(x => x.Nationalcode == command.Nationalcode && x.LName != command.LName))
+        if (_personalContractingPartyRepository2.Exists(x => x.Nationalcode == command.Nationalcode && x.LName != command.LName))
         {
             nationalcodeIsOk = false;
                
             return opration.Failed("کد ملی وارد شده تکراری است");
         }
 
-        if (_personalContractingPartyRepository.Exists(x => x.ArchiveCode == command.ArchiveCode))
+        if (_personalContractingPartyRepository2.Exists(x => x.ArchiveCode == command.ArchiveCode))
             return opration.Failed("کد طرف حساب تکراری است");
 
         try
@@ -134,8 +132,8 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
                 command.State,command.City,command.Zone,command.SureName);
 
 
-            _personalContractingPartyRepository.Create(personalContractingParty);
-            _personalContractingPartyRepository.SaveChanges();
+            _personalContractingPartyRepository2.Create(personalContractingParty);
+            _personalContractingPartyRepository2.SaveChanges();
 
             return opration.Succcedded();
 
@@ -154,13 +152,13 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
     public OperationResult Edit2(EditPersonalContractingParty command)
     {
         var opration = new OperationResult();
-        var personalContractingParty = _personalContractingPartyRepository.Get(command.Id);
+        var personalContractingParty = _personalContractingPartyRepository2.Get(command.Id);
         if (personalContractingParty == null)
             return opration.Failed("رکورد مورد نظر یافت نشد");
 
         personalContractingParty.Edit2(command.Address);
 
-        _personalContractingPartyRepository.SaveChanges();
+        _personalContractingPartyRepository2.SaveChanges();
         return opration.Succcedded();
     }
 
@@ -168,7 +166,7 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
     {
            
         var opration = new OperationResult();
-        if (_personalContractingPartyRepository.Exists(x =>
+        if (_personalContractingPartyRepository2.Exists(x =>
                 x.LName == command.LName && x.RegisterId == command.RegisterId && x.SureName == command.SureName))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
         if (command.RepresentativeId < 1)
@@ -176,23 +174,23 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
 
 
 
-        if (_personalContractingPartyRepository.Exists(x => x.LName == command.LName && x.SureName == command.SureName))
+        if (_personalContractingPartyRepository2.Exists(x => x.LName == command.LName && x.SureName == command.SureName))
         {
             legalNameIsOk = false;
             return opration.Failed("نام شرکت  وارد شده تکراری است");
         }
-        if (_personalContractingPartyRepository.Exists(x => x.RegisterId == command.RegisterId && x.LName != command.LName))
+        if (_personalContractingPartyRepository2.Exists(x => x.RegisterId == command.RegisterId && x.LName != command.LName))
         {
             registerIdIsOk = false;
             return opration.Failed("شماره ثبت وارد شده تکراری است");
 
         }
-        if (_personalContractingPartyRepository.Exists(x => x.NationalId == command.NationalId && x.LName != command.LName))
+        if (_personalContractingPartyRepository2.Exists(x => x.NationalId == command.NationalId && x.LName != command.LName))
         {
             nationalIdIsOk = false;
             return opration.Failed("شناسه ملی وارد شده تکراری است");
         }
-        if (_personalContractingPartyRepository.Exists(x => x.ArchiveCode == command.ArchiveCode))
+        if (_personalContractingPartyRepository2.Exists(x => x.ArchiveCode == command.ArchiveCode))
             return opration.Failed("کد طرف حساب تکراری است");
 
 
@@ -206,8 +204,8 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
                 command.State, command.City, command.Zone,command.SureName);
 
 
-            _personalContractingPartyRepository.Create(legalContractingParty);
-            _personalContractingPartyRepository.SaveChanges();
+            _personalContractingPartyRepository2.Create(legalContractingParty);
+            _personalContractingPartyRepository2.SaveChanges();
 
             return opration.Succcedded();
 
@@ -225,15 +223,15 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
     {
             
         var opration = new OperationResult();
-        var personalContractingParty = _personalContractingPartyRepository.Get(command.Id);
+        var personalContractingParty = _personalContractingPartyRepository2.Get(command.Id);
         if (personalContractingParty == null)
             return opration.Failed("رکورد مورد نظر یافت نشد");
         if (command.RepresentativeId < 1)
             return opration.Failed("لطفا معرف را انتخاب کنید");
-        if (_personalContractingPartyRepository.Exists(x =>
+        if (_personalContractingPartyRepository2.Exists(x =>
                 x.LName == command.LName && x.Nationalcode == command.Nationalcode && x.SureName == command.SureName && x.id != command.Id))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
-        if (_personalContractingPartyRepository.Exists(x => x.ArchiveCode == command.ArchiveCode &&  x.id != command.Id))
+        if (_personalContractingPartyRepository2.Exists(x => x.ArchiveCode == command.ArchiveCode &&  x.id != command.Id))
             return opration.Failed("کد طرف حساب تکراری است");
         try
         {
@@ -302,7 +300,7 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
                 command.Phone, command.AgentPhone, command.Address, command.RepresentativeId, representative.FullName, command.ArchiveCode,
                 command.State, command.City, command.Zone,command.SureName);
 
-            _personalContractingPartyRepository.SaveChanges();
+            _personalContractingPartyRepository2.SaveChanges();
             return opration.Succcedded();
         }
         else
@@ -316,16 +314,16 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
     {
             
         var opration = new OperationResult();
-        var legalContractingParty = _personalContractingPartyRepository.Get(command.Id);
+        var legalContractingParty = _personalContractingPartyRepository2.Get(command.Id);
         if (legalContractingParty == null)
             return opration.Failed("رکورد مورد نظر یافت نشد");
 
-        if (_personalContractingPartyRepository.Exists(x =>
+        if (_personalContractingPartyRepository2.Exists(x =>
                 x.LName== command.LName && x.RegisterId == command.RegisterId &&x.SureName == command.SureName &&x.id != command.Id))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
         if (command.RepresentativeId < 1)
             return opration.Failed("لطفا معرف را انتخاب کنید");
-        if (_personalContractingPartyRepository.Exists(x => x.ArchiveCode == command.ArchiveCode && x.id != command.Id))
+        if (_personalContractingPartyRepository2.Exists(x => x.ArchiveCode == command.ArchiveCode && x.id != command.Id))
             return opration.Failed("کد طرف حساب تکراری است");
         var representative = _representativeApplication.GetDetails(command.RepresentativeId);
         legalContractingParty.EditLegal(command.LName, command.RegisterId,
@@ -333,54 +331,54 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
             command.Phone, command.AgentPhone, command.Address, command.RepresentativeId, representative.FullName,command.ArchiveCode,
             command.State, command.City, command.Zone, command.SureName);
 
-        _personalContractingPartyRepository.SaveChanges();
+        _personalContractingPartyRepository2.SaveChanges();
         return opration.Succcedded();
     }
 
     public EditPersonalContractingParty GetDetails(long id)
     {
-        return _personalContractingPartyRepository.GetDetails(id);
+        return _personalContractingPartyRepository2.GetDetails(id);
     }
 
     public string IsBlockByEmployerId(long employerId)
     {
-        return _personalContractingPartyRepository.IsBlockByEmployerId(employerId);
+        return _personalContractingPartyRepository2.IsBlockByEmployerId(employerId);
     }
 
     public EditPersonalContractingParty GetDetailsToEdit(long id)
     { 
-        return _personalContractingPartyRepository.GetDetailsToEdit(id);
+        return _personalContractingPartyRepository2.GetDetailsToEdit(id);
    
     }
 
     public string GetFullName(long id)
     {
-        return _personalContractingPartyRepository.GetFullName(id);
+        return _personalContractingPartyRepository2.GetFullName(id);
     }
 
     public List<PersonalContractingPartyViewModel> GetPersonalContractingParties()
     {
-        return _personalContractingPartyRepository.GetPersonalContractingParties();
+        return _personalContractingPartyRepository2.GetPersonalContractingParties();
     }
 
     public List<PersonalContractingPartyViewModel> Search(PersonalContractingPartySearchModel searchModel2)
     {
-        return _personalContractingPartyRepository.Search(searchModel2);
+        return _personalContractingPartyRepository2.Search(searchModel2);
     }
 
     public int GetLastArchiveCode()
     {
-        return _personalContractingPartyRepository.GetLastArchiveCode();
+        return _personalContractingPartyRepository2.GetLastArchiveCode();
     }
 	#region Mahan
 	public List<string> SearchByName(string name)
 	{
-		return _personalContractingPartyRepository.SearchByName(name);
+		return _personalContractingPartyRepository2.SearchByName(name);
 	}
 	#endregion
 	public ContractingPartyAndStatmentIdViewModel GetContractingpartyIdByAccountId(long accountId)
     {
-        return _personalContractingPartyRepository.GetContractingpartyIdByAccountId(accountId);
+        return _personalContractingPartyRepository2.GetContractingpartyIdByAccountId(accountId);
     }
 
 
@@ -388,15 +386,15 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
 
     public List<PersonalContractingPartyViewModel> GetPersonalContractingPartiesForNationalcode(string searchText)
     {
-        return _personalContractingPartyRepository.GetPersonalContractingPartiesForNationalcode(searchText);
+        return _personalContractingPartyRepository2.GetPersonalContractingPartiesForNationalcode(searchText);
 
     }
     public List<PersonalContractingPartyViewModel> SearchForMain(PersonalContractingPartySearchModel searchModel2)
     {
-        var result= _personalContractingPartyRepository.SearchForMain(searchModel2);
+        var result= _personalContractingPartyRepository2.SearchForMain(searchModel2);
         foreach (var item in result)
         {
-            item.HasInstitutionContract = _personalContractingPartyRepository.GetHasContract(item.id);
+            item.HasInstitutionContract = _personalContractingPartyRepository2.GetHasContract(item.id);
         }
         return result;
     }
@@ -413,12 +411,12 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
         //اونهایی که کارفرما یا قرارداد غیر فعال دارند غیر فعال می شوند
         if (_employerRepository.Exists(x => x.ContractingPartyId == id)|| _institutionContractRepository.Exists(x => x.ContractingPartyId == id))
         {
-            opration= _personalContractingPartyRepository.DeActiveAll(id);
+            opration= _personalContractingPartyRepository2.DeActiveAll(id);
             return opration;
         }
         else
         {
-            opration = _personalContractingPartyRepository.DeletePersonalContractingParties(id);
+            opration = _personalContractingPartyRepository2.DeletePersonalContractingParties(id);
         }
 
         return opration;
@@ -430,10 +428,10 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
     {
 
         var opration = new OperationResult();
-        var contract = _personalContractingPartyRepository.Get(id);
+        var contract = _personalContractingPartyRepository2.Get(id);
         if (contract == null)
             return opration.Failed("رکورد مورد نظر یافت نشد");
-        return _personalContractingPartyRepository.ActiveAll(id);
+        return _personalContractingPartyRepository2.ActiveAll(id);
 
 
         //var opration = new OperationResult();
@@ -448,44 +446,44 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
     public OperationResult DeActive(long id)
     {
         var opration = new OperationResult();
-        var personalContracting = _personalContractingPartyRepository.Get(id);
+        var personalContracting = _personalContractingPartyRepository2.Get(id);
         if (personalContracting == null)
             return opration.Failed("رکورد مورد نظر یافت نشد");
 
         personalContracting.DeActive();
 
 
-        _personalContractingPartyRepository.SaveChanges();
+        _personalContractingPartyRepository2.SaveChanges();
         return opration.Succcedded();
     }    
     public  bool GetHasContract(long id)
     {
            
-        return  _personalContractingPartyRepository.GetHasContract(id);
+        return  _personalContractingPartyRepository2.GetHasContract(id);
 
     }
 
     public OperationResult Block(long id)
     {
         var opration = new OperationResult();
-        var contract = _personalContractingPartyRepository.Get(id);
+        var contract = _personalContractingPartyRepository2.Get(id);
         if (contract == null)
             return opration.Failed("رکورد مورد نظر یافت نشد");
         contract.Block();
 
-        _personalContractingPartyRepository.SaveChanges();
+        _personalContractingPartyRepository2.SaveChanges();
         return opration.Succcedded();
     }
     public OperationResult DisableBlock(long id)
     {
         var opration = new OperationResult();
-        var personalContracting = _personalContractingPartyRepository.Get(id);
+        var personalContracting = _personalContractingPartyRepository2.Get(id);
         if (personalContracting == null)
             return opration.Failed("رکورد مورد نظر یافت نشد");
        
             int blockTimes = personalContracting.BlockTimes + 1;
             personalContracting.DisableBlock(blockTimes);
-            _personalContractingPartyRepository.SaveChanges();
+            _personalContractingPartyRepository2.SaveChanges();
       
         
     
@@ -501,225 +499,7 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
 
     public bool IsBlockCheckByWorkshopId(long workshopId)
     {
-        return _personalContractingPartyRepository.IsBlockCheckByWorkshopId(workshopId);
-    }
-
-
-
-    #endregion
-
-
-    #region Api
-
-
-    public async Task<ICollection<ContractingPartyGetListViewModel>> GetList(
-        ContractingPartyGetListSearchModel searchModel)
-    {
-        return await _personalContractingPartyRepository.GetList(searchModel);
-    }
-
-    public async Task<List<ContractingPartySelectListViewModel>> GetSelectList()
-    {
-        return await _personalContractingPartyRepository.GetSelectList();
-    }
-    public async Task<OperationResult> CreateReal(CreateRealContractingParty command)
-    {
-        var operation = new OperationResult();
-
-        if (_personalContractingPartyRepository.Exists(x =>
-                x.LName == command.LName && x.Nationalcode == command.NationalCode && x.SureName == command.SureName))
-            return operation.Failed("امکان ثبت رکورد تکراری وجود ندارد");
-
-        if (command.RepresentativeId < 1)
-            return operation.Failed("لطفا معرف را انتخاب کنید");
-
-        if (_personalContractingPartyRepository.Exists(x => x.Nationalcode == command.NationalCode && x.LName != command.LName))
-        {
-            nationalcodeIsOk = false;
-
-            return operation.Failed("کد ملی وارد شده تکراری است");
-        }
-
-
-        if (_personalContractingPartyRepository.Exists(x => x.ArchiveCode == command.ArchiveCode))
-            return operation.Failed("کد طرف حساب تکراری است");
-
-        if (command.NationalCode.NationalCodeValid() != "valid")
-        {
-            return operation.Failed("کد ملی وارد شده نا معتبر است");
-        }
-
-        var representative = _representativeApplication.GetDetails(command.RepresentativeId);
-        var personalContractingParty = new PersonalContractingParty(command.FName, command.LName,
-            command.NationalCode, command.IdNumber, "*", "*",
-            "حقیقی",
-            command.PhoneNumber, command.AgentPhone, command.Address, command.RepresentativeId, representative.FullName, command.ArchiveCode,
-            command.State, command.City, command.Zone, command.SureName);
-
-
-        await _personalContractingPartyRepository.CreateAsync(personalContractingParty);
-        await _personalContractingPartyRepository.SaveChangesAsync();
-
-        return operation.Succcedded();
-    }
-
-    public async Task<OperationResult> CreateLegal(CreateLegalContractingParty command)
-    {
-        var opration = new OperationResult();
-
-        if (_personalContractingPartyRepository.Exists(x =>
-                x.LName == command.CompanyName && x.RegisterId == command.RegisterId && x.SureName == command.SureName))
-            return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
-
-        if (command.RepresentativeId < 1)
-            return opration.Failed("لطفا معرف را انتخاب کنید");
-
-        if (_personalContractingPartyRepository.Exists(x =>
-                x.LName == command.CompanyName && x.SureName == command.SureName))
-        {
-            legalNameIsOk = false;
-            return opration.Failed("نام شرکت  وارد شده تکراری است");
-        }
-
-        if (_personalContractingPartyRepository.Exists(x =>
-                x.RegisterId == command.RegisterId && x.LName != command.CompanyName))
-        {
-            registerIdIsOk = false;
-            return opration.Failed("شماره ثبت وارد شده تکراری است");
-
-        }
-
-        if (_personalContractingPartyRepository.Exists(x =>
-                x.NationalId == command.NationalId && x.LName != command.CompanyName))
-        {
-            nationalIdIsOk = false;
-            return opration.Failed("شناسه ملی وارد شده تکراری است");
-        }
-
-        if (_personalContractingPartyRepository.Exists(x => x.ArchiveCode == command.ArchiveCode))
-            return opration.Failed("کد طرف حساب تکراری است");
-
-
-
-        var representative = _representativeApplication.GetDetails(command.RepresentativeId);
-        var legalContractingParty = new PersonalContractingParty("*", command.CompanyName,
-            "*", "*", command.RegisterId, command.NationalId,
-            "حقوقی",
-            command.PhoneNumber, command.AgentPhone, command.Address, command.RepresentativeId, representative.FullName,
-            command.ArchiveCode,
-            command.State, command.City, command.Zone, command.SureName);
-
-
-        await _personalContractingPartyRepository.CreateAsync(legalContractingParty);
-        await _personalContractingPartyRepository.SaveChangesAsync();
-
-        return opration.Succcedded();
-
-    }
-
-    public async Task<List<GetContractingPartyNationalCodeOrNationalIdViewModel>> GetNationalCodeOrNationalId()
-    {
-        return await _personalContractingPartyRepository.GetNationalCodeOrNationalId();
-    }
-
-    public async Task<OperationResult<string>> Delete(long id)
-    {
-        var operationResult = new OperationResult<string>();
-
-        try
-        {
-            //اگر دارای قرارداد یا دازای کارفرما باشد غیر فعال می شود
-            if (_employerRepository.Exists(x => x.ContractingPartyId == id) || _institutionContractRepository.Exists(x => x.ContractingPartyId == id))
-            {
-                operationResult = await _personalContractingPartyRepository.DeactivateWithSubordinates(id);
-                return operationResult;
-            }
-
-            var entity = _personalContractingPartyRepository.Get(id);
-            _personalContractingPartyRepository.Remove(entity);
-            operationResult.Succcedded("Deleted");
-        }
-        catch
-        {
-            return operationResult.Failed("خطایی رخ داده است");
-        }
-
-        return operationResult;
-    }
-
-    public OperationResult EditRealApi(EditRealContractingParty command)
-    {
-        var opration = new OperationResult();
-        var personalContractingParty = _personalContractingPartyRepository.Get(command.Id);
-
-        if (personalContractingParty == null)
-            return opration.Failed("رکورد مورد نظر یافت نشد");
-
-        if (command.RepresentativeId < 1)
-            return opration.Failed("لطفا معرف را انتخاب کنید");
-
-        if (_personalContractingPartyRepository.Exists(x =>
-                x.LName == command.LName && x.Nationalcode == command.NationalCode && x.SureName == command.SureName && x.id != command.Id))
-            return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
-
-        if (_personalContractingPartyRepository.Exists(x => x.ArchiveCode == command.ArchiveCode && x.id != command.Id))
-            return opration.Failed("کد طرف حساب تکراری است");
-
-        if (command.NationalCode.NationalCodeValid() != "valid")
-        {
-            return opration.Failed("کد ملی وارد شده نا معتبر است");
-        }
-
-        try
-        {
-            var representative = _representativeApplication.GetDetails(command.RepresentativeId);
-            personalContractingParty.Edit(command.FName, command.LName,
-                command.NationalCode, command.IdNumber,
-                command.PhoneNumber, command.AgentPhone, command.Address, command.RepresentativeId, representative.FullName, command.ArchiveCode,
-                command.State, command.City, command.Zone, command.SureName);
-
-            _personalContractingPartyRepository.SaveChanges();
-            return opration.Succcedded();
-        }
-        catch
-        {
-
-            return opration.Failed("خطایی رخ داده است");
-        }
-    }
-
-    public OperationResult EditLegal(EditLegalContractingParty command)
-    {
-        var opration = new OperationResult();
-        var legalContractingParty = _personalContractingPartyRepository.Get(command.Id);
-        if (legalContractingParty == null)
-            return opration.Failed("رکورد مورد نظر یافت نشد");
-
-        if (_personalContractingPartyRepository.Exists(x =>
-                x.LName == command.CompanyName && x.RegisterId == command.RegisterId && x.SureName == command.SureName && x.id != command.Id))
-            return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
-        if (command.RepresentativeId < 1)
-            return opration.Failed("لطفا معرف را انتخاب کنید");
-        if (_personalContractingPartyRepository.Exists(x => x.ArchiveCode == command.ArchiveCode && x.id != command.Id))
-            return opration.Failed("کد طرف حساب تکراری است");
-        var representative = _representativeApplication.GetDetails(command.RepresentativeId);
-        legalContractingParty.EditLegal(command.CompanyName, command.RegisterId,
-            command.NationalId,
-            command.PhoneNumber, command.AgentPhone, command.Address, command.RepresentativeId, representative.FullName, command.ArchiveCode,
-            command.State, command.City, command.Zone, command.SureName);
-
-        _personalContractingPartyRepository.SaveChanges();
-        return opration.Succcedded();
-    }
-
-    public async Task<GetRealContractingPartyDetailsViewModel> GetRealDetails(long id)
-    {
-        return await _personalContractingPartyRepository.GetRealDetails(id);
-    }
-
-    public async Task<GetLegalContractingPartyDetailsViewModel> GetLegalDetails(long id)
-    {
-        return await _personalContractingPartyRepository.GetLegalDetails(id);
+        return _personalContractingPartyRepository2.IsBlockCheckByWorkshopId(workshopId);
     }
 
     #endregion

CompanyManagment.Application/TemporaryClientRegistrationApplication.cs

@@ -67,7 +67,7 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
             return op.Failed("شماره همراه نا معتبر است");
 
 
-
+    
         #endregion
 
 
@@ -141,8 +141,6 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
             result.FName = createTemp.FName;
             result.LName = createTemp.LName;
             result.DateOfBirthFa = dateOfBirth;
-            result.FatherName = createTemp.FatherName;
-            result.IdNumberSerial = createTemp.IdNumberSerial;
             result.IdNumber = idNumber;
 
             return op.Succcedded(result);
@@ -190,7 +188,7 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
     /// </summary>
     /// <param name="command"></param>
     /// <returns></returns>
-    public async Task<OperationResult> CreateOrUpdateWorkshopTemp(List<WorkshopTempViewModel> command, long contractingPartyTempId)
+    public async Task<OperationResult> CreateOrUpdateWorkshopTemp(List<WorkshopTempViewModel> command)
     {
         var op = new OperationResult();
         var updateWorkshopList = command.Where(x => x.Id > 0).ToList();
@@ -198,17 +196,10 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
 
         if (updateWorkshopList.Count == 0 && createNewWorkshopList.Count == 0)
             return op.Failed("هیچ مجموعه ای ایجاد نشده است");
-        var oldWorkshops = await _workshopTempRepository.GetWorkshopTemp(contractingPartyTempId);
 
         #region Update
         if (updateWorkshopList.Count > 0)
         {
-            var updateListIds = updateWorkshopList.Select(x => x.Id).ToList();
-            var oldWorkshopsIds = oldWorkshops.Select(x => x.Id).ToList();
-            var exceptWorkshops = oldWorkshopsIds.Except(updateListIds).ToList();
-            if (exceptWorkshops.Any())
-                await _workshopTempRepository.RemoveWorkshopTemps(exceptWorkshops);
-
 
             foreach (var workshop in updateWorkshopList)
             {
@@ -221,7 +212,6 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
                     workshop.RollCall == false && workshop.Insurance == false)
                     op.Failed($"برای مجموعه {workshop.WorkshopName} هیچ سرویسی انتخاب نشده است");
                 var existWorkshops = _workshopTempRepository.Get(workshop.Id);
-
                 if (existWorkshops != null)
                 {
                     if (workshop.ContractAndCheckout)
@@ -266,8 +256,6 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
                         if (workshop.CustomizeCheckout)
                             await _workshopServicesTempRepository.CreateAsync(
                                 new WorkshopServicesTemp("CustomizeCheckout", workshop.CountPerson, workshop.Id));
-
-                        await _workshopServicesTempRepository.SaveChangesAsync();
                     }
 
                 }
@@ -336,8 +324,6 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
                     if (workshop.CustomizeCheckout)
                         await _workshopServicesTempRepository.CreateAsync(
                             new WorkshopServicesTemp("CustomizeCheckout", workshop.CountPerson, createNewWorkshopTemp.id));
-
-                    await _workshopServicesTempRepository.SaveChangesAsync();
                 }
 
             }
@@ -366,9 +352,8 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
     /// </summary>
     /// <param name="contractingPartyTempId"></param>
     /// <returns></returns>
-    public async Task<ReviewAndPaymentViewModel> GetTotalPaymentAndWorkshopList(long contractingPartyTempId, string periodModel = "12", string paymentModel = "OneTime", string contractStartType = "currentMonth")
+    public async Task<ReviewAndPaymentViewModel> GetTotalPaymentAndWorkshopList(long contractingPartyTempId, string periodModel = "12", string paymentModel = "OneTime")
     {
-
         //دریافت کارگاه ها
         var workshops = await _workshopTempRepository.GetWorkshopTemp(contractingPartyTempId);
 
@@ -395,10 +380,9 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
             _ => 12,
         };
         //رند کردن مبالغ کارگاه ها
-        var roundAmount = (((Convert.ToInt64(totalPayment1MonthDouble))) / 1000000) * 1000000;
-        double roundAmount2 = roundAmount;
+        var roundAmount = (int)(totalPayment1MonthDouble / 1000000) * 1000000;
         //بدست آوردن جمع کل مبالغ کارگاه بر اساس مدت قراداد
-        result.SumOfWorkshopsPaymentDouble = months * roundAmount2;
+        result.SumOfWorkshopsPaymentDouble = roundAmount * months;
         result.SumOfWorkshopsPaymentPaymentStr = result.SumOfWorkshopsPaymentDouble.ToMoney();
 
 
@@ -410,112 +394,31 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
         //مالیات
         result.ValueAddedTaxDouble = tenPercent;
         result.ValueAddedTaxSt = tenPercent.ToMoney();
-        //پرداخت یکجا
-        #region OneTimePaymentResult
-
-        double discountOneTimePeyment = result.SumOfWorkshopsPaymentDouble - tenPercent;
-
-
-        //مبلغ بدون مالیات و با تخفیف
-        result.OneTimeWithoutTaxPaymentDouble = discountOneTimePeyment;
-        result.OneTimeWithoutTaxPaymentStr = discountOneTimePeyment.ToMoney();
-
-        //مبلغ با مالیات
-        result.OneTimeTotalPaymentDouble = discountOneTimePeyment + tenPercent;
-        result.OneTimeTotalPaymentStr = result.OneTimeTotalPaymentDouble.ToMoney();
-
-        #endregion
-
-        //پرداخت ماهیانه
-        #region MonthlyPaymentResult
-
-        //مبلغ بدون مالیات
-        result.MonthlyWithoutTaxPaymentDouble = result.SumOfWorkshopsPaymentDouble;
-        result.MonthlyWithoutTaxPaymentStr = result.SumOfWorkshopsPaymentDouble.ToMoney();
-
-        // مبلغ با مالیات
-        result.MonthlyTotalPaymentDouble = result.SumOfWorkshopsPaymentDouble + tenPercent;
-        result.MonthlyTotalPaymentStr = result.MonthlyTotalPaymentDouble.ToMoney();
-        var installmentList = new List<MonthlyInstallment>();
-
-        var startDate = (DateTime.Now).ToFarsi();
-        result.ContractStartCurrentMonthFa = $"{startDate.Substring(0, 8)}01";
-        result.ContractStartCurrentMonthGr = result.ContractStartCurrentMonthFa.ToGeorgianDateTime();
-        startDate = result.ContractStartCurrentMonthFa;
-
-        result.ContractStartNextMonthGr = ((startDate.FindeEndOfMonth()).ToGeorgianDateTime()).AddDays(1);
-        result.ContractStartNextMonthFa = result.ContractStartNextMonthGr.ToFarsi();
-
-        if (contractStartType == "nextMonth")
-            startDate = result.ContractStartNextMonthFa;
-
-
-
-        var findeEnd = Tools.FindEndOfContract(startDate, periodModel);
-        var contractEndDate = findeEnd.endDateGr;
-        result.ContractEndGr = contractEndDate;
-        result.ContractEndFa = contractEndDate.ToFarsi();
-
-        if (periodModel == "1")
+        if (paymentModel == "OneTime")//تخفیف 10 درصدی درصورت پرداخت یکجا
         {
 
-            installmentList.Add(new MonthlyInstallment()
-            {
-                InstallmentAmountStr = result.MonthlyTotalPaymentStr,
-                InstallmentCounter = "سررسید پرداخت اول",
-                InstalmentDate = (DateTime.Now).ToFarsi()
+            double discountOneTimePeyment = result.SumOfWorkshopsPaymentDouble - tenPercent;
+            
 
-            });
-            result.MonthlyInstallments = installmentList;
+            //مبلغ بدون مالیات و با تخفیف
+            result.WithoutTaxPaymentDouble = discountOneTimePeyment;
+            result.WithoutTaxPaymentStr = discountOneTimePeyment.ToMoney();
+
+            //مبلغ با مالیات
+            result.TotalPaymentDouble = discountOneTimePeyment + tenPercent;
+            result.TotalPaymentStr = result.TotalPaymentDouble.ToMoney();
         }
         else
         {
-            int instalmentCount = Convert.ToInt32(periodModel);
-            var instalmentAmount = result.MonthlyTotalPaymentDouble / instalmentCount;
-            var findEndOfMonth = startDate.FindeEndOfMonth();
-            for (int i = 1; i <= instalmentCount; i++)
-            {
-                if (i == 1)
-                {
-                    startDate = (DateTime.Now).ToFarsi();
-
-                }
-                else if (i > 1)
-                {
-                    var currentMonthStart = ((findEndOfMonth.ToGeorgianDateTime()).AddDays(1)).ToFarsi();
-                    startDate = currentMonthStart.FindeEndOfMonth();
-                    findEndOfMonth = startDate;
-                }
-
-                installmentList.Add(new MonthlyInstallment()
-                {
-                    InstallmentAmountStr = instalmentAmount.ToMoney(),
-                    InstallmentCounter = i switch
-                    {
-                        1 => "سررسید پرداخت اول",
-                        2 => "سررسید پرداخت دوم",
-                        3 => "سررسید پرداخت سوم",
-                        4 => "سررسید پرداخت چهارم",
-                        5 => "سررسید پرداخت پنجم",
-                        6 => "سررسید پرداخت ششم",
-                        7 => "سررسید پرداخت هفتم",
-                        8 => "سررسید پرداخت هشتم",
-                        9 => "سررسید پرداخت نهم",
-                        10 => "سررسید پرداخت دهم",
-                        11 => "سررسید پرداخت یازدهم",
-                        12 => "سررسید پرداخت دوازدهم",
-                        _ => "سررسید پرداخت دوازدهم",
-                    },
-                    InstalmentDate = startDate
-
-                });
-            }
+            //مبلغ بدون مالیات
+            result.WithoutTaxPaymentDouble = result.SumOfWorkshopsPaymentDouble;
+            result.WithoutTaxPaymentStr = result.SumOfWorkshopsPaymentDouble.ToMoney();
 
+            // مبلغ با مالیات
+            result.TotalPaymentDouble = result.SumOfWorkshopsPaymentDouble + tenPercent;
+            result.TotalPaymentStr = result.TotalPaymentDouble.ToMoney();
         }
 
-        #endregion
-
-        result.MonthlyInstallments = installmentList;
         result.ContractingPartTempId = contractingPartyTempId;
 
         return result;
@@ -527,21 +430,19 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
     /// </summary>
     /// <param name="contractingPartyTempId"></param>
     /// <returns></returns>
-    public async Task<OperationResult> CreateOrUpdateInstitutionContractTemp(long contractingPartyTempId, string periodModel, string paymentModel, double totalPayment, double valueAddedTax, DateTime contractStart)
+    public async Task<OperationResult> CreateOrUpdateInstitutionContractTemp(long contractingPartyTempId, string periodModel, string paymentModel, double totalPayment, double valueAddedTax)
     {
 
         var op = new OperationResult();
         var institutionContractTemp = await
             _institutionContractTempRepository.GetInstitutionContractTemp(0, contractingPartyTempId);
-        var contractStartDate = contractStart;
-        string contractStartFa = contractStart.ToFarsi();
-        var findeEnd = Tools.FindEndOfContract(contractStartFa, periodModel);
-        var contractEndDate = findeEnd.endDateGr;
+
         if (institutionContractTemp == null)
         {
             var periodModelInt = Convert.ToInt32(periodModel);
-
-            var create = new InstitutionContractTemp(contractingPartyTempId, paymentModel, periodModel, totalPayment, contractStartDate, contractEndDate, "official", valueAddedTax, "", "BeforeSendVerifyCode", 0, null, null);
+            var contractstart = DateTime.Now;
+            var contractEnd = DateTime.Now.AddMonths(periodModelInt);
+            var create = new InstitutionContractTemp(contractingPartyTempId,paymentModel,periodModel,totalPayment,contractstart,contractEnd,"official", valueAddedTax,"", "BeforeSendVerifyCode", 0,null,null);
             _institutionContractTempRepository.Create(create);
             _institutionContractTempRepository.SaveChanges();
             return op.Succcedded();
@@ -550,20 +451,20 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
         {
             if (institutionContractTemp.VerifyCodeEndTime != null)
             {
-                var spaning = (DateTime.Now - institutionContractTemp.VerifyCodeEndTime.Value);
+                var spaning = (institutionContractTemp.VerifyCodeEndTime.Value - DateTime.Now);
                 if (institutionContractTemp.RegistrationStatus == "VerifyCodeSent" && spaning > new TimeSpan(0, 0, 0) && spaning < new TimeSpan(0, 1, 0))
                     return op.Failed("شما به تازگی پیامک دریافت نموده اید دو دقیقه صبر کنید و دوباره تلاش کنید");
             }
-
+  
             if (institutionContractTemp.RegistrationStatus == "Completed")
                 return op.Failed("شما قبلا ثبت نام خود را تکمیل نموده اید");
-
+          
 
             var periodModelInt = Convert.ToInt32(periodModel);
             var contractstart = DateTime.Now;
             var contractEnd = DateTime.Now.AddMonths(periodModelInt);
             var update = _institutionContractTempRepository.Get(institutionContractTemp.Id);
-            update.Edit(contractingPartyTempId, paymentModel, periodModel, totalPayment, contractStartDate, contractEndDate, "official", valueAddedTax, "", "BeforeSendVerifyCode", 0, null, null);
+            update.Edit(contractingPartyTempId, paymentModel, periodModel, totalPayment, contractstart, contractEnd, "official", valueAddedTax, "", "BeforeSendVerifyCode", 0, null, null);
             _institutionContractTempRepository.SaveChanges();
             return op.Succcedded();
         }
@@ -582,14 +483,14 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
     {
 
         var op = new OperationResult();
-        var institutionContractTemp = await
+        var institutionContractTemp = await 
             _institutionContractTempRepository.GetInstitutionContractTemp(0, contractingPartyTempId);
         if (institutionContractTemp == null)
-            return op.Failed("خطا");
+            return op.Failed("خظا");
 
         var update = _institutionContractTempRepository.Get(institutionContractTemp.Id);
 
-
+        
 
 
         if (institutionContractTemp.RegistrationStatus == "BeforeSendVerifyCode")
@@ -615,29 +516,26 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
                 return op.Succcedded(1, "کد برای شما پیامک شد");
             }
 
-
+           
         }
 
         if (institutionContractTemp.RegistrationStatus == "VerifyCodeSent")
 
         {
-
-            if (DateTime.Now < institutionContractTemp.VerifyCodeEndTime.Value)
-                return op.Failed("کد دریافت شده را وارد کنید");
-            var spaning = (DateTime.Now - institutionContractTemp.VerifyCodeEndTime.Value);
-            if ((spaning > new TimeSpan(0, 0, 0) && spaning < new TimeSpan(0, 1, 0)))
+            var spaning = (institutionContractTemp.VerifyCodeEndTime.Value - DateTime.Now);
+            if ((spaning >  new TimeSpan(0, 0, 0) && spaning < new TimeSpan(0, 1, 0)))
                 return op.Failed("شما به تازگی پیامک دریافت نموده اید دو دقیقه صبر کنید و دوباره تلاش کنید");
 
-            if ((spaning > new TimeSpan(0, 1, 0)))
+            if ((spaning > new TimeSpan(0, 0, 0) && spaning > new TimeSpan(0, 1, 0)))
             {
                 //ساخت کد شش رقمی
                 Random generator = new Random();
                 String code = generator.Next(1, 1000000).ToString("D6");
                 //ارسال اس ام اس
                 var getContractingPaty = _contractingPartyTempRepository.GetByContractingPartyTempId(contractingPartyTempId);
-                var sendResult = await _smsService.SendVerifyCodeToClient(getContractingPaty.Phone, code);
+                var sendResult =await _smsService.SendVerifyCodeToClient(getContractingPaty.Phone, code);
 
-                if (!sendResult.IsSuccedded)
+                if(!sendResult.IsSuccedded)
                     return op.Failed($"{sendResult.Message}");
 
 
@@ -646,16 +544,16 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
                 //ذخیره تاریخ ارسال و مهلت پایان
                 //ذخیره آیدی پیامک
                 //تغییر وضعیت به ارسال شده
-
+              
                 if (update != null)
                 {
-                    update.Update(code, "VerifyCodeSent", sendResult.MessageId, DateTime.Now, DateTime.Now.AddMinutes(2));
+                    update.Update(code, "VerifyCodeSent",sendResult.MessageId, DateTime.Now, DateTime.Now.AddMinutes(2));
                     _institutionContractTempRepository.SaveChanges();
                     return op.Succcedded(1, "کد برای شما پیامک شد");
                 }
+               
 
-
-
+              
             }
 
         }
@@ -682,25 +580,25 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
             _institutionContractTempRepository.GetInstitutionContractTemp(0, contractingPartyTempId);
         if (institutionContractTemp == null)
             return op.Failed("خظا");
-        if (institutionContractTemp.RegistrationStatus != "VerifyCodeSent")
+        if(institutionContractTemp.RegistrationStatus != "VerifyCodeSent")
             return op.Failed("خطا");
 
-        if (institutionContractTemp.VerifyCodeEndTime < DateTime.Now)
+        if(institutionContractTemp.VerifyCodeEndTime < DateTime.Now)
             return op.Failed("کد شما منقضی شده است");
 
-        if (institutionContractTemp.SendVerifyCodeTime < DateTime.Now && institutionContractTemp.VerifyCodeEndTime >= DateTime.Now)
+        if(institutionContractTemp.SendVerifyCodeTime < DateTime.Now && institutionContractTemp.VerifyCodeEndTime >= DateTime.Now)
         {
             if (institutionContractTemp.VerifyCode == verifyCode)
             {
 
-
+               
                 return op.Succcedded();
             }
             else
             {
                 return op.Failed("کد وارد شده صحیح نیست");
             }
-
+              
         }
 
 

CompanyManagment.EFCore/CompanyContext.cs

@@ -9,7 +9,6 @@ using Company.Domain.CheckoutAgg;
 using Company.Domain.ClassifiedSalaryAgg;
 using Company.Domain.ClientEmployeeWorkshopAgg;
 using Company.Domain.Contact2Agg;
-using Company.Domain.ContactUsAgg;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.ContractAgg;
 using Company.Domain.ContractingPartyAccountAgg;
@@ -176,8 +175,6 @@ public class CompanyContext : DbContext
 
     public DbSet<EmployeeClientTemp> EmployeeClientTemps { get; set; }
     public DbSet<LeftWorkTemp> LeftWorkTemps { get; set; }
-    public DbSet<ContactUs> ContactUs { get; set; }
-
 
     public DbSet<EmployeeAuthorizeTemp> EmployeeAuthorizeTemps { get; set; }
     public DbSet<AdminMonthlyOverview> AdminMonthlyOverviews { get; set; }

CompanyManagment.EFCore/Mapping/ContactUsMapping.cs

@@ -1,20 +0,0 @@
-using Company.Domain.ContactUsAgg;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-
-namespace CompanyManagment.EFCore.Mapping;
-
-public class ContactUsMapping:IEntityTypeConfiguration<ContactUs>
-{
-    public void Configure(EntityTypeBuilder<ContactUs> builder)
-    {
-        builder.HasKey(x => x.id);
-        builder.Property(x => x.FullName).HasMaxLength(200);
-        builder.Property(x => x.Title).HasMaxLength(200);
-        builder.Property(x => x.Email).HasMaxLength(200);
-        builder.Property(x => x.FirstName).HasMaxLength(100);
-        builder.Property(x => x.LastName).HasMaxLength(100);
-        builder.Property(x => x.Message).HasMaxLength(500);
-        builder.Property(x => x.PhoneNumber).HasMaxLength(20);
-    }
-}

CompanyManagment.EFCore/Mapping/CustomizeWorkshopEmployeeSettingsMapping.cs

@@ -228,7 +228,14 @@ public class CustomizeWorkshopEmployeeSettingsMapping : IEntityTypeConfiguration
 
         });
 
-        builder.OwnsMany(x => x.CustomizeRotatingShifts);
+		builder.OwnsMany(x => x.WeeklyOffDays, offDay =>
+		{
+			offDay.HasKey(x => x.Id);
+			offDay.Property(x => x.DayOfWeek).HasConversion<string>().HasMaxLength(15);
+			offDay.WithOwner().HasForeignKey(x => x.ParentId);
+		});
+
+		builder.OwnsMany(x => x.CustomizeRotatingShifts);
 
     }
 }

CompanyManagment.EFCore/Mapping/CustomizeWorkshopGroupSettingsMapping.cs

@@ -227,7 +227,15 @@ public class CustomizeWorkshopGroupSettingsMapping : IEntityTypeConfiguration<Cu
 
         });
 
-        builder.OwnsMany(x => x.CustomizeRotatingShifts);
+
+		builder.OwnsMany(x => x.WeeklyOffDays, offDay =>
+		{
+			offDay.HasKey(x => x.Id);
+			offDay.Property(x => x.DayOfWeek).HasConversion<string>().HasMaxLength(15);
+			offDay.WithOwner().HasForeignKey(x => x.ParentId);
+		});
+
+		builder.OwnsMany(x => x.CustomizeRotatingShifts);
 
 
         builder.HasOne(x => x.CustomizeWorkshopSettings).WithMany(x => x.CustomizeWorkshopGroupSettingsCollection)

CompanyManagment.EFCore/Mapping/CustomizeWorkshopSettingsMapping.cs

@@ -221,6 +221,12 @@ public class CustomizeWorkshopSettingsMapping:IEntityTypeConfiguration<Customize
          
 
         });
+        builder.OwnsMany(x => x.WeeklyOffDays, offDay =>
+        {
+	        offDay.HasKey(x => x.Id);
+	        offDay.Property(x => x.DayOfWeek).HasConversion<string>().HasMaxLength(15);
+	        offDay.WithOwner().HasForeignKey(x => x.ParentId);
+        });
 
         
         builder.HasMany(x => x.CustomizeWorkshopGroupSettingsCollection).WithOne(x => x.CustomizeWorkshopSettings)

CompanyManagment.EFCore/Mapping/InsuranceListMapping.cs

@@ -13,32 +13,5 @@ public class InsuranceListMapping : IEntityTypeConfiguration<InsuranceList>
 
         builder.Property(x => x.Year).HasMaxLength(4);
         builder.Property(x => x.Month).HasMaxLength(2);
-
-        builder.ComplexProperty(x => x.Inspection, inspection =>
-        {
-            inspection.IsRequired();
-            inspection.Property(x => x.Type).HasConversion<string>().HasMaxLength(50);
-            inspection.Property(x => x.LastInspectionDateTime);
-            inspection.Property(x => x.MediaId);
-        });
-
-        builder.ComplexProperty(x => x.Debt, debt =>
-        {
-            debt.IsRequired();
-            debt.Property(x => x.Type).HasConversion<string>().HasMaxLength(50);
-            debt.Property(x => x.DebtDate);
-            debt.Property(x => x.Amount);
-            debt.Property(x => x.MediaId);
-        });
-
-        builder.ComplexProperty(x => x.EmployerApproval, approval =>
-        {
-            approval.IsRequired();
-            approval.Property(x => x.Status).HasConversion<string>().HasMaxLength(50);
-            approval.Property(x => x.Description).HasMaxLength(500);
-        });
-
-        //builder.HasMany(x => x.EmployerSignatures)
-        //    .WithOne(x => x.InsuranceList).HasForeignKey(x => x.InsuranceListId);
     }
 }

CompanyManagment.EFCore/Mapping/PersonalContractingpartyMapping.cs

@@ -39,7 +39,7 @@ public class PersonalContractingpartyMapping : IEntityTypeConfiguration<Personal
         builder.Property(x => x.IdNumberSerial).HasMaxLength(15);
         builder.Property(x => x.FatherName).HasMaxLength(20);
         builder.Property(x => x.DateOfBirth).IsRequired(false);
-        builder.Property(x => x.Gender).HasConversion(
+                builder.Property(x => x.Gender).HasConversion(
             v => v.ToString(),
             v => string.IsNullOrWhiteSpace(v) ? Gender.None : (Gender)Enum.Parse(typeof(Gender), v)).HasMaxLength(6);
 

CompanyManagment.EFCore/Migrations/20250423184716_add contact us .cs

@@ -1,42 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addcontactus : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "ContactUs",
-                columns: table => new
-                {
-                    id = table.Column<long>(type: "bigint", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    FirstName = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
-                    LastName = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
-                    Email = table.Column<string>(type: "nvarchar(200)", maxLength: 200, nullable: true),
-                    PhoneNumber = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: true),
-                    Title = table.Column<string>(type: "nvarchar(200)", maxLength: 200, nullable: true),
-                    Message = table.Column<string>(type: "nvarchar(500)", maxLength: 500, nullable: true),
-                    FullName = table.Column<string>(type: "nvarchar(200)", maxLength: 200, nullable: true),
-                    CreationDate = table.Column<DateTime>(type: "datetime2", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ContactUs", x => x.id);
-                });
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "ContactUs");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20250427155240_add salaryAid calculation date.cs

@@ -1,23 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addsalaryAidcalculationdate : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-           
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20250427160638_add salaryAid calculation date to customize checkouts.cs

@@ -1,23 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addsalaryAidcalculationdatetocustomizecheckouts : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-          
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-           
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20250521125646_add inspection-debt-approval to insurance list.cs

@@ -1,121 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addinspectiondebtapprovaltoinsurancelist : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<double>(
-                name: "Debt_Amount",
-                table: "InsuranceLists",
-                type: "float",
-                nullable: false,
-                defaultValue: 0.0);
-
-            migrationBuilder.AddColumn<DateTime>(
-                name: "Debt_DebtDate",
-                table: "InsuranceLists",
-                type: "datetime2",
-                nullable: false,
-                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
-
-            migrationBuilder.AddColumn<long>(
-                name: "Debt_MediaId",
-                table: "InsuranceLists",
-                type: "bigint",
-                nullable: false,
-                defaultValue: 0L);
-
-            migrationBuilder.AddColumn<string>(
-                name: "Debt_Type",
-                table: "InsuranceLists",
-                type: "nvarchar(50)",
-                maxLength: 50,
-                nullable: false,
-                defaultValue: "None");
-
-            migrationBuilder.AddColumn<string>(
-                name: "EmployerApproval_Description",
-                table: "InsuranceLists",
-                type: "nvarchar(500)",
-                maxLength: 500,
-                nullable: true);
-
-            migrationBuilder.AddColumn<string>(
-                name: "EmployerApproval_Status",
-                table: "InsuranceLists",
-                type: "nvarchar(50)",
-                maxLength: 50,
-                nullable: false,
-                defaultValue: "None");
-
-            migrationBuilder.AddColumn<DateTime>(
-                name: "Inspection_LastInspectionDateTime",
-                table: "InsuranceLists",
-                type: "datetime2",
-                nullable: false,
-                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
-
-            migrationBuilder.AddColumn<long>(
-                name: "Inspection_MediaId",
-                table: "InsuranceLists",
-                type: "bigint",
-                nullable: false,
-                defaultValue: 0L);
-
-            migrationBuilder.AddColumn<string>(
-                name: "Inspection_Type",
-                table: "InsuranceLists",
-                type: "nvarchar(50)",
-                maxLength: 50,
-                nullable: false,
-                defaultValue: "None");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "Debt_Amount",
-                table: "InsuranceLists");
-
-            migrationBuilder.DropColumn(
-                name: "Debt_DebtDate",
-                table: "InsuranceLists");
-
-            migrationBuilder.DropColumn(
-                name: "Debt_MediaId",
-                table: "InsuranceLists");
-
-            migrationBuilder.DropColumn(
-                name: "Debt_Type",
-                table: "InsuranceLists");
-
-            migrationBuilder.DropColumn(
-                name: "EmployerApproval_Description",
-                table: "InsuranceLists");
-
-            migrationBuilder.DropColumn(
-                name: "EmployerApproval_Status",
-                table: "InsuranceLists");
-
-            migrationBuilder.DropColumn(
-                name: "Inspection_LastInspectionDateTime",
-                table: "InsuranceLists");
-
-            migrationBuilder.DropColumn(
-                name: "Inspection_MediaId",
-                table: "InsuranceLists");
-
-            migrationBuilder.DropColumn(
-                name: "Inspection_Type",
-                table: "InsuranceLists");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/20250602161025_add offDays to cws.Designer.cs

@@ -1,6 +1,5 @@
 // <auto-generated />
 using System;
-using System.Collections.Generic;
 using CompanyManagment.EFCore;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -13,8 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace CompanyManagment.EFCore.Migrations
 {
     [DbContext(typeof(CompanyContext))]
-    [Migration("20250602185437_insurance operation list")]
-    partial class insuranceoperationlist
+    [Migration("20250602161025_add offDays to cws")]
+    partial class addoffDaystocws
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -3354,64 +3353,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(4)
                         .HasColumnType("nvarchar(4)");
 
-                    b.ComplexProperty<Dictionary<string, object>>("Debt", "Company.Domain.InsuranceListAgg.InsuranceList.Debt#InsuranceListDebt", b1 =>
-                        {
-                            b1.IsRequired();
-
-                            b1.Property<double>("Amount")
-                                .HasColumnType("float");
-
-                            b1.Property<DateTime>("DebtDate")
-                                .HasColumnType("datetime2");
-
-                            b1.Property<bool>("IsDone")
-                                .HasColumnType("bit");
-
-                            b1.Property<long>("MediaId")
-                                .HasColumnType("bigint");
-
-                            b1.Property<string>("Type")
-                                .IsRequired()
-                                .HasMaxLength(50)
-                                .HasColumnType("nvarchar(50)");
-                        });
-
-                    b.ComplexProperty<Dictionary<string, object>>("EmployerApproval", "Company.Domain.InsuranceListAgg.InsuranceList.EmployerApproval#InsuranceListEmployerApproval", b1 =>
-                        {
-                            b1.IsRequired();
-
-                            b1.Property<string>("Description")
-                                .HasMaxLength(500)
-                                .HasColumnType("nvarchar(500)");
-
-                            b1.Property<bool>("IsDone")
-                                .HasColumnType("bit");
-
-                            b1.Property<string>("Status")
-                                .IsRequired()
-                                .HasMaxLength(50)
-                                .HasColumnType("nvarchar(50)");
-                        });
-
-                    b.ComplexProperty<Dictionary<string, object>>("Inspection", "Company.Domain.InsuranceListAgg.InsuranceList.Inspection#InsuranceListInspection", b1 =>
-                        {
-                            b1.IsRequired();
-
-                            b1.Property<bool>("IsDone")
-                                .HasColumnType("bit");
-
-                            b1.Property<DateTime>("LastInspectionDateTime")
-                                .HasColumnType("datetime2");
-
-                            b1.Property<long>("MediaId")
-                                .HasColumnType("bigint");
-
-                            b1.Property<string>("Type")
-                                .IsRequired()
-                                .HasMaxLength(50)
-                                .HasColumnType("nvarchar(50)");
-                        });
-
                     b.HasKey("id");
 
                     b.ToTable("InsuranceLists", (string)null);
@@ -7495,6 +7436,32 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasForeignKey("CustomizeWorkshopEmployeeSettingsid");
                         });
 
+                    b.OwnsMany("_0_Framework.Domain.CustomizeCheckoutShared.Base.WeeklyOffDay", "WeeklyOffDays", b1 =>
+                        {
+                            b1.Property<long>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("bigint");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("Id"));
+
+                            b1.Property<string>("DayOfWeek")
+                                .IsRequired()
+                                .HasMaxLength(15)
+                                .HasColumnType("nvarchar(15)");
+
+                            b1.Property<long>("ParentId")
+                                .HasColumnType("bigint");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("ParentId");
+
+                            b1.ToTable("CustomizeWorkshopEmployeeSettings_WeeklyOffDays");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ParentId");
+                        });
+
                     b.Navigation("BaseYearsPay");
 
                     b.Navigation("BonusesPay");
@@ -7530,6 +7497,8 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("OverTimePay");
 
                     b.Navigation("ShiftPay");
+
+                    b.Navigation("WeeklyOffDays");
                 });
 
             modelBuilder.Entity("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings", b =>
@@ -8053,6 +8022,32 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasForeignKey("CustomizeWorkshopGroupSettingsid");
                         });
 
+                    b.OwnsMany("_0_Framework.Domain.CustomizeCheckoutShared.Base.WeeklyOffDay", "WeeklyOffDays", b1 =>
+                        {
+                            b1.Property<long>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("bigint");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("Id"));
+
+                            b1.Property<string>("DayOfWeek")
+                                .IsRequired()
+                                .HasMaxLength(15)
+                                .HasColumnType("nvarchar(15)");
+
+                            b1.Property<long>("ParentId")
+                                .HasColumnType("bigint");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("ParentId");
+
+                            b1.ToTable("CustomizeWorkshopGroupSettings_WeeklyOffDays");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ParentId");
+                        });
+
                     b.Navigation("BaseYearsPay");
 
                     b.Navigation("BonusesPay");
@@ -8088,6 +8083,8 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("OverTimePay");
 
                     b.Navigation("ShiftPay");
+
+                    b.Navigation("WeeklyOffDays");
                 });
 
             modelBuilder.Entity("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings", b =>
@@ -8538,6 +8535,32 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasForeignKey("CustomizeWorkshopSettingsid");
                         });
 
+                    b.OwnsMany("_0_Framework.Domain.CustomizeCheckoutShared.Base.WeeklyOffDay", "WeeklyOffDays", b1 =>
+                        {
+                            b1.Property<long>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("bigint");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("Id"));
+
+                            b1.Property<string>("DayOfWeek")
+                                .IsRequired()
+                                .HasMaxLength(15)
+                                .HasColumnType("nvarchar(15)");
+
+                            b1.Property<long>("ParentId")
+                                .HasColumnType("bigint");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("ParentId");
+
+                            b1.ToTable("CustomizeWorkshopSettings_WeeklyOffDays");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ParentId");
+                        });
+
                     b.Navigation("BaseYearsPay");
 
                     b.Navigation("BonusesPay");
@@ -8566,6 +8589,8 @@ namespace CompanyManagment.EFCore.Migrations
 
                     b.Navigation("ShiftPay");
 
+                    b.Navigation("WeeklyOffDays");
+
                     b.Navigation("Workshop");
                 });
 

CompanyManagment.EFCore/Migrations/20250602161025_add offDays to cws.cs

@@ -0,0 +1,106 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addoffDaystocws : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+            migrationBuilder.CreateTable(
+                name: "CustomizeWorkshopEmployeeSettings_WeeklyOffDays",
+                columns: table => new
+                {
+                    Id = table.Column<long>(type: "bigint", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    DayOfWeek = table.Column<string>(type: "nvarchar(15)", maxLength: 15, nullable: false),
+                    ParentId = table.Column<long>(type: "bigint", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CustomizeWorkshopEmployeeSettings_WeeklyOffDays", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_CustomizeWorkshopEmployeeSettings_WeeklyOffDays_CustomizeWorkshopEmployeeSettings_ParentId",
+                        column: x => x.ParentId,
+                        principalTable: "CustomizeWorkshopEmployeeSettings",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "CustomizeWorkshopGroupSettings_WeeklyOffDays",
+                columns: table => new
+                {
+                    Id = table.Column<long>(type: "bigint", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    DayOfWeek = table.Column<string>(type: "nvarchar(15)", maxLength: 15, nullable: false),
+                    ParentId = table.Column<long>(type: "bigint", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CustomizeWorkshopGroupSettings_WeeklyOffDays", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_CustomizeWorkshopGroupSettings_WeeklyOffDays_CustomizeWorkshopGroupSettings_ParentId",
+                        column: x => x.ParentId,
+                        principalTable: "CustomizeWorkshopGroupSettings",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "CustomizeWorkshopSettings_WeeklyOffDays",
+                columns: table => new
+                {
+                    Id = table.Column<long>(type: "bigint", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    DayOfWeek = table.Column<string>(type: "nvarchar(15)", maxLength: 15, nullable: false),
+                    ParentId = table.Column<long>(type: "bigint", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CustomizeWorkshopSettings_WeeklyOffDays", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_CustomizeWorkshopSettings_WeeklyOffDays_CustomizeWorkshopSettings_ParentId",
+                        column: x => x.ParentId,
+                        principalTable: "CustomizeWorkshopSettings",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CustomizeWorkshopEmployeeSettings_WeeklyOffDays_ParentId",
+                table: "CustomizeWorkshopEmployeeSettings_WeeklyOffDays",
+                column: "ParentId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CustomizeWorkshopGroupSettings_WeeklyOffDays_ParentId",
+                table: "CustomizeWorkshopGroupSettings_WeeklyOffDays",
+                column: "ParentId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CustomizeWorkshopSettings_WeeklyOffDays_ParentId",
+                table: "CustomizeWorkshopSettings_WeeklyOffDays",
+                column: "ParentId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+          
+            migrationBuilder.DropTable(
+                name: "CustomizeWorkshopEmployeeSettings_WeeklyOffDays");
+
+            migrationBuilder.DropTable(
+                name: "CustomizeWorkshopGroupSettings_WeeklyOffDays");
+
+            migrationBuilder.DropTable(
+                name: "CustomizeWorkshopSettings_WeeklyOffDays");
+
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/20250602185437_insurance operation list.cs

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

CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs

@@ -1,6 +1,5 @@
 // <auto-generated />
 using System;
-using System.Collections.Generic;
 using CompanyManagment.EFCore;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -560,50 +559,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("TextManager_Contact", (string)null);
                 });
 
-            modelBuilder.Entity("Company.Domain.ContactUsAgg.ContactUs", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<DateTime>("CreationDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("Email")
-                        .HasMaxLength(200)
-                        .HasColumnType("nvarchar(200)");
-
-                    b.Property<string>("FirstName")
-                        .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
-
-                    b.Property<string>("FullName")
-                        .HasMaxLength(200)
-                        .HasColumnType("nvarchar(200)");
-
-                    b.Property<string>("LastName")
-                        .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
-
-                    b.Property<string>("Message")
-                        .HasMaxLength(500)
-                        .HasColumnType("nvarchar(500)");
-
-                    b.Property<string>("PhoneNumber")
-                        .HasMaxLength(20)
-                        .HasColumnType("nvarchar(20)");
-
-                    b.Property<string>("Title")
-                        .HasMaxLength(200)
-                        .HasColumnType("nvarchar(200)");
-
-                    b.HasKey("id");
-
-                    b.ToTable("ContactUs");
-                });
-
             modelBuilder.Entity("Company.Domain.ContarctingPartyAgg.PersonalContractingParty", b =>
                 {
                     b.Property<long>("id")
@@ -3395,64 +3350,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(4)
                         .HasColumnType("nvarchar(4)");
 
-                    b.ComplexProperty<Dictionary<string, object>>("Debt", "Company.Domain.InsuranceListAgg.InsuranceList.Debt#InsuranceListDebt", b1 =>
-                        {
-                            b1.IsRequired();
-
-                            b1.Property<double>("Amount")
-                                .HasColumnType("float");
-
-                            b1.Property<DateTime>("DebtDate")
-                                .HasColumnType("datetime2");
-
-                            b1.Property<bool>("IsDone")
-                                .HasColumnType("bit");
-
-                            b1.Property<long>("MediaId")
-                                .HasColumnType("bigint");
-
-                            b1.Property<string>("Type")
-                                .IsRequired()
-                                .HasMaxLength(50)
-                                .HasColumnType("nvarchar(50)");
-                        });
-
-                    b.ComplexProperty<Dictionary<string, object>>("EmployerApproval", "Company.Domain.InsuranceListAgg.InsuranceList.EmployerApproval#InsuranceListEmployerApproval", b1 =>
-                        {
-                            b1.IsRequired();
-
-                            b1.Property<string>("Description")
-                                .HasMaxLength(500)
-                                .HasColumnType("nvarchar(500)");
-
-                            b1.Property<bool>("IsDone")
-                                .HasColumnType("bit");
-
-                            b1.Property<string>("Status")
-                                .IsRequired()
-                                .HasMaxLength(50)
-                                .HasColumnType("nvarchar(50)");
-                        });
-
-                    b.ComplexProperty<Dictionary<string, object>>("Inspection", "Company.Domain.InsuranceListAgg.InsuranceList.Inspection#InsuranceListInspection", b1 =>
-                        {
-                            b1.IsRequired();
-
-                            b1.Property<bool>("IsDone")
-                                .HasColumnType("bit");
-
-                            b1.Property<DateTime>("LastInspectionDateTime")
-                                .HasColumnType("datetime2");
-
-                            b1.Property<long>("MediaId")
-                                .HasColumnType("bigint");
-
-                            b1.Property<string>("Type")
-                                .IsRequired()
-                                .HasMaxLength(50)
-                                .HasColumnType("nvarchar(50)");
-                        });
-
                     b.HasKey("id");
 
                     b.ToTable("InsuranceLists", (string)null);
@@ -7536,6 +7433,32 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasForeignKey("CustomizeWorkshopEmployeeSettingsid");
                         });
 
+                    b.OwnsMany("_0_Framework.Domain.CustomizeCheckoutShared.Base.WeeklyOffDay", "WeeklyOffDays", b1 =>
+                        {
+                            b1.Property<long>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("bigint");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("Id"));
+
+                            b1.Property<string>("DayOfWeek")
+                                .IsRequired()
+                                .HasMaxLength(15)
+                                .HasColumnType("nvarchar(15)");
+
+                            b1.Property<long>("ParentId")
+                                .HasColumnType("bigint");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("ParentId");
+
+                            b1.ToTable("CustomizeWorkshopEmployeeSettings_WeeklyOffDays");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ParentId");
+                        });
+
                     b.Navigation("BaseYearsPay");
 
                     b.Navigation("BonusesPay");
@@ -7571,6 +7494,8 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("OverTimePay");
 
                     b.Navigation("ShiftPay");
+
+                    b.Navigation("WeeklyOffDays");
                 });
 
             modelBuilder.Entity("Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities.CustomizeWorkshopGroupSettings", b =>
@@ -8094,6 +8019,32 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasForeignKey("CustomizeWorkshopGroupSettingsid");
                         });
 
+                    b.OwnsMany("_0_Framework.Domain.CustomizeCheckoutShared.Base.WeeklyOffDay", "WeeklyOffDays", b1 =>
+                        {
+                            b1.Property<long>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("bigint");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("Id"));
+
+                            b1.Property<string>("DayOfWeek")
+                                .IsRequired()
+                                .HasMaxLength(15)
+                                .HasColumnType("nvarchar(15)");
+
+                            b1.Property<long>("ParentId")
+                                .HasColumnType("bigint");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("ParentId");
+
+                            b1.ToTable("CustomizeWorkshopGroupSettings_WeeklyOffDays");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ParentId");
+                        });
+
                     b.Navigation("BaseYearsPay");
 
                     b.Navigation("BonusesPay");
@@ -8129,6 +8080,8 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Navigation("OverTimePay");
 
                     b.Navigation("ShiftPay");
+
+                    b.Navigation("WeeklyOffDays");
                 });
 
             modelBuilder.Entity("Company.Domain.CustomizeWorkshopSettingsAgg.Entities.CustomizeWorkshopSettings", b =>
@@ -8579,6 +8532,32 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasForeignKey("CustomizeWorkshopSettingsid");
                         });
 
+                    b.OwnsMany("_0_Framework.Domain.CustomizeCheckoutShared.Base.WeeklyOffDay", "WeeklyOffDays", b1 =>
+                        {
+                            b1.Property<long>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("bigint");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("Id"));
+
+                            b1.Property<string>("DayOfWeek")
+                                .IsRequired()
+                                .HasMaxLength(15)
+                                .HasColumnType("nvarchar(15)");
+
+                            b1.Property<long>("ParentId")
+                                .HasColumnType("bigint");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("ParentId");
+
+                            b1.ToTable("CustomizeWorkshopSettings_WeeklyOffDays");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ParentId");
+                        });
+
                     b.Navigation("BaseYearsPay");
 
                     b.Navigation("BonusesPay");
@@ -8607,6 +8586,8 @@ namespace CompanyManagment.EFCore.Migrations
 
                     b.Navigation("ShiftPay");
 
+                    b.Navigation("WeeklyOffDays");
+
                     b.Navigation("Workshop");
                 });
 

CompanyManagment.EFCore/Repository/ContactUsRepository.cs

@@ -1,14 +0,0 @@
-using _0_Framework.InfraStructure;
-using Company.Domain.ContactUsAgg;
-using Microsoft.EntityFrameworkCore;
-
-namespace CompanyManagment.EFCore.Repository;
-
-public class ContactUsRepository:RepositoryBase<long,ContactUs>,IContactUsRepository
-{
-    private readonly CompanyContext _companyContext;
-    public ContactUsRepository(CompanyContext companyContext) : base(companyContext)
-    {
-        _companyContext = companyContext;
-    }
-}

CompanyManagment.EFCore/Repository/CustomizeWorkshopEmployeeSettingsRepository.cs

@@ -26,7 +26,6 @@ public class CustomizeWorkshopEmployeeSettingsRepository(CompanyContext companyC
             return new();
         return new EditCustomizeEmployeeSettings()
         {
-            FridayWork = entity.FridayWork,
             FridayPay = new() { FridayPayType = entity.FridayPay.FridayPayType, Value = entity.FridayPay.Value },
             LateToWork = new()
             {

CompanyManagment.EFCore/Repository/CustomizeWorkshopGroupSettingsRepository.cs

@@ -265,7 +265,7 @@ public class CustomizeWorkshopGroupSettingsRepository(CompanyContext companyCont
         var entity = _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery().FirstOrDefault(x => x.id == groupId);
         return new EditCustomizeWorkshopGroupSettings()
         {
-            FridayWork = entity.FridayWork,
+            //FridayWork = entity.FridayWork,
             FridayPay = new (){ FridayPayType = entity.FridayPay.FridayPayType, Value = entity.FridayPay.Value },
             LateToWork = new()
 			{
@@ -338,8 +338,8 @@ public class CustomizeWorkshopGroupSettingsRepository(CompanyContext companyCont
             {
                 EndTime = x.EndTime.ToString("HH:mm"),
                 StartTime = x.StartTime.ToString("HH:mm")
-            }).ToList()
-
+            }).ToList(),
+            OffDayOfWeeks = entity.WeeklyOffDays.Select(x=>x.DayOfWeek).ToList()
         };
 
     }

CompanyManagment.EFCore/Repository/CustomizeWorkshopSettingsRepository.cs

@@ -8,351 +8,364 @@ using CompanyManagment.App.Contracts.CustomizeWorkshopSettings.ValueObjectsViewM
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 
-namespace CompanyManagment.EFCore.Repository
+namespace CompanyManagment.EFCore.Repository;
+
+public class CustomizeWorkshopSettingsRepository(CompanyContext companyContext, IAuthHelper authHelper, IEmployeeRepository employeeRepository)
+    : RepositoryBase<long, CustomizeWorkshopSettings>(companyContext), ICustomizeWorkshopSettingsRepository
 {
-    public class CustomizeWorkshopSettingsRepository(CompanyContext companyContext, IAuthHelper authHelper, IEmployeeRepository employeeRepository)
-        : RepositoryBase<long, CustomizeWorkshopSettings>(companyContext), ICustomizeWorkshopSettingsRepository
+    private readonly CompanyContext _companyContext = companyContext;
+    private readonly IAuthHelper _authHelper = authHelper;
+    private readonly IEmployeeRepository _employeeRepository = employeeRepository;
+
+    public CustomizeWorkshopSettingsViewModel GetWorkshopSettingsByWorkshopId(long workshopId, AuthViewModel auth)
     {
-        private readonly CompanyContext _companyContext = companyContext;
-        private readonly IAuthHelper _authHelper = authHelper;
-        private readonly IEmployeeRepository _employeeRepository = employeeRepository;
+        var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().Where(x => x.WorkshopId == workshopId)
+            .Include(x => x.CustomizeWorkshopGroupSettingsCollection)
+            .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection).AsSplitQuery()
+            .FirstOrDefault();
+        if (entity == null)
+            return new();
 
-        public CustomizeWorkshopSettingsViewModel GetWorkshopSettingsByWorkshopId(long workshopId, AuthViewModel auth)
+        var employeeIds = entity.CustomizeWorkshopGroupSettingsCollection
+            .SelectMany(x => x.CustomizeWorkshopEmployeeSettingsCollection)
+            .Select(y => y.EmployeeId)
+            .ToList();
+        var employees = _employeeRepository.GetBy(employeeIds);
+        return new CustomizeWorkshopSettingsViewModel()
         {
-            var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().Where(x => x.WorkshopId == workshopId)
-                .Include(x => x.CustomizeWorkshopGroupSettingsCollection)
-                .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection).AsSplitQuery()
-                .FirstOrDefault();
-            if (entity == null)
-                return new();
-
-            var employeeIds = entity.CustomizeWorkshopGroupSettingsCollection
-                .SelectMany(x => x.CustomizeWorkshopEmployeeSettingsCollection)
-                .Select(y => y.EmployeeId)
-                .ToList();
-            var employees = _employeeRepository.GetBy(employeeIds);
-            return new CustomizeWorkshopSettingsViewModel()
-            {
-                Id = entity.id,
-                Name = auth.WorkshopList.FirstOrDefault(w => w.Id == entity.WorkshopId)?.Name,
-                GroupSettings = entity.CustomizeWorkshopGroupSettingsCollection.Where(x => !x.MainGroup).Select(x =>
-                    new CustomizeWorkshopGroupSettingsViewModel()
-                    {
-                        Id = x.id,
-                        GroupName = x.GroupName,
-                        WorkshopShiftStatus = x.WorkshopShiftStatus,
-                        IrregularShift = x.IrregularShift,
-                        Salary = x.Salary,
-                        RollCallWorkshopShifts = x.CustomizeWorkshopGroupSettingsShifts.Select(s =>
-                            new CustomizeWorkshopShiftViewModel()
-                            {
-                                EndTime = s.EndTime.ToString("HH:mm"),
-                                Placement = s.Placement,
-                                StartTime = s.StartTime.ToString("HH:mm")
-
-                            }).ToList(),
-                        MainGroup = x.MainGroup,
-                        CustomizeRotatingShiftsViewModels = x.CustomizeRotatingShifts.
-	                        Select(r=>new CustomizeRotatingShiftsViewModel(){StartTime = r.StartTime.ToString("HH:mm"), EndTime = r.EndTime.ToString("HH:mm")}).ToList()
-                    }).ToList(),
-
-            };
-        }
-        public CustomizeWorkshopSettingsViewModel GetWorkshopSettingsByWorkshopIdForAdmin(long workshopId)
-        {
-            var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().Where(x => x.WorkshopId == workshopId)
-                .Include(x => x.CustomizeWorkshopGroupSettingsCollection)
-                .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection).AsSplitQuery()
-                .FirstOrDefault();
-            if (entity == null)
-                return new();
-
-            return new CustomizeWorkshopSettingsViewModel()
-            {
-                Id = entity.id,
-                Offset = entity.EndTimeOffSet,
-                GroupSettings = entity.CustomizeWorkshopGroupSettingsCollection.Where(x => !x.MainGroup).Select(x =>
-                    new CustomizeWorkshopGroupSettingsViewModel()
-                    {
-                        Id = x.id,
-                        GroupName = x.GroupName,
-                        RollCallWorkshopEmployeesSettings = x.CustomizeWorkshopEmployeeSettingsCollection.Select(y =>
-                        {
-                            var employee = _employeeRepository.Get(y.EmployeeId);
-                            return new CustomizeWorkshopEmployeeSettingsViewModel()
-                            {
-                                Id = y.id,
-                                EmployeeId = y.EmployeeId,
-                                IsSettingChanged = y.IsSettingChanged,
-                                IsShiftChanged = y.IsShiftChanged,
-                                Name = $"{employee?.FName} {employee?.LName}",
-                                RollCallWorkshopShifts = y.CustomizeWorkshopEmployeeSettingsShifts.Select(s =>
-                                    new CustomizeWorkshopShiftViewModel()
-                                    {
-                                        EndTime = s.EndTime.ToString("HH:mm"),
-                                        Placement = s.Placement,
-                                        StartTime = s.StartTime.ToString("HH:mm")
-                                    }).ToList(),
-                                Salary = y.Salary,
-                                CustomizeRotatingShiftsViewModels = y.CustomizeRotatingShifts.Select(r => new CustomizeRotatingShiftsViewModel
-                                {
-                                    StartTime = r.StartTime.ToString("HH:mm"),
-                                    EndTime = r.EndTime.ToString("HH:mm")
-                                }).ToList(),
-                                LeavePermittedDays = y.LeavePermittedDays,
-                                IrregularShift = y.IrregularShift,
-                                WorkshopShiftStatus = y.WorkshopShiftStatus
-                            };
-                        }).ToList(),
-                        Salary = x.Salary,
-                        RollCallWorkshopShifts = x.CustomizeWorkshopGroupSettingsShifts.Select(s =>
-                            new CustomizeWorkshopShiftViewModel()
-                            {
-                                EndTime = s.EndTime.ToString("HH:mm"),
-                                Placement = s.Placement,
-                                StartTime = s.StartTime.ToString("HH:mm")
-
-                            }).ToList(),
-                        MainGroup = x.MainGroup,
-                        WorkshopShiftStatus = x.WorkshopShiftStatus,
-                        CustomizeRotatingShiftsViewModels = x.CustomizeRotatingShifts.Select(r=>new CustomizeRotatingShiftsViewModel
-                        {
-                            StartTime = r.StartTime.ToString("HH:mm"),
-                            EndTime = r.EndTime.ToString("HH:mm")
-                        }).ToList(),
-                        IrregularShift = x.IrregularShift
-
-
-
-                    }).ToList(),
-            };
-        }
-
-
-        public EditCustomizeWorkshopSettings GetWorkshopSettingsDetails(long workshopId)
-        {
-
-            var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().FirstOrDefault(x => x.WorkshopId == workshopId);
-            if (entity == null)
-                return new();
-            var viewModel = new EditCustomizeWorkshopSettings()
-            {
-                FridayWork = entity.FridayWork,
-                FridayPay = new() { FridayPayType = entity.FridayPay.FridayPayType, Value = entity.FridayPay.Value },
-                LateToWork = new()
-                {
-                    LateToWorkTimeFinesVewModels = entity.LateToWork.LateToWorkTimeFines.Select(x =>
-                        new LateToWorkTimeFineVewModel() { FineMoney = x.FineMoney, Minute = x.Minute }).ToList(),
-                    Value = entity.LateToWork.Value,
-                    LateToWorkType = entity.LateToWork.LateToWorkType
-                },
-                HolidayWork = entity.HolidayWork,
-                FineAbsenceDeduction = new()
-                {
-                    Value = entity.FineAbsenceDeduction.Value,
-                    FineAbsenceDayOfWeekViewModels = entity.FineAbsenceDeduction.FineAbsenceDayOfWeekCollection
-                        .Select(x => new FineAbsenceDayOfWeekViewModel() { DayOfWeek = x.DayOfWeek }).ToList(),
-                    FineAbsenceDeductionType = entity.FineAbsenceDeduction.FineAbsenceDeductionType
-                },
-                EarlyExit = new()
-                {
-                    EarlyExitTimeFinesViewModels = entity.EarlyExit.EarlyExitTimeFines.Select(x =>
-                        new EarlyExitTimeFineViewModel() { FineMoney = x.FineMoney, Minute = x.Minute }).ToList(),
-                    Value = entity.EarlyExit.Value,
-                    EarlyExitType = entity.EarlyExit.EarlyExitType
-                },
-                BonusesPay = new()
-                {
-                    Value = entity.BonusesPay.Value,
-                    BonusesPayType = entity.BonusesPay.BonusesPayType,
-                    PaymentType = entity.BonusesPay.PaymentType
-                },
-                ShiftPay = new()
-                {
-                    Value = entity.ShiftPay.Value,
-                    ShiftPayType = entity.ShiftPay.ShiftPayType,
-                    ShiftType = entity.ShiftPay.ShiftType
-                },
-                InsuranceDeduction = new()
-                {
-                    Value = entity.InsuranceDeduction.Value,
-                    InsuranceDeductionType = entity.InsuranceDeduction.InsuranceDeductionType
-                },
-                OverTimePay = new()
-                { OverTimePayType = entity.OverTimePay.OverTimePayType, Value = entity.OverTimePay.Value },
-                BaseYearsPay = new()
-                {
-                    BaseYearsPayType = entity.BaseYearsPay.BaseYearsPayType,
-                    Value = entity.BaseYearsPay.Value,
-                    PaymentType = entity.BaseYearsPay.PaymentType
-                },
-                NightWorkPay = new()
-                { NightWorkingType = entity.NightWorkPay.NightWorkingType, Value = entity.NightWorkPay.Value },
-                LeavePay = new()
-                {
-                    Value = entity.LeavePay.Value,
-                    LeavePayType = entity.LeavePay.LeavePayType
-                },
-                MarriedAllowance = new()
-                {
-                    Value = entity.MarriedAllowance.Value,
-                    MarriedAllowanceType = entity.MarriedAllowance.MarriedAllowanceType
-                },
-                FamilyAllowance = new()
-                {
-                    FamilyAllowanceType = entity.FamilyAllowance.FamilyAllowanceType,
-                    Value = entity.FamilyAllowance.Value
-                },
-                Currency = entity.Currency,
-                MaxMonthDays = entity.MaxMonthDays,
-                Id = entity.id,
-                ShiftsList = entity.CustomizeWorkshopSettingsShifts.Select(x => new CustomizeWorkshopShiftViewModel()
-                { EndTime = x.EndTime.ToString("HH:mm"), Placement = x.Placement, StartTime = x.StartTime.ToString("HH:mm") }).ToList(),
-                BonusesPaysInEndOfMonth = entity.BonusesPaysInEndOfMonth,
-                LeavePermittedDays = entity.LeavePermittedDays,
-                BaseYearsPayInEndOfYear = entity.BaseYearsPayInEndOfYear,
-                WorkshopId = entity.WorkshopId,
-                WorkshopShiftStatus = entity.WorkshopShiftStatus
-
-            };
-            return viewModel;
-
-        }
-
-        public CustomizeWorkshopSettings GetBy(long workshopId)
-        {
-            return _companyContext.CustomizeWorkshopSettings.FirstOrDefault(x => x.WorkshopId == workshopId);
-        }
-
-        public EditCustomizeWorkshopSettings GetSimpleWorkshopSettings(long workshopId)
-        {
-            var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().FirstOrDefault(x => x.WorkshopId == workshopId);
-            if (entity == null)
-            {
-                return new();
-            }
-
-            return new()
-            {
-                ShiftsList = entity.CustomizeWorkshopSettingsShifts.Select(x => new CustomizeWorkshopShiftViewModel()
-                {
-                    EndTime = x.EndTime.ToString("HH:mm"),
-                    StartTime = x.StartTime.ToString("HH:mm"),
-                    Placement = x.Placement
-                }).ToList(),
-                Id = entity.id,
-                WorkshopId = entity.WorkshopId,
-                WorkshopShiftStatus = entity.WorkshopShiftStatus,
-                FridayWork = entity.FridayWork,
-                HolidayWork = entity.HolidayWork
-
-            };
-        }
-
-        public List<ChangedGroupedViewModel> GetShiftChangesGroupAndEmployees(long customizeWorkshopSettingsId)
-        {
-
-
-            var result = from groupSetting in _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery()
-                         where groupSetting.IsShiftChange // Filter parent tables where isChange is true
-                         join employeeSettings in _companyContext.CustomizeWorkshopEmployeeSettings on groupSetting.id equals employeeSettings.CustomizeWorkshopGroupSettingId
-                         where employeeSettings.IsShiftChanged// Filter child tables where isChange is true
-                         join employee in _companyContext.Employees on employeeSettings.EmployeeId equals employee.id
-                         group new { employee.FullName, groupSetting.GroupName } by groupSetting.id into grouped
-                         select new ChangedGroupedViewModel
-                         {
-                             GroupName = grouped.First().GroupName,
-                             EmployeeName = grouped.Select(e => e.FullName).ToList()
-                         };
-
-            return result.ToList();
-
-        }
-
-        public CustomizeWorkshopSettingsViewModel GetWorkshopIncludeGroupsByWorkshopId(long workshopId)
-        {
-            var customizeWorkshopSettings = _companyContext.CustomizeWorkshopSettings
-                .AsNoTracking().AsSplitQuery().Where(x => x.WorkshopId == workshopId)
-                .Include(x => x.CustomizeWorkshopGroupSettingsCollection)
-                .Select(x => new CustomizeWorkshopSettingsViewModel()
+            Id = entity.id,
+            Name = auth.WorkshopList.FirstOrDefault(w => w.Id == entity.WorkshopId)?.Name,
+            GroupSettings = entity.CustomizeWorkshopGroupSettingsCollection.Where(x => !x.MainGroup).Select(x =>
+                new CustomizeWorkshopGroupSettingsViewModel()
                 {
                     Id = x.id,
-                    WorkshopShiftStatus = x.WorkshopShiftStatus,
-                    GroupSettings = x.CustomizeWorkshopGroupSettingsCollection.Select(g =>
-                        new CustomizeWorkshopGroupSettingsViewModel()
+                    GroupName = x.GroupName,
+                    RollCallWorkshopEmployeesSettings = x.CustomizeWorkshopEmployeeSettingsCollection.Select(y =>
+                    {
+                        var employee = employees.First(e => e.Id == y.EmployeeId);
+                        return new CustomizeWorkshopEmployeeSettingsViewModel()
                         {
-                            Id = g.id,
-                            IrregularShift = g.IrregularShift,
-                            WorkshopShiftStatus = g.WorkshopShiftStatus,
-                            GroupName = g.GroupName,
-                            MainGroup = g.MainGroup,
-                            Salary = g.Salary,
-                            SalaryStr = g.Salary.ToMoney(),
-                            LeavePermitted = g.LeavePermittedDays,
-                            RollCallWorkshopShifts = g.CustomizeWorkshopGroupSettingsShifts.Select(s =>
+                            Id = y.id,
+                            EmployeeId = y.EmployeeId,
+                            IsSettingChanged = y.IsSettingChanged,
+                            IsShiftChanged = y.IsShiftChanged,
+                            Name = $"{employee}",
+                            RollCallWorkshopShifts = y.CustomizeWorkshopEmployeeSettingsShifts.Select(s =>
                                 new CustomizeWorkshopShiftViewModel()
                                 {
-                                    StartTime = s.StartTime.ToString("HH:mm"),
                                     EndTime = s.EndTime.ToString("HH:mm"),
                                     Placement = s.Placement,
+                                    StartTime = s.StartTime.ToString("HH:mm")
                                 }).ToList(),
-                            BreakTime = g.BreakTime,
-                            HolidayWork = g.HolidayWork,
-                            FridayWork = g.FridayWork,
-                            CustomizeRotatingShiftsViewModels = g.CustomizeRotatingShifts.Select(r=>new CustomizeRotatingShiftsViewModel()
-                            {
-                                EndTime = r.EndTime.ToString("HH:mm"),
-                                StartTime= r.StartTime.ToString("HH:mm")
-                            }).ToList()
-                            
-                        }).ToList(),
+                            Salary = y.Salary,
 
-
-                }).FirstOrDefault();
-
-            return customizeWorkshopSettings;
-        }
-
-        public CustomizeWorkshopEmployeeSettingsViewModel GetEmployeeSettingsByWorkshopIdEmployeeId(long workshopId, long employeeId)
-        {
-            var employee = _companyContext.CustomizeWorkshopSettings
-                .AsSplitQuery().Include(x => x.CustomizeWorkshopGroupSettingsCollection)
-                .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection)
-                .FirstOrDefault(x => x.WorkshopId == workshopId)?.CustomizeWorkshopGroupSettingsCollection.SelectMany(x => x.CustomizeWorkshopEmployeeSettingsCollection)
-                .FirstOrDefault(x => x.EmployeeId == employeeId);
-
-            if (employee == null)
-                return new();
-
-            var employeeName = _companyContext.Employees.Select(x => new { x.FullName, x.id })
-                .FirstOrDefault(x => x.id == employee.EmployeeId);
-            return new CustomizeWorkshopEmployeeSettingsViewModel()
-            {
-                Id = employee.id,
-                EmployeeId = employee.EmployeeId,
-                IsSettingChanged = employee.IsSettingChanged,
-                IsShiftChanged = employee.IsShiftChanged,
-                Name = employeeName?.FullName,
-                RollCallWorkshopShifts = employee.CustomizeWorkshopEmployeeSettingsShifts.Select(x =>
-                    new CustomizeWorkshopShiftViewModel()
-                    {
-                        EndTime = x.EndTime.ToString("HH:mm"),
-                        Placement = x.Placement,
-                        StartTime = x.StartTime.ToString("HH:mm")
+                        };
                     }).ToList(),
-                Salary = employee.Salary
-            };
+                    WorkshopShiftStatus = x.WorkshopShiftStatus,
+                    IrregularShift = x.IrregularShift,
+                    Salary = x.Salary,
+                    RollCallWorkshopShifts = x.CustomizeWorkshopGroupSettingsShifts.Select(s =>
+                        new CustomizeWorkshopShiftViewModel()
+                        {
+                            EndTime = s.EndTime.ToString("HH:mm"),
+                            Placement = s.Placement,
+                            StartTime = s.StartTime.ToString("HH:mm")
+
+                        }).ToList(),
+                    MainGroup = x.MainGroup,
+                    CustomizeRotatingShiftsViewModels = x.CustomizeRotatingShifts.
+                        Select(r=>new CustomizeRotatingShiftsViewModel(){StartTime = r.StartTime.ToString("HH:mm"), EndTime = r.EndTime.ToString("HH:mm")}).ToList()
+                }).ToList(),
+
+        };
+    }
+    public CustomizeWorkshopSettingsViewModel GetWorkshopSettingsByWorkshopIdForAdmin(long workshopId)
+    {
+        var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().Where(x => x.WorkshopId == workshopId)
+            .Include(x => x.CustomizeWorkshopGroupSettingsCollection)
+            .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection).AsSplitQuery()
+            .FirstOrDefault();
+        if (entity == null)
+            return new();
+
+        return new CustomizeWorkshopSettingsViewModel()
+        {
+            Id = entity.id,
+            Offset = entity.EndTimeOffSet,
+            GroupSettings = entity.CustomizeWorkshopGroupSettingsCollection.Where(x => !x.MainGroup).Select(x =>
+                new CustomizeWorkshopGroupSettingsViewModel()
+                {
+                    Id = x.id,
+                    GroupName = x.GroupName,
+                    RollCallWorkshopEmployeesSettings = x.CustomizeWorkshopEmployeeSettingsCollection.Select(y =>
+                    {
+                        var employee = _employeeRepository.Get(y.EmployeeId);
+                        return new CustomizeWorkshopEmployeeSettingsViewModel()
+                        {
+                            Id = y.id,
+                            EmployeeId = y.EmployeeId,
+                            IsSettingChanged = y.IsSettingChanged,
+                            IsShiftChanged = y.IsShiftChanged,
+                            Name = $"{employee?.FName} {employee?.LName}",
+                            RollCallWorkshopShifts = y.CustomizeWorkshopEmployeeSettingsShifts.Select(s =>
+                                new CustomizeWorkshopShiftViewModel()
+                                {
+                                    EndTime = s.EndTime.ToString("HH:mm"),
+                                    Placement = s.Placement,
+                                    StartTime = s.StartTime.ToString("HH:mm")
+                                }).ToList(),
+                            Salary = y.Salary,
+                            CustomizeRotatingShiftsViewModels = y.CustomizeRotatingShifts.Select(r => new CustomizeRotatingShiftsViewModel
+                            {
+                                StartTime = r.StartTime.ToString("HH:mm"),
+                                EndTime = r.EndTime.ToString("HH:mm")
+                            }).ToList(),
+                            LeavePermittedDays = y.LeavePermittedDays,
+                            IrregularShift = y.IrregularShift,
+                            WorkshopShiftStatus = y.WorkshopShiftStatus
+                        };
+                    }).ToList(),
+                    Salary = x.Salary,
+                    RollCallWorkshopShifts = x.CustomizeWorkshopGroupSettingsShifts.Select(s =>
+                        new CustomizeWorkshopShiftViewModel()
+                        {
+                            EndTime = s.EndTime.ToString("HH:mm"),
+                            Placement = s.Placement,
+                            StartTime = s.StartTime.ToString("HH:mm")
+
+                        }).ToList(),
+                    MainGroup = x.MainGroup,
+                    WorkshopShiftStatus = x.WorkshopShiftStatus,
+                    CustomizeRotatingShiftsViewModels = x.CustomizeRotatingShifts.Select(r => new CustomizeRotatingShiftsViewModel
+                    {
+                        StartTime = r.StartTime.ToString("HH:mm"),
+                        EndTime = r.EndTime.ToString("HH:mm")
+                    }).ToList(),
+                    IrregularShift = x.IrregularShift
+
+
+
+                }).ToList(),
+        };
+    }
+
+
+    public EditCustomizeWorkshopSettings GetWorkshopSettingsDetails(long workshopId)
+    {
+
+        var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().FirstOrDefault(x => x.WorkshopId == workshopId);
+        if (entity == null)
+            return new();
+        var viewModel = new EditCustomizeWorkshopSettings()
+        {
+            FridayPay = new() { FridayPayType = entity.FridayPay.FridayPayType, Value = entity.FridayPay.Value },
+            LateToWork = new()
+            {
+                LateToWorkTimeFinesVewModels = entity.LateToWork.LateToWorkTimeFines.Select(x =>
+                    new LateToWorkTimeFineVewModel() { FineMoney = x.FineMoney, Minute = x.Minute }).ToList(),
+                Value = entity.LateToWork.Value,
+                LateToWorkType = entity.LateToWork.LateToWorkType
+            },
+            HolidayWork = entity.HolidayWork,
+            FineAbsenceDeduction = new()
+            {
+                Value = entity.FineAbsenceDeduction.Value,
+                FineAbsenceDayOfWeekViewModels = entity.FineAbsenceDeduction.FineAbsenceDayOfWeekCollection
+                    .Select(x => new FineAbsenceDayOfWeekViewModel() { DayOfWeek = x.DayOfWeek }).ToList(),
+                FineAbsenceDeductionType = entity.FineAbsenceDeduction.FineAbsenceDeductionType
+            },
+            EarlyExit = new()
+            {
+                EarlyExitTimeFinesViewModels = entity.EarlyExit.EarlyExitTimeFines.Select(x =>
+                    new EarlyExitTimeFineViewModel() { FineMoney = x.FineMoney, Minute = x.Minute }).ToList(),
+                Value = entity.EarlyExit.Value,
+                EarlyExitType = entity.EarlyExit.EarlyExitType
+            },
+            BonusesPay = new()
+            {
+                Value = entity.BonusesPay.Value,
+                BonusesPayType = entity.BonusesPay.BonusesPayType,
+                PaymentType = entity.BonusesPay.PaymentType
+            },
+            ShiftPay = new()
+            {
+                Value = entity.ShiftPay.Value,
+                ShiftPayType = entity.ShiftPay.ShiftPayType,
+                ShiftType = entity.ShiftPay.ShiftType
+            },
+            InsuranceDeduction = new()
+            {
+                Value = entity.InsuranceDeduction.Value,
+                InsuranceDeductionType = entity.InsuranceDeduction.InsuranceDeductionType
+            },
+            OverTimePay = new()
+                { OverTimePayType = entity.OverTimePay.OverTimePayType, Value = entity.OverTimePay.Value },
+            BaseYearsPay = new()
+            {
+                BaseYearsPayType = entity.BaseYearsPay.BaseYearsPayType,
+                Value = entity.BaseYearsPay.Value,
+                PaymentType = entity.BaseYearsPay.PaymentType
+            },
+            NightWorkPay = new()
+                { NightWorkingType = entity.NightWorkPay.NightWorkingType, Value = entity.NightWorkPay.Value },
+            LeavePay = new()
+            {
+                Value = entity.LeavePay.Value,
+                LeavePayType = entity.LeavePay.LeavePayType
+            },
+            MarriedAllowance = new()
+            {
+                Value = entity.MarriedAllowance.Value,
+                MarriedAllowanceType = entity.MarriedAllowance.MarriedAllowanceType
+            },
+            FamilyAllowance = new()
+            {
+                FamilyAllowanceType = entity.FamilyAllowance.FamilyAllowanceType,
+                Value = entity.FamilyAllowance.Value
+            },
+            Currency = entity.Currency,
+            MaxMonthDays = entity.MaxMonthDays,
+            Id = entity.id,
+            ShiftsList = entity.CustomizeWorkshopSettingsShifts.Select(x => new CustomizeWorkshopShiftViewModel()
+                { EndTime = x.EndTime.ToString("HH:mm"), Placement = x.Placement, StartTime = x.StartTime.ToString("HH:mm") }).ToList(),
+            BonusesPaysInEndOfMonth = entity.BonusesPaysInEndOfMonth,
+            LeavePermittedDays = entity.LeavePermittedDays,
+            BaseYearsPayInEndOfYear = entity.BaseYearsPayInEndOfYear,
+            WorkshopId = entity.WorkshopId,
+            WorkshopShiftStatus = entity.WorkshopShiftStatus,
+            OffDays = entity.WeeklyOffDays.Select(x=>x.DayOfWeek).ToList()
+
+        };
+        return viewModel;
+
+    }
+
+
+    public EditCustomizeWorkshopSettings GetSimpleWorkshopSettings(long workshopId)
+    {
+        var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().FirstOrDefault(x => x.WorkshopId == workshopId);
+        if (entity == null)
+        {
+            return new();
         }
 
-        #region Pooya
-        public List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingsWithMonthlySalary(long workshopId)
+        return new()
         {
-            var query = _companyContext.CustomizeWorkshopGroupSettings.Where(x => x.MainGroup == false).Include(x => x)
-                .Include(x => x.CustomizeWorkshopEmployeeSettingsCollection).Where(x => x.CustomizeWorkshopEmployeeSettingsCollection.Any(y =>
+            ShiftsList = entity.CustomizeWorkshopSettingsShifts.Select(x => new CustomizeWorkshopShiftViewModel()
+            {
+                EndTime = x.EndTime.ToString("HH:mm"),
+                StartTime = x.StartTime.ToString("HH:mm"),
+                Placement = x.Placement
+            }).ToList(),
+            Id = entity.id,
+            WorkshopId = entity.WorkshopId,
+            WorkshopShiftStatus = entity.WorkshopShiftStatus,
+            HolidayWork = entity.HolidayWork,
+            OffDays = entity.WeeklyOffDays.Select(x=>x.DayOfWeek).ToList()
+
+        };
+    }
+
+    public List<ChangedGroupedViewModel> GetShiftChangesGroupAndEmployees(long customizeWorkshopSettingsId)
+    {
+
+
+        var result = from groupSetting in _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery()
+            where groupSetting.IsShiftChange // Filter parent tables where isChange is true
+            join employeeSettings in _companyContext.CustomizeWorkshopEmployeeSettings on groupSetting.id equals employeeSettings.CustomizeWorkshopGroupSettingId
+            where employeeSettings.IsShiftChanged// Filter child tables where isChange is true
+            join employee in _companyContext.Employees on employeeSettings.EmployeeId equals employee.id
+            group new { employee.FullName, groupSetting.GroupName } by groupSetting.id into grouped
+            select new ChangedGroupedViewModel
+            {
+                GroupName = grouped.First().GroupName,
+                EmployeeName = grouped.Select(e => e.FullName).ToList()
+            };
+
+        return result.ToList();
+
+    }
+
+    public CustomizeWorkshopSettingsViewModel GetWorkshopIncludeGroupsByWorkshopId(long workshopId)
+    {
+        var customizeWorkshopSettings = _companyContext.CustomizeWorkshopSettings
+            .AsNoTracking().AsSplitQuery().Where(x => x.WorkshopId == workshopId)
+            .Include(x => x.CustomizeWorkshopGroupSettingsCollection)
+            .Select(x => new CustomizeWorkshopSettingsViewModel()
+            {
+                Id = x.id,
+                WorkshopShiftStatus = x.WorkshopShiftStatus,
+                GroupSettings = x.CustomizeWorkshopGroupSettingsCollection.Select(g =>
+                    new CustomizeWorkshopGroupSettingsViewModel()
+                    {
+                        Id = g.id,
+                        IrregularShift = g.IrregularShift,
+                        WorkshopShiftStatus = g.WorkshopShiftStatus,
+                        GroupName = g.GroupName,
+                        MainGroup = g.MainGroup,
+                        RollCallWorkshopShifts = g.CustomizeWorkshopGroupSettingsShifts.Select(s =>
+                            new CustomizeWorkshopShiftViewModel()
+                            {
+                                StartTime = s.StartTime.ToString("HH:mm"),
+                                EndTime = s.EndTime.ToString("HH:mm"),
+                                Placement = s.Placement,
+                            }).ToList(),
+                        BreakTime = g.BreakTime,
+                        HolidayWork = g.HolidayWork,
+                        FridayWork = g.FridayWork,
+                        CustomizeRotatingShiftsViewModels = g.CustomizeRotatingShifts.Select(r => new CustomizeRotatingShiftsViewModel()
+                        {
+                            EndTime = r.EndTime.ToString("HH:mm"),
+                            StartTime = r.StartTime.ToString("HH:mm")
+                        }).ToList()
+
+                    }).ToList(),
+
+
+            }).FirstOrDefault();
+
+        return customizeWorkshopSettings;
+    }
+
+    public CustomizeWorkshopEmployeeSettingsViewModel GetEmployeeSettingsByWorkshopIdEmployeeId(long workshopId, long employeeId)
+    {
+        var employee = _companyContext.CustomizeWorkshopSettings
+            .AsSplitQuery().Include(x => x.CustomizeWorkshopGroupSettingsCollection)
+            .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection)
+            .FirstOrDefault(x => x.WorkshopId == workshopId)?.CustomizeWorkshopGroupSettingsCollection.SelectMany(x => x.CustomizeWorkshopEmployeeSettingsCollection)
+            .FirstOrDefault(x => x.EmployeeId == employeeId);
+
+        if (employee == null)
+            return new();
+
+        var employeeName = _companyContext.Employees.Select(x => new { x.FullName, x.id })
+            .FirstOrDefault(x => x.id == employee.EmployeeId);
+        return new CustomizeWorkshopEmployeeSettingsViewModel()
+        {
+            Id = employee.id,
+            EmployeeId = employee.EmployeeId,
+            IsSettingChanged = employee.IsSettingChanged,
+            IsShiftChanged = employee.IsShiftChanged,
+            Name = employeeName?.FullName,
+            RollCallWorkshopShifts = employee.CustomizeWorkshopEmployeeSettingsShifts.Select(x =>
+                new CustomizeWorkshopShiftViewModel()
+                {
+                    EndTime = x.EndTime.ToString("HH:mm"),
+                    Placement = x.Placement,
+                    StartTime = x.StartTime.ToString("HH:mm")
+                }).ToList(),
+            Salary = employee.Salary
+        };
+    }
+
+    #region Pooya
+    public List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingsWithMonthlySalary(long workshopId)
+    {
+        var query = _companyContext.CustomizeWorkshopGroupSettings.Where(x => x.MainGroup == false).Include(x => x)
+            .Include(x => x.CustomizeWorkshopEmployeeSettingsCollection).Where(x => x.CustomizeWorkshopEmployeeSettingsCollection.Any(y =>
                 y.WorkshopId == workshopId)).SelectMany(x => x.CustomizeWorkshopEmployeeSettingsCollection)
-                .Where(x => x.Salary > 0).Select(x =>
+            .Where(x => x.Salary > 0).Select(x =>
                 new CustomizeWorkshopEmployeeSettingsViewModel()
                 {
                     WorkshopShiftStatus = x.WorkshopShiftStatus,
@@ -361,26 +374,31 @@ namespace CompanyManagment.EFCore.Repository
                     EmployeeId = x.EmployeeId,
                     BreakTime = x.BreakTime
                 });
-            return query.ToList();
-        }
-
-        public List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingsByWorkshopId(long workshopId)
-        {
-            return _companyContext.CustomizeWorkshopSettings.AsNoTracking().Where(x => x.WorkshopId == workshopId).Include(x => x.CustomizeWorkshopGroupSettingsCollection)
-                .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection).SelectMany(x => x.CustomizeWorkshopGroupSettingsCollection
-                .SelectMany(y => y.CustomizeWorkshopEmployeeSettingsCollection))
-                .Select(x => new CustomizeWorkshopEmployeeSettingsViewModel
-                {
-                    BreakTime = x.BreakTime,
-                    IsShiftChanged = x.IsShiftChanged,
-                    IsSettingChanged = x.IsSettingChanged,
-                    EmployeeId = x.EmployeeId,
-                    Id = x.id,
-                    Salary = x.Salary,
-                    GroupSettingsId = x.CustomizeWorkshopGroupSettingId
-                }).ToList();
-        }
-
-        #endregion
+        return query.ToList();
     }
+
+    public List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingsByWorkshopId(long workshopId)
+    {
+        return _companyContext.CustomizeWorkshopSettings.AsNoTracking().Where(x => x.WorkshopId == workshopId).Include(x => x.CustomizeWorkshopGroupSettingsCollection)
+            .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection).SelectMany(x => x.CustomizeWorkshopGroupSettingsCollection
+                .SelectMany(y => y.CustomizeWorkshopEmployeeSettingsCollection))
+            .Select(x => new CustomizeWorkshopEmployeeSettingsViewModel
+            {
+                BreakTime = x.BreakTime,
+                IsShiftChanged = x.IsShiftChanged,
+                IsSettingChanged = x.IsSettingChanged,
+                EmployeeId = x.EmployeeId,
+                Id = x.id,
+                Salary = x.Salary,
+                GroupSettingsId = x.CustomizeWorkshopGroupSettingId
+            }).ToList();
+    }
+
+    public CustomizeWorkshopSettings GetBy(long workshopId)
+    {
+        return _companyContext.CustomizeWorkshopSettings.AsSplitQuery()
+            .FirstOrDefault(x => x.WorkshopId == workshopId);
+    }
+
+    #endregion
 }