neu report integriert

This commit is contained in:
2026-02-19 19:58:08 +01:00
parent 22bec79bab
commit 68529dbce4
7 changed files with 45 additions and 113 deletions

View File

@@ -2,11 +2,13 @@
@using SZUAbsolventenverein.Module.HallOfFame.Models @using SZUAbsolventenverein.Module.HallOfFame.Models
@using Oqtane.Security @using Oqtane.Security
@using Oqtane.Shared @using Oqtane.Shared
@using Interfaces
@namespace SZUAbsolventenverein.Module.HallOfFame @namespace SZUAbsolventenverein.Module.HallOfFame
@inherits ModuleBase @inherits ModuleBase
@inject IHallOfFameService HallOfFameService @inject IHallOfFameService HallOfFameService
@inject NavigationManager NavigationManager @inject NavigationManager NavigationManager
@inject IReportUI ReportingComponent
@if (_item == null) @if (_item == null)
{ {
@@ -103,9 +105,10 @@ else
<i class="oi oi-trash me-2"></i> Löschen <i class="oi oi-trash me-2"></i> Löschen
</button> </button>
} }
<button class="btn btn-warning btn-lg px-4" @onclick="ShowReportModal"> @if (ReportingComponent != null)
<i class="oi oi-warning me-2"></i> Melden {
</button> <DynamicComponent Type="@ReportingComponent.ReportType" Parameters="@_parameters"/>
}
</div> </div>
</div> </div>
</div> </div>
@@ -113,27 +116,7 @@ else
</div> </div>
</div> </div>
</div> </div>
@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 von <strong>@_item?.Name</strong> 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>
}
@if (_showPdfModal) @if (_showPdfModal)
{ {
<div class="modal fade show" style="display: block; background: rgba(0,0,0,0.6); z-index: 1050;" tabindex="-1"> <div class="modal fade show" style="display: block; background: rgba(0,0,0,0.6); z-index: 1050;" tabindex="-1">
@@ -233,9 +216,8 @@ else
private HallOfFame _item; private HallOfFame _item;
private int _id; private int _id;
private List<HallOfFameReport> _reports; private List<HallOfFameReport> _reports;
private Dictionary<string, object> _parameters = new Dictionary<string, object>();
private bool _showReportModal = false;
private string _reportReason = "";
private bool _showPdfModal = false; private bool _showPdfModal = false;
private string _pdfPreviewUrl = ""; private string _pdfPreviewUrl = "";
@@ -250,7 +232,12 @@ else
{ {
_id = Int32.Parse(PageState.QueryString["id"]); _id = Int32.Parse(PageState.QueryString["id"]);
_item = await HallOfFameService.GetHallOfFameAsync(_id, ModuleState.ModuleId); _item = await HallOfFameService.GetHallOfFameAsync(_id, ModuleState.ModuleId);
if (_item != null && ReportingComponent != null)
{
_parameters = ReportingComponent.ConstructParameterList(_item, RenderModeBoundary);
}
if (_item != null && _item.IsReported && UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin + ";" + RoleNames.Host)) if (_item != null && _item.IsReported && UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin + ";" + RoleNames.Host))
{ {
_reports = await HallOfFameService.GetHallOfFameReportsAsync(_id, ModuleState.ModuleId); _reports = await HallOfFameService.GetHallOfFameReportsAsync(_id, ModuleState.ModuleId);
@@ -281,35 +268,7 @@ else
await JSRuntime.InvokeVoidAsync("eval", $"var a = document.createElement('a'); a.href = '{url}'; a.download = 'HallOfFame.pdf'; document.body.appendChild(a); a.click(); document.body.removeChild(a);"); await JSRuntime.InvokeVoidAsync("eval", $"var a = document.createElement('a'); a.href = '{url}'; a.download = 'HallOfFame.pdf'; document.body.appendChild(a); a.click(); document.body.removeChild(a);");
} }
private void ShowReportModal()
{
_reportReason = "";
_showReportModal = true;
}
private void CloseReportModal()
{
_showReportModal = false;
}
private async Task ReportEntry()
{
if (!string.IsNullOrEmpty(_reportReason))
{
try
{
await HallOfFameService.ReportAsync(_item.HallOfFameId, ModuleState.ModuleId, _reportReason);
AddModuleMessage("Eintrag wurde erfolgreich gemeldet.", MessageType.Success);
_showReportModal = false;
await LoadData();
}
catch (Exception ex)
{
await logger.LogError(ex, "Error Reporting HallOfFame {Error}", ex.Message);
AddModuleMessage("Fehler beim Melden des Eintrags.", MessageType.Error);
}
}
}
private async Task DeleteEntry() private async Task DeleteEntry()
{ {

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" />

View File

@@ -1,43 +0,0 @@
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Oqtane.Databases.Interfaces;
using Oqtane.Migrations;
using SZUAbsolventenverein.Module.HallOfFame.Migrations.EntityBuilders;
using SZUAbsolventenverein.Module.HallOfFame.Repository;
namespace SZUAbsolventenverein.Module.HallOfFame.Migrations
{
[DbContext(typeof(HallOfFameContext))]
[Migration("SZUAbsolventenverein.Module.HallOfFame.01.00.00.02")]
public class AddReportingColumns : MultiDatabaseMigration
{
public AddReportingColumns(IDatabase database) : base(database)
{
}
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "IsReported",
table: "SZUAbsolventenvereinHallOfFame",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<string>(
name: "ReportReason",
table: "SZUAbsolventenvereinHallOfFame",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "IsReported",
table: "SZUAbsolventenvereinHallOfFame");
migrationBuilder.DropColumn(
name: "ReportReason",
table: "SZUAbsolventenvereinHallOfFame");
}
}
}

View File

@@ -22,15 +22,15 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Migrations.EntityBuilders
protected override HallOfFameEntityBuilder BuildTable(ColumnsBuilder table) protected override HallOfFameEntityBuilder BuildTable(ColumnsBuilder table)
{ {
HallOfFameId = AddAutoIncrementColumn(table,"HallOfFameId"); HallOfFameId = AddAutoIncrementColumn(table, "HallOfFameId");
ModuleId = AddIntegerColumn(table,"ModuleId"); ModuleId = AddIntegerColumn(table, "ModuleId");
Name = AddMaxStringColumn(table,"Name"); Name = AddMaxStringColumn(table, "Name");
Year = AddIntegerColumn(table,"Year"); Year = AddIntegerColumn(table, "Year");
Description = AddMaxStringColumn(table,"Description"); Description = AddMaxStringColumn(table, "Description");
Image = AddMaxStringColumn(table,"Image"); Image = AddMaxStringColumn(table, "Image");
Link = AddMaxStringColumn(table,"Link"); Link = AddMaxStringColumn(table, "Link");
Status = AddStringColumn(table,"Status", 50); Status = AddStringColumn(table, "Status", 50);
UserId = AddIntegerColumn(table,"UserId"); UserId = AddIntegerColumn(table, "UserId");
AddAuditableColumns(table); AddAuditableColumns(table);
return this; return this;
} }
@@ -44,8 +44,6 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Migrations.EntityBuilders
public OperationBuilder<AddColumnOperation> Link { get; set; } public OperationBuilder<AddColumnOperation> Link { get; set; }
public OperationBuilder<AddColumnOperation> Status { get; set; } public OperationBuilder<AddColumnOperation> Status { get; set; }
public OperationBuilder<AddColumnOperation> UserId { get; set; } public OperationBuilder<AddColumnOperation> UserId { get; set; }
public OperationBuilder<AddColumnOperation> IsReported { get; set; }
public OperationBuilder<AddColumnOperation> ReportReason { get; set; }
} }
} }

View File

@@ -70,6 +70,8 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Repository
{ {
using var db = _factory.CreateDbContext(); using var db = _factory.CreateDbContext();
HallOfFame.Description = HallOfFame.Description?.Replace("\t", " "); HallOfFame.Description = HallOfFame.Description?.Replace("\t", " ");
HallOfFame.Image ??= "";
HallOfFame.Link ??= "";
db.HallOfFame.Add(HallOfFame); db.HallOfFame.Add(HallOfFame);
db.SaveChanges(); db.SaveChanges();
return HallOfFame; return HallOfFame;
@@ -79,6 +81,8 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Repository
{ {
using var db = _factory.CreateDbContext(); using var db = _factory.CreateDbContext();
HallOfFame.Description = HallOfFame.Description?.Replace("\t", " "); HallOfFame.Description = HallOfFame.Description?.Replace("\t", " ");
HallOfFame.Image ??= "";
HallOfFame.Link ??= "";
db.Entry(HallOfFame).State = EntityState.Modified; db.Entry(HallOfFame).State = EntityState.Modified;
db.SaveChanges(); db.SaveChanges();
return HallOfFame; return HallOfFame;
@@ -134,10 +138,10 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Repository
public void DeleteHallOfFameReport(int HallOfFameReportId) public void DeleteHallOfFameReport(int HallOfFameReportId)
{ {
using var db = _factory.CreateDbContext(); using var db = _factory.CreateDbContext();
// Clear any tracked entities to avoid conflicts // Clear any tracked entities to avoid conflicts
db.ChangeTracker.Clear(); db.ChangeTracker.Clear();
Models.HallOfFameReport HallOfFameReport = db.HallOfFameReport.Find(HallOfFameReportId); Models.HallOfFameReport HallOfFameReport = db.HallOfFameReport.Find(HallOfFameReportId);
if (HallOfFameReport != null) if (HallOfFameReport != null)
{ {

View File

@@ -1,28 +1,40 @@
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.HallOfFame.Models namespace SZUAbsolventenverein.Module.HallOfFame.Models
{ {
[Table("SZUAbsolventenvereinHallOfFame")] [Table("SZUAbsolventenvereinHallOfFame")]
public class HallOfFame : IAuditable public class HallOfFame : IAuditable, IReportable
{ {
[Key] [Key]
public int HallOfFameId { get; set; } public int HallOfFameId { get; set; }
public int ModuleId { get; set; } public int ModuleId { get; set; }
public string Name { get; set; } public string Name { get; set; }
public int Year { get; set; } public int Year { get; set; }
public string Description { get; set; } public string Description { get; set; }
public string Image { get; set; } public string Image { get; set; }
public string Link { get; set; } public string Link { get; set; }
public string Status { get; set; } // "Draft" or "Published" public string Status { get; set; } // "Draft" or "Published"
public int UserId { get; set; } // Owner public int UserId { get; set; } // Owner
[NotMapped]
public bool IsReported { get; set; } public bool IsReported { get; set; }
[NotMapped]
public string ReportReason { get; set; } public string ReportReason { get; set; }
[NotMapped]
public string ModuleName => "";
[NotMapped]
public int ModuleID => ModuleId;
[NotMapped]
public int EntityID => HallOfFameId;
[NotMapped]
public string UserName => Name;
public string CreatedBy { get; set; } public string CreatedBy { get; set; }
public DateTime CreatedOn { get; set; } public DateTime CreatedOn { get; set; }
public string ModifiedBy { get; set; } public string ModifiedBy { get; set; }

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>