Compare commits
8 Commits
7694fc1e08
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 9b1ea5ada1 | |||
| 9eca4dd779 | |||
| ce68c5eb1d | |||
| 1359aee2b1 | |||
| 7929f0bed6 | |||
| f86287783c | |||
| 669cc79678 | |||
| 2ed210e20f |
@ -1,5 +1,6 @@
|
|||||||
@using Oqtane
|
@using Oqtane
|
||||||
@using Oqtane.Modules.Controls
|
@using Oqtane.Modules.Controls
|
||||||
|
@using Oqtane.Themes.Controls
|
||||||
@using SZUAbsolventenverein.Module.EventRegistration.Services
|
@using SZUAbsolventenverein.Module.EventRegistration.Services
|
||||||
@using SZUAbsolventenverein.Module.EventRegistration.Models
|
@using SZUAbsolventenverein.Module.EventRegistration.Models
|
||||||
@using System.Text.RegularExpressions
|
@using System.Text.RegularExpressions
|
||||||
@ -19,7 +20,7 @@
|
|||||||
<p>Willst du am Event (@_name) teilnehmen?</p>
|
<p>Willst du am Event (@_name) teilnehmen?</p>
|
||||||
<span class="mb-6">@_eventDate.ToLocalTime() - @_location</span>
|
<span class="mb-6">@_eventDate.ToLocalTime() - @_location</span>
|
||||||
<div>
|
<div>
|
||||||
@((MarkupString)_description)
|
@((MarkupString) _description)
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@if (PageState.User != null) {
|
@if (PageState.User != null) {
|
||||||
@ -46,11 +47,10 @@
|
|||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
<p class="mt-3">Um dich für dieses Event zu registrieren, muss man sich zuerst anmelden.</p>
|
<p class="mt-3">Um dich für dieses Event zu registrieren, muss man sich zuerst anmelden.</p>
|
||||||
<Login />
|
<div class="gap-2">
|
||||||
@* @if(PageState.Site.AllowRegistration)
|
<Login />
|
||||||
{
|
<UserProfile ShowRegister="true" />
|
||||||
<Register />
|
</div>
|
||||||
} *@
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@code {
|
@code {
|
||||||
@ -82,27 +82,21 @@
|
|||||||
|
|
||||||
private async Task SendResponse(bool response)
|
private async Task SendResponse(bool response)
|
||||||
{
|
{
|
||||||
if(_response == null)
|
if(ValidateProfiles()) {
|
||||||
{
|
if(_response == null)
|
||||||
_response = new Response();
|
{
|
||||||
_response.EventRegistrationId = _id;
|
_response = new Response();
|
||||||
_response.OwnerId = PageState.User.UserId;
|
_response.EventRegistrationId = _id;
|
||||||
_response.ModuleId = ModuleState.ModuleId;
|
_response.OwnerId = PageState.User.UserId;
|
||||||
_response.ResponseType = response;
|
_response.ModuleId = ModuleState.ModuleId;
|
||||||
_response = await EventRegistrationService.AddResponseAsync(_response);
|
_response.ResponseType = response;
|
||||||
} else
|
_response = await EventRegistrationService.AddResponseAsync(_response);
|
||||||
{
|
} else
|
||||||
_response.ResponseType = response;
|
{
|
||||||
_response = await EventRegistrationService.UpdateResponseAsync(_response);
|
_response.ResponseType = response;
|
||||||
}
|
_response = await EventRegistrationService.UpdateResponseAsync(_response);
|
||||||
if(_response != null) Status = _response.ResponseType;
|
}
|
||||||
}
|
if(_response != null) Status = _response.ResponseType;
|
||||||
|
|
||||||
private async void Zusage()
|
|
||||||
{
|
|
||||||
if(ValidateProfiles())
|
|
||||||
{
|
|
||||||
await SendResponse(true);
|
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
var currentPathAndQuery = new Uri(NavigationManager.Uri).PathAndQuery;
|
var currentPathAndQuery = new Uri(NavigationManager.Uri).PathAndQuery;
|
||||||
@ -113,30 +107,27 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async void Zusage()
|
||||||
|
{
|
||||||
|
await SendResponse(true);
|
||||||
|
}
|
||||||
|
|
||||||
private async void Absage()
|
private async void Absage()
|
||||||
{
|
{
|
||||||
if(ValidateProfiles())
|
await SendResponse(false);
|
||||||
{
|
|
||||||
await SendResponse(false);
|
|
||||||
} else
|
|
||||||
{
|
|
||||||
var currentPathAndQuery = new Uri(NavigationManager.Uri).PathAndQuery;
|
|
||||||
var encodedReturnUrl = Uri.EscapeDataString(currentPathAndQuery);
|
|
||||||
var link = $"/profile?tab=profile&returnurl={encodedReturnUrl}";
|
|
||||||
|
|
||||||
AddModuleMessage(string.Format(SharedLocalizer["ProfileRequired"], $"Vervollständige hier dein Profil mit deinem Jahrgang und deiner Fachrichtung: {link}"), MessageType.Warning);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
_profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
|
if(PageState.User != null) {
|
||||||
var user = await UserService.GetUserAsync(PageState.User.UserId, PageState.Site.SiteId);
|
_profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
|
||||||
if (user != null)
|
var user = await UserService.GetUserAsync(PageState.User.UserId, PageState.Site.SiteId);
|
||||||
{
|
if (user != null)
|
||||||
_settings = user.Settings;
|
{
|
||||||
|
_settings = user.Settings;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_id = Int32.Parse(PageState.QueryString["id"]);
|
_id = Int32.Parse(PageState.QueryString["id"]);
|
||||||
|
|||||||
@ -9,9 +9,9 @@ namespace SZUAbsolventenverein.Module.EventRegistration
|
|||||||
{
|
{
|
||||||
Name = "EventRegistration",
|
Name = "EventRegistration",
|
||||||
Description = "A module to manage registration for events",
|
Description = "A module to manage registration for events",
|
||||||
Version = "1.0.14",
|
Version = "1.0.17",
|
||||||
ServerManagerType = "SZUAbsolventenverein.Module.EventRegistration.Manager.EventRegistrationManager, SZUAbsolventenverein.Module.EventRegistration.Server.Oqtane",
|
ServerManagerType = "SZUAbsolventenverein.Module.EventRegistration.Manager.EventRegistrationManager, SZUAbsolventenverein.Module.EventRegistration.Server.Oqtane",
|
||||||
ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,1.0.6,1.0.7,1.0.8,1.0.9,1.0.10,1.0.11,1.0.12,1.0.13,1.0.14",
|
ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,1.0.6,1.0.7,1.0.8,1.0.9,1.0.10,1.0.11,1.0.12,1.0.13,1.0.14,1.0.15,1.0.16,1.0.17",
|
||||||
Dependencies = "SZUAbsolventenverein.Module.EventRegistration.Shared.Oqtane",
|
Dependencies = "SZUAbsolventenverein.Module.EventRegistration.Shared.Oqtane",
|
||||||
PackageName = "SZUAbsolventenverein.Module.EventRegistration"
|
PackageName = "SZUAbsolventenverein.Module.EventRegistration"
|
||||||
};
|
};
|
||||||
|
|||||||
@ -13,11 +13,11 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.8" />
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.9" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.8" />
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.9" />
|
||||||
<PackageReference Include="System.Net.Http.Json" Version="9.0.8" />
|
<PackageReference Include="System.Net.Http.Json" Version="9.0.9" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||||
<metadata>
|
<metadata>
|
||||||
<id>$projectname$</id>
|
<id>$projectname$</id>
|
||||||
<version>1.0.14</version>
|
<version>1.0.17</version>
|
||||||
<authors>SZUAbsolventenverein</authors>
|
<authors>SZUAbsolventenverein</authors>
|
||||||
<owners>SZUAbsolventenverein</owners>
|
<owners>SZUAbsolventenverein</owners>
|
||||||
<title>EventRegistration</title>
|
<title>EventRegistration</title>
|
||||||
|
|||||||
@ -19,10 +19,10 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.8" />
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.9" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.8" />
|
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.9" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.8" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.9" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
Reference in New Issue
Block a user