Revert: 234

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,11 +20,11 @@
 <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) {
-
+    
     @if (Status != null)
     {
         <p class="mt-2"><strong>Status: </strong> 
@@ -46,11 +47,10 @@
 } else
 {
     <p class="mt-3">Um dich für dieses Event zu registrieren, muss man sich zuerst anmelden.</p>
-    <Login />
-    @* @if(PageState.Site.AllowRegistration)
-    {
-        <Register />
-    } *@
+    <div class="gap-2">
+        <Login />
+        <UserProfile ShowRegister="true" />
+    </div>
 }
 
 @code {
@@ -82,27 +82,21 @@
 
     private async Task SendResponse(bool response)
     {
-        if(_response == null)
-        {
-            _response = new Response();
-            _response.EventRegistrationId = _id;
-            _response.OwnerId = PageState.User.UserId;
-            _response.ModuleId = ModuleState.ModuleId;
-            _response.ResponseType = response;
-            _response = await EventRegistrationService.AddResponseAsync(_response);
-        } else
-        {
-            _response.ResponseType = response;
-            _response = await EventRegistrationService.UpdateResponseAsync(_response);
-        }
-        if(_response != null) Status = _response.ResponseType;
-    }
-
-    private async void Zusage()
-    {
-        if(ValidateProfiles())
-        {
-            await SendResponse(true);
+        if(ValidateProfiles()) {
+            if(_response == null)
+            {
+                _response = new Response();
+                _response.EventRegistrationId = _id;
+                _response.OwnerId = PageState.User.UserId;
+                _response.ModuleId = ModuleState.ModuleId;
+                _response.ResponseType = response;
+                _response = await EventRegistrationService.AddResponseAsync(_response);
+            } else
+            {
+                _response.ResponseType = response;
+                _response = await EventRegistrationService.UpdateResponseAsync(_response);
+            }
+            if(_response != null) Status = _response.ResponseType;
         } else
         {
             var currentPathAndQuery = new Uri(NavigationManager.Uri).PathAndQuery;
@@ -113,30 +107,27 @@
         }
     }
 
+    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);
-        }
+        await SendResponse(false);
     }
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
-            _profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
-            var user = await UserService.GetUserAsync(PageState.User.UserId, PageState.Site.SiteId);
-            if (user != null)
-            {
-                _settings = user.Settings;
+            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/Modules/SZUAbsolventenverein.Module.EventRegistration/ModuleInfo.cs

@@ -9,9 +9,9 @@ namespace SZUAbsolventenverein.Module.EventRegistration
         {
             Name = "EventRegistration",
             Description = "A module to manage registration for events",
-            Version = "1.0.14",
+            Version = "1.0.17",
             ServerManagerType = "SZUAbsolventenverein.Module.EventRegistration.Manager.EventRegistrationManager, SZUAbsolventenverein.Module.EventRegistration.Server.Oqtane",
-            ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,1.0.6,1.0.7,1.0.8,1.0.9,1.0.10,1.0.11,1.0.12,1.0.13,1.0.14",
+            ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,1.0.6,1.0.7,1.0.8,1.0.9,1.0.10,1.0.11,1.0.12,1.0.13,1.0.14,1.0.15,1.0.16,1.0.17",
             Dependencies = "SZUAbsolventenverein.Module.EventRegistration.Shared.Oqtane",
             PackageName = "SZUAbsolventenverein.Module.EventRegistration" 
         };

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>

Package/SZUAbsolventenverein.Module.EventRegistration.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>$projectname$</id>
-        <version>1.0.14</version>
+        <version>1.0.17</version>
         <authors>SZUAbsolventenverein</authors>
         <owners>SZUAbsolventenverein</owners>
         <title>EventRegistration</title>

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>