Edit Your Details
+
+ +
+
+@code {
+ [Parameter] public Car MyCar { get; set; }
+
+ protected override async Task OnInitializedAsync()
+ {
+ await base.OnInitializedAsync();
+ }
+
+ protected override Task OnParametersSetAsync()
+ {
+
+ return base.OnParametersSetAsync();
+ }
+
+ RenderFragment RenderDetailsItem(string iconCssClass, string caption, string value)
+ {
+ return @
+
+
+
+ 
+
+
+
+
+ @($"{MyCar.Color}")
+ @MyCar.Manufacture
+@MyCar.CarModel
++ +
+
+
+
+ @RenderDetailsItem("fa-solid fa-engine", "Engine", Enum.GetName(MyCar.CarMotorType))
+
+
+ @RenderDetailsItem("fa-solid fa-location-dot", "Year", MyCar.YearOfMake.ToString())
+
+ +
+ @RenderDetailsItem("fa-solid fa-users", "Seats", MyCar.SeatNumber.ToString())
+
+
+
+
;
+ }
+}
diff --git a/TIAMSharedUI/Pages/User/CardComponents/CarCardComponent.razor.css b/TIAMSharedUI/Pages/User/CardComponents/CarCardComponent.razor.css
new file mode 100644
index 00000000..ca9b8b1d
--- /dev/null
+++ b/TIAMSharedUI/Pages/User/CardComponents/CarCardComponent.razor.css
@@ -0,0 +1,29 @@
+.e-name {
+ margin-bottom: 0.25rem;
+ font-size: 1.25rem;
+ font-weight: 500;
+ line-height: 1.2;
+}
+
+.e-email {
+ font-size: 0.75rem;
+ text-decoration: underline;
+ margin-bottom: 0;
+}
+
+.e-title {
+ font-size: 0.875rem;
+ margin-bottom: 0.5rem;
+}
+
+.e-details .text-container label {
+ font-size: 0.8125rem;
+ line-height: 1rem;
+}
+
+.e-details .text-container {
+ font-size: 0.875rem;
+ line-height: 1.125rem;
+ white-space: nowrap;
+}
+
diff --git a/TIAMSharedUI/Pages/User/CardComponents/TransferCardComponent.razor b/TIAMSharedUI/Pages/User/CardComponents/TransferCardComponent.razor
index 08499e3a..50d5463c 100644
--- a/TIAMSharedUI/Pages/User/CardComponents/TransferCardComponent.razor
+++ b/TIAMSharedUI/Pages/User/CardComponents/TransferCardComponent.razor
@@ -47,7 +47,7 @@
+
+
+
+
+
+ @value
+
@RenderDetailsItem("fa-solid fa-list-check", "Status", AllStatuses.FirstOrDefault(x => x.StatusValue == (byte)Context.TransferStatusType).StatusName)
-
+
@@ -151,7 +157,21 @@
await DataChanged.InvokeAsync(msg);
}
-
+ protected async Task PaidByCash()
+ {
+ Context.Paid = true;
+ var result = await AdminSignalRClient.PostDataAsync
+
Save
+ @if(!Context.Paid)
+ {
+
+
+
+ Paid in car
+
+ }
-
@msg
+
+ +
+
+@code {
+ [Parameter] public UserModelDtoDetail Context { get; set; }
+
+ [Parameter] public EventCallback
+
+
+
+ 
+
+
+
+
+ @($"{Context.UserDto.Id}")
+ @Context.UserDto.EmailAddress
+@Context.UserDto.PhoneNumber
++ +
+
+
+ @RenderDetailsItem("fa-solid fa-key", "Password", Context.UserDto.Password)
+
+
+
+
+
+ Save
+
+
+ @msg
+
+
;
+ }
+}
diff --git a/TIAMSharedUI/Pages/User/CardComponents/UserCardComponent.razor.css b/TIAMSharedUI/Pages/User/CardComponents/UserCardComponent.razor.css
new file mode 100644
index 00000000..ca9b8b1d
--- /dev/null
+++ b/TIAMSharedUI/Pages/User/CardComponents/UserCardComponent.razor.css
@@ -0,0 +1,29 @@
+.e-name {
+ margin-bottom: 0.25rem;
+ font-size: 1.25rem;
+ font-weight: 500;
+ line-height: 1.2;
+}
+
+.e-email {
+ font-size: 0.75rem;
+ text-decoration: underline;
+ margin-bottom: 0;
+}
+
+.e-title {
+ font-size: 0.875rem;
+ margin-bottom: 0.5rem;
+}
+
+.e-details .text-container label {
+ font-size: 0.8125rem;
+ line-height: 1rem;
+}
+
+.e-details .text-container {
+ font-size: 0.875rem;
+ line-height: 1.125rem;
+ white-space: nowrap;
+}
+
diff --git a/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor b/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor
index 08943bd8..fc2836cc 100644
--- a/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor
+++ b/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor
@@ -34,8 +34,8 @@
+
+
+
+
+
+ @value
+
-
@@ -46,8 +46,8 @@
CloseOnOutsideClick="false"
ShowCloseButton="false"
HeaderText="MessageBox"
- Closing="EulaPopupClosing"
- Closed="EulaPopupClosed">
+ Closing="EmailPopupClosing"
+ Closed="EmailPopupClosed">
Transfer management
-Manage transfers here!
+Tasks
+Manage your tasks here!
-
-
-
-
-
-
- @foreach (var (transfer, i) in Items)
- {
-
+
+
+
+
+
+
+
+
+
+ @foreach (var (transfer, i) in Upcoming)
+ {
+
-
-
-
- }
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+ }
+
+
+
+
+
+
+ @foreach (var (transfer, i) in Problems)
+ {
-
-
-
-
-
- @{
- var idKeyField = ((Transfer)context.DataItem).Id.ToString("N");
- var editUri = $"mytransfers/{idKeyField}";
-
- @context.Value
-
- }
-
-
-
-
- @{
- var keyField = context.Value;
- var keyItem = (Transfer)context.DataItem;
- string buttonText = "Contact";
-
-
-
-
- @{
-
- TransferStatusModel keyField = Statuses.FirstOrDefault(x => x.StatusValue == (byte)context.Value)!;
- string transferStatusText = keyField.StatusName;
- @transferStatusText
- }
-
-
-
-
-
- @{
- var transfer = ((Transfer)context.DataItem);
- }
-
-
-
-
-
-
-
-
- @{
- var transfer2 = (Transfer)editFormContext.EditModel;
- }
-
-
- @editFormContext.GetEditor("FirstName")
-
-
- @editFormContext.GetEditor("LastName")
-
-
- @editFormContext.GetEditor("ToAddress")
-
-
- @editFormContext.GetEditor("FromAddress")
-
-
-
-
-
-
-
-
- @editFormContext.GetEditor("PassengerCount")
-
-
-
- @editFormContext.GetEditor("Payed")
-
-
-
- @editFormContext.GetEditor("TransferStatusType")
-
-
-
-
+
+
+
+
+ }
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -260,10 +145,10 @@
private LoggerClient _logger;
private bool _popupVisible;
- private TransferGrid _gridTransfer;
private List? transfers = [];
- IEnumerable<(Transfer, int)> Items = [];
+ IEnumerable<(Transfer, int)> Upcoming = [];
+ IEnumerable<(Transfer, int)> Problems = [];
AccordionExpandMode ExpandMode { get; set; } = AccordionExpandMode.SingleOrNone;
AccordionExpandCollapseAction ExpandCollapseAction { get; set; } = AccordionExpandCollapseAction.HeaderClick;
@@ -292,15 +177,14 @@
new(Convert.ToByte(TransferStatusType.AdminDenied), "Admin cancelled")
];
- private static List _selectedCategories = Statuses.Where(x => /* x.StatusValue != (byte)TransferStatusType.OrderSubmitted && */ x.StatusValue != (byte)TransferStatusType.Finished && x.StatusValue != (byte)TransferStatusType.UserCanceled && x.StatusValue != (byte)TransferStatusType.AdminDenied).ToList();
- private string _filterText = GetFilterText(_selectedCategories.Select(x => (TransferStatusType)x.StatusValue).ToList());
+
private MessageWizardModel _messageWizardModel = new();
public List AppointmentModels { get; set; } = null!;
DateTime StartDate { get; set; } = DateTime.Today;
- DxSchedulerDataStorage _dataStorage = new();
+ DxSchedulerDataStorage _dataStorage = new();
private void RefreshComponent()
{
@@ -333,13 +217,13 @@
_popupVisible = false;
}
- void EulaPopupClosed()
+ void EmailPopupClosed()
{
//cancel clicked
}
- void EulaPopupClosing(PopupClosingEventArgs args)
+ void EmailPopupClosing(PopupClosingEventArgs args)
{
//myModel = new TransferWizardModel();
_messageWizardModel = new MessageWizardModel();
@@ -374,145 +258,34 @@
_logger.Info($"Submitted nested form: {result.GetType().FullName}");
}
- void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
- {
- try
- {
- if (e.ElementType == GridElementType.HeaderCell)
- {
- e.Style = "background-color: rgba(0, 0, 0, 0.08)";
- e.CssClass = "header-bold";
- }
-
- if (e.ElementType != GridElementType.DataRow) return;
-
- var transferStatus = e.Grid?.GetRowValue(e.VisibleIndex, "TransferStatusType");
- if (transferStatus == null) return;
-
- var transferStatusByte = (byte)transferStatus;
-
- switch (transferStatusByte)
- {
- case 5:
- e.CssClass = "bg-important";
- break;
- case > 5 and < 35:
- e.CssClass = "bg-attention";
- break;
- case 35:
- e.CssClass = "bg-finished";
- break;
- case > 35:
- e.CssClass = "bg-cancel";
- break;
- }
- }
- catch (Exception ex)
- {
- _logger.Error($"Grid_CustomizeElement; {ex.Message}", ex);
- }
- }
+
string GetCustomColor(TransferStatusType transferStatusType)
{
-
- var transferStatusByte = (byte)transferStatusType;
- switch (transferStatusByte)
- {
- case 5:
- return "bg-important";
+ var transferStatusByte = (byte)transferStatusType;
- case > 5 and < 35:
- return "bg-attention";
-
- case 35:
- return "bg-finished";
-
- case > 35:
- return "bg-cancel";
-
- default:
- return "";
- }
-
- }
-
- void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e)
- {
- if (!e.IsNew) return;
-
- var transferEditModel = (Transfer)e.EditModel; //TODO not valid cast
- transferEditModel.Id = Guid.NewGuid();
- transferEditModel.ToAddress = "Where to?";
- transferEditModel.FromAddress = "From where?";
- transferEditModel.Appointment = DateTime.UtcNow.AddDays(3);
- transferEditModel.PassengerCount = 1;
- transferEditModel.FirstName = "John";
- transferEditModel.LastName = "Doe";
- transferEditModel.ContactPhone = "+00000000000";
- transferEditModel.ContactEmail = "your@email.address";
- }
-
- private static string GetFilterText(ICollection selectedTransferStatuses)
- => selectedTransferStatuses.Count == 0 ? string.Empty : CriteriaOperator.FromLambda(t => selectedTransferStatuses.Contains(t.TransferStatusType)).ToString();
-
- void TagBox_ValuesChanged(IEnumerable newSelectedCategories)
- {
- var filterText = string.Empty;
- InOperator? filterCriteria = null;
-
- _selectedCategories = newSelectedCategories.ToList();
-
- if (_selectedCategories.Count > 0)
+ switch (transferStatusByte)
{
- filterCriteria = new InOperator("TransferStatusType", _selectedCategories.Select(c => c.StatusValue));
- filterText = GetFilterText(_selectedCategories.Select(x => (TransferStatusType)x.StatusValue).ToList());
+ case 5:
+ return "bg-important";
+
+ case > 5 and < 35:
+ return "bg-attention";
+
+ case 35:
+ return "bg-finished";
+
+ case > 35:
+ return "bg-cancel";
+
+ default:
+ return "";
}
- _filterText = filterText;
- _gridTransfer.SetFieldFilterCriteria("TransferStatusType", filterCriteria);
}
- private void DataSourceChanged(IList transfers)
- {
- _logger.Info("DataSourceChanged called");
- InitializeAppointments(transfers);
-
- if (_selectedCategories.Count > 0)
- TagBox_ValuesChanged(_selectedCategories);
-
- // if(!SelectedCategories.Any())
- // SelectedCategories = [Statuses.FirstOrDefault(x => x.StatusValue == (byte)TransferStatusType.Finished)!];
-
- // var filterTransferStatusType = Statuses.FirstOrDefault(x => x.StatusValue == (byte)TransferStatusType.Finished)!;
-
- // if (SelectedCategories.All(x => x.StatusValue != filterTransferStatusType.StatusValue))
- // SelectedCategories.Add(filterTransferStatusType);
- }
-
- private void DataSourceItemChanging(GridDataItemChangingEventArgs args)
- {
- _logger.Info("DataSourceItemChanging called");
- }
-
- private void DataSourceItemChanged(GridDataItemChangedEventArgs args)
- {
- _logger.Info("DataSourceItemChanged called");
-
- AppointmentModels.UpdateCollection(CreateAppointmentModel(args.DataItem), args.TrackingState == TrackingState.Remove);
- }
-
- private void DataItemSaving(GridEditModelSavingEventArgs e)
- {
- _logger.Info("DataItemSaving called");
- }
-
- private void DataItemDeleting(GridDataItemDeletingEventArgs e)
- {
- _logger.Info($"DataItemDeleting OnItemDeleting");
- }
protected override async Task OnInitializedAsync()
{
@@ -520,13 +293,21 @@
if (transfers != null)
{
var test = DriverId.ToString();
- transfers = await AdminSignalRClient.GetByIdAsync>(SignalRTags.GetTransfersByUserProductMappingId, DriverId);
- Items = transfers.Select((item, index) => (item, index));
+ var result = await AdminSignalRClient.GetByIdAsync>(SignalRTags.GetTransfersByUserProductMappingId, DriverId);
+ transfers = result.Where(t => t.TransferStatusType != TransferStatusType.UserCanceled && t.TransferStatusType != TransferStatusType.AdminDenied).ToList();
+ Upcoming = transfers.Where(x => x.Appointment >= DateTime.Now).Select((item, index) => (item, index));
+ Problems = transfers.Where(x => x.Appointment < DateTime.Now && x.TransferStatusType != TransferStatusType.Finished).Select((item, index) => (item, index));
+ InitializeAppointments(transfers);
}
-
+
await base.OnInitializedAsync();
}
+ private void GroupTransfers(List transferDataList)
+ {
+
+ }
+
private void InitializeAppointments(ICollection transferDataList)
{
_logger.Info("InitializeAppointments called");
@@ -569,17 +350,5 @@
return new AppointmentModel { Id = transfer.Id, StartDate = transfer.Appointment, EndDate = transfer.Appointment.AddMinutes(30), Description = $"{transfer.FullName}, {transfer.ToAddress}", Location = transfer.FromAddress, Caption = "Simple transfer" };
}
- void ColumnChooserButton_Click()
- {
- _gridTransfer.ShowColumnChooser();
- }
-
- protected override void OnAfterRender(bool firstRender)
- {
- if (firstRender)
- {
- //_gridTransfer.ExpandDetailRow(0);
- }
- }
}
\ No newline at end of file
diff --git a/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor b/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor
index 65a18cc8..12478896 100644
--- a/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor
+++ b/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor
@@ -26,22 +26,27 @@
-
Selected Hotel:
-
-
+
diff --git a/TIAMSharedUI/Pages/User/Hotels/HotelAdmin.razor b/TIAMSharedUI/Pages/User/Hotels/HotelAdmin.razor
index efa1abba..dc611414 100644
--- a/TIAMSharedUI/Pages/User/Hotels/HotelAdmin.razor
+++ b/TIAMSharedUI/Pages/User/Hotels/HotelAdmin.razor
@@ -13,7 +13,7 @@
-
+
-
-
+
+
+
- Selected Hotel:
+
+
+
+
+
-
-
-
-
-
-
+ @if (Id != null)
+{
+
-
-
- - username - Donec id elit non mi porta gravida at eget metus... -
-
-
-
- - username - Donec id elit non mi porta gravida at eget metus... -
-
-
-
- - username - Donec id elit non mi porta gravida at eget metus... -
-
-
-
-
-
-
-
- - username - Donec id elit non mi porta gravida at eget metus... -
-
+
+
+ @{
+ //check if has transferdestination
+ var AddressId = ((Product)context.DataItem).Profile.AddressId;
+ var result = CheckDestinations(AddressId);
+ //if not, display button
+ if (!result)
+ {
+ //
+
- @{
- //check if has transferdestination
- var AddressId = ((Product)context.DataItem).Profile.AddressId;
- var result = CheckDestinations(AddressId);
- //if not, display button
- if(!result)
- {
@@ -179,6 +184,7 @@
transferDestination.AddressString = address.AddressText;
var result = await AdminSignalRClient.PostDataAsync(SignalRTags.CreateTransferDestination, transferDestination);
_productGrid.Reload();
+ await InvokeAsync(StateHasChanged);
}
protected override async Task OnParametersSetAsync()
diff --git a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor
index 055db57a..49c4bde0 100644
--- a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor
+++ b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor
@@ -85,7 +85,7 @@
@@ -248,6 +248,12 @@
MenuDisplayMode DisplayMode { get; set; } = MenuDisplayMode.Auto;
Orientation Orientation { get; set; } = Orientation.Horizontal;
+ private void NavToAcc()
+ {
+ var url = $"user/account/{SessionService.User.UserId}";
+ NavigationManager.NavigateTo(url);
+ }
+
protected override void OnInitialized()
{
_logger = new LoggerClient(LogWriters.ToArray());
diff --git a/TIAMSharedUI/wwwroot/css/TourIAm.css b/TIAMSharedUI/wwwroot/css/TourIAm.css
index 47df5915..c19a7b3d 100644
--- a/TIAMSharedUI/wwwroot/css/TourIAm.css
+++ b/TIAMSharedUI/wwwroot/css/TourIAm.css
@@ -434,8 +434,8 @@ select:focus-visible {
.form-field, .card .form-field {
padding-left: 10px;
border-bottom: 1px solid;
- margin-bottom: 20px;
- /*border-radius: 20px;
+ /*margin-bottom: 20px;
+ border-radius: 20px;
box-shadow: inset 3px 3px 3px #cbced1, inset -3px -3px 3px #fff;*/
}
@@ -489,6 +489,28 @@ select:focus-visible {
}
}
+@media (max-width: 576px) {
+ .wrapper {
+ margin: 30px 20px;
+ padding: 40px 15px 15px 15px;
+ }
+
+ .carousel-item {
+ height: 30vh;
+ min-height: 350px;
+ background: no-repeat center center scroll;
+ -webkit-background-size: cover;
+ -moz-background-size: cover;
+ -o-background-size: cover;
+ background-size: cover;
+ }
+
+ .container-fluid {
+ padding-left: 0px;
+ padding-right: 0px;
+ }
+}
+
/*forms end*/
diff --git a/TIAMSharedUI/wwwroot/images/defaultcar_60.png b/TIAMSharedUI/wwwroot/images/defaultcar_60.png
new file mode 100644
index 00000000..9ba33059
Binary files /dev/null and b/TIAMSharedUI/wwwroot/images/defaultcar_60.png differ
@localizer.GetString("TransferDestination")
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor index 25522d6a..283acc65 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor @@ -61,29 +61,34 @@Address:
+ //@(((Product)context.DataItem).Profile.Address.AddressText)
+Address:
+@(((Product)context.DataItem).Profile.Address.AddressText)
+ } + } + +Address:
-@(((Product)context.DataItem).Profile.Address.AddressText)
-Address:
-@(((Product)context.DataItem).Profile.Address.AddressText)
- } - - } - +@SessionService.User.UserModelDto.ProfileDto.FullName
-