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);
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 @@
1.0.0.0
sprint1
- 1.10.9.0
+ 1.10.10.0
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",
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++)
{
diff --git a/client/src/js/views/RentalRequests.jsx b/client/src/js/views/RentalRequests.jsx
index 9bb7cb51..8d1a144b 100644
--- a/client/src/js/views/RentalRequests.jsx
+++ b/client/src/js/views/RentalRequests.jsx
@@ -218,6 +218,16 @@ class RentalRequests extends React.Component {
this.setState({ showAddDialog: false });
};
+
+ handleNewAddedRequestId = (id) => {
+ this.setState({ newAddedRequestId: id });
+ const currentPathname = this.props.location.pathname;
+ const newUrl = `${currentPathname}/${id}`;
+ this.props.history.push(newUrl);
+ };
+
+
+
newRentalAdded = async (rentalRequest) => {
await this.props.dispatch(Log.rentalRequestAdded(rentalRequest));
this.props.history.push(`${Constant.RENTAL_REQUESTS_PATHNAME}/${rentalRequest.id}`);
@@ -373,7 +383,7 @@ class RentalRequests extends React.Component {
CUSTOM,
]}
/>
-