diff --git a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.html b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.html index 658e3027df..59d1a878a8 100644 --- a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.html +++ b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.html @@ -61,10 +61,12 @@

} - @if (!settings.isSplitSingleOption) { + @if (!(settings.isSplitSingleOption && !displayed_in_autopilot)) {
@if (showAvailableVotes) {
} - @if (!showAvailableVotes && poll.option_ids) { + @if ( + !showAvailableVotes && + poll.option_ids && + !(settings.isSplitSingleOption && displayed_in_autopilot) + ) { {{ poll.option_ids.length }} {{ optionPluralLabel | translate }} @@ -85,17 +91,22 @@

track action; let i = $index ) { - - {{ action.label | translate }} - + @if (!poll.isTopicPoll) { + + {{ action.label | translate }} + + } }

} @for (option of poll.options; track option; let i = $index) {
- @if (settings.isSplitSingleOption) { + @if (settings.isSplitSingleOption && !displayed_in_autopilot) { {{ action.label | translate }} @@ -177,6 +188,40 @@

} } + @if (settings.isSplitSingleOption && displayed_in_autopilot) { + + @for ( + action of voteActions.length ? voteActions : voteOptions; + track action; + let i = $index + ) { +
+ +
+ } +
+ } @if (poll.max_votes_per_option > 1) { e return this._poll; } + @Input() + public set displayInAutopilot(is_in_autopilot: boolean) { + this.displayed_in_autopilot = is_in_autopilot; + } + + protected displayed_in_autopilot = true; + public PollType = PollType; public formControlMap: { [optionId: number]: UntypedFormControl } = {}; diff --git a/client/src/app/site/pages/meetings/pages/autopilot/components/autopilot/autopilot.component.html b/client/src/app/site/pages/meetings/pages/autopilot/components/autopilot/autopilot.component.html index 67d1a03e67..28f1a0fb2a 100644 --- a/client/src/app/site/pages/meetings/pages/autopilot/components/autopilot/autopilot.component.html +++ b/client/src/app/site/pages/meetings/pages/autopilot/components/autopilot/autopilot.component.html @@ -139,6 +139,7 @@

[currentProjection]="projectedViewModel" [disableFinished]="disabledContentElements['poll-finished'] === true" [disableRunning]="disabledContentElements['poll-running'] === true" + [displayInAutopilot]="true" > } diff --git a/client/src/app/site/pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.html b/client/src/app/site/pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.html index be4bb1c92d..9fd0b4d834 100644 --- a/client/src/app/site/pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.html +++ b/client/src/app/site/pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.html @@ -34,7 +34,10 @@ @if (poll.isMotionPoll) {
@if (poll.canBeVotedFor() && !last) { - + } @if (last) { diff --git a/client/src/app/site/pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.ts b/client/src/app/site/pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.ts index 3019399ffe..ddf7ae1e42 100644 --- a/client/src/app/site/pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.ts +++ b/client/src/app/site/pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.ts @@ -33,6 +33,9 @@ export class PollCollectionComponent extends BaseCo @Input() public disableFinished = false; + @Input() + public displayInAutopilot = true; + @Input() public set currentProjection(viewModel: (Partial> & { readonly fqid: string }) | null) { this._currentProjection = viewModel; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll/motion-poll.component.html b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll/motion-poll.component.html index b0e31bdf9d..9601a1b0cb 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll/motion-poll.component.html +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll/motion-poll.component.html @@ -72,7 +72,7 @@ } @if (poll.canBeVotedFor()) { - + } } @else {