Skip to content

Change appearance of Agenda export (#6062) #6115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Elblinator wants to merge 1 commit into
base: stable/4.2.x
Choose a base branch
from
Open

Change appearance of Agenda export (#6062) #6115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion client/src/app/site/pages/meetings/pages/agenda/agenda.subscription.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,15 @@ export const getAgendaExportSubscriptionConfig: SubscriptionConfigGenerator = (.
follow: [
{
idField: `content_object_id`,
fieldset: [`number`, `title`, `agenda_item_id`, `text`, `poll_ids`, ...MEETING_ROUTING_FIELDS],
fieldset: [
`agenda_item_id`,
`description`,
`number`,
`poll_ids`,
`title`,
`text`,
...MEETING_ROUTING_FIELDS
],
follow: [
{
idField: `list_of_speakers_id`,
Expand Down Expand Up @@ -271,6 +279,10 @@ export const getAgendaExportSubscriptionConfig: SubscriptionConfigGenerator = (.
{
idField: `poll_ids`,
...pollModelRequest
},
{
idField: `motion_ids`,
fieldset: [`meeting_id`, `number`, `sequential_number`, `title`]
}
]
}
Expand Down
177 changes: 99 additions & 78 deletions ...es/agenda/services/agenda-pdf-catalog-export.service/agenda-pdf-catalog-export.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ export class AgendaPdfCatalogExportService {
// parent agenda items which are not in the export are handled different
// then exported agenda items, collect the ids of the special parent items here
private addedAgendaItemIds = [];
private _addExtraSpace = false;

public constructor(
private translate: TranslateService,
Expand Down Expand Up @@ -72,20 +71,6 @@ export class AgendaPdfCatalogExportService {
const agendaDocDef: any = this.agendaItemToDoc(sortedAgendaItems[agendaItemIndex], exportInfo);
// add id field to the first page of a agenda item to make it findable over TOC
agendaDocDef[0].id = `${sortedAgendaItems[agendaItemIndex].id}`;
if (!enforcePageBreaks && agendaItemIndex + 1 < sortedAgendaItems.length) {
if (!sortedAgendaItems[agendaItemIndex + 1].parent) {
agendaDocDef.push({
text: ``,
marginBottom: this._addExtraSpace ? 25 : 20
});
} else {
agendaDocDef.push({
text: ``,
marginBottom: this._addExtraSpace ? 15 : 10
});
}
this._addExtraSpace = false;
}

agendaDocList.push(agendaDocDef);

Expand All @@ -104,8 +89,8 @@ export class AgendaPdfCatalogExportService {
doc.push([
{
text: this.translate.instant(`Agenda`),
style: this.getStyle(`header1`),
margin: this.getStyle(`margin-header1`)
style: this.getStyle(`title-style`),
margin: this.getStyle(`title-margin`)
}
]);

Expand Down Expand Up @@ -229,9 +214,17 @@ export class AgendaPdfCatalogExportService {
private createNumberTitleDoc(agendaItem: ViewAgendaItem, info: any): ContentText {
const useItemNumber: boolean = info.includes(`item_number`);
const useTitle: boolean = info.includes(`title`);
const contentItems = [
`text`,
`attachments`,
`moderation_notes`,
`list_of_speakers`,
`polls`,
`internal_commentary`
];
const onlyMainMargins = !contentItems.some(item => info.includes(item));
const itemNumber: string = agendaItem.item_number ?? ``;
const title: string = agendaItem.content_object!.getTitle();
const styleName = agendaItem.level ? `header-child` : `header2`;
let numberOrTitle = ``;
if (agendaItem.content_object?.collection === `motion`) {
const motion = agendaItem.content_object;
Expand Down Expand Up @@ -262,18 +255,25 @@ export class AgendaPdfCatalogExportService {
}
}
return {
style: this.getStyle(styleName),
text: numberOrTitle
text: numberOrTitle,
style: this.getStyle(this.level(agendaItem.level)),
margin: this.getStyle(onlyMainMargins ? `main-margin` : `main-margin-bigger`)
};
}

private createTextDoc(agendaItem: ViewAgendaItem): Content {
if (!this.isTopic(agendaItem.content_object)) {
return [];
}
if (agendaItem.content_object?.getCSVExportText) {
if (agendaItem.content_object?.getCSVExportText && agendaItem.content_object?.text) {
const entry = this.htmlToPdfService.convertHtml({ htmlText: agendaItem.content_object?.text ?? `` });
return entry;
return [
entry,
{
text: ``,
style: this.getStyle(`small`)
}
];
}
return [];
}
Expand All @@ -285,14 +285,17 @@ export class AgendaPdfCatalogExportService {
const moderationNotes = agendaItem.content_object?.list_of_speakers?.moderator_notes ?? ``;
const entry = this.htmlToPdfService.convertHtml({ htmlText: moderationNotes });
if (moderationNotes) {
this._addExtraSpace = true;
return [
{
text: this.translate.instant(`Moderation note`),
style: this.getStyle(`header3`),
margin: this.getStyle(`margin-header3`)
style: this.getStyle(`level-content`),
margin: this.getStyle(`level-margin-normal`)
},
entry
entry,
{
text: ``,
style: this.getStyle(`small`)
}
];
} else {
return [];
Expand Down Expand Up @@ -398,12 +401,11 @@ export class AgendaPdfCatalogExportService {
}

if (speakers.length > 0) {
this._addExtraSpace = true;
return [
{
text: this.translate.instant(`List of speakers`),
style: this.getStyle(`header3`),
margin: this.getStyle(`margin-header3`)
style: this.getStyle(`level-content`),
margin: this.getStyle(`level-margin-normal`)
},
{
table: {
Expand All @@ -414,7 +416,7 @@ export class AgendaPdfCatalogExportService {
body: tableCells
},
layout: BorderType.LIGHT_HORIZONTAL_LINES,
margin: this.getStyle(`margin-text`)
margin: this.getStyle(`level-margin-bigger`)
}
];
}
Expand All @@ -438,8 +440,8 @@ export class AgendaPdfCatalogExportService {
const tableCells: Content[][] = [];
entries.push({
text: poll.title,
style: this.getStyle(`header3`),
margin: pollIndex === 0 ? this.getStyle(`margin-item`) : this.getStyle(`margin-item-2`)
style: this.getStyle(`level-content`),
margin: this.getStyle(`level-margin-normal`)
});
// poll table header
tableCells.push([
Expand Down Expand Up @@ -478,19 +480,20 @@ export class AgendaPdfCatalogExportService {
body: tableCells
},
layout: BorderType.LIGHT_HORIZONTAL_LINES,
margin: this.getStyle(`margin-text`)
margin: this.getStyle(`level-margin-normal`)
});

entries.push({ text: ``, margin: this.getStyle(`margin-text`) });
}
this._addExtraSpace = true;
return [
{
text: this.translate.instant(`Polls`),
style: this.getStyle(`header3`),
margin: this.getStyle(`margin-header3`)
style: this.getStyle(`level-content`),
margin: this.getStyle(`level-margin-normal`)
},
...entries
...entries,
{
text: ``,
style: this.getStyle(`small`)
}
];
}
return [];
Expand All @@ -501,50 +504,21 @@ export class AgendaPdfCatalogExportService {
return [];
}
if (agendaItem.comment) {
this._addExtraSpace = true;
return [
{
text: this.translate.instant(`Comment`),
style: this.getStyle(`header3`),
margin: this.getStyle(`margin-header3`)
style: this.getStyle(`level-content`),
margin: this.getStyle(`level-margin-normal`)
},
{ text: agendaItem.comment }
{
text: agendaItem.comment,
margin: this.getStyle(`level-margin-middle`)
}
];
}
return [];
}

private getStyle(name: string): any {
switch (name) {
case `header1`:
return { bold: true, fontSize: 24 };
case `header2`:
return { bold: true, fontSize: 20 };
case `header3`:
return { bold: true, fontSize: 14 };
case `header-child`:
return { bold: true, fontSize: 16 };
case `table-header`:
return { bold: true, fontSize: 12 };
case `grey`:
return { layout: TABLEROW_GREY };
case `italics`:
return { italics: true };
case `margin-header1`:
return [0, 0, 0, 20];
case `margin-header3`:
return [0, 15, 0, 10];
case `margin-type-text`:
return [0, 0, 0, 10];
case `margin-item`:
return [0, 0, 0, 5];
case `margin-item-2`:
return [0, 10, 0, 5];
default:
return {};
}
}

private createAttachmentsDoc(agendaItem: ViewAgendaItem): Content[] {
if (!this.isTopic(agendaItem.content_object)) {
return [];
Expand All @@ -558,8 +532,8 @@ export class AgendaPdfCatalogExportService {
if (agendaItem.content_object?.attachment_meeting_mediafiles.length > 0) {
attachments.push({
text: this.translate.instant(`Attachments`),
style: this.getStyle(`header3`),
margin: this.getStyle(`margin-header3`)
style: this.getStyle(`level-content`),
margin: this.getStyle(`level-margin-normal`)
});
for (const key of Object.keys(agendaItem.content_object?.attachment_meeting_mediafiles)) {
const attachment = agendaItem.content_object?.attachment_meeting_mediafiles[key];
Expand All @@ -569,7 +543,7 @@ export class AgendaPdfCatalogExportService {
attachments.push({
image: fileUrl,
width: width,
margin: this.getStyle(`margin-text`)
margin: this.getStyle(`level-margin-normal`)
});
} else {
const link = Location.joinWithSlash(instanceUrl, fileUrl);
Expand All @@ -578,12 +552,16 @@ export class AgendaPdfCatalogExportService {
{
text: attachment.getTitle() + `: ` + link,
link: link,
margin: this.getStyle(`margin-item`)
margin: this.getStyle(`level-margin-normal`)
}
]
});
}
}
attachments.push({
text: ``,
style: this.getStyle(`small`)
});
}

return attachments;
Expand All @@ -593,4 +571,47 @@ export class AgendaPdfCatalogExportService {
const topic = obj as ViewTopic;
return !!topic && topic.collection !== undefined && topic.collection === ViewTopic.COLLECTION && !!topic.topic;
}

private level(level: number): string {
return `level-${Math.min(level, 2)}`;
}

private getStyle(name: string): any {
switch (name) {
case `title-style`:
return { bold: true, fontSize: 24 };
case `level-0`:
return { bold: true, fontSize: 16 };
case `level-1`:
return { bold: true, fontSize: 12 };
case `level-2`:
return { bold: true, fontSize: 10 };
case `level-content`:
return { bold: true, fontSize: 10 };
case `italics`:
return { italics: true };
case `small`:
return { fontSize: 7 };
// margins
case `title-margin`:
return [0, 0, 0, 10];
case `level-margin-bigger`:
return [0, 0, 0, 16];
case `level-margin-middle`:
return [0, 0, 0, 14];
case `level-margin-normal`:
return [0, 0, 0, 7];
case `main-margin-bigger`:
return [0, 0, 0, 11];
case `main-margin`:
return [0, 0, 0, 7];
default:
console.warn(
this.translate
.instant(`An undefined class was called. Please add the class: {}`)
.replace(`{}`, name)
);
return {};
}
}
}