Merge branch 'kh-test' of https://git.kocoder.xyz/Diplomarbeit-Absolventenverein/Module.EventRegistration into kh-test
This commit is contained in:
@ -43,7 +43,12 @@
|
||||
}
|
||||
} 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>
|
||||
<Login />
|
||||
@* @if(PageState.Site.AllowRegistration)
|
||||
{
|
||||
<Register />
|
||||
} *@
|
||||
}
|
||||
|
||||
@code {
|
||||
|
||||
@ -16,7 +16,6 @@ else
|
||||
<ActionLink Action="Add" Security="SecurityAccessLevel.Edit" Text="Add Event" ResourceKey="Add" />
|
||||
<br />
|
||||
<br />
|
||||
<p>@Status</p>
|
||||
@if (@_EventRegistrations.Count != 0)
|
||||
{
|
||||
|
||||
@ -37,7 +36,7 @@ else
|
||||
<ActionDialog Action="Delete"
|
||||
Security="SecurityAccessLevel.Edit"
|
||||
Class="btn btn-danger"
|
||||
OnClick="@(() => Delete(context))"
|
||||
OnClick="@(async () => await Delete(context))"
|
||||
ResourceKey="Delete"
|
||||
Id="@context.EventId.ToString()" />
|
||||
|
||||
@ -49,24 +48,6 @@ else
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
/* <Pager Items="@_EventRegistrations">
|
||||
<Header>
|
||||
<th style="width: 1px;"> </th>
|
||||
<th style="width: 1px;"> </th>
|
||||
<th>@Localizer["Name"]</th>
|
||||
<th>@Localizer["Date"]</th>
|
||||
<th>@Localizer["Locataion"]</th>
|
||||
<th style="width: 1px;"> </th>
|
||||
</Header>
|
||||
<Row>
|
||||
<td><ActionLink Action="Edit" Parameters="@($"id=" + context.EventId.ToString())" ResourceKey="Edit" /></td>
|
||||
<td><ActionDialog 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>@context.EventDate.ToLocalTime()</td>
|
||||
<td>@context.Location</td>
|
||||
<td><ActionLink Action="Details" Parameters="@($"id=" + context.EventId.ToString())" ResourceKey="Details"/></td>
|
||||
</Row>
|
||||
</Pager>*/
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -75,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" },
|
||||
|
||||
@ -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.14",
|
||||
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",
|
||||
Dependencies = "SZUAbsolventenverein.Module.EventRegistration.Shared.Oqtane",
|
||||
PackageName = "SZUAbsolventenverein.Module.EventRegistration"
|
||||
};
|
||||
|
||||
@ -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.5" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.5" />
|
||||
<PackageReference Include="System.Net.Http.Json" Version="9.0.5" />
|
||||
<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" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@ -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>();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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.14</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>
|
||||
|
||||
@ -81,8 +81,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);
|
||||
|
||||
Reference in New Issue
Block a user