diff --git a/EnotaryoPH/EnotaryoPH.Web/Pages/Notary/Dashboard/Dashboard.cshtml b/EnotaryoPH/EnotaryoPH.Web/Pages/Notary/Dashboard/Dashboard.cshtml
index 28cf701..73d5fcb 100644
--- a/EnotaryoPH/EnotaryoPH.Web/Pages/Notary/Dashboard/Dashboard.cshtml
+++ b/EnotaryoPH/EnotaryoPH.Web/Pages/Notary/Dashboard/Dashboard.cshtml
@@ -36,7 +36,7 @@
{
@transaction.Type |
- @transaction.Date.ToShortDateString() |
+ @transaction.Date.ToString("g") |
@transaction.Status |
Link |
diff --git a/EnotaryoPH/EnotaryoPH.Web/Pages/Notary/Dashboard/Dashboard.cshtml.cs b/EnotaryoPH/EnotaryoPH.Web/Pages/Notary/Dashboard/Dashboard.cshtml.cs
index 1ac0df7..ded8f0f 100644
--- a/EnotaryoPH/EnotaryoPH.Web/Pages/Notary/Dashboard/Dashboard.cshtml.cs
+++ b/EnotaryoPH/EnotaryoPH.Web/Pages/Notary/Dashboard/Dashboard.cshtml.cs
@@ -27,7 +27,7 @@ namespace EnotaryoPH.Web.Pages.Notary.Dashboard
.Where(t => t.Status == nameof(TransactionState.Submitted) && t.Lawyer.UserID != currentUser.UserID && t.PreferredLawyer.UserID != currentUser.UserID)
.Select(t => new DashboardItem
{
- Date = t.TransactionDate,
+ Date = t.CreatedOn.Value,
Link = $"/Notary/TransactionStatus/{t.Transaction_UID}",
Status = t.Status,
Type = t.TransactionDocument.DocumentType
@@ -42,7 +42,7 @@ namespace EnotaryoPH.Web.Pages.Notary.Dashboard
.Where(t => (t.Status == nameof(TransactionState.Submitted) && t.PreferredLawyer.UserID == currentUser.UserID) || (t.Status == nameof(TransactionState.Accepted) && t.Lawyer.UserID == currentUser.UserID))
.Select(t => new DashboardItem
{
- Date = t.TransactionDate,
+ Date = t.CreatedOn.Value,
Link = t.Status == nameof(TransactionState.Accepted) ? $"/Participant/VideoCall/Room/{t.Transaction_UID}" : $"/Notary/TransactionStatus/{t.Transaction_UID}",
Status = t.Status,
Type = t.TransactionDocument.DocumentType
diff --git a/EnotaryoPH/EnotaryoPH.Web/Pages/Principal/Dashboard/Dashboard.cshtml b/EnotaryoPH/EnotaryoPH.Web/Pages/Principal/Dashboard/Dashboard.cshtml
index 3e19d25..b31ef8a 100644
--- a/EnotaryoPH/EnotaryoPH.Web/Pages/Principal/Dashboard/Dashboard.cshtml
+++ b/EnotaryoPH/EnotaryoPH.Web/Pages/Principal/Dashboard/Dashboard.cshtml
@@ -65,6 +65,7 @@
Type |
Status |
+ Created |
Link |
@@ -75,6 +76,7 @@
@item.Type |
@item.Status |
+ @item.Date.ToString("g") |
View |
}
diff --git a/EnotaryoPH/EnotaryoPH.Web/Pages/Principal/Dashboard/Dashboard.cshtml.cs b/EnotaryoPH/EnotaryoPH.Web/Pages/Principal/Dashboard/Dashboard.cshtml.cs
index 8cef210..a033f5f 100644
--- a/EnotaryoPH/EnotaryoPH.Web/Pages/Principal/Dashboard/Dashboard.cshtml.cs
+++ b/EnotaryoPH/EnotaryoPH.Web/Pages/Principal/Dashboard/Dashboard.cshtml.cs
@@ -36,7 +36,7 @@ namespace EnotaryoPH.Web.Pages.Principal.Dashboard
.Where(ut => ut.Status != nameof(TransactionState.Completed))
.Select(ut => new DashboardItem
{
- Date = ut.TransactionDate,
+ Date = ut.CreatedOn.GetValueOrDefault(),
Status = ut.Status,
Type = ut.TransactionDocument?.DocumentType ?? "PENDING",
Link = CreateDocumentLink(ut)
@@ -56,6 +56,7 @@ namespace EnotaryoPH.Web.Pages.Principal.Dashboard
private string CreateDocumentLink(Transaction tx) => tx.Status switch
{
nameof(TransactionState.New) => $"/Principal/NotaryoSteps/UploadDocument/{tx.Transaction_UID}",
+ nameof(TransactionState.Accepted) => $"/Participant/VideoCall/Room/{tx.Transaction_UID}",
nameof(TransactionState.DocumentUploaded) => $"/Principal/NotaryoSteps/ChooseNotary/{tx.Transaction_UID}",
_ => $"/Principal/TransactionStatus/{tx.Transaction_UID}"
};