From 94b13aa5343bfbed15cbcf3c392084b924d4e923 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <bcgov.brwang@gmail.com>
Date: Wed, 1 May 2024 13:22:46 -0700
Subject: [PATCH 1/5] TH-114320,TH-1144422, TH-113933: fixed 401 login error

---
 Server/HetsApi/Helpers/UserAccountHelper.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Server/HetsApi/Helpers/UserAccountHelper.cs b/Server/HetsApi/Helpers/UserAccountHelper.cs
index d6e9bad2..afd61588 100644
--- a/Server/HetsApi/Helpers/UserAccountHelper.cs
+++ b/Server/HetsApi/Helpers/UserAccountHelper.cs
@@ -142,6 +142,9 @@ public static HetUser GetUser(DbAppContext context, string username, string guid
                     updUser.AppLastUpdateUserGuid = guid;
                     updUser.AppLastUpdateUserid = username;
                     updUser.AppLastUpdateTimestamp = DateTime.UtcNow;
+                    updUser.AppCreateTimestamp = updUser.AppCreateTimestamp.ToUniversalTime();
+                    updUser.DbCreateTimestamp = updUser.DbCreateTimestamp.ToUniversalTime();
+                    updUser.DbLastUpdateTimestamp = updUser.DbLastUpdateTimestamp.ToUniversalTime();
 
                     context.HetUsers.Update(updUser);
 

From 4a5dddd3e3c1733c795ba6061c8641a9116c6cb8 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <bcgov.brwang@gmail.com>
Date: Thu, 2 May 2024 09:51:52 -0700
Subject: [PATCH 2/5] TH-114443: fixed the issue that noting showed when new
 request added

---
 client/src/js/views/RentalRequests.jsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/src/js/views/RentalRequests.jsx b/client/src/js/views/RentalRequests.jsx
index 9bb7cb51..05bed22c 100644
--- a/client/src/js/views/RentalRequests.jsx
+++ b/client/src/js/views/RentalRequests.jsx
@@ -216,8 +216,13 @@ class RentalRequests extends React.Component {
 
   closeAddDialog = () => {
     this.setState({ showAddDialog: false });
+    this.fetch();
   };
 
+
+
+
+
   newRentalAdded = async (rentalRequest) => {
     await this.props.dispatch(Log.rentalRequestAdded(rentalRequest));
     this.props.history.push(`${Constant.RENTAL_REQUESTS_PATHNAME}/${rentalRequest.id}`);
@@ -373,7 +378,7 @@ class RentalRequests extends React.Component {
                         CUSTOM,
                       ]}
                     />
-                    <Button id="search-button" variant="primary" type="submit">
+                    <Button id="search-button" variant="primary" type="submit" >
                       Search
                     </Button>
                     <Button className="btn-custom" id="clear-search-button" onClick={this.clearSearch}>

From c8dbd5e1db3c1d65c3914ced460e3e7979068a7d Mon Sep 17 00:00:00 2001
From: bcgov-brwang <bcgov.brwang@gmail.com>
Date: Mon, 6 May 2024 09:14:12 -0700
Subject: [PATCH 3/5] 1.10.10: sorted RotationList by block number first then
 by equipment seniority

---
 .../Repositories/RentalRequestRepository.cs         | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Server/HetsData/Repositories/RentalRequestRepository.cs b/Server/HetsData/Repositories/RentalRequestRepository.cs
index 60fdc0ce..886852cc 100644
--- a/Server/HetsData/Repositories/RentalRequestRepository.cs
+++ b/Server/HetsData/Repositories/RentalRequestRepository.cs
@@ -196,11 +196,18 @@ public RentalRequestDto GetRecordWithRotationList(int id, SeniorityScoringRules
                     }
                 }
             }
-            // TH-112626
-            // Sorting the RentalRequestRotationList based on Equipment.Seniority
+            //// TH-112626
+            //// Sorting the RentalRequestRotationList based on Equipment.Seniority
+            //var sortedList = request.HetRentalRequestRotationLists
+            //    .OrderByDescending(x => x.Equipment.Seniority)
+            //    .ToList();
+
+            // Sorting the RotationList by block number first then by equipment seniority 
             var sortedList = request.HetRentalRequestRotationLists
-                .OrderByDescending(x => x.Equipment.Seniority)
+                .OrderBy(x => x.BlockNumber)
+                .ThenByDescending(x => x.Equipment.Seniority)
                 .ToList();
+
             // Updating RotationListSortOrder based on the sorted list
             for (int i = 0; i < sortedList.Count; i++)
             {

From f3d6cab1a6d454faa5a358a8cf43941fe7e0c19f Mon Sep 17 00:00:00 2001
From: bcgov-brwang <bcgov.brwang@gmail.com>
Date: Tue, 7 May 2024 14:26:12 -0700
Subject: [PATCH 4/5] 1.10.10: rework on TH-114443 bug fix

---
 client/src/js/views/RentalRequests.jsx                  | 8 +++++++-
 client/src/js/views/dialogs/RentalRequestsAddDialog.jsx | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/client/src/js/views/RentalRequests.jsx b/client/src/js/views/RentalRequests.jsx
index 05bed22c..8d1a144b 100644
--- a/client/src/js/views/RentalRequests.jsx
+++ b/client/src/js/views/RentalRequests.jsx
@@ -216,10 +216,15 @@ class RentalRequests extends React.Component {
 
   closeAddDialog = () => {
     this.setState({ showAddDialog: false });
-    this.fetch();
   };
 
 
+  handleNewAddedRequestId = (id) => {
+    this.setState({ newAddedRequestId: id });
+    const currentPathname = this.props.location.pathname;
+    const newUrl = `${currentPathname}/${id}`;
+    this.props.history.push(newUrl);
+  };
 
 
 
@@ -482,6 +487,7 @@ class RentalRequests extends React.Component {
             viewOnly={this.state.addViewOnly}
             onRentalAdded={this.newRentalAdded}
             onClose={this.closeAddDialog}
+            onNewRentalQuestIdGenerated={this.handleNewAddedRequestId}
           />
         )}
       </div>
diff --git a/client/src/js/views/dialogs/RentalRequestsAddDialog.jsx b/client/src/js/views/dialogs/RentalRequestsAddDialog.jsx
index 03dddb31..745f9f5c 100644
--- a/client/src/js/views/dialogs/RentalRequestsAddDialog.jsx
+++ b/client/src/js/views/dialogs/RentalRequestsAddDialog.jsx
@@ -205,8 +205,9 @@ class RentalRequestsAddDialog extends React.Component {
 
         try {
           const response = await dispatch(Api.addRentalRequest(request, this.props.viewOnly));
-          this.setState({ isSaving: false });
+          this.setState({ isSaving: false, newAddedRequestId: response.id});
           this.props.onRentalAdded(response);
+          this.props.onNewRentalQuestIdGenerated(response.id);
           this.props.onClose();
         } catch (error) {
           this.setState({ isSaving: false });

From 774bbf9649ee2e58e7563a57513d2dfacc421391 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <bcgov.brwang@gmail.com>
Date: Wed, 8 May 2024 13:46:06 -0700
Subject: [PATCH 5/5] 1.10.10: version updated to 1.10.10

---
 Server/HetsApi/HetsApi.csproj   | 2 +-
 Server/HetsApi/appsettings.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Server/HetsApi/HetsApi.csproj b/Server/HetsApi/HetsApi.csproj
index 02d49c87..42fe674e 100644
--- a/Server/HetsApi/HetsApi.csproj
+++ b/Server/HetsApi/HetsApi.csproj
@@ -12,7 +12,7 @@
   <PropertyGroup>
     <VersionPrefix>1.0.0.0</VersionPrefix>
     <VersionSuffix>sprint1</VersionSuffix>
-    <Version>1.10.9.0</Version>
+    <Version>1.10.10.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/Server/HetsApi/appsettings.json b/Server/HetsApi/appsettings.json
index 46c8f2e2..0586e7d9 100644
--- a/Server/HetsApi/appsettings.json
+++ b/Server/HetsApi/appsettings.json
@@ -13,8 +13,8 @@
     "LogoffUrl-Training": "https://logontest.gov.bc.ca/clp-cgi/logoff.cgi?returl=https://trn-hets.th.gov.bc.ca&retnow=1",
     "LogoffUrl-UAT": "https://logontest.gov.bc.ca/clp-cgi/logoff.cgi?returl=https://uat-hets.th.gov.bc.ca&retnow=1",
     "LogoffUrl-Production": "https://logon.gov.bc.ca/clp-cgi/logoff.cgi?returl=https://hets.th.gov.bc.ca&retnow=1",
-    "Version-Application": "Release 1.10.9.0",
-    "Version-Database": "Release 1.10.9.0",
+    "Version-Application": "Release 1.10.10.0",
+    "Version-Database": "Release 1.10.10.0",
     "Maximum-Blank-Agreements": "3",
     "ExceptionDescriptions": {
       "HETS-01": "Record not found",