eNotaryoPH/enotaryo-landing
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix some stuff in Dashboard

Browse Source
This commit is contained in:
jojo aquino 2025-03-26 21:37:32 +00:00
parent 9e839e61c4
commit 63d4bde015
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EnotaryoPH/EnotaryoPH.Web/Pages/Notary/Dashboard/Dashboard.cshtml
View File

@ -36,7 +36,7 @@
{ {
<tr> <tr>
<td>@transaction.Type</td> <td>@transaction.Type</td>
<td>@transaction.Date.ToShortDateString()</td> <td>@transaction.Date.ToString("g")</td>
<td>@transaction.Status</td> <td>@transaction.Status</td>
<td><a href="@transaction.Link">Link</a></td> <td><a href="@transaction.Link">Link</a></td>
</tr> </tr>

4
EnotaryoPH/EnotaryoPH.Web/Pages/Notary/Dashboard/Dashboard.cshtml.cs
View File

@ -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) .Where(t => t.Status == nameof(TransactionState.Submitted) && t.Lawyer.UserID != currentUser.UserID && t.PreferredLawyer.UserID != currentUser.UserID)
.Select(t => new DashboardItem .Select(t => new DashboardItem
{ {
Date = t.TransactionDate, Date = t.CreatedOn.Value,
Link = $"/Notary/TransactionStatus/{t.Transaction_UID}", Link = $"/Notary/TransactionStatus/{t.Transaction_UID}",
Status = t.Status, Status = t.Status,
Type = t.TransactionDocument.DocumentType 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)) .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 .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}", Link = t.Status == nameof(TransactionState.Accepted) ? $"/Participant/VideoCall/Room/{t.Transaction_UID}" : $"/Notary/TransactionStatus/{t.Transaction_UID}",
Status = t.Status, Status = t.Status,
Type = t.TransactionDocument.DocumentType Type = t.TransactionDocument.DocumentType

2
EnotaryoPH/EnotaryoPH.Web/Pages/Principal/Dashboard/Dashboard.cshtml
View File

@ -65,6 +65,7 @@
<tr> <tr>
<th>Type</th> <th>Type</th>
<th>Status</th> <th>Status</th>
<th>Created</th>
<th>Link</th> <th>Link</th>
</tr> </tr>
</thead> </thead>
@ -75,6 +76,7 @@
<tr> <tr>
<td>@item.Type</td> <td>@item.Type</td>
<td>@item.Status</td> <td>@item.Status</td>
<td>@item.Date.ToString("g")</td>
<td><a href="@item.Link">View</a></td> <td><a href="@item.Link">View</a></td>
</tr> </tr>
} }

3
EnotaryoPH/EnotaryoPH.Web/Pages/Principal/Dashboard/Dashboard.cshtml.cs
View File

@ -36,7 +36,7 @@ namespace EnotaryoPH.Web.Pages.Principal.Dashboard
.Where(ut => ut.Status != nameof(TransactionState.Completed)) .Where(ut => ut.Status != nameof(TransactionState.Completed))
.Select(ut => new DashboardItem .Select(ut => new DashboardItem
{ {
Date = ut.TransactionDate, Date = ut.CreatedOn.GetValueOrDefault(),
Status = ut.Status, Status = ut.Status,
Type = ut.TransactionDocument?.DocumentType ?? "PENDING", Type = ut.TransactionDocument?.DocumentType ?? "PENDING",
Link = CreateDocumentLink(ut) Link = CreateDocumentLink(ut)
@ -56,6 +56,7 @@ namespace EnotaryoPH.Web.Pages.Principal.Dashboard
private string CreateDocumentLink(Transaction tx) => tx.Status switch private string CreateDocumentLink(Transaction tx) => tx.Status switch
{ {
nameof(TransactionState.New) => $"/Principal/NotaryoSteps/UploadDocument/{tx.Transaction_UID}", 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}", nameof(TransactionState.DocumentUploaded) => $"/Principal/NotaryoSteps/ChooseNotary/{tx.Transaction_UID}",
_ => $"/Principal/TransactionStatus/{tx.Transaction_UID}" _ => $"/Principal/TransactionStatus/{tx.Transaction_UID}"
}; };