From f2a4be702af0726b33da5191a94f97b4809c8b9b Mon Sep 17 00:00:00 2001 From: Sean Engelhardt Date: Wed, 20 Feb 2019 10:11:26 +0100 Subject: [PATCH] Add tags to motion pdf Adds tags to motion pdf. Adjusts the export dialog to also support selecting and deselecting tags. Increases the target with of the export dialog to 1100px so the tags also fit there. Not too pretty, yet effective --- .../motion-export-dialog.component.html | 7 ++----- .../motion-export-dialog.component.ts | 1 + .../motion-list/motion-list.component.ts | 2 +- .../motions/services/motion-pdf.service.ts | 20 +++++++++++++++++++ 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.html b/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.html index 24bf442c1..e9666371e 100644 --- a/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.html +++ b/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.html @@ -49,6 +49,7 @@ State Recommendation Category + Tags Origin Motion block @@ -59,11 +60,7 @@

Comments

- + {{ comment.name }} diff --git a/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.ts b/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.ts index c10e914d7..81692a401 100644 --- a/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.ts +++ b/client/src/app/site/motions/components/motion-export-dialog/motion-export-dialog.component.ts @@ -51,6 +51,7 @@ export class MotionExportDialogComponent implements OnInit { 'recommendation', 'category', 'origin', + 'tags', 'block', 'polls', 'id' diff --git a/client/src/app/site/motions/components/motion-list/motion-list.component.ts b/client/src/app/site/motions/components/motion-list/motion-list.component.ts index 1054452ff..f62e35d49 100644 --- a/client/src/app/site/motions/components/motion-list/motion-list.component.ts +++ b/client/src/app/site/motions/components/motion-list/motion-list.component.ts @@ -198,7 +198,7 @@ export class MotionListComponent extends ListViewBaseComponent { + return tag; + }) + .join(', '); + + metaTableBody.push([ + { + text: `${this.translate.instant('Tags')}:`, + style: 'boldText' + }, + { + text: tags + } + ]); + } + // motion block if (motion.motion_block && (!infoToExport || infoToExport.includes('block'))) { metaTableBody.push([