Merge pull request #4601 from MaximilianKrambach/callListPDF

call list improvements
This commit is contained in:
Sean 2019-04-17 10:38:22 +02:00 committed by GitHub
commit 637c0fb78e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -607,7 +607,7 @@ export class MotionPdfService {
style: 'tableHeader' style: 'tableHeader'
}, },
{ {
text: this.translate.instant('Motion block'), text: this.translate.instant('Notes'),
style: 'tableHeader' style: 'tableHeader'
} }
] ]
@ -643,6 +643,7 @@ export class MotionPdfService {
table: { table: {
widths: ['auto', 'auto', 'auto', '*', 'auto', 'auto'], widths: ['auto', 'auto', 'auto', '*', 'auto', 'auto'],
headerRows: 1, headerRows: 1,
dontBreakRows: true,
body: callListTableBody.concat(callListRows) body: callListTableBody.concat(callListRows)
}, },
layout: { layout: {
@ -675,9 +676,9 @@ export class MotionPdfService {
{ text: motion.submitters.length ? motion.submitters.map(s => s.short_name).join(', ') : '' }, { text: motion.submitters.length ? motion.submitters.map(s => s.short_name).join(', ') : '' },
{ text: motion.title }, { text: motion.title },
{ {
text: motion.recommendation ? this.translate.instant(motion.recommendation.recommendation_label) : '' text: motion.recommendation ? this.motionRepo.getExtendedRecommendationLabel(motion) : ''
}, },
{ text: motion.motion_block ? motion.motion_block.title : '' } { text: '' }
]; ];
} }