diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/components/projection-dialog/projection-dialog.component.html b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/components/projection-dialog/projection-dialog.component.html index 8dd9451fc0..7248db125e 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/components/projection-dialog/projection-dialog.component.html +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/components/projection-dialog/projection-dialog.component.html @@ -62,7 +62,9 @@

{{ option.displayName | translate }}

} - + @if (!hideMainButton) { + + } @if (projectorSelectable) { } diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/components/projection-dialog/projection-dialog.component.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/components/projection-dialog/projection-dialog.component.ts index 336b5a7429..4cb6aff225 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/components/projection-dialog/projection-dialog.component.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/components/projection-dialog/projection-dialog.component.ts @@ -29,6 +29,7 @@ export interface ProjectionDialogConfig { descriptor: ProjectionBuildDescriptor; allowReferenceProjector: boolean; projector?: ViewProjector; + hideMainButton?: boolean; } @Component({ @@ -65,6 +66,8 @@ export class ProjectionDialogComponent implements OnInit, OnDestroy { private _projectorSubscription: string; private _subscriptions: Subscription[] = []; + public hideMainButton = false; + public constructor( public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: ProjectionDialogConfig | ProjectionBuildDescriptor, @@ -87,6 +90,9 @@ export class ProjectionDialogComponent implements OnInit, OnDestroy { this.currentProjectionOptions = projections[0].options || {}; } } + if (data && !isProjectionBuildDescriptor(data)) { + this.hideMainButton = data.hideMainButton; + } } public ngOnDestroy(): void { @@ -180,6 +186,7 @@ export class ProjectionDialogComponent implements OnInit, OnDestroy { } public onAddToPreview(): void { + console.log(`keey:`); this.dialogRef.close({ action: `addToPreview`, resultDescriptor: this.descriptor, diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service.ts index 75e155a136..2630d1b914 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service.ts @@ -22,6 +22,7 @@ export class ProjectionDialogService { * the projectors will be updated. */ public async openProjectDialogFor(descriptor: ProjectionBuildDescriptor | ProjectionDialogConfig): Promise { + console.log(descriptor); const module = await import(`../projection-dialog.module`).then(m => m.ProjectionDialogModule); const dialogRef = this.dialog.open< ProjectionDialogComponent, diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/components/projector-button/projector-button.component.html b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/components/projector-button/projector-button.component.html index 1f44793207..4b31a2151b 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/components/projector-button/projector-button.component.html +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/components/projector-button/projector-button.component.html @@ -5,7 +5,7 @@ @if (!ref.innerHTML.trim()) { - {{ 'Project' | translate }} + {{ projectorLabel | translate }} } diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/components/projector-button/projector-button.component.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/components/projector-button/projector-button.component.ts index dbd3c9d2dd..1795706f5d 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/components/projector-button/projector-button.component.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/components/projector-button/projector-button.component.ts @@ -42,6 +42,12 @@ export class ProjectorButtonComponent implements OnInit, OnDestroy { @Input() public menuItem = false; + @Input() + public projectorLabel = `Project`; + + @Input() + public hideMainButton = false; + @Output() public changeEvent = new EventEmitter(); @@ -99,7 +105,8 @@ export class ProjectorButtonComponent implements OnInit, OnDestroy { // open the projection dialog this.projectionDialogService.openProjectDialogFor({ descriptor, - allowReferenceProjector: this.allowReferenceProjector + allowReferenceProjector: this.allowReferenceProjector, + hideMainButton: this.hideMainButton }); } }; diff --git a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/components/agenda-item-list/agenda-item-list.component.html b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/components/agenda-item-list/agenda-item-list.component.html index 93c1b455df..1ff6eaa926 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/components/agenda-item-list/agenda-item-list.component.html +++ b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/components/agenda-item-list/agenda-item-list.component.html @@ -160,6 +160,14 @@

Agenda

{{ 'Tags' | translate }} + + +