From 68529dbce4db7a4d028bf6d2e68360f2b3683bd7 Mon Sep 17 00:00:00 2001 From: Adam Gaiswinkler Date: Thu, 19 Feb 2026 19:58:08 +0100 Subject: [PATCH] neu report integriert --- .../Details.razor | 69 ++++--------------- ...ntenverein.Module.HallOfFame.Client.csproj | 1 + .../01000002_AddReportingColumns.cs | 43 ------------ .../EntityBuilders/HallOfFameEntityBuilder.cs | 20 +++--- Server/Repository/HallOfFameRepository.cs | 8 ++- Shared/Models/HallOfFame.cs | 16 ++++- ...ntenverein.Module.HallOfFame.Shared.csproj | 1 + 7 files changed, 45 insertions(+), 113 deletions(-) delete mode 100644 Server/Migrations/01000002_AddReportingColumns.cs diff --git a/Client/Modules/SZUAbsolventenverein.Module.HallOfFame/Details.razor b/Client/Modules/SZUAbsolventenverein.Module.HallOfFame/Details.razor index 06f4487..dccf6d1 100644 --- a/Client/Modules/SZUAbsolventenverein.Module.HallOfFame/Details.razor +++ b/Client/Modules/SZUAbsolventenverein.Module.HallOfFame/Details.razor @@ -2,11 +2,13 @@ @using SZUAbsolventenverein.Module.HallOfFame.Models @using Oqtane.Security @using Oqtane.Shared +@using Interfaces @namespace SZUAbsolventenverein.Module.HallOfFame @inherits ModuleBase @inject IHallOfFameService HallOfFameService @inject NavigationManager NavigationManager +@inject IReportUI ReportingComponent @if (_item == null) { @@ -103,9 +105,10 @@ else Löschen } - + @if (ReportingComponent != null) + { + + } @@ -113,27 +116,7 @@ else - @if (_showReportModal) - { -
-
-
-
-
Eintrag melden
- -
-
-

Warum möchtest du diesen Eintrag von @_item?.Name melden?

- -
-
- - -
-
-
-
- } + @if (_showPdfModal) {
@@ -233,9 +216,8 @@ else private HallOfFame _item; private int _id; private List _reports; + private Dictionary _parameters = new Dictionary(); - private bool _showReportModal = false; - private string _reportReason = ""; private bool _showPdfModal = false; private string _pdfPreviewUrl = ""; @@ -250,7 +232,12 @@ else { _id = Int32.Parse(PageState.QueryString["id"]); _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)) { _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);"); } - 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() { diff --git a/Client/SZUAbsolventenverein.Module.HallOfFame.Client.csproj b/Client/SZUAbsolventenverein.Module.HallOfFame.Client.csproj index 55b739d..904e10a 100644 --- a/Client/SZUAbsolventenverein.Module.HallOfFame.Client.csproj +++ b/Client/SZUAbsolventenverein.Module.HallOfFame.Client.csproj @@ -13,6 +13,7 @@ + diff --git a/Server/Migrations/01000002_AddReportingColumns.cs b/Server/Migrations/01000002_AddReportingColumns.cs deleted file mode 100644 index 65e918e..0000000 --- a/Server/Migrations/01000002_AddReportingColumns.cs +++ /dev/null @@ -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( - name: "IsReported", - table: "SZUAbsolventenvereinHallOfFame", - nullable: false, - defaultValue: false); - - migrationBuilder.AddColumn( - name: "ReportReason", - table: "SZUAbsolventenvereinHallOfFame", - nullable: true); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "IsReported", - table: "SZUAbsolventenvereinHallOfFame"); - - migrationBuilder.DropColumn( - name: "ReportReason", - table: "SZUAbsolventenvereinHallOfFame"); - } - } -} diff --git a/Server/Migrations/EntityBuilders/HallOfFameEntityBuilder.cs b/Server/Migrations/EntityBuilders/HallOfFameEntityBuilder.cs index 9226896..3a64fd9 100644 --- a/Server/Migrations/EntityBuilders/HallOfFameEntityBuilder.cs +++ b/Server/Migrations/EntityBuilders/HallOfFameEntityBuilder.cs @@ -22,15 +22,15 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Migrations.EntityBuilders protected override HallOfFameEntityBuilder BuildTable(ColumnsBuilder table) { - HallOfFameId = AddAutoIncrementColumn(table,"HallOfFameId"); - ModuleId = AddIntegerColumn(table,"ModuleId"); - Name = AddMaxStringColumn(table,"Name"); - Year = AddIntegerColumn(table,"Year"); - Description = AddMaxStringColumn(table,"Description"); - Image = AddMaxStringColumn(table,"Image"); - Link = AddMaxStringColumn(table,"Link"); - Status = AddStringColumn(table,"Status", 50); - UserId = AddIntegerColumn(table,"UserId"); + HallOfFameId = AddAutoIncrementColumn(table, "HallOfFameId"); + ModuleId = AddIntegerColumn(table, "ModuleId"); + Name = AddMaxStringColumn(table, "Name"); + Year = AddIntegerColumn(table, "Year"); + Description = AddMaxStringColumn(table, "Description"); + Image = AddMaxStringColumn(table, "Image"); + Link = AddMaxStringColumn(table, "Link"); + Status = AddStringColumn(table, "Status", 50); + UserId = AddIntegerColumn(table, "UserId"); AddAuditableColumns(table); return this; } @@ -44,8 +44,6 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Migrations.EntityBuilders public OperationBuilder Link { get; set; } public OperationBuilder Status { get; set; } public OperationBuilder UserId { get; set; } - public OperationBuilder IsReported { get; set; } - public OperationBuilder ReportReason { get; set; } } } diff --git a/Server/Repository/HallOfFameRepository.cs b/Server/Repository/HallOfFameRepository.cs index 32dd537..6972a46 100644 --- a/Server/Repository/HallOfFameRepository.cs +++ b/Server/Repository/HallOfFameRepository.cs @@ -70,6 +70,8 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Repository { using var db = _factory.CreateDbContext(); HallOfFame.Description = HallOfFame.Description?.Replace("\t", " "); + HallOfFame.Image ??= ""; + HallOfFame.Link ??= ""; db.HallOfFame.Add(HallOfFame); db.SaveChanges(); return HallOfFame; @@ -79,6 +81,8 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Repository { using var db = _factory.CreateDbContext(); HallOfFame.Description = HallOfFame.Description?.Replace("\t", " "); + HallOfFame.Image ??= ""; + HallOfFame.Link ??= ""; db.Entry(HallOfFame).State = EntityState.Modified; db.SaveChanges(); return HallOfFame; @@ -134,10 +138,10 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Repository public void DeleteHallOfFameReport(int HallOfFameReportId) { using var db = _factory.CreateDbContext(); - + // Clear any tracked entities to avoid conflicts db.ChangeTracker.Clear(); - + Models.HallOfFameReport HallOfFameReport = db.HallOfFameReport.Find(HallOfFameReportId); if (HallOfFameReport != null) { diff --git a/Shared/Models/HallOfFame.cs b/Shared/Models/HallOfFame.cs index 7678226..cdaf59a 100644 --- a/Shared/Models/HallOfFame.cs +++ b/Shared/Models/HallOfFame.cs @@ -1,28 +1,40 @@ using System; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Interfaces; using Oqtane.Models; namespace SZUAbsolventenverein.Module.HallOfFame.Models { [Table("SZUAbsolventenvereinHallOfFame")] - public class HallOfFame : IAuditable + public class HallOfFame : IAuditable, IReportable { [Key] public int HallOfFameId { get; set; } public int ModuleId { get; set; } public string Name { get; set; } - + public int Year { get; set; } public string Description { get; set; } public string Image { get; set; } public string Link { get; set; } public string Status { get; set; } // "Draft" or "Published" public int UserId { get; set; } // Owner + [NotMapped] public bool IsReported { get; set; } + [NotMapped] 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 DateTime CreatedOn { get; set; } public string ModifiedBy { get; set; } diff --git a/Shared/SZUAbsolventenverein.Module.HallOfFame.Shared.csproj b/Shared/SZUAbsolventenverein.Module.HallOfFame.Shared.csproj index b72de6d..44ae79b 100644 --- a/Shared/SZUAbsolventenverein.Module.HallOfFame.Shared.csproj +++ b/Shared/SZUAbsolventenverein.Module.HallOfFame.Shared.csproj @@ -12,6 +12,7 @@ +