fix task

AccountManagement.Application/TaskApplication.cs

@@ -622,6 +622,7 @@ public class TaskApplication : ITaskApplication
         {
             return operation.Failed("چنین وظیفه ای درخواستی برای مهلت ندارد");
         }
+
         assign.RejectTimeRequest();
         if (assign.EndTaskDate.Date <= DateTime.Now.Date)
         {

AccountManagement.Domain/AssignAgg/Assign.cs

@@ -71,6 +71,7 @@ public class Assign : EntityBase
 
 	public void AcceptTimeRequest()
 	{
+        ClearRequests();
         TimeRequest = false;
 		AcceptedTimeRequest++;
         EndTaskDate = RequestDate < DateTime.Today ? DateTime.Today : RequestDate.Value;
@@ -78,6 +79,7 @@ public class Assign : EntityBase
     }
 	public void RejectTimeRequest()
 	{
+        ClearRequests();
         TimeRequest = false;
 		TimeRequestDescription = null;
 		RequestDate = null;
@@ -92,6 +94,7 @@ public class Assign : EntityBase
 	}
 	public void AcceptCancelRequest()
 	{
+        ClearRequests();
         IsCanceledRequest = false;
 		IsCancel = true;
 
@@ -99,23 +102,27 @@ public class Assign : EntityBase
 	}
 	public void RejectCancel()
 	{
+        ClearRequests();
         CancelDescription = null;
 		IsCanceledRequest = false;
 	}
 
 	public void CompleteRequest(string? doneDescription)
 	{
+        ClearRequests();
         DoneDescription = doneDescription;
 		IsDoneRequest = true;
 	}
 
 	public void RejectCompleteRequest()
 	{
+        ClearRequests();
         IsDoneRequest = false;
 		DoneDescription = null;
 	}
 	public void Completed()
 	{
+        ClearRequests();
         IsDoneRequest = false;
 		IsDone = true;
 	}
@@ -128,6 +135,13 @@ public class Assign : EntityBase
 		TimeRequest = false;
 	}
 
+    public void ClearRequests()
+    {
+        IsDoneRequest = false;
+        IsCanceledRequest = false;
+        TimeRequest = false;
+    }
+
 	public void InsertNewData(DateTime endTaskDate,bool timeRequest,int acceptedTimeRequest,DateTime? requestDate, string timeRequestDescription, bool isCanceledRequest,
 		bool isCancel,string cancelDescription,bool isDone,bool isDoneRequest,string? doneDescription)
 	{

AccountMangement.Infrastructure.EFCore/Repository/TaskRepository.cs

@@ -2735,7 +2735,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         var raw = _accountContext.Assigns.Include(x => x.Task).ThenInclude(x => x.TaskMedias)
             .ThenInclude(x => x.Media)
             .Where(x =>
-                x.Task.IsActiveString == "true" && x.AssignedId == accountId && x.Task.TicketId == null);
+                x.Task.IsActiveString == "true" && x.AssignedId == accountId  && x.Task.TicketId == null &&!x.IsDoneRequest && !x.IsCanceledRequest);
         if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
         {
             raw = raw.Where(x =>
@@ -2878,8 +2878,8 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
 
 
         var orderResult = result.OrderBy(x => x.IsDone || x.IsCancel)
-            .ThenByDescending(x => x.EndTaskDateGE <= today.AddDays(1) && !x.HasRequest)
-            .ThenByDescending(x => x.HasRequest)
+            .ThenByDescending(x => x.EndTaskDateGE <= today.AddDays(1) && !x.RequestTime)
+            .ThenByDescending(x => x.RequestTime)
             .ThenBy(x => x.EndTaskDateGE); // مرتب‌سازی داخلی بر اساس تاریخ
 
 
@@ -2915,7 +2915,6 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             SelfName = x.SelfName,
             Description = x.Description,
             IsDoneRequest = x.IsDoneRequest,
-            HasRequest = x.IsDoneRequest || x.RequestTime || x.IsCancelRequest
 
         }).ToList();
 
@@ -2943,7 +2942,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             AcceptedTimeRequest = x.AcceptedTimeRequest,
             IsCancelRequest = x.IsCancelRequest,
             ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, x.HasRequest),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel,x.RequestTime),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -3003,6 +3002,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                     AssignedPositionValue = 0
                 },
             HasRequest = x.IsCancelRequest || x.RequestTime || x.IsDoneRequest
+
         }).ToList();
         return final;
     }