feat: add SetIsSent endpoint to update contract send status

- Updated status transitions to include PendingForCompletion before Completed
- Added API endpoint and command/handler for approving/rejecting section completion
- Fixed additional time calculation to include minutes
- Refactored project board query logic and improved user ordering
- Updated launch settings with new HTTPS endpoint
- Documented progress percentage feature for TaskSection

.gitignore

@@ -362,3 +362,5 @@ MigrationBackup/
 # # Fody - auto-generated XML schema
 # FodyWeavers.xsd
 .idea
+/ServiceHost/appsettings.Development.json
+/ServiceHost/appsettings.json

0_Framework/Application/PaymentGateway/SepehrPaymentGateway.cs

@@ -4,6 +4,7 @@ using System.Net.Http;
 using System.Net.Http.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
 namespace _0_Framework.Application.PaymentGateway;
@@ -12,18 +13,24 @@ public class SepehrPaymentGateway:IPaymentGateway
 {
 	private readonly HttpClient _httpClient;
 	private const long TerminalId = 99213700;
+	private readonly ILogger<SepehrPaymentGateway> _logger;
 
-	public SepehrPaymentGateway(IHttpClientFactory httpClient)
+	public SepehrPaymentGateway(IHttpClientFactory httpClient, ILogger<SepehrPaymentGateway> logger)
 	{
+		_logger = logger;
 		_httpClient = httpClient.CreateClient();
 		_httpClient.BaseAddress = new Uri("https://sepehr.shaparak.ir/Rest/V1/PeymentApi/");
 	}
 
 	public async Task<PaymentGatewayResponse> Create(CreatePaymentGatewayRequest command, CancellationToken cancellationToken = default)
 	{
+		_logger.LogInformation("Create payment started. TransactionId: {TransactionId}, Amount: {Amount}", command.TransactionId, command.Amount);
 		command.ExtraData ??= new Dictionary<string, object>();
+		_logger.LogInformation("Initializing extra data with FinancialInvoiceId: {FinancialInvoiceId}", command.FinancialInvoiceId);
 		command.ExtraData.Add("financialInvoiceId", command.FinancialInvoiceId);
 		var extraData = JsonConvert.SerializeObject(command.ExtraData);
+		_logger.LogInformation("Serialized extra data payload: {Payload}", extraData);
+		
 		var res = await _httpClient.PostAsJsonAsync("GetToken", new
 		{
 			TerminalID = TerminalId,
@@ -32,21 +39,25 @@ public class SepehrPaymentGateway:IPaymentGateway
 			callbackURL = command.CallBackUrl,
 			payload = extraData
 		}, cancellationToken: cancellationToken);
+		_logger.LogInformation("Create payment request sent. StatusCode: {StatusCode}", res.StatusCode);
 		// خواندن محتوای پاسخ
 		var content = await res.Content.ReadAsStringAsync(cancellationToken);
-
+		_logger.LogInformation("Create payment response content: {Content}", content);
+		
 		// تبدیل پاسخ JSON به آبجکت دات‌نت
 		var json = System.Text.Json.JsonDocument.Parse(content);
+		_logger.LogInformation("Create payment JSON parsed successfully.");
 
 		// گرفتن مقدار AccessToken
 		var accessToken = json.RootElement.GetProperty("Accesstoken").ToString();
 		var status = json.RootElement.GetProperty("Status").ToString();
-
+		_logger.LogInformation("Create payment parsed values. Status: {Status}, AccessToken: {AccessToken}", status, accessToken);
+		
 		return new PaymentGatewayResponse
 		{
 			Status = status,
 			IsSuccess = status == "0",
-			Token = accessToken
+			Token = accessToken,
 		};
 	}
 
@@ -55,21 +66,24 @@ public class SepehrPaymentGateway:IPaymentGateway
 
 	public async Task<PaymentGatewayResponse> Verify(VerifyPaymentGateWayRequest command, CancellationToken cancellationToken = default)
 	{
+		_logger.LogInformation("Verify payment started. DigitalReceipt: {DigitalReceipt}", command.DigitalReceipt);
 		var res = await _httpClient.PostAsJsonAsync("Advice", new
 		{
 			digitalreceipt = command.DigitalReceipt,
 			Tid = TerminalId,
 		}, cancellationToken: cancellationToken);
-
+		_logger.LogInformation("Verify payment request sent. StatusCode: {StatusCode}", res.StatusCode);
 		// خواندن محتوای پاسخ
 		var content = await res.Content.ReadAsStringAsync(cancellationToken);
-
+		_logger.LogInformation("Verify payment response content: {Content}", content);
+		
 		// تبدیل پاسخ JSON به آبجکت دات‌نت
 		var json = System.Text.Json.JsonDocument.Parse(content);
-
-
+		_logger.LogInformation("Verify payment JSON parsed successfully.");
+		
 		var message = json.RootElement.GetProperty("Message").GetString();
 		var status = json.RootElement.GetProperty("Status").GetString();
+		_logger.LogInformation("Verify payment parsed values. Status: {Status}, Message: {Message}", status, message);
 		return new PaymentGatewayResponse
 		{
 			Status = status,

AccountManagement.Application/AccountApplication.cs

@@ -18,7 +18,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-
 using Shared.Contracts.PmUser.Commands;
 using Shared.Contracts.PmUser.Queries;
 
@@ -48,7 +47,13 @@ public class AccountApplication : IAccountApplication
     private readonly IPmUserCommandService _pmUserCommandService;
 
     public AccountApplication(IAccountRepository accountRepository, IPasswordHasher passwordHasher,
-        IFileUploader fileUploader, IAuthHelper authHelper, IRoleRepository roleRepository, IWorker worker, ISmsService smsService, ICameraAccountRepository cameraAccountRepository, IPositionRepository positionRepository, IAccountLeftworkRepository accountLeftworkRepository, IWorkshopRepository workshopRepository, ISubAccountRepository subAccountRepository, ISubAccountRoleRepository subAccountRoleRepository, IWorkshopSubAccountRepository workshopSubAccountRepository, ISubAccountPermissionSubtitle1Repository accountPermissionSubtitle1Repository, IUnitOfWork unitOfWork, IPmUserQueryService pmUserQueryService, IPmUserCommandService pmUserCommandService)
+        IFileUploader fileUploader, IAuthHelper authHelper, IRoleRepository roleRepository, IWorker worker,
+        ISmsService smsService, ICameraAccountRepository cameraAccountRepository,
+        IPositionRepository positionRepository, IAccountLeftworkRepository accountLeftworkRepository,
+        IWorkshopRepository workshopRepository, ISubAccountRepository subAccountRepository,
+        ISubAccountRoleRepository subAccountRoleRepository, IWorkshopSubAccountRepository workshopSubAccountRepository,
+        ISubAccountPermissionSubtitle1Repository accountPermissionSubtitle1Repository, IUnitOfWork unitOfWork,
+        IPmUserQueryService pmUserQueryService, IPmUserCommandService pmUserCommandService)
     {
         _authHelper = authHelper;
         _roleRepository = roleRepository;
@@ -68,7 +73,6 @@ public class AccountApplication : IAccountApplication
         _fileUploader = fileUploader;
         _passwordHasher = passwordHasher;
         _accountRepository = accountRepository;
-
     }
 
     public OperationResult EditClient(EditClientAccount command)
@@ -89,7 +93,8 @@ public class AccountApplication : IAccountApplication
                 (x.Mobile == command.Mobile && x.id != command.Id)))
             return opreation.Failed("شماره موبایل تکراری است");
         if (_accountRepository.Exists(x =>
-                (x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(x.NationalCode) && x.id != command.Id)))
+                (x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(x.NationalCode) &&
+                 x.id != command.Id)))
             return opreation.Failed("کد ملی تکراری است");
         if (_accountRepository.Exists(x =>
                 (x.Email == command.Email && !string.IsNullOrWhiteSpace(x.Email) && x.id != command.Id)))
@@ -97,7 +102,8 @@ public class AccountApplication : IAccountApplication
 
         var path = $"profilePhotos";
         var picturePath = _fileUploader.Upload(command.ProfilePhoto, path);
-        editAccount.EditClient(command.Fullname, command.Username, command.Mobile, picturePath, command.Email, command.NationalCode);
+        editAccount.EditClient(command.Fullname, command.Username, command.Mobile, picturePath, command.Email,
+            command.NationalCode);
         _accountRepository.SaveChanges();
         return opreation.Succcedded();
     }
@@ -142,8 +148,8 @@ public class AccountApplication : IAccountApplication
         if (_fileUploader != null)
         {
             picturePath = _fileUploader.Upload(command.ProfilePhoto, path);
-
         }
+
         var account = new Account(command.Fullname, command.Username, password, command.Mobile, command.RoleId,
             picturePath, roleName.Name, "true", "false");
 
@@ -158,7 +164,8 @@ public class AccountApplication : IAccountApplication
             if (command.UserRoles == null)
                 return operation.Failed("حداقل یک نقش برای کاربر مدیریت پروژه لازم است");
             var pmUserRoles = command.UserRoles.Where(x => x > 0).ToList();
-            var createPm = await _pmUserCommandService.Create(new CreatePmUserDto(command.Fullname, command.Username, account.Password, command.Mobile,
+            var createPm = await _pmUserCommandService.Create(new CreatePmUserDto(command.Fullname, command.Username,
+                account.Password, command.Mobile,
                 null, account.id, pmUserRoles));
             if (!createPm.isSuccess)
             {
@@ -167,7 +174,6 @@ public class AccountApplication : IAccountApplication
             }
 
 
-
             //var url = "api/user/create";
             //var key = SecretKeys.ProgramManagerInternalApi;
 
@@ -252,29 +258,30 @@ public class AccountApplication : IAccountApplication
         //    $"api/user/{account.id}",
         //    key
         //);
-        var userResult =await _pmUserQueryService.GetPmUserDataByAccountId(account.id);
+        var userResult = await _pmUserQueryService.GetPmUserDataByAccountId(account.id);
 
         if (command.UserRoles == null)
             return operation.Failed("حداقل یک نقش برای کاربر مدیریت پروژه لازم است");
         var pmUserRoles = command.UserRoles.Where(x => x > 0).ToList();
 
         //اگر کاربر در پروگرام منیجر قبلا ایجاد شده
-        if (userResult.Id >0)
+        if (userResult.Id > 0)
         {
             if (!command.UserRoles.Any())
             {
                 _unitOfWork.RollbackAccountContext();
                 return operation.Failed("حداقل یک نقش باید انتخاب شود");
             }
-           
-            var editPm =await _pmUserCommandService.Edit(new EditPmUserDto(command.Fullname, command.Username, command.Mobile, account.id, pmUserRoles,
+
+            var editPm = await _pmUserCommandService.Edit(new EditPmUserDto(command.Fullname, command.Username,
+                command.Mobile, account.id, pmUserRoles,
                 command.IsProgramManagerUser));
             if (!editPm.isSuccess)
             {
                 _unitOfWork.RollbackAccountContext();
                 return operation.Failed("خطا در ویرایش کاربر پروگرام منیجر");
             }
- 
+
             //var parameters = new EditUserCommand(
             //    command.Fullname,
             //    command.Username,
@@ -302,7 +309,6 @@ public class AccountApplication : IAccountApplication
             //    _unitOfWork.RollbackAccountContext();
             //    return operation.Failed(response.Error);
             //}
-
         }
         else //اگر کاربر قبلا ایجاد نشده
         {
@@ -315,19 +321,15 @@ public class AccountApplication : IAccountApplication
                     return operation.Failed("حداقل یک نقش باید انتخاب شود");
                 }
 
-             
 
-                
-
-               
-                var createPm = await _pmUserCommandService.Create(new CreatePmUserDto(command.Fullname, command.Username, account.Password, command.Mobile,
+                var createPm = await _pmUserCommandService.Create(new CreatePmUserDto(command.Fullname,
+                    command.Username, account.Password, command.Mobile,
                     null, account.id, pmUserRoles));
                 if (!createPm.isSuccess)
                 {
                     _unitOfWork.RollbackAccountContext();
                     return operation.Failed("خطا در ویرایش کاربر پروگرام منیجر");
                 }
-              
 
 
                 //var parameters = new CreateProgramManagerUser(
@@ -362,7 +364,6 @@ public class AccountApplication : IAccountApplication
                 //    return operation.Failed(response.Error);
                 //}
             }
-
         }
 
         _unitOfWork.CommitAccountContext();
@@ -376,7 +377,6 @@ public class AccountApplication : IAccountApplication
 
     public OperationResult Login(Login command)
     {
-
         long idAutoriz = 0;
         var operation = new OperationResult();
         if (string.IsNullOrWhiteSpace(command.Password))
@@ -401,21 +401,27 @@ public class AccountApplication : IAccountApplication
                 .Select(x => x.Code)
                 .ToList();
             //PmPermission
-            var PmUserData = _pmUserQueryService.GetPmUserDataByAccountId(account.id).GetAwaiter().GetResult();
-            if (PmUserData.AccountId > 0 && PmUserData.IsActive)
+            var PmUserData = _pmUserQueryService.GetPmUserDataByAccountId(account.id)
+                .GetAwaiter().GetResult();
+            long? pmUserId = null;
+            if (PmUserData != null)
             {
-                
-                var pmUserPermissions =
-                    PmUserData.RoleListDto != null
-                        ? PmUserData.RoleListDto
-                            .SelectMany(x => x.Permissions)
-                            .Where(p => p != 99)
-                            .Distinct()                    
-                            .ToList()
-                        : new List<int>();
-                permissions.AddRange(pmUserPermissions);
+                if (PmUserData.AccountId > 0 && PmUserData.IsActive)
+                {
+                    var pmUserPermissions =
+                        PmUserData.RoleListDto != null
+                            ? PmUserData.RoleListDto
+                                .SelectMany(x => x.Permissions)
+                                .Where(p => p != 99)
+                                .Distinct()
+                                .ToList()
+                            : new List<int>();
+                    permissions.AddRange(pmUserPermissions);
+                }
+
+                pmUserId = PmUserData.Id > 0 ? PmUserData.Id : null;
             }
-           
+
 
             int? positionValue;
             if (account.PositionId != null)
@@ -426,24 +432,25 @@ public class AccountApplication : IAccountApplication
             {
                 positionValue = null;
             }
-            var pmUserId = PmUserData.AccountId > 0 ? PmUserData.AccountId : null;
+
             var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
                 , account.Username, account.Mobile, account.ProfilePhoto,
-                permissions, account.RoleName, account.AdminAreaPermission, 
-                account.ClientAriaPermission, positionValue,0,pmUserId);
+                permissions, account.RoleName, account.AdminAreaPermission,
+                account.ClientAriaPermission, positionValue, 0, pmUserId);
 
             if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false" &&
                 account.IsActiveString == "true")
             {
                 var clientPermissions = _accountPermissionSubtitle1Repository.GetAllPermissionCodes();
                 authViewModel.Permissions = clientPermissions;
-                var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x => new WorkshopClaim
-                {
-                    PersonnelCount = x.PersonnelCount,
-                    Id = x.Id,
-                    Name = x.WorkshopFullName,
-                    Slug = _passwordHasher.SlugHasher(x.Id)
-                }).OrderByDescending(x => x.PersonnelCount).ToList();
+                var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x =>
+                    new WorkshopClaim
+                    {
+                        PersonnelCount = x.PersonnelCount,
+                        Id = x.Id,
+                        Name = x.WorkshopFullName,
+                        Slug = _passwordHasher.SlugHasher(x.Id)
+                    }).OrderByDescending(x => x.PersonnelCount).ToList();
                 authViewModel.WorkshopList = workshopList;
                 if (workshopList.Any())
                 {
@@ -456,10 +463,14 @@ public class AccountApplication : IAccountApplication
 
             _authHelper.Signin(authViewModel);
 
-            if ((account.AdminAreaPermission == "true" && account.ClientAriaPermission == "true" && account.IsActiveString == "true") || (account.AdminAreaPermission == "true" && account.ClientAriaPermission == "false" && account.IsActiveString == "true"))
+            if ((account.AdminAreaPermission == "true" && account.ClientAriaPermission == "true" &&
+                 account.IsActiveString == "true") || (account.AdminAreaPermission == "true" &&
+                                                       account.ClientAriaPermission == "false" &&
+                                                       account.IsActiveString == "true"))
                 idAutoriz = 1;
 
-            if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false" && account.IsActiveString == "true")
+            if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false" &&
+                account.IsActiveString == "true")
                 idAutoriz = 2;
         }
 
@@ -471,7 +482,8 @@ public class AccountApplication : IAccountApplication
 
             var mobile = string.IsNullOrWhiteSpace(cameraAccount.Mobile) ? " " : cameraAccount.Mobile;
             var authViewModel = new CameraAuthViewModel(cameraAccount.id, cameraAccount.WorkshopId,
-                cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId, cameraAccount.IsActiveSting);
+                cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId,
+                cameraAccount.IsActiveSting);
             if (cameraAccount.IsActiveSting == "true")
             {
                 _authHelper.CameraSignIn(authViewModel);
@@ -481,7 +493,6 @@ public class AccountApplication : IAccountApplication
             {
                 idAutoriz = 0;
             }
-
         }
 
         if (subAccount != null)
@@ -511,12 +522,14 @@ public class AccountApplication : IAccountApplication
                 authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.WorkshopId);
                 authViewModel.WorkshopId = workshop.WorkshopId;
             }
+
             _authHelper.Signin(authViewModel);
             idAutoriz = 2;
         }
 
         return operation.Succcedded(idAutoriz);
     }
+
     public OperationResult LoginWithMobile(long id)
     {
         var operation = new OperationResult();
@@ -525,7 +538,6 @@ public class AccountApplication : IAccountApplication
             return operation.Failed(ApplicationMessages.WrongUserPass);
 
 
-
         var permissions = _roleRepository.Get(account.RoleId)
             .Permissions
             .Select(x => x.Code)
@@ -541,20 +553,22 @@ public class AccountApplication : IAccountApplication
         }
 
         var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
-            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, account.AdminAreaPermission, account.ClientAriaPermission, positionValue);
+            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName,
+            account.AdminAreaPermission, account.ClientAriaPermission, positionValue);
 
         if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false" &&
             account.IsActiveString == "true")
         {
             var clientPermissions = _accountPermissionSubtitle1Repository.GetAllPermissionCodes();
             authViewModel.Permissions = clientPermissions;
-            var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x => new WorkshopClaim
-            {
-                PersonnelCount = x.PersonnelCount,
-                Id = x.Id,
-                Name = x.WorkshopFullName,
-                Slug = _passwordHasher.SlugHasher(x.Id)
-            }).OrderByDescending(x => x.PersonnelCount).ToList();
+            var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x =>
+                new WorkshopClaim
+                {
+                    PersonnelCount = x.PersonnelCount,
+                    Id = x.Id,
+                    Name = x.WorkshopFullName,
+                    Slug = _passwordHasher.SlugHasher(x.Id)
+                }).OrderByDescending(x => x.PersonnelCount).ToList();
             authViewModel.WorkshopList = workshopList;
             if (workshopList.Any())
             {
@@ -567,13 +581,15 @@ public class AccountApplication : IAccountApplication
 
         _authHelper.Signin(authViewModel);
         long idAutoriz = 0;
-        if (account.AdminAreaPermission == "true" && account.ClientAriaPermission == "true" || account.AdminAreaPermission == "true" && account.ClientAriaPermission == "false")
+        if (account.AdminAreaPermission == "true" && account.ClientAriaPermission == "true" ||
+            account.AdminAreaPermission == "true" && account.ClientAriaPermission == "false")
             idAutoriz = 1;
 
         if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false")
             idAutoriz = 2;
         return operation.Succcedded(idAutoriz);
     }
+
     public void Logout()
     {
         _authHelper.SignOut();
@@ -609,6 +625,7 @@ public class AccountApplication : IAccountApplication
         _accountRepository.SaveChanges();
         return operation.Succcedded();
     }
+
     public EditAccount GetByVerifyCode(string code, string phone)
     {
         return _accountRepository.GetByVerifyCode(code, phone);
@@ -637,7 +654,6 @@ public class AccountApplication : IAccountApplication
         await _accountRepository.RemoveCode(id);
 
         return operation.Succcedded();
-
     }
 
 
@@ -682,7 +698,6 @@ public class AccountApplication : IAccountApplication
             return operation.Failed("این اکانت وجود ندارد");
 
 
-
         var permissions = _roleRepository.Get(account.RoleId)
             .Permissions
             .Select(x => x.Code)
@@ -691,7 +706,8 @@ public class AccountApplication : IAccountApplication
 
         _authHelper.SignOut();
         var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
-            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, "false", "true", null);
+            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, "false", "true",
+            null);
         var workshopList = _workshopRepository.GetWorkshopsByClientAccountId(account.id).Select(x => new WorkshopClaim
         {
             PersonnelCount = x.PersonnelCount,
@@ -711,9 +727,11 @@ public class AccountApplication : IAccountApplication
             authViewModel.WorkshopName = workshop.Name;
             authViewModel.WorkshopId = workshop.Id;
         }
+
         _authHelper.Signin(authViewModel);
         return operation.Succcedded(2);
     }
+
     public OperationResult DirectCameraLogin(long cameraAccountId)
     {
         var prAcc = _authHelper.CurrentAccountInfo();
@@ -723,24 +741,22 @@ public class AccountApplication : IAccountApplication
             return operation.Failed("این اکانت وجود ندارد");
 
 
-
-
-
         _authHelper.SignOut();
 
 
         var mobile = string.IsNullOrWhiteSpace(cameraAccount.Mobile) ? " " : cameraAccount.Mobile;
         var authViewModel = new CameraAuthViewModel(cameraAccount.id, cameraAccount.WorkshopId,
-            cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId, cameraAccount.IsActiveSting);
+            cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId,
+            cameraAccount.IsActiveSting);
         if (cameraAccount.IsActiveSting == "true")
         {
             _authHelper.CameraSignIn(authViewModel);
-
         }
         else
         {
             return operation.Failed("این اکانت غیر فعال شده است");
         }
+
         return operation.Succcedded(2);
     }
 
@@ -773,10 +789,12 @@ public class AccountApplication : IAccountApplication
     {
         return this._accountLeftworkRepository.SaveWorkshopAccount(workshopAccountList, startDate, leftDate, accountId);
     }
+
     public OperationResult CreateNewWorkshopAccount(long currentAccountId, long newAccountId)
     {
         return this._accountLeftworkRepository.CopyWorkshopToNewAccount(currentAccountId, newAccountId);
     }
+
     #region Mahan
 
     public List<AccountViewModel> AccountsForAssign(long taskId)
@@ -790,6 +808,7 @@ public class AccountApplication : IAccountApplication
         {
             return new List<AccountViewModel>();
         }
+
         return _accountRepository.GetAccountsByPositionId(positionId);
     }
 
@@ -807,7 +826,6 @@ public class AccountApplication : IAccountApplication
             return operation.Failed("این اکانت وجود ندارد");
 
 
-
         var permissions = _roleRepository.Get(account.RoleId)
             .Permissions
             .Select(x => x.Code)
@@ -816,10 +834,10 @@ public class AccountApplication : IAccountApplication
 
         _authHelper.SignOut();
         var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
-            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, account.AdminAreaPermission, account.ClientAriaPermission, account.Position.PositionValue);
+            , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName,
+            account.AdminAreaPermission, account.ClientAriaPermission, account.Position.PositionValue);
         _authHelper.Signin(authViewModel);
         return operation.Succcedded(2);
-
     }
 
     public async Task<List<AccountSelectListViewModel>> GetAdminSelectList()
@@ -828,8 +846,11 @@ public class AccountApplication : IAccountApplication
     }
 
     #endregion
+
     #region Pooya
-    public OperationResult IsPhoneNumberAndPasswordValid(long accountId, string phoneNumber, string password, string rePassword)
+
+    public OperationResult IsPhoneNumberAndPasswordValid(long accountId, string phoneNumber, string password,
+        string rePassword)
     {
         OperationResult op = new();
 
@@ -847,7 +868,8 @@ public class AccountApplication : IAccountApplication
                 return op.Failed("رمز عبور نمی تواند کمتر از 8 کاراکتر باشد");
         }
 
-        if ((string.IsNullOrWhiteSpace(phoneNumber) || entity.Mobile == phoneNumber) && string.IsNullOrWhiteSpace(rePassword))
+        if ((string.IsNullOrWhiteSpace(phoneNumber) || entity.Mobile == phoneNumber) &&
+            string.IsNullOrWhiteSpace(rePassword))
             return op.Failed("چیزی برای تغییر وجود ندارد");
 
 
@@ -873,20 +895,22 @@ public class AccountApplication : IAccountApplication
         var entity = _accountRepository.Get(command.AccountId);
         if (entity == null)
             return op.Failed(ApplicationMessages.RecordNotFound);
-        var validationResult = IsPhoneNumberAndPasswordValid(command.AccountId, command.PhoneNumber, command.Password, command.RePassword);
+        var validationResult = IsPhoneNumberAndPasswordValid(command.AccountId, command.PhoneNumber, command.Password,
+            command.RePassword);
         if (validationResult.IsSuccedded == false)
             return validationResult;
 
         if (!string.IsNullOrWhiteSpace(command.RePassword))
         {
-
             entity.ChangePassword(_passwordHasher.Hash(command.Password));
         }
 
         if (!string.IsNullOrWhiteSpace(command.PhoneNumber))
         {
-            entity.Edit(entity.Fullname, entity.Username, command.PhoneNumber, entity.RoleId, entity.ProfilePhoto, entity.RoleName);
+            entity.Edit(entity.Fullname, entity.Username, command.PhoneNumber, entity.RoleId, entity.ProfilePhoto,
+                entity.RoleName);
         }
+
         _accountRepository.SaveChanges();
         return op.Succcedded();
     }
@@ -982,6 +1006,7 @@ public class AccountApplication : IAccountApplication
 
     //    return claimsResponse.Failed(ApplicationMessages.WrongUserPass);
     //}
+
     #endregion
 
 
@@ -1024,5 +1049,4 @@ public class AccountApplication : IAccountApplication
     {
         return await _pmUserQueryService.GetPmUserDataByAccountId(accountId);
     }
-    
 }

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Jobs/JobSchedulerRegistrator.cs

@@ -58,17 +58,17 @@ public class JobSchedulerRegistrator
             "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
         );
 
-        RecurringJob.AddOrUpdate(
-            "InstitutionContract.SendWarningSms",
-            () => SendWarningSms(),
-            "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
-        );
+        //RecurringJob.AddOrUpdate(
+        //    "InstitutionContract.SendWarningSms",
+        //    () => SendWarningSms(),
+        //    "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
+        //);
 
-        RecurringJob.AddOrUpdate(
-            "InstitutionContract.SendLegalActionSms",
-            () => SendLegalActionSms(),
-            "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
-        );
+        //RecurringJob.AddOrUpdate(
+        //    "InstitutionContract.SendLegalActionSms",
+        //    () => SendLegalActionSms(),
+        //    "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
+        //);
     }
 
 

Company.Domain/InstitutionContractSendFlagAgg/IInstitutionContractSendFlagRepository.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Company.Domain.InstitutionContractSendFlagAgg;
+
+/// <summary>
+/// Interface برای Repository مربوط به فلگ ارسال قرارداد
+/// </summary>
+public interface IInstitutionContractSendFlagRepository
+{
+    /// <summary>
+    /// ایجاد یک رکورد جدید برای فلگ ارسال قرارداد
+    /// </summary>
+    Task Create(InstitutionContractSendFlag flag);
+
+    /// <summary>
+    /// بازیابی فلگ بر اساس شناسه قرارداد
+    /// </summary>
+    Task<InstitutionContractSendFlag> GetByContractId(long contractId);
+
+    /// <summary>
+    /// به‌روزرسانی فلگ ارسال
+    /// </summary>
+    Task Update(InstitutionContractSendFlag flag);
+
+    /// <summary>
+    /// بررسی اینکه آیا قرارداد ارسال شده است
+    /// </summary>
+    Task<bool> IsContractSent(long contractId);
+    
+
+}
+

Company.Domain/InstitutionContractSendFlagAgg/InstitutionContractSendFlag.cs

@@ -0,0 +1,82 @@
+using System;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+
+namespace Company.Domain.InstitutionContractSendFlagAgg;
+
+/// <summary>
+/// نمایندگی فلگ ارسال قرارداد در MongoDB
+/// این موجودیت برای ردیابی اینکه آیا قرارداد ارسال شده است استفاده می‌شود
+/// </summary>
+public class InstitutionContractSendFlag
+{
+    public InstitutionContractSendFlag(long institutionContractId,bool isSent)
+    {
+        Id = Guid.NewGuid();
+        InstitutionContractId = institutionContractId;
+        IsSent = isSent;
+        CreatedDate = DateTime.Now;
+    }
+
+    /// <summary>
+    /// شناسه یکتای MongoDB
+    /// </summary>
+    [BsonId]
+    [BsonRepresentation(BsonType.String)]
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// شناسه قرارداد در SQL
+    /// </summary>
+    public long InstitutionContractId { get; set; }
+    
+    /// <summary>
+    /// آیا قرارداد ارسال شده است
+    /// </summary>
+    public bool IsSent { get; set; }
+
+    /// <summary>
+    /// تاریخ و زمان ارسال
+    /// </summary>
+    public DateTime? SentDate { get; set; }
+
+    /// <summary>
+    /// تاریخ و زمان ایجاد رکورد
+    /// </summary>
+    public DateTime CreatedDate { get; set; }
+
+    /// <summary>
+    /// تاریخ و زمان آخرین به‌روزرسانی
+    /// </summary>
+    public DateTime? LastModifiedDate { get; set; }
+    
+
+    /// <summary>
+    /// علامت‌گذاری قرارداد به عنوان ارسال‌شده
+    /// </summary>
+    public void MarkAsSent()
+    {
+        IsSent = true;
+        SentDate = DateTime.Now;
+        LastModifiedDate = DateTime.Now;
+    }
+
+    /// <summary>
+    /// بازگردانی علامت ارسال
+    /// </summary>
+    public void MarkAsNotSent()
+    {
+        IsSent = false;
+        SentDate = null;
+        LastModifiedDate = DateTime.Now;
+    }
+
+    /// <summary>
+    /// به‌روزرسانی علامت آخری اصلاح
+    /// </summary>
+    public void UpdateLastModified()
+    {
+        LastModifiedDate = DateTime.Now;
+    }
+}
+

CompanyManagement.Infrastructure.Mongo/InstitutionContractSendFlagRepo/InstitutionContractSendFlagRepository.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Company.Domain.InstitutionContractSendFlagAgg;
+using MongoDB.Driver;
+
+namespace CompanyManagement.Infrastructure.Mongo.InstitutionContractSendFlagRepo;
+
+/// <summary>
+/// Repository برای مدیریت فلگ ارسال قرارداد در MongoDB
+/// </summary>
+public class InstitutionContractSendFlagRepository : IInstitutionContractSendFlagRepository
+{
+    private readonly IMongoCollection<InstitutionContractSendFlag> _collection;
+
+    public InstitutionContractSendFlagRepository(IMongoDatabase database)
+    {
+        _collection = database.GetCollection<InstitutionContractSendFlag>("InstitutionContractSendFlag");
+    }
+    
+    public async Task Create(InstitutionContractSendFlag flag)
+    {
+        await _collection.InsertOneAsync(flag);
+    }
+
+    public async Task<InstitutionContractSendFlag> GetByContractId(long contractId)
+    {
+        var filter = Builders<InstitutionContractSendFlag>.Filter
+            .Eq(x => x.InstitutionContractId, contractId);
+        
+        return await _collection.Find(filter).FirstOrDefaultAsync();
+    }
+    
+
+    public async Task Update(InstitutionContractSendFlag flag)
+    {
+        var filter = Builders<InstitutionContractSendFlag>.Filter
+            .Eq(x => x.InstitutionContractId, flag.InstitutionContractId);
+        
+        await _collection.ReplaceOneAsync(filter, flag);
+    }
+
+    public async Task<bool> IsContractSent(long contractId)
+    {
+        var flag = await GetByContractId(contractId);
+        return flag != null && flag.IsSent;
+    }
+
+    public async Task Remove(long contractId)
+    {
+        var filter = Builders<InstitutionContractSendFlag>.Filter
+            .Eq(x => x.InstitutionContractId, contractId);
+        
+        await _collection.DeleteOneAsync(filter);
+    }
+    
+}
+

CompanyManagment.App.Contracts/AuthorizedBankDetails/IAuthorizedBankDetailsApplication.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using _0_Framework.Application;
 using Company.Application.Contracts.AuthorizedBankDetails;
 
-namespace Company.Application.Contracts.AuthorizedBankDetails
+namespace CompanyManagment.App.Contracts.AuthorizedBankDetails
 {
     public interface IAuthorizedBankDetailsApplication
     {

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListItemsViewModel.cs

@@ -96,6 +96,8 @@ public class GetInstitutionContractListItemsViewModel
     /// مبلغ قسط
     /// </summary>
     public double InstallmentAmount { get; set; }
+
+    public bool InstitutionContractIsSentFlag { get; set; }
 }
 
 public class InstitutionContractListWorkshop

CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

@@ -148,7 +148,7 @@ public interface IInstitutionContractApplication
     /// <param name="id">شناسه قرارداد</param>
     /// <returns>نتیجه عملیات</returns>
     OperationResult UnSign(long id);
-
+    
     /// <summary>
     /// ایجاد حساب کاربری برای طرف قرارداد
     /// </summary>
@@ -305,6 +305,14 @@ public interface IInstitutionContractApplication
     Task<InstitutionContractDiscountResponse> SetDiscountForCreation(InstitutionContractSetDiscountForCreationRequest request);
     Task<InstitutionContractDiscountResponse> ResetDiscountForCreation(InstitutionContractResetDiscountForExtensionRequest request);
     Task<OperationResult> CreationComplete(InstitutionContractExtensionCompleteRequest request);
+
+    /// <summary>
+    /// تعیین فلگ ارسال قرارداد در MongoDB
+    /// اگر فلگ وجود نداشتن‌د ایجاد می‌کند
+    /// </summary>
+    /// <param name="request">درخواست تعیین فلگ</param>
+    /// <returns>نتیجه عملیات</returns>
+    Task<OperationResult> SetContractSendFlag(SetInstitutionContractSendFlagRequest request);
 }
 
 public class CreationSetContractingPartyResponse

CompanyManagment.App.Contracts/InstitutionContract/SetInstitutionContractSendFlagRequest.cs

@@ -0,0 +1,19 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+/// <summary>
+/// درخواست برای تعیین فلگ ارسال قرارداد
+/// </summary>
+public class SetInstitutionContractSendFlagRequest
+{
+    /// <summary>
+    /// شناسه قرارداد
+    /// </summary>
+    public long InstitutionContractId { get; set; }
+
+    /// <summary>
+    /// آیا قرارداد ارسال شده است
+    /// </summary>
+    public bool IsSent { get; set; }
+    
+}
+

CompanyManagment.App.Contracts/InstitutionContract/SmsListData.cs

@@ -109,4 +109,14 @@ public class BlockSmsListData
     /// پابلیک آی دی بخش دو
     /// </summary>
     public string Code2 { get; set; }
+}
+
+
+/// <summary>
+/// لیست قراداد های آبی
+/// جهت ارسال هشدار یا اقدام قضائی
+/// </summary>
+public class BlueWarningSmsData
+{
+
 }

CompanyManagment.Application/AuthorizedBankDetailsApplication.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using _0_Framework.Application;
 using Company.Application.Contracts.AuthorizedBankDetails;
 using Company.Domain.AuthorizedBankDetailsAgg;
+using CompanyManagment.App.Contracts.AuthorizedBankDetails;
 
 namespace CompanyManagment.Application
 {

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -19,6 +19,7 @@ using Company.Domain.PaymentTransactionAgg;
 using Company.Domain.RepresentativeAgg;
 using Company.Domain.RollCallServiceAgg;
 using Company.Domain.WorkshopAgg;
+using Company.Domain.InstitutionContractSendFlagAgg;
 using CompanyManagment.App.Contracts.FinancialInvoice;
 using CompanyManagment.App.Contracts.FinancialStatment;
 using CompanyManagment.App.Contracts.InstitutionContract;
@@ -26,6 +27,7 @@ using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
 using CompanyManagment.App.Contracts.PaymentTransaction;
 using CompanyManagment.App.Contracts.SepehrPaymentGateway;
 using CompanyManagment.App.Contracts.Workshop;
+using Microsoft.Extensions.Logging;
 using PersianTools.Core;
 using ConnectedPersonnelViewModel = CompanyManagment.App.Contracts.Workshop.ConnectedPersonnelViewModel;
 using FinancialStatment = Company.Domain.FinancialStatmentAgg.FinancialStatment;
@@ -50,6 +52,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
     private readonly IPaymentTransactionRepository _paymentTransactionRepository;
     private readonly IRollCallServiceRepository _rollCallServiceRepository;
     private readonly ISepehrPaymentGatewayService _sepehrPaymentGatewayService;
+    private readonly IInstitutionContractSendFlagRepository _institutionContractSendFlagRepository;
 
 
     public InstitutionContractApplication(IInstitutionContractRepository institutionContractRepository,
@@ -61,7 +64,8 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         IAccountApplication accountApplication, ISmsService smsService,
         IFinancialInvoiceRepository financialInvoiceRepository, IHttpClientFactory httpClientFactory,
         IPaymentTransactionRepository paymentTransactionRepository, IRollCallServiceRepository rollCallServiceRepository,
-        ISepehrPaymentGatewayService sepehrPaymentGatewayService)
+        ISepehrPaymentGatewayService sepehrPaymentGatewayService,ILogger<SepehrPaymentGateway> sepehrGatewayLogger,
+        IInstitutionContractSendFlagRepository institutionContractSendFlagRepository)
     {
         _institutionContractRepository = institutionContractRepository;
         _contractingPartyRepository = contractingPartyRepository;
@@ -78,7 +82,8 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         _paymentTransactionRepository = paymentTransactionRepository;
         _rollCallServiceRepository = rollCallServiceRepository;
         _sepehrPaymentGatewayService = sepehrPaymentGatewayService;
-        _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
+        _paymentGateway = new SepehrPaymentGateway(httpClientFactory,sepehrGatewayLogger);
+        _institutionContractSendFlagRepository = institutionContractSendFlagRepository;
     }
 
 	public OperationResult Create(CreateInstitutionContract command)
@@ -893,6 +898,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return opration.Succcedded();
     }
 
+
     public void CreateContractingPartyAccount(long contractingPartyid, long accountId)
     {
         _institutionContractRepository.CreateContractingPartyAccount(contractingPartyid, accountId);
@@ -1284,9 +1290,6 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             financialInvoice = await _financialInvoiceRepository.GetUnPaidByEntityId(firstInstallment.Id, FinancialInvoiceItemType.BuyInstitutionContractInstallment);
             if (financialInvoice == null)
             {
-                var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
-                    "قسط اول سرویس", "debt", "بابت خدمات", firstInstallmentAmount, 0, 0);
-                financialStatement.AddFinancialTransaction(financialTransaction);
                 invoiceAmount = firstInstallmentAmount;
                 invoiceItemDescription = $"پرداخت قسط اول قرارداد شماره {institutionContract.ContractNo}";
                 invoiceItemType = FinancialInvoiceItemType.BuyInstitutionContractInstallment;
@@ -1305,9 +1308,6 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             financialInvoice = await _financialInvoiceRepository.GetUnPaidByEntityId(institutionContract.id, FinancialInvoiceItemType.BuyInstitutionContract);
             if (financialInvoice == null)
             {
-                var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
-                    "پرداخت کل سرویس", "debt", "بابت خدمات", institutionContract.TotalAmount, 0, 0);
-                financialStatement.AddFinancialTransaction(financialTransaction);
                 invoiceAmount = institutionContract.TotalAmount;
                 invoiceItemDescription = $"پرداخت کل قرارداد شماره {institutionContract.ContractNo}";
                 invoiceItemType = FinancialInvoiceItemType.BuyInstitutionContract;
@@ -1825,7 +1825,60 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             installments.Add(lastInstallment);
             return installments;
         }
+
+     
     }
+       /// <summary>
+        /// تعیین فلگ ارسال قرارداد
+        /// اگر فلگ وجود نداشتن‌د ایجاد می‌کند
+        /// </summary>
+        public async Task<OperationResult> SetContractSendFlag(SetInstitutionContractSendFlagRequest request)
+        {
+            var operationResult = new OperationResult();
+
+            try
+            {
+                // بازیابی قرارداد از SQL
+                var contract = _institutionContractRepository.Get(request.InstitutionContractId);
+                if (contract == null)
+                    return operationResult.Failed("قرارداد مورد نظر یافت نشد");
+
+                // بررسی اینکه آیا فلگ در MongoDB وجود دارد
+                var existingFlag = await _institutionContractSendFlagRepository
+                    .GetByContractId(request.InstitutionContractId);
+
+                if (existingFlag != null)
+                {
+                    // اگر فلگ وجود داشتن‌د، آن را اپدیت کنیم
+                    if (request.IsSent)
+                    {
+                        existingFlag.MarkAsSent();
+                    }
+                    else
+                    {
+                        existingFlag.MarkAsNotSent();
+                    }
+                    existingFlag.UpdateLastModified();
+                    await _institutionContractSendFlagRepository.Update(existingFlag);
+                }
+                else
+                {
+                    // اگر فلگ وجود ندارد، آن را ایجاد کنیم
+                    var newFlag = new InstitutionContractSendFlag(
+                        request.InstitutionContractId,
+                        request.IsSent
+                    );
+
+                    await _institutionContractSendFlagRepository.Create(newFlag);
+                }
+
+                return operationResult.Succcedded();
+            }
+            catch (Exception ex)
+            {
+                return operationResult.Failed($"خطا در تعیین فلگ ارسال: {ex.Message}");
+            }
+        }
 }
 
 #region CustomViewModels

CompanyManagment.Application/PaymentCallbackHandler.cs

@@ -18,6 +18,7 @@ using Company.Domain.FinancialStatmentAgg;
 using Company.Domain.FinancialTransactionAgg;
 using Company.Domain.InstitutionContractAgg;
 using CompanyManagment.EFCore.Migrations;
+using Microsoft.Extensions.Logging;
 
 namespace CompanyManagment.Application;
 
@@ -37,7 +38,8 @@ public class PaymentCallbackHandler : IPaymentCallbackHandler
         IFinancialInvoiceApplication financialInvoiceApplication,
         IInstitutionContractApplication institutionContractApplication,
         IHttpClientFactory httpClientFactory, IInstitutionContractRepository institutionContractRepository,
-        IFinancialStatmentRepository financialStatmentRepository)
+        IFinancialStatmentRepository financialStatmentRepository,
+        ILogger<SepehrPaymentGateway> sepehrGatewayLogger)
     {
         _paymentTransactionApplication = paymentTransactionApplication;
         _financialStatmentApplication = financialStatmentApplication;
@@ -45,7 +47,7 @@ public class PaymentCallbackHandler : IPaymentCallbackHandler
         _institutionContractApplication = institutionContractApplication;
         _institutionContractRepository = institutionContractRepository;
         _financialStatmentRepository = financialStatmentRepository;
-        _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
+        _paymentGateway = new SepehrPaymentGateway(httpClientFactory, sepehrGatewayLogger);
     }
 
     /// <summary>

CompanyManagment.Application/SepehrPaymentGatewayService.cs

@@ -7,6 +7,7 @@ using _0_Framework.Application;
 using _0_Framework.Application.PaymentGateway;
 using CompanyManagment.App.Contracts.PaymentTransaction;
 using CompanyManagment.App.Contracts.SepehrPaymentGateway;
+using Microsoft.Extensions.Logging;
 
 namespace CompanyManagment.Application;
 
@@ -20,9 +21,10 @@ public class SepehrPaymentGatewayService : ISepehrPaymentGatewayService
 
     public SepehrPaymentGatewayService(
         IPaymentTransactionApplication paymentTransactionApplication,
-        IHttpClientFactory httpClientFactory)
+        IHttpClientFactory httpClientFactory,
+        ILogger<SepehrPaymentGateway> sepehrGatewayLogger)
     {
-        _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
+        _paymentGateway = new SepehrPaymentGateway(httpClientFactory, sepehrGatewayLogger);
         _paymentTransactionApplication = paymentTransactionApplication;
     }
 

CompanyManagment.Application/WorkshopAppliction.cs

@@ -407,6 +407,10 @@ public class WorkshopAppliction : IWorkshopApplication
     public EditWorkshop GetDetails(long id)
     {
         var workshop = _workshopRepository.GetDetails(id);
+        if (workshop == null)
+        {
+            return null;
+        }
         if (workshop.IsClassified)
         {
             workshop.CreatePlan = _workshopPlanApplication.GetWorkshopPlanByWorkshopId(id);

CompanyManagment.EFCore/Repository/FinancialStatmentRepository.cs

@@ -210,6 +210,7 @@ public class FinancialStatmentRepository : RepositoryBase<long, FinancialStatmen
                 }
                 return new FinancialTransactionDetailViewModel()
                 {
+                    Id = t.id,
                     DateTimeGr = t.TdateGr,
                     DateFa = t.TdateGr.ToFarsi(),
                     TimeFa = $"{t.TdateGr:HH:mm}",

CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs

@@ -11,6 +11,7 @@ using Company.Domain.InstitutionContractAgg;
 using Company.Domain.InstitutionContractAmendmentTempAgg;
 using Company.Domain.InstitutionContractContactInfoAgg;
 using Company.Domain.InstitutionContractExtensionTempAgg;
+using Company.Domain.InstitutionContractSendFlagAgg;
 using Company.Domain.InstitutionPlanAgg;
 using Company.Domain.SmsResultAgg;
 using Company.Domain.WorkshopAgg;
@@ -42,6 +43,7 @@ using AccountManagement.Application.Contracts.Account;
 using Company.Domain.InstitutionContractCreationTempAgg;
 using Company.Domain.RepresentativeAgg;
 using Company.Domain.TemporaryClientRegistrationAgg;
+using Company.Domain.InstitutionContractSendFlagAgg;
 using ContractingPartyAccount = Company.Domain.ContractingPartyAccountAgg.ContractingPartyAccount;
 using FinancialStatment = Company.Domain.FinancialStatmentAgg.FinancialStatment;
 using String = System.String;
@@ -57,6 +59,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     private readonly IMongoCollection<InstitutionContractExtensionTemp> _institutionExtensionTemp;
     private readonly IMongoCollection<InstitutionContractAmendmentTemp> _institutionAmendmentTemp;
     private readonly IMongoCollection<InstitutionContractCreationTemp> _institutionContractCreationTemp;
+    private readonly IMongoCollection<InstitutionContractSendFlag> _institutionContractSendFlag;
     private readonly IPlanPercentageRepository _planPercentageRepository;
     private readonly ISmsService _smsService;
     private readonly ISmsResultRepository _smsResultRepository;
@@ -114,6 +117,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             database.GetCollection<InstitutionContractAmendmentTemp>("InstitutionContractAmendmentTemp");
         _institutionContractCreationTemp =
             database.GetCollection<InstitutionContractCreationTemp>("InstitutionContractCreationTemp");
+        _institutionContractSendFlag =
+            database.GetCollection<InstitutionContractSendFlag>("InstitutionContractSendFlag");
     }
 
     public EditInstitutionContract GetDetails(long id)
@@ -1353,6 +1358,12 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             .Where(x => contractIds.Contains(x.InstitutionContractId))
             .ToDictionaryAsync(x => x.InstitutionContractId, x => x);
 
+        // بارگذاری وضعیت ارسال قراردادها از MongoDB - کوئری مستقیم
+        var filter = Builders<InstitutionContractSendFlag>.Filter
+            .In(x => x.InstitutionContractId, contractIds);
+        var sendFlagsList = await _institutionContractSendFlag.Find(filter).ToListAsync();
+        var sendFlags = sendFlagsList.ToDictionary(x => x.InstitutionContractId, x => x.IsSent);
+
         var financialStatements = _context.FinancialStatments.Include(x => x.FinancialTransactionList)
             .Where(x => contractingPartyIds.Contains(x.ContractingPartyId)).ToList();
         var res = new PagedResult<GetInstitutionContractListItemsViewModel>()
@@ -1462,7 +1473,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     Workshops = workshopDetails,
                     IsInPersonContract = workshopGroup?.CurrentWorkshops
                         .Any(y => y.Services.ContractInPerson) ?? true,
-                    IsOldContract = x.contract.SigningType == InstitutionContractSigningType.Legacy
+                    IsOldContract = x.contract.SigningType == InstitutionContractSigningType.Legacy,
+                    InstitutionContractIsSentFlag = sendFlags.ContainsKey(x.contract.id) ? sendFlags[x.contract.id] : false
                 };
             }).ToList()
         };
@@ -2002,7 +2014,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 DiscountedAmount = discountAmount.ToMoney(),
                 DiscountPercetage = request.DiscountPercentage,
                 Installments = InstitutionMonthlyInstallmentCaculation((int)request.Duration,
-                    totalAmount, DateTime.Now.ToFarsi()),
+                    paymentAmount, DateTime.Now.ToFarsi()),
                 OneMonthAmount = discountedOneMonthAmount.ToMoney(),
                 Obligation = totalAmount.ToMoney()
             };
@@ -3351,7 +3363,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 VerifyCode = institution.VerifyCode,
                 VerifyDate = institution.VerifyCodeCreation.ToFarsi(),
                 VerifyTime = institution.VerifyCodeCreation.ToString("HH:mm:ss"),
-                Workshops = institution.WorkshopGroup.CurrentWorkshops
+                Workshops = institution.WorkshopGroup.InitialWorkshops
                     .Select(x => new GetInstitutionVerificationDetailsWorkshopsViewModel()
                     {
                         Name = x.WorkshopName,
@@ -3561,7 +3573,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     public async Task<bool> SendReminderSmsForBackgroundTask()
     {
         var now = DateTime.Now;
-        _logger.LogInformation("================>> SendReminderSmsForBackgroundTask job run");
+
 
         // تبدیل تاریخ میلادی به شمسی
         var persianNow = now.ToFarsi();
@@ -6333,6 +6345,276 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         }
     }
 
+    /// <summary>
+    ///دریافت لیست پیامک قراداد های آبی بدهکار 
+    /// </summary>
+    /// <returns></returns>
+    //public async Task<List<SmsListData>> GetWarningSmsListData()
+    //{
+
+    //    var institutionContracts = await _context.InstitutionContractSet.AsQueryable().Select(x => new InstitutionContractViewModel
+    //    {
+    //        Id = x.id,
+    //        ContractingPartyId = x.ContractingPartyId,
+    //        ContractingPartyName = x.ContractingPartyName,
+    //        ContractStartGr = x.ContractStartGr,
+    //        ContractStartFa = x.ContractStartFa,
+    //        ContractEndGr = x.ContractEndGr,
+    //        ContractEndFa = x.ContractEndFa,
+    //        IsActiveString = x.IsActiveString,
+    //        ContractAmountDouble = x.ContractAmount,
+    //        OfficialCompany = x.OfficialCompany,
+    //        IsInstallment = x.IsInstallment,
+    //        VerificationStatus = x.VerificationStatus,
+    //        SigningType = x.SigningType,
+    //    }).Where(x => x.IsActiveString == "blue" &&
+    //                       x.ContractAmountDouble > 0).GroupBy(x => x.ContractingPartyId).Select(x => x.First()).ToListAsync();
+
+    //    var institutionContractsIds = institutionContracts.Select(x => x.id).ToList();
+
+    //    // قرارداد هایی که بطور یکجا پرداخت شده اند
+    //    var paidInFull = institutionContracts.Where(x =>
+    //        x.SigningType != InstitutionContractSigningType.Legacy && x.IsInstallment == false && x.SigningType != null).ToList();
+
+    //    //حذف قراداد هایی که یکجا پرداخت شده اند از لیست ایجاد سند ماهانه
+    //    institutionContracts = institutionContracts.Except(paidInFull).ToList();
+
+    //    var contractingPartyList = await _context.PersonalContractingParties
+    //        .Where(x => institutionContracts.Select(ins => ins.ContractingPartyId).Contains(x.id)).ToListAsync();
+
+    //    var financialStatmentList = await _context.FinancialStatments.AsSplitQuery()
+    //        .Where(x => institutionContracts.Select(ins => ins.ContractingPartyId).Contains(x.ContractingPartyId))
+    //        .Include(x => x.FinancialTransactionList).Where(x => x.FinancialTransactionList.Count > 0).ToListAsync();
+
+    //    var phoneNumberList = await _context.InstitutionContractContactInfos
+    //        .Where(x => institutionContracts.Select(ins => ins.Id).Contains(x.InstitutionContractId))
+    //        .Where(x => x.SendSms && x.PhoneType == "شماره همراه" && !string.IsNullOrWhiteSpace(x.PhoneNumber) &&
+    //                    x.PhoneNumber.Length == 11).ToListAsync();
+    //    var legalActionSentSms = await _context.SmsResults
+    //        .Where(x => x.TypeOfSms == "اقدام قضایی").ToListAsync();
+    //    var warningSentSms = await _context.SmsResults.Where(x => x.TypeOfSms.Contains("هشدار")).ToListAsync();
+
+    //    var oldInstitutionContract = institutionContracts.Where(x => x.IsInstallment == false).ToList();
+    //    var electronicInstitutionContract = institutionContracts.Where(x => x.IsInstallment == true).ToList();
+
+    //    foreach (var item in oldInstitutionContract)
+    //    {
+    //        try
+    //        {
+    //            var contractingParty = GetDetails(item.ContractingPartyId);
+    //            bool hasLegalActionSentSms = legalActionSentSms.Any(x => x.InstitutionContractId == item.Id);
+    //            int year = Convert.ToInt32(item.ContractEndFa.Substring(0, 4));
+    //            int month = Convert.ToInt32(item.ContractEndFa.Substring(5, 2));
+    //            var endOfContractNextMonthStart = new PersianDateTime(year, month, 1).AddMonths(1);
+    //            var endOfContractNextMonthEnd = (($"{endOfContractNextMonthStart}").FindeEndOfMonth()).ToGeorgianDateTime();
+    //            var now = DateTime.Now
+
+    //            if (!string.IsNullOrWhiteSpace(contractingParty.LName) && !hasLegalActionSentSms && now.Date <= endOfContractNextMonthEnd.Date)
+    //            {
+    //                //Thread.Sleep(500);
+    //                var partyName = contractingParty.LName;
+
+    //                if (partyName.Length > 25) partyName = $"{partyName.Substring(0, 25)}";
+
+    //                var isLegal = contractingParty.IsLegal == "حقوقی" ? true : false;
+    //                var isBlock = contractingParty.IsBlock == "true" ? true : false;
+    //                var isActive = contractingParty.IsActiveString == "true" ? true : false;
+    //                if (!string.IsNullOrWhiteSpace(contractingParty.IsActiveString))
+    //                {
+    //                    var hasFinancialStatement =
+    //                        financialStatmentList.Any(x => x.ContractingPartyId == item.ContractingPartyId);
+
+    //                    var hasPhonNumber = phoneNumberList.Any(x => x.InstitutionContractId == item.Id);
+
+    //                    if (hasFinancialStatement && hasPhonNumber)
+    //                    {
+    //                        var phoneNumbers = phoneNumberList.Where(x => x.InstitutionContractId == item.Id)
+    //                            .Select(x => new CreateContactInfo
+    //                            {
+    //                                PhoneType = x.PhoneType,
+    //                                PhoneNumber = x.PhoneNumber,
+
+    //                                InstitutionContractId = x.InstitutionContractId,
+    //                                SendSms = x.SendSms
+    //                            }).Where(x => x.PhoneNumber.Length == 11).ToList();
+
+    //                        var transactions = financialStatmentList.FirstOrDefault(x =>
+    //                            x.ContractingPartyId == item.ContractingPartyId);
+
+
+    //                        var debtor = transactions.FinancialTransactionViewModels.Sum(x => x.Deptor);
+    //                        var creditor = transactions.FinancialTransactionViewModels.Sum(x => x.Creditor);
+
+
+    //                        var id = $"{item.ContractingPartyId}";
+    //                        var aprove = $"{transactions.Id}";
+    //                        var balance = debtor - creditor;
+
+    //                        if (balance > 0) // اگر بدهکار بود
+    //                        {
+
+    //                            if (isLegal)
+    //                            {
+    //                                if (item.OfficialCompany == "Official") // حقوقی بدهکار رسمی
+    //                                {
+    //                                    var balanceToMoney = balance.ToMoney();
+
+    //                                    foreach (var number in phoneNumbers)
+    //                                    {
+
+    //                                        var isLastAlarmSend = _context.SmsResults.Any(x => (
+    //                                            x.ContractingPatyId == contractingParty.Id &&
+    //                                            x.Mobile == number.PhoneNumber) && (x.TypeOfSms == "اقدام قضایی" || x.TypeOfSms == "هشدار دوم"));
+    //                                        var t = warningSentSms.Any(x=> x.)
+    //                                        if (!string.IsNullOrWhiteSpace(number.PhoneNumber) &&
+    //                                            number.PhoneNumber.Length == 11 && !isSend && !isLastAlarmSend)
+    //                                        {
+
+    //                                            var smsResult = _smsService.MonthlyBill(number.PhoneNumber, 608443,
+    //                                                partyName,
+    //                                                balanceToMoney, id, aprove);
+    //                                            Thread.Sleep(1000);
+    //                                            if (smsResult.IsSuccedded)
+    //                                            {
+    //                                                var createSmsResult = new SmsResult(smsResult.MessageId,
+    //                                                    smsResult.Message, typeOfSms, partyName, number.PhoneNumber,
+    //                                                    item.ContractingPartyId, item.Id);
+    //                                                _smsResultRepository.Create(createSmsResult);
+    //                                                _smsResultRepository.SaveChanges();
+    //                                                Thread.Sleep(1000);
+    //                                            }
+
+    //                                        }
+    //                                    }
+
+
+
+    //                                }
+    //                                else if (item.OfficialCompany == "NotOfficial") // حقوقی بدهکار غیر رسمی
+    //                                {
+    //                                    var balanceToMoney = balance.ToMoney();
+    //                                    foreach (var number in phoneNumbers)
+    //                                    {
+    //                                        var isSend = _context.SmsResults.Any(x =>
+    //                                            x.ContractingPatyId == contractingParty.Id &&
+    //                                            x.Mobile == number.PhoneNumber && x.TypeOfSms == typeOfSms);
+    //                                        var isLastAlarmSend = _context.SmsResults.Any(x => (
+    //                                            x.ContractingPatyId == contractingParty.Id &&
+    //                                            x.Mobile == number.PhoneNumber) && (x.TypeOfSms == "اقدام قضایی" || x.TypeOfSms == "هشدار دوم"));
+    //                                        if (!string.IsNullOrWhiteSpace(number.PhoneNumber) &&
+    //                                            number.PhoneNumber.Length == 11 && !isSend && !isLastAlarmSend)
+    //                                        {
+
+    //                                            var smsResult = _smsService.MonthlyBill(number.PhoneNumber, 351691,
+    //                                                partyName,
+    //                                                balanceToMoney, id, aprove);
+    //                                            Thread.Sleep(1000);
+    //                                            if (smsResult.IsSuccedded)
+    //                                            {
+    //                                                var createSmsResult = new SmsResult(smsResult.MessageId,
+    //                                                    smsResult.Message, typeOfSms, partyName, number.PhoneNumber,
+    //                                                    item.ContractingPartyId, item.Id);
+    //                                                _smsResultRepository.Create(createSmsResult);
+    //                                                _smsResultRepository.SaveChanges();
+    //                                                Thread.Sleep(1000);
+    //                                            }
+
+
+
+    //                                        }
+    //                                    }
+
+
+    //                                }
+    //                            }
+    //                            else
+    //                            {
+    //                                if (item.OfficialCompany == "Official") // حقیقی بدهکار رسمی
+    //                                {
+    //                                    var balanceToMoney = balance.ToMoney();
+
+    //                                    foreach (var number in phoneNumbers)
+    //                                    {
+    //                                        var isSend = _context.SmsResults.Any(x =>
+    //                                            x.ContractingPatyId == contractingParty.Id &&
+    //                                            x.Mobile == number.PhoneNumber && x.TypeOfSms == typeOfSms);
+    //                                        var isLastAlarmSend = _context.SmsResults.Any(x => (
+    //                                            x.ContractingPatyId == contractingParty.Id &&
+    //                                            x.Mobile == number.PhoneNumber) && (x.TypeOfSms == "اقدام قضایی" || x.TypeOfSms == "هشدار دوم"));
+    //                                        if (!string.IsNullOrWhiteSpace(number.PhoneNumber) &&
+    //                                            number.PhoneNumber.Length == 11 && !isSend && !isLastAlarmSend)
+    //                                        {
+
+    //                                            var smsResult = _smsService.MonthlyBill(number.PhoneNumber, 190430,
+    //                                                partyName,
+    //                                                balanceToMoney, id, aprove);
+    //                                            Thread.Sleep(1000);
+    //                                            if (smsResult.IsSuccedded)
+    //                                            {
+    //                                                var createSmsResult = new SmsResult(smsResult.MessageId,
+    //                                                    smsResult.Message, typeOfSms, partyName, number.PhoneNumber,
+    //                                                    item.ContractingPartyId, item.Id);
+    //                                                _smsResultRepository.Create(createSmsResult);
+    //                                                _smsResultRepository.SaveChanges();
+    //                                                Thread.Sleep(1000);
+    //                                            }
+    //                                        }
+    //                                    }
+
+
+    //                                }
+    //                                else if (item.OfficialCompany == "NotOfficial") // حقیقی بدهکار غیر رسمی
+    //                                {
+    //                                    var balanceToMoney = balance.ToMoney();
+
+    //                                    foreach (var number in phoneNumbers)
+    //                                    {
+    //                                        var isSend = _context.SmsResults.Any(x =>
+    //                                            x.ContractingPatyId == contractingParty.Id &&
+    //                                            x.Mobile == number.PhoneNumber && x.TypeOfSms == typeOfSms);
+    //                                        var isLastAlarmSend = _context.SmsResults.Any(x => (
+    //                                            x.ContractingPatyId == contractingParty.Id &&
+    //                                            x.Mobile == number.PhoneNumber) && (x.TypeOfSms == "اقدام قضایی" || x.TypeOfSms == "هشدار دوم"));
+    //                                        if (!string.IsNullOrWhiteSpace(number.PhoneNumber) &&
+    //                                            number.PhoneNumber.Length == 11 && !isSend && !isLastAlarmSend)
+    //                                        {
+    //                                            var smsResult = _smsService.MonthlyBill(number.PhoneNumber, 412829,
+    //                                                partyName,
+    //                                                balanceToMoney, id, aprove);
+    //                                            Thread.Sleep(1000);
+    //                                            if (smsResult.IsSuccedded)
+    //                                            {
+    //                                                var createSmsResult = new SmsResult(smsResult.MessageId,
+    //                                                    smsResult.Message, typeOfSms, partyName, number.PhoneNumber,
+    //                                                    item.ContractingPartyId, item.Id);
+    //                                                _smsResultRepository.Create(createSmsResult);
+    //                                                _smsResultRepository.SaveChanges();
+    //                                                Thread.Sleep(1000);
+    //                                            }
+
+
+    //                                        }
+    //                                    }
+
+
+    //                                }
+    //                            }
+    //                        }
+    //                    }
+    //                }
+    //            }
+    //        }
+    //        catch (Exception e)
+    //        {
+
+
+    //            string name = item.ContractingPartyName.Length > 18 ? item.ContractingPartyName.Substring(0, 18) : item.ContractingPartyName;
+    //            string errMess = $"{name}-خطا";
+    //            _smsService.Alarm("09114221321", errMess);
+    //            _logger.LogError(e, "BlueWarningSms");
+    //        }
+    //    }
+    //}
     #endregion
 
 

CompanyManagment.EFCore/Services/UidService.cs

@@ -10,6 +10,7 @@ using CompanyManagment.App.Contracts.AuthorizedPerson;
 using _0_Framework.Application;
 using _0_Framework.Application.UID;
 using Company.Application.Contracts.AuthorizedBankDetails;
+using CompanyManagment.App.Contracts.AuthorizedBankDetails;
 
 namespace CompanyManagment.EFCore.Services;
 

PersonalContractingParty.Config/PersonalBootstrapper.cs

@@ -61,6 +61,7 @@ using Company.Domain.HolidayItemAgg;
 using Company.Domain.InstitutionContractAgg;
 using Company.Domain.InstitutionContractContactInfoAgg;
 using Company.Domain.InstitutionContractExtensionTempAgg;
+using Company.Domain.InstitutionContractSendFlagAgg;
 using Company.Domain.InstitutionPlanAgg;
 using Company.Domain.InsuranceAgg;
 using Company.Domain.InsuranceEmployeeInfoAgg;
@@ -123,6 +124,7 @@ using Company.Domain.ZoneAgg;
 using CompanyManagement.Infrastructure.Excel.SalaryAid;
 using CompanyManagement.Infrastructure.Mongo.EmployeeFaceEmbeddingRepo;
 using CompanyManagement.Infrastructure.Mongo.InstitutionContractInsertTempRepo;
+using CompanyManagement.Infrastructure.Mongo.InstitutionContractSendFlagRepo;
 using CompanyManagment.App.Contracts.AdminMonthlyOverview;
 using CompanyManagment.App.Contracts.AndroidApkVersion;
 using CompanyManagment.App.Contracts.AuthorizedPerson;
@@ -236,6 +238,7 @@ using P_TextManager.Domin.TextManagerAgg;
 using CompanyManagment.App.Contracts.PaymentCallback;
 using CompanyManagment.App.Contracts.SepehrPaymentGateway;
 using Company.Domain.CameraBugReportAgg;
+using CompanyManagment.App.Contracts.AuthorizedBankDetails;
 using CompanyManagment.App.Contracts.CameraBugReport;
 using CameraBugReportRepository = CompanyManagement.Infrastructure.Mongo.CameraBugReportRepo.CameraBugReportRepository;
 using CompanyManagment.EFCore.Services;
@@ -657,6 +660,9 @@ public class PersonalBootstrapper
         services.AddTransient<ICameraBugReportApplication, CameraBugReportApplication>();
         services.AddTransient<ICameraBugReportRepository, CameraBugReportRepository>(); // MongoDB Implementation
 
+        // InstitutionContractSendFlag - MongoDB
+        services.AddTransient<IInstitutionContractSendFlagRepository, InstitutionContractSendFlagRepository>();
+
         services.AddDbContext<CompanyContext>(x => x.UseSqlServer(connectionString));
     }
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/ApproveTaskSectionCompletion/ApproveTaskSectionCompletionCommand.cs

@@ -0,0 +1,57 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain._Common.Exceptions;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.ApproveTaskSectionCompletion;
+
+public record ApproveTaskSectionCompletionCommand(Guid TaskSectionId, bool IsApproved) : IBaseCommand;
+
+public class ApproveTaskSectionCompletionCommandHandler : IBaseCommandHandler<ApproveTaskSectionCompletionCommand>
+{
+    private readonly ITaskSectionRepository _taskSectionRepository;
+    private readonly IUnitOfWork _unitOfWork;
+    private readonly IAuthHelper _authHelper;
+
+    public ApproveTaskSectionCompletionCommandHandler(
+        ITaskSectionRepository taskSectionRepository,
+        IUnitOfWork unitOfWork,
+        IAuthHelper authHelper)
+    {
+        _taskSectionRepository = taskSectionRepository;
+        _unitOfWork = unitOfWork;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult> Handle(ApproveTaskSectionCompletionCommand request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId()
+            ?? throw new UnAuthorizedException("˜ÇÑÈÑ ÇÍÑÇÒ åæ?Ê äÔÏå ÇÓÊ");
+
+        var section = await _taskSectionRepository.GetByIdAsync(request.TaskSectionId, cancellationToken);
+        if (section == null)
+        {
+            return OperationResult.NotFound("ÈÎÔ ãæÑÏ äÙÑ ?ÇÝÊ äÔÏ");
+        }
+
+        if (section.Status != TaskSectionStatus.PendingForCompletion)
+        {
+            return OperationResult.Failure("ÝÞØ ÈÎÔ<C38E>åÇ?? ˜å ÏÑ ÇäÊÙÇÑ Ê˜ã?á åÓÊäÏ ÞÇÈá ÊÇ??Ï ?Ç ÑÏ åÓÊäÏ");
+        }
+
+        if (request.IsApproved)
+        {
+            section.UpdateStatus(TaskSectionStatus.Completed);
+        }
+        else
+        {
+            section.UpdateStatus(TaskSectionStatus.Incomplete);
+        }
+
+        await _unitOfWork.SaveChangesAsync(cancellationToken);
+
+        return OperationResult.Success();
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/ApproveTaskSectionCompletion/ApproveTaskSectionCompletionCommandValidator.cs

@@ -0,0 +1,14 @@
+using FluentValidation;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.ApproveTaskSectionCompletion;
+
+public class ApproveTaskSectionCompletionCommandValidator : AbstractValidator<ApproveTaskSectionCompletionCommand>
+{
+    public ApproveTaskSectionCompletionCommandValidator()
+    {
+        RuleFor(c => c.TaskSectionId)
+            .NotEmpty()
+            .NotNull()
+            .WithMessage("ÔäÇÓå ÈÎÔ äã?<3F>ÊæÇäÏ ÎÇá? ÈÇÔÏ");
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/ChangeStatusSection/ChangeStatusSectionCommandHandler.cs

@@ -52,7 +52,10 @@ public class ChangeStatusSectionCommandHandler : IBaseCommandHandler<ChangeStatu
 			// Going TO InProgress: Check if section has remaining time, then start work
 			if (!section.HasRemainingTime())
 				return OperationResult.ValidationError("زمان این بخش به پایان رسیده است");
-
+            if (await _taskSectionRepository.HasUserAnyInProgressSectionAsync(section.CurrentAssignedUserId, cancellationToken))
+            {
+                return OperationResult.ValidationError("کاربر مورد نظر در حال حاضر بخش دیگری را در وضعیت 'درحال انجام' دارد");
+            }
 			section.StartWork();
         }
         else
@@ -86,9 +89,9 @@ public class ChangeStatusSectionCommandHandler : IBaseCommandHandler<ChangeStatu
         var validTransitions = new Dictionary<TaskSectionStatus, List<TaskSectionStatus>>
         {
             { TaskSectionStatus.ReadyToStart, [TaskSectionStatus.InProgress] },
-            { TaskSectionStatus.InProgress, [TaskSectionStatus.Incomplete, TaskSectionStatus.Completed] },
-            { TaskSectionStatus.Incomplete, [TaskSectionStatus.InProgress, TaskSectionStatus.Completed] },
-            { TaskSectionStatus.Completed, [TaskSectionStatus.InProgress, TaskSectionStatus.Incomplete] }, // Can return to InProgress or Incomplete
+            { TaskSectionStatus.InProgress, [TaskSectionStatus.Incomplete, TaskSectionStatus.PendingForCompletion] },
+            { TaskSectionStatus.Incomplete, [TaskSectionStatus.InProgress, TaskSectionStatus.PendingForCompletion] },
+            { TaskSectionStatus.PendingForCompletion, [TaskSectionStatus.InProgress, TaskSectionStatus.Incomplete] }, // Can return to InProgress or Incomplete
             { TaskSectionStatus.NotAssigned, [TaskSectionStatus.InProgress, TaskSectionStatus.ReadyToStart] }
         };
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/SetTimeProject/SetTimeProjectCommand.cs

@@ -4,10 +4,15 @@ using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.SetTimeProject;
 
-public record SetTimeProjectCommand(List<SetTimeProjectSectionItem> SectionItems, Guid Id, ProjectHierarchyLevel Level):IBaseCommand;
+public record SetTimeProjectCommand(
+    List<SetTimeProjectSkillItem> SkillItems,
+    Guid Id,
+    ProjectHierarchyLevel Level,
+    bool CascadeToChildren) : IBaseCommand;
 
 public class SetTimeSectionTime
 {
     public string Description { get; set; }
     public int Hours { get; set; }
+    public int Minutes { get; set; }
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/SetTimeProject/SetTimeProjectCommandHandler.cs

@@ -6,6 +6,8 @@ using GozareshgirProgramManager.Domain._Common.Exceptions;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+using GozareshgirProgramManager.Domain.SkillAgg.Repositories;
+using GozareshgirProgramManager.Domain.UserAgg.Repositories;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.SetTimeProject;
 
@@ -15,21 +17,33 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
     private readonly IProjectPhaseRepository _projectPhaseRepository;
     private readonly IProjectTaskRepository _projectTaskRepository;
     private readonly IUnitOfWork _unitOfWork;
-    private readonly IAuthHelper _authHelper;
+    private readonly IUserRepository _userRepository;
+    private readonly ISkillRepository _skillRepository;
+    private readonly IPhaseSectionRepository _phaseSectionRepository;
+    private readonly IProjectSectionRepository _projectSectionRepository;
     private long? _userId;
+    private readonly ITaskSectionRepository _taskSectionRepository;
 
 
     public SetTimeProjectCommandHandler(
         IProjectRepository projectRepository,
         IProjectPhaseRepository projectPhaseRepository,
         IProjectTaskRepository projectTaskRepository,
-        IUnitOfWork unitOfWork, IAuthHelper authHelper)
+        IUnitOfWork unitOfWork, IAuthHelper authHelper, 
+        IUserRepository userRepository, ISkillRepository skillRepository,
+        IPhaseSectionRepository phaseSectionRepository,
+        IProjectSectionRepository projectSectionRepository, 
+        ITaskSectionRepository taskSectionRepository)
     {
         _projectRepository = projectRepository;
         _projectPhaseRepository = projectPhaseRepository;
         _projectTaskRepository = projectTaskRepository;
         _unitOfWork = unitOfWork;
-        _authHelper = authHelper;
+        _userRepository = userRepository;
+        _skillRepository = skillRepository;
+        _phaseSectionRepository = phaseSectionRepository;
+        _projectSectionRepository = projectSectionRepository;
+        _taskSectionRepository = taskSectionRepository;
         _userId = authHelper.GetCurrentUserId();
     }
 
@@ -37,6 +51,10 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
     {
         switch (request.Level)
         {
+            case ProjectHierarchyLevel.Project:
+                return await AssignProject(request);
+            case ProjectHierarchyLevel.Phase:
+                return await AssignProjectPhase(request);
             case ProjectHierarchyLevel.Task:
                 return await SetTimeForProjectTask(request, cancellationToken);
             default:
@@ -44,67 +62,229 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
         }
     }
 
-    private async Task<OperationResult> SetTimeForProject(SetTimeProjectCommand request,
-        CancellationToken cancellationToken)
+    private async Task<OperationResult> AssignProject(SetTimeProjectCommand request)
     {
         var project = await _projectRepository.GetWithFullHierarchyAsync(request.Id);
-        if (project == null)
+        if (project is null)
         {
             return OperationResult.NotFound("پروژه یافت نشد");
-            return OperationResult.NotFound("<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD>");
         }
 
-        long? addedByUserId = _userId;
+        var skillItems = request.SkillItems.Where(x=>x.UserId is > 0).ToList();
+        
+        // حذف ProjectSections که در validSkills نیستند
+        var validSkillIds = skillItems.Select(x => x.SkillId).ToList();
+        var sectionsToRemove = project.ProjectSections
+            .Where(s => !validSkillIds.Contains(s.SkillId))
+            .ToList();
+        
+        foreach (var section in sectionsToRemove)
+        {
+            project.RemoveProjectSection(section.SkillId);
+        }
+        
+        // تخصیص در سطح پروژه
+        foreach (var item in skillItems)
+        {
+            var skill = await _skillRepository.GetByIdAsync(item.SkillId);
+            if (skill is null)
+            {
+                return OperationResult.NotFound($"مهارت با شناسه {item.SkillId} یافت نشد");
+            }
 
-        // تنظیم زمان برای تمام sections در تمام فازها و تسک‌های پروژه
+            // بررسی و به‌روزرسانی یا اضافه کردن ProjectSection
+            var existingSection = project.ProjectSections.FirstOrDefault(s => s.SkillId == item.SkillId);
+            if (existingSection != null)
+            {
+                // اگر وجود داشت، فقط userId را به‌روزرسانی کن
+                existingSection.UpdateUser(item.UserId.Value);
+            }
+            else
+            {
+                // اگر وجود نداشت، اضافه کن
+                var newSection = new ProjectSection(project.Id, item.UserId.Value, item.SkillId);
+                await _projectSectionRepository.CreateAsync(newSection);
+            }
+        }
+
+        // حالا برای تمام فازها و تسک‌ها cascade کن
         foreach (var phase in project.Phases)
         {
-            foreach (var task in phase.Tasks)
+            // اگر CascadeToChildren true است یا فاز override ندارد
+            if (request.CascadeToChildren || !phase.HasAssignmentOverride)
             {
-                foreach (var section in task.Sections)
+                // حذف PhaseSections که در validSkills نیستند
+                var phaseSectionsToRemove = phase.PhaseSections
+                    .Where(s => !validSkillIds.Contains(s.SkillId))
+                    .ToList();
+                
+                foreach (var section in phaseSectionsToRemove)
                 {
-                    var sectionItem = request.SectionItems.FirstOrDefault(si => si.SectionId == section.Id);
-                    if (sectionItem != null)
+                    phase.RemovePhaseSection(section.SkillId);
+                }
+                
+                // برای phase هم باید section‌ها را به‌روزرسانی کنیم
+                foreach (var item in skillItems )
+                {
+                    var existingSection = phase.PhaseSections.FirstOrDefault(s => s.SkillId == item.SkillId);
+                    if (existingSection != null)
                     {
-                        SetSectionTime(section, sectionItem, addedByUserId);
+                        existingSection.Update(item.UserId.Value, item.SkillId);
+                    }
+                    else
+                    {
+                        var newPhaseSection = new PhaseSection(phase.Id, item.UserId.Value, item.SkillId);
+                        await _phaseSectionRepository.CreateAsync(newPhaseSection);
+                    }
+                }
+                
+                foreach (var task in phase.Tasks)
+                {
+                    // اگر CascadeToChildren true است یا تسک override ندارد
+                    if (request.CascadeToChildren || !task.HasAssignmentOverride)
+                    {
+                        // حذف TaskSections که در validSkills نیستند
+                        var taskSectionsToRemove = task.Sections
+                            .Where(s => !validSkillIds.Contains(s.SkillId))
+                            .ToList();
+                        
+                        foreach (var section in taskSectionsToRemove)
+                        {
+                            task.RemoveSection(section.Id);
+                        }
+                        
+                        foreach (var item in skillItems)
+                        {
+                            var section = task.Sections.FirstOrDefault(s => s.SkillId == item.SkillId);
+                            if (section != null)
+                            {
+                                // استفاده از TransferToUser
+                                if (section.CurrentAssignedUserId != item.UserId)
+                                {
+                                    if (section.CurrentAssignedUserId > 0)
+                                    {
+                                        section.TransferToUser(section.CurrentAssignedUserId, item.UserId.Value);
+                                    }
+                                    else
+                                    {
+                                        section.AssignToUser(item.UserId.Value);
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                var newTaskSection = new TaskSection(task.Id, item.SkillId, item.UserId.Value);
+                                await _taskSectionRepository.CreateAsync(newTaskSection);
+                            }
+                        }
                     }
                 }
             }
         }
 
-        await _unitOfWork.SaveChangesAsync(cancellationToken);
+        await _unitOfWork.SaveChangesAsync();
         return OperationResult.Success();
     }
 
-    private async Task<OperationResult> SetTimeForProjectPhase(SetTimeProjectCommand request,
-        CancellationToken cancellationToken)
+    private async Task<OperationResult> AssignProjectPhase(SetTimeProjectCommand request)
     {
         var phase = await _projectPhaseRepository.GetWithTasksAsync(request.Id);
-        if (phase == null)
+        if (phase is null)
         {
             return OperationResult.NotFound("فاز پروژه یافت نشد");
-            return OperationResult.NotFound("<22><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD>");
         }
 
-        long? addedByUserId = _userId;
+        // تخصیص در سطح فاز
+        foreach (var item in request.SkillItems)
+        {
+            var skill = await _skillRepository.GetByIdAsync(item.SkillId);
+            if (skill is null)
+            {
+                return OperationResult.NotFound($"مهارت با شناسه {item.SkillId} یافت نشد");
+            }
+        }
 
-        // تنظیم زمان برای تمام sections در تمام تسک‌های این فاز
+        // علامت‌گذاری که این فاز نسبت به parent متمایز است
+        phase.MarkAsOverridden();
+
+        var skillItems = request.SkillItems.Where(x=>x.UserId is > 0).ToList();
+        
+        // حذف PhaseSections که در validSkills نیستند
+        var validSkillIds = skillItems.Select(x => x.SkillId).ToList();
+        var sectionsToRemove = phase.PhaseSections
+            .Where(s => !validSkillIds.Contains(s.SkillId))
+            .ToList();
+        
+        foreach (var section in sectionsToRemove)
+        {
+            phase.RemovePhaseSection(section.SkillId);
+        }
+        
+        // به‌روزرسانی یا اضافه کردن PhaseSection
+        foreach (var item in skillItems)
+        {
+            var existingSection = phase.PhaseSections.FirstOrDefault(s => s.SkillId == item.SkillId);
+            if (existingSection != null)
+            {
+                // اگر وجود داشت، فقط userId را به‌روزرسانی کن
+                existingSection.Update(item.UserId!.Value, item.SkillId); 
+            }
+            else
+            {
+                // اگر وجود نداشت، اضافه کن
+                var newPhaseSection = new PhaseSection(phase.Id, item.UserId!.Value, item.SkillId);
+                await _phaseSectionRepository.CreateAsync(newPhaseSection);
+            }
+        }
+
+        // cascade به تمام تسک‌ها
         foreach (var task in phase.Tasks)
         {
-            foreach (var section in task.Sections)
+            // اگر CascadeToChildren true است یا تسک override ندارد
+            if (request.CascadeToChildren || !task.HasAssignmentOverride)
             {
-                var sectionItem = request.SectionItems.FirstOrDefault(si => si.SectionId == section.Id);
-                if (sectionItem != null)
+                // حذف TaskSections که در validSkills نیستند
+                var taskSectionsToRemove = task.Sections
+                    .Where(s => !validSkillIds.Contains(s.SkillId))
+                    .ToList();
+                
+                foreach (var section in taskSectionsToRemove)
                 {
-                    SetSectionTime(section, sectionItem, addedByUserId);
+                    task.RemoveSection(section.Id);
+                }
+                
+                foreach (var item in skillItems) 
+                {
+                    var section = task.Sections.FirstOrDefault(s => s.SkillId == item.SkillId);
+                    if (section != null)
+                    {
+                        // استفاده از TransferToUser
+                        if (section.CurrentAssignedUserId != item.UserId)
+                        {
+                            if (section.CurrentAssignedUserId > 0)
+                            {
+                                section.TransferToUser(section.CurrentAssignedUserId, item.UserId!.Value);
+                            }
+                            else
+                            {
+                                section.AssignToUser(item.UserId!.Value);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        var newTaskSection = new TaskSection(task.Id, item.SkillId, item.UserId!.Value);
+                        await _taskSectionRepository.CreateAsync(newTaskSection);
+                    }
                 }
             }
         }
 
-        await _unitOfWork.SaveChangesAsync(cancellationToken);
+        await _unitOfWork.SaveChangesAsync();
         return OperationResult.Success();
     }
 
+
     private async Task<OperationResult> SetTimeForProjectTask(SetTimeProjectCommand request,
         CancellationToken cancellationToken)
     {
@@ -116,24 +296,64 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
 
         long? addedByUserId = _userId;
 
-        // تنظیم زمان مستقیماً برای sections این تسک
-        foreach (var section in task.Sections)
+        var validSkills = request.SkillItems
+            .Where(x=>x.UserId is > 0).ToList();
+        
+        // حذف سکشن‌هایی که در validSkills نیستند
+        var validSkillIds = validSkills.Select(x => x.SkillId).ToList();
+        var sectionsToRemove = task.Sections
+            .Where(s => !validSkillIds.Contains(s.SkillId))
+            .ToList();
+        
+        foreach (var sectionToRemove in sectionsToRemove)
         {
-            var sectionItem = request.SectionItems.FirstOrDefault(si => si.SectionId == section.Id);
-            if (sectionItem != null)
-            {
-                SetSectionTime(section, sectionItem, addedByUserId);
-            }
+            task.RemoveSection(sectionToRemove.Id);
         }
+        
+        foreach (var skillItem in validSkills)
+        {
+            var section = task.Sections.FirstOrDefault(s => s.SkillId == skillItem.SkillId);
 
+            if (!_userRepository.Exists(x=>x.Id == skillItem.UserId!.Value))
+            {
+                throw new BadRequestException("کاربر با شناسه یافت نشد.");
+            }
+            
+            if (section == null)
+            {
+                var taskSection = new TaskSection(task.Id,
+                    skillItem.SkillId, skillItem.UserId!.Value);
+                
+                task.AddSection(taskSection);
+                section = taskSection;
+            }
+            else
+            {
+                if (section.CurrentAssignedUserId != skillItem.UserId)
+                {
+                    if (section.CurrentAssignedUserId > 0)
+                    {
+                        section.TransferToUser(section.CurrentAssignedUserId, skillItem.UserId!.Value);
+                    }
+                    else
+                    {
+                        section.AssignToUser(skillItem.UserId!.Value);
+                    }
+                }
+            }
+            
+            SetSectionTime(section, skillItem, addedByUserId);
+            
+        }
         await _unitOfWork.SaveChangesAsync(cancellationToken);
         return OperationResult.Success();
     }
 
-    private void SetSectionTime(TaskSection section, SetTimeProjectSectionItem sectionItem, long? addedByUserId)
+    private void SetSectionTime(TaskSection section, SetTimeProjectSkillItem sectionItem, long? addedByUserId)
     {
         var initData = sectionItem.InitData;
-        var initialTime = TimeSpan.FromHours(initData.Hours);
+        var initialTime = TimeSpan.FromHours(initData.Hours)
+            .Add(TimeSpan.FromMinutes(initData.Minutes));
         
         if (initialTime <= TimeSpan.Zero)
         {
@@ -147,7 +367,7 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
         // افزودن زمان‌های اضافی
         foreach (var additionalTime in sectionItem.AdditionalTime)
         {
-            var additionalTimeSpan = TimeSpan.FromHours(additionalTime.Hours);
+            var additionalTimeSpan = TimeSpan.FromHours(additionalTime.Hours).Add(TimeSpan.FromMinutes(additionalTime.Minutes));
             section.AddAdditionalTime(additionalTimeSpan, additionalTime.Description, addedByUserId);
         }
     }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/SetTimeProject/SetTimeProjectCommandValidator.cs

@@ -13,19 +13,15 @@ public class SetTimeProjectCommandValidator:AbstractValidator<SetTimeProjectComm
             .NotNull()
             .WithMessage("شناسه پروژه نمی‌تواند خالی باشد.");
 
-        RuleForEach(x => x.SectionItems)
-            .SetValidator(command => new SetTimeProjectSectionItemValidator());
-
-        RuleFor(x => x.SectionItems)
-            .Must(sectionItems => sectionItems.Any(si => si.InitData?.Hours > 0))
-            .WithMessage("حداقل یکی از بخش‌ها باید مقدار ساعت معتبری داشته باشد.");
+        RuleForEach(x => x.SkillItems)
+            .SetValidator(command => new SetTimeProjectSkillItemValidator());
     }
 }
-public class SetTimeProjectSectionItemValidator:AbstractValidator<SetTimeProjectSectionItem>
+public class SetTimeProjectSkillItemValidator:AbstractValidator<SetTimeProjectSkillItem>
 {
-    public SetTimeProjectSectionItemValidator()
+    public SetTimeProjectSkillItemValidator()
     {
-        RuleFor(x=>x.SectionId)
+        RuleFor(x=>x.SkillId)
             .NotEmpty()
             .NotNull()
             .WithMessage("شناسه بخش نمی‌تواند خالی باشد.");
@@ -47,6 +43,18 @@ public class AdditionalTimeDataValidator: AbstractValidator<SetTimeSectionTime>
             .GreaterThanOrEqualTo(0)
             .WithMessage("ساعت نمی‌تواند منفی باشد.");
         
+        RuleFor(x => x.Hours)
+            .LessThan(1_000)
+            .WithMessage("ساعت باید کمتر از 1000 باشد.");
+
+        RuleFor(x => x.Minutes)
+            .GreaterThanOrEqualTo(0)
+            .WithMessage("دقیقه نمی‌تواند منفی باشد.");
+
+        RuleFor(x => x.Minutes)
+            .LessThan(60)
+            .WithMessage("دقیقه باید بین 0 تا 59 باشد.");
+        
         RuleFor(x=>x.Description)
             .MaximumLength(500)
             .WithMessage("توضیحات نمی‌تواند بیشتر از 500 کاراکتر باشد.");

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/DTOs/ProjectHierarchyDtos.cs

@@ -89,6 +89,7 @@ public class ProjectSectionDto
     
     public TimeSpan FinalEstimatedHours { get; set; }
     public TimeSpan TotalTimeSpent { get; set; }
+    public double ProgressPercentage { get; set; }
     public bool IsCompleted { get; set; }
     public bool IsInProgress { get; set; }
     

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/DTOs/SetTimeProjectSectionItem.cs

@@ -2,9 +2,10 @@ using GozareshgirProgramManager.Application.Modules.Projects.Commands.SetTimePro
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.DTOs;
 
-public class SetTimeProjectSectionItem
+public class SetTimeProjectSkillItem
 {
-    public Guid SectionId { get; set; }
+    public Guid SkillId { get; set; }
+    public long? UserId { get; set; }
     public SetTimeSectionTime InitData { get; set; }
     public List<SetTimeSectionTime> AdditionalTime { get; set; } = [];
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Extensions/ProjectMappingExtensions.cs

@@ -166,6 +166,7 @@ public static class ProjectMappingExtensions
             CreationDate = section.CreationDate,
             FinalEstimatedHours = section.FinalEstimatedHours,
             TotalTimeSpent = section.GetTotalTimeSpent(),
+            ProgressPercentage = section.GetProgressPercentage(),
             IsCompleted = section.IsCompleted(),
             IsInProgress = section.IsInProgress(),
             Activities = section.Activities.Select(a => a.ToDto()).ToList(),
@@ -188,6 +189,7 @@ public static class ProjectMappingExtensions
             CreationDate = section.CreationDate,
             FinalEstimatedHours = section.FinalEstimatedHours,
             TotalTimeSpent = section.GetTotalTimeSpent(),
+            ProgressPercentage = section.GetProgressPercentage(),
             IsCompleted = section.IsCompleted(),
             IsInProgress = section.IsInProgress()
             // No activities or additional times for summary

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectHierarchySearch/GetProjectSearchQuery.cs

@@ -0,0 +1,11 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectHierarchySearch;
+
+/// <summary>
+/// درخواست جستجو در سراسر سلسله‌مراتب پروژه (پروژه، فاز، تسک).
+/// نتایج با اطلاعات مسیر سلسله‌مراتب برای پشتیبانی از ناوبری درخت در رابط کاربری بازگردانده می‌شود.
+/// </summary>
+public record GetProjectSearchQuery(
+    string SearchQuery) : IBaseQuery<GetProjectSearchResponse>;
+ 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectHierarchySearch/GetProjectSearchQueryHandler.cs

@@ -0,0 +1,132 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectHierarchySearch;
+
+/// <summary>
+/// Handler برای درخواست جستجوی سراسری در سلسله‌مراتب پروژه.
+/// این handler در تمام سطح‌های پروژه، فاز و تسک جستجو می‌کند و از تمام فیلدهای متنی (نام، توضیحات) استفاده می‌کند.
+/// همچنین در زیرمجموعه‌های هر سطح (ProjectSections، PhaseSections، TaskSections) جستجو می‌کند.
+/// </summary>
+public class GetProjectSearchQueryHandler : IBaseQueryHandler<GetProjectSearchQuery, GetProjectSearchResponse>
+{
+    private readonly IProgramManagerDbContext _context;
+    private const int MaxResults = 50;
+
+    public GetProjectSearchQueryHandler(IProgramManagerDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<OperationResult<GetProjectSearchResponse>> Handle(
+        GetProjectSearchQuery request,
+        CancellationToken cancellationToken)
+    {
+        var searchQuery = request.SearchQuery.ToLower();
+        var results = new List<ProjectHierarchySearchResultDto>();
+
+        // جستجو در پروژه‌ها و ProjectSections
+        var projects = await SearchProjects(searchQuery, cancellationToken);
+        results.AddRange(projects);
+
+        // جستجو در فازها و PhaseSections
+        var phases = await SearchPhases(searchQuery, cancellationToken);
+        results.AddRange(phases);
+
+        // جستجو در تسک‌ها و TaskSections
+        var tasks = await SearchTasks(searchQuery, cancellationToken);
+        results.AddRange(tasks);
+
+        // مرتب‌سازی نتایج: ابتدا بر اساس سطح سلسله‌مراتب (پروژه → فاز → تسک)، سپس بر اساس نام
+        var sortedResults = results
+            .OrderBy(r => r.Level)
+            .ThenBy(r => r.Title)
+            .Take(MaxResults)
+            .ToList();
+
+        var response = new GetProjectSearchResponse(sortedResults);
+        return OperationResult<GetProjectSearchResponse>.Success(response);
+    }
+
+    /// <summary>
+    /// جستجو در جدول پروژه‌ها (نام، توضیحات) و ProjectSections (نام مهارت، توضیحات اولیه)
+    /// </summary>
+    private async Task<List<ProjectHierarchySearchResultDto>> SearchProjects(
+        string searchQuery,
+        CancellationToken cancellationToken)
+    {
+        var projects = await _context.Projects
+            .Where(p => 
+                p.Name.ToLower().Contains(searchQuery) ||
+                (p.Description != null && p.Description.ToLower().Contains(searchQuery)))
+            .Select(p => new ProjectHierarchySearchResultDto
+            {
+                Id = p.Id,
+                Title = p.Name,
+                Level = ProjectHierarchyLevel.Project,
+                ProjectId = null,
+                PhaseId = null
+            })
+            .ToListAsync(cancellationToken);
+
+        return projects;
+    }
+
+    /// <summary>
+    /// جستجو در جدول فازهای پروژه (نام، توضیحات) و PhaseSections
+    /// </summary>
+    private async Task<List<ProjectHierarchySearchResultDto>> SearchPhases(
+        string searchQuery,
+        CancellationToken cancellationToken)
+    {
+        var phases = await _context.ProjectPhases
+            .Where(ph => 
+                ph.Name.ToLower().Contains(searchQuery) ||
+                (ph.Description != null && ph.Description.ToLower().Contains(searchQuery)))
+            .Select(ph => new ProjectHierarchySearchResultDto
+            {
+                Id = ph.Id,
+                Title = ph.Name,
+                Level = ProjectHierarchyLevel.Phase,
+                ProjectId = ph.ProjectId,
+                PhaseId = null
+            })
+            .ToListAsync(cancellationToken);
+
+        return phases;
+    }
+
+    /// <summary>
+    /// جستجو در جدول تسک‌های پروژه (نام، توضیحات) و TaskSections (نام مهارت، توضیح اولیه، اطلاعات اضافی)
+    /// </summary>
+    private async Task<List<ProjectHierarchySearchResultDto>> SearchTasks(
+        string searchQuery,
+        CancellationToken cancellationToken)
+    {
+        var tasks = await _context.ProjectTasks
+            .Include(t => t.Sections)
+            .Include(t => t.Phase)
+            .Where(t => 
+                t.Name.ToLower().Contains(searchQuery) ||
+                (t.Description != null && t.Description.ToLower().Contains(searchQuery)) ||
+                t.Sections.Any(s =>
+                    (s.InitialDescription != null && s.InitialDescription.ToLower().Contains(searchQuery)) ||
+                    s.AdditionalTimes.Any(at => at.Reason != null && at.Reason.ToLower().Contains(searchQuery))))
+            .Select(t => new ProjectHierarchySearchResultDto
+            {
+                Id = t.Id,
+                Title = t.Name,
+                Level = ProjectHierarchyLevel.Task,
+                ProjectId = t.Phase.ProjectId,
+                PhaseId = t.PhaseId
+            })
+            .ToListAsync(cancellationToken);
+
+        return tasks;
+    }
+    
+}
+
+

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectHierarchySearch/GetProjectSearchQueryValidator.cs

@@ -0,0 +1,18 @@
+using FluentValidation;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectHierarchySearch;
+
+/// <summary>
+/// اعتبارسنج برای درخواست جستجوی سراسری
+/// </summary>
+public class GetProjectSearchQueryValidator : AbstractValidator<GetProjectSearchQuery>
+{
+    public GetProjectSearchQueryValidator()
+    {
+        RuleFor(x => x.SearchQuery)
+            .NotEmpty().WithMessage("متن جستجو نمی‌تواند خالی باشد.")
+            .MinimumLength(2).WithMessage("متن جستجو باید حداقل 2 حرف باشد.")
+            .MaximumLength(500).WithMessage("متن جستجو نمی‌تواند بیش از 500 حرف باشد.");
+    }
+}
+

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectHierarchySearch/GetProjectSearchResponse.cs

@@ -0,0 +1,8 @@
+namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectHierarchySearch;
+
+/// <summary>
+/// پوسته‌ی پاسخ برای نتایج جستجوی سراسری
+/// </summary>
+public record GetProjectSearchResponse(
+    List<ProjectHierarchySearchResultDto> Results);
+

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectHierarchySearch/ProjectHierarchySearchResultDto.cs

@@ -0,0 +1,36 @@
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectHierarchySearch;
+
+/// <summary>
+/// DTO برای نتایج جستجوی سراسری در سلسله‌مراتب پروژه.
+/// حاوی اطلاعات کافی برای بازسازی مسیر سلسله‌مراتب و بسط درخت در رابط کاربری است.
+/// </summary>
+public record ProjectHierarchySearchResultDto
+{
+    /// <summary>
+    /// شناسه آیتم (پروژه، فاز یا تسک)
+    /// </summary>
+    public Guid Id { get; init; }
+
+    /// <summary>
+    /// نام/عنوان آیتم
+    /// </summary>
+    public string Title { get; init; } = string.Empty;
+
+    /// <summary>
+    /// سطح سلسله‌مراتب این آیتم
+    /// </summary>
+    public ProjectHierarchyLevel Level { get; init; }
+
+    /// <summary>
+    /// شناسه پروژه - همیشه برای فاز و تسک پر شده است، برای پروژه با شناسه خود پر می‌شود
+    /// </summary>
+    public Guid? ProjectId { get; init; }
+
+    /// <summary>
+    /// شناسه فاز - فقط برای تسک پر شده است، برای پروژه و فاز خالی است
+    /// </summary>
+    public Guid? PhaseId { get; init; }
+}
+

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectListDto.cs

@@ -1,18 +1,28 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
-public record GetProjectListDto
+
+// Base DTO shared across project, phase, and task
+public class GetProjectItemDto
 {
     public Guid Id { get; init; }
     public string Name { get; init; } = string.Empty;
     public int Percentage { get; init; }
     public ProjectHierarchyLevel Level { get; init; }
     public Guid? ParentId { get; init; }
-    public bool HasFront { get; set; }
-    public bool HasBackend { get; set; }
-    public bool HasDesign { get; set; }
-        
+    public int TotalHours { get; set; }
+    public int Minutes { get; set; }
+    public AssignmentStatus Front { get; set; }
+    public AssignmentStatus Backend { get; set; }
+    public AssignmentStatus Design { get; set; }
 }
 
+// Project DTO (no extra fields; inherits from base)
+public class GetProjectDto : GetProjectItemDto
+{
+}
 
-
+// Phase DTO (no extra fields; inherits from base)
+public class GetPhaseDto : GetProjectItemDto
+{
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectsListQueryHandler.cs

@@ -3,6 +3,7 @@ using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using Microsoft.EntityFrameworkCore;
+using System.Linq;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
 
@@ -17,278 +18,342 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
 
     public async Task<OperationResult<GetProjectsListResponse>> Handle(GetProjectsListQuery request, CancellationToken cancellationToken)
     {
-        List<GetProjectListDto> projects;
+        var projects = new List<GetProjectDto>();
+        var phases = new List<GetPhaseDto>();
+        var tasks = new List<GetTaskDto>();
 
         switch (request.HierarchyLevel)
         {
             case ProjectHierarchyLevel.Project:
                 projects = await GetProjects(request.ParentId, cancellationToken);
+                await SetSkillFlags(projects, cancellationToken);
                 break;
             case ProjectHierarchyLevel.Phase:
-                projects = await GetPhases(request.ParentId, cancellationToken);
+                phases = await GetPhases(request.ParentId, cancellationToken);
+                await SetSkillFlags(phases, cancellationToken);
                 break;
             case ProjectHierarchyLevel.Task:
-                projects = await GetTasks(request.ParentId, cancellationToken);
+                tasks = await GetTasks(request.ParentId, cancellationToken);
+                // Tasks don't need SetSkillFlags because they have Sections list
                 break;
             default:
                 return OperationResult<GetProjectsListResponse>.Failure("سطح سلسله مراتب نامعتبر است");
         }
-        await SetSkillFlags(projects, cancellationToken);
 
-        var response = new GetProjectsListResponse(projects);
+        var response = new GetProjectsListResponse(projects, phases, tasks);
         return OperationResult<GetProjectsListResponse>.Success(response);
     }
 
-    private async Task<List<GetProjectListDto>> GetProjects(Guid? parentId, CancellationToken cancellationToken)
+    private async Task<List<GetProjectDto>> GetProjects(Guid? parentId, CancellationToken cancellationToken)
     {
         var query = _context.Projects.AsQueryable();
-
-        // پروژه‌ها سطح بالا هستند و parentId ندارند، فقط در صورت null بودن parentId نمایش داده می‌شوند
         if (parentId.HasValue)
         {
-            return new List<GetProjectListDto>(); // پروژه‌ها parent ندارند
+            return new List<GetProjectDto>();
         }
-
-        var projects = await query
+        var entities = await query
             .OrderByDescending(p => p.CreationDate)
             .ToListAsync(cancellationToken);
-        var result = new List<GetProjectListDto>();
-
-        foreach (var project in projects)
+        var result = new List<GetProjectDto>();
+        foreach (var project in entities)
         {
-            var percentage = await CalculateProjectPercentage(project, cancellationToken);
-            result.Add(new GetProjectListDto
+            var (percentage, totalTime) = await CalculateProjectPercentage(project, cancellationToken);
+            result.Add(new GetProjectDto
             {
                 Id = project.Id,
                 Name = project.Name,
                 Level = ProjectHierarchyLevel.Project,
                 ParentId = null,
-                Percentage = percentage
+                Percentage = percentage,
+                TotalHours = (int)totalTime.TotalHours,
+                Minutes = totalTime.Minutes,
             });
         }
-
         return result;
     }
 
-    private async Task<List<GetProjectListDto>> GetPhases(Guid? parentId, CancellationToken cancellationToken)
+    private async Task<List<GetPhaseDto>> GetPhases(Guid? parentId, CancellationToken cancellationToken)
     {
         var query = _context.ProjectPhases.AsQueryable();
-
         if (parentId.HasValue)
         {
             query = query.Where(x => x.ProjectId == parentId);
         }
-
-        var phases = await query
+        var entities = await query
             .OrderByDescending(p => p.CreationDate)
             .ToListAsync(cancellationToken);
-        var result = new List<GetProjectListDto>();
-
-        foreach (var phase in phases)
+        var result = new List<GetPhaseDto>();
+        foreach (var phase in entities)
         {
-            var percentage = await CalculatePhasePercentage(phase, cancellationToken);
-            result.Add(new GetProjectListDto
+            var (percentage, totalTime) = await CalculatePhasePercentage(phase, cancellationToken);
+            result.Add(new GetPhaseDto
             {
                 Id = phase.Id,
                 Name = phase.Name,
                 Level = ProjectHierarchyLevel.Phase,
                 ParentId = phase.ProjectId,
-                Percentage = percentage
+                Percentage = percentage,
+                TotalHours = (int)totalTime.TotalHours,
+                Minutes = totalTime.Minutes,
             });
         }
-
         return result;
     }
 
-    private async Task<List<GetProjectListDto>> GetTasks(Guid? parentId, CancellationToken cancellationToken)
+    private async Task<List<GetTaskDto>> GetTasks(Guid? parentId, CancellationToken cancellationToken)
     {
         var query = _context.ProjectTasks.AsQueryable();
-
         if (parentId.HasValue)
         {
             query = query.Where(x => x.PhaseId == parentId);
         }
-
-        var tasks = await query
+        var entities = await query
             .OrderByDescending(t => t.CreationDate)
             .ToListAsync(cancellationToken);
-        var result = new List<GetProjectListDto>();
+        var result = new List<GetTaskDto>();
+        // دریافت تمام Skills
+        var allSkills = await _context.Skills
+            .Select(s => new { s.Id, s.Name })
+            .ToListAsync(cancellationToken);
 
-        foreach (var task in tasks)
+        foreach (var task in entities)
         {
-            var percentage = await CalculateTaskPercentage(task, cancellationToken);
-            result.Add(new GetProjectListDto
+            var (percentage, totalTime) = await CalculateTaskPercentage(task, cancellationToken);
+            var sections = await _context.TaskSections
+                .Include(s => s.Activities)
+                .Include(s => s.Skill)
+                .Where(s => s.TaskId == task.Id)
+                .ToListAsync(cancellationToken);
+
+            // جمع‌آوری تمام userId های مورد نیاز
+            var userIds = sections
+                .Where(s => s.CurrentAssignedUserId > 0)
+                .Select(s => s.CurrentAssignedUserId)
+                .Distinct()
+                .ToList();
+
+            // دریافت اطلاعات کاربران
+            var users = await _context.Users
+                .Where(u => userIds.Contains(u.Id))
+                .Select(u => new { u.Id, u.FullName })
+                .ToDictionaryAsync(u => u.Id, u => u.FullName, cancellationToken);
+
+            // محاسبه SpentTime و RemainingTime
+            var spentTime = TimeSpan.FromTicks(sections.Sum(s => s.Activities.Sum(a => a.GetTimeSpent().Ticks)));
+            var remainingTime = totalTime - spentTime;
+
+            // ساخت section DTOs برای تمام Skills
+            var sectionDtos = allSkills.Select(skill =>
+            {
+                var section = sections.FirstOrDefault(s => s.SkillId == skill.Id);
+                
+                if (section == null)
+                {
+                    // اگر section وجود نداشت، یک DTO با وضعیت Unassigned برمی‌گردانیم
+                    return new GetTaskSectionDto
+                    {
+                        Id = Guid.Empty,
+                        SkillName = skill.Name ?? string.Empty,
+                        SpentTime = TimeSpan.Zero,
+                        TotalTime = TimeSpan.Zero,
+                        Percentage = 0,
+                        UserFullName = string.Empty,
+                        AssignmentStatus = AssignmentStatus.Unassigned
+                    };
+                }
+
+                // اگر section وجود داشت
+                return new GetTaskSectionDto
+                {
+                    Id = section.Id,
+                    SkillName = skill.Name ?? string.Empty,
+                    SpentTime = TimeSpan.FromTicks(section.Activities.Sum(a => a.GetTimeSpent().Ticks)),
+                    TotalTime = section.FinalEstimatedHours,
+                    Percentage = (int)section.GetProgressPercentage(),
+                    UserFullName = section.CurrentAssignedUserId > 0 && users.ContainsKey(section.CurrentAssignedUserId)
+                        ? users[section.CurrentAssignedUserId]
+                        : string.Empty,
+                    AssignmentStatus = GetAssignmentStatus(section)
+                };
+            }).ToList();
+
+            result.Add(new GetTaskDto
             {
                 Id = task.Id,
                 Name = task.Name,
                 Level = ProjectHierarchyLevel.Task,
                 ParentId = task.PhaseId,
-                Percentage = percentage
+                Percentage = percentage,
+                TotalHours = (int)totalTime.TotalHours,
+                Minutes = totalTime.Minutes,
+                SpentTime = spentTime,
+                RemainingTime = remainingTime,
+                Sections = sectionDtos,
             });
         }
-
         return result;
     }
 
-    private async Task SetSkillFlags(List<GetProjectListDto> projects, CancellationToken cancellationToken)
+    private async Task SetSkillFlags<TItem>(List<TItem> items, CancellationToken cancellationToken) where TItem : GetProjectItemDto
     {
-        if (!projects.Any())
+        if (!items.Any())
             return;
-
-        var projectIds = projects.Select(x => x.Id).ToList();
-        var hierarchyLevel = projects.First().Level;
-
+        var ids = items.Select(x => x.Id).ToList();
+        var hierarchyLevel = items.First().Level;
         switch (hierarchyLevel)
         {
             case ProjectHierarchyLevel.Project:
-                await SetSkillFlagsForProjects(projects, projectIds, cancellationToken);
+                await SetSkillFlagsForProjects(items, ids, cancellationToken);
                 break;
-                
             case ProjectHierarchyLevel.Phase:
-                await SetSkillFlagsForPhases(projects, projectIds, cancellationToken);
-                break;
-                
-            case ProjectHierarchyLevel.Task:
-                await SetSkillFlagsForTasks(projects, projectIds, cancellationToken);
+                await SetSkillFlagsForPhases(items, ids, cancellationToken);
                 break;
         }
     }
 
-    private async Task SetSkillFlagsForProjects(List<GetProjectListDto> projects, List<Guid> projectIds, CancellationToken cancellationToken)
+
+    private async Task SetSkillFlagsForProjects<TItem>(List<TItem> items, List<Guid> projectIds, CancellationToken cancellationToken) where TItem : GetProjectItemDto
     {
-        var projectSections = await _context.ProjectSections
-            .Include(x => x.Skill)
-            .Where(s => projectIds.Contains(s.ProjectId))
+        // For projects: gather all phases, then tasks, then sections
+        var phases = await _context.ProjectPhases
+            .Where(ph => projectIds.Contains(ph.ProjectId))
+            .Select(ph => ph.Id)
+            .ToListAsync(cancellationToken);
+        var tasks = await _context.ProjectTasks
+            .Where(t => phases.Contains(t.PhaseId))
+            .Select(t => t.Id)
+            .ToListAsync(cancellationToken);
+        var sections = await _context.TaskSections
+            .Include(s => s.Skill)
+            .Where(s => tasks.Contains(s.TaskId))
             .ToListAsync(cancellationToken);
 
-        if (!projectSections.Any())
-            return;
-
-        foreach (var project in projects)
+        foreach (var item in items)
         {
-            var sections = projectSections.Where(s => s.ProjectId == project.Id).ToList();
-            project.HasBackend = sections.Any(x => x.Skill?.Name == "Backend");
-            project.HasFront = sections.Any(x => x.Skill?.Name == "Frontend");
-            project.HasDesign = sections.Any(x => x.Skill?.Name == "UI/UX Design");
+            var relatedPhases = phases; // used for filtering tasks by project
+            var relatedTasks = await _context.ProjectTasks
+                .Where(t => t.PhaseId != Guid.Empty && relatedPhases.Contains(t.PhaseId))
+                .Select(t => t.Id)
+                .ToListAsync(cancellationToken);
+            var itemSections = sections.Where(s => relatedTasks.Contains(s.TaskId));
+            item.Backend = GetAssignmentStatus(itemSections.FirstOrDefault(x => x.Skill?.Name == "Backend"));
+            item.Front = GetAssignmentStatus(itemSections.FirstOrDefault(x => x.Skill?.Name == "Frontend"));
+            item.Design = GetAssignmentStatus(itemSections.FirstOrDefault(x => x.Skill?.Name == "UI/UX Design"));
         }
     }
 
-    private async Task SetSkillFlagsForPhases(List<GetProjectListDto> projects, List<Guid> phaseIds, CancellationToken cancellationToken)
+    private async Task SetSkillFlagsForPhases<TItem>(List<TItem> items, List<Guid> phaseIds, CancellationToken cancellationToken) where TItem : GetProjectItemDto
     {
-        var phaseSections = await _context.PhaseSections
-            .Include(x => x.Skill)
-            .Where(s => phaseIds.Contains(s.PhaseId))
+        // For phases: gather tasks, then sections
+        var tasks = await _context.ProjectTasks
+            .Where(t => phaseIds.Contains(t.PhaseId))
+            .Select(t => t.Id)
+            .ToListAsync(cancellationToken);
+        var sections = await _context.TaskSections
+            .Include(s => s.Skill)
+            .Where(s => tasks.Contains(s.TaskId))
             .ToListAsync(cancellationToken);
 
-        if (!phaseSections.Any())
-            return;
-
-        foreach (var phase in projects)
+        foreach (var item in items)
         {
-            var sections = phaseSections.Where(s => s.PhaseId == phase.Id).ToList();
-            phase.HasBackend = sections.Any(x => x.Skill?.Name == "Backend");
-            phase.HasFront = sections.Any(x => x.Skill?.Name == "Frontend");
-            phase.HasDesign = sections.Any(x => x.Skill?.Name == "UI/UX Design");
+            // Filter tasks for this phase
+            var phaseTaskIds = await _context.ProjectTasks
+                .Where(t => t.PhaseId == item.Id)
+                .Select(t => t.Id)
+                .ToListAsync(cancellationToken);
+            var itemSections = sections.Where(s => phaseTaskIds.Contains(s.TaskId));
+            item.Backend = GetAssignmentStatus(itemSections.FirstOrDefault(x => x.Skill?.Name == "Backend"));
+            item.Front = GetAssignmentStatus(itemSections.FirstOrDefault(x => x.Skill?.Name == "Frontend"));
+            item.Design = GetAssignmentStatus(itemSections.FirstOrDefault(x => x.Skill?.Name == "UI/UX Design"));
         }
     }
 
-    private async Task SetSkillFlagsForTasks(List<GetProjectListDto> projects, List<Guid> taskIds, CancellationToken cancellationToken)
+    private async Task<(int Percentage, TimeSpan TotalTime)> CalculateProjectPercentage(Project project, CancellationToken cancellationToken)
     {
-        var taskSections = await _context.TaskSections
-            .Include(x => x.Skill)
-            .Where(s => taskIds.Contains(s.TaskId))
-            .ToListAsync(cancellationToken);
-
-        if (!taskSections.Any())
-            return;
-
-        foreach (var task in projects)
-        {
-            var sections = taskSections.Where(s => s.TaskId == task.Id).ToList();
-            task.HasBackend = sections.Any(x => x.Skill?.Name == "Backend");
-            task.HasFront = sections.Any(x => x.Skill?.Name == "Frontend");
-            task.HasDesign = sections.Any(x => x.Skill?.Name == "UI/UX Design");
-        }
-    }
-
-    private async Task<int> CalculateProjectPercentage(Project project, CancellationToken cancellationToken)
-    {
-        // گرفتن تمام فازهای پروژه
         var phases = await _context.ProjectPhases
             .Where(ph => ph.ProjectId == project.Id)
             .ToListAsync(cancellationToken);
-
         if (!phases.Any())
-            return 0;
-
-        // محاسبه درصد هر فاز و میانگین‌گیری
+            return (0, TimeSpan.Zero);
         var phasePercentages = new List<int>();
+        var totalTime = TimeSpan.Zero;
         foreach (var phase in phases)
         {
-            var phasePercentage = await CalculatePhasePercentage(phase, cancellationToken);
+            var (phasePercentage, phaseTime) = await CalculatePhasePercentage(phase, cancellationToken);
             phasePercentages.Add(phasePercentage);
+            totalTime += phaseTime;
         }
-
-        return phasePercentages.Any() ? (int)phasePercentages.Average() : 0;
+        var averagePercentage = phasePercentages.Any() ? (int)phasePercentages.Average() : 0;
+        return (averagePercentage, totalTime);
     }
 
-    private async Task<int> CalculatePhasePercentage(ProjectPhase phase, CancellationToken cancellationToken)
+    private async Task<(int Percentage, TimeSpan TotalTime)> CalculatePhasePercentage(ProjectPhase phase, CancellationToken cancellationToken)
     {
-        // گرفتن تمام تسک‌های فاز
         var tasks = await _context.ProjectTasks
             .Where(t => t.PhaseId == phase.Id)
             .ToListAsync(cancellationToken);
-
         if (!tasks.Any())
-            return 0;
-
-        // محاسبه درصد هر تسک و میانگین‌گیری
+            return (0, TimeSpan.Zero);
         var taskPercentages = new List<int>();
+        var totalTime = TimeSpan.Zero;
         foreach (var task in tasks)
         {
-            var taskPercentage = await CalculateTaskPercentage(task, cancellationToken);
+            var (taskPercentage, taskTime) = await CalculateTaskPercentage(task, cancellationToken);
             taskPercentages.Add(taskPercentage);
+            totalTime += taskTime;
         }
-
-        return taskPercentages.Any() ? (int)taskPercentages.Average() : 0;
+        var averagePercentage = taskPercentages.Any() ? (int)taskPercentages.Average() : 0;
+        return (averagePercentage, totalTime);
     }
 
-    private async Task<int> CalculateTaskPercentage(ProjectTask task, CancellationToken cancellationToken)
+    private async Task<(int Percentage, TimeSpan TotalTime)> CalculateTaskPercentage(ProjectTask task, CancellationToken cancellationToken)
     {
-        // گرفتن تمام سکشن‌های تسک با activities
         var sections = await _context.TaskSections
             .Include(s => s.Activities)
+            .Include(x=>x.AdditionalTimes)
             .Where(s => s.TaskId == task.Id)
             .ToListAsync(cancellationToken);
-
         if (!sections.Any())
-            return 0;
-
-        // محاسبه درصد هر سکشن و میانگین‌گیری
+            return (0, TimeSpan.Zero);
         var sectionPercentages = new List<int>();
+        var totalTime = TimeSpan.Zero;
         foreach (var section in sections)
         {
-            var sectionPercentage = CalculateSectionPercentage(section);
+            var (sectionPercentage, sectionTime) = CalculateSectionPercentage(section);
             sectionPercentages.Add(sectionPercentage);
+            totalTime += sectionTime;
         }
-
-        return sectionPercentages.Any() ? (int)sectionPercentages.Average() : 0;
+        var averagePercentage = sectionPercentages.Any() ? (int)sectionPercentages.Average() : 0;
+        return (averagePercentage, totalTime);
     }
 
-    private static int CalculateSectionPercentage(TaskSection section)
+    private static (int Percentage, TimeSpan TotalTime) CalculateSectionPercentage(TaskSection section)
     {
-        // محاسبه کل زمان تخمین زده شده (اولیه + اضافی)
-        var totalEstimatedHours = section.FinalEstimatedHours.TotalHours;
+        return ((int)section.GetProgressPercentage(),section.FinalEstimatedHours);
+    }
 
-        if (totalEstimatedHours <= 0)
-            return 0;
+    private static AssignmentStatus GetAssignmentStatus(TaskSection? section)
+    {
+        // تعیین تکلیف نشده: section وجود ندارد
+        if (section == null)
+            return AssignmentStatus.Unassigned;
 
-        // محاسبه کل زمان صرف شده از activities
-        var totalSpentHours = section.Activities.Sum(a => a.GetTimeSpent().TotalHours);
+        // بررسی وجود user
+        bool hasUser = section.CurrentAssignedUserId > 0;
+        
+        // بررسی وجود time (InitialEstimatedHours بزرگتر از صفر باشد)
+        bool hasTime = section.InitialEstimatedHours > TimeSpan.Zero;
 
-        // محاسبه درصد (حداکثر 100%)
-        var percentage = (totalSpentHours / totalEstimatedHours) * 100;
-        return Math.Min((int)Math.Round(percentage), 100);
+        // تعیین تکلیف شده: هم user و هم time تعیین شده
+        if (hasUser && hasTime)
+            return AssignmentStatus.Assigned;
+
+        // فقط کاربر تعیین شده: user دارد ولی time ندارد
+        if (hasUser && !hasTime)
+            return AssignmentStatus.UserOnly;
+
+        // تعیین تکلیف نشده: نه user دارد نه time
+        return AssignmentStatus.Unassigned;
     }
 }
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectsListResponse.cs

@@ -1,5 +1,6 @@
 namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
 
 public record GetProjectsListResponse(
-    List<GetProjectListDto> Projects);
-
+    List<GetProjectDto> Projects,
+    List<GetPhaseDto> Phases,
+    List<GetTaskDto> Tasks);

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetTaskListDto.cs

@@ -0,0 +1,31 @@
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
+
+public class GetTaskDto
+{
+    public Guid Id { get; init; }
+    public string Name { get; init; } = string.Empty;
+    public int Percentage { get; init; }
+    public ProjectHierarchyLevel Level { get; init; }
+    public Guid? ParentId { get; init; }
+    public int TotalHours { get; set; }
+    public int Minutes { get; set; }
+    
+    // Task-specific fields
+    public TimeSpan SpentTime { get; init; }
+    public TimeSpan RemainingTime { get; init; }
+    public List<GetTaskSectionDto> Sections { get;  init; }
+}
+
+public class GetTaskSectionDto
+{
+    public Guid Id { get; init; }
+    public string SkillName { get; init; } = string.Empty;
+    public TimeSpan SpentTime { get; init; }
+    public TimeSpan TotalTime { get; init; }
+    public int Percentage { get; init; }
+    public string UserFullName{ get; init; } = string.Empty;
+    public AssignmentStatus AssignmentStatus { get; set; }
+    
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListQueryHandler.cs

@@ -53,68 +53,83 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
             .ToDictionaryAsync(x => x.Id, x => x.FullName, cancellationToken);
         
 
-        var result = data.Select(x =>
-        {
-            // محاسبه یکبار برای هر Activity و Cache کردن نتیجه
-            var activityTimeData = x.Activities.Select(a =>
+        var result = data .OrderByDescending(x => x.CurrentAssignedUserId == currentUserId)
+            .ThenBy(x => GetStatusOrder(x.Status))
+            .Select(x =>
             {
-                var timeSpent = a.GetTimeSpent();
-                return new
+                // محاسبه یکبار برای هر Activity و Cache کردن نتیجه
+                var activityTimeData = x.Activities.Select(a =>
                 {
-                    Activity = a,
-                    TimeSpent = timeSpent,
-                    TotalSeconds = timeSpent.TotalSeconds,
-                    FormattedTime = timeSpent.ToString(@"hh\:mm")
+                    var timeSpent = a.GetTimeSpent();
+                    return new
+                    {
+                        Activity = a,
+                        TimeSpent = timeSpent,
+                        TotalSeconds = timeSpent.TotalSeconds,
+                        FormattedTime = timeSpent.ToString(@"hh\:mm")
+                    };
+                }).ToList();
+
+                // ادغام پشت سر هم فعالیت‌های یک کاربر
+                var mergedHistories = new List<ProjectProgressHistoryDto>();
+                foreach (var activityData in activityTimeData)
+                {
+                    var lastHistory = mergedHistories.LastOrDefault();
+
+                    // اگر آخرین history برای همین کاربر باشد، زمان‌ها را جمع می‌کنیم
+                    if (lastHistory != null && lastHistory.UserId == activityData.Activity.UserId)
+                    {
+                        var totalTimeSpan = lastHistory.WorkedTimeSpan + activityData.TimeSpent;
+                        lastHistory.WorkedTimeSpan = totalTimeSpan;
+                        lastHistory.WorkedTime = totalTimeSpan.ToString(@"hh\:mm");
+                    }
+                    else
+                    {
+                        // در غیر این صورت، یک history جدید اضافه می‌کنیم
+                        mergedHistories.Add(new ProjectProgressHistoryDto()
+                        {
+                            UserId = activityData.Activity.UserId,
+                            IsCurrentUser = activityData.Activity.UserId == currentUserId,
+                            Name = users.GetValueOrDefault(activityData.Activity.UserId, "ناشناس"),
+                            WorkedTime = activityData.FormattedTime,
+                            WorkedTimeSpan = activityData.TimeSpent,
+                        });
+                    }
+                }
+                return new ProjectBoardListResponse()
+                {
+                    Id = x.Id,
+                    PhaseName = x.Task.Phase.Name,
+                    ProjectName = x.Task.Phase.Project.Name,
+                    TaskName = x.Task.Name,
+                    SectionStatus = x.Status,
+                    Progress = new ProjectProgressDto()
+                    {
+                        CompleteSecond = x.FinalEstimatedHours.TotalSeconds,
+                        Percentage = (int)x.GetProgressPercentage(),
+                        CurrentSecond = activityTimeData.Sum(a => a.TotalSeconds),
+                        Histories = mergedHistories
+                    },
+                    OriginalUser = users.GetValueOrDefault(x.OriginalAssignedUserId, "ناشناس"),
+                    AssignedUser = x.CurrentAssignedUserId == x.OriginalAssignedUserId ? null 
+                        : users.GetValueOrDefault(x.CurrentAssignedUserId, "ناشناس"),
+                    SkillName =  x.Skill?.Name??"-",
                 };
             }).ToList();
 
-            // ادغام پشت سر هم فعالیت‌های یک کاربر
-            var mergedHistories = new List<ProjectProgressHistoryDto>();
-            foreach (var activityData in activityTimeData)
-            {
-                var lastHistory = mergedHistories.LastOrDefault();
-
-                // اگر آخرین history برای همین کاربر باشد، زمان‌ها را جمع می‌کنیم
-                if (lastHistory != null && lastHistory.UserId == activityData.Activity.UserId)
-                {
-                    var totalTimeSpan = lastHistory.WorkedTimeSpan + activityData.TimeSpent;
-                    lastHistory.WorkedTimeSpan = totalTimeSpan;
-                    lastHistory.WorkedTime = totalTimeSpan.ToString(@"hh\:mm");
-                }
-                else
-                {
-                    // در غیر این صورت، یک history جدید اضافه می‌کنیم
-                    mergedHistories.Add(new ProjectProgressHistoryDto()
-                    {
-                        UserId = activityData.Activity.UserId,
-                        IsCurrentUser = activityData.Activity.UserId == currentUserId,
-                        Name = users.GetValueOrDefault(activityData.Activity.UserId, "ناشناس"),
-                        WorkedTime = activityData.FormattedTime,
-                        WorkedTimeSpan = activityData.TimeSpent,
-                    });
-                }
-            }
-
-            return new ProjectBoardListResponse()
-            {
-                Id = x.Id,
-                PhaseName = x.Task.Phase.Name,
-                ProjectName = x.Task.Phase.Project.Name,
-                TaskName = x.Task.Name,
-                SectionStatus = x.Status,
-                Progress = new ProjectProgressDto()
-                {
-                    CompleteSecond = x.FinalEstimatedHours.TotalSeconds,
-                    CurrentSecond = activityTimeData.Sum(a => a.TotalSeconds),
-                    Histories = mergedHistories
-                },
-                OriginalUser = users.GetValueOrDefault(x.OriginalAssignedUserId, "ناشناس"),
-                AssignedUser = x.CurrentAssignedUserId == x.OriginalAssignedUserId ? null 
-                    : users.GetValueOrDefault(x.CurrentAssignedUserId, "ناشناس"),
-                SkillName =  x.Skill?.Name??"-",
-            };
-        }).ToList();
-
         return OperationResult<List<ProjectBoardListResponse>>.Success(result);
     }
+
+    private static int GetStatusOrder(TaskSectionStatus status)
+    {
+        return status switch
+        {
+            TaskSectionStatus.InProgress => 0,
+            TaskSectionStatus.Incomplete => 1,
+            TaskSectionStatus.NotAssigned => 2,
+            TaskSectionStatus.ReadyToStart => 2,
+            TaskSectionStatus.PendingForCompletion => 3,
+            _ => 99
+        };
+    }
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListResponse.cs

@@ -18,6 +18,7 @@ public class ProjectBoardListResponse
 public class ProjectProgressDto
 {
     public double CurrentSecond { get; set; }
+    public int Percentage { get; set; }
     public double CompleteSecond { get; set; }
     public List<ProjectProgressHistoryDto> Histories { get; set; }
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectDeployBoardDetail/ProjectDeployBoardDetailsQueryHandler.cs

@@ -12,14 +12,16 @@ public record ProjectDeployBoardDetailsResponse(
 public record ProjectDeployBoardDetailPhaseItem(
     string Name,
     TimeSpan TotalTimeSpan,
-    TimeSpan DoneTimeSpan);
+    TimeSpan DoneTimeSpan,
+    int Percentage);
 
 public record ProjectDeployBoardDetailTaskItem(
     string Name,
     TimeSpan TotalTimeSpan,
     TimeSpan DoneTimeSpan,
+    int Percentage,
     List<ProjectDeployBoardDetailItemSkill> Skills)
-    : ProjectDeployBoardDetailPhaseItem(Name, TotalTimeSpan, DoneTimeSpan);
+    : ProjectDeployBoardDetailPhaseItem(Name, TotalTimeSpan, DoneTimeSpan,Percentage);
 
 public record ProjectDeployBoardDetailItemSkill(string OriginalUserFullName, string SkillName, int TimePercentage);
 
@@ -79,22 +81,20 @@ public class
 
                     var skillName = s.Skill?.Name ?? "بدون مهارت";
 
-                    var totalTimeSpent = s.GetTotalTimeSpent();
-                    
-                    var timePercentage = s.FinalEstimatedHours.Ticks > 0
-                        ? (int)((totalTimeSpent.Ticks / (double)s.FinalEstimatedHours.Ticks) * 100)
-                        : 0;
+                    var timePercentage = (int)s.GetProgressPercentage();
                     
                     return new ProjectDeployBoardDetailItemSkill(
                         originalUserFullName,
                         skillName,
                         timePercentage);
                 }).ToList();
+            var taskPercentage = (int)Math.Round(skills.Average(x => x.TimePercentage));
 
             return new ProjectDeployBoardDetailTaskItem(
                 t.Name,
                 totalTime,
                 doneTime,
+                taskPercentage,
                 skills);
         }).ToList();
 
@@ -104,7 +104,10 @@ public class
         var doneTimeSpan = tasksRes.Aggregate(TimeSpan.Zero,
             (sum, next) => sum.Add(next.DoneTimeSpan));
 
-        var phaseRes = new ProjectDeployBoardDetailPhaseItem(phase.Name, totalTimeSpan, doneTimeSpan);
+        var phasePercentage = tasksRes.Average(x => x.Percentage);
+            
+        var phaseRes = new ProjectDeployBoardDetailPhaseItem(phase.Name, totalTimeSpan, doneTimeSpan,
+            (int)phasePercentage);
 
         var res = new ProjectDeployBoardDetailsResponse(phaseRes, tasksRes);
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectDeployBoardList/ProjectDeployBoardListQueryHandler.cs

@@ -17,6 +17,7 @@ public record ProjectDeployBoardListItem()
     public int DoneTasks { get; set; }
     public TimeSpan TotalTimeSpan { get; set; }
     public TimeSpan DoneTimeSpan { get; set; }
+    public int Percentage { get; set; }
     public ProjectDeployStatus DeployStatus { get; set; }
 }
 public record GetProjectsDeployBoardListResponse(List<ProjectDeployBoardListItem> Items);
@@ -66,7 +67,8 @@ public class ProjectDeployBoardListQueryHandler:IBaseQueryHandler<GetProjectDepl
                 .Select(x => x.TaskId).Distinct().Count(),
             TotalTimeSpan = TimeSpan.FromTicks(g.Sum(x => x.InitialEstimatedHours.Ticks)),
             DoneTimeSpan = TimeSpan.FromTicks(g.Sum(x=>x.GetTotalTimeSpent().Ticks)),
-            DeployStatus = g.First().Task.Phase.DeployStatus
+            DeployStatus = g.First().Task.Phase.DeployStatus,
+            Percentage = (int)Math.Round(g.Average(x => x.GetProgressPercentage()))
         }).ToList();
         var response = new GetProjectsDeployBoardListResponse(list);
         return OperationResult<GetProjectsDeployBoardListResponse>.Success(response);

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQuery.cs

@@ -3,21 +3,22 @@ using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectSetTimeDetails;
 
-public record ProjectSetTimeDetailsQuery(Guid TaskId)
+public record ProjectSetTimeDetailsQuery(Guid Id, ProjectHierarchyLevel Level)
     : IBaseQuery<ProjectSetTimeResponse>;
 public record ProjectSetTimeResponse(
-    List<ProjectSetTimeResponseSections> SectionItems,
+    List<ProjectSetTimeResponseSkill> SkillItems,
     Guid Id,
     ProjectHierarchyLevel Level);
 
-public record ProjectSetTimeResponseSections
+public record ProjectSetTimeResponseSkill
 {
+    public Guid SkillId { get; init; }
     public string SkillName { get; init; }
-    public string UserName { get; init; }
-    public int InitialTime { get; set; }
+    public long UserId { get; set; }
+    public string UserFullName { get; init; }
+    public int InitialHours { get; set; }
+    public int InitialMinutes { get; set; }
     public string InitialDescription { get; set; }
-    public int TotalEstimateTime { get; init; }
-    public int TotalAdditionalTime { get; init; }
     public string InitCreationTime { get; init; }
     public List<ProjectSetTimeResponseSectionAdditionalTime> AdditionalTimes { get; init; }
     public Guid SectionId { get; set; }
@@ -25,6 +26,8 @@ public record ProjectSetTimeResponseSections
 
 public class ProjectSetTimeResponseSectionAdditionalTime
 {
-    public int Time { get; init; }
+    public int Hours { get; init; }
+    public int Minutes { get; init; }
     public string Description { get; init; }
+    public string CreationDate { get; set; }
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQueryHandler.cs

@@ -22,17 +22,30 @@ public class ProjectSetTimeDetailsQueryHandler
 
     public async Task<OperationResult<ProjectSetTimeResponse>> Handle(ProjectSetTimeDetailsQuery request,
         CancellationToken cancellationToken)
+    {
+        return request.Level switch
+        {
+            ProjectHierarchyLevel.Task => await GetTaskSetTimeDetails(request.Id, request.Level, cancellationToken),
+            ProjectHierarchyLevel.Phase => await GetPhaseSetTimeDetails(request.Id, request.Level, cancellationToken),
+            ProjectHierarchyLevel.Project => await GetProjectSetTimeDetails(request.Id, request.Level, cancellationToken),
+            _ => OperationResult<ProjectSetTimeResponse>.Failure("سطح معادل نامعتبر است")
+        };
+    }
+
+    private async Task<OperationResult<ProjectSetTimeResponse>> GetTaskSetTimeDetails(Guid id, ProjectHierarchyLevel level,
+        CancellationToken cancellationToken)
     {
         var task = await _context.ProjectTasks
-            .Where(p => p.Id == request.TaskId)
+            .Where(p => p.Id == id)
             .Include(x => x.Sections)
             .ThenInclude(x => x.AdditionalTimes).AsNoTracking()
             .FirstOrDefaultAsync(cancellationToken);
         
         if (task == null)
         {
-            return OperationResult<ProjectSetTimeResponse>.NotFound("Project not found");
+            return OperationResult<ProjectSetTimeResponse>.NotFound("تسک یافت نشد");
         }
+        
         var userIds = task.Sections.Select(x => x.OriginalAssignedUserId)
             .Distinct().ToList();
         
@@ -40,40 +53,142 @@ public class ProjectSetTimeDetailsQueryHandler
             .Where(x => userIds.Contains(x.Id))
             .AsNoTracking()
             .ToListAsync(cancellationToken);
-        var skillIds = task.Sections.Select(x => x.SkillId)
-            .Distinct().ToList();
         
-        var skills =  await _context.Skills
-            .Where(x => skillIds.Contains(x.Id))
+        var skills = await _context.Skills
             .AsNoTracking()
             .ToListAsync(cancellationToken);
 
         var res = new ProjectSetTimeResponse(
-                task.Sections.Select(ts =>
+            skills.Select(skill =>
+            {
+                var section = task.Sections
+                    .FirstOrDefault(x => x.SkillId == skill.Id);
+                var user = users.FirstOrDefault(x => x.Id == section?.OriginalAssignedUserId);
+                return new ProjectSetTimeResponseSkill
                 {
-                    var user = users.FirstOrDefault(x => x.Id == ts.OriginalAssignedUserId);
-                    var skill = skills.FirstOrDefault(x => x.Id == ts.SkillId);
-                    return new ProjectSetTimeResponseSections
-                    {
-                        AdditionalTimes = ts.AdditionalTimes
-                            .Select(x => new ProjectSetTimeResponseSectionAdditionalTime
-                            {
-                                Description = x.Reason ?? "",
-                                Time = (int)x.Hours.TotalHours
-                            }).ToList(),
-                        InitCreationTime = ts.CreationDate.ToFarsi(),
-                        SkillName = skill?.Name ?? "",
-                        TotalAdditionalTime = (int)ts.GetTotalAdditionalTime().TotalHours,
-                        TotalEstimateTime = (int)ts.FinalEstimatedHours.TotalHours,
-                        UserName = user?.UserName ?? "",
-                        SectionId = ts.Id,
-                        InitialDescription = ts.InitialDescription ?? "",
-                        InitialTime = (int)ts.InitialEstimatedHours.TotalHours
-                    };
-                }).ToList(),
-                task.Id,
-                ProjectHierarchyLevel.Task);
+                    AdditionalTimes = section?.AdditionalTimes
+                        .Select(x => new ProjectSetTimeResponseSectionAdditionalTime
+                        {
+                            Description = x.Reason ?? "",
+                            Hours = (int)x.Hours.TotalHours,
+                            Minutes = x.Hours.Minutes,
+                            CreationDate = x.CreationDate.ToFarsi()
+                        }).OrderBy(x => x.CreationDate).ToList() ?? [],
+                    InitCreationTime = section?.CreationDate.ToFarsi() ?? "",
+                    SkillName = skill.Name ?? "",
+                    UserFullName = user?.FullName ?? "",
+                    SectionId = section?.Id ?? Guid.Empty,
+                    InitialDescription = section?.InitialDescription ?? "",
+                    InitialHours = (int)(section?.InitialEstimatedHours.TotalHours ?? 0),
+                    InitialMinutes = section?.InitialEstimatedHours.Minutes ?? 0,
+                    UserId = section?.OriginalAssignedUserId ?? 0,
+                    SkillId = skill.Id,
+                };
+            }).OrderBy(x => x.SkillId).ToList(),
+            task.Id,
+            level);
 
+        return OperationResult<ProjectSetTimeResponse>.Success(res);
+    }
+
+    private async Task<OperationResult<ProjectSetTimeResponse>> GetPhaseSetTimeDetails(Guid id, ProjectHierarchyLevel level,
+        CancellationToken cancellationToken)
+    {
+        var phase = await _context.ProjectPhases
+            .Where(p => p.Id == id)
+            .Include(x => x.PhaseSections).AsNoTracking()
+            .FirstOrDefaultAsync(cancellationToken);
+
+        if (phase == null)
+        {
+            return OperationResult<ProjectSetTimeResponse>.NotFound("فاز یافت نشد");
+        }
+
+        var userIds = phase.PhaseSections.Select(x => x.UserId)
+            .Distinct().ToList();
+
+        var users = await _context.Users
+            .Where(x => userIds.Contains(x.Id))
+            .AsNoTracking()
+            .ToListAsync(cancellationToken);
+
+        var skills = await _context.Skills
+            .AsNoTracking()
+            .ToListAsync(cancellationToken);
+
+        var res = new ProjectSetTimeResponse(
+            skills.Select(skill =>
+            {
+                var section = phase.PhaseSections
+                    .FirstOrDefault(x => x.SkillId == skill.Id);
+                var user = users.FirstOrDefault(x => x.Id == section?.UserId);
+                return new ProjectSetTimeResponseSkill
+                {
+                    AdditionalTimes = [],
+                    InitCreationTime = "",
+                    SkillName = skill.Name ?? "",
+                    UserFullName = user?.FullName ?? "",
+                    SectionId = section?.Id ?? Guid.Empty,
+                    InitialDescription = "",
+                    InitialHours = 0,
+                    InitialMinutes = 0,
+                    UserId = section?.UserId ?? 0,
+                    SkillId = skill.Id,
+                };
+            }).OrderBy(x => x.SkillId).ToList(),
+            phase.Id,
+            level);
+
+        return OperationResult<ProjectSetTimeResponse>.Success(res);
+    }
+
+    private async Task<OperationResult<ProjectSetTimeResponse>> GetProjectSetTimeDetails(Guid id, ProjectHierarchyLevel level,
+        CancellationToken cancellationToken)
+    {
+        var project = await _context.Projects
+            .Where(p => p.Id == id)
+            .Include(x => x.ProjectSections).AsNoTracking()
+            .FirstOrDefaultAsync(cancellationToken);
+
+        if (project == null)
+        {
+            return OperationResult<ProjectSetTimeResponse>.NotFound("پروژه یافت نشد");
+        }
+
+        var userIds = project.ProjectSections.Select(x => x.UserId)
+            .Distinct().ToList();
+
+        var users = await _context.Users
+            .Where(x => userIds.Contains(x.Id))
+            .AsNoTracking()
+            .ToListAsync(cancellationToken);
+
+        var skills = await _context.Skills
+            .AsNoTracking()
+            .ToListAsync(cancellationToken);
+
+        var res = new ProjectSetTimeResponse(
+            skills.Select(skill =>
+            {
+                var section = project.ProjectSections
+                    .FirstOrDefault(x => x.SkillId == skill.Id);
+                var user = users.FirstOrDefault(x => x.Id == section?.UserId);
+                return new ProjectSetTimeResponseSkill
+                {
+                    AdditionalTimes = [],
+                    InitCreationTime = "",
+                    SkillName = skill.Name ?? "",
+                    UserFullName = user?.FullName ?? "",
+                    SectionId = section?.Id ?? Guid.Empty,
+                    InitialDescription = "",
+                    InitialHours = 0,
+                    InitialMinutes = 0,
+                    UserId = section?.UserId ?? 0,
+                    SkillId = skill.Id,
+                };
+            }).OrderBy(x => x.SkillId).ToList(),
+            project.Id,
+            level);
 
         return OperationResult<ProjectSetTimeResponse>.Success(res);
     }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQueryValidator.cs

@@ -1,13 +1,18 @@
 using FluentValidation;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectSetTimeDetails;
 
-public class ProjectSetTimeDetailsQueryValidator:AbstractValidator<ProjectSetTimeDetailsQuery>
+public class ProjectSetTimeDetailsQueryValidator : AbstractValidator<ProjectSetTimeDetailsQuery>
 {
     public ProjectSetTimeDetailsQueryValidator()
     {
-        RuleFor(x => x.TaskId)
+        RuleFor(x => x.Id)
             .NotEmpty()
-            .WithMessage("شناسه پروژه نمی‌تواند خالی باشد.");
+            .WithMessage("شناسه نمی‌تواند خالی باشد.");
+
+        RuleFor(x => x.Level)
+            .IsInEnum()
+            .WithMessage("سطح معادل نامعتبر است.");
     }
 }

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

@@ -74,6 +74,15 @@ public class Project : ProjectHierarchyNode
         }
     }
 
+    public void RemoveProjectSection(Guid skillId)
+    {
+        var section = _projectSections.FirstOrDefault(s => s.SkillId == skillId);
+        if (section != null)
+        {
+            _projectSections.Remove(section);
+        }
+    }
+
     public void ClearProjectSections()
     {
         _projectSections.Clear();

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

@@ -87,6 +87,15 @@ public class ProjectPhase : ProjectHierarchyNode
         }
     }
 
+    public void RemovePhaseSection(Guid skillId)
+    {
+        var section = _phaseSections.FirstOrDefault(s => s.SkillId == skillId);
+        if (section != null)
+        {
+            _phaseSections.Remove(section);
+        }
+    }
+
     public void ClearPhaseSections()
     {
         _phaseSections.Clear();

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

@@ -246,4 +246,9 @@ public class ProjectTask : ProjectHierarchyNode
     }
 
     #endregion
+
+    public void ClearTaskSections()
+    {
+        _sections.Clear();
+    }
 }

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

@@ -157,6 +157,27 @@ public class TaskSection : EntityBase<Guid>
         return TimeSpan.FromTicks(_activities.Sum(a => a.GetTimeSpent().Ticks));
     }
 
+    /// <summary>
+    /// محاسبه درصد پیشرفت بر اساس زمان مصرف شده به تایم برآورد شده
+    /// اگر وضعیت Completed باشد، همیشه 100 درصد برمی‌گرداند
+    /// </summary>
+    public double GetProgressPercentage()
+    {
+        // اگر تسک کامل شده، همیشه 100 درصد
+        if (Status == TaskSectionStatus.Completed)
+            return 100.0;
+
+        // اگر تایم برآورد شده صفر است، درصد صفر است
+        if (FinalEstimatedHours.TotalHours <= 0)
+            return 0.0;
+
+        var timeSpent = GetTotalTimeSpent();
+        var percentage = (timeSpent.TotalMinutes / FinalEstimatedHours.TotalMinutes) * 100.0;
+
+        // محدود کردن درصد به 100 (در صورتی که زمان مصرف شده بیشتر از تخمین باشد)
+        return Math.Min(percentage, 100.0);
+    }
+
     public bool IsCompleted()
     {
         return Status == TaskSectionStatus.Completed;

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Enums/AssignmentStatus.cs

@@ -0,0 +1,23 @@
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+
+/// <summary>
+/// وضعیت تکلیف دهی برای بخش‌های مختلف پروژه
+/// </summary>
+public enum AssignmentStatus
+{
+    /// <summary>
+    /// تعیین تکلیف نشده
+    /// </summary>
+    Unassigned = 0,
+    
+    /// <summary>
+    /// تعیین تکلیف شده
+    /// </summary>
+    Assigned = 1,
+    
+    /// <summary>
+    /// فقط کاربر تعیین شده
+    /// </summary>
+    UserOnly = 2,
+}
+

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

@@ -13,4 +13,5 @@ public interface ITaskSectionRepository: IRepository<Guid,TaskSection>
 
     Task<List<TaskSection>> GetAssignedToUserAsync(long userId);
     Task<List<TaskSection>> GetActiveSectionsIncludeAllAsync(CancellationToken cancellationToken);
+    Task<bool> HasUserAnyInProgressSectionAsync(long userId, CancellationToken cancellationToken = default);
 }

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

@@ -19,6 +19,7 @@ public class ProjectPhaseRepository : RepositoryBase<Guid, ProjectPhase>, IProje
     public Task<ProjectPhase?> GetWithTasksAsync(Guid phaseId)
     {
         return _context.ProjectPhases
+            .Include(x=>x.PhaseSections)
             .Include(p => p.Tasks)
                 .ThenInclude(t => t.Sections)
                     .ThenInclude(s => s.Skill)

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

@@ -19,6 +19,7 @@ public class TaskSectionRepository:RepositoryBase<Guid,TaskSection>,ITaskSection
     {
         return await _context.TaskSections
             .Include(x => x.Activities)
+            .Include(x=>x.AdditionalTimes)
             .FirstOrDefaultAsync(x => x.Id == id, cancellationToken);
     }
 
@@ -45,4 +46,11 @@ public class TaskSectionRepository:RepositoryBase<Guid,TaskSection>,ITaskSection
             .Include(x => x.AdditionalTimes)
             .ToListAsync(cancellationToken);
     }
+
+    public async Task<bool> HasUserAnyInProgressSectionAsync(long userId, CancellationToken cancellationToken = default)
+    {
+        return await _context.TaskSections
+            .AnyAsync(x => x.CurrentAssignedUserId == userId && x.Status == TaskSectionStatus.InProgress, 
+                cancellationToken);
+    }
 }

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

@@ -1,5 +1,6 @@
 using System.Runtime.InteropServices;
 using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application.Modules.Projects.Commands.ApproveTaskSectionCompletion;
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.AssignProject;
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.AutoStopOverTimeTaskSections;
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.AutoUpdateDeployStatus;
@@ -17,6 +18,7 @@ using GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectBoar
 using GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectDeployBoardDetail;
 using GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectDeployBoardList;
 using GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectSetTimeDetails;
+using GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectHierarchySearch;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
 using ServiceHost.BaseControllers;
@@ -40,6 +42,15 @@ public class ProjectController : ProgramManagerBaseController
         return res;
     }
 
+    [HttpGet("search")]
+    public async Task<ActionResult<OperationResult<GetProjectSearchResponse>>> Search(
+        [FromQuery] string search)
+    {
+        var searchQuery = new GetProjectSearchQuery(search);
+        var res = await _mediator.Send(searchQuery);
+        return res;
+    }
+
     [HttpPost]
     public async Task<ActionResult<OperationResult>> Create([FromBody] CreateProjectCommand command)
     {
@@ -147,4 +158,11 @@ public class ProjectController : ProgramManagerBaseController
         var res = await _mediator.Send(command);
         return res;
     }
+
+    [HttpPost("approve-completion")]
+    public async Task<ActionResult<OperationResult>> ApproveTaskSectionCompletion([FromBody] ApproveTaskSectionCompletionCommand command)
+    {
+        var res = await _mediator.Send(command);
+        return res;
+    }
 }

ServiceHost/Areas/Admin/Controllers/institutionContractController.cs

@@ -48,7 +48,8 @@ public class institutionContractController : AdminBaseController
         IPersonalContractingPartyApp contractingPartyApplication, IContactInfoApplication contactInfoApplication,
         IAccountApplication accountApplication, IEmployerApplication employerApplication,
         IWorkshopApplication workshopApplication, ITemporaryClientRegistrationApplication temporaryClientRegistration,
-        ITemporaryClientRegistrationApplication clientRegistrationApplication, IHttpClientFactory httpClientFactory)
+        ITemporaryClientRegistrationApplication clientRegistrationApplication, IHttpClientFactory httpClientFactory
+        ,ILogger<SepehrPaymentGateway> sepehrGatewayLogger)
     {
         _institutionContractApplication = institutionContractApplication;
         _contractingPartyApplication = contractingPartyApplication;
@@ -58,7 +59,7 @@ public class institutionContractController : AdminBaseController
         _workshopApplication = workshopApplication;
         _temporaryClientRegistration = temporaryClientRegistration;
         _clientRegistrationApplication = clientRegistrationApplication;
-        _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
+        _paymentGateway = new SepehrPaymentGateway(httpClientFactory, sepehrGatewayLogger);
     }
 
     /// <summary>
@@ -915,6 +916,17 @@ public class institutionContractController : AdminBaseController
             "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
             $"قرارداد های مالی.xlsx");
     }
+
+    /// <summary>
+    /// تنظیم وضعیت ارسال قرارداد
+    /// </summary>
+    [HttpPost("set-is-sent")]
+    public async Task<ActionResult<OperationResult>> SetIsSent([FromBody] SetInstitutionContractSendFlagRequest request)
+    {
+        var result = await _institutionContractApplication.SetContractSendFlag(request);
+        return result;
+    }
+    
 }
 
 public class InstitutionContractCreationGetRepresentativeIdResponse
@@ -968,4 +980,4 @@ public class VerifyCodeRequest
 {
     public long ContractingPartyId { get; set; }
     public string verifyCode { get; set; }
-}
+}

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

@@ -79,7 +79,8 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
             CompanyContext context, AccountContext accountContext, IHttpClientFactory httpClientFactory,
             IOptions<AppSettingConfiguration> appSetting,
             ITemporaryClientRegistrationApplication clientRegistrationApplication, IOnlinePayment onlinePayment,
-            IFaceEmbeddingService faceEmbeddingService, IAuthHelper authHelper, IInstitutionContractApplication institutionContractApplication)
+            IFaceEmbeddingService faceEmbeddingService, IAuthHelper authHelper, IInstitutionContractApplication institutionContractApplication
+            ,ILogger<SepehrPaymentGateway> sepehrGatewayLogger)
         {
             _application = application;
             _rollCallDomainService = rollCallDomainService;
@@ -91,7 +92,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
             _faceEmbeddingService = faceEmbeddingService;
             _authHelper = authHelper;
             _institutionContractApplication = institutionContractApplication;
-            _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
+            _paymentGateway = new SepehrPaymentGateway(httpClientFactory, sepehrGatewayLogger);
         }
 
         public void OnGet()

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

@@ -219,7 +219,7 @@
 							</div>
 							<div class="Rtable-cell--content">
 								<div class="d-flex align-items-center justify-content-end">
-									<a href="@Url.Page("./Index", "DownloadFile", new { path = @item.FullPath, fileName = @item.FileName })" class="btn-delete1">
+                                    <a href="@Url.Page("./Index", "DownloadFileLog", new { path = @item.FullPath, fileName = @item.FileName })" class="btn-delete1">
 										<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
 											<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 0 0 5.25 21h13.5A2.25 2.25 0 0 0 21 18.75V16.5M16.5 12 12 16.5m0 0L7.5 12m4.5 4.5V3" />
 										</svg>

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

@@ -1,4 +1,4 @@
-using _0_Framework.Application;
+using _0_Framework.Application;
 using _0_Framework.Infrastructure;
 using _0_Framework.InfraStructure;
 using backService;
@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Configuration.UserSecrets;
+using System.IO;
 
 namespace ServiceHost.Areas.AdminNew.Pages.Company.FileBackup
 {
@@ -68,8 +69,8 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.FileBackup
                 {
                     FileName = Path.GetFileName(x),
                     FullPath = x,
-                    CreationDate = Path.GetFileName(x).ExtractTimeFromInsurancebackup(),
-                }).OrderByDescending(x => x.CreationDate).ToList();
+                    CreationDate = new DateTime(),
+                }).ToList();
 
 
                 #endregion
@@ -89,5 +90,22 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.FileBackup
 		    byte[] fileContent = System.IO.File.ReadAllBytes(path);
 		    return File(fileContent, "application/zip", fileName);
 	    }
-	}
+
+
+        public IActionResult OnGetDownloadFileLog(string path, string fileName)
+        {
+            if (!System.IO.File.Exists(path))
+                return NotFound();
+
+            var stream = new FileStream(
+                path,
+                FileMode.Open,
+                FileAccess.Read,
+                FileShare.ReadWrite // 🔑 کلید حل مشکل
+            );
+
+            return File(stream, "text/plain", fileName);
+        }
+
+    }
 }

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

@@ -80,7 +80,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.Ticket
 		public IActionResult OnGetShowDetailTicketByAdmin(long ticketID)
         {
             var res = _ticketApplication.GetDetails(ticketID);
-            res.WorkshopName = _workshopApplication.GetDetails(res.WorkshopId).WorkshopFullName;
+            res.WorkshopName = _workshopApplication.GetDetails(res.WorkshopId)?.WorkshopFullName??"";
             return Partial("DetailTicketModal", res);
         }
 

ServiceHost/Program.cs

@@ -32,6 +32,8 @@ using GozareshgirProgramManager.Application.Modules.Users.Commands.CreateUser;
 using GozareshgirProgramManager.Infrastructure;
 using GozareshgirProgramManager.Infrastructure.Persistence.Seed;
 using Microsoft.OpenApi;
+using Serilog;
+using Serilog.Events;
 using ServiceHost.Hubs.ProgramManager;
 using ServiceHost.Notifications.ProgramManager;
 using ServiceHost.Conventions;
@@ -53,7 +55,30 @@ builder.Services.AddHttpClient("holidayApi", c => c.BaseAddress = new System.Uri
 var connectionString = builder.Configuration.GetConnectionString("MesbahDb");
 var connectionStringTestDb = builder.Configuration.GetConnectionString("TestDb");
 
+#region Serilog
+var logDirectory = @"C:\Logs\Gozareshgir\";
 
+if (!Directory.Exists(logDirectory))
+{
+    Directory.CreateDirectory(logDirectory);
+}
+
+// فقط برای فایل از Serilog استفاده می‌شود
+// تنظیمات MinimumLevel از appsettings.json خوانده می‌شود
+Log.Logger = new LoggerConfiguration()
+    .Enrich.FromLogContext()
+    .WriteTo.File(
+        path: Path.Combine(logDirectory, "gozareshgir_log.txt"),
+        rollingInterval: RollingInterval.Day,
+        retainedFileCountLimit: 30,
+        shared: true,
+        outputTemplate:
+        "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level}] {Message}{NewLine}{Exception}"
+    ).CreateLogger();
+
+
+
+#endregion
 
 builder.Services.AddProgramManagerApplication();
 builder.Services.AddProgramManagerInfrastructure(builder.Configuration);
@@ -348,7 +373,25 @@ builder.Services.AddParbad().ConfigureGateways(gateways =>
 });
 
 
+// فقط Serilog برای File استفاده می‌شه، کنسول از لاگر پیش‌فرض ASP.NET استفاده می‌کنه
+builder.Host.UseSerilog((context, services, configuration) =>
+{
+    var logConfig = configuration
+        .ReadFrom.Configuration(context.Configuration)
+        .ReadFrom.Services(services)
+        .Enrich.FromLogContext();
 
+    
+    logConfig.WriteTo.File(
+        path: Path.Combine(logDirectory, "gozareshgir_log.txt"),
+        rollingInterval: RollingInterval.Day,
+        retainedFileCountLimit: 30,
+        shared: true,
+        outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level}] {Message}{NewLine}{Exception}"
+    );
+}, writeToProviders: true); // این باعث میشه کنسول پیش‌فرض هم کار کنه
+
+Log.Information("SERILOG STARTED SUCCESSFULLY");
 
 var app = builder.Build();
 app.UseCors("AllowSpecificOrigins");

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
     },
@@ -44,7 +44,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
     }

ServiceHost/ServiceHost.csproj

@@ -10,6 +10,7 @@
   </PropertyGroup>
 	<PropertyGroup>
 		<RazorCompileOnBuild>true</RazorCompileOnBuild>
+		<UserSecretsId>a6049acf-0286-4947-983a-761d06d65f36</UserSecretsId>
 	</PropertyGroup>
 
 	<!--<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -94,11 +95,16 @@
     <PackageReference Include="MongoDB.Driver" Version="3.5.2" />
     <PackageReference Include="Parbad.AspNetCore" Version="1.5.0" />
     <PackageReference Include="Parbad.Storage.Cache" Version="1.5.0" />
+    <PackageReference Include="Serilog" Version="4.3.0" />
     <PackageReference Include="SocialExplorer.FastDBF" Version="1.0.0" />
     <PackageReference Include="System.Data.OleDb" Version="10.0.1" />
 	  <PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
 
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
+  </ItemGroup>
 
   <ItemGroup>
     <Folder Include="Storage\Task\" />

ServiceHost/appsettings.Development.json

@@ -1,71 +0,0 @@
-{
-  "DetailedErrors": true,
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    //تست
-    //"MesbahDb": "Data Source=DESKTOP-NUE119G\\MSNEW;Initial Catalog=Mesbah_db;Integrated Security=True"
-
-    //server
-    "MesbahDbServer": "Data Source=171.22.24.15;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]18[3019]#@ATt;TrustServerCertificate=true;",
-
-    //local
-    "MesbahDb": "Data Source=.;Initial Catalog=mesbah_db;Integrated Security=True;TrustServerCertificate=true;",
-
-    //server 
-    //"MesbahDb": "Data Source=185.208.175.186;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]18[3019]#@ATt;TrustServerCertificate=true;",
-
-    //dad-mehr
-    //"MesbahDb": "Data Source=.;Initial Catalog=teamWork;Integrated Security=True;TrustServerCertificate=true;",
-
-    "TestDb": "Data Source=.;Initial Catalog=TestDb;Integrated Security=True;TrustServerCertificate=true;",
-
-    //program_manager_db
-    "ProgramManagerDb": "Data Source=.;Initial Catalog=program_manager_db;Integrated Security=True;TrustServerCertificate=true;",
-    //"ProgramManagerDb": "Data Source=185.208.175.186;Initial Catalog=program_manager_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]18[3019]#@ATt;TrustServerCertificate=true;"
-    "ProgramManagerDbServer": "Data Source=171.22.24.15;Initial Catalog=program_manager_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]18[3019]#@ATt;TrustServerCertificate=true;"
-    //mahan Docker
-    //"MesbahDb": "Data Source=localhost,5069;Initial Catalog=mesbah_db;User ID=sa;Password=YourPassword123;TrustServerCertificate=True;"
-  },
-
-  "GoogleRecaptchaV3": {
-    "SiteKey": "6Lfhp_AnAAAAAB79WkrMoHd1k8ir4m8VvfjE7FTH",
-    "SecretKey": "6Lfhp_AnAAAAANjDDY6DPrbbUQS7k6ZCRmrVP5Lb"
-  },
-  "SmsSecrets": {
-    "ApiKey": "Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa",
-    "SecretKey": "dadmehr"
-  },
-  "Domain": ".dadmehrg.ir",
-  "MongoDb": {
-    "ConnectionString": "mongodb://localhost:27017",
-    "DatabaseName": "Gozareshgir"
-  },
-  "SmsSettings": {
-    "IsTestMode": true,
-    "TestNumbers": [
-      "09116967898"
-      //, "09116067106", "09114221321"
-    ]
-  },
-  "InternalApi": {
-    "Local": "https://localhost:7032",
-    "Dadmehrg": "https://api.pm.dadmehrg.ir",
-    "Gozareshgir": "https://api.pm.gozareshgir.ir"
-  },
-  "SepehrGateWayTerminalId": 99213700,
-  "JwtSettings": {
-    "SecretKey": ">3£>^1UBG@yw)QdhRC3$£:;r8~?qpp^oKK4D3a~8L2>enF;lkgh",
-    "Issuer": "GozareshgirApp",
-    "Audience": "GozareshgirUsers",
-    "ExpirationMinutes": 30
-  }
-
-
-}
-

ServiceHost/appsettings.json

@@ -1,54 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-     //"MesbahDb": "Data Source=.\\MSSQLSERVER2019;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=mesbah_db;Password=sa142857$@;"
-    "MesbahDb": "Data Source=.;Initial Catalog=mesbah_db;Integrated Security=True;TrustServerCertificate=true;",
-
-    //dad-mehr
-    //"MesbahDb": "Data Source=.;Initial Catalog=teamWork;Integrated Security=True;TrustServerCertificate=true;",
-
-    //testDb
-    "TestDb": "Data Source=.;Initial Catalog=TestDb;Integrated Security=True;TrustServerCertificate=true;",
-    //program_manager_db
-    "ProgramManagerDb": "Data Source=.;Initial Catalog=program_manager_db;Integrated Security=True;TrustServerCertificate=true;"
-  },
-  "BackupOptions": {
-    "DbName": "mesbah_db",
-    "DbBackupZipPath": "c://EveryHourBackupList//",
-    "FastDbBackupZipPath": "c://FastBackupZipList//",
-    "InsuranceListZipPath": "c://InsuranceListZipPath//"
-  },
-  "faceModels": {
-    "Faces": "c://labels//20//"
-  },
-  "AllowedHosts": "*",
-  //"Domain": ".dad-mehr.ir"
-  "Domain": ".gozareshgir.ir",
-  "MongoDb": {
-    "ConnectionString": "mongodb://localhost:27017",
-    "DatabaseName": "Gozareshgir"
-  },
-  "SmsSettings": {
-    "IsTestMode": false,
-    "TestNumbers": []
-  },
-  "InternalApi": {
-    "Local": "https://localhost:7032",
-    "Dadmehrg": "https://api.pm.dadmehrg.ir",
-    "Gozareshgir": "https://api.pm.gozareshgir.ir"
-  },
-
-  "SepehrGateWayTerminalId": 99213700,
-  "JwtSettings": {
-    "SecretKey": ">3£>^1UBG@yw)QdhRC3$£:;r8~?qpp^oKK4D3a~8L2>enF;lkgh",
-    "Issuer": "GozareshgirApp",
-    "Audience": "GozareshgirUsers",
-    "ExpirationMinutes": 30
-  }
-}