Code-Style: DRO: Validate Profile erst in SendResponse machen

Client/Modules/SZUAbsolventenverein.Module.EventRegistration/Details.razor

@@ -1,5 +1,6 @@
 @using Oqtane
 @using Oqtane.Modules.Controls
+@using Oqtane.Themes.Controls
 @using SZUAbsolventenverein.Module.EventRegistration.Services
 @using SZUAbsolventenverein.Module.EventRegistration.Models
 @using System.Text.RegularExpressions
@@ -19,7 +20,7 @@
 <p>Willst du am Event (@_name) teilnehmen?</p>
 <span class="mb-6">@_eventDate.ToLocalTime() - @_location</span>
 <div>
-    @((MarkupString)_description)
+    @((MarkupString) _description)
 </div>
 
 @if (PageState.User != null) {
@@ -46,11 +47,10 @@
 } else
 {
     <p class="mt-3">Um dich für dieses Event zu registrieren, muss man sich zuerst anmelden.</p>
+    <div class="gap-2">
     <Login />
-    @* @if(PageState.Site.AllowRegistration)
-    {
-        <Register />
-    } *@
+    <UserProfile ShowRegister="true" />
+    </div>
 }
 
 @code {
@@ -82,6 +82,7 @@
 
     private async Task SendResponse(bool response)
     {
+        if(ValidateProfiles()) {
         if(_response == null)
         {
             _response = new Response();
@@ -96,13 +97,6 @@
             _response = await EventRegistrationService.UpdateResponseAsync(_response);
         }
         if(_response != null) Status = _response.ResponseType;
-    }
-
-    private async void Zusage()
-    {
-        if(ValidateProfiles())
-        {
-            await SendResponse(true);
         } else
         {
             var currentPathAndQuery = new Uri(NavigationManager.Uri).PathAndQuery;
@@ -113,31 +107,28 @@
         }
     }
 
+    private async void Zusage()
+    {
+        await SendResponse(true);
+    }
+
     private async void Absage()
     {
-        if(ValidateProfiles())
-        {
             await SendResponse(false);
-        } else
-        {
-            var currentPathAndQuery = new Uri(NavigationManager.Uri).PathAndQuery;
-            var encodedReturnUrl = Uri.EscapeDataString(currentPathAndQuery);
-            var link = $"/profile?tab=profile&returnurl={encodedReturnUrl}";
-
-            AddModuleMessage(string.Format(SharedLocalizer["ProfileRequired"], $"Vervollständige hier dein Profil mit deinem Jahrgang und deiner Fachrichtung: {link}"), MessageType.Warning);
-        }
     }
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
+            if(PageState.User != null) {
             _profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
             var user = await UserService.GetUserAsync(PageState.User.UserId, PageState.Site.SiteId);
             if (user != null)
             {
                 _settings = user.Settings;
             }
+            }
 
             _id = Int32.Parse(PageState.QueryString["id"]);
 

Client/SZUAbsolventenverein.Module.EventRegistration.Client.csproj

@@ -13,11 +13,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.8" />
-    <PackageReference Include="System.Net.Http.Json" Version="9.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.9" />
+    <PackageReference Include="System.Net.Http.Json" Version="9.0.9" />
   </ItemGroup>
 
   <ItemGroup>

Server/SZUAbsolventenverein.Module.EventRegistration.Server.csproj

@@ -19,10 +19,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
   </ItemGroup>
 
   <ItemGroup>