UserComponent 10 Benutzer anzeigen design fehlt noch

Needs-Future-Attention
#17
Removal of unset Fields and comments

Client/Components/UserComponent.razor

@@ -0,0 +1,23 @@
+@inject FileService fileService
+
+<div>
+    <img src=@profilePictureUrl />
+    <h4>@user.DisplayName</h4>
+    <p>@user.Settings["Jahrgang"] - @user.Settings["Fachrichtung"]</p>
+</div>
+
+@code {
+    [Parameter]
+    public User user { get; set; }
+
+    private string profilePictureUrl = "";
+
+    protected override async Task OnInitializedAsync()
+    {
+        if(user.PhotoFileId != null)
+        {
+            File f = await fileService.GetFileAsync(user.PhotoFileId);
+            profilePictureUrl = f.Url;
+        }
+    }
+}

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

@@ -1,45 +1,61 @@
-@using Oqtane.Modules.Controls
+@using Oqtane
+@using Oqtane.Modules.Controls
+@using Oqtane.Themes.Controls
 @using SZUAbsolventenverein.Module.EventRegistration.Services
 @using SZUAbsolventenverein.Module.EventRegistration.Models
+@using System.Text.RegularExpressions
+@using SZUAbsolventenverein.Module.EventRegistration.Client.Components
 
 @namespace SZUAbsolventenverein.Module.EventRegistration
 @inherits ModuleBase
 @inject IEventRegistrationService EventRegistrationService
 @inject NavigationManager NavigationManager
 @inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+@inject IUserService UserService
+@inject IProfileService ProfileService
+@inject ISettingService SettingService
 
 <h3>Anmeldung zum Event</h3>
 
 <p>Willst du am Event (@_name) teilnehmen?</p>
-<span>@_eventDate - @_location</span>
+<span class="mb-6">@_eventDate.ToLocalTime() - @_location</span>
 <div>
-    <p>@_description</p>
+    @((MarkupString) _description)
 </div>
 
 @if (PageState.User != null) {
-
+    
     @if (Status != null)
     {
-        <p class="mt-3"><strong>Status:</strong> 
+        <p class="mt-2"><strong>Status: </strong> 
             @if (Status == true)
             {
-                @Localizer["Zusage"]
-                <button class="btn btn-danger" @onclick="Absage">@Localizer["Absagen"]</button>
+                <span class ="fontsizeInf">@Localizer["Zugesagt"]</span><br />
+                <p><button class="btn btn-danger" @onclick="Reject">@Localizer["Absagen"]</button></p>
             } else
             {
-                @Localizer["Absage"]
-                <button class="btn btn-success" @onclick="Zusage">@Localizer["Zusagen"]</button>
+                <span class="fontsizeInf"> @Localizer["Abgesagt"]</span><br />
+                <p><button class="btn btn-success" @onclick="Accept">@Localizer["Zusagen"]</button></p>
             }
         </p>
     } else {
         <div class="buttons">
-            <button class="btn btn-success" @onclick="Zusage">@Localizer["Zusagen"]</button>
-            <button class="btn btn-danger" @onclick="Absage">@Localizer["Absagen"]</button>
+            <button class="btn btn-success" @onclick="Accept">@Localizer["Zusagen"]</button>
+            <button class="btn btn-danger" @onclick="Reject">@Localizer["Absagen"]</button>
         </div>
     }
+    @foreach (User u in _users)
+    {
+        <UserComponent user="u" />
+    }
 } else
 {
-    <p class="mt-3">Um dich für dieses Event zu registrieren, muss man sich zuerst anmelden.</p> <Login /><Register />
+    <p class="mt-3">Um dich für dieses Event zu registrieren, muss man sich zuerst anmelden.</p>
+    <div class="gap-2">
+        <Login />
+        <UserProfile ShowRegister="true" />
+    </div>
 }
 
 @code {
@@ -54,47 +70,53 @@
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
     };
 
-    // private ElementReference form;
-    // private bool validated = false;
-
     private int _id;
     private string _name;
     private string _description;
     private DateTime _eventDate;
     private string _location;
 
-    private string _createdby;
-    private DateTime _createdon;
-    private string _modifiedby;
-    private DateTime _modifiedon;
-
     private Response _response;
     private bool? Status;
 
+    private List<Profile> _profiles = new List<Profile>();
+    private Dictionary<string, string> _settings;
+    
+    private List<User> _users = new List<User>();
+
     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);
+        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
         {
-            _response.ResponseType = response;
-            _response = await EventRegistrationService.UpdateResponseAsync(_response);
+            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: <a href=\"{link}\">Link zum Profil</a>"), MessageType.Warning);
         }
-        if(_response != null) Status = _response.ResponseType;
     }
 
-    private async void Zusage()
+    private async void Accept()
     {
         await SendResponse(true);
     }
 
-    private async void Absage()
+    private async void Reject()
     {
         await SendResponse(false);
     }
@@ -104,7 +126,18 @@
         try
         {
             _id = Int32.Parse(PageState.QueryString["id"]);
-
+            
+            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;
+                }
+                _users = await EventRegistrationService.GetRecommendedResponses(_id, ModuleState.ModuleId);
+                _users.ForEach(u => Console.WriteLine(u.UserId));
+            }
+            
             Event currentEvent;
             Response rsvp;
             (currentEvent, rsvp) = await EventRegistrationService.GetEventDetails(_id, ModuleState.ModuleId);
@@ -112,12 +145,8 @@
             {
                 _name = currentEvent.Name;
                 _description = currentEvent.Description;
-                _eventDate = currentEvent.EventDate.ToLocalTime();
+                _eventDate = currentEvent.EventDate;
                 _location = currentEvent.Location;
-                _createdby = currentEvent.CreatedBy;
-                _createdon = currentEvent.CreatedOn.ToLocalTime();
-                _modifiedby = currentEvent.ModifiedBy;
-                _modifiedon = currentEvent.ModifiedOn.ToLocalTime();
             }
 
             if(rsvp != null)
@@ -132,4 +161,46 @@
             AddModuleMessage(Localizer["Message.LoadError"], MessageType.Error);
         }
     }
+
+
+    private bool ValidateProfiles()
+    {
+        foreach (Profile profile in _profiles)
+        {
+            var value = GetProfileValue(profile.Name, string.Empty);
+            if (string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(profile.DefaultValue))
+            {
+                _settings = SettingService.SetSetting(_settings, profile.Name, profile.DefaultValue);
+            }
+            if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+            {
+                if (profile.IsRequired && string.IsNullOrEmpty(value))
+                {
+                    AddModuleMessage(string.Format(SharedLocalizer["ProfileRequired"], profile.Title), MessageType.Warning);
+                    return false;
+                }
+                if (!string.IsNullOrEmpty(profile.Validation))
+                {
+                    Regex regex = new Regex(profile.Validation);
+                    bool valid = regex.Match(value).Success;
+                    if (!valid)
+                    {
+                        AddModuleMessage(string.Format(SharedLocalizer["ProfileInvalid"], profile.Title), MessageType.Warning);
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+    private string GetProfileValue(string SettingName, string DefaultValue)
+    {
+        string value = SettingService.GetSetting(_settings, SettingName, DefaultValue);
+        if (value.Contains("]"))
+        {
+            value = value.Substring(value.IndexOf("]") + 1);
+        }
+        return value;
+    }
 }

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

@@ -1,6 +1,7 @@
 @using Oqtane.Modules.Controls
 @using SZUAbsolventenverein.Module.EventRegistration.Services
 @using SZUAbsolventenverein.Module.EventRegistration.Models
+@using Microsoft.AspNetCore.Components.Forms
 
 @namespace SZUAbsolventenverein.Module.EventRegistration
 @inherits ModuleBase
@@ -17,22 +18,21 @@
             </div>
         </div>
         <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="description" HelpText="Enter a description" ResourceKey="Description">Description: </Label>
+            <Label Class="col-sm-3" For="location" HelpText="Enter a Location" ResourceKey="Location">Location: </Label>
             <div class="col-sm-9">
-                <input id="description" class="form-control" @bind="@_description" required />
+                <input id="location" class="form-control" @bind="@_location" required />
             </div>
         </div>
         <div class="row mb-1 align-items-center">
             <Label Class="col-sm-3" For="eventdate" HelpText="Enter a Date" ResourceKey="EventDate">EventDate: </Label>
             <div class="col-sm-9">
-                <input id="eventdate" class="form-control" @bind="@_eventDate" required />
+                <!--<input id="eventdate" class="form-control" @bind="@_eventDate" required />-->
+                <InputDate id="eventdate" class="form-control" @bind-Value="@_eventDate" Type="InputDateType.DateTimeLocal" />
             </div>
         </div>
-        <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="location" HelpText="Enter a Location" ResourceKey="Location">Location: </Label>
-            <div class="col-sm-9">
-                <input id="location" class="form-control" @bind="@_location" required />
-            </div>
+        <div class="mb-1 align-items-center">
+            <Label Class="" For="description" HelpText="Enter a description" ResourceKey="Description">Description: </Label>
+            <RichTextEditor @ref="@RichTextEditorHtml" Content="@_description" Placeholder="Enter a description"/>
         </div>
     </div>
     <button type="button" class="btn btn-success" @onclick="Save">@Localizer["Save"]</button>
@@ -56,13 +56,15 @@
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
     };
 
+    
+    private RichTextEditor RichTextEditorHtml;
     private ElementReference form;
     private bool validated = false;
 
     private int _id;
     private string _name;
     private string _description;
-    private DateTime _eventDate;
+    private DateTime _eventDate = DateTime.Now;
     private string _location;
 
     private string _createdby;
@@ -105,6 +107,10 @@
         {
             validated = true;
             var interop = new Oqtane.UI.Interop(JSRuntime);
+
+            string content = await RichTextEditorHtml.GetHtml();
+		    content = Utilities.FormatContent(content, PageState.Alias, "save");
+
             if (await interop.FormValid(form))
             {
                 if (PageState.Action == "Add")
@@ -112,7 +118,7 @@
                     Event EventRegistration = new Event();
                     EventRegistration.ModuleId = ModuleState.ModuleId;
                     EventRegistration.Name = _name;
-                    EventRegistration.Description = _description;
+                    EventRegistration.Description = content;
                     EventRegistration.EventDate = _eventDate.ToUniversalTime();
                     EventRegistration.Location = _location;
                     EventRegistration = await EventRegistrationService.AddEventAsync(EventRegistration);
@@ -122,7 +128,7 @@
                 {
                     Event EventRegistration = await EventRegistrationService.GetEventAsync(_id, ModuleState.ModuleId);
                     EventRegistration.Name = _name;
-                    EventRegistration.Description = _description;
+                    EventRegistration.Description = content;
                     EventRegistration.EventDate = _eventDate.ToUniversalTime();
                     EventRegistration.Location = _location;
                     await EventRegistrationService.UpdateEventAsync(EventRegistration);

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

@@ -16,24 +16,38 @@ else
     <ActionLink Action="Add" Security="SecurityAccessLevel.Edit" Text="Add Event" ResourceKey="Add" />
     <br />
     <br />
-    <p>@Status</p>
     @if (@_EventRegistrations.Count != 0)
     {
-        <Pager Items="@_EventRegistrations">
-            <Header>
-                <th style="width: 1px;">&nbsp;</th>
-                <th style="width: 1px;">&nbsp;</th>
-                <th>@Localizer["Name"]</th>
-                <th style="width: 1px;">&nbsp;</th>
-            </Header>
-            <Row>
-                <td><ActionLink Action="Edit" Parameters="@($"id=" + context.EventId.ToString())" ResourceKey="Edit"  /></td>
-                <td><ActionDialog Header="Delete EventRegistration" Message="Are You Sure You Wish To Delete This EventRegistration?" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" ResourceKey="Delete"  Id="@context.EventId.ToString()" /></td>
-                <td>@context.Name</td>
 
-                <td><ActionLink Action="Details" Parameters="@($"id=" + context.EventId.ToString())"  ResourceKey="Details"/></td>
-            </Row>
-        </Pager>
+        <div class="event-list">
+            <div class="event-list">
+                @foreach (var context in _EventRegistrations)
+                {
+                    <div class="event-card">
+                        <h3>@context.Name</h3>
+                        <p><strong>@Localizer["Date"]:</strong> @context.EventDate.ToLocalTime()</p>
+                        <p><strong>@Localizer["Location"]:</strong> @context.Location</p>
+
+                        <div class="event-actions">
+                            <ActionLink Action="Edit"
+                                        Parameters="@($"id={context.EventId}")"
+                                        ResourceKey="Edit" />
+
+                            <ActionDialog Action="Delete"
+                                          Security="SecurityAccessLevel.Edit"
+                                          Class="btn btn-danger"
+                                          OnClick="@(async () => await Delete(context))"
+                                          ResourceKey="Delete"
+                                          Id="@context.EventId.ToString()" />
+
+                            <ActionLink Action="Details"
+                                        Parameters="@($"id={context.EventId}")"
+                                        ResourceKey="Details" />
+                        </div>
+                    </div>
+                }
+            </div>
+        </div>
     }
     else
     {
@@ -42,8 +56,6 @@ else
 }
 
 @code {
-    private string Status;
-
     public override List<Resource> Resources => new List<Resource>()
     {
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" },
@@ -80,15 +92,4 @@ else
             AddModuleMessage(Localizer["Message.DeleteError"], MessageType.Error);
         }
     }
-
-    private async Task Accept(Event eventRegistration)
-    {
-        Status = ("EventRegistration Accepted " + eventRegistration.Name);
-        await logger.LogInformation("EventRegistration Accepted {EventRegistration}", eventRegistration);
-    }
-
-    private void Reject()
-    {
-        Status = "EventRegistration Rejected 1";
-    }
 }

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.5",
+            Version = "1.0.17",
             ServerManagerType = "SZUAbsolventenverein.Module.EventRegistration.Manager.EventRegistrationManager, SZUAbsolventenverein.Module.EventRegistration.Server.Oqtane",
-            ReleaseVersions = "1.0.0,1.0.5",
+            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/Resources/SZUAbsolventenverein.Module.EventRegistration/Index.resx

@@ -127,10 +127,10 @@
     <value>Delete</value>
   </data>
   <data name="Delete.Header" xml:space="preserve">
-    <value>Delete Event</value>
+    <value>Delete</value>
   </data>
   <data name="Delete.Message" xml:space="preserve">
-    <value>Are You Sure You Wish To Delete This Event?</value>
+    <value>Are You Sure You Wish To Delete This Event? If you delete an event, all existing registrations will be deleted as well.</value>
   </data>
   <data name="Message.DisplayNone" xml:space="preserve">
     <value>No Events To Display</value>
@@ -142,6 +142,15 @@
     <value>Error Deleting Event</value>
   </data>
   <data name="Details.Text" xml:space="preserve">
-    <value>Reject</value>
+    <value>Details</value>
+  </data>
+  <data name="Name" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="Date" xml:space="preserve">
+    <value>Date</value>
+  </data>
+  <data name="Location" xml:space="preserve">
+    <value>Location</value>
   </data>
 </root>

Client/SZUAbsolventenverein.Module.EventRegistration.Client.csproj

@@ -13,11 +13,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.3" />
-    <PackageReference Include="System.Net.Http.Json" Version="9.0.3" />
+    <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>

Client/Services/EventRegistrationService.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
+using Oqtane.Models;
 using Oqtane.Services;
 using Oqtane.Shared;
 using SZUAbsolventenverein.Module.EventRegistration.Models;
@@ -15,27 +16,6 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services
 
         private string Apiurl => CreateApiUrl("EventRegistration");
 
-        /*public async Task<List<Models.Event>> GetEventRegistrationsAsync(int ModuleId)
-        {
-            List<Models.Event> EventRegistrations = await GetJsonAsync<List<Models.Event>>(CreateAuthorizationPolicyUrl($"{Apiurl}?moduleid={ModuleId}", EntityNames.Module, ModuleId), Enumerable.Empty<Models.Event>().ToList());
-            return EventRegistrations.OrderBy(item => item.Name).ToList();
-        }
-
-        public async Task<Models.Event> GetEventRegistrationAsync(int EventRegistrationId, int ModuleId)
-        {
-            return await GetJsonAsync<Models.Event>(CreateAuthorizationPolicyUrl($"{Apiurl}/{EventRegistrationId}/{ModuleId}", EntityNames.Module, ModuleId));
-        }
-
-        public async Task<Models.Event> AddEventRegistrationAsync(Models.Event EventRegistration)
-        {
-            return await PostJsonAsync<Models.Event>(CreateAuthorizationPolicyUrl($"{Apiurl}", EntityNames.Module, EventRegistration.ModuleId), EventRegistration);
-        }
-
-        public async Task<Models.Event> UpdateEventRegistrationAsync(Models.Event EventRegistration)
-        {
-            return await PutJsonAsync<Models.Event>(CreateAuthorizationPolicyUrl($"{Apiurl}/{EventRegistration.EventRegistrationId}", EntityNames.Module, EventRegistration.ModuleId), EventRegistration);
-        }*/
-
         public async Task<List<Event>> GetEventsAsync(int ModuleId)
         {
             List<Event> EventRegistrations = await GetJsonAsync(CreateAuthorizationPolicyUrl($"{Apiurl}?moduleid={ModuleId}", EntityNames.Module, ModuleId), Enumerable.Empty<Event>().ToList());
@@ -80,5 +60,10 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services
         {
             throw new System.NotImplementedException();
         }
+
+        public Task<List<User>> GetRecommendedResponses(int EventId, int ModuleId)
+        {
+            throw new System.NotImplementedException();
+        }
     }
 }

Client/Startup/ClientStartup.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Oqtane.Services;
+using System.Linq;
 using SZUAbsolventenverein.Module.EventRegistration.Services;
 
 namespace SZUAbsolventenverein.Module.EventRegistration.Startup
@@ -8,7 +9,10 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Startup
     {
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddScoped<IEventRegistrationService, EventRegistrationService>();
+            if (!services.Any(s => s.ServiceType == typeof(IEventRegistrationService)))
+            {
+                services.AddScoped<IEventRegistrationService, EventRegistrationService>();
+            }
         }
     }
 }

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.0</version>
+        <version>1.0.17</version>
         <authors>SZUAbsolventenverein</authors>
         <owners>SZUAbsolventenverein</owners>
         <title>EventRegistration</title>
@@ -16,7 +16,7 @@
         <releaseNotes></releaseNotes>
         <summary></summary>
         <dependencies>
-            <dependency id="Oqtane.Framework" version="6.1.1" />
+            <dependency id="Oqtane.Framework" version="6.2.0" />
         </dependencies>
     </metadata>
     <files>

Package/debug.sh

@@ -3,10 +3,10 @@
 TargetFramework=$1
 ProjectName=$2
 
-cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
-cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
-cp -f "../Server/bin/Debug/$TargetFramework/$ProjectName$.Server.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
-cp -f "../Server/bin/Debug/$TargetFramework/$ProjectName$.Server.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
-cp -f "../Shared/bin/Debug/$TargetFramework/$ProjectName$.Shared.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
-cp -f "../Shared/bin/Debug/$TargetFramework/$ProjectName$.Shared.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
+cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName.Client.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
+cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName.Client.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
+cp -f "../Server/bin/Debug/$TargetFramework/$ProjectName.Server.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
+cp -f "../Server/bin/Debug/$TargetFramework/$ProjectName.Server.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
+cp -f "../Shared/bin/Debug/$TargetFramework/$ProjectName.Shared.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
+cp -f "../Shared/bin/Debug/$TargetFramework/$ProjectName.Shared.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
 cp -rf "../Server/wwwroot/"* "../../oqtane.framework/Oqtane.Server/wwwroot/"

Server/SZUAbsolventenverein.Module.EventRegistration.Server.csproj

@@ -19,10 +19,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.5" />
+    <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>

Server/Services/EventRegistrationService.cs

@@ -1,5 +1,7 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Numerics;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Oqtane.Enums;
@@ -23,9 +25,10 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services
         private readonly IUserPermissions _userPermissions;
         private readonly ILogManager _logger;
         private readonly IHttpContextAccessor _accessor;
+        private readonly ISettingRepository _settingRepository;
         private readonly Alias _alias;
 
-        public ServerEventRegistrationService(IEventRepository EventRepository, IResponseRepository ResponseRepository, INotificationRepository NotificationRepository, IUserRepository UserRepository, IUserPermissions userPermissions, ITenantManager tenantManager, ILogManager logger, IHttpContextAccessor accessor)
+        public ServerEventRegistrationService(IEventRepository EventRepository, IResponseRepository ResponseRepository, INotificationRepository NotificationRepository, IUserRepository UserRepository, IUserPermissions userPermissions, ITenantManager tenantManager, ILogManager logger, IHttpContextAccessor accessor, ISettingRepository settingRepository)
         {
             _EventRepository = EventRepository;
             _ResponseRepository = ResponseRepository;
@@ -34,6 +37,7 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services
             _userPermissions = userPermissions;
             _logger = logger;
             _accessor = accessor;
+            _settingRepository = settingRepository;
             _alias = tenantManager.GetAlias();
         }
 
@@ -81,8 +85,8 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services
                 Response = _ResponseRepository.UpdateResponse(Response);
 
                 Event currentEvent = _EventRepository.GetEvent(Response.EventRegistrationId);
-                string subject = Response.ResponseType ? $"Du bist erfolgreich für '{currentEvent.Name}' Registriert worden." : $"Du hast erfolgreich für '{currentEvent.Name}' abgesagt.";
-                string body = "Hier kann man die Infos des Events hineinpacken (HTML ist erlaubt)";
+                string subject = Response.ResponseType ? $"Du bist erfolgreich für '{currentEvent.Name}' registriert." : $"Du hast erfolgreich für '{currentEvent.Name}' abgesagt.";
+                string body = currentEvent.Description;
                 SendEventResponseNotification(subject, body);
                 
                 _logger.Log(LogLevel.Information, this, LogFunction.Create, "EventRegistration Added {NewEvent}", Response);
@@ -148,7 +152,32 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services
                 _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Event Response Get Attempt {ModuleId}", ModuleId);
                 return null;
             }
-            throw new System.NotImplementedException();
+        }
+
+        public async Task<List<User>> GetRecommendedResponses(int EventId, int ModuleId)
+        {
+            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View))
+            {
+                IEnumerable<Response> responses = _ResponseRepository.GetResponses(EventId, ModuleId).DistinctBy(r => r.OwnerId).Where(r => r.OwnerId != _accessor.HttpContext.User.UserId() && r.ResponseType);
+                IEnumerable<User> users = _UserRepository.GetUsers();
+                
+                List<Setting> userSettings = _settingRepository.GetSettings("User").ToList();
+                
+                List<Setting> requestorSettings = userSettings.FindAll(s => s.EntityId == _accessor.HttpContext.User.UserId());
+                string targetFachrichtung = requestorSettings.FirstOrDefault(s => s.SettingName == "Fachrichtung")?.SettingValue;
+                int targetStartjahr = int.Parse(requestorSettings.FirstOrDefault(s => s.SettingName == "Jahrgang")?.SettingValue ?? "0");
+
+
+                IEnumerable<GroupingUser> gu = responses.Join(users, r => r.OwnerId, u => u.UserId,
+                    (response, user) => (response, user)).GroupJoin(userSettings, ru => ru.user.UserId,
+                    s => s.EntityId, (ru, s) => new GroupingUser(ru.user, ru.response, s, targetStartjahr, targetFachrichtung)).OrderBy(gu => gu.Score());
+                return gu.Select(gu => gu.User).Take(10).ToList();
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Event Response Get Attempt {ModuleId}", ModuleId);
+                return null;
+            }
         }
 
         public Task<List<Event>> GetEventsAsync(int ModuleId)
@@ -179,55 +208,6 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services
             return Task.FromResult(NewEvent);
         }
 
-        // TODO: Implement the methods for EventResponses
-
-        /*
-
-        public Task<Models.Event> GetEventRegistrationAsync(int EventRegistrationId, int ModuleId)
-        {
-            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View))
-            {
-                return Task.FromResult(_EventRegistrationRepository.GetEventRegistration(EventRegistrationId));
-            }
-            else
-            {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized EventRegistration Get Attempt {EventRegistrationId} {ModuleId}", EventRegistrationId, ModuleId);
-                return null;
-            }
-        }
-
-        public Task<Models.Event> AddEventRegistrationAsync(Models.Event EventRegistration)
-        {
-            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, EventRegistration.ModuleId, PermissionNames.Edit))
-            {
-                EventRegistration = _EventRegistrationRepository.AddEventRegistration(EventRegistration);
-                _logger.Log(LogLevel.Information, this, LogFunction.Create, "EventRegistration Added {EventRegistration}", EventRegistration);
-            }
-            else
-            {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized EventRegistration Add Attempt {EventRegistration}", EventRegistration);
-                EventRegistration = null;
-            }
-            return Task.FromResult(EventRegistration);
-        }
-
-        public Task<Models.Event> UpdateEventRegistrationAsync(Models.Event EventRegistration)
-        {
-            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, EventRegistration.ModuleId, PermissionNames.Edit))
-            {
-                EventRegistration = _EventRegistrationRepository.UpdateEventRegistration(EventRegistration);
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "EventRegistration Updated {EventRegistration}", EventRegistration);
-            }
-            else
-            {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized EventRegistration Update Attempt {EventRegistration}", EventRegistration);
-                EventRegistration = null;
-            }
-            return Task.FromResult(EventRegistration);
-        }
-
-        }*/
-
         private void SendEventResponseNotification(string subject, string body)
         {
             User user = _UserRepository.GetUser(_accessor.HttpContext.User.UserId());
@@ -235,4 +215,76 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services
             _NotificationRepository.AddNotification(notification);
         }
     }
+
+    public class GroupingUser
+    {
+        private User _user;
+        private Response _response;
+        
+        private string _fachrichtung;
+        private int _startjahr;
+
+        private int _targetyear;
+        private string _targetfachrichtung;
+        public User User { get { return _user; } }
+
+        public IEnumerable<Setting> Settings
+        {
+            set
+            {
+                if (value == null)
+                {
+                    _fachrichtung = "-";
+                    _startjahr = 0;
+                    return;
+                }
+                _fachrichtung = value.FirstOrDefault(v => v.SettingName == "Fachrichtung", new Setting(){SettingValue = "-"}).SettingValue;
+                _startjahr = int.Parse(value.FirstOrDefault(v => v.SettingName == "Jahrgang", new Setting(){SettingValue = "0"}).SettingValue);
+            }
+        }
+        
+        public string TargetFachrichtung
+        {
+            set { _targetfachrichtung = value; }
+        }
+        public int TargetJahr
+        {
+            set { _targetyear = value; }
+        }
+
+        public GroupingUser(User user, Response response, IEnumerable<Setting> settings, int targetyear, string targetfachrichtung)
+        {
+            _user = user;
+            _response = response;
+            Settings = settings;
+            TargetJahr = targetyear;
+            TargetFachrichtung = targetfachrichtung;
+        }
+
+        public int Score()
+        {
+            int total = 0;
+            total += ScoreYear() * 5;
+            total += ScoreFachrichtung() * 3;
+
+            return total;
+        }
+        
+        private int ScoreYear()
+        {
+            return Math.Abs(_targetyear - _startjahr);
+        }
+
+        private int ScoreFachrichtung()
+        {
+            if (_fachrichtung == _targetfachrichtung)
+            {
+                return 1;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+    }
 }

Server/wwwroot/Modules/SZUAbsolventenverein.Module.EventRegistration/Module.css

@@ -1 +1,201 @@
-/* Module Custom Styles */
+/* Module Custom Styles */
+.mb-6 {
+    margin-bottom: 6rem;
+}
+
+.mt-3 {
+    margin-top: 3rem;
+}
+.mt-2 strong {
+    font-size: 1.4rem; /* Textgr<67><72>e <20> Standard ist ca. 1rem */
+    font-weight: 700;
+}
+.fontsizeInf {
+    font-size: 1.4rem; /* Textgr<67><72>e <20> Standard ist ca. 1rem */
+}
+.event-list {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 1.5rem;
+    justify-content: center;
+}
+
+.event-card {
+    /*background-color: var(--bs-gray-dark); */
+    border: 2px solid rgb(128 128 128); /* Umrandung */
+    border-radius: 12px;
+    box-shadow: 0 4px 10px rgba(0, 0, 0, 0.3);
+    padding: 1.5rem;
+    width: 280px;
+   /* color: #ddd; */
+    transition: all 0.3s ease;
+}
+
+
+    .event-card h3 {
+        margin-top: 0;
+        margin-bottom: 0.5rem;
+    }
+
+    .event-card p {
+        margin: 0.2rem 0;
+    }
+
+.event-actions {
+    margin-top: 1rem;
+    display: flex;
+    justify-content: space-between;
+}
+/* vorher:
+.event-card:hover {
+  border-color: #66ccff;
+  transform: translateY(-4px);   <-- das ist der <20>belt<6C>ter
+  box-shadow: 0 6px 14px rgba(0,0,0,0.5);
+}
+*/
+
+/* nachher <20> kein transform mehr */
+.event-card:hover {
+    border-color: #66ccff;
+    /* statt transform die Karte minimal "anheben" */
+    margin-top: -4px; /* optischer Lift */
+    box-shadow: 0 6px 14px rgba(0,0,0,0.5);
+}
+
+/* sicherheitshalber: Overlay darf nicht abgeschnitten werden */
+.event-card {
+    overflow: visible;
+}
+/* ---------- A) Hover nur auf Ger<65>ten mit Maus ---------- */
+@media (hover: hover) and (pointer: fine) {
+    .event-card:hover {
+        border-color: #66ccff;
+       
+        box-shadow: 0 6px 14px rgba(0,0,0,.5);
+    }
+}
+
+/* Auf Touch-Ger<65>ten kein transform (verhindert Modal-Probleme) */
+@media (hover: none), (pointer: coarse) {
+    .event-card:hover {
+        transform: none;
+        box-shadow: 0 6px 14px rgba(0,0,0,.5);
+    }
+}
+
+/* Sicherheitshalber: nichts abschneiden */
+.event-card {
+    overflow: visible;
+}
+
+
+/* ---------- B) Overlay/Modal (Desktop-Basis) ---------- */
+/* Falls schon vorhanden, kannst du diese Werte als Override nutzen */
+.overlay {
+    position: fixed;
+    inset: 0;
+    background: rgba(0,0,0,.45);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 2rem;
+    z-index: 2000;
+    overscroll-behavior: contain;
+}
+
+.modal {
+    background: #fff;
+    border-radius: 10px;
+    box-shadow: 0 20px 60px rgba(0,0,0,.35);
+    width: min(92vw, 720px);
+    max-height: 85vh;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden; /* f<>r sticky header/footer */
+}
+
+.modal-header,
+.modal-footer {
+    padding: 1rem 1.25rem;
+    background: #fff;
+}
+
+.modal-header {
+    border-bottom: 1px solid rgba(0,0,0,.1);
+}
+
+.modal-footer {
+    border-top: 1px solid rgba(0,0,0,.1);
+    display: flex;
+    gap: .75rem;
+    justify-content: flex-end;
+}
+
+.modal-body {
+    padding: 1rem 1.25rem;
+    overflow: auto;
+    -webkit-overflow-scrolling: touch;
+}
+
+    /* Medien responsiv im Detail-Dialog */
+    .modal-body img,
+    .modal-body video,
+    .modal-body canvas,
+    .modal-body iframe {
+        max-width: 100% !important;
+        height: auto !important;
+        display: block;
+    }
+
+
+/* ---------- C) Mobile-Vollbild & Sticky-Header/Footer ---------- */
+@supports (height: 100dvh) {
+    .modal {
+        max-height: 100dvh;
+    }
+}
+
+@media (max-width: 768px) {
+    .overlay {
+        padding: 0;
+    }
+
+    .modal {
+        width: 100vw;
+        height: 100vh; /* nutzt auf modernen Browsern 100dvh (s.o.) */
+        max-height: 100vh;
+        border-radius: 0;
+    }
+
+    .modal-header {
+        position: sticky;
+        top: 0;
+        z-index: 1;
+    }
+
+    .modal-footer {
+        position: sticky;
+        bottom: 0;
+        z-index: 1;
+    }
+
+    .modal-body {
+        padding: 1rem;
+    }
+
+        /* Lesbare <20>berschriften auf Mobile */
+        .modal-body h1 {
+            font-size: clamp(1.25rem, 5.5vw, 2rem);
+        }
+
+        .modal-body h2 {
+            font-size: clamp(1.125rem, 5vw, 1.5rem);
+        }
+}
+
+/* iOS Safe-Area (Notch) */
+@supports (padding: max(0px)) {
+    .modal {
+        padding-bottom: max(0px, env(safe-area-inset-bottom));
+    }
+}

Shared/Interfaces/IEventRegistrationService.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Oqtane.Models;
 using SZUAbsolventenverein.Module.EventRegistration.Models;
 
 namespace SZUAbsolventenverein.Module.EventRegistration.Services
@@ -26,5 +27,6 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services
         Task<(Event, Response)> GetEventDetails(int EventId, int ModuleId);
 
         Task<List<Response>> GetEventResponses(int EventId, int ModuleId);
+        Task<List<User>> GetRecommendedResponses(int EventId, int ModuleId);
     }
 }