12 Commits

31 changed files with 966 additions and 10 deletions

View File

@@ -0,0 +1,95 @@
@inherits LocalizableComponent
@using Interfaces
@implements Interfaces.IReportUI
@inject IReportingHandler ReportingHandler
<button type="button" class="btn btn-warning btn-lg px-4" @onclick="ShowReportModal">
<i class="oi oi-warning me-2"></i> Melden
</button>
@if (_showReportModal)
{
<div class="modal fade show" style="display: block; background: rgba(0,0,0,0.5); z-index: 1050;" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Eintrag melden</h5>
<button type="button" class="btn-close" @onclick="CloseReportModal"></button>
</div>
<div class="modal-body">
<p>Warum möchtest du diesen Eintrag melden?</p>
<textarea class="form-control" @bind="_reportReason" rows="3" placeholder="Grund für die Meldung..."></textarea>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" @onclick="CloseReportModal">Abbrechen</button>
<button type="button" class="btn btn-danger" @onclick="ReportEntry">Melden</button>
</div>
</div>
</div>
</div>
}
@code {
public Type ReportType => typeof(ReportComponent);
[Parameter]
public IReportable ReportableEntity { get; set; }
private bool _showReportModal = false;
private string _reportReason = "";
private Task ShowReportModal()
{
_reportReason = "";
_showReportModal = true;
return Task.CompletedTask;
}
private void CloseReportModal()
{
_showReportModal = false;
}
public Dictionary<string, object> ConstructParameterList(IReportable reportableEntity, object RenderModeBoundary) {
Dictionary<string, object> _parameters = new Dictionary<string, object>();
_parameters["ReportableEntity"] = reportableEntity;
_parameters["RenderModeBoundary"] = RenderModeBoundary;
return _parameters;
}
private async Task ReportEntry()
{
// Basic null checks to avoid runtime NREs
if (ReportingHandler == null)
{
Console.WriteLine("ReportingHandler is not available (null). Ensure it is registered and injected.");
CloseReportModal();
return;
}
if (ReportableEntity == null)
{
Console.WriteLine("ReportableEntity is null. Cannot report.");
CloseReportModal();
return;
}
try
{
// If the handler exposes an async API use it instead. We run the synchronous call off the UI thread to avoid blocking.
await Task.Run(() => ReportingHandler.Report(ReportableEntity, _reportReason));
Console.WriteLine($"Eintrag gemeldet mit Grund: {_reportReason}");
AddModuleMessage($"Eintrag mit Grund {_reportReason} gemeldet.", MessageType.Success);
}
catch (Exception ex)
{
Console.WriteLine($"Reporting failed: {ex.Message}");
AddModuleMessage($"Eintrag konnte nicht gemeldet werden, bitte melden sie sich direkt beim Absolventenverein: ({ex.StackTrace}).", MessageType.Error);
}
finally
{
CloseReportModal();
StateHasChanged();
}
}
}

View File

@@ -1,4 +1,5 @@
@using Oqtane.Modules.Controls @using Oqtane.Modules.Controls
@using SZUAbsolventenverein.Module.AdminModules.Client.Components
@using SZUAbsolventenverein.Module.AdminModules.Services @using SZUAbsolventenverein.Module.AdminModules.Services
@using SZUAbsolventenverein.Module.AdminModules.Models @using SZUAbsolventenverein.Module.AdminModules.Models
@@ -24,6 +25,8 @@
<button type="button" class="btn btn-success" @onclick="Save">@Localizer["Save"]</button> <button type="button" class="btn btn-success" @onclick="Save">@Localizer["Save"]</button>
<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
<br /><br /> <br /><br />
<ReportComponent ReportableEntity="@AdminModules" RenderModeBoundary="@RenderModeBoundary" />
<br /><br />
@if (PageState.Action == "Edit") @if (PageState.Action == "Edit")
{ {
<AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo> <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
@@ -54,6 +57,8 @@
private string _modifiedby; private string _modifiedby;
private DateTime _modifiedon; private DateTime _modifiedon;
private AdminModules AdminModules;
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
try try
@@ -70,6 +75,7 @@
_createdon = AdminModules.CreatedOn; _createdon = AdminModules.CreatedOn;
_modifiedby = AdminModules.ModifiedBy; _modifiedby = AdminModules.ModifiedBy;
_modifiedon = AdminModules.ModifiedOn; _modifiedon = AdminModules.ModifiedOn;
this.AdminModules = AdminModules;
} }
} }
} }

View File

@@ -1,3 +1,4 @@
@using Interfaces
@using SZUAbsolventenverein.Module.AdminModules.Services @using SZUAbsolventenverein.Module.AdminModules.Services
@using SZUAbsolventenverein.Module.AdminModules.Models @using SZUAbsolventenverein.Module.AdminModules.Models
@@ -6,6 +7,7 @@
@inject IAdminModulesService AdminModulesService @inject IAdminModulesService AdminModulesService
@inject NavigationManager NavigationManager @inject NavigationManager NavigationManager
@inject IStringLocalizer<Index> Localizer @inject IStringLocalizer<Index> Localizer
@inject IReportingHandler ReportingHandler;
@if (_AdminModuless == null) @if (_AdminModuless == null)
{ {
@@ -23,11 +25,13 @@ else
<th style="width: 1px;">&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th style="width: 1px;">&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th style="width: 1px;">&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th style="width: 1px;">&nbsp;</th>
<th>@Localizer["Name"]</th> <th>@Localizer["Name"]</th>
</Header> </Header>
<Row> <Row>
<td><ActionLink Action="Edit" Parameters="@($"id=" + context.AdminModulesId.ToString())" ResourceKey="Edit" /></td> <td><ActionLink Action="Edit" Parameters="@($"id=" + context.AdminModulesId.ToString())" ResourceKey="Edit" /></td>
<td><ActionDialog Header="Delete AdminModules" Message="Are You Sure You Wish To Delete This AdminModules?" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" ResourceKey="Delete" Id="@context.AdminModulesId.ToString()" /></td> <td><ActionDialog Header="Delete AdminModules" Message="Are You Sure You Wish To Delete This AdminModules?" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(() => Delete(context))" ResourceKey="Delete" Id="@("Delete-"+context.AdminModulesId)" /></td>
<td><ActionDialog Header="Report AdminModules" Message="Are You Sure You Wish To Report This AdminModules?" Action="Report" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(() => Report(context))" ResourceKey="Report" Id="@("Report-"+context.AdminModulesId)" /></td>
<td><ActionLink Action="Send" Parameters="@($"id=" + context.AdminModulesId.ToString())" ResourceKey="Send" /></td> <td><ActionLink Action="Send" Parameters="@($"id=" + context.AdminModulesId.ToString())" ResourceKey="Send" /></td>
<td>@context.Name</td> <td>@context.Name</td>
</Row> </Row>
@@ -40,7 +44,7 @@ else
} }
@code { @code {
public override string RenderMode => RenderModes.Static; public override string RenderMode => RenderModes.Interactive;
public override List<Resource> Resources => new List<Resource>() public override List<Resource> Resources => new List<Resource>()
{ {
@@ -78,4 +82,19 @@ else
AddModuleMessage(Localizer["Message.DeleteError"], MessageType.Error); AddModuleMessage(Localizer["Message.DeleteError"], MessageType.Error);
} }
} }
private async Task Report(AdminModules AdminModules)
{
try
{
ReportingHandler.Report(AdminModules, "Reported by User");
await logger.LogInformation("AdminModules Reported {AdminModules}", AdminModules);
StateHasChanged();
}
catch (Exception ex)
{
await logger.LogError(ex, "Error Reportign AdminModules {AdminModules} {Error}", AdminModules, ex.Message);
AddModuleMessage(Localizer["Message.DeleteError"], MessageType.Error);
}
}
} }

View File

@@ -9,9 +9,9 @@ namespace SZUAbsolventenverein.Module.AdminMassMailing
{ {
Name = "AdminMassMailing", Name = "AdminMassMailing",
Description = "Mass Mailing Tool", Description = "Mass Mailing Tool",
Version = "1.0.7", Version = "1.0.8",
ServerManagerType = "SZUAbsolventenverein.Module.AdminModules.Manager.AdminModulesManager, SZUAbsolventenverein.Module.AdminModules.Server.Oqtane", ServerManagerType = "SZUAbsolventenverein.Module.AdminModules.Manager.AdminModulesManager, SZUAbsolventenverein.Module.AdminModules.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", 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",
Dependencies = "SZUAbsolventenverein.Module.AdminModules.Shared.Oqtane", Dependencies = "SZUAbsolventenverein.Module.AdminModules.Shared.Oqtane",
PackageName = "SZUAbsolventenverein.Module.AdminMassMailing" PackageName = "SZUAbsolventenverein.Module.AdminMassMailing"
}; };

View File

@@ -9,9 +9,9 @@ namespace SZUAbsolventenverein.Module.AdminSettings
{ {
Name = "Admin - Settings", Name = "Admin - Settings",
Description = "Einstellungen in Oqtane", Description = "Einstellungen in Oqtane",
Version = "1.0.0", Version = "1.0.8",
ServerManagerType = "SZUAbsolventenverein.Module.AdminModules.Manager.AdminModulesManager, SZUAbsolventenverein.Module.AdminModules.Server.Oqtane", ServerManagerType = "SZUAbsolventenverein.Module.AdminModules.Manager.AdminModulesManager, SZUAbsolventenverein.Module.AdminModules.Server.Oqtane",
ReleaseVersions = "1.0.0", ReleaseVersions = "1.0.8",
Dependencies = "SZUAbsolventenverein.Module.AdminModules.Shared.Oqtane", Dependencies = "SZUAbsolventenverein.Module.AdminModules.Shared.Oqtane",
PackageName = "SZUAbsolventenverein.Module.AdminSettings" PackageName = "SZUAbsolventenverein.Module.AdminSettings"
}; };

View File

@@ -0,0 +1,99 @@
@namespace SZUAbsolventenverein.Module.ReportSystem
@using Microsoft.VisualBasic.FileIO
@using SZUAbsolventenverein.Module.ReportSystem.Models
@using SZUAbsolventenverein.Module.ReportSystem.Services
@inherits ModuleBase
@inject NavigationManager NavigationManager
@inject IReportSystemReportingService ReportingService
@inject IStringLocalizer<Index> Localizer
@inject IModuleService ModuleService
@if (_reportings == null)
{
<p><em>Loading...</em></p>
}
else
{
<br />
<br />
@if (_reportings.Count != 0)
{
<Pager Items="@_reportings">
<Header>
<th style="width: 1px;">&nbsp;</th>
<th style="width: 1px;">&nbsp;</th>
<th>@Localizer["Submitter"]</th>
<th>@Localizer["Note"]</th>
<th>@Localizer["Name"]</th>
</Header>
<Row>
<td><ActionLink Action="Edit" Parameters="@($"id=" + context.ReportingID)" ResourceKey="Edit" /></td>
<td><ActionDialog Header="Delete AdminModules" Message="Are You Sure You Wish To Delete This AdminModules?" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" ResourceKey="Delete" Id="@context.ReportingID.ToString()" /></td>
<td>@context.CreatedBy</td>
<td>@context.CreatedOn</td>
<td>@context.ModuleId</td>
<td>@context.ReportingID</td>
<td>@context.Note</td>
<td>@context.Reason</td>
</Row>
</Pager>
}
else
{
<p>@Localizer["Message.DisplayNone"]</p>
}
}
@code {
public override string RenderMode => RenderModes.Interactive;
public override List<Resource> Resources => new List<Resource>()
{
new Stylesheet("_content/SZUAbsolventenverein.Module.ReportSystem/Module.css"),
new Script("_content/SZUAbsolventenverein.Module.ReportSystem/Module.js")
};
private List<Reporting> _reportings = new List<Reporting>();
private Dictionary<int, Module> _modules = new Dictionary<int, Module>();
protected override async Task OnInitializedAsync()
{
try
{
_reportings = await ReportingService.GetReportsAsync(ModuleState.ModuleId);
foreach (var moduleId in _reportings.Select(r => r.ModuleId).Distinct())
{
Console.WriteLine(moduleId);
try
{
_modules.Add(moduleId, await ModuleService.GetModuleAsync(moduleId));
await logger.LogDebug(LogFunction.Create, "Module found {ModuleId} while loading Modules for Reportings.", moduleId);
}
catch (Exception ex)
{
_modules.Add(moduleId, new Module {Title = $"Module not found {ex.Message}"});
await logger.LogDebug("Module not found {ModuleId} while loading Modules for Reportings. {error}", moduleId, ex);
}
}
}
catch (Exception ex)
{
logger.LogError("Error fetching reportings: {Message}", ex.Message);
};
}
private async Task Delete(Reporting reporting)
{
try
{
await ReportingService.DeleteReportingAsync(reporting.ReportingID, ModuleState.ModuleId);
_reportings.Remove(reporting);
StateHasChanged();
}
catch (Exception ex)
{
logger.LogError("Error deleting reporting: {Message}", ex.Message);
}
}
}

View File

@@ -0,0 +1,21 @@
using System;
using Oqtane.Models;
using Oqtane.Modules;
namespace SZUAbsolventenverein.Module.ReportSystem
{
public class ModuleInfo : IModule
{
public ModuleDefinition ModuleDefinition => new ModuleDefinition
{
Name = "ReportSystem",
Description = "Handle Systemwide Reporting",
Version = "1.0.8",
ServerManagerType =
"SZUAbsolventenverein.Module.ReportSystem.Manager.ReportSystemManager, SZUAbsolventenverein.Module.AdminModules.Server.Oqtane",
ReleaseVersions = "1.0.8",
Dependencies = "SZUAbsolventenverein.Module.ReportSystem.Shared.Oqtane",
PackageName = "SZUAbsolventenverein.Module.ReportSystem",
};
}
}

View File

@@ -0,0 +1,49 @@
@namespace SZUAbsolventenverein.Module.ReportSystem
@inherits ModuleBase
@inject ISettingService SettingService
@inject IStringLocalizer<Settings> Localizer
<div class="container">
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="value" HelpText="Enter a value" ResourceKey="SettingName"
ResourceType="@resourceType">Name: </Label>
<div class="col-sm-9">
<input id="value" type="text" class="form-control" @bind="@_value"/>
</div>
</div>
</div>
@code {
private string resourceType = "SZUAbsolventenverein.Module.ReportSystem.Settings, SZUAbsolventenverein.Module.AdminModules.Client.Oqtane"; // for localization
public override string Title => "ReportSystem Settings";
string _value;
protected override async Task OnInitializedAsync()
{
try
{
Dictionary<string, string> settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
_value = SettingService.GetSetting(settings, "SettingName", "");
}
catch (Exception ex)
{
AddModuleMessage(ex.Message, MessageType.Error);
}
}
public async Task UpdateSettings()
{
try
{
Dictionary<string, string> settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
SettingService.SetSetting(settings, "SettingName", _value);
await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
}
catch (Exception ex)
{
AddModuleMessage(ex.Message, MessageType.Error);
}
}
}

View File

@@ -13,6 +13,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Interfaces" Version="0.0.0-12" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.1" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.1" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="10.0.1" /> <PackageReference Include="Microsoft.Extensions.Localization" Version="10.0.1" />
@@ -25,10 +26,18 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Interfaces">
<HintPath>..\..\interfaces\Interfaces\bin\Debug\net10.0\Interfaces.dll</HintPath>
</Reference>
<Reference Include="Oqtane.Client"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Client.dll</HintPath></Reference> <Reference Include="Oqtane.Client"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Client.dll</HintPath></Reference>
<Reference Include="Oqtane.Shared"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Shared.dll</HintPath></Reference> <Reference Include="Oqtane.Shared"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Shared.dll</HintPath></Reference>
</ItemGroup> </ItemGroup>
<!-- <ItemGroup>
<AdditionalFiles Include="Modules\SZUAbsolventenverein.Module.ReportSystem\Index.razor" />
<AdditionalFiles Include="Modules\SZUAbsolventenverein.Module.ReportSystem\Settings.razor" />
</ItemGroup> -->
<PropertyGroup> <PropertyGroup>
<!-- there may be other elements here --> <!-- there may be other elements here -->
<BlazorWebAssemblyEnableLinking>false</BlazorWebAssemblyEnableLinking> <BlazorWebAssemblyEnableLinking>false</BlazorWebAssemblyEnableLinking>

View File

@@ -0,0 +1,51 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Interfaces;
using SZUAbsolventenverein.Module.ReportSystem.Models;
namespace SZUAbsolventenverein.Module.ReportSystem.Services
{
public interface IReportSystemReportingService
{
Task<Reporting> CreateReportAsync(Reporting reporting);
Task<List<Reporting>> GetReportsAsync(int ModuleId);
Task<Reporting> GetReportAsync(int ReportableId, int ModuleId);
Task<Reporting> UpdateReport(Reporting reporting);
Task DeleteReportingAsync(int ReportingId, int ModuleId);
}
public class ReportSystemReportingService : IReportSystemReportingService, IReportingHandler
{
public void Report(IReportable reportable, string note)
{
CreateReportAsync(new Reporting
{ ModuleId = reportable.ModuleID, EntityId = reportable.EntityID, Note = note, UserName = reportable.UserName, Reason = "Default Reason" });
}
public Task<Reporting> CreateReportAsync(Reporting reporting)
{
throw new System.NotImplementedException();
}
public Task<List<Reporting>> GetReportsAsync(int ModuleId)
{
throw new System.NotImplementedException();
}
public Task<Reporting> GetReportAsync(int ReportableId, int ModuleId)
{
throw new System.NotImplementedException();
}
public Task<Reporting> UpdateReport(Reporting Reporting)
{
throw new System.NotImplementedException();
}
public Task DeleteReportingAsync(int ReportingId, int ModuleId)
{
throw new System.NotImplementedException();
}
}
}

View File

@@ -1,7 +1,11 @@
using System;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using System.Linq; using System.Linq;
using Interfaces;
using Oqtane.Services; using Oqtane.Services;
using SZUAbsolventenverein.Module.AdminModules.Client.Components;
using SZUAbsolventenverein.Module.AdminModules.Services; using SZUAbsolventenverein.Module.AdminModules.Services;
using SZUAbsolventenverein.Module.ReportSystem.Services;
using SZUAbsolventenverein.Module.AdminSettings.Services; using SZUAbsolventenverein.Module.AdminSettings.Services;
namespace SZUAbsolventenverein.Module.AdminModules.Startup namespace SZUAbsolventenverein.Module.AdminModules.Startup
@@ -14,6 +18,22 @@ namespace SZUAbsolventenverein.Module.AdminModules.Startup
{ {
services.AddScoped<IAdminModulesService, AdminModulesService>(); services.AddScoped<IAdminModulesService, AdminModulesService>();
} }
if (!services.Any(s => s.ServiceType == typeof(IReportingHandler)))
{
services.AddScoped<IReportingHandler, ReportSystemReportingService>();
}
if (!services.Any(s => s.ServiceType == typeof(IReportSystemReportingService)))
{
services.AddScoped<IReportSystemReportingService, ReportSystemReportingService>();
}
if (!services.Any(s => s.ServiceType == typeof(IReportUI)))
{
services.AddScoped<IReportUI, ReportComponent>();
}
if (!services.Any(s => s.ServiceType == typeof(IAdminSettingsService))) if (!services.Any(s => s.ServiceType == typeof(IAdminSettingsService)))
{ {
services.AddScoped<IAdminSettingsService, AdminSettingsService>(); services.AddScoped<IAdminSettingsService, AdminSettingsService>();

View File

@@ -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.6</version> <version>1.0.8</version>
<authors>SZUAbsolventenverein</authors> <authors>SZUAbsolventenverein</authors>
<owners>SZUAbsolventenverein</owners> <owners>SZUAbsolventenverein</owners>
<title>AdminModules</title> <title>AdminModules</title>
@@ -17,7 +17,7 @@
<summary></summary> <summary></summary>
<packageTypes> <packageTypes>
<packageType name="Dependency" /> <packageType name="Dependency" />
<packageType name="Oqtane.Framework" version="6.2.0" /> <packageType name="Oqtane.Framework" version="10.0.3" />
</packageTypes> </packageTypes>
</metadata> </metadata>
<files> <files>

View File

@@ -9,4 +9,5 @@ cp -f "../Server/bin/Debug/$TargetFramework/$ProjectName.Server.Oqtane.dll" "../
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/_content/$ProjectName/"

View File

@@ -0,0 +1,8 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=_002Fhome_002Fkocoder_002Falumnihub_005F10_002E0_005Famd64_002Finterfaces_002FInterfaces_002Fbin_002FDebug_002Fnet10_002E0_002FInterfaces_002Edll/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=_002Fhome_002Fkocoder_002Falumnihub_005F10_002E0_005Famd64_002FSZUAbsolventenverein_002FInterfaces_002Fbin_002FDebug_002Fnet10_002E0_002FInterfaces_002Edll/@EntryIndexedValue">True</s:Boolean>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AComponentBase_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fa1ecd5c0c773451bb67865cbd48f5976e4e00_003F15_003F972ec13f_003FComponentBase_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AComponentBase_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fc79a534484f3c079e696a1b8489d234b7066e25afd8a9b4bd1be4257d3167_003FComponentBase_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;
&lt;Assembly Path="/home/kocoder/alumnihub_10.0_amd64/SZUAbsolventenverein/Interfaces/bin/Debug/net10.0/Interfaces.dll" /&gt;
&lt;/AssemblyExplorer&gt;</s:String></wpf:ResourceDictionary>

View File

@@ -0,0 +1,117 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
using System.Collections.Generic;
using Microsoft.AspNetCore.Http;
using Oqtane.Shared;
using Oqtane.Enums;
using Oqtane.Infrastructure;
using SZUAbsolventenverein.Module.AdminModules.Services;
using Oqtane.Controllers;
using System.Net;
using System.Threading.Tasks;
using SZUAbsolventenverein.Module.AdminModules.Models;
using Oqtane.Models;
using SZUAbsolventenverein.Module.ReportSystem.Models;
using SZUAbsolventenverein.Module.ReportSystem.Services;
namespace SZUAbsolventenverein.Module.ReportSystem.Controllers
{
[Route(ControllerRoutes.ApiRoute)]
public class ReportSystemController : ModuleControllerBase
{
private readonly IReportSystemReportingService _reportSystemReportingService;
public ReportSystemController(IReportSystemReportingService reportSystemReportingService, ILogManager logger, IHttpContextAccessor accessor) : base(logger, accessor)
{
_reportSystemReportingService = reportSystemReportingService;
}
// GET: api/<controller>?moduleid=x
[HttpGet]
[Authorize(Policy = PolicyNames.ViewModule)]
public async Task<IEnumerable<Reporting>> Get(string moduleid)
{
int ModuleId;
if (int.TryParse(moduleid, out ModuleId) && IsAuthorizedEntityId(EntityNames.Module, ModuleId))
{
return await _reportSystemReportingService.GetReportsAsync(ModuleId);
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Reporting Get Attempt {ModuleId}", moduleid);
HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
return null;
}
}
// GET api/<controller>/5
[HttpGet("get/{id}/{moduleid}")]
[Authorize(Policy = PolicyNames.ViewModule)]
public async Task<Reporting> Get(int id, int moduleid)
{
if (IsAuthorizedEntityId(EntityNames.Module, moduleid))
{
return await _reportSystemReportingService.GetReportAsync(id, moduleid);
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Reporting Get Attempt {Reporting} {ModuleId}", id, moduleid);
HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
return null;
}
}
// POST api/<controller>
[HttpPost]
[Authorize(Policy = PolicyNames.EditModule)]
public async Task<Reporting> Post([FromBody] Reporting Reporting)
{
if (ModelState.IsValid && IsAuthorizedEntityId(EntityNames.Module, Reporting.ModuleId))
{
Reporting = await _reportSystemReportingService.CreateReportAsync(Reporting);
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Reporting Post Attempt {Reporting}", Reporting);
HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
Reporting = null;
}
return Reporting;
}
// PUT api/<controller>/5
[HttpPut("{id}")]
[Authorize(Policy = PolicyNames.EditModule)]
public async Task<Reporting> Put(int id, [FromBody] Reporting Reporting)
{
if (ModelState.IsValid && Reporting.ReportingID == id && IsAuthorizedEntityId(EntityNames.Module, Reporting.ReportingID))
{
Reporting = await _reportSystemReportingService.UpdateReport(Reporting);
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Reporting Put Attempt {Reporting}", Reporting);
HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
Reporting = null;
}
return Reporting;
}
// DELETE api/<controller>/5
[HttpDelete("{id}/{moduleid}")]
[Authorize(Policy = PolicyNames.EditModule)]
public async Task Delete(int id, int moduleid)
{
Reporting Reporting = await _reportSystemReportingService.GetReportAsync(id, moduleid);
if (Reporting != null && IsAuthorizedEntityId(EntityNames.Module, Reporting.ReportingID))
{
await _reportSystemReportingService.DeleteReportingAsync(id, Reporting.ReportingID);
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Reporting Delete Attempt {ReportingID} {ModuleId}", id, moduleid);
HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
}
}
}
}

View File

@@ -0,0 +1,76 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.Json;
using Oqtane.Modules;
using Oqtane.Models;
using Oqtane.Infrastructure;
using Oqtane.Interfaces;
using Oqtane.Enums;
using Oqtane.Repository;
using SZUAbsolventenverein.Module.AdminModules.Repository;
using System.Threading.Tasks;
using SZUAbsolventenverein.Module.ReportSystem.Models;
using SZUAbsolventenverein.Module.ReportSystem.Repository;
using SZUAbsolventenverein.Module.ReportSystem.Services;
using Oqtane.Shared;
namespace SZUAbsolventenverein.Module.ReportSystem.Manager
{
public class ReportSystemManager : MigratableModuleBase, IInstallable, IPortable, ISearchable
{
private readonly IReportingRepository _reportSystemRepository;
private readonly IDBContextDependencies _DBContextDependencies;
public ReportSystemManager(IReportingRepository reportSystemRepository, IDBContextDependencies DBContextDependencies)
{
_reportSystemRepository = reportSystemRepository;
_DBContextDependencies = DBContextDependencies;
}
public bool Install(Tenant tenant, string version)
{
Console.WriteLine("Installing ReportSystem module for tenant {TenantId}");
return Migrate(new ReportingContext(_DBContextDependencies), tenant, MigrationType.Up);
}
public bool Uninstall(Tenant tenant)
{
return Migrate(new ReportingContext(_DBContextDependencies), tenant, MigrationType.Down);
}
public string ExportModule(Oqtane.Models.Module module)
{
string content = "";
List<Reporting> reportings = _reportSystemRepository.GetReportings().ToList();
if (reportings != null)
{
content = JsonSerializer.Serialize(reportings);
}
return content;
}
public void ImportModule(Oqtane.Models.Module module, string content, string version)
{
List<Reporting> reportings = null;
if (!string.IsNullOrEmpty(content))
{
reportings = JsonSerializer.Deserialize<List<Reporting>>(content);
}
if (reportings != null)
{
foreach(var reporting in reportings)
{
_reportSystemRepository.AddReporting(reporting);
}
}
}
public Task<List<SearchContent>> GetSearchContentsAsync(PageModule pageModule, DateTime lastIndexedOn)
{
var searchContentList = new List<SearchContent>();
return Task.FromResult(searchContentList);
}
}
}

View File

@@ -0,0 +1,37 @@
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations.Operations;
using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
using Oqtane.Databases.Interfaces;
using Oqtane.Migrations;
using Oqtane.Migrations.EntityBuilders;
namespace SZUAbsolventenverein.Module.AdminModules.Migrations.EntityBuilders;
public class ReportingEntityBuilder : AuditableBaseEntityBuilder<ReportingEntityBuilder>
{
private const string _entityTableName = "SZUAbsolventenvereinReportings";
private readonly PrimaryKey<ReportingEntityBuilder> _primaryKey = new ("PK_ReportingEntityBuilder", x => x.ReportingID);
public ReportingEntityBuilder(MigrationBuilder migrationBuilder, IDatabase database) : base(migrationBuilder, database)
{
EntityTableName = _entityTableName;
PrimaryKey = _primaryKey;
}
protected override ReportingEntityBuilder BuildTable(ColumnsBuilder table)
{
ReportingID = AddAutoIncrementColumn(table, "ReportingID");
ModuleId = AddIntegerColumn(table, "ModuleId");
EntityId = AddIntegerColumn(table, "EntityId");
Note = AddMaxStringColumn(table, "Note");
Reason = AddMaxStringColumn(table, "Reason");
AddAuditableColumns(table);
return this;
}
public OperationBuilder<AddColumnOperation> ReportingID { get; set; }
public OperationBuilder<AddColumnOperation> ModuleId { get; set; }
public OperationBuilder<AddColumnOperation> EntityId { get; set; }
public OperationBuilder<AddColumnOperation> Note { get; set; }
public OperationBuilder<AddColumnOperation> Reason { get; set; }
}

View File

@@ -0,0 +1,30 @@
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Oqtane.Databases.Interfaces;
using Oqtane.Migrations;
using SZUAbsolventenverein.Module.AdminModules.Migrations.EntityBuilders;
using SZUAbsolventenverein.Module.AdminModules.Repository;
namespace SZUAbsolventenverein.Module.ReportSystem.Migrations
{
[DbContext(typeof(ReportingContext))]
[Migration("SZUAbsolventenverein.Module.ReportSystem.01.00.00.00")]
public class InitializeModule : MultiDatabaseMigration
{
public InitializeModule(IDatabase database) : base(database)
{
}
protected override void Up(MigrationBuilder migrationBuilder)
{
var entityBuilder = new ReportingEntityBuilder(migrationBuilder, ActiveDatabase);
entityBuilder.Create();
}
protected override void Down(MigrationBuilder migrationBuilder)
{
var entityBuilder = new ReportingEntityBuilder(migrationBuilder, ActiveDatabase);
entityBuilder.Drop();
}
}
}

View File

@@ -0,0 +1,30 @@
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Oqtane.Databases.Interfaces;
using Oqtane.Migrations;
using SZUAbsolventenverein.Module.AdminModules.Migrations.EntityBuilders;
using SZUAbsolventenverein.Module.AdminModules.Repository;
namespace SZUAbsolventenverein.Module.ReportSystem.Migrations
{
[DbContext(typeof(ReportingContext))]
[Migration("SZUAbsolventenverein.Module.ReportSystem.01.00.00.01")]
public class AddUserName : MultiDatabaseMigration
{
public AddUserName(IDatabase database) : base(database)
{
}
protected override void Up(MigrationBuilder migrationBuilder)
{
var entityBuilder = new ReportingEntityBuilder(migrationBuilder, ActiveDatabase);
entityBuilder.AddStringColumn("UserName", 256, false, false, "");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
var entityBuilder = new ReportingEntityBuilder(migrationBuilder, ActiveDatabase);
entityBuilder.DropColumn("UserName");
}
}
}

View File

@@ -4,6 +4,7 @@ using Oqtane.Modules;
using Oqtane.Repository; using Oqtane.Repository;
using Oqtane.Infrastructure; using Oqtane.Infrastructure;
using Oqtane.Repository.Databases.Interfaces; using Oqtane.Repository.Databases.Interfaces;
using SZUAbsolventenverein.Module.ReportSystem.Models;
namespace SZUAbsolventenverein.Module.AdminModules.Repository namespace SZUAbsolventenverein.Module.AdminModules.Repository
{ {

View File

@@ -0,0 +1,24 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.AspNetCore.Http;
using Oqtane.Modules;
using Oqtane.Repository;
using Oqtane.Infrastructure;
using Oqtane.Repository.Databases.Interfaces;
using SZUAbsolventenverein.Module.ReportSystem.Models;
namespace SZUAbsolventenverein.Module.AdminModules.Repository
{
public class ReportingContext : DBContextBase, ITransientService, IMultiDatabase
{
public virtual DbSet<Reporting> Reportings { get; set; }
public ReportingContext(IDBContextDependencies DBContextDependencies) : base(DBContextDependencies)
{}
protected override void OnModelCreating(ModelBuilder builder)
{
base.OnModelCreating(builder);
builder.Entity<Reporting>().ToTable(ActiveDatabase.RewriteName("SZUAbsolventenvereinReportings"));
}
}
}

View File

@@ -0,0 +1,77 @@
using Microsoft.EntityFrameworkCore;
using System.Linq;
using System.Collections.Generic;
using Oqtane.Modules;
using SZUAbsolventenverein.Module.AdminModules.Repository;
using SZUAbsolventenverein.Module.ReportSystem.Models;
namespace SZUAbsolventenverein.Module.ReportSystem.Repository
{
public interface IReportingRepository
{
IEnumerable<Reporting> GetReportings();
Reporting GetReporting(int ReportingID);
Reporting GetReporting(int ReportingID, bool tracking);
Reporting AddReporting(Reporting Reporting);
Reporting UpdateReporting(Reporting Reporting);
void DeleteReporting(int ReportingID);
}
public class ReportingRepository : IReportingRepository, ITransientService
{
private readonly IDbContextFactory<ReportingContext> _factory;
public ReportingRepository(IDbContextFactory<ReportingContext> factory)
{
_factory = factory;
}
public IEnumerable<Reporting> GetReportings()
{
using var db = _factory.CreateDbContext();
return db.Reportings.ToList();
}
public Reporting GetReporting(int ReportingID)
{
return GetReporting(ReportingID, true);
}
public Reporting GetReporting(int ReportingID, bool tracking)
{
using var db = _factory.CreateDbContext();
if (tracking)
{
return db.Reportings.Find(ReportingID);
}
else
{
return db.Reportings.AsNoTracking().FirstOrDefault(item => item.ReportingID == ReportingID);
}
}
public Reporting AddReporting(Reporting Reporting)
{
using var db = _factory.CreateDbContext();
db.Reportings.Add(Reporting);
db.SaveChanges();
return Reporting;
}
public Reporting UpdateReporting(Reporting Reporting)
{
using var db = _factory.CreateDbContext();
db.Entry(Reporting).State = EntityState.Modified;
db.SaveChanges();
return Reporting;
}
public void DeleteReporting(int ReportingID)
{
using var db = _factory.CreateDbContext();
var Reporting = db.Reportings.Find(ReportingID);
db.Reportings.Remove(Reporting);
db.SaveChanges();
}
}
}

View File

@@ -31,6 +31,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Interfaces">
<HintPath>..\..\interfaces\Interfaces\bin\Debug\net10.0\Interfaces.dll</HintPath>
</Reference>
<Reference Include="Oqtane.Server"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Server.dll</HintPath></Reference> <Reference Include="Oqtane.Server"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Server.dll</HintPath></Reference>
<Reference Include="Oqtane.Shared"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Shared.dll</HintPath></Reference> <Reference Include="Oqtane.Shared"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Shared.dll</HintPath></Reference>
</ItemGroup> </ItemGroup>

View File

@@ -0,0 +1,135 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Interfaces;
using Microsoft.AspNetCore.Http;
using Oqtane.Enums;
using Oqtane.Infrastructure;
using Oqtane.Models;
using Oqtane.Repository;
using Oqtane.Security;
using Oqtane.Shared;
using SZUAbsolventenverein.Module.ReportSystem.Models;
using SZUAbsolventenverein.Module.ReportSystem.Permissions;
using SZUAbsolventenverein.Module.ReportSystem.Repository;
namespace SZUAbsolventenverein.Module.ReportSystem.Services
{
public class ServerReportSystemReportingService : IReportSystemReportingService, IReportingHandler
{
private readonly IModuleDefinitionRepository _moduleDefinitionRepository;
private readonly IReportingRepository _reportSystemRepository;
private readonly IUserPermissions _userPermissions;
private readonly ILogManager _logger;
private readonly IHttpContextAccessor _accessor;
private readonly Alias _alias;
private readonly int _moduleDefinitionId;
public ServerReportSystemReportingService(IModuleDefinitionRepository moduleDefinitionRepository, IReportingRepository reportSystemRepository, IUserPermissions userPermissions, ITenantManager tenantManager, ILogManager logger, IHttpContextAccessor accessor)
{
_moduleDefinitionRepository = moduleDefinitionRepository;
_reportSystemRepository = reportSystemRepository;
_userPermissions = userPermissions;
_logger = logger;
_accessor = accessor;
_alias = tenantManager.GetAlias();
ModuleDefinition md = moduleDefinitionRepository.GetModuleDefinitions(_alias.SiteId).ToList().Find(md => md.IsEnabled && md.Name == new ModuleInfo().ModuleDefinition.Name);
if (md == null)
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Reporting Module Not Found {ModuleName}", new ModuleInfo().ModuleDefinition.Name);
}
else
{
_moduleDefinitionId = md.ModuleDefinitionId;
}
}
public Task<Reporting> CreateReportAsync(Reporting Reporting)
{
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.ModuleDefinition, _moduleDefinitionId, PermissionNames.Utilize))
{
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Reporting created {Reporting}", Reporting);
return Task.FromResult(_reportSystemRepository.AddReporting(Reporting));
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Reporting create attempt {Reporting}", Reporting);
return null;
}
}
public Task<List<Reporting>> GetReportsAsync(int ModuleId)
{
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View))
{
return Task.FromResult(_reportSystemRepository.GetReportings().ToList());
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Reportings Get Attempt {ModuleId}", ModuleId);
return null;
}
}
public Task<Reporting> GetReportAsync(int ReportableId, int ModuleId)
{
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View))
{
return Task.FromResult(_reportSystemRepository.GetReporting(ReportableId));
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Reporting Get Attempt {ModuleId} {ReportableId}", ModuleId, ReportableId);
return null;
}
}
public Task<Reporting> UpdateReport(Reporting Reporting)
{
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, Reporting.ReportingID, PermissionNames.Edit))
{
Reporting = _reportSystemRepository.UpdateReporting(Reporting);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Reporting Updated {Reporting}", Reporting);
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Reporting Update Attempt {Reporting}", Reporting);
Reporting = null;
}
return Task.FromResult(Reporting);
}
public Task DeleteReportingAsync(int ReportingId, int ModuleId)
{
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.Edit))
{
_reportSystemRepository.DeleteReporting(ReportingId);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Reporting Deleted {ReportingId}", ReportingId);
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Reporting Delete Attempt {ReportingId} {ModuleId}", ReportingId, ModuleId);
}
return Task.CompletedTask;
}
public async void Report(IReportable reportable, string note)
{
// if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.Edit))
{
Reporting reporting = await CreateReportAsync(new Reporting {ModuleId = reportable.ModuleID, EntityId = reportable.EntityID, UserName = reportable.UserName, Note = note, Reason = "Default Reason"});
if (reporting != null)
{
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Reporting recieved {ReportingId}", reporting.ReportingID);
}
}
// else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Reporting Delete Attempt {EntityId} {ModuleId}", reportable.EntityID, reportable);
}
}
}
}

View File

@@ -1,3 +1,4 @@
using Interfaces;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity;
@@ -7,6 +8,9 @@ using System;
using SZUAbsolventenverein.Module.AdminModules.Models; using SZUAbsolventenverein.Module.AdminModules.Models;
using SZUAbsolventenverein.Module.AdminModules.Repository; using SZUAbsolventenverein.Module.AdminModules.Repository;
using SZUAbsolventenverein.Module.AdminModules.Services; using SZUAbsolventenverein.Module.AdminModules.Services;
using SZUAbsolventenverein.Module.ReportSystem.Repository;
using SZUAbsolventenverein.Module.ReportSystem.Services;
using SZUAbsolventenverein.Module.AdminSettings.Services; using SZUAbsolventenverein.Module.AdminSettings.Services;
namespace SZUAbsolventenverein.Module.AdminModules.Startup namespace SZUAbsolventenverein.Module.AdminModules.Startup
@@ -26,8 +30,13 @@ namespace SZUAbsolventenverein.Module.AdminModules.Startup
public void ConfigureServices(IServiceCollection services) public void ConfigureServices(IServiceCollection services)
{ {
services.AddTransient<IAdminModulesService, ServerAdminModulesService>(); services.AddTransient<IAdminModulesService, ServerAdminModulesService>();
services.AddTransient<IReportSystemReportingService, ServerReportSystemReportingService>();
services.AddTransient<IReportingHandler, ServerReportSystemReportingService>();
services.AddTransient<IAdminSettingsService, ServerAdminSettingsService>(); services.AddTransient<IAdminSettingsService, ServerAdminSettingsService>();
services.AddTransient<IAdminSettingsRepository, AdminSettingsRepository>(); services.AddTransient<IAdminSettingsRepository, AdminSettingsRepository>();
services.AddDbContextFactory<AdminModulesContext>(opt => { }, ServiceLifetime.Transient);
services.AddDbContextFactory<ReportingContext>(opt => { }, ServiceLifetime.Transient);
services.AddDbContextFactory<AdminModulesContext>(opt => { }, ServiceLifetime.Transient); services.AddDbContextFactory<AdminModulesContext>(opt => { }, ServiceLifetime.Transient);
services.Configure<DataProtectionTokenProviderOptions>(options => services.Configure<DataProtectionTokenProviderOptions>(options =>

View File

@@ -1,12 +1,13 @@
using System; using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using Interfaces;
using Oqtane.Models; using Oqtane.Models;
namespace SZUAbsolventenverein.Module.AdminModules.Models namespace SZUAbsolventenverein.Module.AdminModules.Models
{ {
[Table("SZUAbsolventenvereinAdminModules")] [Table("SZUAbsolventenvereinAdminModules")]
public class AdminModules : IAuditable public class AdminModules : IAuditable, IReportable
{ {
[Key] [Key]
public int AdminModulesId { get; set; } public int AdminModulesId { get; set; }
@@ -18,5 +19,13 @@ namespace SZUAbsolventenverein.Module.AdminModules.Models
public DateTime CreatedOn { get; set; } public DateTime CreatedOn { get; set; }
public string ModifiedBy { get; set; } public string ModifiedBy { get; set; }
public DateTime ModifiedOn { get; set; } public DateTime ModifiedOn { get; set; }
[NotMapped] public string ModuleName => "";
[NotMapped] public int ModuleID => ModuleId;
[NotMapped] public int EntityID => AdminModulesId;
[NotMapped] public string UserName => CreatedBy;
} }
} }

View File

@@ -0,0 +1,21 @@
using System;
using System.ComponentModel.DataAnnotations;
using Oqtane.Models;
namespace SZUAbsolventenverein.Module.ReportSystem.Models;
public class Reporting : IAuditable
{
[Key]
public int ReportingID { get; set; }
public int ModuleId { get; set; }
public int EntityId { get; set; }
public string UserName { get; set; }
public string Note { get; set; }
public string Reason { get; set; }
public string CreatedBy { get; set; }
public DateTime CreatedOn { get; set; }
public string ModifiedBy { get; set; }
public DateTime ModifiedOn { get; set; }
}

View File

@@ -0,0 +1,8 @@
namespace SZUAbsolventenverein.Module.ReportSystem.Permissions
{
public class ReportSystemPermissionNames
{
public const string Report = "Report";
}
}

View File

@@ -12,6 +12,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Interfaces" Version="0.0.0-12" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
</ItemGroup> </ItemGroup>