Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
13587ea210 | |||
d967449889 | |||
02a845c711 |
50
.gitea/workflows/ci.yml
Normal file
50
.gitea/workflows/ci.yml
Normal file
@ -0,0 +1,50 @@
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
- ci
|
||||
pull_request:
|
||||
branches:
|
||||
- main
|
||||
- ci
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 15
|
||||
steps:
|
||||
- name: Checkout Module
|
||||
uses: https://github.com/actions/checkout@v4
|
||||
with:
|
||||
path: Module.EventRegistration
|
||||
- name: Checkout Oqtane
|
||||
uses: https://github.com/actions/checkout@v4
|
||||
with:
|
||||
repository: Diplomarbeit-Absolventenverein/oqtane.framework
|
||||
path: oqtane.framework
|
||||
ref: v6.1.1
|
||||
- name: Setup Dotnet SDK
|
||||
uses: https://github.com/actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: '9.x'
|
||||
# - name: Setup NuGet
|
||||
# uses: https://github.com/nuget/setup-nuget@v2
|
||||
# with:
|
||||
# nuget-api-key: ${{ secrets.NuGetAPIKey }}
|
||||
# nuget-version: '5.x'
|
||||
- name: Build Oqtane
|
||||
run: dotnet build ./oqtane.framework/Oqtane.sln --configuration Debug
|
||||
- name: Build Module
|
||||
run: dotnet build ./Module.EventRegistration/SZUAbsolventenverein.Module.EventRegistration.sln --configuration Release
|
||||
- name: Test
|
||||
run: dotnet test ./Module.EventRegistration/SZUAbsolventenverein.Module.EventRegistration.sln --configuration Release --no-build
|
||||
- name: Create Release
|
||||
uses: akkuman/gitea-release-action@v1
|
||||
env:
|
||||
NODE_OPTIONS: '--experimental-fetch' # if nodejs < 18
|
||||
with:
|
||||
body: "Test-release"
|
||||
draft: true
|
||||
files: |-
|
||||
./**/*.nupkg
|
||||
./*.nupkg
|
35
.gitea/workflows/release.yml
Normal file
35
.gitea/workflows/release.yml
Normal file
@ -0,0 +1,35 @@
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- "v[0-9]+.[0-9]+.[0-9]+"
|
||||
release:
|
||||
types:
|
||||
- published
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 15
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: https://github.com/actions/checkout@v4
|
||||
- name: Verify commit exists in origin/main
|
||||
run: |
|
||||
git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
|
||||
git branch --remote --contains | grep origin/main
|
||||
- name: Set VERSION variable from tag
|
||||
run: echo "VERSION=${GITEA_REF/refs\/tags\/v/}" >> $GITEA_ENV
|
||||
- name: Setup Dotnet SDK
|
||||
uses: https://github.com/actions/setup-dotnet@v4
|
||||
- name: Build
|
||||
run: dotnet build --configuration Release /p:Version=${VERSION}
|
||||
- name: Test
|
||||
run: dotnet test --configuration Release /p:Version=${VERSION} --no-build
|
||||
- name: Pack
|
||||
run: dotnet pack --configuration Release /p:Version=${VERSION} --no-build --output .
|
||||
- uses: https://github.com/actions/upload-artifact@v4
|
||||
with:
|
||||
name: nuget
|
||||
if-no-files-found: error
|
||||
retention-days: 7
|
||||
path: ./*.nupkg
|
@ -11,10 +11,6 @@
|
||||
<h3>Anmeldung zum Event</h3>
|
||||
|
||||
<p>Willst du am Event (@_name) teilnehmen?</p>
|
||||
<span class="mb-6">@_eventDate.ToLocalTime() - @_location</span>
|
||||
<div>
|
||||
@((MarkupString)_description)
|
||||
</div>
|
||||
|
||||
@if (PageState.User != null) {
|
||||
|
||||
@ -23,11 +19,11 @@
|
||||
<p class="mt-3"><strong>Status:</strong>
|
||||
@if (Status == true)
|
||||
{
|
||||
@Localizer["Zusage"]<br />
|
||||
@Localizer["Zusage"]
|
||||
<button class="btn btn-danger" @onclick="Absage">@Localizer["Absagen"]</button>
|
||||
} else
|
||||
{
|
||||
@Localizer["Absage"]<br />
|
||||
@Localizer["Absage"]
|
||||
<button class="btn btn-success" @onclick="Zusage">@Localizer["Zusagen"]</button>
|
||||
}
|
||||
</p>
|
||||
@ -39,7 +35,7 @@
|
||||
}
|
||||
} 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 />
|
||||
}
|
||||
|
||||
@code {
|
||||
@ -54,14 +50,15 @@
|
||||
new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
|
||||
};
|
||||
|
||||
// private ElementReference form;
|
||||
// private bool validated = false;
|
||||
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;
|
||||
@ -106,9 +103,10 @@
|
||||
if (currentEvent != null)
|
||||
{
|
||||
_name = currentEvent.Name;
|
||||
_description = currentEvent.Description;
|
||||
_eventDate = currentEvent.EventDate;
|
||||
_location = currentEvent.Location;
|
||||
_createdby = currentEvent.CreatedBy;
|
||||
_createdon = currentEvent.CreatedOn;
|
||||
_modifiedby = currentEvent.ModifiedBy;
|
||||
_modifiedon = currentEvent.ModifiedOn;
|
||||
}
|
||||
|
||||
if(rsvp != null)
|
||||
@ -123,4 +121,41 @@
|
||||
AddModuleMessage(Localizer["Message.LoadError"], MessageType.Error);
|
||||
}
|
||||
}
|
||||
|
||||
private async Task Save()
|
||||
{
|
||||
try
|
||||
{
|
||||
validated = true;
|
||||
var interop = new Oqtane.UI.Interop(JSRuntime);
|
||||
if (await interop.FormValid(form))
|
||||
{
|
||||
if (PageState.Action == "Add")
|
||||
{
|
||||
Event EventRegistration = new Event();
|
||||
EventRegistration.ModuleId = ModuleState.ModuleId;
|
||||
EventRegistration.Name = _name;
|
||||
EventRegistration = await EventRegistrationService.AddEventAsync(EventRegistration);
|
||||
await logger.LogInformation("EventRegistration Added {EventRegistration}", EventRegistration);
|
||||
}
|
||||
else
|
||||
{
|
||||
Event EventRegistration = await EventRegistrationService.GetEventAsync(_id, ModuleState.ModuleId);
|
||||
EventRegistration.Name = _name;
|
||||
await EventRegistrationService.UpdateEventAsync(EventRegistration);
|
||||
await logger.LogInformation("EventRegistration Updated {EventRegistration}", EventRegistration);
|
||||
}
|
||||
NavigationManager.NavigateTo(NavigateUrl());
|
||||
}
|
||||
else
|
||||
{
|
||||
AddModuleMessage(Localizer["Message.SaveValidation"], MessageType.Warning);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
await logger.LogError(ex, "Error Saving EventRegistration {Error}", ex.Message);
|
||||
AddModuleMessage(Localizer["Message.SaveError"], MessageType.Error);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,7 +1,6 @@
|
||||
@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,30 +16,13 @@
|
||||
<input id="name" class="form-control" @bind="@_name" required />
|
||||
</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>
|
||||
<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 />-->
|
||||
<InputDate id="eventdate" class="form-control" @bind-Value="@_eventDate" Type="InputDateType.DateTimeLocal" />
|
||||
</div>
|
||||
</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>
|
||||
<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
|
||||
<br /><br />
|
||||
@if (PageState.Action == "Edit")
|
||||
{
|
||||
<AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
|
||||
<AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
|
||||
}
|
||||
</form>
|
||||
|
||||
@ -56,17 +38,11 @@
|
||||
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 = DateTime.Now;
|
||||
private string _location;
|
||||
|
||||
private string _createdby;
|
||||
private DateTime _createdon;
|
||||
private string _modifiedby;
|
||||
@ -83,10 +59,6 @@
|
||||
if (EventRegistration != null)
|
||||
{
|
||||
_name = EventRegistration.Name;
|
||||
_description = EventRegistration.Description;
|
||||
_eventDate = EventRegistration.EventDate.ToLocalTime();
|
||||
_location = EventRegistration.Location;
|
||||
|
||||
_createdby = EventRegistration.CreatedBy;
|
||||
_createdon = EventRegistration.CreatedOn;
|
||||
_modifiedby = EventRegistration.ModifiedBy;
|
||||
@ -107,10 +79,6 @@
|
||||
{
|
||||
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")
|
||||
@ -118,9 +86,6 @@
|
||||
Event EventRegistration = new Event();
|
||||
EventRegistration.ModuleId = ModuleState.ModuleId;
|
||||
EventRegistration.Name = _name;
|
||||
EventRegistration.Description = content;
|
||||
EventRegistration.EventDate = _eventDate.ToUniversalTime();
|
||||
EventRegistration.Location = _location;
|
||||
EventRegistration = await EventRegistrationService.AddEventAsync(EventRegistration);
|
||||
await logger.LogInformation("EventRegistration Added {EventRegistration}", EventRegistration);
|
||||
}
|
||||
@ -128,9 +93,6 @@
|
||||
{
|
||||
Event EventRegistration = await EventRegistrationService.GetEventAsync(_id, ModuleState.ModuleId);
|
||||
EventRegistration.Name = _name;
|
||||
EventRegistration.Description = content;
|
||||
EventRegistration.EventDate = _eventDate.ToUniversalTime();
|
||||
EventRegistration.Location = _location;
|
||||
await EventRegistrationService.UpdateEventAsync(EventRegistration);
|
||||
await logger.LogInformation("EventRegistration Updated {EventRegistration}", EventRegistration);
|
||||
}
|
||||
|
@ -24,16 +24,13 @@ else
|
||||
<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><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>@context.EventDate.ToLocalTime()</td>
|
||||
<td>@context.Location</td>
|
||||
|
||||
<td><ActionLink Action="Details" Parameters="@($"id=" + context.EventId.ToString())" ResourceKey="Details"/></td>
|
||||
</Row>
|
||||
</Pager>
|
||||
@ -83,4 +80,15 @@ 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";
|
||||
}
|
||||
}
|
@ -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.0",
|
||||
ServerManagerType = "SZUAbsolventenverein.Module.EventRegistration.Manager.EventRegistrationManager, SZUAbsolventenverein.Module.EventRegistration.Server.Oqtane",
|
||||
ReleaseVersions = "1.0.0,1.0.5",
|
||||
ReleaseVersions = "1.0.0",
|
||||
Dependencies = "SZUAbsolventenverein.Module.EventRegistration.Shared.Oqtane",
|
||||
PackageName = "SZUAbsolventenverein.Module.EventRegistration"
|
||||
};
|
||||
|
@ -127,10 +127,10 @@
|
||||
<value>Delete</value>
|
||||
</data>
|
||||
<data name="Delete.Header" xml:space="preserve">
|
||||
<value>Delete</value>
|
||||
<value>Delete Event</value>
|
||||
</data>
|
||||
<data name="Delete.Message" xml:space="preserve">
|
||||
<value>Are You Sure You Wish To Delete This Event? If you delete an event, all existing registrations will be deleted as well.</value>
|
||||
<value>Are You Sure You Wish To Delete This Event?</value>
|
||||
</data>
|
||||
<data name="Message.DisplayNone" xml:space="preserve">
|
||||
<value>No Events To Display</value>
|
||||
@ -142,15 +142,6 @@
|
||||
<value>Error Deleting Event</value>
|
||||
</data>
|
||||
<data name="Details.Text" xml:space="preserve">
|
||||
<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>
|
||||
<value>Reject</value>
|
||||
</data>
|
||||
</root>
|
@ -13,8 +13,8 @@
|
||||
</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.AspNetCore.Components.WebAssembly" Version="9.0.3" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.3" />
|
||||
<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" />
|
||||
|
@ -1,5 +1,9 @@
|
||||
TargetFramework=$1
|
||||
ProjectName=$2
|
||||
|
||||
"..\..\oqtane.framework\oqtane.package\nuget.exe" pack %ProjectName%.nuspec -Properties targetframework=%TargetFramework%;projectname=%ProjectName%
|
||||
cp -f "*.nupkg" "..\..\oqtane.framework\Oqtane.Server\Packages\"
|
||||
# chmod +x ../../oqtane.framework/Oqtane.Package/nuget.exe
|
||||
# "../../oqtane.framework/Oqtane.Package/nuget.exe" pack %ProjectName%.nuspec -Properties targetframework=%TargetFramework%;projectname=%ProjectName%
|
||||
# https://learn.microsoft.com/en-us/nuget/reference/dotnet-commands
|
||||
dotnet pack SZUAbsolventenverein.Module.EventRegistration.Package.csproj --no-build
|
||||
|
||||
#cp -f "*.nupkg" "..\..\oqtane.framework\Oqtane.Server\Packages\"
|
||||
|
@ -40,19 +40,10 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Manager
|
||||
{
|
||||
// TODO: Export event Responses as well.
|
||||
string content = "";
|
||||
List<object> exportData = new List<object>();
|
||||
foreach (var events in _EventRepository.GetEvents(module.ModuleId))
|
||||
List<Models.Event> EventRegistrations = _EventRepository.GetEvents(module.ModuleId).ToList();
|
||||
if (EventRegistrations != null)
|
||||
{
|
||||
var responses = _ResponseRepository.GetResponses(events.EventId, module.ModuleId);
|
||||
exportData.Add(new
|
||||
{
|
||||
Event = events,
|
||||
Responses = responses.ToList()
|
||||
});
|
||||
};
|
||||
if (exportData != null)
|
||||
{
|
||||
content = JsonSerializer.Serialize(exportData);
|
||||
content = JsonSerializer.Serialize(EventRegistrations);
|
||||
}
|
||||
return content;
|
||||
}
|
||||
|
@ -26,10 +26,10 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Migrations
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
var responseEB = new EventResponseEntityBuilder(migrationBuilder, ActiveDatabase);
|
||||
responseEB.Drop();
|
||||
var eventEB = new EventEntityBuilder(migrationBuilder, ActiveDatabase);
|
||||
eventEB.Drop();
|
||||
var entityBuilder = new EventEntityBuilder(migrationBuilder, ActiveDatabase);
|
||||
entityBuilder.Drop();
|
||||
var entityBuilder2 = new EventResponseEntityBuilder(migrationBuilder, ActiveDatabase);
|
||||
entityBuilder2.Drop();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,35 +0,0 @@
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
using Oqtane.Databases.Interfaces;
|
||||
using Oqtane.Migrations;
|
||||
using System;
|
||||
using SZUAbsolventenverein.Module.EventRegistration.Migrations.EntityBuilders;
|
||||
using SZUAbsolventenverein.Module.EventRegistration.Repository;
|
||||
|
||||
namespace SZUAbsolventenverein.Module.EventRegistration.Migrations
|
||||
{
|
||||
[DbContext(typeof(EventRegistrationContext))]
|
||||
[Migration("SZUAbsolventenverein.Module.EventRegistration.01.00.00.05")]
|
||||
public class AddDescriptionDateTimeLocation : MultiDatabaseMigration
|
||||
{
|
||||
public AddDescriptionDateTimeLocation(IDatabase database) : base(database)
|
||||
{
|
||||
}
|
||||
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
var entityBuilder = new EventEntityBuilder(migrationBuilder, ActiveDatabase);
|
||||
entityBuilder.AddMaxStringColumn("Description", false, true, ""); // Contents for RichTextEditor
|
||||
entityBuilder.AddDateTimeColumn("EventDate", false, new DateTime()); // DateTime for the event
|
||||
entityBuilder.AddStringColumn("Location", 100, false, true, ""); // Location of the event
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
var entityBuilder = new EventEntityBuilder(migrationBuilder, ActiveDatabase);
|
||||
entityBuilder.DropColumn("Description"); // RichTextEditor
|
||||
entityBuilder.DropColumn("EventDate"); // DateTime
|
||||
entityBuilder.DropColumn("Location"); // Location 0
|
||||
}
|
||||
}
|
||||
}
|
@ -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.3" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.3" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.3" />
|
||||
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.3" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -6,7 +6,6 @@ using Oqtane.Enums;
|
||||
using Oqtane.Extensions;
|
||||
using Oqtane.Infrastructure;
|
||||
using Oqtane.Models;
|
||||
using Oqtane.Repository;
|
||||
using Oqtane.Security;
|
||||
using Oqtane.Shared;
|
||||
using SZUAbsolventenverein.Module.EventRegistration.Models;
|
||||
@ -18,19 +17,15 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services
|
||||
{
|
||||
private readonly IEventRepository _EventRepository;
|
||||
private readonly IResponseRepository _ResponseRepository;
|
||||
private readonly INotificationRepository _NotificationRepository;
|
||||
private readonly IUserRepository _UserRepository;
|
||||
private readonly IUserPermissions _userPermissions;
|
||||
private readonly ILogManager _logger;
|
||||
private readonly IHttpContextAccessor _accessor;
|
||||
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, IUserPermissions userPermissions, ITenantManager tenantManager, ILogManager logger, IHttpContextAccessor accessor)
|
||||
{
|
||||
_EventRepository = EventRepository;
|
||||
_ResponseRepository = ResponseRepository;
|
||||
_NotificationRepository = NotificationRepository;
|
||||
_UserRepository = UserRepository;
|
||||
_userPermissions = userPermissions;
|
||||
_logger = logger;
|
||||
_accessor = accessor;
|
||||
@ -57,12 +52,6 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services
|
||||
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, Response.ModuleId, PermissionNames.View))
|
||||
{
|
||||
Response = _ResponseRepository.AddResponse(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)";
|
||||
SendEventResponseNotification(subject, body);
|
||||
|
||||
_logger.Log(LogLevel.Information, this, LogFunction.Create, "EventRegistration Added {NewEvent}", Response);
|
||||
}
|
||||
else
|
||||
@ -79,12 +68,6 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services
|
||||
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, Response.ModuleId, PermissionNames.View))
|
||||
{
|
||||
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)";
|
||||
SendEventResponseNotification(subject, body);
|
||||
|
||||
_logger.Log(LogLevel.Information, this, LogFunction.Create, "EventRegistration Added {NewEvent}", Response);
|
||||
}
|
||||
else
|
||||
@ -228,11 +211,7 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services
|
||||
|
||||
}*/
|
||||
|
||||
private void SendEventResponseNotification(string subject, string body)
|
||||
{
|
||||
User user = _UserRepository.GetUser(_accessor.HttpContext.User.UserId());
|
||||
Notification notification = new Notification(_alias.SiteId, user, subject, body);
|
||||
_NotificationRepository.AddNotification(notification);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -1,8 +1 @@
|
||||
/* Module Custom Styles */
|
||||
.mb-6 {
|
||||
margin-bottom: 6rem;
|
||||
}
|
||||
|
||||
.mt-3 {
|
||||
margin-top: 3rem;
|
||||
}
|
||||
/* Module Custom Styles */
|
@ -13,10 +13,6 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Models
|
||||
public int ModuleId { get; set; }
|
||||
public string Name { get; set; }
|
||||
|
||||
public string Description { get; set; }
|
||||
public DateTime EventDate { get; set; }
|
||||
public string Location { get; set; }
|
||||
|
||||
public string CreatedBy { get; set; }
|
||||
public DateTime CreatedOn { get; set; }
|
||||
public string ModifiedBy { get; set; }
|
||||
|
Reference in New Issue
Block a user