diff --git a/client/src/app/core/repositories/assignments/assignment-poll-repository.service.ts b/client/src/app/core/repositories/assignments/assignment-poll-repository.service.ts index 81bfe5389..4708fb2aa 100644 --- a/client/src/app/core/repositories/assignments/assignment-poll-repository.service.ts +++ b/client/src/app/core/repositories/assignments/assignment-poll-repository.service.ts @@ -116,6 +116,7 @@ export class AssignmentPollRepositoryService extends BasePollRepositoryService< return this.translate.instant(plural ? 'Polls' : 'Poll'); }; + // TODO: data must not be any public vote(data: any, poll_id: number): Promise { return this.http.post(`/rest/assignments/assignment-poll/${poll_id}/vote/`, data); } diff --git a/client/src/app/shared/models/poll/base-poll.ts b/client/src/app/shared/models/poll/base-poll.ts index 0c059cb02..be5b062f0 100644 --- a/client/src/app/shared/models/poll/base-poll.ts +++ b/client/src/app/shared/models/poll/base-poll.ts @@ -51,19 +51,19 @@ export abstract class BasePoll = any> extends public onehundred_percent_base: PercentBase; public user_has_voted: boolean; - public get isStateCreated(): boolean { + public get isCreated(): boolean { return this.state === PollState.Created; } - public get isStateStarted(): boolean { + public get isStarted(): boolean { return this.state === PollState.Started; } - public get isStateFinished(): boolean { + public get isFinished(): boolean { return this.state === PollState.Finished; } - public get isStatePublished(): boolean { + public get isPublished(): boolean { return this.state === PollState.Published; } @@ -71,20 +71,6 @@ export abstract class BasePoll = any> extends return this.onehundred_percent_base === PercentBase.Valid || this.onehundred_percent_base === PercentBase.Cast; } - /** - * If the state is finished. - */ - public get isFinished(): boolean { - return this.state === PollState.Finished; - } - - /** - * If the state is published. - */ - public get isPublished(): boolean { - return this.state === PollState.Published; - } - /** * Determine if the state is finished or published */ diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts index be7c92fd9..8f2ec7e08 100644 --- a/client/src/app/shared/shared.module.ts +++ b/client/src/app/shared/shared.module.ts @@ -6,7 +6,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; // MaterialUI modules import { MatBadgeModule } from '@angular/material/badge'; import { MatBottomSheetModule } from '@angular/material/bottom-sheet'; -import { MatButtonModule } from '@angular/material/button'; +import { MatButtonModule, MatAnchor } from '@angular/material/button'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; import { MatCardModule } from '@angular/material/card'; import { MatCheckboxModule } from '@angular/material/checkbox'; diff --git a/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.html b/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.html index 9744ef218..ce6ea2261 100644 --- a/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.html +++ b/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.html @@ -1,16 +1,9 @@ - +

{{ poll.title }}

-
+
@@ -25,30 +18,14 @@

{{ poll.title }}

- - -
-
{{ 'Current state' | translate }}: {{ poll.stateVerbose | translate }}
-
- {{ 'Groups' | translate }}: - {{ group.getTitle() | translate }} -
-
{{ 'Voting type' | translate }}: {{ poll.typeVerbose | translate }}
-
{{ 'Election method' | translate }}: {{ poll.pollmethodVerbose | translate }}
-
{{ 'Required majority' | translate }}: {{ poll.majorityMethodVerbose | translate }}
-
{{ '100% base' | translate }}: {{ poll.percentBaseVerbose | translate }}
-
- - -
- -
+ {{ poll.typeVerbose | translate }}

Result

-
- +
+ + {{ 'Candidates' | translate }} {{ row.user }} @@ -81,43 +58,64 @@ -
- + + + + +
+

{{ 'Single votes' | translate }}

+ + + + + + {{ 'User' | translate }} + +
{{ row.user.getFullName() }}
+
{{ 'Unknown user' | translate }}
+ + + + +
{{ option.user.getFullName() }}
+
{{ 'Unknown user' | translate }}
+ + + {{ row.votes[option.user_id] }} + + + + + +
+
- - - - - {{ 'User' | translate }} - -
{{ row.user.getFullName() }}
-
{{ 'Unknown user' | translate }}
- - - - -
{{ option.user.getFullName() }}
-
{{ 'Unknown user' | translate }}
- - - {{ row.votes[option.user_id] }} - - + +
+
+ {{ 'Groups' | translate }}: - - - - + + {{ group.getTitle() | translate }}, + +
+ +
{{ 'Required majority' | translate }}: {{ poll.majorityMethodVerbose | translate }}
+
{{ '100% base' | translate }}: {{ poll.percentBaseVerbose | translate }}
 @@ -125,13 +123,21 @@ - + - diff --git a/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.scss b/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.scss index 21ea38d3b..d8dea6a26 100644 --- a/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.scss +++ b/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.scss @@ -1,15 +1,40 @@ -.chart-wrapper { - &.flex { - display: flex; +@import '~assets/styles/variables.scss'; - .mat-table { - flex: 2; - .mat-column-votes { - justify-content: center; - } - } - .chart-inner-wrapper { - flex: 3; - } +.result-wrapper { + display: grid; + grid-gap: 10px; + grid-template-areas: + 'chart' + 'results' + 'names'; +} + +@include desktop { + .result-wrapper { + grid-template-areas: + 'results chart' + 'names names'; + grid-template-columns: 2fr 1fr; } } + +.result-table { + grid-area: results; +} + +.result-chart { + grid-area: chart; + max-width: 300px; +} + +.named-result-table { + grid-area: names; + .mat-form-field { + font-size: 14px; + width: 100%; + } +} + +.poll-content { + padding-top: 20px; +} diff --git a/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.ts b/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.ts index 4d2fb3411..616b0e024 100644 --- a/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.ts +++ b/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.ts @@ -91,6 +91,8 @@ export class AssignmentPollDetailComponent extends BasePollDetailComponent + +
+ +
+ -
- -
-
- - ({{ getVotesCount() }}/{{ poll.votes_amount }} {{ 'Votes' | translate }}) - -
+ +

+ {{ 'Votes for this poll' | translate }}: {{ poll.votes_amount }} + +

- - -
- {{ option.user.getFullName() }} - {{ "Unknown user" | translate }} -
- -
- - ({{ 'Current' | translate }}: {{ currentVotes[option.user_id] | translate }}) - - - ({{ 'Current choice' | translate }}) - -
- - - - Yes - - - No - - - Abstain - - - - - - - -
-
- - ({{ 'Current' | translate }}: {{ currentVotes.global | translate }}) - -
- - - Global no - - - Global abstain - - - -
-
- +
+ {{ option.user.getFullName() }} + {{ 'Unknown user' | translate }} +
+ +
+ + + {{ action.label | translate }} + +
+
+
+ + + + +
+
+ + + {{ 'No to all' | translate }} + +
+ +
+ + + {{ 'Abstain' | translate }} + +
+
+ + + {{ vmanager.getVotePermissionErrorVerbose(poll) | translate }} diff --git a/client/src/app/site/assignments/components/assignment-poll-vote/assignment-poll-vote.component.scss b/client/src/app/site/assignments/components/assignment-poll-vote/assignment-poll-vote.component.scss index 4e6b74093..b3cb014df 100644 --- a/client/src/app/site/assignments/components/assignment-poll-vote/assignment-poll-vote.component.scss +++ b/client/src/app/site/assignments/components/assignment-poll-vote/assignment-poll-vote.component.scss @@ -1,12 +1,61 @@ -.current-vote { - color: #777; - margin-right: 10px; +@import '~assets/styles/poll-colors.scss'; + +%vote-grid-base { + display: grid; + grid-gap: 10px; + margin: 20px 0; } -.voting-grid { - display: grid; - grid-gap: 5px; - padding: 5px; - align-items: baseline; - grid-template-columns: auto max-content max-content; +.yn-grid { + @extend %vote-grid-base; + grid-template-areas: + 'name name' + 'yes no'; +} + +.yna-grid { + @extend %vote-grid-base; + grid-template-areas: + 'name name name' + 'yes no abstain'; +} + +.single-vote-grid { + @extend %vote-grid-base; + grid-template-areas: 'yes name'; + grid-template-columns: min-content auto; +} + +.global-option-grid { + @extend %vote-grid-base; + grid-template-columns: auto auto; +} + +.vote-candidate-name { + grid-area: name; + display: flex; + span { + margin-top: auto; + margin-bottom: auto; + } +} + +.voted-yes { + background-color: $votes-yes-color; +} + +.voted-no { + background-color: $votes-no-color; +} + +.voted-abstain { + background-color: $votes-abstain-color; +} + +.vote-label { + margin-left: 10px; +} + +.mat-divider-horizontal { + position: initial; } diff --git a/client/src/app/site/assignments/components/assignment-poll-vote/assignment-poll-vote.component.ts b/client/src/app/site/assignments/components/assignment-poll-vote/assignment-poll-vote.component.ts index e90c4da91..025941713 100644 --- a/client/src/app/site/assignments/components/assignment-poll-vote/assignment-poll-vote.component.ts +++ b/client/src/app/site/assignments/components/assignment-poll-vote/assignment-poll-vote.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { AbstractControl, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { MatSnackBar } from '@angular/material'; import { Title } from '@angular/platform-browser'; @@ -15,6 +14,14 @@ import { BasePollVoteComponent } from 'app/site/polls/components/base-poll-vote. import { ViewAssignmentPoll } from '../../models/view-assignment-poll'; import { ViewAssignmentVote } from '../../models/view-assignment-vote'; +// TODO: Duplicate +interface VoteActions { + vote: 'Y' | 'N' | 'A'; + css: string; + icon: string; + label: string; +} + @Component({ selector: 'os-assignment-poll-vote', templateUrl: './assignment-poll-vote.component.html', @@ -23,8 +30,7 @@ import { ViewAssignmentVote } from '../../models/view-assignment-vote'; export class AssignmentPollVoteComponent extends BasePollVoteComponent implements OnInit { public pollMethods = AssignmentPollMethods; public PollType = PollType; - - public voteForm: FormGroup; + public voteActions: VoteActions[] = []; /** holds the currently saved votes */ public currentVotes: { [key: number]: string | null; global?: string } = {}; @@ -38,13 +44,13 @@ export class AssignmentPollVoteComponent extends BasePollVoteComponent { this.votes = votes; @@ -53,119 +59,74 @@ export class AssignmentPollVoteComponent extends BasePollVoteComponent vote.option.poll_id === this.poll.id && vote.user_id === this.user.id ); - this.voteForm = this.formBuilder.group({ - votes: this.formBuilder.group( - this.poll.options.mapToObject(option => ({ [option.id]: ['', [Validators.required]] })) - ) - }); - if ( - this.poll.pollmethod === AssignmentPollMethods.Votes && - (this.poll.global_no || this.poll.global_abstain) - ) { - this.voteForm.addControl('global', new FormControl('', Validators.required)); - } for (const option of this.poll.options) { let curr_vote = filtered.find(vote => vote.option.id === option.id); if (this.poll.pollmethod === AssignmentPollMethods.Votes && curr_vote) { if (curr_vote.value !== 'Y') { this.currentVotes.global = curr_vote.valueVerbose; - this.voteForm.controls.global.setValue(curr_vote.value); curr_vote = null; } else { this.currentVotes.global = null; } } - this.currentVotes[option.user_id] = curr_vote && curr_vote.valueVerbose; - this.voteForm.get(['votes', option.id]).setValue(curr_vote && curr_vote.value); - } - - if (this.poll.pollmethod === AssignmentPollMethods.Votes) { - this.voteForm.controls.votes.valueChanges.subscribe(value => { - if (Object.values(value).some(vote => vote)) { - const ctrl = this.voteForm.controls.global; - if (ctrl) { - ctrl.reset(); - } - this.saveVotesIfNamed(); - } - }); - - this.voteForm.controls.global.valueChanges.subscribe(value => { - if (value) { - this.voteForm.controls.votes.reset(); - this.saveVotesIfNamed(); - } - }); + this.currentVotes[option.id] = curr_vote && curr_vote.valueVerbose; } } } - private saveVotesIfNamed(): void { - if (this.poll.type === PollType.Named && !this.isSaveButtonDisabled()) { - this.saveVotes(); - } + private getPollOptionIds(): number[] { + return this.poll.options.map(option => option.id); } - public saveVotes(): void { - let values = this.voteForm.value.votes; - // convert Y to 1 and null to 0 for votes method - if (this.poll.pollmethod === this.pollMethods.Votes) { - if (this.voteForm.value.global) { - values = JSON.stringify(this.voteForm.value.global); + public saveSingleVote(optionId: number, vote: 'Y' | 'N' | 'A'): void { + const pollOptionIds = this.getPollOptionIds(); + const requestMap = pollOptionIds.reduce((o, n) => { + if ((n === optionId && vote === 'Y') !== (this.currentVotes[n] === 'Yes')) { + o[n] = 1; } else { - this.poll.options.forEach(option => { - values[option.id] = this.voteForm.value.votes[option.id] === 'Y' ? 1 : 0; - }); + o[n] = 0; } - } - this.pollRepo.vote(values, this.poll.id).catch(this.raiseError); + + return o; + }, {}); + + this.pollRepo.vote(JSON.stringify(requestMap), this.poll.id).catch(this.raiseError); } - public isSaveButtonDisabled(): boolean { - return ( - !this.voteForm || - this.voteForm.pristine || - (this.poll.pollmethod === AssignmentPollMethods.Votes - ? !this.getAllFormControls().some(control => control.valid) - : this.voteForm.invalid) - ); - } - - public getVotesCount(): number { - return Object.values(this.voteForm.value.votes).filter(vote => vote).length; - } - - private getAllFormControls(): AbstractControl[] { - if (this.voteForm) { - const votesFormGroup = this.voteForm.controls.votes as FormGroup; - return [...Object.values(votesFormGroup.controls), this.voteForm.controls.global]; - } else { - return []; - } - } - - public yesButtonClicked($event: MouseEvent, optionId: string): void { - if (this.poll.pollmethod === AssignmentPollMethods.Votes) { - // check current value (before click) - if (this.voteForm.value.votes[optionId] === 'Y') { - // this handler is executed before the mat-radio-button handler, so we have to set a timeout or else the other handler will just set the value again - setTimeout(() => { - this.voteForm.get(['votes', optionId]).setValue(null); - this.voteForm.markAsDirty(); - this.saveVotesIfNamed(); - }); - } else { - // check if by clicking this button, the amount of votes would succeed the permitted amount - if (this.getVotesCount() >= this.poll.votes_amount) { - $event.preventDefault(); - } - } - } + public saveGlobalVote(globalVote: 'N' | 'A'): void { + this.pollRepo.vote(`"${globalVote}"`, this.poll.id).catch(this.raiseError); } } diff --git a/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.html b/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.html index 93655dc90..4be419001 100644 --- a/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.html +++ b/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.html @@ -1,4 +1,4 @@ - +
@@ -8,28 +8,24 @@
- {{ poll.stateVerbose | translate }} - - {{ poll.stateVerbose | translate }} + + {{ poll.typeVerbose | translate }} +
- +
+
+ + {{ 'More' | translate }} + +
@@ -64,6 +70,10 @@
+
-
+
Publish immediately diff --git a/client/src/app/site/motions/modules/motion-poll/motion-poll-vote/motion-poll-vote.component.html b/client/src/app/site/motions/modules/motion-poll/motion-poll-vote/motion-poll-vote.component.html index e0efc88ab..013201c8e 100644 --- a/client/src/app/site/motions/modules/motion-poll/motion-poll-vote/motion-poll-vote.component.html +++ b/client/src/app/site/motions/modules/motion-poll/motion-poll-vote/motion-poll-vote.component.html @@ -1,5 +1,5 @@ -
+
diff --git a/client/src/app/site/motions/modules/motion-poll/motion-poll/motion-poll.component.html b/client/src/app/site/motions/modules/motion-poll/motion-poll/motion-poll.component.html index 99e4ddb62..6a40eb17f 100644 --- a/client/src/app/site/motions/modules/motion-poll/motion-poll/motion-poll.component.html +++ b/client/src/app/site/motions/modules/motion-poll/motion-poll/motion-poll.component.html @@ -20,19 +20,11 @@
- {{ poll.stateVerbose }} - - {{ poll.stateVerbose }} @@ -87,9 +79,9 @@
- +
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 8bcae1954..631b51b2b 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 @@ -88,7 +88,7 @@ .poll-detail-button-wrapper { display: flex; margin: auto 0; - > button { + > a { margin-left: auto; } } 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 53ce4def2..af81a8ffd 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 @@ -130,8 +130,8 @@ export class MotionPollComponent extends BasePollComponent { public showPoll(): boolean { return ( this.operator.hasPerms('motions.can_manage_polls') || - this.poll.isStatePublished || - (this.poll.type !== 'analog' && this.poll.isStateStarted) + this.poll.isPublished || + (this.poll.type !== 'analog' && this.poll.isStarted) ); } 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 779a6190f..473edb4a3 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 @@ -18,7 +18,7 @@
- + @@ -71,7 +71,7 @@ : 'Y' | 'N' [|'A']} - - all option_ids must be given + - all option_ids must be given TODO: No it must not be that way. Single Votes have to be accepted - 'A' is only allowed in YNA pollmethod Votes for all options have to be given