Diplomarbeit-Absolventenverein/Module.EventRegistration
6
0
Fork 0
Code Issues 7 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Compare commits

base: Diplomarbeit-Absolventenverein:kh-charts-auswertungen
Branches Tags
Diplomarbeit-Absolventenverein:main Diplomarbeit-Absolventenverein:net10.0-sln-to-slnx Diplomarbeit-Absolventenverein:linux-compatibility Diplomarbeit-Absolventenverein:ten-recommended-uses Diplomarbeit-Absolventenverein:kh-charts-auswertungen Diplomarbeit-Absolventenverein:linux-debug-environment Diplomarbeit-Absolventenverein:dev Diplomarbeit-Absolventenverein:ci Diplomarbeit-Absolventenverein:master
..
compare: Diplomarbeit-Absolventenverein:e22d36042546b6b005ba0cac8a6c44ab01dfc7d4
Branches Tags
Diplomarbeit-Absolventenverein:net10.0-sln-to-slnx Diplomarbeit-Absolventenverein:linux-compatibility Diplomarbeit-Absolventenverein:ten-recommended-uses Diplomarbeit-Absolventenverein:kh-charts-auswertungen Diplomarbeit-Absolventenverein:linux-debug-environment Diplomarbeit-Absolventenverein:main Diplomarbeit-Absolventenverein:dev Diplomarbeit-Absolventenverein:ci Diplomarbeit-Absolventenverein:master

4 Commits
kh-charts- ... e22d360425

Author SHA1 Message Date
KoCoder
e22d360425 Migrate further to net10.0.1 2026-01-29 21:23:45 +01:00
KoCoder
1c32640c78 Upgrade dependencies to net10.0 2026-01-29 21:21:06 +01:00
KoCoder
cb1c94f43c MIGRATE: sln to slnx 2026-01-29 21:16:35 +01:00
KoCoder
bbcc755b82 New: Linux release script fixed 2026-01-29 21:05:29 +01:00
15 changed files with 139 additions and 268 deletions
Expand all files Collapse all files

15
Client/Interop.cs
View File

@@ -11,20 +11,5 @@ namespace SZUAbsolventenverein.Module.EventRegistration
{ {
_jsRuntime = jsRuntime; _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
}
}
} }
} }

44
Client/Modules/SZUAbsolventenverein.Module.EventRegistration/Edit.razor
View File

@@ -42,7 +42,6 @@
{ {
<AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo> <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
} }
<div id="chart"></div>
</form> </form>
@code { @code {
@@ -54,9 +53,7 @@
public override List<Resource> Resources => new List<Resource>() 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 string _modifiedby;
private DateTime _modifiedon; private DateTime _modifiedon;
bool _refresh = false;
private List<Response> _responses;
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
try try
@@ -98,10 +92,6 @@
_modifiedby = EventRegistration.ModifiedBy; _modifiedby = EventRegistration.ModifiedBy;
_modifiedon = EventRegistration.ModifiedOn; _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) catch (Exception ex)
@@ -111,38 +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 = "ALL", data = new int[] { _responses.Count(r => r.ResponseType == true), _responses.Count(r => r.ResponseType == false) }, fill = false, backgroundColor = colors });
// datasets.Add(new { label = "2024", data = new int[] { 1, 1 }, 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() private async Task Save()
{ {
try try

12
Client/SZUAbsolventenverein.Module.EventRegistration.Client.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor"> <Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<Version>1.0.0</Version> <Version>1.0.0</Version>
<Authors>SZUAbsolventenverein</Authors> <Authors>SZUAbsolventenverein</Authors>
<Company>SZUAbsolventenverein</Company> <Company>SZUAbsolventenverein</Company>
@@ -13,11 +13,11 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.9" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.9" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" /> <PackageReference Include="Microsoft.Extensions.Localization" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.9" /> <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.1" />
<PackageReference Include="System.Net.Http.Json" Version="9.0.9" /> <PackageReference Include="System.Net.Http.Json" Version="10.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

32
Client/Services/EventRegistrationService.cs
View File

@@ -15,6 +15,27 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services
private string Apiurl => CreateApiUrl("EventRegistration"); 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) public async Task<List<Event>> GetEventsAsync(int ModuleId)
{ {
List<Event> EventRegistrations = await GetJsonAsync(CreateAuthorizationPolicyUrl($"{Apiurl}?moduleid={ModuleId}", EntityNames.Module, ModuleId), Enumerable.Empty<Event>().ToList()); 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); 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) 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)); 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(); throw new System.NotImplementedException();
} }

2
Package/SZUAbsolventenverein.Module.EventRegistration.Package.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild> <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<AccelerateBuildsInVisualStudio>false</AccelerateBuildsInVisualStudio> <AccelerateBuildsInVisualStudio>false</AccelerateBuildsInVisualStudio>
</PropertyGroup> </PropertyGroup>

12
Package/debug.sh
View File

@@ -3,10 +3,10 @@
TargetFramework=$1 TargetFramework=$1
ProjectName=$2 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.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 "../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.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 "../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.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 "../Shared/bin/Debug/$TargetFramework/$ProjectName$.Shared.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
cp -rf "../Server/wwwroot/"* "../../oqtane.framework/Oqtane.Server/wwwroot/" cp -rf "../Server/wwwroot/"* "../../oqtane.framework/Oqtane.Server/wwwroot/"

6
Package/release.sh
View File

@@ -1,5 +1,7 @@
TargetFramework=$1 TargetFramework=$1
ProjectName=$2 ProjectName=$2
"..\..\oqtane.framework\oqtane.package\nuget.exe" pack %ProjectName%.nuspec -Properties targetframework=%TargetFramework%;projectname=%ProjectName% find . -name *.nupkg -delete
cp -f "*.nupkg" "..\..\oqtane.framework\Oqtane.Server\Packages\" dotnet run --project ../../fixProps/FixProps/FixProps.csproj
nuget pack $ProjectName.nuspec -Properties "targetframework=${TargetFramework};ProjectName=${ProjectName}"
cp -f *.nupkg ../../oqtane.framework/Oqtane.Server/Packages/

46
SZUAbsolventenverein.Module.EventRegistration.sln
View File

@@ -1,46 +0,0 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.13.35828.75 d17.13
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Server", "..\oqtane.framework\Oqtane.Server\Oqtane.Server.csproj", "{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Module.EventRegistration.Client", "Client\SZUAbsolventenverein.Module.EventRegistration.Client.csproj", "{AA8E58A1-CD09-4208-BF66-A8BB341FD669}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Module.EventRegistration.Server", "Server\SZUAbsolventenverein.Module.EventRegistration.Server.csproj", "{04B05448-788F-433D-92C0-FED35122D45A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Module.EventRegistration.Shared", "Shared\SZUAbsolventenverein.Module.EventRegistration.Shared.csproj", "{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Module.EventRegistration.Package", "Package\SZUAbsolventenverein.Module.EventRegistration.Package.csproj", "{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Release|Any CPU.Build.0 = Release|Any CPU
{04B05448-788F-433D-92C0-FED35122D45A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{04B05448-788F-433D-92C0-FED35122D45A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{04B05448-788F-433D-92C0-FED35122D45A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{04B05448-788F-433D-92C0-FED35122D45A}.Release|Any CPU.Build.0 = Release|Any CPU
{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Release|Any CPU.Build.0 = Release|Any CPU
{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {1D016F15-46FE-4726-8DFD-2E4FD4DC7668}
EndGlobalSection
EndGlobal

9
SZUAbsolventenverein.Module.EventRegistration.slnx Normal file
View File

@@ -0,0 +1,9 @@
<Solution>
<Project Path="../oqtane.framework/Oqtane.Server/Oqtane.Server.csproj">
<Build Project="false" />
</Project>
<Project Path="Client/SZUAbsolventenverein.Module.EventRegistration.Client.csproj" />
<Project Path="Package/SZUAbsolventenverein.Module.EventRegistration.Package.csproj" />
<Project Path="Server/SZUAbsolventenverein.Module.EventRegistration.Server.csproj" />
<Project Path="Shared/SZUAbsolventenverein.Module.EventRegistration.Shared.csproj" />
</Solution>

18
Server/Controllers/EventRegistrationController.cs
View File

@@ -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. // TODO: Add Event Response Endpoints.
} }
} }

10
Server/SZUAbsolventenverein.Module.EventRegistration.Server.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor"> <Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<Version>1.0.0</Version> <Version>1.0.0</Version>
<Product>SZUAbsolventenverein.Module.EventRegistration</Product> <Product>SZUAbsolventenverein.Module.EventRegistration</Product>
@@ -19,10 +19,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.9" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.9" /> <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.9" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" /> <PackageReference Include="Microsoft.Extensions.Localization" Version="10.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

108
Server/Services/EventRegistrationService.cs
View File

@@ -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) public Task<(Event, Response)> GetEventDetails(int EventId, int ModuleId)
{ {
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View)) 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); _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Event Response Get Attempt {ModuleId}", ModuleId);
return null; return null;
} }
}
public Task<List<Response>> GetRecommendedEventResponses(int EventId, int MouleId)
{
throw new System.NotImplementedException(); 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) private void SendEventResponseNotification(string subject, string body)
{ {

21
Server/wwwroot/Modules/SZUAbsolventenverein.Module.EventRegistration/Module.js
View File

@@ -2,25 +2,4 @@
var SZUAbsolventenverein = SZUAbsolventenverein || {}; var SZUAbsolventenverein = SZUAbsolventenverein || {};
SZUAbsolventenverein.EventRegistration = { 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
});
}
}; };

66
Shared/Interfaces/IEventRegistrationService.cs
View File

@@ -5,84 +5,26 @@ using SZUAbsolventenverein.Module.EventRegistration.Models;
namespace SZUAbsolventenverein.Module.EventRegistration.Services namespace SZUAbsolventenverein.Module.EventRegistration.Services
{ {
/// <summary>
/// Methods for managing events and their responses
/// </summary>
public interface IEventRegistrationService 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); 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); 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); 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); 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); 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); 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); 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); 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);
} }
} }

2
Shared/SZUAbsolventenverein.Module.EventRegistration.Shared.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<Version>1.0.0</Version> <Version>1.0.0</Version>
<Product>SZUAbsolventenverein.Module.EventRegistration</Product> <Product>SZUAbsolventenverein.Module.EventRegistration</Product>
<Authors>SZUAbsolventenverein</Authors> <Authors>SZUAbsolventenverein</Authors>