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

Merge pull request #5730 from emanuelschuetze/motionPollTitle 

Show motion poll title in motion pdf
This commit is contained in:
Emanuel Schütze 2020-11-26 12:05:33 +01:00 committed by GitHub
parent b318bfda99 5577bac7c9
commit fbed661dfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -370,13 +370,12 @@ export class MotionPdfService {
// voting results
if (motion.polls.length && (!infoToExport || infoToExport.includes('polls'))) {
const column1 = [];
const column2 = [];
const column3 = [];
motion.polls.forEach(poll => {
if (poll.hasVotes) {
const tableData = this.motionPollService.generateTableData(poll);
const column1 = [];
const column2 = [];
const column3 = [];
tableData.forEach(votingResult => {
const votingOption = this.translate.instant(
this.pollKeyVerbose.transform(votingResult.votingOption)
@ -397,33 +396,33 @@ export class MotionPdfService {
}
column3.push(resultValue);
});
metaTableBody.push([
{
text: poll.title,
style: 'boldText'
},
{
columns: [
{
text: column1.join('\n'),
width: 'auto'
},
{
text: column2.join('\n'),
width: 'auto',
alignment: 'right'
},
{
text: column3.join('\n'),
width: 'auto',
alignment: 'right'
}
],
columnGap: 7
}
]);
}
});
metaTableBody.push([
{
text: `${this.translate.instant('Voting result')}:`,
style: 'boldText'
},
{
columns: [
{
text: column1.join('\n'),
width: 'auto'
},
{
text: column2.join('\n'),
width: 'auto',
alignment: 'right'
},
{
text: column3.join('\n'),
width: 'auto',
alignment: 'right'
}
],
columnGap: 7
}
]);
}
// summary of change recommendations (for motion diff version only)