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 ec854a8..904e10a 100644 --- a/Client/SZUAbsolventenverein.Module.HallOfFame.Client.csproj +++ b/Client/SZUAbsolventenverein.Module.HallOfFame.Client.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 1.0.0 SZUAbsolventenverein SZUAbsolventenverein @@ -13,11 +13,12 @@ - - - - - + + + + + + @@ -25,8 +26,8 @@ - ..\..\oqtane.framework\Oqtane.Server\bin\Debug\net9.0\Oqtane.Client.dll - ..\..\oqtane.framework\Oqtane.Server\bin\Debug\net9.0\Oqtane.Shared.dll + ..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Client.dll + ..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Shared.dll diff --git a/Package/SZUAbsolventenverein.Module.HallOfFame.Package.csproj b/Package/SZUAbsolventenverein.Module.HallOfFame.Package.csproj index 6f2b2d9..f705b1c 100644 --- a/Package/SZUAbsolventenverein.Module.HallOfFame.Package.csproj +++ b/Package/SZUAbsolventenverein.Module.HallOfFame.Package.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 false false diff --git a/Package/SZUAbsolventenverein.Module.HallOfFame.nuspec b/Package/SZUAbsolventenverein.Module.HallOfFame.nuspec index 12a13fb..b678e5a 100644 --- a/Package/SZUAbsolventenverein.Module.HallOfFame.nuspec +++ b/Package/SZUAbsolventenverein.Module.HallOfFame.nuspec @@ -2,7 +2,7 @@ $projectname$ - 1.0.1 + 1.0.0 SZUAbsolventenverein SZUAbsolventenverein HallOfFame @@ -27,11 +27,11 @@ - - - - - + + + + + diff --git a/Package/release.sh b/Package/release.sh index 443bf64..8dbc740 100644 --- a/Package/release.sh +++ b/Package/release.sh @@ -1,7 +1,7 @@ TargetFramework=$1 ProjectName=$2 -find . -name "*.nupkg" -delete -"..\..\oqtane.framework\oqtane.package\FixProps.exe" -"..\..\oqtane.framework\oqtane.package\nuget.exe" pack %ProjectName%.nuspec -Properties targetframework=%TargetFramework%;projectname=%ProjectName% -cp -f "*.nupkg" "..\..\oqtane.framework\Oqtane.Server\Packages\" \ No newline at end of file +find . -name *.nupkg -delete +dotnet run --project ../../fixProps/FixProps/FixProps.csproj +dotnet pack $ProjectName.nuspec "/p:targetframework=${TargetFramework};ProjectName=${ProjectName}" +cp -f *.nupkg ../../oqtane.framework/Oqtane.Server/Packages/ \ No newline at end of file diff --git a/SZUAbsolventenverein.Module.HallOfFame.sln b/SZUAbsolventenverein.Module.HallOfFame.sln deleted file mode 100644 index ad7ea67..0000000 --- a/SZUAbsolventenverein.Module.HallOfFame.sln +++ /dev/null @@ -1,47 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28621.142 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Server", "..\oqtane.framework\Oqtane.Server\Oqtane.Server.csproj", "{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Module.HallOfFame.Client", "Client\SZUAbsolventenverein.Module.HallOfFame.Client.csproj", "{AA8E58A1-CD09-4208-BF66-A8BB341FD669}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Module.HallOfFame.Server", "Server\SZUAbsolventenverein.Module.HallOfFame.Server.csproj", "{04B05448-788F-433D-92C0-FED35122D45A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Module.HallOfFame.Shared", "Shared\SZUAbsolventenverein.Module.HallOfFame.Shared.csproj", "{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Module.HallOfFame.Package", "Package\SZUAbsolventenverein.Module.HallOfFame.Package.csproj", "{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Release|Any CPU.Build.0 = Release|Any CPU - {04B05448-788F-433D-92C0-FED35122D45A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04B05448-788F-433D-92C0-FED35122D45A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04B05448-788F-433D-92C0-FED35122D45A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04B05448-788F-433D-92C0-FED35122D45A}.Release|Any CPU.Build.0 = Release|Any CPU - {18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Release|Any CPU.Build.0 = Release|Any CPU - {C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {1D016F15-46FE-4726-8DFD-2E4FD4DC7668} - EndGlobalSection -EndGlobal diff --git a/SZUAbsolventenverein.Module.HallOfFame.slnx b/SZUAbsolventenverein.Module.HallOfFame.slnx new file mode 100644 index 0000000..8c8f079 --- /dev/null +++ b/SZUAbsolventenverein.Module.HallOfFame.slnx @@ -0,0 +1,9 @@ + + + + + + + + + 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/Server/SZUAbsolventenverein.Module.HallOfFame.Server.csproj b/Server/SZUAbsolventenverein.Module.HallOfFame.Server.csproj index d2ffef7..8568994 100644 --- a/Server/SZUAbsolventenverein.Module.HallOfFame.Server.csproj +++ b/Server/SZUAbsolventenverein.Module.HallOfFame.Server.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 true 1.0.1 SZUAbsolventenverein.Module.HallOfFame @@ -19,10 +19,10 @@ - - - - + + + + @@ -32,8 +32,8 @@ - ..\..\oqtane.framework\Oqtane.Server\bin\Debug\net9.0\Oqtane.Server.dll - ..\..\oqtane.framework\Oqtane.Server\bin\Debug\net9.0\Oqtane.Shared.dll + ..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Server.dll + ..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Shared.dll 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 e990d20..44ae79b 100644 --- a/Shared/SZUAbsolventenverein.Module.HallOfFame.Shared.csproj +++ b/Shared/SZUAbsolventenverein.Module.HallOfFame.Shared.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 1.0.1 SZUAbsolventenverein.Module.HallOfFame SZUAbsolventenverein @@ -12,11 +12,12 @@ + - ..\..\oqtane.framework\Oqtane.Server\bin\Debug\net9.0\Oqtane.Shared.dll + ..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Shared.dll