Adam
/
TourIAm
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

small changes

This commit is contained in:
Adam 2024-09-02 10:09:42 +02:00
parent 64d38174be
commit 7662251bbd
5 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TIAMSharedUI/Pages/EditTransfers.razor
View File

@ -12,6 +12,7 @@
@using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Interfaces
@using AyCode.Services.Loggers @using AyCode.Services.Loggers
@using TIAM.Core.Enums @using TIAM.Core.Enums
@using TIAMWebApp.Shared.Application.Models.ClientSide.UI
@using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
@using TIAMWebApp.Shared.Application.Services @using TIAMWebApp.Shared.Application.Services
@using TIAMWebApp.Shared.Application.Utility @using TIAMWebApp.Shared.Application.Utility
@ -152,7 +153,8 @@ else
<hr /> <hr />
<p class="text-muted">Status on: <span class="text-body">@DateTime.Now.ToString("hh:mm tt"), @DateTime.Today.ToString("MMMM dd, yyyy")</span></p> <p class="text-muted">Status on: <span class="text-body">@DateTime.Now.ToString("hh:mm tt"), @DateTime.Today.ToString("MMMM dd, yyyy")</span></p>
<h5 class="text-muted">@Enum.GetName(typeof(TransferStatusType), _transfer.TransferStatusType)</h5> <h5 class="text-muted">@TransferStatusModel.GetStatusModel(_transfer.TransferStatusType);</h5>
</div> </div>
</div> </div>
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">

3
TIAMSharedUI/Pages/User/CardComponents/ProductCardComponent.razor
View File

@ -139,6 +139,7 @@
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
await AdminSignalRClient.GetTransferDestinationsAsync(_destinations);
var productOwner = await AdminSignalRClient.GetByIdAsync<List<Company>>(SignalRTags.GetCompaniesById, Context.ServiceProviderId); var productOwner = await AdminSignalRClient.GetByIdAsync<List<Company>>(SignalRTags.GetCompaniesById, Context.ServiceProviderId);
var productProfiles = await AdminSignalRClient.GetByIdAsync<List<Profile>>(SignalRTags.GetProfileById, Context.ProfileId); var productProfiles = await AdminSignalRClient.GetByIdAsync<List<Profile>>(SignalRTags.GetProfileById, Context.ProfileId);
@ -153,7 +154,7 @@
_isAddressTransferDestination = CheckDestinations(_productProfile.AddressId); _isAddressTransferDestination = CheckDestinations(_productProfile.AddressId);
} }
AdminSignalRClient.GetTransferDestinationsAsync(_destinations).Forget();
await base.OnInitializedAsync(); await base.OnInitializedAsync();
} }

4
TIAMSharedUI/Pages/User/CardComponents/TransferCardComponent.razor
View File

@ -154,6 +154,8 @@
[Parameter] public EventCallback<string> DataChanged { get; set; } [Parameter] public EventCallback<string> DataChanged { get; set; }
[Parameter] public string Role { get; set; }
private LoggerClient<TransferCardComponent> _logger = null!; private LoggerClient<TransferCardComponent> _logger = null!;
//Email //Email
@ -301,7 +303,7 @@
void SendMail(Transfer item) void SendMail(Transfer item)
{ {
_logger.Info($"Preparing mail to {item.ContactEmail}, {item.Id}"); _logger.Info($"Preparing mail to {item.ContactEmail}, {item.Id}");
_messageWizardModel.Subject = $"[#{item.OrderId}] New message from guest"; _messageWizardModel.Subject = $"[#{item.OrderId}] New message from {Role}";
_messageWizardModel.ReceiverId = TiamConstClient.SysAccounts["SystemEmailSender"]; _messageWizardModel.ReceiverId = TiamConstClient.SysAccounts["SystemEmailSender"];
//get first sysadmin //get first sysadmin

13
TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor
View File

@ -124,7 +124,7 @@
</HeaderTextTemplate> </HeaderTextTemplate>
<ContentTemplate> <ContentTemplate>
<TransferCardComponent DataChanged="RefreshComponent" Context="@transfer" /> <TransferCardComponent Role="driver" DataChanged="RefreshComponent" Context="@transfer" />
</ContentTemplate> </ContentTemplate>
</DxAccordionItem> </DxAccordionItem>
@ -373,8 +373,15 @@
case 5: case 5:
return "text-danger fa-solid fa-triangle-exclamation"; return "text-danger fa-solid fa-triangle-exclamation";
case > 5 and < 35: case 10:
return "text-warning fa-solid fa-triangle-exclamation"; return "text-primary fa-solid fa-circle-xmark";
case 15:
return "text-primary fa-solid fa-circle-question";
case > 15 and <35:
return "text-success fa-solid fa-clock-rotate-left";
case 35: case 35:
return "text-success fa-solid fa-circle-check"; return "text-success fa-solid fa-circle-check";

7
TIAMSharedUI/Pages/User/UserManageTransfers.razor
View File

@ -117,7 +117,7 @@
<ContentTemplate> <ContentTemplate>
<TransferCardComponent DataChanged="RefreshComponent" Context="@transfer" /> <TransferCardComponent Role="passenger" DataChanged="RefreshComponent" Context="@transfer" />
</ContentTemplate> </ContentTemplate>
</DxAccordionItem> </DxAccordionItem>
@ -368,8 +368,9 @@
return "text-danger fa-solid fa-triangle-exclamation"; return "text-danger fa-solid fa-triangle-exclamation";
case > 5 and < 35: case > 5 and < 35:
return "text-warning fa-solid fa-triangle-exclamation";
return "text-primary fa-solid fa-clock-rotate-left";
case 35: case 35:
return "text-success fa-solid fa-circle-check"; return "text-success fa-solid fa-circle-check";