Add moderator notes to topic detail (#3457)

OpenSlides · Apr 9, 2024 · 80f94d8 · 80f94d8
1 parent b898e8c
commit 80f94d8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/.../modules/list-of-speakers-content/components/moderation-note/moderation-note.component.ts b/.../modules/list-of-speakers-content/components/moderation-note/moderation-note.component.ts
@@ -44,6 +44,11 @@ export class ModerationNoteComponent extends BaseMeetingComponent implements OnI
         }
     }
 
+    @Input()
+    public set contentObject(contentObject: BaseViewModel) {
+        this._contentObject = contentObject;
+    }
+
     public get moderatorNotes(): Observable<string> {
         return this.agendaItemRepo
             .getViewModelObservable(this._contentObject?.getModel().agenda_item_id)

diff --git a/client/src/app/site/pages/meetings/pages/agenda/agenda.subscription.ts b/client/src/app/site/pages/meetings/pages/agenda/agenda.subscription.ts
@@ -109,7 +109,7 @@ export const getTopicDetailSubscriptionConfig: SubscriptionConfigGenerator = (..
                 idField: `list_of_speakers_id`,
                 ...listOfSpeakersSpeakerCountSubscription
             },
-            { idField: `agenda_item_id`, fieldset: [`item_number`, `content_object_id`] }
+            { idField: `agenda_item_id`, fieldset: [`item_number`, `content_object_id`, `moderator_notes`] }
         ]
     },
     subscriptionName: TOPIC_ITEM_SUBSCRIPTION

diff --git a/...nda/modules/topics/pages/topic-detail/components/topic-detail/topic-detail.component.html b/...nda/modules/topics/pages/topic-detail/components/topic-detail/topic-detail.component.html
@@ -33,6 +33,7 @@ <h2>
             </button>
         </div>
     </os-head-bar>
+
     <mat-card *ngIf="(topic || editTopic) && (hasLoaded | async)" class="spacer-bottom-60 os-card">
         <mat-card-content>
             <ng-container *ngIf="!editTopic && topic">
@@ -104,6 +105,7 @@ <h4>{{ 'Text' | translate }}</h4>
         </mat-card-content>
     </mat-card>
 
+    <os-moderation-note [contentObject]="topic" *ngIf="!editTopic"></os-moderation-note>
     <div *ngIf="!editTopic" class="spacer-bottom-60">
         <ng-container *ngIf="topic && topic.poll_ids?.length">
             <ng-container *ngFor="let poll of topic.poll_ids | reverse; trackBy: trackById">

diff --git a/...site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/topic-detail.module.ts b/...site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/topic-detail.module.ts
@@ -10,6 +10,7 @@ import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-m
 import { MatSelectModule } from '@angular/material/select';
 import { RouterModule } from '@angular/router';
 import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations';
+import { ListOfSpeakersContentModule } from 'src/app/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.module';
 import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector';
 import { AttachmentControlModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control';
 import { DirectivesModule } from 'src/app/ui/directives';
@@ -47,7 +48,8 @@ import { TopicDetailRoutingModule } from './topic-detail-routing.module';
         MatListModule,
         MatFormFieldModule,
         TopicPollModule,
-        RouterModule
+        RouterModule,
+        ListOfSpeakersContentModule
     ]
 })
 export class TopicDetailModule {}