fix: update time restrictions for entry and exit registration to 5 minutes

.github/workflows/dotnet-developPublish.yml

@@ -37,7 +37,7 @@ jobs:
         & "C:\Program Files\IIS\Microsoft Web Deploy V3\msdeploy.exe" `
           -verb:sync `
           -source:contentPath="$publishFolder" `
-          -dest:contentPath="dadmehrg",computerName="https://171.22.24.15:8172/msdeploy.axd?site=dadmehrg",userName="Administrator",password="R",authType="Basic" `
+          -dest:contentPath="dadmehrg",computerName="https://171.22.24.15:8172/msdeploy.axd?site=dadmehrg",userName="Administrator",password="R2rNpdnetP3j>q5b18",authType="Basic" `
           -allowUntrusted `
           -enableRule:AppOffline
 

0_Framework/Application/StaticWorkshopAccounts.cs

@@ -39,15 +39,4 @@ public static class StaticWorkshopAccounts
     /// که کاربر همچنان به کارگاه دسترسی دارد
     /// </summary>
     public static DateTime ContinuesWorkingDate = new DateTime(2150, 1, 1);
-
-
-    /// <summary>
-    /// لیستی آی دی نقش هایی که مسئول بیمه کارگاه هستند
-    /// 7 : بیمه ارشد
-    /// 8 : بیمه ساده
-    /// </summary>
-    public static List<long> InsuranceAccountsRoleIds = [7, 8];
-
-
-
 }

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Jobs/JobSchedulerRegistrator.cs

@@ -1,6 +1,5 @@
 
 using _0_Framework.Application;
-using _0_Framework.Application.Sms;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.InstitutionContractAgg;
 using Hangfire;
@@ -14,15 +13,13 @@ public class JobSchedulerRegistrator
     private readonly IInstitutionContractRepository _institutionContractRepository;
     private static DateTime? _lastRunCreateTransaction;
     private static DateTime? _lastRunSendMonthlySms;
-    private readonly ISmsService _smsService;
 
 
-    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient, IInstitutionContractRepository institutionContractRepository, ISmsService smsService)
+    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient, IInstitutionContractRepository institutionContractRepository)
     {
         _smsReminder = smsReminder;
         _backgroundJobClient = backgroundJobClient;
         _institutionContractRepository = institutionContractRepository;
-        _smsService = smsService;
     }
 
     public void Register()
@@ -94,8 +91,8 @@ public class JobSchedulerRegistrator
             }
             catch (Exception e)
             {
-                await _smsService.Alarm("09114221321", "خطا-ایجاد سند مالی");
+                //_smsService.Alarm("09114221321", "خطا-ایجاد سند مالی");
-
+          
             }
            
         }

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/NullBoardNotificationPublisher.cs

@@ -1,10 +0,0 @@
-using GozareshgirProgramManager.Application.Interfaces;
-using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
-
-public class NullBoardNotificationPublisher:IBoardNotificationPublisher
-{
-    public Task SendProjectStatusChanged(long userId, TaskSectionStatus oldStatus, TaskSectionStatus newStatus, Guid sectionId)
-    {
-        throw new NotImplementedException();
-    }
-}

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Program.cs

@@ -8,7 +8,6 @@ using BackgroundInstitutionContract.Task.Jobs;
 using CompanyManagment.App.Contracts.Hubs;
 using CompanyManagment.EFCore.Services;
 using GozareshgirProgramManager.Application._Bootstrapper;
-using GozareshgirProgramManager.Application.Interfaces;
 using GozareshgirProgramManager.Application.Modules.Users.Commands.CreateUser;
 using GozareshgirProgramManager.Infrastructure;
 using GozareshgirProgramManager.Infrastructure.Persistence.Seed;
@@ -32,7 +31,7 @@ builder.Services.AddTransient<ISmsService, SmsService>();
 builder.Services.AddTransient<IUidService, UidService>();
 builder.Services.AddTransient<IFileUploader, FileUploader>();
 builder.Services.Configure<AppSettingConfiguration>(builder.Configuration);
-builder.Services.AddScoped<IBoardNotificationPublisher, NullBoardNotificationPublisher>();
+
 #region MongoDb
 
 var mongoConnectionSection = builder.Configuration.GetSection("MongoDb");

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -56,7 +56,7 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     void UpdateStatusIfNeeded(long institutionContractId);
     Task<GetInstitutionVerificationDetailsViewModel> GetVerificationDetails(Guid id);
     Task<InstitutionContract> GetByPublicIdAsync(Guid id);
-    InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request,string contractStart = null);
+    InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request);
     InstitutionContractDiscountResponse ResetDiscountCreate(InstitutionContractResetDiscountForCreateRequest request);
     
 

Company.Domain/InstitutionPlanAgg/IPlanPercentageRepository.cs

@@ -1,9 +1,7 @@
-using _0_Framework.Application;
+using _0_Framework.Domain;
-using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.InstitutionPlan;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace Company.Domain.InstitutionPlanAgg;
 
@@ -28,18 +26,4 @@ public interface IPlanPercentageRepository : IRepository<long, PlanPercentage>
     /// <param name="command"></param>
     /// <returns></returns>
     InstitutionPlanViewModel GetInstitutionPlanForWorkshop(WorkshopTempViewModel command);
-
-    /// <summary>
-    /// دریافت دیتای مودال ایجاد
-    /// </summary>
-    /// <returns></returns>
-    Task<CreateServiceAmountDto> GetCreateModalData();
-
-    /// <summary>
-    /// دریافت لیست مبالغ سرویس ها
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<PagedResult<InstitutionPlanListDto>> GetList(
-        InstitutionPlanSearchModel searchModel);
 }

Company.Domain/LeaveAgg/ILeaveRepository.cs

@@ -1,10 +1,8 @@
-using _0_Framework.Application;
+using System;
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.InstitutionPlan;
-using CompanyManagment.App.Contracts.Leave;
-using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
+using _0_Framework.Application;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.Leave;
 
 namespace Company.Domain.LeaveAgg;
 
@@ -29,8 +27,6 @@ public interface ILeaveRepository : IRepository<long, Leave>
     List<LeaveMainViewModel> searchClient(LeaveSearchModel searchModel);
     LeavePrintViewModel PrintOne(long id);
     List<LeavePrintViewModel> PrintAll(List<long> id);
-    
-    Task<List<LeavePrintResponseViewModel>> PrintAllAsync(List<long> ids, long workshopId);
 
     #region Vafa
 
@@ -38,20 +34,4 @@ public interface ILeaveRepository : IRepository<long, Leave>
 
     #endregion
     bool CheckIfValidToEdit(long id);
-
-    /// <summary>
-    /// دریافت لیست مرخصی ها در کلاینت
-    /// Api
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<PagedResult<leaveListDto>> GetList(
-        LeaveListSearchModel searchModel);
-
-    /// <summary>
-    /// دریافت لیست گروه بندی شده
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<List<GroupLeaveListDto>> GetGroupList(LeaveListSearchModel searchModel);
 }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractViewModel.cs

@@ -76,7 +76,5 @@ public class InstitutionContractViewModel
     public bool IsInstallment { get; set; }
     public InstitutionContractVerificationStatus VerificationStatus { get; set; }
 
-    public InstitutionContractSigningType? SigningType { get; set; }
-
     public List<InstitutionContractInstallmentViewModel> InstallmentList { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionPlan/CreateServiceAmountDto.cs

@@ -1,51 +0,0 @@
-namespace CompanyManagment.App.Contracts.InstitutionPlan;
-
-public class CreateServiceAmountDto
-{
-    /// <summary>
-    /// آی دی
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// قرارداد و تصفیه
-    /// درصد از مزد روزانه
-    /// string
-    /// </summary>
-    public string ContractAndCheckoutPercentStr { get; set; }
-
-    /// <summary>
-    /// بیمه
-    /// درصد از مزد روزانه
-    /// string
-    /// </summary>
-    public string InsurancePercentStr { get; set; }
-
-    /// <summary>
-    /// حضورغباب
-    /// درصد از مزد روزانه
-    /// string
-    /// </summary>
-    public string RollCallPercentStr { get; set; }
-
-    /// <summary>
-    /// فیش غیر رسمی
-    /// درصد از مزد روزانه
-    /// string
-    /// </summary>
-    public string CustomizeCheckoutPercentStr { get; set; }
-
-    /// <summary>
-    /// خدمات حضوری قرداد و تصفیه
-    /// درصد از مزد روزانه
-    /// string
-    /// </summary>
-    public string ContractAndCheckoutInPersonPercentStr { get; set; }
-
-    /// <summary>
-    /// خدمات حضوری بیمه
-    /// درصد از مزد روزانه
-    /// string
-    /// </summary>
-    public string InsuranceInPersonPercentStr { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionPlan/IInstitutionPlanApplication.cs

@@ -1,7 +1,6 @@
-using _0_Framework.Application;
+using System.Collections.Generic;
+using _0_Framework.Application;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace CompanyManagment.App.Contracts.InstitutionPlan;
 
@@ -35,27 +34,4 @@ public interface IInstitutionPlanApplication
     /// <param name="command"></param>
     /// <returns></returns>
     InstitutionPlanViewModel GetInstitutionPlanForWorkshop(WorkshopTempViewModel command);
-
-
-    /// <summary>
-    /// دریافت دیتای درصد سرویس برای مودال ایجاد
-    /// </summary>
-    /// <returns></returns>
-    Task<CreateServiceAmountDto> GetCreateModalData();
-
-    /// <summary>
-    /// ایجاد درصد سرویس
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    Task<OperationResult> CreateInstitutionPlanPercentage(CreateServiceAmountDto command);
-
-
-    /// <summary>
-    /// دریافت لیست مبالغ سرویس ها
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<PagedResult<InstitutionPlanListDto>> GetList(
-        InstitutionPlanSearchModel searchModel);
 }

CompanyManagment.App.Contracts/InstitutionPlan/InstitutionPlanListDto.cs

@@ -1,84 +0,0 @@
-namespace CompanyManagment.App.Contracts.InstitutionPlan;
-
-public class InstitutionPlanListDto
-{
-
-
-    /// <summary>
-    /// تعداد پرسنل
-    /// </summary>
-    public int CountPerson { get; set; }
-
-    /// <summary>
-    /// مبلغ قرارداد و تصفیه 
-    /// </summary>
-    public string ContractAndCheckout { get; set; }
-
-    /// <summary>
-    /// مبلغ بیمه
-    /// </summary>
-    public string Insurance { get; set; }
-
-    /// <summary>
-    /// مبلغ حضورغباب
-    /// </summary>
-    public string RollCall { get; set; }
-
-    /// <summary>
-    /// مبلغ فیش غیر رسمی
-    /// </summary>
-    public string CustomizeCheckout { get; set; }
-
-    /// <summary>
-    /// مبلغ خدمات حضوری قرداد و تصفیه
-    /// </summary>
-    public string ContractAndCheckoutInPerson { get; set; }
-
-    /// <summary>
-    /// مبلغ خدمات حضوری بیمه
-    /// </summary>
-    public string InsuranceInPerson { get; set; }
-
-
-
-
-    #region Total
-
-
-    /// <summary>
-    /// مبلغ کل خدمات حضوری
-    /// </summary>
-    public string InPersonSumAmountStr { get; set; }
-
-    /// <summary>
-    /// مبلغ کل خدمات آنلاین
-    /// </summary>
-    public string OnlineOnlySumAmountStr { get; set; }
-
-    /// <summary>
-    /// مبلغ کل خدمات حضوری و آنلاین
-    /// </summary>
-    public string OnlineAndInPersonSumAmountStr { get; set; }
-
-    /// <summary>
-    /// مبلغ کل خدمات حضوری و آنلاین
-    /// double
-    /// </summary>
-    public double OnlineAndInPersonSumAmountDouble { get; set; }
-
-
-    /// <summary>
-    /// مبلغ کل خدمات حضوری
-    /// double
-    /// </summary>
-    public double InPersonSumAmountDouble { get; set; }
-
-    /// <summary>
-    /// مبلغ کل خدمات آنلاین
-    /// double
-    /// </summary>
-    public double OnlineOnlySumAmountDouble { get; set; }
-
-
-    #endregion
-}

CompanyManagment.App.Contracts/InstitutionPlan/InstitutionPlanSearchModel.cs

@@ -1,11 +0,0 @@
-using _0_Framework.Application;
-
-namespace CompanyManagment.App.Contracts.InstitutionPlan;
-
-public class InstitutionPlanSearchModel : PaginationRequest
-{
-    /// <summary>
-    /// تعداد پرسنل برای جستجو
-    /// </summary>
-    public int CountPerson { get; set; }
-}

CompanyManagment.App.Contracts/Leave/GroupLeaveListDto.cs

@@ -1,88 +0,0 @@
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.Leave;
-
-public class GroupLeaveListDto
-{
-    /// <summary>
-    /// سال مرخصی
-    /// </summary>
-    public string YearStr { get; set; }
-
-    /// <summary>
-    /// ماه مرخصی
-    /// </summary>
-    public string MonthStr { get; set; }
-    /// <summary>
-    /// آیتم های هر گروه
-    /// </summary>
-    public List<LeaveListItemsDto> LeaveListItemsDto { get; set; }
-}
-
-/// <summary>
-/// آیتم های هر گروه
-/// </summary>
-public class LeaveListItemsDto
-{
-    /// <summary>
-    /// نوع مرخصی، استحقاقی/استعلاجی
-    /// </summary>
-    public string LeaveType { get; set; }
-
-
-    /// <summary>
-    /// تاریخ شروع مرخصی
-    /// </summary>
-    public string StartLeave { get; set; }
-
-    /// <summary>
-    /// تاریخ پایان مرخصی
-    /// </summary>
-    public string EndLeave { get; set; }
-
-
-    /// <summary>
-    /// زمان مرخصی
-    /// بازه مرخصی ساعتی
-    /// </summary>
-    public string HourlyInterval { get; set; }
-
-
-    /// <summary>
-    /// مدت مرخصی
-    /// </summary>
-    public string LeaveDuration { get; set; }
-
-    /// <summary>
-    /// موافقت/عدم موافقت  کارفرما
-    /// </summary>
-    public bool IsAccepted { get; set; }
-
-
-
-
-
-    /// <summary>
-    /// آی دی
-    /// </summary>
-    public long Id { get; set; }
-
-
-
-    /// <summary>
-    /// آی دی گارگاه
-    /// </summary>
-    public long WorkshopId { get; set; }
-
-    /// <summary>
-    /// آی دی پرسنل
-    /// </summary>
-    public long EmployeeId { get; set; }
-
-
-
-    /// <summary>
-    ///آیا فاقد اعتبار است. فاقد اعتبار ها فقط برای فیش های غیررسمی مورد استفاده قرار میگیرند 
-    /// </summary>
-    public bool IsInvalid { get; set; }
-}

CompanyManagment.App.Contracts/Leave/ILeaveApplication.cs

@@ -36,67 +36,5 @@ public interface ILeaveApplication
     TimeSpan GetEmployeeLeaveTimeSpanInDates(long workshopId, long employeeId, string startFa, string endFa,
         string type);
 
-    #endregion
+	#endregion
-
-
-    /// <summary>
-    /// دریافت لیست مرخصی ها در کلاینت
-    /// Api
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<PagedResult<leaveListDto>> GetList(
-        LeaveListSearchModel searchModel);
-
-    /// <summary>
-    /// دریافت لیست گروه بندی شده
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<List<GroupLeaveListDto>> GetGroupList(LeaveListSearchModel searchModel);
-
-    /// <summary>
-    /// دریافت مجکوع مرخصی پرسنل
-    /// اگر آی دی پرسنل، سال و ماه خالی نباشد
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <param name="employeeId"></param>
-    /// <param name="yearStr"></param>
-    /// <param name="monthStr"></param>
-    /// <param name="leaveType"></param>
-    /// <returns></returns>
-    TimeSpan SumOfEmployeeLeaveTimeSpanInDates(long workshopId, long employeeId, string yearStr, string monthStr,
-        LeaveType leaveType);
-
-    Task<List<LeavePrintResponseViewModel>> PrintAllAsync(List<long> ids, long workshopId);
-    Task<LeavePrintResponseViewModel> PrintOneAsync(long id, long workshopId);
-    
-}
-
-public class LeavePrintResponseViewModel
-{
-    public string FullName { get; set; }
-    public string NationalCode { get; set; }
-    public string WorkshopName { get; set; }
-    public List<string> EmployerNames { get; set; }
-    public string PaidLeaveType { get; set; }
-    public string ContractNo { get; set; }
-    public LeavePrintHourlyResponseViewModel HourlyLeave { get; set; }
-    public LeavePrintDailyResponseViewModel DailyLeave { get; set; }
-    
-}
-
-public class LeavePrintDailyResponseViewModel
-{
-    public string StartLeave { get; set; }
-    public string EndLeave { get; set; }
-    public string TotalDay { get; set; }
-}
-
-public class LeavePrintHourlyResponseViewModel
-{
-    public string LeaveDate { get; set; }
-    public string StartHour { get; set; }
-    public string EndHour { get; set; }
-    public string TotalHour { get; set; }
 }

CompanyManagment.App.Contracts/Leave/LeaveListMultipleDto.cs

@@ -1,24 +0,0 @@
-using _0_Framework.Application;
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.Leave;
-
-public class LeaveListMultipleDto
-{
-    /// <summary>
-    /// لیست گروهبندی شده بر اساس سال و ماه
-    /// اگر در جستجو پرسنل انتخاب شود
-    /// </summary>
-    public List<GroupLeaveListDto>? GroupLeaveListDto { get; set; }
-
-    /// <summary>
-    /// لیست نرمال PageResult
-    /// </summary>
-    public PagedResult<leaveListDto>? leaveListDto { get; set; }
-
-    /// <summary>
-    /// مجموع مرخصی پرسنل
-    /// اگر پرسنل انتخاب شده باشد
-    /// </summary>
-    public string? SumOfEmployeeleaves { get; set; }
-}

CompanyManagment.App.Contracts/Leave/LeaveListSearchModel.cs

@@ -1,45 +0,0 @@
-using _0_Framework.Application;
-
-namespace CompanyManagment.App.Contracts.Leave;
-
-public class LeaveListSearchModel : PaginationRequest
-{
-    /// <summary>
-    /// آی دی کارگاه
-    /// </summary>
-    public long WorkshopId { get; set; }
-    /// <summary>
-    /// نوع مرخصی، استحقاقی/استعلاجی
-    /// </summary>
-    public LeaveType LeaveType { get; set; }
-
-    /// <summary>
-    /// سال مرخصی
-    /// </summary>
-    public string YearStr { get; set; }
-
-    /// <summary>
-    /// ماه مرخصی
-    /// </summary>
-    public string MonthStr { get; set; }
-
-    /// <summary>
-    ///آیا فاقد اعتبار است. فاقد اعتبار ها فقط برای فیش های غیررسمی مورد استفاده قرار میگیرند 
-    /// </summary>
-    public bool IsInvalid { get; private set; }
-
-    /// <summary>
-    /// تاریخ شروع مرخصی
-    /// </summary>
-    public string StartLeave { get; set; }
-
-    /// <summary>
-    /// تاریخ پایان مرخصی
-    /// </summary>
-    public string EndLeave { get; set; }
-
-    /// <summary>
-    /// آی دی پرسنل
-    /// </summary>
-    public long EmployeeId { get; set; }
-}

CompanyManagment.App.Contracts/Leave/LeaveType.cs

@@ -1,18 +0,0 @@
-namespace CompanyManagment.App.Contracts.Leave;
-
-public enum LeaveType
-{
-    /// <summary>
-    /// هر دو
-    /// </summary>
-    Both,
-    /// <summary>
-    /// مرخصی استعلاجی
-    /// </summary>
-    SickLeave,
-
-    /// <summary>
-    /// مرخصی استحقاقی
-    /// </summary>
-    PaidLeave
-}

CompanyManagment.App.Contracts/Leave/leaveListDto.cs

@@ -1,84 +0,0 @@
-namespace CompanyManagment.App.Contracts.Leave;
-
-public class leaveListDto
-{
-
-    /// <summary>
-    /// نام کامل پرسنل
-    /// </summary>
-    public string EmployeeFullName { get; set; }
-
-
-    /// <summary>
-    /// سال مرخصی
-    /// </summary>
-    public string YearStr { get; set; }
-
-    /// <summary>
-    /// ماه مرخصی
-    /// </summary>
-    public string MonthStr { get; set; }
-
-
-    /// <summary>
-    /// نوع مرخصی، استحقاقی/استعلاجی
-    /// </summary>
-    public string LeaveType { get; set; }
-
-
-    /// <summary>
-    /// تاریخ شروع مرخصی
-    /// </summary>
-    public string StartLeave { get; set; }
-
-    /// <summary>
-    /// تاریخ پایان مرخصی
-    /// </summary>
-    public string EndLeave { get; set; }
-
-
-    /// <summary>
-    /// زمان مرخصی
-    /// بازه مرخصی ساعتی
-    /// </summary>
-    public string HourlyInterval { get; set; }
-
-
-    /// <summary>
-    /// مدت مرخصی
-    /// </summary>
-    public string LeaveDuration { get; set; }
-
-    /// <summary>
-    /// موافقت/عدم موافقت  کارفرما
-    /// </summary>
-    public bool IsAccepted { get; set; }
-
-
-
-
-
-    /// <summary>
-    /// آی دی
-    /// </summary>
-    public long Id { get; set; }
-
-
-
-    /// <summary>
-    /// آی دی گارگاه
-    /// </summary>
-    public long WorkshopId { get; set; }
-
-    /// <summary>
-    /// آی دی پرسنل
-    /// </summary>
-    public long EmployeeId { get; set; }
-
-
-
-    /// <summary>
-    ///آیا فاقد اعتبار است. فاقد اعتبار ها فقط برای فیش های غیررسمی مورد استفاده قرار میگیرند 
-    /// </summary>
-    public bool IsInvalid { get; set; }
-}

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -22,7 +22,6 @@ using Company.Domain.InstitutionContractAgg;
 using Company.Domain.LeftWorkAgg;
 using Company.Domain.PaymentTransactionAgg;
 using Company.Domain.RepresentativeAgg;
-using Company.Domain.RollCallServiceAgg;
 using Company.Domain.TemporaryClientRegistrationAgg;
 using Company.Domain.WorkshopAgg;
 using CompanyManagment.App.Contracts.FinancialInvoice;
@@ -60,7 +59,6 @@ public class InstitutionContractApplication : IInstitutionContractApplication
     private readonly IFinancialInvoiceRepository _financialInvoiceRepository;
     private readonly IPaymentGateway _paymentGateway;
     private readonly IPaymentTransactionRepository _paymentTransactionRepository;
-    private readonly IRollCallServiceRepository _rollCallServiceRepository;
 
 
     public InstitutionContractApplication(IInstitutionContractRepository institutionContractRepository,
@@ -72,7 +70,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         IFinancialStatmentRepository financialStatmentRepository, IContactInfoApplication contactInfoApplication,
         IAccountApplication accountApplication, ISmsService smsService, IUidService uidService,
         IFinancialInvoiceRepository financialInvoiceRepository, IHttpClientFactory httpClientFactory,
-        IPaymentTransactionRepository paymentTransactionRepository, IRollCallServiceRepository rollCallServiceRepository)
+        IPaymentTransactionRepository paymentTransactionRepository)
     {
         _institutionContractRepository = institutionContractRepository;
         _contractingPartyRepository = contractingPartyRepository;
@@ -90,7 +88,6 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         _uidService = uidService;
         _financialInvoiceRepository = financialInvoiceRepository;
         _paymentTransactionRepository = paymentTransactionRepository;
-        _rollCallServiceRepository = rollCallServiceRepository;
         _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
     }
 
@@ -1558,48 +1555,28 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             .Where(x => x.WorkshopCreated && x.WorkshopId is > 0).ToList();
         
         var currentWorkshops = institutionContract.WorkshopGroup.CurrentWorkshops.ToList();
-        var accountId = _contractingPartyRepository
-            .GetAccountByPersonalContractingParty(institutionContract.ContractingPartyId).Id;
         foreach (var createdWorkshop in initialCreatedWorkshops)
         {
             if (currentWorkshops.Any(x => x.WorkshopId == createdWorkshop.WorkshopId))
             {
-                //rollcall serviecs
+                continue;
-                if (createdWorkshop.Services.RollCall)
-                {
-                    var ActiveService = _rollCallServiceRepository.GetActiveServiceByWorkshopId(createdWorkshop.WorkshopId!.Value);
-                    var startTime = institutionContract.ContractStartGr;
-                    var endTime = institutionContract.ContractEndGr;
-                    if (ActiveService != null)
-                    {
-                        if (ActiveService.EndService> startTime)
-                        {
-                            startTime = ActiveService.EndService;
-                        }
-                        
-                    }
-                    var rollCallService = new RollCallService("BasedOnIC",
-                        startTime, endTime, createdWorkshop.WorkshopId.Value,accountId,createdWorkshop.PersonnelCount,
-                        0,"12");
-                    await _rollCallServiceRepository.CreateAsync(rollCallService);
-                }
-            }
-            else
-            {
-                var currentWorkshop = new InstitutionContractWorkshopCurrent(createdWorkshop.WorkshopName,
-                    createdWorkshop.Services.RollCall, createdWorkshop.Services.RollCallInPerson,
-                    createdWorkshop.Services.CustomizeCheckout, createdWorkshop.Services.Contract,
-                    createdWorkshop.Services.ContractInPerson, createdWorkshop.Services.Insurance,
-                    createdWorkshop.Services.InsuranceInPerson,createdWorkshop.PersonnelCount, createdWorkshop.Price,
-                    createdWorkshop.InstitutionContractWorkshopGroupId,createdWorkshop.WorkshopGroup,
-                    createdWorkshop.WorkshopId!.Value, createdWorkshop.id);
-                institutionContract.WorkshopGroup.AddCurrentWorkshop(currentWorkshop);
             }
+
+            var currentWorkshop = new InstitutionContractWorkshopCurrent(createdWorkshop.WorkshopName,
+                createdWorkshop.Services.RollCall, createdWorkshop.Services.RollCallInPerson,
+                createdWorkshop.Services.CustomizeCheckout, createdWorkshop.Services.Contract,
+                createdWorkshop.Services.ContractInPerson, createdWorkshop.Services.Insurance,
+                createdWorkshop.Services.InsuranceInPerson,createdWorkshop.PersonnelCount, createdWorkshop.Price,
+                createdWorkshop.InstitutionContractWorkshopGroupId,createdWorkshop.WorkshopGroup,
+                createdWorkshop.WorkshopId!.Value, createdWorkshop.id);
+            institutionContract.WorkshopGroup.AddCurrentWorkshop(currentWorkshop);
+
+
+
         }
         
         if (institutionContract.WorkshopGroup.InitialWorkshops.All(x => x.WorkshopCreated && x.WorkshopId is > 0))
         {
-            
             institutionContract.Verified();
         }
         else
@@ -1634,23 +1611,9 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         var transaction = await _institutionContractRepository.BeginTransactionAsync();
         await SetPendingWorkflow(institutionContractId,InstitutionContractSigningType.Physical);
         
-        var financialStatement = await _financialStatmentRepository
-            .GetByContractingPartyId(institutionContract.ContractingPartyId);
         
-        DateTime today = DateTime.Today;
-        var description = institutionContract.IsInstallment
-            ? "قسط اول سرویس"
-            : "پرداخت کل سرویس";
-        var debtorAmount = institutionContract.IsInstallment
-            ? institutionContract.Installments.First().Amount
-            : institutionContract.TotalAmount;
-        
-        var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
-            description, "debt", "بابت خدمات", debtorAmount, 0, 0);
-        financialStatement.AddFinancialTransaction(financialTransaction);
-        
-        await _institutionContractRepository.SaveChangesAsync();
         await transaction.CommitAsync();
+        await _institutionContractRepository.SaveChangesAsync();
         return op.Succcedded();
     }
 

CompanyManagment.Application/InstitutionPlanApplication.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using _0_Framework.Application;
 using Company.Domain.InstitutionPlanAgg;
 using CompanyManagment.App.Contracts.InstitutionPlan;
@@ -85,73 +84,4 @@ public class InstitutionPlanApplication : IInstitutionPlanApplication
     {
         return _planPercentageRepository.GetInstitutionPlanForWorkshop(command);
     }
-
-
-    #region ForApi
-
-    public async Task<CreateServiceAmountDto> GetCreateModalData()
-    {
-        return await _planPercentageRepository.GetCreateModalData();
-    }
-
-
-    public async Task<OperationResult> CreateInstitutionPlanPercentage(CreateServiceAmountDto command)
-    {
-        var op = new OperationResult();
-        if (string.IsNullOrWhiteSpace(command.ContractAndCheckoutInPersonPercentStr) || command.ContractAndCheckoutInPersonPercentStr == "0" ||
-            string.IsNullOrWhiteSpace(command.ContractAndCheckoutPercentStr) || (command.ContractAndCheckoutPercentStr == "0" ||
-            string.IsNullOrWhiteSpace(command.CustomizeCheckoutPercentStr) || command.CustomizeCheckoutPercentStr == "0" ||
-            string.IsNullOrWhiteSpace(command.InsuranceInPersonPercentStr) || command.InsuranceInPersonPercentStr == "0" ||
-            string.IsNullOrWhiteSpace(command.InsurancePercentStr) || command.InsurancePercentStr == "0" ||
-            string.IsNullOrWhiteSpace(command.RollCallPercentStr) || command.RollCallPercentStr == "0"))
-            return op.Failed("هیچ یک از فیلدها نمیتوانند صفر باشند");
-
-        int contractAndCheckoutInPersonPercent = 0;
-        int contractAndCheckoutPercent = 0;
-        int customizeCheckoutPercent = 0;
-        int insuranceInPersonPercent = 0;
-        int insurancePercent = 0;
-        int rollCallPercent = 0;
-
-        try
-        {
-            contractAndCheckoutInPersonPercent = Convert.ToInt32(command.ContractAndCheckoutInPersonPercentStr);
-            contractAndCheckoutPercent = Convert.ToInt32(command.ContractAndCheckoutPercentStr);
-            customizeCheckoutPercent = Convert.ToInt32(command.CustomizeCheckoutPercentStr);
-            insuranceInPersonPercent = Convert.ToInt32(command.InsuranceInPersonPercentStr);
-            insurancePercent = Convert.ToInt32(command.InsurancePercentStr);
-            rollCallPercent = Convert.ToInt32(command.RollCallPercentStr);
-        }
-        catch (Exception e)
-        {
-            return op.Failed("لطفا عدد معتبر وارد کنید");
-
-        }
-
-        var firstPlan =await _planPercentageRepository.GetCreateModalData();
-        if (firstPlan != null)
-        {
-            var planPercentage = _planPercentageRepository.Get(firstPlan.Id);
-            planPercentage.Edit(contractAndCheckoutPercent, insurancePercent, rollCallPercent, customizeCheckoutPercent, contractAndCheckoutInPersonPercent, insuranceInPersonPercent);
-            _planPercentageRepository.SaveChanges();
-        }
-        else
-        {
-            var create = new PlanPercentage(contractAndCheckoutPercent, insurancePercent, rollCallPercent,
-                customizeCheckoutPercent, contractAndCheckoutInPersonPercent, insuranceInPersonPercent);
-            await _planPercentageRepository.CreateAsync(create);
-            await _planPercentageRepository.SaveChangesAsync();
-        }
-
-
-
-        return op.Succcedded();
-    }
-
-    public async Task<PagedResult<InstitutionPlanListDto>> GetList(InstitutionPlanSearchModel searchModel)
-    {
-        return await _planPercentageRepository.GetList(searchModel);
-    }
-
-    #endregion
 }

CompanyManagment.Application/LeaveApplication.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg;
@@ -591,86 +590,11 @@ public class LeaveApplication : ILeaveApplication
         return leaveTotalTimeSpan;
     }
 
-
+	private TimeSpan CalculateTotalLeaveTimeSpan(List<LeavePrintViewModel> leaves)
-
-    private TimeSpan CalculateTotalLeaveTimeSpan(List<LeavePrintViewModel> leaves)
 	{
 		var timeSpanHourlyLeave = new TimeSpan(leaves.Where(x => x.PaidLeaveType != "روزانه").Sum(x => (x.EndLeaveGr - x.StartLeaveGr).Ticks));
 		var dailyLeaveCount = leaves.Count(x => x.PaidLeaveType == "روزانه") * new TimeSpan(1, 0, 0, 0);
 		return timeSpanHourlyLeave + dailyLeaveCount;
 	}
-    #endregion
+	#endregion
-
-
-    #region ForApi
-
-    public async Task<PagedResult<leaveListDto>> GetList(LeaveListSearchModel searchModel)
-    {
-        return await _leaveRepository.GetList(searchModel);
-    }
-
-    public async Task<List<GroupLeaveListDto>> GetGroupList(LeaveListSearchModel searchModel)
-    {
-        return await _leaveRepository.GetGroupList(searchModel);
-    }
-
-    public TimeSpan SumOfEmployeeLeaveTimeSpanInDates(long workshopId, long employeeId, string yearStr, string monthStr, LeaveType leaveType)
-    {
-  
-    
-        var startFa = $"{yearStr}/{monthStr:00}/01";
-        var endFa = startFa.FindeEndOfMonth();
-   
-        if (startFa.TryToGeorgianDateTime(out var start) == false || endFa.TryToGeorgianDateTime(out var end) == false)
-            return TimeSpan.Zero;
-
-        var leaveTotalTimeSpan = TimeSpan.Zero;
-
-        var leaves = _leaveRepository.GetByWorkshopIdEmployeeIdInDates(workshopId, employeeId, start, end);
-        //var timeSpanHourlyLeave = new TimeSpan(leaves.Where(x => x.PaidLeaveType != "روزانه").Sum(x => (x.EndLeaveGr - x.StartLeaveGr).Ticks));
-        //var dailyLeaveCount = leaves.Count(x => x.PaidLeaveType == "روزانه") * new TimeSpan(1, 0, 0, 0);
-
-        if (leaveType == LeaveType.PaidLeave)
-        {
-            var timeSpanHourlyLeave = new TimeSpan(leaves.Where(x => x.PaidLeaveType == "ساعتی" && x.LeaveType == "استحقاقی")
-                .Sum(x => TimeOnly.Parse(x.LeaveHourses).Ticks));
-            var dailyLeaveTime = leaves.Where(x => x.PaidLeaveType == "روزانه" && x.LeaveType == "استحقاقی")
-                .Sum(x => Convert.ToInt32(x.LeaveHourses)) * TimeSpan.FromDays(1);
-
-            leaveTotalTimeSpan = timeSpanHourlyLeave + dailyLeaveTime;
-        }
-        else if (leaveType == LeaveType.SickLeave)
-        {
-            var timeSpanHourlyLeave = new TimeSpan(leaves.Where(x => x.PaidLeaveType == "ساعتی" && x.LeaveType == "استعلاجی")
-                .Sum(x => TimeOnly.Parse(x.LeaveHourses).Ticks));
-
-            var dailyLeaveTime = leaves.Where(x => x.PaidLeaveType == "روزانه" && x.LeaveType == "استعلاجی")
-                .Sum(x => Convert.ToInt32(x.LeaveHourses)) * TimeSpan.FromDays(1);
-
-            leaveTotalTimeSpan = timeSpanHourlyLeave + dailyLeaveTime;
-        }
-        else
-        {
-            var timeSpanHourlyLeave = new TimeSpan(leaves.Where(x => x.PaidLeaveType == "ساعتی").Sum(x => TimeOnly.Parse(x.LeaveHourses).Ticks));
-            var dailyLeaveTime = leaves.Where(x => x.PaidLeaveType == "روزانه").Sum(x => Convert.ToInt32(x.LeaveHourses)) * TimeSpan.FromDays(1);
-            leaveTotalTimeSpan = timeSpanHourlyLeave + dailyLeaveTime;
-        }
-
-
-
-
-        return leaveTotalTimeSpan;
-    }
-
-    public async Task<List<LeavePrintResponseViewModel>> PrintAllAsync(List<long> ids,long workshopId)
-    {
-        return await _leaveRepository.PrintAllAsync(ids,workshopId);
-    }
-
-    public async Task<LeavePrintResponseViewModel> PrintOneAsync(long id, long workshopId)
-    {
-        return (await _leaveRepository.PrintAllAsync([id],workshopId)).FirstOrDefault();
-    }
-
-    #endregion
 }

CompanyManagment.Application/WorkshopAppliction.cs

@@ -1092,9 +1092,7 @@ public class WorkshopAppliction : IWorkshopApplication
                 Amount = 1000,
                 MaxPersonValid = 500,
                 Duration = "12",
-                HasCustomizeCheckoutService = command.HasCustomizeCheckoutService,
+                HasCustomizeCheckoutService = command.HasCustomizeCheckoutService
-                StartService = institutionContract.ContractStartGr,
-                
             };
             _rollCallServiceApplication.Create(commandSave);
         }

CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs

@@ -1895,7 +1895,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             .FirstOrDefaultAsync(x => x.PublicId == id);
     }
 
-    public InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request,string contractStart=null)
+    public InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request)
     {
         var baseAmount = request.TotalAmount;
         var discountAmount = (baseAmount * request.DiscountPercentage) / 100;
@@ -2356,7 +2356,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             IsInstallment = request.IsInstallment,
             OneMonthAmount = selectedPlan.OneMonthPaymentDiscounted.MoneyToDouble()
         };
-        var res = CalculateDiscount(calculateRequest,selectedPlan.ContractStart);
+        var res = CalculateDiscount(calculateRequest);
 
         //این به این دلیل هست که متد caclulate discount یکی از مقادیر رو پر میکنه و ما نیاز داریم هر دو مقدار رو داشته باشیم
         if (request.IsInstallment)
@@ -2476,7 +2476,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 Tax = resetTax.ToMoney(),
                 TotalAmount = resetTotalAmount.ToMoney(),
                 Installments = InstitutionMonthlyInstallmentCaculation((int)institutionTemp.Duration.Value,
-                    paymentAmount,selectedPlan.ContractStart),
+                    paymentAmount, DateTime.Now.ToFarsi()),
                 OneMonthAmount = newOneMonthAmount.ToMoney(),
                 Obligation = resetTotalAmount.ToMoney()
             };
@@ -4364,7 +4364,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             {
                 var sendResult = await _smsService.SendInstitutionCreationVerificationLink(item.Number, item.FullName,
                     item.InstitutionId, item.ContractingPartyId, item.InstitutionContractId, typeOfSms);
-                Thread.Sleep(1000);
             }
 
             Console.WriteLine("executed at : " + persianNow + " - " + hour + ":" + minute);
@@ -4416,13 +4415,12 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 TypeOfContract = x.TypeOfContract,
                 IsInstallment = x.IsInstallment,
                 VerificationStatus = x.VerificationStatus,
-                SigningType = x.SigningType,
                 InstallmentList = x.Installments
                     .Select(ins => new InstitutionContractInstallmentViewModel
                     { AmountDouble = ins.Amount, InstallmentDateGr = ins.InstallmentDateGr })
                     .OrderBy(ins => ins.InstallmentDateGr).Skip(1).ToList(),
             }).Where(x =>
-                x.ContractStartGr < endOfMonthGr && x.ContractEndGr >= endOfMonthGr && x.ContractAmountDouble > 0 && x.VerificationStatus != InstitutionContractVerificationStatus.PendingForVerify)
+                x.ContractStartGr < endOfMonthGr && x.ContractEndGr >= endOfMonthGr && x.ContractAmountDouble > 0)
             .ToListAsync();
 
         #endregion
@@ -4440,13 +4438,13 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
 
         #region GetDectivedContractOnCurrentMonth
-       
+
         if (futureContracts.Any())
         {
             List<long> futureContractIds = futureContracts.Select(x => x.ContractingPartyId).ToList();
             List<InstitutionContractViewModel> deatcivedContract = await _context.InstitutionContractSet
                 .Where(x => x.IsActiveString == "false" && futureContractIds.Contains(x.ContractingPartyId) &&
-                            x.ContractEndGr.Date == endOfCurrentMonth.Date && x.ContractAmount > 0 && x.VerificationStatus != InstitutionContractVerificationStatus.PendingForVerify)
+                            x.ContractEndGr.Date == endOfCurrentMonth.Date && x.ContractAmount > 0)
                 .Select(x => new InstitutionContractViewModel
                 {
                     Id = x.id,
@@ -4461,7 +4459,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     TypeOfContract = x.TypeOfContract,
                     IsInstallment = x.IsInstallment,
                     VerificationStatus = x.VerificationStatus,
-                    SigningType = x.SigningType,
                     InstallmentList = x.Installments
                         .Select(ins => new InstitutionContractInstallmentViewModel
                         { AmountDouble = ins.Amount, InstallmentDateGr = ins.InstallmentDateGr })
@@ -4472,12 +4469,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 institutionContracts.AddRange(deatcivedContract);
         }
 
-        // قرارداد هایی که پطور یکجا پرداخت شده اند
-        var paidInFull = institutionContracts.Where(x =>
-            x.SigningType != InstitutionContractSigningType.Legacy && x.IsInstallment == false && x.SigningType != null).ToList();
-
-        //حذف قراداد هایی که یکجا پرداخت شده اند از لیست ایجاد سند ماهانه
-        institutionContracts = institutionContracts.Except(paidInFull).ToList();
 
         #region RollCallServicCompute
 
@@ -4525,7 +4516,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
                         if (!alreadyCreated)
                         {
-                            if (item.IsInstallment)
+                            if (item.IsInstallment &&
+                                item.VerificationStatus == InstitutionContractVerificationStatus.Verified)
                             {
                                 var instalment = item.InstallmentList
                                     .FirstOrDefault(x =>
@@ -4559,7 +4551,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                         await _financialStatmentRepository.SaveChangesAsync();
 
 
-                        if (item.IsInstallment)
+                        if (item.IsInstallment &&
+                            item.VerificationStatus == InstitutionContractVerificationStatus.Verified)
                         {
                             var instalment = item.InstallmentList
                                 .FirstOrDefault(x =>
@@ -4586,17 +4579,12 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
 
                     #region RollCallServicCompute
-                    //ایجاد سند مالی حضورغیاب
+
-                    //قرارداد هایی که جدید نیستند و اقساط ندارند
+                    if (item.VerificationStatus != InstitutionContractVerificationStatus.Verified &&
-                    //کارگاه های استثناء : کباب مهدی 30520 و نمونه پروتئین 30739 
+                        !item.IsInstallment && item.ContractingPartyId != 30520 && item.ContractingPartyId != 30739)
-                    if (item.SigningType != InstitutionContractSigningType.OtpBased && item.SigningType != InstitutionContractSigningType.Physical
-                        && !item.IsInstallment && item.ContractingPartyId != 30520 && item.ContractingPartyId != 30739)
                     {
                         try
                         {
-                            //TODO
-                            //@refactor Need
-
                             var employers = await _context.Employers
                                 .Where(x => x.ContractingPartyId == item.ContractingPartyId)
                                 .Select(x => x.id).ToListAsync();

CompanyManagment.EFCore/Repository/InsuranceListRepository.cs

@@ -1820,24 +1820,19 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
         return res;
     }
 
-    public async Task<List<InsuranceListViewModel>>  GetNotCreatedWorkshop(InsuranceListSearchModel searchModel)
+    public async Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel)
     {
         if (string.IsNullOrEmpty(searchModel.Month) || string.IsNullOrEmpty(searchModel.Year))
         {
             return [];
         }
 
-
-        var workshopsHasInsuranceAccount = await _accountContext
-            .AccountLeftWorks
-            .Where(x => StaticWorkshopAccounts.InsuranceAccountsRoleIds.Contains(x.RoleId) && x.IsActive)
-            .Select(x => x.WorkshopId).Distinct().ToListAsync();
         var acountId = _authHelper.CurrentAccountId();
-        var accountWorkshopIds = _context.WorkshopAccounts.Where(x => x.AccountId == acountId && workshopsHasInsuranceAccount.Contains(x.WorkshopId))
+        var accountWorkshopIds = _context.WorkshopAccounts.Where(x => x.AccountId == acountId)
             .Select(x => x.WorkshopId);
         var firstDayOfMonth = $"{searchModel.Year}/{searchModel.Month}/01".ToGeorgianDateTime();
         var insuranceWorkshops = _context.Workshops
-            .Where(x => accountWorkshopIds.Contains(x.id) &&
+            .Where(x => x.InsuranceCode != null && x.InsuranceCode.Length >= 10 && accountWorkshopIds.Contains(x.id) &&
                         x.IsActiveString == "true");
 
 
@@ -1860,7 +1855,7 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
                 WorkShopId = result.id,
                 WorkShopCode = result.InsuranceWorkshopInfo != null
                     ? result.InsuranceWorkshopInfo.InsuranceCode
-                    : string.IsNullOrWhiteSpace(result.InsuranceCode) ? "کد کارگاهی ندارد" : result.InsuranceCode,
+                    : result.InsuranceCode,
                 WorkShopName = result.InsuranceWorkshopInfo != null
                     ? result.InsuranceWorkshopInfo.WorkshopName
                     : result.WorkshopFullName,

CompanyManagment.EFCore/Repository/LeaveRepository.cs

@@ -1,15 +1,12 @@
-using _0_Framework.Application;
+using System;
-using _0_Framework.InfraStructure;
-using Azure.Core;
-using Company.Domain.LeaveAgg;
-using CompanyManagment.App.Contracts.Checkout;
-using CompanyManagment.App.Contracts.InstitutionPlan;
-using CompanyManagment.App.Contracts.Leave;
-using Microsoft.EntityFrameworkCore;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
+using _0_Framework.Application;
+using _0_Framework.InfraStructure;
+using Company.Domain.LeaveAgg;
+using CompanyManagment.App.Contracts.Checkout;
+using CompanyManagment.App.Contracts.Leave;
+using Microsoft.EntityFrameworkCore;
 
 namespace CompanyManagment.EFCore.Repository;
 
@@ -20,7 +17,6 @@ public class LeaveRepository : RepositoryBase<long, Leave>, ILeaveRepository
     public LeaveRepository(CompanyContext context) : base(context)
     {
         _context = context;
-   
     }
 
     public EditLeave GetDetails(long id)
@@ -294,65 +290,6 @@ public class LeaveRepository : RepositoryBase<long, Leave>, ILeaveRepository
         return query;
     }
 
-    public async Task<List<LeavePrintResponseViewModel>> PrintAllAsync(List<long> ids, long workshopId)
-    {
-        var leaves =await _context
-            .LeaveList.Where(x => ids.Contains(x.id) && x.WorkshopId == workshopId).ToListAsync();
-
-        var minLeave = leaves.Min(x => x.StartLeave);
-        var maxLeave = leaves.Max(x => x.EndLeave);
-        
-        var employeeIds = leaves.Select(x => x.EmployeeId).Distinct().ToList();
-        
-        var contracts = await _context.Contracts
-            .Where(x => x.WorkshopIds == workshopId && employeeIds.Contains(x.EmployeeId)
-            && x.ContarctStart<= maxLeave && x.ContractEnd>= minLeave)
-            .ToListAsync();
-        
-        var employees = await _context
-            .Employees.Where(x=> employeeIds.Contains(x.id)).ToListAsync();
-        
-        var employerNames = _context.WorkshopEmployers.Include(x=>x.Employer)
-            .Where(x=>x.WorkshopId == workshopId).Select(x=>x.Employer.FName+" "+x.Employer.LName).ToList();
-        
-        var workshopName = _context.Workshops.FirstOrDefault(x => x.id == workshopId)?.WorkshopName;
-        
-        var res = leaves.Select(leave =>
-        {
-            var employee = employees.FirstOrDefault(x => x.id == leave.EmployeeId);
-            return new LeavePrintResponseViewModel
-            {
-                FullName = employee?.FName + " " +
-                           employee?.LName,
-                NationalCode = employee?.NationalCode,
-                WorkshopName = workshopName,
-                EmployerNames = employerNames,
-                PaidLeaveType = leave.PaidLeaveType,
-                ContractNo = contracts.FirstOrDefault(x =>
-                    x.EmployeeId == leave.EmployeeId &&
-                    x.ContarctStart <= leave.StartLeave &&
-                    x.ContractEnd >= leave.EndLeave)?.ContractNo,
-                DailyLeave = leave.PaidLeaveType == "روزانه" ? new LeavePrintDailyResponseViewModel
-                {
-                    StartLeave = leave.StartLeave.ToFarsi(),
-                    EndLeave = leave.EndLeave.ToFarsi(),
-                    TotalDay = leave.LeaveHourses
-                } : null,
-                
-                HourlyLeave = leave.PaidLeaveType == "ساعتی" ?
-                    new LeavePrintHourlyResponseViewModel
-                {
-                    LeaveDate = leave.StartLeave.ToFarsi(),
-                    StartHour = leave.StartLeave.ToString("HH:mm"),
-                    EndHour = leave.EndLeave.ToString("HH:mm"),
-                    TotalHour = TimeSpan.Parse(leave.LeaveHourses)
-                        .TotalHours.ToString("F0")
-                } : null
-            };
-        }).ToList();
-        return res;
-    }
-
     #region Vafa
 
     public List<LeaveViewModel> LastLeaveMain(LeaveSearchModel searchModel)
@@ -434,8 +371,6 @@ public class LeaveRepository : RepositoryBase<long, Leave>, ILeaveRepository
         }
     }
 
-
-
     public OperationResult RemoveLeave(long id)
     {
         var op = new OperationResult();
@@ -601,200 +536,4 @@ public class LeaveRepository : RepositoryBase<long, Leave>, ILeaveRepository
             (starContract >= x.StartLeaveGr && starContract <= x.EndLeaveGr) ||
             (endContract >= x.StartLeaveGr && endContract <= x.EndLeaveGr));
     }
-
-
-    #region ForApi
-
-    public async Task<PagedResult<leaveListDto>> GetList(LeaveListSearchModel searchModel)
-    {
-        var query = _context.LeaveList.Where(x => x.WorkshopId == searchModel.WorkshopId);
-
-        if (searchModel.EmployeeId != 0)
-            query = query.Where(x => x.EmployeeId == searchModel.EmployeeId);
-
-        if (searchModel.LeaveType == LeaveType.PaidLeave)
-            query = query.Where(x => x.LeaveType == "استحقاقی");
-
-        if (searchModel.LeaveType == LeaveType.SickLeave)
-            query = query.Where(x => x.LeaveType == "استعلاجی");
-
-        if (searchModel.IsInvalid)
-        {
-            query = query.IgnoreQueryFilters().Where(x => x.IsInvalid);
-        }
-
-        if (!string.IsNullOrWhiteSpace(searchModel.StartLeave) && !string.IsNullOrWhiteSpace(searchModel.EndLeave))
-        {
-            var start = new DateTime();
-            var end = new DateTime();
-            try
-            {
-                start = searchModel.StartLeave.ToGeorgianDateTime();
-                end = searchModel.EndLeave.ToGeorgianDateTime();
-            }
-            catch (Exception e)
-            {
-                return new PagedResult<leaveListDto>();
-            }
-      
-            query = query.Where(x => x.StartLeave >= start && x.EndLeave <= end);
-        }
-        else if (!string.IsNullOrWhiteSpace(searchModel.YearStr) || !string.IsNullOrWhiteSpace(searchModel.MonthStr))
-        {
-            if (!string.IsNullOrWhiteSpace(searchModel.YearStr))
-            {
-                try
-                {
-                    int year = Convert.ToInt32(searchModel.YearStr);
-                    query = query.Where(x => x.Year == year);
-                }
-                catch (Exception)
-                {
-
-                    return new PagedResult<leaveListDto>();
-                }
-
-            }
-
-            if (!string.IsNullOrWhiteSpace(searchModel.MonthStr))
-            {
-                try
-                {
-                    int month = Convert.ToInt32(searchModel.MonthStr);
-                    query = query.Where(x => x.Month == month);
-                }
-                catch (Exception)
-                {
-
-                    return new PagedResult<leaveListDto>();
-                }
-
-            }
-
-
-         
-        }
-        var count = await query.CountAsync();
-        query = query.OrderByDescending(x => x.CreationDate);
-        var queryPaginationFilter = await query.ApplyPagination(searchModel.PageIndex, searchModel.PageSize).ToListAsync();
-
-   
-        var leaveResult = queryPaginationFilter.Select(item => new leaveListDto()
-        {
-            Id = item.id,
-            EmployeeFullName = item.EmployeeFullName,
-            YearStr = $"{item.Year}",
-            MonthStr = item.Month.ToFarsiMonthByIntNumber(),
-            IsInvalid = item.IsInvalid,
-            LeaveType = item.LeaveType,
-            StartLeave = item.StartLeave.ToFarsi(),
-            EndLeave = item.EndLeave.ToFarsi(),
-            HourlyInterval = item.PaidLeaveType == "ساعتی" ? $"{item.StartLeave.TimeOfDay:hh\\:mm} الی {item.EndLeave.TimeOfDay:hh\\:mm}" : "-",
-            LeaveDuration = Tools.CalculateLeaveHoursAndDays(item.PaidLeaveType, item.LeaveHourses),
-            IsAccepted = item.IsAccepted,
-            WorkshopId = item.WorkshopId,
-            EmployeeId = item.EmployeeId,
-         
-        }).ToList();
-        return new PagedResult<leaveListDto>()
-        {
-            TotalCount = count,
-            List = leaveResult
-        };
-    }
-
-
-    public async Task<List<GroupLeaveListDto>> GetGroupList(LeaveListSearchModel searchModel)
-    {
-        var query = _context.LeaveList.Where(x => x.WorkshopId == searchModel.WorkshopId && x.EmployeeId == searchModel.EmployeeId);
-
-
-
-        if (searchModel.LeaveType == LeaveType.PaidLeave)
-            query = query.Where(x => x.LeaveType == "استحقاقی");
-
-        if (searchModel.LeaveType == LeaveType.SickLeave)
-            query = query.Where(x => x.LeaveType == "استعلاجی");
-
-        if (searchModel.IsInvalid)
-        {
-            query = query.IgnoreQueryFilters().Where(x => x.IsInvalid);
-        }
-
-        if (!string.IsNullOrWhiteSpace(searchModel.StartLeave) && !string.IsNullOrWhiteSpace(searchModel.EndLeave))
-        {
-            var start = new DateTime();
-            var end = new DateTime();
-            try
-            {
-                start = searchModel.StartLeave.ToGeorgianDateTime();
-                end = searchModel.EndLeave.ToGeorgianDateTime();
-            }
-            catch (Exception e)
-            {
-                return new List<GroupLeaveListDto>();
-            }
-
-            query = query.Where(x => x.StartLeave >= start && x.EndLeave <= end);
-        }
-        else if (!string.IsNullOrWhiteSpace(searchModel.YearStr) || !string.IsNullOrWhiteSpace(searchModel.MonthStr))
-        {
-            if (!string.IsNullOrWhiteSpace(searchModel.YearStr))
-            {
-                try
-                {
-                    int year = Convert.ToInt32(searchModel.YearStr);
-                    query = query.Where(x => x.Year == year);
-                }
-                catch (Exception)
-                {
-
-                    return new List<GroupLeaveListDto>();
-                }
-
-            }
-
-            if (!string.IsNullOrWhiteSpace(searchModel.MonthStr))
-            {
-                try
-                {
-                    int month = Convert.ToInt32(searchModel.MonthStr);
-                    query = query.Where(x => x.Month == month);
-                }
-                catch (Exception)
-                {
-
-                    return new List<GroupLeaveListDto>();
-                }
-
-            }
-
-
-        }
-
-        var leaveList = await query.GroupBy(x => new { x.Year, x.Month })
-            .OrderByDescending(group => group.Key.Year)
-            .ThenByDescending(group => group.Key.Month)
-            .Select(group => new GroupLeaveListDto
-            {
-                YearStr = $"{group.Key.Year}",
-                MonthStr = group.Key.Month.ToFarsiMonthByIntNumber(),
-                LeaveListItemsDto = group.OrderByDescending(x=>x.StartLeave).Select(item => new LeaveListItemsDto
-                {
-                    Id = item.id,
-                    IsInvalid = item.IsInvalid,
-                    LeaveType = item.LeaveType,
-                    StartLeave = item.StartLeave.ToFarsi(),
-                    EndLeave = item.EndLeave.ToFarsi(),
-                    HourlyInterval = item.PaidLeaveType == "ساعتی" ? $"{item.StartLeave.TimeOfDay:hh\\:mm} الی {item.EndLeave.TimeOfDay:hh\\:mm}" : "-",
-                    LeaveDuration = Tools.CalculateLeaveHoursAndDays(item.PaidLeaveType, item.LeaveHourses),
-                    IsAccepted = item.IsAccepted,
-                    WorkshopId = item.WorkshopId,
-                    EmployeeId = item.EmployeeId,
-                }).ToList()
-            }).ToListAsync();
-
-        return leaveList;
-    }
-    #endregion
 }

CompanyManagment.EFCore/Repository/PlanPercentageRepository.cs

@@ -1,14 +1,12 @@
-using _0_Framework.Application;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using Company.Domain.InstitutionPlanAgg;
-using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.InstitutionPlan;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace CompanyManagment.EFCore.Repository;
 
@@ -46,7 +44,6 @@ public class PlanPercentageRepository : RepositoryBase<long, PlanPercentage>, IP
         }).FirstOrDefault();
     }
 
-
     public List<InstitutionPlanViewModel> GetInstitutionPlanList(int pageIndex, int countPeron)
     {
         var planPercentage = _context.PlanPercentages.FirstOrDefault();
@@ -306,109 +303,4 @@ public class PlanPercentageRepository : RepositoryBase<long, PlanPercentage>, IP
 
         return new InstitutionPlanViewModel();
     }
-
-
-    #region ForApi
-
-    public async Task<CreateServiceAmountDto> GetCreateModalData()
-    {
-        return await _context.PlanPercentages.Select(x => new CreateServiceAmountDto()
-        {
-            Id = x.id,
-            ContractAndCheckoutInPersonPercentStr = $"{x.ContractAndCheckoutInPersonPercent}",
-            CustomizeCheckoutPercentStr = $"{x.CustomizeCheckoutPercent}",
-            ContractAndCheckoutPercentStr = $"{x.ContractAndCheckoutPercent}",
-            InsuranceInPersonPercentStr = $"{x.InsuranceInPersonPercent}",
-            InsurancePercentStr = $"{x.InsurancePercent}",
-            RollCallPercentStr = $"{x.RollCallPercent}",
-        }).FirstOrDefaultAsync();
-    }
-
-
-    public async Task<PagedResult<InstitutionPlanListDto>> GetList(
-        InstitutionPlanSearchModel searchModel)
-    {
-        var planPercentage = await _context.PlanPercentages.FirstOrDefaultAsync();
-        if (planPercentage == null)
-            return new PagedResult<InstitutionPlanListDto>();
-        var dailyWageYearlySalery = await _context.YearlySalaries.Include(i => i.YearlySalaryItemsList).FirstOrDefaultAsync(x =>
-            x.StartDate.Date <= DateTime.Now.Date && x.EndDate >= DateTime.Now.Date);
-        if (dailyWageYearlySalery == null)
-            return new PagedResult<InstitutionPlanListDto>();
-
-        var dailyWage = dailyWageYearlySalery.YearlySalaryItemsList.Where(x => x.ItemName == "مزد روزانه")
-            .Select(x => x.ItemValue).FirstOrDefault();
-
-        var plans = _context.InstitutionPlans.AsQueryable();
-        if (searchModel.CountPerson > 0)
-            plans = plans.Where(x => x.CountPerson == searchModel.CountPerson);
-
-        var count = await plans.CountAsync();
-
-        var planQueryFilter =await plans.ApplyPagination(searchModel.PageIndex, searchModel.PageSize).ToListAsync();
-        var planResult =  planQueryFilter.Select(plan =>
-            new InstitutionPlanViewModel
-            {
-                CountPerson = plan.CountPerson,
-
-                ContractAndCheckoutDouble =
-                    ((dailyWage * planPercentage.ContractAndCheckoutPercent / 100) * plan.CountPerson *
-                     plan.IncreasePercentage),
-
-                InsuranceDouble = (((dailyWage * planPercentage.InsurancePercent) / 100) * plan.CountPerson *
-                                   plan.IncreasePercentage),
-
-                RollCallDouble = (((dailyWage * planPercentage.RollCallPercent) / 100) * plan.CountPerson *
-                                  plan.IncreasePercentage),
-
-                CustomizeCheckoutDouble = (((dailyWage * planPercentage.CustomizeCheckoutPercent) / 100) *
-                                           plan.CountPerson *
-                                           plan.IncreasePercentage),
-
-                ContractAndCheckoutInPersonDouble =
-                    (((dailyWage * planPercentage.ContractAndCheckoutInPersonPercent) / 100) * plan.CountPerson *
-                     plan.IncreasePercentage),
-
-                InsuranceInPersonDouble = (((dailyWage * planPercentage.InsuranceInPersonPercent) / 100) *
-                                           plan.CountPerson *
-                                           plan.IncreasePercentage)
-            }).ToList();
-
-        var finalResult = planResult.Select(plan => new InstitutionPlanListDto()
-        {
-            CountPerson = plan.CountPerson,
-
-            ContractAndCheckout = plan.ContractAndCheckoutDouble.ToMoney(),
-
-            Insurance = plan.InsuranceDouble.ToMoney(),
-
-            RollCall = plan.RollCallDouble.ToMoney(),
-
-            CustomizeCheckout = plan.CustomizeCheckoutDouble.ToMoney(),
-
-            ContractAndCheckoutInPerson = plan.ContractAndCheckoutInPersonDouble.ToMoney(),
-
-            InsuranceInPerson = plan.InsuranceInPersonDouble.ToMoney(),
-
-            InPersonSumAmountStr =
-                (plan.ContractAndCheckoutDouble + plan.InsuranceDouble + plan.ContractAndCheckoutInPersonDouble +
-                 plan.InsuranceInPersonDouble).ToMoney(),
-
-            OnlineAndInPersonSumAmountStr = (plan.ContractAndCheckoutDouble + plan.InsuranceDouble +
-                                             plan.ContractAndCheckoutInPersonDouble + plan.InsuranceInPersonDouble +
-                                             plan.RollCallDouble + plan.CustomizeCheckoutDouble).ToMoney(),
-
-            OnlineOnlySumAmountStr =
-                (plan.ContractAndCheckoutDouble + plan.InsuranceDouble + plan.RollCallDouble +
-                 plan.CustomizeCheckoutDouble).ToMoney(),
-        }).ToList();
-
-        return new PagedResult<InstitutionPlanListDto>()
-        {
-            TotalCount = count,
-            List = finalResult
-        };
-
-    }
-    #endregion
 }

CompanyManagment.EFCore/Repository/RollCallRepository.cs

@@ -1425,7 +1425,7 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, IRollCallRepos
 
     public string CheckRepeat(long employeeId, long workshopId)
     {
-        var validSpan = new TimeSpan(0, 0, 2, 0);
+        var validSpan = new TimeSpan(0, 0, 5, 0);
         var checkDate = DateTime.Now.AddDays(-3);
         var query = _context.RollCalls
             .Where(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId && x.CreationDate >= checkDate);

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AutoStopOverTimeTaskSections/AutoStopOverTimeTaskSectionsCommand.cs

@@ -1,49 +0,0 @@
-using GozareshgirProgramManager.Application._Common.Interfaces;
-using GozareshgirProgramManager.Application._Common.Models;
-using GozareshgirProgramManager.Domain._Common;
-using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
-using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
-using Microsoft.EntityFrameworkCore;
-
-namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.AutoStopOverTimeTaskSections;
-
-public record AutoStopOverTimeTaskSectionsCommand : IBaseCommand;
-
-public class AutoStopOverTimeTaskSectionsCommandHandler : IBaseCommandHandler<AutoStopOverTimeTaskSectionsCommand>
-{
-    private readonly ITaskSectionRepository _taskSectionRepository;
-    private readonly IUnitOfWork _unitOfWork;
-
-    public AutoStopOverTimeTaskSectionsCommandHandler(ITaskSectionRepository taskSectionRepository,
-        IUnitOfWork unitOfWork)
-    {
-        _taskSectionRepository = taskSectionRepository;
-        _unitOfWork = unitOfWork;
-    }
-
-    public async Task<OperationResult> Handle(AutoStopOverTimeTaskSectionsCommand request,
-        CancellationToken cancellationToken)
-    {
-        try
-        {
-            // دریافت تمام تسک‌های در حال انجام
-            var taskSections = await _taskSectionRepository.GetActiveSectionsIncludeAllAsync(cancellationToken);
-
-
-            foreach (var taskSection in taskSections)
-            {
-                // استفاده از متد Domain برای بررسی و متوقف کردن خودکار
-                taskSection.AutoStopIfOverTime();
-            }
-
-            // ذخیره تغییرات در دیتابیس
-            await _unitOfWork.SaveChangesAsync(cancellationToken);
-
-            return OperationResult.Success();
-        }
-        catch (Exception ex)
-        {
-            return OperationResult.Failure($"خطا در ناتمام کردن تسک‌های overtime: {ex.Message}");
-        }
-    }
-}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardDetail/ProjectBoardDetailQueryHandler.cs

@@ -1,4 +1,3 @@
-using System.Globalization;
 using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain._Common;
@@ -8,23 +7,21 @@ namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.Project
 
 public record ProjectBoardDetailQuery(Guid SectionId) : IBaseQuery<ProjectBoardDetailResponse>;
 
-public record ProjectBoardDetailResponse(List<ProjectBoardDetailUserResponse> Users, string TotalTime,string RemainingTime );
+public record ProjectBoardDetailResponse(List<ProjectBoardDetailUserResponse> Users, string TotalTime);
 
 public record ProjectBoardDetailUserResponse
 {
-    public List<ProjectBoardDetailUserHistoryResponse> Histories { get; init; }
+    public List<ProjectBoardDetailUserHistoryResponse> Histories { get; set; } = new();
-    public string UserFullName { get; init; }
+    public string UserFullName { get; set; }
-    public string TotalTime { get; init; }
+    public long UserId { get; set; }
-    public string SpentTime { get; init; }
-    public long UserId { get; init; }
 }
 
-public record ProjectBoardDetailUserHistoryResponse
+public class ProjectBoardDetailUserHistoryResponse
 {
-    public string Date { get; init; }
+    public string Date { get; set; }
-    public string startTime { get; init; }
+    public string startTime { get; set; }
-    public string EndTime { get; init; }
+    public string EndTime { get; set; }
-    public string TotalTime { get; init; }
+    public string TotalTime { get; set; }
 }
 
 public class ProjectBoardDetailQueryHandler : IBaseQueryHandler<ProjectBoardDetailQuery, ProjectBoardDetailResponse>
@@ -41,7 +38,6 @@ public class ProjectBoardDetailQueryHandler : IBaseQueryHandler<ProjectBoardDeta
     {
         var section = await _programManagerDbContext.TaskSections
             .Include(x => x.Activities)
-            .Include(x=>x.AdditionalTimes)
             .FirstOrDefaultAsync(x => x.Id == request.SectionId, cancellationToken: cancellationToken);
         
         if (section == null)
@@ -53,22 +49,16 @@ public class ProjectBoardDetailQueryHandler : IBaseQueryHandler<ProjectBoardDeta
             .Where(x => userIds.Contains(x.Id))
             .ToDictionaryAsync(x => x.Id, x => x.FullName, cancellationToken);
 
-        var totalActivityTimeSpan = section.Activities
+        var totalTimeSpan = section.Activities
             .Select(x => x.GetTimeSpent())
             .Aggregate(TimeSpan.Zero, (sum, next) => sum.Add(next));
         
-        var finalTime = section.FinalEstimatedHours;
-        
-        var remainingTimeSpan = finalTime >= totalActivityTimeSpan
-            ? TimeSpan.FromTicks(finalTime.Ticks - totalActivityTimeSpan.Ticks)
-            : TimeSpan.Zero;
         var users = section.Activities.GroupBy(x => x.UserId).Select(x =>
         {
             return new ProjectBoardDetailUserResponse()
             {
                 UserId = x.Key,
                 UserFullName = usersDict[x.Key],
-                TotalTime = TimeSpan.FromTicks(x.Sum(h=>h.GetTimeSpent().Ticks)).TotalHours.ToString(CultureInfo.InvariantCulture),
                 Histories = x.Select(h => new ProjectBoardDetailUserHistoryResponse()
                 {
                     Date = h.StartDate.ToFarsi(),
@@ -78,8 +68,7 @@ public class ProjectBoardDetailQueryHandler : IBaseQueryHandler<ProjectBoardDeta
                 }).ToList()
             };
         }).ToList();
-        var response = new ProjectBoardDetailResponse(users, $"{(int)totalActivityTimeSpan.TotalHours}:{totalActivityTimeSpan.Minutes:D2}",
+        var response = new ProjectBoardDetailResponse(users, $"{(int)totalTimeSpan.TotalHours}:{totalTimeSpan.Minutes:D2}");
-            $"{(int)remainingTimeSpan.TotalHours}:{remainingTimeSpan.Minutes:D2}");
         return OperationResult<ProjectBoardDetailResponse>.Success(response);
     }
 }

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/TaskSection.cs

@@ -217,39 +217,4 @@ public class TaskSection : EntityBase<Guid>
         var finalEstimate = FinalEstimatedHours;
         return totalSpent < finalEstimate;
     }
-
-    /// <summary>
-    /// اگر زمان کار شده بیش از تایم تعیین شده باشد، تسک را متوقف می‌کند
-    /// و EndDate را به طوری تنظیم می‌کند که کل زمان برابر با FinalEstimatedHours شود
-    /// </summary>
-    public void AutoStopIfOverTime()
-    {
-        if (Status != TaskSectionStatus.InProgress)
-            return;
-
-        var activeActivity = _activities.FirstOrDefault(a => a.IsActive);
-        if (activeActivity == null)
-            return;
-
-        // محاسبه کل زمان صرف شده تا کنون (بدون فعالیت فعال)
-        var totalTimeSpentExcludingActive = _activities.Where(a => !a.IsActive).Sum(a => a.GetTimeSpent().Ticks);
-        var totalTimeSpentTimeSpan = TimeSpan.FromTicks(totalTimeSpentExcludingActive);
-        var finalEstimate = FinalEstimatedHours;
-
-        // اگر زمان صرف شده (بدون فعالیت فعال) + فعالیت فعال > تایم تعیین شده
-        var activeTimeSpent = activeActivity.GetTimeSpent();
-        if (totalTimeSpentTimeSpan + activeTimeSpent > finalEstimate)
-        {
-            // محاسبه مدت زمانی که این فعالیت باید برای رسیدن به FinalEstimatedHours داشته باشد
-            var remainingTime = finalEstimate - totalTimeSpentTimeSpan;
-            
-            // EndDate = StartDate + remainingTime
-            var adjustedEndDate = activeActivity.StartDate.Add(remainingTime);
-            
-            // متوقف کردن فعالیت با EndDate دقیق شده
-            activeActivity.StopWorkWithSpecificTime(adjustedEndDate, "متوقف خودکار - بیش از تایم تعیین شده");
-            
-            UpdateStatus(TaskSectionStatus.Incomplete);
-        }
-    }
 }

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/TaskSectionActivity.cs

@@ -40,22 +40,6 @@ public class TaskSectionActivity : EntityBase<Guid>
         IsActive = false;
     }
 
-    /// <summary>
-    /// متوقف کردن فعالیت با مشخص کردن EndDate دقیق
-    /// </summary>
-    public void StopWorkWithSpecificTime(DateTime endDate, string? endNotes = null)
-    {
-        if (!IsActive)
-            throw new InvalidOperationException("این فعالیت قبلاً متوقف شده است.");
-
-        if (endDate < StartDate)
-            throw new InvalidOperationException("تاریخ پایان نمی‌تواند قبل از تاریخ شروع باشد.");
-
-        EndDate = endDate;
-        EndNotes = endNotes;
-        IsActive = false;
-    }
-
     public TimeSpan GetTimeSpent()
    {
            if (IsActive)

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/ITaskSectionRepository.cs

@@ -1,4 +1,3 @@
-using System.Collections;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
 
@@ -12,5 +11,4 @@ public interface ITaskSectionRepository: IRepository<Guid,TaskSection>
     Task<TaskSection?> GetByIdWithFullDataAsync(Guid id, CancellationToken cancellationToken = default);
 
     Task<List<TaskSection>> GetAssignedToUserAsync(long userId);
-    Task<List<TaskSection>> GetActiveSectionsIncludeAllAsync(CancellationToken cancellationToken);
 }

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Repositories/TaskSectionRepository.cs

@@ -1,5 +1,4 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
-using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 using GozareshgirProgramManager.Infrastructure.Persistence._Common;
 using GozareshgirProgramManager.Infrastructure.Persistence.Context;
@@ -36,13 +35,4 @@ public class TaskSectionRepository:RepositoryBase<Guid,TaskSection>,ITaskSection
             .Where(x => x.CurrentAssignedUserId == userId)
             .ToListAsync();
     }
-
-    public Task<List<TaskSection>> GetActiveSectionsIncludeAllAsync(CancellationToken cancellationToken)
-    {
-        return _context.TaskSections
-            .Where(x => x.Status == TaskSectionStatus.InProgress)
-            .Include(x => x.Activities)
-            .Include(x => x.AdditionalTimes)
-            .ToListAsync(cancellationToken);
-    }
 }

ServiceHost/Areas/Admin/Controllers/ProgramManager/ProjectController.cs

@@ -1,7 +1,6 @@
 using System.Runtime.InteropServices;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.AssignProject;
-using GozareshgirProgramManager.Application.Modules.Projects.Commands.AutoStopOverTimeTaskSections;
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.ChangeStatusSection;
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.CreateProject;
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.DeleteProject;
@@ -99,9 +98,6 @@ public class ProjectController : ProgramManagerBaseController
     [HttpGet("board")]
     public async Task<ActionResult<OperationResult<List<ProjectBoardListResponse>>>> GetProjectBoard([FromQuery] ProjectBoardListQuery query)
     {
-        // اجرای Command برای متوقف کردن تسک‌های overtime قبل از نمایش
-        await _mediator.Send(new AutoStopOverTimeTaskSectionsCommand());
-        
         var res = await _mediator.Send(query);
         return res;
     }

ServiceHost/Areas/Admin/Controllers/ServiceAmountsManagement.cs

@@ -1,63 +0,0 @@
-using _0_Framework.Application;
-using AccountManagement.Application.Contracts.Ticket;
-using CompanyManagment.App.Contracts.InstitutionPlan;
-using CompanyManagment.App.Contracts.Workshop;
-using Microsoft.AspNetCore.Mvc;
-using ServiceHost.BaseControllers;
-
-namespace ServiceHost.Areas.Admin.Controllers;
-
-public class ServiceAmountsManagement : AdminBaseController
-{
-    private readonly IInstitutionPlanApplication _institutionPlanApplication;
-    private readonly IAuthHelper _authHelper;
-
-    public ServiceAmountsManagement(IInstitutionPlanApplication institutionPlanApplication, IAuthHelper authHelper)
-    {
-        _institutionPlanApplication = institutionPlanApplication;
-        _authHelper = authHelper;
-    }
-
-
-    /// <summary>
-    /// دریافت دیتای مودال ایجاد
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet("GetCreateModalData")]
-    public async Task<ActionResult<CreateServiceAmountDto>> GetCreateModalData()
-    {
-        if(!_authHelper.HasPermission(315))
-            return Forbid();
-        var data = await _institutionPlanApplication.GetCreateModalData();
-
-        return data;
-    }
-
-    /// <summary>
-    /// ذخیره درصدها
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    [HttpPost("CreateServicePercentage")]
-    public async Task<ActionResult<OperationResult>> CreateServicePercentage([FromBody] CreateServiceAmountDto command)
-    {
-
-        if (!_authHelper.HasPermission(315))
-            return Forbid();
-
-        var result = await _institutionPlanApplication.CreateInstitutionPlanPercentage(command);
-
-        return result;
-    }
-
-    /// <summary>
-    /// دریافت لیست مبالغ سرویس ها
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    [HttpGet("GetList")]
-    public async Task<ActionResult<PagedResult<InstitutionPlanListDto>>> GetList(InstitutionPlanSearchModel searchModel)
-    {
-        return await _institutionPlanApplication.GetList(searchModel);
-    }
-}

ServiceHost/Areas/Admin/Controllers/institutionContractController.cs

@@ -809,7 +809,7 @@ public class institutionContractController : AdminBaseController
     }
 
     [HttpPost("mannual-verify/{id}")]
-    public async Task<ActionResult<OperationResult>> VerifyInstitutionContractManually(long id)
+    public async Task<ActionResult<OperationResult>> VerifyInstitutionContractMannualy(long id)
     {
         var res= await _institutionContractApplication.VerifyInstitutionContractManually(id);
         return res;

ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml

@@ -74,8 +74,8 @@
 </form>
 <div class="lineDiv"></div>
 <div class="row m-t-20">
-    <div class="col-md-4 visible-md visible-lg"></div>
+    <div class="col-4"></div>
-    <div class="col-6 col-md-2">
+    <div class="col-2">
         <form asp-page-handler="UploadFrontEnd" id="12" method="post">
             <button type="submit"
                     class="btn btn-danger"
@@ -84,14 +84,14 @@
             </button>
         </form>
     </div>
-    <div class="col-6 col-md-2">
+    <div class="col-2">
         <button type="button" class="btn btn-outline-secondary"
                 data-bs-toggle="modal"
                 data-bs-target="#logModal">
             مشاهده لاگ Deploy
         </button>
     </div>
-    <div class="col-md-4 visible-md visible-lg"></div>
+    <div class="col-4"></div>
 </div>
 <div class="lineDiv"></div>
 

ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs

@@ -332,39 +332,19 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
             var validAccountId = _authHelper.CurrentAccountId();
             if (validAccountId == 2 || validAccountId == 322)
             {
-                //var batPath = @"C:\next-ui\deploy-next-ui.bat";
+                var batPath = @"C:\next-ui\deploy-next-ui.bat";
-
-                //var psi = new ProcessStartInfo
-                //{
-                //    FileName = batPath,
-                //    UseShellExecute = true,   // خیلی مهم
-                //    Verb = "runas",           // اجرای Administrator
-                //    CreateNoWindow = true,
-                //    WindowStyle = ProcessWindowStyle.Hidden
-                //};
-
-                //Process.Start(psi);
 
                 var psi = new ProcessStartInfo
                 {
-                    FileName = "cmd.exe",
+                    FileName = batPath,
-                    Arguments = "/c schtasks /run /tn \"DeployNextUI\"",
+                    UseShellExecute = true,   // خیلی مهم
-                    UseShellExecute = false,
+                    Verb = "runas",           // اجرای Administrator
-                    CreateNoWindow = true
+                    CreateNoWindow = true,
+                    WindowStyle = ProcessWindowStyle.Hidden
                 };
 
                 Process.Start(psi);
 
-                //var psi = new ProcessStartInfo
-                //{
-                //    FileName = @"C:\next-ui\deploy-next-ui.bat",
-                //    UseShellExecute = false,
-                //    CreateNoWindow = false
-                //};
-
-                //Process.Start(psi);
-
-
                 TempData["Message"] = "فرآیند Deploy شروع شد. لاگ را بررسی کنید.";
                 return RedirectToPage();
             }

ServiceHost/Areas/Camera/Controllers/CameraController.cs

@@ -145,10 +145,10 @@ public class CameraController : CameraBaseController
         switch (repeatStatus)
         {
             case "IncomRegistred-InvalidOut":
-            throw new BadRequestException("شما به تازگی ثبت ورود نموده اید ,تا 2 دقیقه نمی توانید ثبت خروج نمایید");
+            throw new BadRequestException("شما به تازگی ثبت ورود نموده اید ,تا 5 دقیقه نمی توانید ثبت خروج نمایید");
             
             case "outRegistred-InvalidIncom":
-            throw new BadRequestException("شما به تازگی ثبت خروج نموده اید تا 2 دقیقه نمی توانید ثبت ورود نمایید");
+            throw new BadRequestException("شما به تازگی ثبت خروج نموده اید تا 5 دقیقه نمی توانید ثبت ورود نمایید");
             
         }
         
@@ -201,10 +201,10 @@ public class CameraController : CameraBaseController
         switch (repeatStatus)
         {
             case "IncomRegistred-InvalidOut":
-                throw new BadRequestException("شما به تازگی ثبت ورود نموده اید ,تا 2 دقیقه نمی توانید ثبت خروج نمایید");
+                throw new BadRequestException("شما به تازگی ثبت ورود نموده اید ,تا 5 دقیقه نمی توانید ثبت خروج نمایید");
             
             case "outRegistred-InvalidIncom":
-                throw new BadRequestException("شما به تازگی ثبت خروج نموده اید تا 2 دقیقه نمی توانید ثبت ورود نمایید");
+                throw new BadRequestException("شما به تازگی ثبت خروج نموده اید تا 5 دقیقه نمی توانید ثبت ورود نمایید");
             
         }
         
@@ -302,13 +302,13 @@ public class CameraController : CameraBaseController
                 return new JsonResult(new
                 {
                     isSuccess = false,
-                    message = "شما به تازگی ثبت ورود نموده اید ,تا 2 دقیقه نمی توانید ثبت خروج نمایید",
+                    message = "شما به تازگی ثبت ورود نموده اید ,تا 5 دقیقه نمی توانید ثبت خروج نمایید",
                 });
             case "outRegistred-InvalidIncom":
                 return new JsonResult(new
                 {
                     isSuccess = false,
-                    message = "شما به تازگی ثبت خروج نموده اید تا 2 دقیقه نمی توانید ثبت ورود نمایید",
+                    message = "شما به تازگی ثبت خروج نموده اید تا 5 دقیقه نمی توانید ثبت ورود نمایید",
                 });
         }
 
@@ -412,6 +412,32 @@ public class CameraController : CameraBaseController
             });
         }
     }
+    
+    
+    [HttpPost("check-password")]
+    public IActionResult OnPostCheckPassword([FromBody]string password)
+    {
+        var cameraAccount = _authHelper.CameraAccountInfo();
+        var cameraPassword = _cameraAccountApplication.GetDetails(cameraAccount.Id).Password;
+        (bool Verified, bool NeedUpgrade) result = _passwordHasher.Check(cameraPassword, password);
+        if (result.Verified)
+        {
+            _accountApplication.Logout();
+            return new JsonResult(new
+            {
+                isSuccess = true,
+      
+            });
+        }
+        
+        return new JsonResult(new
+        {
+            isSuccess = false,
+            errorMessage = "گذرواژه اشتباه است",
+        });
+      
+        
+    }
 }
 
 public class RollCallExitRequest:RollCallEnterRequest

ServiceHost/Areas/Camera/Pages/Index.cshtml.cs

@@ -139,13 +139,13 @@ public class IndexModel : PageModel
                     return new JsonResult(new
                     {
                         isSuccess = false,
-                        message = "شما به تازگی ثبت ورود نموده اید ,تا 2 دقیقه نمی توانید ثبت خروج نمایید",
+                        message = "شما به تازگی ثبت ورود نموده اید ,تا 5 دقیقه نمی توانید ثبت خروج نمایید",
                     });
                 case "outRegistred-InvalidIncom":
                     return new JsonResult(new
                     {
                         isSuccess = false,
-                        message = "شما به تازگی ثبت خروج نموده اید تا 2 دقیقه نمی توانید ثبت ورود نمایید",
+                        message = "شما به تازگی ثبت خروج نموده اید تا 5 دقیقه نمی توانید ثبت ورود نمایید",
                     });
             }
 

ServiceHost/Areas/Client/Controllers/LeaveController.cs

@@ -1,65 +0,0 @@
-using _0_Framework.Application;
-using Company.Domain.EmployeeAgg;
-using CompanyManagment.App.Contracts.InsuranceList;
-using CompanyManagment.App.Contracts.Leave;
-using Microsoft.AspNetCore.Mvc;
-using ServiceHost.BaseControllers;
-using System.Security.Cryptography;
-
-namespace ServiceHost.Areas.Client.Controllers;
-
-public class LeaveController : ClientBaseController
-{
-    private readonly ILeaveApplication _leaveApplication;
-    private long _workshopId;
-    public LeaveController(ILeaveApplication leaveApplication, IAuthHelper authHelper)
-    {
-        _leaveApplication = leaveApplication;
-        _workshopId = authHelper.GetWorkshopId();
-    }
-
-    /// <summary>
-    /// دریافت لیست مرخصی ها
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    [HttpGet("GetLeaveList")]
-    public async Task<ActionResult<LeaveListMultipleDto>> GetLeaveList(LeaveListSearchModel searchModel)
-    {
-        var result = new LeaveListMultipleDto();
-        searchModel.WorkshopId = _workshopId;
-        if (searchModel.EmployeeId > 0)
-        {
-            //لیست گروه بندی شده
-            result.GroupLeaveListDto = await _leaveApplication.GetGroupList(searchModel);
-
-            if (!string.IsNullOrWhiteSpace(searchModel.YearStr) && !string.IsNullOrWhiteSpace(searchModel.MonthStr))
-            {
-                TimeSpan timeSpan = _leaveApplication.SumOfEmployeeLeaveTimeSpanInDates(_workshopId, searchModel.EmployeeId, searchModel.YearStr, searchModel.MonthStr, searchModel.LeaveType);
-                //مجموع مرخصی پرسنل
-                result.SumOfEmployeeleaves = timeSpan.ToFarsiDaysAndHoursAndMinutes();
-            }
-
-            return Ok(result);
-        }
-        //لیست نرمال PageResult
-        result.leaveListDto = await _leaveApplication.GetList(searchModel);
-        return Ok(result);
-    }
-
-
-
-    [HttpGet("print/{id}")]
-    public async Task<ActionResult<LeavePrintResponseViewModel>> PrintOneAsync(long id)
-    {
-        var leavePrint = await _leaveApplication.PrintOneAsync(id, _workshopId);
-        return leavePrint;
-    }
-    [HttpGet("print")]
-    public async Task<ActionResult<List<LeavePrintResponseViewModel>>> PrintAllAsync([FromQuery] List<long> ids)
-    {
-        var leavePrints = await _leaveApplication.PrintAllAsync(ids, _workshopId);
-        return Ok(leavePrints);
-    }
-    
-}

ServiceHost/Properties/launchSettings.json

@@ -19,7 +19,7 @@
       "sqlDebugging": true,
       "dotnetRunMessages": "true",
       "nativeDebugging": true,
-      "applicationUrl": "https://localhost:5004;http://localhost:5003;",
+      "applicationUrl": "https://localhost:5004;http://localhost:5003;https://192.168.0.117:5006",
       "jsWebView2Debugging": false,
       "hotReloadEnabled": true
     },