ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5417 from tsiegleauq/agenda-numbered-topics-pdf

Browse Source 
Prevent double "TOP" in agenda PDF
This commit is contained in:
Emanuel Schütze 2020-06-15 15:10:22 +02:00 committed by GitHub
commit b5bc855dfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/app/core/repositories/topics/topic-repository.service.ts
View File

@ -53,16 +53,19 @@ export class TopicRepositoryService extends BaseIsAgendaItemAndListOfSpeakersCon
} }
public getTitle = (titleInformation: TopicTitleInformation) => { public getTitle = (titleInformation: TopicTitleInformation) => {
return titleInformation.title;
};
public getListTitle = (titleInformation: TopicTitleInformation) => {
if (titleInformation.agenda_item_number && titleInformation.agenda_item_number()) { if (titleInformation.agenda_item_number && titleInformation.agenda_item_number()) {
return `${titleInformation.agenda_item_number()} · ${titleInformation.title}`; return `${titleInformation.agenda_item_number()} · ${titleInformation.title}`;
} else { } else {
return titleInformation.title; return this.getTitle(titleInformation);
} }
}; };
public getAgendaListTitle = (titleInformation: TopicTitleInformation) => { public getAgendaListTitle = (titleInformation: TopicTitleInformation) => {
// Do not append ' (Topic)' to the title. return { title: this.getListTitle(titleInformation) };
return { title: this.getTitle(titleInformation) };
}; };
public getAgendaSlideTitle = (titleInformation: TopicTitleInformation) => { public getAgendaSlideTitle = (titleInformation: TopicTitleInformation) => {

2
client/src/app/site/agenda/services/agenda-pdf.service.ts
View File

@ -87,7 +87,7 @@ export class AgendaPdfService {
text: nodeItem.item.item_number text: nodeItem.item.item_number
}, },
{ {
text: nodeItem.item.contentObject.getListTitle() text: nodeItem.item.contentObject.getTitle()
} }
] ]
}; };

2
client/src/app/site/base/base-view-model-with-agenda-item.ts
View File

@ -68,7 +68,7 @@ export abstract class BaseViewModelWithAgendaItem<
*/ */
public getProjectorTitle(): ProjectorTitle { public getProjectorTitle(): ProjectorTitle {
const subtitle = this.item ? this.item.comment : null; const subtitle = this.item ? this.item.comment : null;
return { title: this.getTitle(), subtitle }; return { title: this.getListTitle(), subtitle };
} }
/** /**

2
client/src/app/site/topics/components/topic-detail/topic-detail.component.html
View File

@ -27,7 +27,7 @@
<mat-card *ngIf="topic || editTopic" [ngClass]="editTopic ? 'os-form-card' : 'os-card'"> <mat-card *ngIf="topic || editTopic" [ngClass]="editTopic ? 'os-form-card' : 'os-card'">
<div *ngIf="!editTopic"> <div *ngIf="!editTopic">
<h1>{{ topic.getTitle() }}</h1> <h1>{{ topic.getListTitle() }}</h1>
</div> </div>
<div> <div>
<span *ngIf="!editTopic"> <span *ngIf="!editTopic">