+
{{ 'Edit to enter votes.' | translate }}
diff --git a/client/src/app/site/motions/modules/motion-poll/motion-poll/motion-poll.component.scss b/client/src/app/site/motions/modules/motion-poll/motion-poll/motion-poll.component.scss
index 643feb3db..152d0e8e2 100644
--- a/client/src/app/site/motions/modules/motion-poll/motion-poll/motion-poll.component.scss
+++ b/client/src/app/site/motions/modules/motion-poll/motion-poll/motion-poll.component.scss
@@ -47,15 +47,15 @@
margin-top: 20px;
}
- .votes-yes {
+ .yes {
color: $votes-yes-color;
}
- .votes-no {
+ .no {
color: $votes-no-color;
}
- .votes-abstain {
+ .abstain {
color: $votes-abstain-color;
}
}
diff --git a/client/src/app/site/motions/modules/motion-poll/motion-poll/motion-poll.component.ts b/client/src/app/site/motions/modules/motion-poll/motion-poll/motion-poll.component.ts
index 6faceabaf..da0bfd06d 100644
--- a/client/src/app/site/motions/modules/motion-poll/motion-poll/motion-poll.component.ts
+++ b/client/src/app/site/motions/modules/motion-poll/motion-poll/motion-poll.component.ts
@@ -6,10 +6,14 @@ import { TranslateService } from '@ngx-translate/core';
import { MotionPollRepositoryService } from 'app/core/repositories/motions/motion-poll-repository.service';
import { PromptService } from 'app/core/ui-services/prompt.service';
+import { VotingPrivacyWarningComponent } from 'app/shared/components/voting-privacy-warning/voting-privacy-warning.component';
+import { PollType } from 'app/shared/models/poll/base-poll';
+import { infoDialogSettings } from 'app/shared/utils/dialog-settings';
import { ViewMotionPoll } from 'app/site/motions/models/view-motion-poll';
import { MotionPollDialogService } from 'app/site/motions/services/motion-poll-dialog.service';
import { MotionPollPdfService } from 'app/site/motions/services/motion-poll-pdf.service';
import { BasePollComponent } from 'app/site/polls/components/base-poll.component';
+import { PollTableData } from 'app/site/polls/models/view-base-poll';
import { PollService } from 'app/site/polls/services/poll.service';
/**
@@ -28,19 +32,7 @@ export class MotionPollComponent extends BasePollComponent
{
@Input()
public set poll(value: ViewMotionPoll) {
this.initPoll(value);
-
const chartData = this.pollService.generateChartData(value);
- for (const data of chartData) {
- if (data.label === 'YES') {
- this.voteYes = data.data[0];
- }
- if (data.label === 'NO') {
- this.voteNo = data.data[0];
- }
- if (data.label === 'ABSTAIN') {
- this.voteAbstain = data.data[0];
- }
- }
this.chartDataSubject.next(chartData);
}
@@ -52,48 +44,17 @@ export class MotionPollComponent extends BasePollComponent {
return `/motions/polls/${this.poll.id}`;
}
- /**
- * Number of votes for `Yes`.
- */
- public set voteYes(n: number) {
- this._voteYes = n;
- }
-
- public get voteYes(): number {
- return this._voteYes;
- }
-
- /**
- * Number of votes for `No`.
- */
- public set voteNo(n: number) {
- this._voteNo = n;
- }
-
- public get voteNo(): number {
- return this._voteNo;
- }
-
- /**
- * Number of votes for `Abstain`.
- */
- public set voteAbstain(n: number) {
- this._voteAbstain = n;
- }
-
- public get voteAbstain(): number {
- return this._voteAbstain;
- }
-
public get showChart(): boolean {
- return this._voteYes >= 0 && this._voteNo >= 0;
+ return this.poll.hasPresentableValues;
}
- private _voteNo: number;
+ public get hideChangeState(): boolean {
+ return this.poll.isPublished || (this.poll.isCreated && this.poll.type === PollType.Analog);
+ }
- private _voteYes: number;
-
- private _voteAbstain: number;
+ public get reducedPollTableData(): PollTableData[] {
+ return this.poll.tableData.filter(data => ['yes', 'no', 'abstain', 'votesinvalid'].includes(data.votingOption));
+ }
/**
* Constructor.
@@ -118,6 +79,10 @@ export class MotionPollComponent extends BasePollComponent {
super(titleService, matSnackBar, translate, dialog, promptService, pollRepo, pollDialog);
}
+ public openVotingWarning(): void {
+ this.dialog.open(VotingPrivacyWarningComponent, infoDialogSettings);
+ }
+
public downloadPdf(): void {
this.pdfService.printBallots(this.poll);
}
diff --git a/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.ts b/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.ts
index 7a490dea5..5ef0902fd 100644
--- a/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.ts
+++ b/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.ts
@@ -146,7 +146,7 @@ export class WorkflowDetailComponent extends BaseViewComponent implements OnInit
* @param title Set the page title
* @param translate Handle translations
* @param matSnackBar Showing error
- * @param promtService Promts
+ * @param promptService Promts
* @param dialog Opening dialogs
* @param workflowRepo The repository for workflows
* @param route Read out URL paramters
@@ -155,7 +155,7 @@ export class WorkflowDetailComponent extends BaseViewComponent implements OnInit
title: Title,
protected translate: TranslateService, // protected required for ng-translate-extract
matSnackBar: MatSnackBar,
- private promtService: PromptService,
+ private promptService: PromptService,
private dialog: MatDialog,
private workflowRepo: WorkflowRepositoryService,
private stateRepo: StateRepositoryService,
@@ -208,7 +208,7 @@ export class WorkflowDetailComponent extends BaseViewComponent implements OnInit
} else if (result.action === 'delete') {
const content = this.translate.instant('Delete') + ` ${state.name}?`;
- this.promtService.open('Are you sure', content).then(promptResult => {
+ this.promptService.open('Are you sure', content).then(promptResult => {
if (promptResult) {
this.stateRepo.delete(state).then(() => {}, this.raiseError);
}
diff --git a/client/src/app/site/motions/services/motion-poll.service.ts b/client/src/app/site/motions/services/motion-poll.service.ts
index f6b97fd57..db79666a3 100644
--- a/client/src/app/site/motions/services/motion-poll.service.ts
+++ b/client/src/app/site/motions/services/motion-poll.service.ts
@@ -55,13 +55,19 @@ export class MotionPollService extends PollService {
config.get(MotionPoll.defaultGroupsConfig).subscribe(ids => (this.defaultGroupIds = ids));
}
- public getDefaultPollData(): MotionPoll {
+ public getDefaultPollData(contextId?: number): MotionPoll {
const poll = new MotionPoll(super.getDefaultPollData());
- const length = this.pollRepo.getViewModelList().filter(item => item.motion_id === poll.motion_id).length;
- poll.title = !length ? this.translate.instant('Vote') : `${this.translate.instant('Vote')} (${length + 1})`;
+ poll.title = this.translate.instant('Vote');
poll.pollmethod = MotionPollMethod.YNA;
+ if (contextId) {
+ const length = this.pollRepo.getViewModelList().filter(item => item.motion_id === contextId).length;
+ if (length) {
+ poll.title += ` (${length + 1})`;
+ }
+ }
+
return poll;
}
diff --git a/client/src/app/site/polls/components/base-poll-dialog.component.ts b/client/src/app/site/polls/components/base-poll-dialog.component.ts
index cc7e4f3ee..ad2fe207e 100644
--- a/client/src/app/site/polls/components/base-poll-dialog.component.ts
+++ b/client/src/app/site/polls/components/base-poll-dialog.component.ts
@@ -1,3 +1,4 @@
+import { OnInit } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { MatSnackBar } from '@angular/material';
import { MatDialogRef } from '@angular/material/dialog';
@@ -13,7 +14,7 @@ import { ViewBasePoll } from '../models/view-base-poll';
/**
* A dialog for updating the values of a poll.
*/
-export abstract class BasePollDialogComponent extends BaseViewComponent {
+export abstract class BasePollDialogComponent extends BaseViewComponent implements OnInit {
public publishImmediately: boolean;
protected pollForm: PollFormComponent;
@@ -29,6 +30,21 @@ export abstract class BasePollDialogComponent extends Ba
super(title, translate, matSnackbar);
}
+ public ngOnInit(): void {
+ if (this.dialogRef) {
+ // Jasmin/Karma fails here. TODO:
+ this.dialogRef.keydownEvents().subscribe((event: KeyboardEvent) => {
+ if (event.key === 'Enter' && event.shiftKey) {
+ this.submitPoll();
+ }
+
+ if (event.key === 'Escape') {
+ this.dialogRef.close();
+ }
+ });
+ }
+ }
+
/**
* Submits the values from dialog.
*/
diff --git a/client/src/app/site/polls/components/poll-form/poll-form.component.html b/client/src/app/site/polls/components/poll-form/poll-form.component.html
index 10df33ba7..4ee04c7eb 100644
--- a/client/src/app/site/polls/components/poll-form/poll-form.component.html
+++ b/client/src/app/site/polls/components/poll-form/poll-form.component.html
@@ -9,7 +9,7 @@
-