From 2af80bf3a74d651c7f7ca201450b37efd55f4cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Sun, 31 May 2026 19:42:50 +0200 Subject: [PATCH 01/11] Add endpoint & button for export --- src/Turnierplan.App/Client/src/app/i18n/de.ts | 1 + .../view-planning-realm.component.html | 7 ++++ .../view-planning-realm.component.ts | 18 ++++++++ .../ExportApplicationsEndpoint.cs | 41 +++++++++++++++++++ ...mer.cs => ResponseOperationTransformer.cs} | 38 +++++++++++++++-- src/Turnierplan.App/Program.cs | 2 +- 6 files changed, 102 insertions(+), 5 deletions(-) create mode 100644 src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs rename src/Turnierplan.App/OpenApi/{PdfResponseOperationTransformer.cs => ResponseOperationTransformer.cs} (54%) diff --git a/src/Turnierplan.App/Client/src/app/i18n/de.ts b/src/Turnierplan.App/Client/src/app/i18n/de.ts index 954eacee..dac09be0 100644 --- a/src/Turnierplan.App/Client/src/app/i18n/de.ts +++ b/src/Turnierplan.App/Client/src/app/i18n/de.ts @@ -1040,6 +1040,7 @@ export const de = { CheckboxLabel: 'Ich habe den Hinweis gelesen und möchte die Anmeldung erstellen' } }, + ExportApplications:"Export (.csv)", TournamentClasses: { Name: 'Name', InvitationLinkCount: 'Anmeldelinks', diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.html b/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.html index 3d99d48c..c2cd6ef3 100644 --- a/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.html +++ b/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.html @@ -39,6 +39,13 @@ } @case (2) { + + + @let canAddApplications = !_hasUnsavedChanges && planningRealm.tournamentClasses.length > 0; @if (!canAddApplications) { diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts b/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts index 87c7f4f0..6375ec3b 100644 --- a/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts @@ -36,6 +36,7 @@ import { createApplication } from '../../../api/fn/applications/create-applicati import { updatePlanningRealm } from '../../../api/fn/planning-realms/update-planning-realm'; import { deletePlanningRealm } from '../../../api/fn/planning-realms/delete-planning-realm'; import { LabelsManagerComponent } from '../../components/labels-manager/labels-manager.component'; +import { exportApplications } from '../../../api/fn/applications/export-applications'; export type UpdatePlanningRealmFunc = (modifyFunc: (planningRealm: PlanningRealmDto) => boolean) => void; @@ -303,6 +304,23 @@ export class ViewPlanningRealmComponent implements OnInit, OnDestroy, DiscardCha }); } + protected exportApplications(): void { + if (!this.planningRealm) { + return; + } + + // TODO: Add dialog with option to include teams and to apply the current filter + + this.turnierplanApi.invoke(exportApplications, { planningRealmId: this.planningRealm.id }).subscribe({ + next: (result) => { + const a = document.createElement('a'); + a.href = URL.createObjectURL(new Blob([result])); + a.download = 'asdf.csv'; // TODO: Add proper translated file name + a.click(); + } + }); + } + protected renamePlanningRealm(name: string): void { if (!this.planningRealm) { return; diff --git a/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs b/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs new file mode 100644 index 00000000..5eac89e6 --- /dev/null +++ b/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs @@ -0,0 +1,41 @@ +using Microsoft.AspNetCore.Mvc; +using Turnierplan.App.OpenApi; +using Turnierplan.App.Security; +using Turnierplan.Core.PublicId; +using Turnierplan.Dal.Repositories; + +namespace Turnierplan.App.Endpoints.Applications; + +internal sealed class ExportApplicationsEndpoint : EndpointBase +{ + protected override HttpMethod Method => HttpMethod.Get; + + protected override string Route => "/api/planning-realms/{planningRealmId}/applications-export"; + + protected override Delegate Handler => Handle; + + protected override void ConfigureMetadata(RouteHandlerBuilder builder) + { + builder.ProducesCsv(); + } + + private static async Task Handle( + [FromRoute] PublicId planningRealmId, + IPlanningRealmRepository planningRealmRepository, + IAccessValidator accessValidator) + { + var planningRealm = await planningRealmRepository.GetByPublicIdAsync(planningRealmId, IPlanningRealmRepository.Includes.TournamentClasses | IPlanningRealmRepository.Includes.ApplicationsWithTeamsAndTournamentLinks); + + if (planningRealm is null) + { + return Results.NotFound(); + } + + if (!accessValidator.IsActionAllowed(planningRealm, Actions.ApplicationsRead)) + { + return Results.Forbid(); + } + + return Results.Text("csvcontent"); + } +} diff --git a/src/Turnierplan.App/OpenApi/PdfResponseOperationTransformer.cs b/src/Turnierplan.App/OpenApi/ResponseOperationTransformer.cs similarity index 54% rename from src/Turnierplan.App/OpenApi/PdfResponseOperationTransformer.cs rename to src/Turnierplan.App/OpenApi/ResponseOperationTransformer.cs index 6c7e4241..c07d6e9f 100644 --- a/src/Turnierplan.App/OpenApi/PdfResponseOperationTransformer.cs +++ b/src/Turnierplan.App/OpenApi/ResponseOperationTransformer.cs @@ -8,13 +8,36 @@ namespace Turnierplan.App.OpenApi; /// content type in such a way that the caller cannot retrieve the Blob returned by the server. This can be /// fixed by modifying the format property and setting it to binary. /// -internal sealed class PdfResponseOperationTransformer : IOpenApiOperationTransformer +internal sealed class ResponseOperationTransformer : IOpenApiOperationTransformer { public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransformerContext context, CancellationToken cancellationToken) { + var csvResponseType = typeof(ICsvResponse); var pdfResponseType = typeof(IPdfResponse); - if (context.Description.SupportedResponseTypes.Any(x => x.Type == pdfResponseType) && operation.Responses is not null) + if (operation.Responses is null) + { + return Task.CompletedTask; + } + + if (context.Description.SupportedResponseTypes.Any(x => x.Type == csvResponseType)) + { + operation.Responses["200"] = new OpenApiResponse + { + Content = new Dictionary + { + ["text/csv"] = new() + { + Schema = new OpenApiSchema + { + Type = JsonSchemaType.String + } + } + } + }; + } + + if (context.Description.SupportedResponseTypes.Any(x => x.Type == pdfResponseType)) { operation.Responses["200"] = new OpenApiResponse { @@ -35,13 +58,20 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform return Task.CompletedTask; } + public interface ICsvResponse; + public interface IPdfResponse; } -internal static class PdfResponseOperationTransformerExtensions +internal static class ResponseOperationTransformerExtensions { + public static void ProducesCsv(this RouteHandlerBuilder builder) + { + builder.Produces(); + } + public static void ProducesPdf(this RouteHandlerBuilder builder) { - builder.Produces(); + builder.Produces(); } } diff --git a/src/Turnierplan.App/Program.cs b/src/Turnierplan.App/Program.cs index c92aeec8..c02b7439 100644 --- a/src/Turnierplan.App/Program.cs +++ b/src/Turnierplan.App/Program.cs @@ -49,7 +49,7 @@ builder.Services.AddOpenApi("turnierplan", options => { - options.AddOperationTransformer(); + options.AddOperationTransformer(); options.AddSchemaTransformer(); options.AddSchemaTransformer(); }); From 41db7d824386ed72da418008ce29571a0c8f5cf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Thu, 4 Jun 2026 08:23:45 +0200 Subject: [PATCH 02/11] Refactor into dialog component --- src/Turnierplan.App/Client/src/app/i18n/de.ts | 6 ++- .../export-applications-dialog.component.html | 17 +++++++ .../export-applications-dialog.component.ts | 45 +++++++++++++++++++ .../view-planning-realm.component.html | 2 +- .../view-planning-realm.component.ts | 17 +++---- 5 files changed, 75 insertions(+), 12 deletions(-) create mode 100644 src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.html create mode 100644 src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts diff --git a/src/Turnierplan.App/Client/src/app/i18n/de.ts b/src/Turnierplan.App/Client/src/app/i18n/de.ts index dac09be0..8971d2b4 100644 --- a/src/Turnierplan.App/Client/src/app/i18n/de.ts +++ b/src/Turnierplan.App/Client/src/app/i18n/de.ts @@ -1040,7 +1040,11 @@ export const de = { CheckboxLabel: 'Ich habe den Hinweis gelesen und möchte die Anmeldung erstellen' } }, - ExportApplications:"Export (.csv)", + ExportApplications: { + Button: 'Export (.csv)', + DialogTitle: 'asdf', + Download: 'Herunterladen' + }, TournamentClasses: { Name: 'Name', InvitationLinkCount: 'Anmeldelinks', diff --git a/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.html b/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.html new file mode 100644 index 00000000..d47cdf39 --- /dev/null +++ b/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.html @@ -0,0 +1,17 @@ +
+
+ +
+
todo: options
+
+ @if (isDownloading) { + + } + + +
diff --git a/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts b/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts new file mode 100644 index 00000000..ef5e47be --- /dev/null +++ b/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts @@ -0,0 +1,45 @@ +import { Component } from '@angular/core'; +import { TranslateDirective } from '@ngx-translate/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { ActionButtonComponent } from '../action-button/action-button.component'; +import { SmallSpinnerComponent } from '../../../core/components/small-spinner/small-spinner.component'; +import { TurnierplanApi } from '../../../api/turnierplan-api'; +import { exportApplications } from '../../../api/fn/applications/export-applications'; + +@Component({ + selector: 'tp-export-applications-dialog', + imports: [TranslateDirective, ActionButtonComponent, SmallSpinnerComponent], + templateUrl: './export-applications-dialog.component.html' +}) +export class ExportApplicationsDialogComponent { + protected isDownloading = false; + private planningRealmId?: string; + + constructor( + protected readonly modal: NgbActiveModal, + private readonly turnierplanApi: TurnierplanApi + ) {} + + public initialize(planningRealmId: string) { + this.planningRealmId = planningRealmId; + } + + protected exportApplications(): void { + if (!this.planningRealmId) { + return; + } + + this.isDownloading = true; + + this.turnierplanApi.invoke(exportApplications, { planningRealmId: this.planningRealmId }).subscribe({ + next: (result) => { + const a = document.createElement('a'); + a.href = URL.createObjectURL(new Blob([result])); + a.download = 'asdf.csv'; // TODO: Add proper translated file name + a.click(); + + this.modal.close(); + } + }); + } +} diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.html b/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.html index c2cd6ef3..d4f83e26 100644 --- a/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.html +++ b/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.html @@ -41,7 +41,7 @@ diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts b/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts index 6375ec3b..75c4280d 100644 --- a/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts @@ -36,7 +36,7 @@ import { createApplication } from '../../../api/fn/applications/create-applicati import { updatePlanningRealm } from '../../../api/fn/planning-realms/update-planning-realm'; import { deletePlanningRealm } from '../../../api/fn/planning-realms/delete-planning-realm'; import { LabelsManagerComponent } from '../../components/labels-manager/labels-manager.component'; -import { exportApplications } from '../../../api/fn/applications/export-applications'; +import { ExportApplicationsDialogComponent } from '../../components/export-applications-dialog/export-applications-dialog.component'; export type UpdatePlanningRealmFunc = (modifyFunc: (planningRealm: PlanningRealmDto) => boolean) => void; @@ -309,16 +309,13 @@ export class ViewPlanningRealmComponent implements OnInit, OnDestroy, DiscardCha return; } - // TODO: Add dialog with option to include teams and to apply the current filter - - this.turnierplanApi.invoke(exportApplications, { planningRealmId: this.planningRealm.id }).subscribe({ - next: (result) => { - const a = document.createElement('a'); - a.href = URL.createObjectURL(new Blob([result])); - a.download = 'asdf.csv'; // TODO: Add proper translated file name - a.click(); - } + const ref = this.modalService.open(ExportApplicationsDialogComponent, { + centered: true, + size: 'md', + fullscreen: 'md' }); + + (ref.componentInstance as ExportApplicationsDialogComponent).initialize(this.planningRealm.id); } protected renamePlanningRealm(name: string): void { From 6a11cf34cdbab7fd5292a9bee7b5e3a6843b8bea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Thu, 4 Jun 2026 08:30:04 +0200 Subject: [PATCH 03/11] Add dynamic file name --- src/Turnierplan.App/Client/src/app/i18n/de.ts | 3 ++- .../document-manager.component.ts | 3 ++- .../export-applications-dialog.component.ts | 25 +++++++++++++------ .../src/app/portal/helpers/file-name.ts | 3 +++ .../view-planning-realm.component.ts | 2 +- 5 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 src/Turnierplan.App/Client/src/app/portal/helpers/file-name.ts diff --git a/src/Turnierplan.App/Client/src/app/i18n/de.ts b/src/Turnierplan.App/Client/src/app/i18n/de.ts index 8971d2b4..55a3a612 100644 --- a/src/Turnierplan.App/Client/src/app/i18n/de.ts +++ b/src/Turnierplan.App/Client/src/app/i18n/de.ts @@ -1043,7 +1043,8 @@ export const de = { ExportApplications: { Button: 'Export (.csv)', DialogTitle: 'asdf', - Download: 'Herunterladen' + Download: 'Herunterladen', + FileName: 'Anmeldungen {{planningRealmName}}' }, TournamentClasses: { Name: 'Name', diff --git a/src/Turnierplan.App/Client/src/app/portal/components/document-manager/document-manager.component.ts b/src/Turnierplan.App/Client/src/app/portal/components/document-manager/document-manager.component.ts index 91065b77..07581d75 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/document-manager/document-manager.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/components/document-manager/document-manager.component.ts @@ -27,6 +27,7 @@ import { setMatchPlanDocumentConfiguration } from '../../../api/fn/documents/set import { MatchPlanDocumentConfiguration } from '../../../api/models/match-plan-document-configuration'; import { setReceiptsDocumentConfiguration } from '../../../api/fn/documents/set-receipts-document-configuration'; import { ReceiptsDocumentConfiguration } from '../../../api/models/receipts-document-configuration'; +import { makeSafeFileName } from '../../helpers/file-name'; @Component({ selector: 'tp-document-manager', @@ -244,7 +245,7 @@ export class DocumentManagerComponent { } private getDocumentFileName(name: string): string { - return `${name} - ${this.tournamentName}.pdf`.replaceAll(/[^.A-Za-z0-9Ä-Öä-öß _-]/g, '_'); + return `${makeSafeFileName(`${name} - ${this.tournamentName}`)}.pdf`; } private getDocumentConfig(document: DocumentDto): Observable { diff --git a/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts b/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts index ef5e47be..95ceebc3 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts @@ -1,10 +1,12 @@ import { Component } from '@angular/core'; -import { TranslateDirective } from '@ngx-translate/core'; +import { TranslateDirective, TranslateService } from '@ngx-translate/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ActionButtonComponent } from '../action-button/action-button.component'; import { SmallSpinnerComponent } from '../../../core/components/small-spinner/small-spinner.component'; import { TurnierplanApi } from '../../../api/turnierplan-api'; import { exportApplications } from '../../../api/fn/applications/export-applications'; +import { PlanningRealmDto } from '../../../api/models/planning-realm-dto'; +import { makeSafeFileName } from '../../helpers/file-name'; @Component({ selector: 'tp-export-applications-dialog', @@ -13,29 +15,36 @@ import { exportApplications } from '../../../api/fn/applications/export-applicat }) export class ExportApplicationsDialogComponent { protected isDownloading = false; - private planningRealmId?: string; + private planningRealm?: PlanningRealmDto; constructor( protected readonly modal: NgbActiveModal, - private readonly turnierplanApi: TurnierplanApi + private readonly turnierplanApi: TurnierplanApi, + private readonly translateService: TranslateService ) {} - public initialize(planningRealmId: string) { - this.planningRealmId = planningRealmId; + public initialize(planningRealm: PlanningRealmDto) { + this.planningRealm = planningRealm; } protected exportApplications(): void { - if (!this.planningRealmId) { + if (!this.planningRealm) { return; } + const fileName = `${makeSafeFileName( + this.translateService.instant('Portal.ViewPlanningRealm.ExportApplications.FileName', { + planningRealmName: this.planningRealm?.name + }) as string + )}.csv`; + this.isDownloading = true; - this.turnierplanApi.invoke(exportApplications, { planningRealmId: this.planningRealmId }).subscribe({ + this.turnierplanApi.invoke(exportApplications, { planningRealmId: this.planningRealm.id }).subscribe({ next: (result) => { const a = document.createElement('a'); a.href = URL.createObjectURL(new Blob([result])); - a.download = 'asdf.csv'; // TODO: Add proper translated file name + a.download = fileName; a.click(); this.modal.close(); diff --git a/src/Turnierplan.App/Client/src/app/portal/helpers/file-name.ts b/src/Turnierplan.App/Client/src/app/portal/helpers/file-name.ts new file mode 100644 index 00000000..5e652313 --- /dev/null +++ b/src/Turnierplan.App/Client/src/app/portal/helpers/file-name.ts @@ -0,0 +1,3 @@ +export const makeSafeFileName = (input: string): string => { + return input.replaceAll(/[^.A-Za-z0-9Ä-Öä-öß _-]/g, '_'); +}; diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts b/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts index 75c4280d..7ff686e7 100644 --- a/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts @@ -315,7 +315,7 @@ export class ViewPlanningRealmComponent implements OnInit, OnDestroy, DiscardCha fullscreen: 'md' }); - (ref.componentInstance as ExportApplicationsDialogComponent).initialize(this.planningRealm.id); + (ref.componentInstance as ExportApplicationsDialogComponent).initialize(this.planningRealm); } protected renamePlanningRealm(name: string): void { From ff953be0846f8c3f50a9e861ed60366c27dec5c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Thu, 4 Jun 2026 08:30:24 +0200 Subject: [PATCH 04/11] Add translated title --- src/Turnierplan.App/Client/src/app/i18n/de.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Turnierplan.App/Client/src/app/i18n/de.ts b/src/Turnierplan.App/Client/src/app/i18n/de.ts index 55a3a612..6bfb626f 100644 --- a/src/Turnierplan.App/Client/src/app/i18n/de.ts +++ b/src/Turnierplan.App/Client/src/app/i18n/de.ts @@ -1042,7 +1042,7 @@ export const de = { }, ExportApplications: { Button: 'Export (.csv)', - DialogTitle: 'asdf', + DialogTitle: 'Anmeldungen exportieren', Download: 'Herunterladen', FileName: 'Anmeldungen {{planningRealmName}}' }, From 0c81ebf009e289b73e1ec1c257589e41342ddf3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Thu, 4 Jun 2026 08:40:01 +0200 Subject: [PATCH 05/11] Dialog is finished --- src/Turnierplan.App/Client/src/app/i18n/de.ts | 3 ++ .../export-applications-dialog.component.html | 18 ++++++++++- .../export-applications-dialog.component.ts | 30 ++++++++++++------- .../ExportApplicationsEndpoint.cs | 1 + 4 files changed, 41 insertions(+), 11 deletions(-) diff --git a/src/Turnierplan.App/Client/src/app/i18n/de.ts b/src/Turnierplan.App/Client/src/app/i18n/de.ts index 6bfb626f..dfbec679 100644 --- a/src/Turnierplan.App/Client/src/app/i18n/de.ts +++ b/src/Turnierplan.App/Client/src/app/i18n/de.ts @@ -1043,6 +1043,9 @@ export const de = { ExportApplications: { Button: 'Export (.csv)', DialogTitle: 'Anmeldungen exportieren', + InfoTest: + 'Nachfolgend können Sie eine CSV-Tabelle mit allen Anmeldungen in diesem Turnierplaner herunterladen. Wahlweise können die Mannschaften jeder Anmeldung ebenfalls aufgelistet werden.', + IncludeApplicationTeams: 'Mannschaften auflisten', Download: 'Herunterladen', FileName: 'Anmeldungen {{planningRealmName}}' }, diff --git a/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.html b/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.html index d47cdf39..0a58922d 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.html +++ b/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.html @@ -2,7 +2,23 @@
-
todo: options
+
+
+
+
+ + +
+
+
@if (isDownloading) { diff --git a/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts b/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts index 95ceebc3..a0a9c872 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts @@ -7,13 +7,18 @@ import { TurnierplanApi } from '../../../api/turnierplan-api'; import { exportApplications } from '../../../api/fn/applications/export-applications'; import { PlanningRealmDto } from '../../../api/models/planning-realm-dto'; import { makeSafeFileName } from '../../helpers/file-name'; +import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms'; @Component({ selector: 'tp-export-applications-dialog', - imports: [TranslateDirective, ActionButtonComponent, SmallSpinnerComponent], + imports: [TranslateDirective, ActionButtonComponent, SmallSpinnerComponent, ReactiveFormsModule], templateUrl: './export-applications-dialog.component.html' }) export class ExportApplicationsDialogComponent { + protected readonly form = new FormGroup({ + includeApplicationTeams: new FormControl(false, { nonNullable: true }) + }); + protected isDownloading = false; private planningRealm?: PlanningRealmDto; @@ -40,15 +45,20 @@ export class ExportApplicationsDialogComponent { this.isDownloading = true; - this.turnierplanApi.invoke(exportApplications, { planningRealmId: this.planningRealm.id }).subscribe({ - next: (result) => { - const a = document.createElement('a'); - a.href = URL.createObjectURL(new Blob([result])); - a.download = fileName; - a.click(); + this.turnierplanApi + .invoke(exportApplications, { + planningRealmId: this.planningRealm.id, + includeApplicationTeams: this.form.getRawValue().includeApplicationTeams + }) + .subscribe({ + next: (result) => { + const a = document.createElement('a'); + a.href = URL.createObjectURL(new Blob([result])); + a.download = fileName; + a.click(); - this.modal.close(); - } - }); + this.modal.close(); + } + }); } } diff --git a/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs b/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs index 5eac89e6..68e32955 100644 --- a/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs @@ -21,6 +21,7 @@ protected override void ConfigureMetadata(RouteHandlerBuilder builder) private static async Task Handle( [FromRoute] PublicId planningRealmId, + [FromQuery] bool includeApplicationTeams, IPlanningRealmRepository planningRealmRepository, IAccessValidator accessValidator) { From a0b16073cb30f489e84e7f5db871e4cb7d46a6cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Thu, 4 Jun 2026 09:59:01 +0200 Subject: [PATCH 06/11] Implement CSV generation --- src/Turnierplan.App/Csv/CsvResult.cs | 21 ++++ src/Turnierplan.App/Csv/CsvWriter.cs | 114 ++++++++++++++++++ .../ExportApplicationsEndpoint.cs | 70 ++++++++++- .../Extensions/ResultsExtensions.cs | 14 +++ 4 files changed, 217 insertions(+), 2 deletions(-) create mode 100644 src/Turnierplan.App/Csv/CsvResult.cs create mode 100644 src/Turnierplan.App/Csv/CsvWriter.cs create mode 100644 src/Turnierplan.App/Extensions/ResultsExtensions.cs diff --git a/src/Turnierplan.App/Csv/CsvResult.cs b/src/Turnierplan.App/Csv/CsvResult.cs new file mode 100644 index 00000000..64c8c0dd --- /dev/null +++ b/src/Turnierplan.App/Csv/CsvResult.cs @@ -0,0 +1,21 @@ +namespace Turnierplan.App.Csv; + +internal sealed class CsvResult : IResult +{ + private readonly Func _generate; + + public CsvResult(Func generate) + { + _generate = generate; + } + + public async Task ExecuteAsync(HttpContext httpContext) + { + httpContext.Response.StatusCode = 200; + httpContext.Response.Headers.ContentType = "text/csv"; + + await using var csvWriter = new CsvWriter(httpContext.Response.Body); + + await _generate(csvWriter); + } +} diff --git a/src/Turnierplan.App/Csv/CsvWriter.cs b/src/Turnierplan.App/Csv/CsvWriter.cs new file mode 100644 index 00000000..82f732dd --- /dev/null +++ b/src/Turnierplan.App/Csv/CsvWriter.cs @@ -0,0 +1,114 @@ +using System.Text; + +namespace Turnierplan.App.Csv; + +internal sealed class CsvWriter : IDisposable, IAsyncDisposable +{ + private readonly StreamWriter _target; + private bool _isAtNewLine = true; + private bool _headerWritten; + private int? _columnCount; + + public CsvWriter(Stream target) + { + _target = new StreamWriter(target, encoding: Encoding.UTF8, leaveOpen: true); + } + + public async Task WriteHeaderAsync(params string[] header) + { + ArgumentOutOfRangeException.ThrowIfZero(header.Length); + + if (_headerWritten) + { + throw new InvalidOperationException("The CSV header was already written."); + } + + foreach (var cell in header) + { + await WriteCellAsync(cell); + } + + await WriteNewLineAsync(); + + _headerWritten = true; + _columnCount = header.Length; + } + + public async Task WriteRowAsync(params object?[] data) + { + if (!_headerWritten) + { + throw new InvalidOperationException("The CSV header has not been written yet."); + } + + if (data.Length != _columnCount) + { + throw new InvalidOperationException("The row has a different column count than the header."); + } + + foreach (var cell in data) + { + switch (cell) + { + case string cellString: + await WriteCellAsync(cellString); + break; + case DateTime dateTime: + await WriteCellAsync($"{dateTime:O}"); + break; + default: + await WriteCellAsync(cell?.ToString() ?? string.Empty); + break; + } + } + + await WriteNewLineAsync(); + } + + public void Dispose() + { + _target.Dispose(); + } + + public async ValueTask DisposeAsync() + { + await _target.DisposeAsync(); + } + + private async Task WriteCellAsync(string cell) + { + if (!_isAtNewLine) + { + await _target.WriteAsync(","); + } + + _isAtNewLine = false; + + if (cell.Length == 0) + { + return; + } + + await _target.WriteAsync('"'); + + foreach (var c in cell) + { + if (c == '"') + { + await _target.WriteAsync("\"\""); + } + else + { + await _target.WriteAsync(c); + } + } + + await _target.WriteAsync('"'); + } + + private async Task WriteNewLineAsync() + { + await _target.WriteLineAsync(); + _isAtNewLine = true; + } +} diff --git a/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs b/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs index 68e32955..684ba0d2 100644 --- a/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using Turnierplan.App.Extensions; using Turnierplan.App.OpenApi; using Turnierplan.App.Security; using Turnierplan.Core.PublicId; @@ -25,7 +26,7 @@ private static async Task Handle( IPlanningRealmRepository planningRealmRepository, IAccessValidator accessValidator) { - var planningRealm = await planningRealmRepository.GetByPublicIdAsync(planningRealmId, IPlanningRealmRepository.Includes.TournamentClasses | IPlanningRealmRepository.Includes.ApplicationsWithTeamsAndTournamentLinks); + var planningRealm = await planningRealmRepository.GetByPublicIdAsync(planningRealmId, IPlanningRealmRepository.Includes.ApplicationsWithTeams); if (planningRealm is null) { @@ -37,6 +38,71 @@ private static async Task Handle( return Results.Forbid(); } - return Results.Text("csvcontent"); + return Results.Csv(async csv => + { + if (includeApplicationTeams) + { + await csv.WriteHeaderAsync( + "ApplicationTag", + "ApplicationCreatedAt", + "ApplicationContactPerson", + "ApplicationContactEmail", + "ApplicationContactTelephone", + "ApplicationComment", + "ApplicationNotes", + "TournamentClass", + "TeamName", + "TeamLabels" + ); + } + else + { + await csv.WriteHeaderAsync( + "Tag", + "CreatedAt", + "NumberOfTeams", + "ContactPerson", + "ContactEmail", + "ContactTelephone", + "Comment", + "Notes" + ); + } + + foreach (var application in planningRealm.Applications.OrderBy(x => x.CreatedAt)) + { + if (includeApplicationTeams) + { + foreach (var team in application.Teams.OrderBy(x => x.Name)) + { + await csv.WriteRowAsync( + application.Tag, + application.CreatedAt, + application.Contact, + application.ContactEmail, + application.ContactTelephone, + application.Comment, + application.Notes, + team.Class.Name, + team.Name, + string.Join(", ", team.Labels.Select(x => x.Name)) + ); + } + } + else + { + await csv.WriteRowAsync( + application.Tag, + application.CreatedAt, + application.Teams.Count, + application.Contact, + application.ContactEmail, + application.ContactTelephone, + application.Comment, + application.Notes + ); + } + } + }); } } diff --git a/src/Turnierplan.App/Extensions/ResultsExtensions.cs b/src/Turnierplan.App/Extensions/ResultsExtensions.cs new file mode 100644 index 00000000..b2498c43 --- /dev/null +++ b/src/Turnierplan.App/Extensions/ResultsExtensions.cs @@ -0,0 +1,14 @@ +using Turnierplan.App.Csv; + +namespace Turnierplan.App.Extensions; + +internal static class ResultsExtensions +{ + extension(Results) + { + public static IResult Csv(Func generate) + { + return new CsvResult(generate); + } + } +} From ad8c983a425f5d520e7e2b37725b966f8f979f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Thu, 4 Jun 2026 10:06:08 +0200 Subject: [PATCH 07/11] Add translated column headers --- .../export-applications-dialog.component.ts | 1 + .../ExportApplicationsEndpoint.cs | 46 +++++++++++-------- .../Resources/i18n/de.json | 15 ++++++ 3 files changed, 43 insertions(+), 19 deletions(-) diff --git a/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts b/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts index a0a9c872..69178209 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts @@ -48,6 +48,7 @@ export class ExportApplicationsDialogComponent { this.turnierplanApi .invoke(exportApplications, { planningRealmId: this.planningRealm.id, + languageCode: this.translateService.getCurrentLang(), includeApplicationTeams: this.form.getRawValue().includeApplicationTeams }) .subscribe({ diff --git a/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs b/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs index 684ba0d2..62fb5672 100644 --- a/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs @@ -4,6 +4,7 @@ using Turnierplan.App.Security; using Turnierplan.Core.PublicId; using Turnierplan.Dal.Repositories; +using Turnierplan.Localization; namespace Turnierplan.App.Endpoints.Applications; @@ -22,10 +23,17 @@ protected override void ConfigureMetadata(RouteHandlerBuilder builder) private static async Task Handle( [FromRoute] PublicId planningRealmId, + [FromQuery] string languageCode, [FromQuery] bool includeApplicationTeams, IPlanningRealmRepository planningRealmRepository, - IAccessValidator accessValidator) + IAccessValidator accessValidator, + ILocalizationProvider localizationProvider) { + if (!localizationProvider.TryGetLocalization(languageCode, out var localization)) + { + return Results.BadRequest("Invalid language code specified."); + } + var planningRealm = await planningRealmRepository.GetByPublicIdAsync(planningRealmId, IPlanningRealmRepository.Includes.ApplicationsWithTeams); if (planningRealm is null) @@ -43,29 +51,29 @@ private static async Task Handle( if (includeApplicationTeams) { await csv.WriteHeaderAsync( - "ApplicationTag", - "ApplicationCreatedAt", - "ApplicationContactPerson", - "ApplicationContactEmail", - "ApplicationContactTelephone", - "ApplicationComment", - "ApplicationNotes", - "TournamentClass", - "TeamName", - "TeamLabels" + localization.Get("ApplicationsExport.Columns.Tag"), + localization.Get("ApplicationsExport.Columns.CreatedAt"), + localization.Get("ApplicationsExport.Columns.ContactPerson"), + localization.Get("ApplicationsExport.Columns.ContactEmail"), + localization.Get("ApplicationsExport.Columns.ContactTelephone"), + localization.Get("ApplicationsExport.Columns.Comment"), + localization.Get("ApplicationsExport.Columns.Notes"), + localization.Get("ApplicationsExport.Columns.TournamentClass"), + localization.Get("ApplicationsExport.Columns.TeamName"), + localization.Get("ApplicationsExport.Columns.TeamLabels") ); } else { await csv.WriteHeaderAsync( - "Tag", - "CreatedAt", - "NumberOfTeams", - "ContactPerson", - "ContactEmail", - "ContactTelephone", - "Comment", - "Notes" + localization.Get("ApplicationsExport.Columns.Tag"), + localization.Get("ApplicationsExport.Columns.CreatedAt"), + localization.Get("ApplicationsExport.Columns.NumberOfTeams"), + localization.Get("ApplicationsExport.Columns.ContactPerson"), + localization.Get("ApplicationsExport.Columns.ContactEmail"), + localization.Get("ApplicationsExport.Columns.ContactTelephone"), + localization.Get("ApplicationsExport.Columns.Comment"), + localization.Get("ApplicationsExport.Columns.Notes") ); } diff --git a/src/Turnierplan.Localization/Resources/i18n/de.json b/src/Turnierplan.Localization/Resources/i18n/de.json index abf8253f..ec180cf6 100644 --- a/src/Turnierplan.Localization/Resources/i18n/de.json +++ b/src/Turnierplan.Localization/Resources/i18n/de.json @@ -1,4 +1,19 @@ { + "ApplicationsExport": { + "Columns": { + "Comment": "Bemerkung", + "ContactEmail": "E-Mail", + "ContactPerson": "Kontaktperson", + "ContactTelephone": "Telefon-Nr.", + "CreatedAt": "Erstellt am", + "Notes": "Notizen", + "NumberOfTeams": "Anzahl Mannschaften", + "Tag": "Tag (ID)", + "TeamLabels": "Label", + "TeamName": "Mannschaftsname", + "TournamentClass": "Turnierklasse" + } + }, "Documents": { "Types": { "MatchPlan": "Spielplan", From 39fa349967f1f6fd48f2bde5709881beb37d2ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Thu, 4 Jun 2026 10:20:31 +0200 Subject: [PATCH 08/11] Disaable form & add error handling --- .../export-applications-dialog.component.ts | 4 ++++ .../view-planning-realm.component.ts | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts b/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts index 69178209..84bcce08 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/components/export-applications-dialog/export-applications-dialog.component.ts @@ -43,6 +43,7 @@ export class ExportApplicationsDialogComponent { }) as string )}.csv`; + this.form.disable(); this.isDownloading = true; this.turnierplanApi @@ -59,6 +60,9 @@ export class ExportApplicationsDialogComponent { a.click(); this.modal.close(); + }, + error: (error) => { + this.modal.dismiss({ isApiError: true, apiError: error as unknown }); } }); } diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts b/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts index 7ff686e7..c02c67a3 100644 --- a/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts @@ -37,6 +37,7 @@ import { updatePlanningRealm } from '../../../api/fn/planning-realms/update-plan import { deletePlanningRealm } from '../../../api/fn/planning-realms/delete-planning-realm'; import { LabelsManagerComponent } from '../../components/labels-manager/labels-manager.component'; import { ExportApplicationsDialogComponent } from '../../components/export-applications-dialog/export-applications-dialog.component'; +import { ApiKeyExtendComponent } from '../../components/api-key-extend/api-key-extend.component'; export type UpdatePlanningRealmFunc = (modifyFunc: (planningRealm: PlanningRealmDto) => boolean) => void; @@ -316,6 +317,15 @@ export class ViewPlanningRealmComponent implements OnInit, OnDestroy, DiscardCha }); (ref.componentInstance as ExportApplicationsDialogComponent).initialize(this.planningRealm); + + ref.dismissed.subscribe({ + next: (reason?: { isApiError?: boolean; apiError?: unknown }) => { + if (reason?.isApiError === true) { + // If reason is specified, this means an error occurred + this.loadingState = { isLoading: false, error: reason.apiError }; + } + } + }); } protected renamePlanningRealm(name: string): void { From 9ce692b57a0f55c1dcf0997b829f8685efc2292a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Thu, 4 Jun 2026 10:54:15 +0200 Subject: [PATCH 09/11] i18n changes --- src/Turnierplan.App/Client/src/app/i18n/de.ts | 3 +-- src/Turnierplan.Localization/Resources/i18n/de.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Turnierplan.App/Client/src/app/i18n/de.ts b/src/Turnierplan.App/Client/src/app/i18n/de.ts index dfbec679..02536fe9 100644 --- a/src/Turnierplan.App/Client/src/app/i18n/de.ts +++ b/src/Turnierplan.App/Client/src/app/i18n/de.ts @@ -1043,8 +1043,7 @@ export const de = { ExportApplications: { Button: 'Export (.csv)', DialogTitle: 'Anmeldungen exportieren', - InfoTest: - 'Nachfolgend können Sie eine CSV-Tabelle mit allen Anmeldungen in diesem Turnierplaner herunterladen. Wahlweise können die Mannschaften jeder Anmeldung ebenfalls aufgelistet werden.', + InfoTest: 'Nachfolgend können Sie eine CSV-Tabelle mit allen Anmeldungen in diesem Turnierplaner herunterladen.', IncludeApplicationTeams: 'Mannschaften auflisten', Download: 'Herunterladen', FileName: 'Anmeldungen {{planningRealmName}}' diff --git a/src/Turnierplan.Localization/Resources/i18n/de.json b/src/Turnierplan.Localization/Resources/i18n/de.json index ec180cf6..19ccf16a 100644 --- a/src/Turnierplan.Localization/Resources/i18n/de.json +++ b/src/Turnierplan.Localization/Resources/i18n/de.json @@ -8,7 +8,7 @@ "CreatedAt": "Erstellt am", "Notes": "Notizen", "NumberOfTeams": "Anzahl Mannschaften", - "Tag": "Tag (ID)", + "Tag": "Tag (Anmeldung)", "TeamLabels": "Label", "TeamName": "Mannschaftsname", "TournamentClass": "Turnierklasse" From 786ff61f2a5a638a4cacae1a728e0a83f4886e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Thu, 4 Jun 2026 10:56:06 +0200 Subject: [PATCH 10/11] Delete unused import --- .../pages/view-planning-realm/view-planning-realm.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts b/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts index c02c67a3..31a06a6a 100644 --- a/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/pages/view-planning-realm/view-planning-realm.component.ts @@ -37,7 +37,6 @@ import { updatePlanningRealm } from '../../../api/fn/planning-realms/update-plan import { deletePlanningRealm } from '../../../api/fn/planning-realms/delete-planning-realm'; import { LabelsManagerComponent } from '../../components/labels-manager/labels-manager.component'; import { ExportApplicationsDialogComponent } from '../../components/export-applications-dialog/export-applications-dialog.component'; -import { ApiKeyExtendComponent } from '../../components/api-key-extend/api-key-extend.component'; export type UpdatePlanningRealmFunc = (modifyFunc: (planningRealm: PlanningRealmDto) => boolean) => void; From 75612fa1545712b2b90d5894841d4ff639c75325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Thu, 4 Jun 2026 11:30:42 +0200 Subject: [PATCH 11/11] Small optimization --- .../Endpoints/Applications/ExportApplicationsEndpoint.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs b/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs index 62fb5672..0eaac5aa 100644 --- a/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/Applications/ExportApplicationsEndpoint.cs @@ -93,7 +93,7 @@ await csv.WriteRowAsync( application.Notes, team.Class.Name, team.Name, - string.Join(", ", team.Labels.Select(x => x.Name)) + team.Labels.Count == 0 ? string.Empty : string.Join(", ", team.Labels.Select(x => x.Name)) ); } }