Prevent double "TOP" in agenda pdf
Also: changes the definition of "getTitle" and "getAgendaTitle" to be more consistent and easier to guess. getTitle will simply return the title, while getAgendaTitle returns the title with the agenda-prefix
This commit is contained in:
parent
f590994875
commit
1f876ec6dd
@ -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) => {
|
||||||
|
@ -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()
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
@ -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 };
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -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">
|
||||||
|
Loading…
Reference in New Issue
Block a user