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

Merge branch 'master' of http://git2.aycode.com/Adam/TourIAm

This commit is contained in:
Loretta 2024-08-15 18:45:49 +02:00
parent bb9d576a05 50c0a32b71
commit 97c6cb3009
3 changed files with 20 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor
View File

@ -44,15 +44,17 @@
SearchMode="@ListSearchMode.AutoSearch" SearchMode="@ListSearchMode.AutoSearch"
SearchFilterCondition="@ListSearchFilterCondition.Contains" SearchFilterCondition="@ListSearchFilterCondition.Contains"
ListRenderMode="ListRenderMode.Virtual" ListRenderMode="ListRenderMode.Virtual"
TextFieldName="Name"></DxComboBox> TextFieldName="Name"
CssClass="form-field">
</DxComboBox>
<div class="row py-3"> <div class="row py-3">
<DynamicEditForm Data="Data" isEditing="true" IgnoreReflection="TransferIgnorList" OnSubmit="SubmitForm"></DynamicEditForm> <DynamicEditForm Data="Data" isEditing="true" IgnoreReflection="TransferIgnorList" OnSubmit="SubmitForm"></DynamicEditForm>
</div> </div>
<div class="row py-3"> <div class="row py-3">
<DxButton RenderStyle="ButtonRenderStyle.Primary" Click="@Reload" Visible="@isReloadVisible">Reload</DxButton> <DxButton RenderStyle="ButtonRenderStyle.Primary" Click="@Reload" Visible="@isReloadVisible">Reload</DxButton>
</div> </div>
@ -134,11 +136,11 @@
registration.ReferralId = productOwner[0].AffiliateId; registration.ReferralId = productOwner[0].AffiliateId;
var createResult = await UserDataService.CreateGuestUser(registration); var createResult = await UserDataService.CreateGuestUser(registration);
if(createResult.isSuccess) if (createResult.isSuccess)
{ {
if (createResult.user != null) if (createResult.user != null)
{ {
valami.UserId = createResult.user.Id; valami.UserId = createResult.user.Id;
} }
} }
_logger.Info("New user created added"); _logger.Info("New user created added");

38
TIAMSharedUI/Pages/User/Messages.razor
View File

@ -1,44 +1,16 @@
<div class="card-body card-admin-body py-2 px-4"> @page "/user/messages/{userId:guid}"
<div class="card-body card-admin-body py-2 px-4">
<div class="d-flex flex-column mb-4 pb-2"> <div class="d-flex flex-column mb-4 pb-2">
<div class="media text-muted pt-3">
<!--img src="https://bootdey.com/img/Content/avatar/avatar7.png" alt="" class="mr-2 rounded" width="32" height="32"-->
<p class="media-body pb-3 mb-0 small lh-125 border-bottom border-gray">
<strong class="d-block text-gray-dark">username</strong>
Donec id elit non mi porta gravida at eget metus...
</p>
</div>
<div class="media text-muted pt-3">
<p class="media-body pb-3 mb-0 small lh-125 border-bottom border-gray">
<strong class="d-block text-gray-dark">username</strong>
Donec id elit non mi porta gravida at eget metus...
</p>
</div>
<div class="media text-muted pt-3">
<p class="media-body pb-3 mb-0 small lh-125 border-bottom border-gray">
<strong class="d-block text-gray-dark">username</strong>
Donec id elit non mi porta gravida at eget metus...
</p>
</div>
<div class="media text-muted pt-3">
<p class="media-body pb-3 mb-0 small lh-125 border-bottom border-gray">
<strong class="d-block text-gray-dark">username</strong>
Donec id elit non mi porta gravida at eget metus...
</p>
</div>
</div> </div>
</div> </div>
@code { @code {
[Parameter] public Guid? userId { get; set; }
} }

8
TIAMSharedUI/Shared/Users/AdminNavMenu.razor
View File

@ -77,7 +77,11 @@
</Items> </Items>
</DxMenuItem--> </DxMenuItem-->
@* <DxMenuItem NavigateUrl="user/messages" Text="Messages" IconCssClass="fa-solid fa-envelope" /> *@ @* <DxMenuItem NavigateUrl="user/messages" Text="Messages" IconCssClass="fa-solid fa-envelope" /> *@
<DxMenuItem NavigateUrl="user/messages" IconCssClass="fa-solid fa-envelope" /> @{
string url3 = $"user/messages/{userId}";
<DxMenuItem NavigateUrl="@url3" IconCssClass="fa-solid fa-envelope" />
}
<DxMenuItem CssClass="notoggle" Position="ItemPosition.End"> <DxMenuItem CssClass="notoggle" Position="ItemPosition.End">
<TextTemplate> <TextTemplate>
<div class="fa-solid fa-user" /> <div class="fa-solid fa-user" />
@ -120,6 +124,7 @@
private bool userHasHotels = false; private bool userHasHotels = false;
private string? userEmail; private string? userEmail;
private string? userFullName; private string? userFullName;
private Guid? userId;
private Guid driverPermissionId; private Guid driverPermissionId;
@ -151,6 +156,7 @@
} }
if (SessionService.User != null) if (SessionService.User != null)
{ {
userId = SessionService.User.UserId;
driverPermissionId = SessionService.DriverPersmissionId; driverPermissionId = SessionService.DriverPersmissionId;
userEmail = SessionService.User.Email; userEmail = SessionService.User.Email;
if (SessionService.User.UserModelDto.ProfileDto.FullName != null) if (SessionService.User.UserModelDto.ProfileDto.FullName != null)