Client Side structure for recommended 10 Users (ready for Florian)

Client/Components/UserComponent.razor

@@ -0,0 +1,6 @@
+<h3>@user.DisplayName</h3>
+
+@code {
+    [Parameter]
+    public User user { get; set; }
+}

Client/Interop.cs

@@ -11,20 +11,5 @@ namespace SZUAbsolventenverein.Module.EventRegistration
         {
             _jsRuntime = jsRuntime;
         }
-        
-        public async Task CreateChart(string divid, string type, string[] labels, object[] datasets, object options)
-        {
-            try
-            {
-                await _jsRuntime.InvokeVoidAsync(
-                    "SZUAbsolventenverein.EventRegistration.createChart",
-                    divid, type, (object) labels, (object) datasets, options);
-            }
-            catch
-            {
-                // handle exception
-            }
-        }
-
     }
 }

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

@@ -4,6 +4,7 @@
 @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
@@ -44,6 +45,10 @@
             <button class="btn btn-danger" @onclick="Absage">@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>
@@ -80,6 +85,8 @@
     private List<Profile> _profiles = new List<Profile>();
     private Dictionary<string, string> _settings;
     
+    private List<User> _users = new List<User>() {new User() {DisplayName = "Hello"}, new User() {DisplayName = "World"}};
+
     private async Task SendResponse(bool response)
     {
         if(ValidateProfiles()) {

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

@@ -42,7 +42,6 @@
     {
         <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
     }
-    <div id="chart"></div>
 </form>
 
 @code {
@@ -54,9 +53,7 @@
 
     public override List<Resource> Resources => new List<Resource>()
     {
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" },
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
-        new Resource { ResourceType = ResourceType.Script, Bundle = "ChartJS", Url = "https://cdn.jsdelivr.net/npm/chart.js" },
-        new Resource { ResourceType = ResourceType.Script, Bundle = "ChartJS", Url = ModulePath() + "Module.js"}
     };
 
     
@@ -75,9 +72,6 @@
     private string _modifiedby;
     private DateTime _modifiedon;
 
-    bool _refresh = false;
-    private List<Response> _responses;
-
     protected override async Task OnInitializedAsync()
     {
         try
@@ -98,10 +92,6 @@
                     _modifiedby = EventRegistration.ModifiedBy;
                     _modifiedon = EventRegistration.ModifiedOn;
                 }
-
-                _responses = await EventRegistrationService.GetEventResponses(_id, ModuleState.ModuleId);
-                Console.WriteLine("Responses count: " + (_responses != null ? _responses.Count.ToString() : "null"));
-                _refresh = true;
             }
         }
         catch (Exception ex)
@@ -111,37 +101,6 @@
         }
     }
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        try
-        {
-            await base.OnAfterRenderAsync(firstRender);
-
-            Console.WriteLine("Responses count: " + (_responses != null ? _responses.Count.ToString() : "null"));
-            
-            if (_refresh && _responses != null)
-            {
-                List<string> labels = new List<string>();
-                List<object> datasets = new List<object>();
-                string[] colors = new string[] { "#FF0000", "#FF8000", "#FFFF00", "#00FF00", "#00FFFF", "#0080FF", "#0000FF", "#8000FF", "#FF00FF", "#CCCCCC" };
-
-                labels.AddRange("Zusage", "Absage");
-                datasets.Add(new { label = "DS1", data = new int[] { _responses.Count(r => r.ResponseType == true), _responses.Count(r => r.ResponseType == false) }, fill = false, backgroundColor = colors });
-                object options = new { maintainAspectRatio = false, legend = new { display = true, position = "bottom", labels = new { fontColor = "white", fontSize = 16 } } };
-
-                var interop = new Interop(JSRuntime);
-                await interop.CreateChart("chart", "pie", labels.ToArray(), datasets.ToArray(), options);
-
-                _refresh = false;
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Rendering Chart {Error}", ex.Message);
-            AddModuleMessage("Error Rendering Chart", MessageType.Error);
-        }
-    }
-    
     private async Task Save()
     {
         try

Client/Services/EventRegistrationService.cs

@@ -15,6 +15,27 @@ 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());
@@ -30,9 +51,9 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services
             return await PostJsonAsync(CreateAuthorizationPolicyUrl($"{Apiurl}", EntityNames.Module, NewEvent.ModuleId), NewEvent);
         }
 
-        public async Task<Event> UpdateEventAsync(Event UpdatedEvent)
+        public async Task<Event> UpdateEventAsync(Event NewEvent)
         {
-            return await PutJsonAsync<Event>(CreateAuthorizationPolicyUrl($"{Apiurl}/{UpdatedEvent.EventId}", EntityNames.Module, UpdatedEvent.ModuleId), UpdatedEvent);
+            return await PutJsonAsync<Event>(CreateAuthorizationPolicyUrl($"{Apiurl}/{NewEvent.EventId}", EntityNames.Module, NewEvent.ModuleId), NewEvent);
         }
 
         public async Task DeleteEventAsync(int EventId, int ModuleId)
@@ -55,12 +76,7 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services
             return await GetJsonAsync<(Event, Response)>(CreateAuthorizationPolicyUrl($"{Apiurl}/details/{EventId}/{ModuleId}", EntityNames.Module, ModuleId));
         }
 
-        public async Task<List<Response>> GetEventResponses(int EventId, int ModuleId)
+        public Task<List<Response>> GetEventResponses(int EventId, int ModuleId)
-        {
-            return await GetJsonAsync<List<Response>>(CreateAuthorizationPolicyUrl($"{Apiurl}/all-responses/{EventId}/{ModuleId}", EntityNames.Module, ModuleId));
-        }
-
-        public Task<List<Response>> GetRecommendedEventResponses(int EventId, int MouleId)
         {
             throw new System.NotImplementedException();
         }

Server/Controllers/EventRegistrationController.cs

@@ -131,24 +131,6 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Controllers
             }
         }
 
-        // GET api/<controller>/5
-        [HttpGet("all-respones/{id}/{moduleid}")]
-        [Authorize(Policy = PolicyNames.ViewModule)]
-        public async Task<List<Models.Response>> GetResponses(int id, int moduleid)
-        {
-            List<Models.Response> eventResponses = await _EventRegistrationService.GetEventResponses(id, moduleid);
-            if (eventResponses != null && IsAuthorizedEntityId(EntityNames.Module, moduleid))
-            {
-                return eventResponses;
-            }
-            else
-            {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized EventRegistration Get Attempt {EventRegistrationId} {ModuleId}", id, moduleid);
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
-                return null;
-            }
-        }
-
         // TODO: Add Event Response Endpoints.
     }
 }

Server/Services/EventRegistrationService.cs

@@ -122,34 +122,6 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services
             }
         }
 
-        public Task<List<Event>> GetEventsAsync(int ModuleId)
-        {
-            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View))
-            {
-                return Task.FromResult(_EventRepository.GetEvents(ModuleId).ToList());
-            }
-            else
-            {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Events Get Attempt {ModuleId}", ModuleId);
-                return null;
-            }
-        }
-
-        public Task<Event> UpdateEventAsync(Event UpdatedEvent)
-        {
-            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, UpdatedEvent.ModuleId, PermissionNames.Edit))
-            {
-                UpdatedEvent = _EventRepository.UpdateEvent(UpdatedEvent);
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Event Updated {NewEvent}", UpdatedEvent);
-            }
-            else
-            {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Event Update Attempt {NewEvent}", UpdatedEvent);
-                UpdatedEvent = null;
-            }
-            return Task.FromResult(UpdatedEvent);
-        }
-
         public Task<(Event, Response)> GetEventDetails(int EventId, int ModuleId)
         {
             if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View))
@@ -176,13 +148,85 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services
                 _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Event Response Get Attempt {ModuleId}", ModuleId);
                 return null;
             }
-        }
-
-        public Task<List<Response>> GetRecommendedEventResponses(int EventId, int MouleId)
-        {
             throw new System.NotImplementedException();
         }
 
+        public Task<List<Event>> GetEventsAsync(int ModuleId)
+        {
+            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View))
+            {
+                return Task.FromResult(_EventRepository.GetEvents(ModuleId).ToList());
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Events Get Attempt {ModuleId}", ModuleId);
+                return null;
+            }
+        }
+
+        public Task<Event> UpdateEventAsync(Event NewEvent)
+        {
+            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, NewEvent.ModuleId, PermissionNames.Edit))
+            {
+                NewEvent = _EventRepository.UpdateEvent(NewEvent);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Event Updated {NewEvent}", NewEvent);
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Event Update Attempt {NewEvent}", NewEvent);
+                NewEvent = null;
+            }
+            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)
         {

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

@@ -2,25 +2,4 @@
 var SZUAbsolventenverein = SZUAbsolventenverein || {};
 
 SZUAbsolventenverein.EventRegistration = {
-    createChart: async function (divid, type, labels, datasets, options) {
-        var container = document.getElementById(divid);
-        if (container.hasChildNodes()) {
-            while (container.firstChild) {
-                container.removeChild(container.firstChild);
-            }
-        }
-        var canvas = document.createElement('canvas');
-        canvas.id = divid + '-canvas';
-        container.appendChild(canvas);
-        var ctx = canvas.getContext('2d');
-        var chart = new Chart(ctx, {
-            type: type,
-            data: {
-                labels: labels,
-                datasets: datasets
-            },
-            options: options
-        });
-    }
-
 };

Shared/Interfaces/IEventRegistrationService.cs

@@ -5,84 +5,26 @@ using SZUAbsolventenverein.Module.EventRegistration.Models;
 
 namespace SZUAbsolventenverein.Module.EventRegistration.Services
 {
-    
-    /// <summary>
-    /// Methods for managing events and their responses
-    /// </summary>
     public interface IEventRegistrationService 
     {
-        /// <summary>
+        /* Reine Events */
-        /// Alle Events eines Moduls abrufen
-        /// </summary>
-        /// <param name="ModuleId">das aufrufende Modul</param>
-        /// <returns>Liste aller Veranstaltungen</returns>
         Task<List<Event>> GetEventsAsync(int ModuleId);
-        /// <summary>
-        /// Ein bestimmtes Event abrufen
-        /// </summary>
-        /// <param name="EventId">das aufzurufende Event</param>
-        /// <param name="ModuleId">das aufrufende Modul</param>
-        /// <returns>Das Event selbst</returns>
         Task<Event> GetEventAsync(int EventId, int ModuleId);
 
-        /// <summary>
-        /// Ein neues Event anlegen
-        /// </summary>
-        /// <param name="NewEvent">das anzulegende Event</param>
-        /// <returns>das angelegte Event</returns>
         Task<Event> AddEventAsync(Event NewEvent);
 
-        /// <summary>
+        Task<Event> UpdateEventAsync(Event NewEvent);
-        /// Ändern eines bestehenden Events
-        /// </summary>
-        /// <param name="UpdatedEvent">Das Eventobjekt mit aktualisierte Event</param>
-        /// <returns>das gespeicherte Event</returns>
-        Task<Event> UpdateEventAsync(Event UpdatedEvent);
 
-        /// <summary>
-        /// Löschen eines Events
-        /// </summary>
-        /// <param name="EventId">das zu löschende Event</param>
-        /// <param name="ModuleId">das aufrufende Modul</param>
-        /// <returns></returns>
         Task DeleteEventAsync(int EventId, int ModuleId);
 
-        /// <summary>
+
-        /// Eine neue Antwort zu einem Event hinzufügen
+        /* Events & Responses */
-        /// </summary>
-        /// <param name="Response">die Antwort</param>
-        /// <returns>die gespeicherte Antwort</returns>
         Task<Response> AddResponseAsync(Response Response);
         
-        /// <summary>
-        /// Eine bestehende Antwort zu einem Event aktualisieren
-        /// </summary>
-        /// <param name="Response">die neue Antwort</param>
-        /// <returns>die gespeicherte neue Antwort</returns>
         Task<Response> UpdateResponseAsync(Response Response);
 
-        /// <summary>
-        /// Details zu einem Event abrufen (Event + Antwort vom auktuellen Benutzer)
-        /// </summary>
-        /// <param name="EventId">das aufzurufende Event</param>
-        /// <param name="ModuleId">das aufrufende Modul</param>
-        /// <returns>Tuple aus Event und Antwort</returns>
         Task<(Event, Response)> GetEventDetails(int EventId, int ModuleId);
 
-        /// <summary>
-        /// Alle Antworten zu einem Event abrufen
-        /// </summary>
-        /// <param name="EventId">das Event, dessen Antworten geladen werden sollen</param>
-        /// <param name="ModuleId">das aufrufende Modul</param>
-        /// <returns>Liste aller Antworten auf das Event</returns>
         Task<List<Response>> GetEventResponses(int EventId, int ModuleId);
-
-        /// <summary>
-        /// 10 Antworten eines Events abrufen, welche gewichtet zurückgeliefert werden
-        /// </summary>
-        /// <param name="EventId">das aufzurufende Event</param>
-        /// <param name="MouleId">das aufrufende Modul</param>
-        /// <returns>Liste mit 10 </returns>
-        Task<List<Response>> GetRecommendedEventResponses(int EventId, int MouleId);
     }
 }