From 02cc0991046e20402bd763c3e1444fb2c5ccd17e Mon Sep 17 00:00:00 2001
From: mahan <mahanch83@gmail.com>
Date: Mon, 5 Jan 2026 16:45:59 +0330
Subject: [PATCH 1/4] feat: update time calculation to include minutes in
 section time setting

---
 .../Commands/SetTimeProject/SetTimeProjectCommandHandler.cs    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/SetTimeProject/SetTimeProjectCommandHandler.cs b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/SetTimeProject/SetTimeProjectCommandHandler.cs
index 2ee2ea7d..fdbadc28 100644
--- a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/SetTimeProject/SetTimeProjectCommandHandler.cs
+++ b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/SetTimeProject/SetTimeProjectCommandHandler.cs
@@ -352,7 +352,8 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
     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)
         {

From 1971252713cb52b9e81645b0857c40b636f51be2 Mon Sep 17 00:00:00 2001
From: mahan <mahanch83@gmail.com>
Date: Mon, 5 Jan 2026 17:52:12 +0330
Subject: [PATCH 2/4] feat: improve project board sorting by current user and
 task status

---
 .../ProjectBoardListQueryHandler.cs           | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListQueryHandler.cs b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListQueryHandler.cs
index 0cfd9bac..e6502494 100644
--- a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListQueryHandler.cs
+++ b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListQueryHandler.cs
@@ -53,7 +53,8 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
             .ToDictionaryAsync(x => x.Id, x => x.FullName, cancellationToken);
         
 
-        var result = data
+        var result = data .OrderByDescending(x => x.CurrentAssignedUserId == currentUserId)
+            .ThenBy(x => GetStatusOrder(x.Status))
             .Select(x =>
             {
                 // محاسبه یکبار برای هر Activity و Cache کردن نتیجه
@@ -95,9 +96,6 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
                         });
                     }
                 }
-
-                mergedHistories = mergedHistories.OrderByDescending(h => h.IsCurrentUser).ToList();
-
                 return new ProjectBoardListResponse()
                 {
                     Id = x.Id,
@@ -116,19 +114,21 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
                         : users.GetValueOrDefault(x.CurrentAssignedUserId, "ناشناس"),
                     SkillName =  x.Skill?.Name??"-",
                 };
-            })
-            .OrderByDescending(r => 
-            {
-                // اگر AssignedUser null نباشد، بررسی کن که برابر current user هست یا نه
-                if (r.AssignedUser != null)
-                {
-                    return users.FirstOrDefault(u => u.Value == r.AssignedUser).Key == currentUserId;
-                }
-                // اگر AssignedUser null بود، از OriginalUser بررسی کن
-                return users.FirstOrDefault(u => u.Value == r.OriginalUser).Key == currentUserId;
-            })
-            .ToList();
+            }).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
+        };
+    }
 }
\ No newline at end of file

From 9360dcad710a1998ab62100a58322b58916f2323 Mon Sep 17 00:00:00 2001
From: mahan <mahanch83@gmail.com>
Date: Mon, 5 Jan 2026 19:14:11 +0330
Subject: [PATCH 3/4] add UserSecretsId to ServiceHost.csproj

---
 ServiceHost/ServiceHost.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ServiceHost/ServiceHost.csproj b/ServiceHost/ServiceHost.csproj
index 8eb8a743..a6eb425b 100644
--- a/ServiceHost/ServiceHost.csproj
+++ b/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'">

From dd5455d80ac11e72e7938f432d0a22cd99b47b16 Mon Sep 17 00:00:00 2001
From: SamSys <f0604741@gmail.com>
Date: Mon, 5 Jan 2026 19:58:54 +0330
Subject: [PATCH 4/4] ignore apsettings

---
 .gitignore                               |  2 +
 ServiceHost/appsettings.Development.json | 71 ------------------------
 ServiceHost/appsettings.json             | 54 ------------------
 3 files changed, 2 insertions(+), 125 deletions(-)
 delete mode 100644 ServiceHost/appsettings.Development.json
 delete mode 100644 ServiceHost/appsettings.json

diff --git a/.gitignore b/.gitignore
index 674512f1..aa9d4d68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -362,3 +362,5 @@ MigrationBackup/
 # # Fody - auto-generated XML schema
 # FodyWeavers.xsd
 .idea
+/ServiceHost/appsettings.Development.json
+/ServiceHost/appsettings.json
diff --git a/ServiceHost/appsettings.Development.json b/ServiceHost/appsettings.Development.json
deleted file mode 100644
index d892b51d..00000000
--- a/ServiceHost/appsettings.Development.json
+++ /dev/null
@@ -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
-  }
-
-
-}
-
diff --git a/ServiceHost/appsettings.json b/ServiceHost/appsettings.json
deleted file mode 100644
index e5286144..00000000
--- a/ServiceHost/appsettings.json
+++ /dev/null
@@ -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://Logs//Gozareshgir//"
-  },
-  "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
-  }
-}