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

Merge pull request #5529 from tsiegleauq/export-dialog-supporter 

Add "supporter" to motion export dialog
This commit is contained in:
Emanuel Schütze 2020-08-27 08:35:23 +02:00 committed by GitHub
parent 4960a8f115 0d16b487d5
commit 38af3d3b8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/site/motions/motions.constants.ts
View File

@ -21,6 +21,7 @@ export const PERSONAL_NOTE_ID = -1;
*/
export type InfoToExport =
| 'submitters'
| 'supporters'
| 'state'
| 'recommendation'
| 'category'
@ -99,6 +100,7 @@ export enum MotionEditNotificationType {
export const motionImportExportHeaderOrder: string[] = [
'identifier',
'submitters',
'supporters',
'title',
'text',
'reason',

34
client/src/app/site/motions/services/motion-pdf.service.ts
View File

@ -247,23 +247,25 @@ export class MotionPdfService {
}
// supporters
const minSupporters = this.configService.instant<number>('motions_min_supporters');
if (minSupporters && motion.supporters.length > 0) {
const supporters = motion.supporters
.map(supporter => {
return supporter.full_name;
})
.join(', ');
if (!infoToExport || infoToExport.includes('supporters')) {
const minSupporters = this.configService.instant<number>('motions_min_supporters');
if (!!minSupporters && motion.supporters.length > 0) {
const supporters = motion.supporters
.map(supporter => {
return supporter.full_name;
})
.join(', ');
metaTableBody.push([
{
text: `${this.translate.instant('Supporters')}:`,
style: 'boldText'
},
{
text: supporters
}
]);
metaTableBody.push([
{
text: `${this.translate.instant('Supporters')}:`,
style: 'boldText'
},
{
text: supporters
}
]);
}
}
// state