diff --git a/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor b/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor index 82d4fc6..2f089a3 100644 --- a/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor +++ b/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor @@ -2,69 +2,71 @@ @inherits EventHubComponentBase @inject IUserAppService UserAppService - - - @L["AddUser"] - - - -
- - - @L["UserName"] - - - -
+ + + + @L["AddUser"] + + + +
+ + + @L["UserName"] + + + +
- - - - - - - - @if (SelectAllUsers.ContainsKey(context.Id)) - { - - } - - + + + + + + + + @if (SelectAllUsers.ContainsKey(context.Id)) + { + + } + + - - - @(context.Username) - - + + + @(context.Username) + + - - - @(context.Name) - - + + + @(context.Name) + + - - - @(context.Surname) - - + + + @(context.Surname) + + - - - @(context.Email) - - - - - - - - - - + + + @(context.Email) + + + + + + + + + + + \ No newline at end of file diff --git a/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor.cs b/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor.cs index 66982f1..082d268 100644 --- a/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor.cs +++ b/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor.cs @@ -13,7 +13,6 @@ namespace EventHub.Admin.Web.Components.UserPicker { public partial class UserPicker { - [Parameter] public Modal UserPickerModal { get; set; } [Parameter] @@ -29,8 +28,8 @@ namespace EventHub.Admin.Web.Components.UserPicker private string CurrentSorting { get; set; } private int TotalCount { get; set; } private int PageSize { get; } + public Dictionary SelectAllUsers = new(); - private bool AllUserSelected { get => SelectAllUsers.All(x => x.Value); @@ -102,6 +101,13 @@ namespace EventHub.Admin.Web.Components.UserPicker await InvokeAsync(StateHasChanged); } + public Task OpenUserPickerModalAsync() + { + UserPickerModal.Show(); + + return Task.CompletedTask; + } + public Task CloseUserPickerModalAsync() { UserPickerModal.Hide(); @@ -113,5 +119,10 @@ namespace EventHub.Admin.Web.Components.UserPicker { await SaveFormAsync.InvokeAsync(); } + + private void ClosingUserPickerModal(ModalClosingEventArgs eventArgs) + { + eventArgs.Cancel = eventArgs.CloseReason == CloseReason.FocusLostClosing; + } } } diff --git a/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor b/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor index c4414b3..f99c45b 100644 --- a/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor +++ b/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor @@ -7,17 +7,15 @@ @inject IEventRegistrationAppService EventRegistrationAppService @inject IUserAppService UserAppService - - @* ************************* PAGE HEADER ************************* *@

@L["Attendees"]

@if (CanAddAttendee) { } @@ -25,7 +23,6 @@ - @* ************************* DATA GRID ************************* *@ - - - + \ No newline at end of file diff --git a/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor.cs b/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor.cs index fd348aa..86380db 100644 --- a/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor.cs +++ b/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor.cs @@ -23,7 +23,6 @@ namespace EventHub.Admin.Web.Pages private int TotalCount { get; set; } private int PageSize { get; } private bool CanAddAttendee { get; set; } - private Modal AddAttendeeModal { get; set; } private GetEventRegistrationListInput Filter { get; set; } public UserPicker UserPickerModalRef { get; set; } @@ -90,7 +89,7 @@ namespace EventHub.Admin.Web.Pages await EventRegistrationAppService.RegisterUsersAsync(EventId, selectedUserIds); - AddAttendeeModal.Hide(); + await UserPickerModalRef.CloseUserPickerModalAsync(); await GetAttendeesAsync(); await InvokeAsync(StateHasChanged); @@ -101,9 +100,9 @@ namespace EventHub.Admin.Web.Pages } } - private void ClosingUserPickerModal(ModalClosingEventArgs eventArgs) + private async Task OpenUserPickerModal() { - eventArgs.Cancel = eventArgs.CloseReason == CloseReason.FocusLostClosing; + await UserPickerModalRef.OpenUserPickerModalAsync(); } } }