Merge new changes into net10.0
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
using System;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using System.Collections.Generic;
|
||||
@@ -10,6 +11,8 @@ using SZUAbsolventenverein.Module.HallOfFame.Services;
|
||||
using Oqtane.Controllers;
|
||||
using System.Net;
|
||||
using System.Threading.Tasks;
|
||||
using System.IO;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
|
||||
namespace SZUAbsolventenverein.Module.HallOfFame.Controllers
|
||||
{
|
||||
@@ -17,10 +20,12 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Controllers
|
||||
public class HallOfFameController : ModuleControllerBase
|
||||
{
|
||||
private readonly IHallOfFameService _HallOfFameService;
|
||||
private readonly IWebHostEnvironment _environment;
|
||||
|
||||
public HallOfFameController(IHallOfFameService HallOfFameService, ILogManager logger, IHttpContextAccessor accessor) : base(logger, accessor)
|
||||
public HallOfFameController(IHallOfFameService HallOfFameService, ILogManager logger, IHttpContextAccessor accessor, IWebHostEnvironment environment) : base(logger, accessor)
|
||||
{
|
||||
_HallOfFameService = HallOfFameService;
|
||||
_environment = environment;
|
||||
}
|
||||
|
||||
// GET: api/<controller>?moduleid=x
|
||||
@@ -33,9 +38,10 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Controllers
|
||||
if (int.TryParse(moduleid, out ModuleId) && IsAuthorizedEntityId(EntityNames.Module, ModuleId))
|
||||
{
|
||||
var list = await _HallOfFameService.GetHallOfFamesAsync(ModuleId);
|
||||
// Filter: Show only Published unless user has Edit permissions (simplified check for now, can be expanded)
|
||||
// For now, let's filter in memory or service. The requirement says: "Hauptseite zeigt nur Published".
|
||||
// We will filter here.
|
||||
if (User.IsInRole(RoleNames.Admin) || User.IsInRole(RoleNames.Host))
|
||||
{
|
||||
return list;
|
||||
}
|
||||
return list.Where(item => item.Status == "Published");
|
||||
}
|
||||
else
|
||||
@@ -138,7 +144,47 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Controllers
|
||||
return HallOfFame;
|
||||
}
|
||||
|
||||
// DELETE api/<controller>/5
|
||||
// PUT api/<controller>/report/5
|
||||
[HttpPut("report/{id}")]
|
||||
[Authorize(Policy = PolicyNames.ViewModule)]
|
||||
public async Task Report(int id, [FromQuery] string reason)
|
||||
{
|
||||
Models.HallOfFame HallOfFame = await _HallOfFameService.GetHallOfFameAsync(id, -1);
|
||||
if (HallOfFame != null && IsAuthorizedEntityId(EntityNames.Module, HallOfFame.ModuleId))
|
||||
{
|
||||
await _HallOfFameService.ReportAsync(id, HallOfFame.ModuleId, reason);
|
||||
}
|
||||
}
|
||||
|
||||
// GET api/<controller>/reports/5?moduleid=x
|
||||
[HttpGet("reports/{id}")]
|
||||
[Authorize(Policy = PolicyNames.EditModule)]
|
||||
public async Task<IEnumerable<Models.HallOfFameReport>> GetReports(int id, string moduleid)
|
||||
{
|
||||
int ModuleId;
|
||||
if (int.TryParse(moduleid, out ModuleId) && IsAuthorizedEntityId(EntityNames.Module, ModuleId))
|
||||
{
|
||||
return await _HallOfFameService.GetHallOfFameReportsAsync(id, ModuleId);
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized HallOfFame GetReports Attempt {HallOfFameId} {ModuleId}", id, moduleid);
|
||||
HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
// DELETE api/<controller>/report/5/x
|
||||
[HttpDelete("report/{id}/{moduleid}")]
|
||||
[Authorize(Policy = PolicyNames.EditModule)]
|
||||
public async Task DeleteReport(int id, int moduleid)
|
||||
{
|
||||
if (IsAuthorizedEntityId(EntityNames.Module, moduleid))
|
||||
{
|
||||
await _HallOfFameService.DeleteHallOfFameReportAsync(id, moduleid);
|
||||
}
|
||||
}
|
||||
|
||||
[HttpDelete("{id}/{moduleid}")]
|
||||
[Authorize(Policy = PolicyNames.EditModule)]
|
||||
public async Task Delete(int id, int moduleid)
|
||||
@@ -154,5 +200,33 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Controllers
|
||||
HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
|
||||
}
|
||||
}
|
||||
[HttpPost("upload")]
|
||||
[Authorize(Policy = PolicyNames.EditModule)]
|
||||
public async Task<IActionResult> Upload(IFormFile file)
|
||||
{
|
||||
if (file == null || file.Length == 0) return BadRequest("Keine Datei ausgewählt.");
|
||||
|
||||
var extension = Path.GetExtension(file.FileName).ToLower();
|
||||
if (extension != ".jpg" && extension != ".jpeg" && extension != ".png")
|
||||
{
|
||||
return BadRequest("Nur JPG und PNG Dateien sind erlaubt.");
|
||||
}
|
||||
|
||||
var folder = Path.Combine(_environment.WebRootPath, "Content", "HallOfFame");
|
||||
if (!Directory.Exists(folder))
|
||||
{
|
||||
Directory.CreateDirectory(folder);
|
||||
}
|
||||
|
||||
var fileName = Guid.NewGuid().ToString() + extension;
|
||||
var path = Path.Combine(folder, fileName);
|
||||
|
||||
using (var stream = new FileStream(path, FileMode.Create))
|
||||
{
|
||||
await file.CopyToAsync(stream);
|
||||
}
|
||||
|
||||
return Ok(new { url = "/Content/HallOfFame/" + fileName });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
188
Server/Controllers/HallOfFamePDFController.cs
Normal file
188
Server/Controllers/HallOfFamePDFController.cs
Normal file
@@ -0,0 +1,188 @@
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Oqtane.Shared;
|
||||
using Oqtane.Enums;
|
||||
using Oqtane.Infrastructure;
|
||||
using Oqtane.Controllers;
|
||||
using SZUAbsolventenverein.Module.HallOfFame.Services;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using QuestPDF.Fluent;
|
||||
using QuestPDF.Helpers;
|
||||
using QuestPDF.Infrastructure;
|
||||
|
||||
namespace SZUAbsolventenverein.Module.HallOfFame.Controllers
|
||||
{
|
||||
[Route(ControllerRoutes.ApiRoute)]
|
||||
public class HallOfFamePdfController : ModuleControllerBase
|
||||
{
|
||||
private readonly IHallOfFameService _hallOfFameService;
|
||||
private readonly IWebHostEnvironment _environment;
|
||||
|
||||
public HallOfFamePdfController(IHallOfFameService hallOfFameService, ILogManager logger, IHttpContextAccessor accessor, IWebHostEnvironment environment) : base(logger, accessor)
|
||||
{
|
||||
_hallOfFameService = hallOfFameService;
|
||||
_environment = environment;
|
||||
}
|
||||
|
||||
// GET: api/<controller>?moduleid=x&download=true/false
|
||||
[HttpGet]
|
||||
[Authorize(Policy = PolicyNames.ViewModule)]
|
||||
public async Task<IActionResult> Get(string moduleid, bool download = false)
|
||||
{
|
||||
int ModuleId;
|
||||
if (int.TryParse(moduleid, out ModuleId) && IsAuthorizedEntityId(EntityNames.Module, ModuleId))
|
||||
{
|
||||
var entries = await _hallOfFameService.GetHallOfFamesAsync(ModuleId);
|
||||
var publishedEntries = entries.Where(e => e.Status == "Published").ToList();
|
||||
|
||||
var document = Document.Create(container =>
|
||||
{
|
||||
foreach (var entry in publishedEntries)
|
||||
{
|
||||
// Bild laden falls vorhanden
|
||||
byte[] imageBytes = null;
|
||||
if (!string.IsNullOrEmpty(entry.Image))
|
||||
{
|
||||
try
|
||||
{
|
||||
var fullImagePath = System.IO.Path.Combine(
|
||||
_environment.WebRootPath, entry.Image.TrimStart('/'));
|
||||
if (System.IO.File.Exists(fullImagePath))
|
||||
imageBytes = System.IO.File.ReadAllBytes(fullImagePath);
|
||||
}
|
||||
catch { }
|
||||
}
|
||||
|
||||
container.Page(page =>
|
||||
{
|
||||
page.Size(PageSizes.A4);
|
||||
page.Margin(0);
|
||||
|
||||
page.Content().Layers(layers =>
|
||||
{
|
||||
// ── Hintergrundbild (Edge-to-Edge) ──
|
||||
if (imageBytes != null)
|
||||
{
|
||||
layers.Layer().Image(imageBytes).FitUnproportionally();
|
||||
}
|
||||
else
|
||||
{
|
||||
layers.Layer().Background("#1A1A2E");
|
||||
}
|
||||
|
||||
// ── Inhalt (PrimaryLayer) ──
|
||||
layers.PrimaryLayer()
|
||||
.Padding(40)
|
||||
.Column(column =>
|
||||
{
|
||||
// ═══ TITELKARTE (oben) ═══
|
||||
column.Item()
|
||||
.Border(5f).BorderColor("#20000000")
|
||||
.CornerRadius(24)
|
||||
.Border(3f).BorderColor("#33000000")
|
||||
.CornerRadius(22)
|
||||
.Border(1f).BorderColor("#44FFFFFF")
|
||||
.Background("#CC1A1A2E")
|
||||
.CornerRadius(20)
|
||||
.PaddingVertical(28)
|
||||
.PaddingHorizontal(36)
|
||||
.Column(inner =>
|
||||
{
|
||||
// Name: groß, dominant, Uppercase
|
||||
inner.Item()
|
||||
.PaddingBottom(6)
|
||||
.Text(entry.Name.ToUpper())
|
||||
.FontSize(36)
|
||||
.ExtraBold()
|
||||
.FontColor(Colors.White)
|
||||
.LetterSpacing(0.5f);
|
||||
|
||||
// Trennlinie
|
||||
inner.Item()
|
||||
.PaddingVertical(8)
|
||||
.Height(1.5f)
|
||||
.Background("#55FFFFFF");
|
||||
|
||||
// Jahr: sekundär, elegant
|
||||
inner.Item()
|
||||
.PaddingTop(4)
|
||||
.Text($"Jahrgang {entry.Year}")
|
||||
.FontSize(15)
|
||||
.FontColor("#CCFFFFFF")
|
||||
.LetterSpacing(1.5f);
|
||||
});
|
||||
|
||||
// ═══ BESCHREIBUNGSKARTE (unten) ═══
|
||||
var description = entry.Description ?? "";
|
||||
var sections = description.Split('\n')
|
||||
.Select(s => s.Trim())
|
||||
.Where(s => !string.IsNullOrEmpty(s))
|
||||
.ToArray();
|
||||
|
||||
column.Item().ExtendVertical().AlignBottom()
|
||||
.Border(5f).BorderColor("#20000000")
|
||||
.CornerRadius(20)
|
||||
.Border(3f).BorderColor("#33000000")
|
||||
.CornerRadius(18)
|
||||
.Border(1f).BorderColor("#33FFFFFF")
|
||||
.Background("#CC1A1A2E")
|
||||
.CornerRadius(16)
|
||||
.PaddingVertical(24)
|
||||
.PaddingHorizontal(32)
|
||||
.Column(descColumn =>
|
||||
{
|
||||
if (sections.Length > 0)
|
||||
{
|
||||
// Überschrift
|
||||
descColumn.Item()
|
||||
.PaddingBottom(12)
|
||||
.Text("Beschreibung")
|
||||
.FontSize(14)
|
||||
.SemiBold()
|
||||
.FontColor("#B0FFFFFF")
|
||||
.LetterSpacing(2f);
|
||||
|
||||
// Trennlinie
|
||||
descColumn.Item()
|
||||
.PaddingBottom(14)
|
||||
.Height(1f)
|
||||
.Background("#33FFFFFF");
|
||||
|
||||
// Text
|
||||
foreach (var line in sections)
|
||||
{
|
||||
descColumn.Item()
|
||||
.PaddingBottom(8)
|
||||
.Text(line)
|
||||
.FontSize(11)
|
||||
.FontColor("#E8FFFFFF")
|
||||
.LineHeight(1.5f);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
byte[] pdfBytes = document.GeneratePdf();
|
||||
|
||||
if (download)
|
||||
{
|
||||
return File(pdfBytes, "application/pdf", "HallOfFame.pdf");
|
||||
}
|
||||
// Inline: PDF wird im Browser angezeigt (Vorschau)
|
||||
return File(pdfBytes, "application/pdf");
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized HallOfFame PDF Get Attempt {ModuleId}", moduleid);
|
||||
return Forbid();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,83 +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.01")]
|
||||
public class AddHallOfFameColumns : MultiDatabaseMigration
|
||||
{
|
||||
public AddHallOfFameColumns(IDatabase database) : base(database)
|
||||
{
|
||||
}
|
||||
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
var entityBuilder = new HallOfFameEntityBuilder(migrationBuilder, ActiveDatabase);
|
||||
|
||||
migrationBuilder.AddColumn<int>(
|
||||
name: "Year",
|
||||
table: "SZUAbsolventenvereinHallOfFame",
|
||||
nullable: false,
|
||||
defaultValue: 0);
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "Description",
|
||||
table: "SZUAbsolventenvereinHallOfFame",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "Image",
|
||||
table: "SZUAbsolventenvereinHallOfFame",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "Link",
|
||||
table: "SZUAbsolventenvereinHallOfFame",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "Status",
|
||||
table: "SZUAbsolventenvereinHallOfFame",
|
||||
maxLength: 50,
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<int>(
|
||||
name: "UserId",
|
||||
table: "SZUAbsolventenvereinHallOfFame",
|
||||
nullable: false,
|
||||
defaultValue: 0);
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "Year",
|
||||
table: "SZUAbsolventenvereinHallOfFame");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "Description",
|
||||
table: "SZUAbsolventenvereinHallOfFame");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "Image",
|
||||
table: "SZUAbsolventenvereinHallOfFame");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "Link",
|
||||
table: "SZUAbsolventenvereinHallOfFame");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "Status",
|
||||
table: "SZUAbsolventenvereinHallOfFame");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "UserId",
|
||||
table: "SZUAbsolventenvereinHallOfFame");
|
||||
}
|
||||
}
|
||||
}
|
||||
43
Server/Migrations/01000002_AddReportingColumns.cs
Normal file
43
Server/Migrations/01000002_AddReportingColumns.cs
Normal file
@@ -0,0 +1,43 @@
|
||||
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");
|
||||
}
|
||||
}
|
||||
}
|
||||
30
Server/Migrations/01000003_AddReportTable.cs
Normal file
30
Server/Migrations/01000003_AddReportTable.cs
Normal file
@@ -0,0 +1,30 @@
|
||||
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.03")]
|
||||
public class AddReportTable : MultiDatabaseMigration
|
||||
{
|
||||
public AddReportTable(IDatabase database) : base(database)
|
||||
{
|
||||
}
|
||||
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
var entityBuilder = new HallOfFameReportEntityBuilder(migrationBuilder, ActiveDatabase);
|
||||
entityBuilder.Create();
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
var entityBuilder = new HallOfFameReportEntityBuilder(migrationBuilder, ActiveDatabase);
|
||||
entityBuilder.Drop();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -44,6 +44,8 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Migrations.EntityBuilders
|
||||
public OperationBuilder<AddColumnOperation> Link { get; set; }
|
||||
public OperationBuilder<AddColumnOperation> Status { get; set; }
|
||||
public OperationBuilder<AddColumnOperation> UserId { get; set; }
|
||||
public OperationBuilder<AddColumnOperation> IsReported { get; set; }
|
||||
public OperationBuilder<AddColumnOperation> ReportReason { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
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.HallOfFame.Migrations.EntityBuilders
|
||||
{
|
||||
public class HallOfFameReportEntityBuilder : AuditableBaseEntityBuilder<HallOfFameReportEntityBuilder>
|
||||
{
|
||||
private const string _entityTableName = "SZUAbsolventenvereinHallOfFameReport";
|
||||
private readonly PrimaryKey<HallOfFameReportEntityBuilder> _primaryKey = new("PK_SZUAbsolventenvereinHallOfFameReport", x => x.HallOfFameReportId);
|
||||
private readonly ForeignKey<HallOfFameReportEntityBuilder> _hallOfFameForeignKey = new("FK_SZUAbsolventenvereinHallOfFameReport_HallOfFame", x => x.HallOfFameId, "SZUAbsolventenvereinHallOfFame", "HallOfFameId", ReferentialAction.Cascade);
|
||||
|
||||
public HallOfFameReportEntityBuilder(MigrationBuilder migrationBuilder, IDatabase database) : base(migrationBuilder, database)
|
||||
{
|
||||
EntityTableName = _entityTableName;
|
||||
PrimaryKey = _primaryKey;
|
||||
ForeignKeys.Add(_hallOfFameForeignKey);
|
||||
}
|
||||
|
||||
protected override HallOfFameReportEntityBuilder BuildTable(ColumnsBuilder table)
|
||||
{
|
||||
HallOfFameReportId = AddAutoIncrementColumn(table, "HallOfFameReportId");
|
||||
HallOfFameId = AddIntegerColumn(table, "HallOfFameId");
|
||||
Reason = AddMaxStringColumn(table, "Reason");
|
||||
AddAuditableColumns(table);
|
||||
return this;
|
||||
}
|
||||
|
||||
public OperationBuilder<AddColumnOperation> HallOfFameReportId { get; set; }
|
||||
public OperationBuilder<AddColumnOperation> HallOfFameId { get; set; }
|
||||
public OperationBuilder<AddColumnOperation> Reason { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -10,6 +10,7 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Repository
|
||||
public class HallOfFameContext : DBContextBase, ITransientService, IMultiDatabase
|
||||
{
|
||||
public virtual DbSet<Models.HallOfFame> HallOfFame { get; set; }
|
||||
public virtual DbSet<Models.HallOfFameReport> HallOfFameReport { get; set; }
|
||||
|
||||
public HallOfFameContext(IDBContextDependencies DBContextDependencies) : base(DBContextDependencies)
|
||||
{
|
||||
@@ -21,6 +22,7 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Repository
|
||||
base.OnModelCreating(builder);
|
||||
|
||||
builder.Entity<Models.HallOfFame>().ToTable(ActiveDatabase.RewriteName("SZUAbsolventenvereinHallOfFame"));
|
||||
builder.Entity<Models.HallOfFameReport>().ToTable(ActiveDatabase.RewriteName("SZUAbsolventenvereinHallOfFameReport"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,6 +13,11 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Repository
|
||||
Models.HallOfFame AddHallOfFame(Models.HallOfFame HallOfFame);
|
||||
Models.HallOfFame UpdateHallOfFame(Models.HallOfFame HallOfFame);
|
||||
void DeleteHallOfFame(int HallOfFameId);
|
||||
|
||||
IEnumerable<Models.HallOfFameReport> GetHallOfFameReports(int HallOfFameId);
|
||||
Models.HallOfFameReport GetHallOfFameReport(int HallOfFameReportId);
|
||||
Models.HallOfFameReport AddHallOfFameReport(Models.HallOfFameReport HallOfFameReport);
|
||||
void DeleteHallOfFameReport(int HallOfFameReportId);
|
||||
}
|
||||
|
||||
public class HallOfFameRepository : IHallOfFameRepository, ITransientService
|
||||
@@ -27,7 +32,14 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Repository
|
||||
public IEnumerable<Models.HallOfFame> GetHallOfFames(int ModuleId)
|
||||
{
|
||||
using var db = _factory.CreateDbContext();
|
||||
return db.HallOfFame.Where(item => item.ModuleId == ModuleId).ToList();
|
||||
var items = db.HallOfFame.Where(item => item.ModuleId == ModuleId)
|
||||
.OrderByDescending(item => item.CreatedOn)
|
||||
.ToList();
|
||||
foreach (var item in items)
|
||||
{
|
||||
item.Description = item.Description?.Replace("\t", " ");
|
||||
}
|
||||
return items;
|
||||
}
|
||||
|
||||
public Models.HallOfFame GetHallOfFame(int HallOfFameId)
|
||||
@@ -38,19 +50,26 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Repository
|
||||
public Models.HallOfFame GetHallOfFame(int HallOfFameId, bool tracking)
|
||||
{
|
||||
using var db = _factory.CreateDbContext();
|
||||
Models.HallOfFame item;
|
||||
if (tracking)
|
||||
{
|
||||
return db.HallOfFame.Find(HallOfFameId);
|
||||
item = db.HallOfFame.Find(HallOfFameId);
|
||||
}
|
||||
else
|
||||
{
|
||||
return db.HallOfFame.AsNoTracking().FirstOrDefault(item => item.HallOfFameId == HallOfFameId);
|
||||
item = db.HallOfFame.AsNoTracking().FirstOrDefault(i => i.HallOfFameId == HallOfFameId);
|
||||
}
|
||||
if (item != null)
|
||||
{
|
||||
item.Description = item.Description?.Replace("\t", " ");
|
||||
}
|
||||
return item;
|
||||
}
|
||||
|
||||
public Models.HallOfFame AddHallOfFame(Models.HallOfFame HallOfFame)
|
||||
{
|
||||
using var db = _factory.CreateDbContext();
|
||||
HallOfFame.Description = HallOfFame.Description?.Replace("\t", " ");
|
||||
db.HallOfFame.Add(HallOfFame);
|
||||
db.SaveChanges();
|
||||
return HallOfFame;
|
||||
@@ -59,17 +78,72 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Repository
|
||||
public Models.HallOfFame UpdateHallOfFame(Models.HallOfFame HallOfFame)
|
||||
{
|
||||
using var db = _factory.CreateDbContext();
|
||||
HallOfFame.Description = HallOfFame.Description?.Replace("\t", " ");
|
||||
db.Entry(HallOfFame).State = EntityState.Modified;
|
||||
db.SaveChanges();
|
||||
return HallOfFame;
|
||||
}
|
||||
|
||||
public void DeleteHallOfFame(int HallOfFameId)
|
||||
{
|
||||
// First transaction: Delete all associated reports
|
||||
using (var db = _factory.CreateDbContext())
|
||||
{
|
||||
var reports = db.HallOfFameReport.Where(item => item.HallOfFameId == HallOfFameId).ToList();
|
||||
if (reports.Any())
|
||||
{
|
||||
db.HallOfFameReport.RemoveRange(reports);
|
||||
db.SaveChanges();
|
||||
}
|
||||
}
|
||||
|
||||
// Second transaction: Delete the HallOfFame entry itself
|
||||
using (var db = _factory.CreateDbContext())
|
||||
{
|
||||
var hallOfFame = db.HallOfFame.Find(HallOfFameId);
|
||||
if (hallOfFame != null)
|
||||
{
|
||||
db.HallOfFame.Remove(hallOfFame);
|
||||
db.SaveChanges();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public IEnumerable<Models.HallOfFameReport> GetHallOfFameReports(int HallOfFameId)
|
||||
{
|
||||
using var db = _factory.CreateDbContext();
|
||||
Models.HallOfFame HallOfFame = db.HallOfFame.Find(HallOfFameId);
|
||||
db.HallOfFame.Remove(HallOfFame);
|
||||
return db.HallOfFameReport.Where(item => item.HallOfFameId == HallOfFameId)
|
||||
.OrderByDescending(item => item.CreatedOn)
|
||||
.ToList();
|
||||
}
|
||||
|
||||
public Models.HallOfFameReport GetHallOfFameReport(int HallOfFameReportId)
|
||||
{
|
||||
using var db = _factory.CreateDbContext();
|
||||
return db.HallOfFameReport.Find(HallOfFameReportId);
|
||||
}
|
||||
|
||||
public Models.HallOfFameReport AddHallOfFameReport(Models.HallOfFameReport HallOfFameReport)
|
||||
{
|
||||
using var db = _factory.CreateDbContext();
|
||||
db.HallOfFameReport.Add(HallOfFameReport);
|
||||
db.SaveChanges();
|
||||
return HallOfFameReport;
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
db.HallOfFameReport.Remove(HallOfFameReport);
|
||||
db.SaveChanges();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.1" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
|
||||
<PackageReference Include="Microsoft.Extensions.Localization" Version="10.0.1" />
|
||||
<PackageReference Include="QuestPDF" Version="2026.2.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@@ -34,4 +35,16 @@
|
||||
<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>
|
||||
</ItemGroup>
|
||||
<!-- Copy QuestPDF and Module DLLs to Oqtane.Server so they are available at runtime -->
|
||||
<Target Name="CopyQuestPdfToOqtane" AfterTargets="Build">
|
||||
<Message Importance="high" Text="Deploying QuestPDF and Module DLLs to Oqtane bin..." />
|
||||
<Copy SourceFiles="$(OutputPath)QuestPDF.dll" DestinationFolder="$(ProjectDir)..\..\oqtane.framework\Oqtane.Server\bin\$(Configuration)\$(TargetFramework)\" SkipUnchangedFiles="true" />
|
||||
<Copy SourceFiles="$(OutputPath)SZUAbsolventenverein.Module.HallOfFame.Server.Oqtane.dll" DestinationFolder="$(ProjectDir)..\..\oqtane.framework\Oqtane.Server\bin\$(Configuration)\$(TargetFramework)\" SkipUnchangedFiles="false" />
|
||||
<Copy SourceFiles="$(OutputPath)SZUAbsolventenverein.Module.HallOfFame.Shared.Oqtane.dll" DestinationFolder="$(ProjectDir)..\..\oqtane.framework\Oqtane.Server\bin\$(Configuration)\$(TargetFramework)\" SkipUnchangedFiles="false" />
|
||||
<ItemGroup>
|
||||
<QuestPdfNativeFiles Include="$(OutputPath)runtimes\**\*.*" />
|
||||
</ItemGroup>
|
||||
<Copy SourceFiles="@(QuestPdfNativeFiles)" DestinationFiles="@(QuestPdfNativeFiles->'$(ProjectDir)..\..\oqtane.framework\Oqtane.Server\bin\$(Configuration)\$(TargetFramework)\runtimes\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -2,12 +2,16 @@ using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using System.Net.Http;
|
||||
using Oqtane.Enums;
|
||||
using Oqtane.Infrastructure;
|
||||
using Oqtane.Models;
|
||||
using Oqtane.Security;
|
||||
using Oqtane.Shared;
|
||||
using SZUAbsolventenverein.Module.HallOfFame.Repository;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using System.IO;
|
||||
using System;
|
||||
|
||||
namespace SZUAbsolventenverein.Module.HallOfFame.Services
|
||||
{
|
||||
@@ -18,14 +22,16 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Services
|
||||
private readonly ILogManager _logger;
|
||||
private readonly IHttpContextAccessor _accessor;
|
||||
private readonly Alias _alias;
|
||||
private readonly IWebHostEnvironment _environment;
|
||||
|
||||
public ServerHallOfFameService(IHallOfFameRepository HallOfFameRepository, IUserPermissions userPermissions, ITenantManager tenantManager, ILogManager logger, IHttpContextAccessor accessor)
|
||||
public ServerHallOfFameService(IHallOfFameRepository HallOfFameRepository, IUserPermissions userPermissions, ITenantManager tenantManager, ILogManager logger, IHttpContextAccessor accessor, IWebHostEnvironment environment)
|
||||
{
|
||||
_HallOfFameRepository = HallOfFameRepository;
|
||||
_userPermissions = userPermissions;
|
||||
_logger = logger;
|
||||
_accessor = accessor;
|
||||
_alias = tenantManager.GetAlias();
|
||||
_environment = environment;
|
||||
}
|
||||
|
||||
public Task<List<Models.HallOfFame>> GetHallOfFamesAsync(int ModuleId)
|
||||
@@ -111,5 +117,104 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Services
|
||||
}
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public Task ReportAsync(int HallOfFameId, int ModuleId, string reason)
|
||||
{
|
||||
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View))
|
||||
{
|
||||
var report = new Models.HallOfFameReport
|
||||
{
|
||||
HallOfFameId = HallOfFameId,
|
||||
Reason = reason
|
||||
};
|
||||
_HallOfFameRepository.AddHallOfFameReport(report);
|
||||
|
||||
var hallOfFame = _HallOfFameRepository.GetHallOfFame(HallOfFameId);
|
||||
if (hallOfFame != null && !hallOfFame.IsReported)
|
||||
{
|
||||
hallOfFame.IsReported = true;
|
||||
_HallOfFameRepository.UpdateHallOfFame(hallOfFame);
|
||||
}
|
||||
_logger.Log(LogLevel.Information, this, LogFunction.Update, "HallOfFame Reported {HallOfFameId}", HallOfFameId);
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized HallOfFame Report Attempt {HallOfFameId} {ModuleId}", HallOfFameId, ModuleId);
|
||||
}
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public Task<List<Models.HallOfFameReport>> GetHallOfFameReportsAsync(int HallOfFameId, int ModuleId)
|
||||
{
|
||||
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.Edit))
|
||||
{
|
||||
return Task.FromResult(_HallOfFameRepository.GetHallOfFameReports(HallOfFameId).ToList());
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized HallOfFame Get Reports Attempt {HallOfFameId} {ModuleId}", HallOfFameId, ModuleId);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public Task DeleteHallOfFameReportAsync(int HallOfFameReportId, int ModuleId)
|
||||
{
|
||||
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.Edit))
|
||||
{
|
||||
var report = _HallOfFameRepository.GetHallOfFameReport(HallOfFameReportId);
|
||||
if (report != null)
|
||||
{
|
||||
int hallOfFameId = report.HallOfFameId;
|
||||
_HallOfFameRepository.DeleteHallOfFameReport(HallOfFameReportId);
|
||||
|
||||
// Check if there are any reports left for this entry
|
||||
var remainingReports = _HallOfFameRepository.GetHallOfFameReports(hallOfFameId);
|
||||
if (!remainingReports.Any())
|
||||
{
|
||||
var hallOfFame = _HallOfFameRepository.GetHallOfFame(hallOfFameId);
|
||||
if (hallOfFame != null)
|
||||
{
|
||||
hallOfFame.IsReported = false;
|
||||
_HallOfFameRepository.UpdateHallOfFame(hallOfFame);
|
||||
}
|
||||
}
|
||||
}
|
||||
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "HallOfFame Report Deleted {HallOfFameReportId}", HallOfFameReportId);
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized HallOfFame Delete Report Attempt {HallOfFameReportId} {ModuleId}", HallOfFameReportId, ModuleId);
|
||||
}
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
public async Task<string> UploadFileAsync(Stream stream, string fileName, int ModuleId)
|
||||
{
|
||||
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.Edit))
|
||||
{
|
||||
var extension = Path.GetExtension(fileName).ToLower();
|
||||
|
||||
if (extension != ".jpg" && extension != ".jpeg" && extension != ".png")
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var folder = Path.Combine(_environment.WebRootPath, "Content", "HallOfFame");
|
||||
if (!Directory.Exists(folder))
|
||||
{
|
||||
Directory.CreateDirectory(folder);
|
||||
}
|
||||
|
||||
var newFileName = Guid.NewGuid().ToString() + extension;
|
||||
var path = Path.Combine(folder, newFileName);
|
||||
|
||||
using (var fileStream = new FileStream(path, FileMode.Create))
|
||||
{
|
||||
await stream.CopyToAsync(fileStream);
|
||||
}
|
||||
|
||||
return "/Content/HallOfFame/" + newFileName;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Oqtane.Infrastructure;
|
||||
@@ -21,6 +21,9 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Startup
|
||||
|
||||
public void ConfigureServices(IServiceCollection services)
|
||||
{
|
||||
// QuestPDF Lizenz konfigurieren
|
||||
QuestPDF.Settings.License = QuestPDF.Infrastructure.LicenseType.Community;
|
||||
|
||||
services.AddTransient<IHallOfFameService, ServerHallOfFameService>();
|
||||
services.AddDbContextFactory<HallOfFameContext>(opt => { }, ServiceLifetime.Transient);
|
||||
}
|
||||
|
||||
@@ -1 +1,17 @@
|
||||
/* Module Custom Styles */
|
||||
/* Module Custom Styles */
|
||||
|
||||
.hof-description-container {
|
||||
min-height: 120px;
|
||||
/* Adjust this value based on the desired card size */
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
.hof-description-line {
|
||||
display: block;
|
||||
padding-left: 1.1em;
|
||||
text-indent: -1.1em;
|
||||
margin-bottom: 0.2rem;
|
||||
line-height: 1.5;
|
||||
word-break: break-word;
|
||||
text-align: left;
|
||||
}
|
||||
Reference in New Issue
Block a user