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

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

Browse Source 
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
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 = export type InfoToExport =
| 'submitters' | 'submitters'
| 'supporters'
| 'state' | 'state'
| 'recommendation' | 'recommendation'
| 'category' | 'category'
@ -99,6 +100,7 @@ export enum MotionEditNotificationType {
export const motionImportExportHeaderOrder: string[] = [ export const motionImportExportHeaderOrder: string[] = [
'identifier', 'identifier',
'submitters', 'submitters',
'supporters',
'title', 'title',
'text', 'text',
'reason', 'reason',

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

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