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

Merge pull request #4267 from MaximilianKrambach/motionPollResultsPDF

Browse Source 
export poll results in motion pdfs
This commit is contained in:
Maximilian Krambach 2019-02-07 15:52:12 +01:00 committed by GitHub
commit 186a0b5da3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 66 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/app/core/ui-services/poll.service.ts
View File

@ -31,7 +31,7 @@ export class PollService {
* An array of value - label pairs for special value signifiers.
* TODO: Should be given by the server, and editable. For now: hard coded
*/
private _specialPollVotes: [number, string][] = [[-1, 'Majority'], [-2, 'Undocumented']];
private _specialPollVotes: [number, string][] = [[-1, 'majority'], [-2, 'undocumented']];
/**
* getter for the special votes
@ -48,14 +48,6 @@ export class PollService {
*/
public constructor() {}
/**
* TODO not implemented yet. Should print the ballots for a motion poll,
* depending on the motion and on the configuration
*/
public printBallots(): void {
console.log('TODO: Ballot printing Not yet implemented');
}
/**
* Gets an icon for a Poll Key
*

2
client/src/app/site/motions/components/motion-poll/motion-poll.component.ts
View File

@ -190,7 +190,7 @@ export class MotionPollComponent implements OnInit {
}
/**
* TODO: not implemented. Print the buttons
* Triggers the printing of the ballots
*/
public printBallots(): void {
this.pdfService.printBallots(this.poll);

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

@ -2,12 +2,13 @@ import { Injectable } from '@angular/core';
import { TranslateService } from '@ngx-translate/core';
import { ViewMotion, LineNumberingMode, ChangeRecoMode } from '../models/view-motion';
import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service';
import { ConfigService } from 'app/core/ui-services/config.service';
import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service';
import { ViewUnifiedChange } from '../models/view-unified-change';
import { ConfigService } from 'app/core/ui-services/config.service';
import { HtmlToPdfService } from 'app/core/ui-services/html-to-pdf.service';
import { MotionPollService, CalculablePollKey } from './motion-poll.service';
import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service';
import { ViewMotion, LineNumberingMode, ChangeRecoMode } from '../models/view-motion';
import { ViewUnifiedChange } from '../models/view-unified-change';
/**
* Type declaring which strings are valid options for metainfos to be exported into a pdf
@ -37,13 +38,15 @@ export class MotionPdfService {
* @param changeRecoRepo to get the change recommendations
* @param configService Read config variables
* @param htmlToPdfService To convert HTML text into pdfmake doc def
* @param pollService MotionPollService for rendering the polls
*/
public constructor(
private translate: TranslateService,
private motionRepo: MotionRepositoryService,
private changeRecoRepo: ChangeRecommendationRepositoryService,
private configService: ConfigService,
private htmlToPdfService: HtmlToPdfService
private htmlToPdfService: HtmlToPdfService,
private pollService: MotionPollService
) {}
/**
@ -248,7 +251,62 @@ export class MotionPdfService {
]);
}
// TODO: Voting result, depends on polls
if (motion.motion.polls.length && (!infoToExport || infoToExport.includes('polls'))) {
const column1 = [];
const column2 = [];
const column3 = [];
motion.motion.polls.map((poll, index) => {
if (poll.has_votes) {
if (motion.motion.polls.length > 1) {
column1.push(index + 1 + '. ' + this.translate.instant('Vote'));
column2.push('');
column3.push('');
}
const values: CalculablePollKey[] = ['yes', 'no', 'abstain'];
if (poll.votesvalid) {
values.push('votesvalid');
}
if (poll.votesinvalid) {
values.push('votesinvalid');
}
if (poll.votescast) {
values.push('votescast');
}
values.map(value => {
column1.push(`${this.translate.instant(this.pollService.getLabel(value))}:`);
column2.push(`${this.translate.instant(this.pollService.getSpecialLabel(poll[value]))}`);
this.pollService.isAbstractValue(poll, value)
? column3.push('')
: column3.push(`(${this.pollService.calculatePercentage(poll, value)} %)`);
});
}
});
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)
const changeRecos = this.changeRecoRepo.getChangeRecoOfMotion(motion.id);