Merge branch 'main' into 3702-allow-committee-admin-personal-info-edit

OpenSlides · Jul 15, 2024 · ec32f7f · ec32f7f
2 parents fe952d4 + 686c488
commit ec32f7f
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 21 deletions.
diff --git a/.../site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.html b/.../site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.html
@@ -61,10 +61,12 @@ <h4 class="poll-delegation-title">
                             </div>
                         }
                         <!-- Options and Actions -->
-                        @if (!settings.isSplitSingleOption) {
+                        @if (!(settings.isSplitSingleOption && !displayed_in_autopilot)) {
                             <div
                                 [ngClass]="{
-                                    'yna-grid': poll.isMethodYNA,
+                                    'yna-grid':
+                                        poll.isMethodYNA || (settings.isSplitSingleOption && displayed_in_autopilot),
+                                    'remove-grid-gap': settings.isSplitSingleOption && displayed_in_autopilot,
                                     'yn-grid': poll.isMethodYN,
                                     'single-vote-grid':
                                         (poll.isMethodY || poll.isMethodN) && poll.max_votes_per_option <= 1,
@@ -75,7 +77,11 @@ <h4 class="poll-delegation-title">
                                 @if (showAvailableVotes) {
                                     <div class="grid-name-area"></div>
                                 }
-                                @if (!showAvailableVotes && poll.option_ids) {
+                                @if (
+                                    !showAvailableVotes &&
+                                    poll.option_ids &&
+                                    !(settings.isSplitSingleOption && displayed_in_autopilot)
+                                ) {
                                     <b class="grid-name-area">
                                         {{ poll.option_ids.length }} {{ optionPluralLabel | translate }}
                                     </b>
@@ -85,17 +91,22 @@ <h4 class="poll-delegation-title">
                                     track action;
                                     let i = $index
                                 ) {
-                                    <b class="poll-option-title" [ngClass]="'option' + i">
-                                        {{ action.label | translate }}
-                                    </b>
+                                    @if (!poll.isTopicPoll) {
+                                        <b class="poll-option-title" [ngClass]="'option' + i">
+                                            {{ action.label | translate }}
+                                        </b>
+                                    }
                                 }
                             </div>
                         }
                         @for (option of poll.options; track option; let i = $index) {
                             <div
                                 [ngClass]="{
-                                    'split-grid': settings.isSplitSingleOption,
-                                    'yna-grid': !settings.isSplitSingleOption && poll.isMethodYNA,
+                                    'split-grid': settings.isSplitSingleOption && !displayed_in_autopilot,
+                                    'remove-grid-gap': settings.isSplitSingleOption && displayed_in_autopilot,
+                                    'yna-grid':
+                                        (!settings.isSplitSingleOption && poll.isMethodYNA) ||
+                                        (settings.isSplitSingleOption && displayed_in_autopilot),
                                     'yn-grid': !settings.isSplitSingleOption && poll.isMethodYN,
                                     'single-vote-grid':
                                         !settings.isSplitSingleOption &&
@@ -169,14 +180,48 @@ <h4 class="poll-delegation-title">
                                                     </mat-icon>
                                                 </div>
                                             </button>
-                                            @if (settings.isSplitSingleOption) {
+                                            @if (settings.isSplitSingleOption && !displayed_in_autopilot) {
                                                 <span class="vote-label">
                                                     {{ action.label | translate }}
                                                 </span>
                                             }
                                         </div>
                                     }
                                 }
+                                @if (settings.isSplitSingleOption && displayed_in_autopilot) {
+                                    <ng-container>
+                                        @for (
+                                            action of voteActions.length ? voteActions : voteOptions;
+                                            track action;
+                                            let i = $index
+                                        ) {
+                                            <div class="vote-button-area" [ngClass]="'option' + i">
+                                                <button
+                                                    class="vote-button"
+                                                    mat-raised-button
+                                                    [disabled]="isDeliveringVote(delegation)"
+                                                    (click)="saveSingleVote(option.id, action.vote, delegation)"
+                                                >
+                                                    <div
+                                                        class="vote-button-content"
+                                                        [ngClass]="
+                                                            getActionButtonContentClass(action, option, delegation)
+                                                        "
+                                                    >
+                                                        <os-custom-icon
+                                                            class="vote-button-cross"
+                                                            [customIcon]="drawnCross"
+                                                            [ngClass]="getActionButtonClass(action, option, delegation)"
+                                                        ></os-custom-icon>
+                                                        <mat-icon class="vote-button-circle">
+                                                            radio_button_unchecked
+                                                        </mat-icon>
+                                                    </div>
+                                                </button>
+                                            </div>
+                                        }
+                                    </ng-container>
+                                }
                                 @if (poll.max_votes_per_option > 1) {
                                     <mat-form-field appearance="outline" class="vote-input">
                                         <input

diff --git a/.../site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.scss b/.../site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.scss
@@ -102,6 +102,15 @@
     }
 }
 
+.remove-grid-gap {
+    @media (max-width: 700px) {
+        //grid-gap: 0 !important;
+        grid-template-areas: 'yes no abstain';
+        grid-template-columns: 70px 70px 70px;
+        justify-content: end;
+    }
+}
+
 .single-vote-grid {
     @extend %vote-grid-base;
     grid-template-areas: 'name yes';
@@ -120,16 +129,6 @@
     }
 }
 
-.global-option-grid {
-    @extend %vote-grid-base;
-    grid-template-columns: auto var(--poll-option-title-width, 70px);
-}
-
-.option-list-information-grid {
-    @extend %vote-grid-base;
-    grid-template-columns: max-content auto max-content;
-}
-
 .split-grid {
     margin: 0;
     padding: 10px 0;
@@ -155,6 +154,16 @@
     }
 }
 
+.global-option-grid {
+    @extend %vote-grid-base;
+    grid-template-columns: auto var(--poll-option-title-width, 70px);
+}
+
+.option-list-information-grid {
+    @extend %vote-grid-base;
+    grid-template-columns: max-content auto max-content;
+}
+
 .grid-name-area {
     grid-area: name;
 }

diff --git a/...pp/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.ts b/...pp/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.ts
@@ -50,6 +50,13 @@ export abstract class BasePollVoteComponent<C extends PollContentObject = any> 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/...src/app/site/pages/meetings/pages/autopilot/components/autopilot/autopilot.component.html b/...src/app/site/pages/meetings/pages/autopilot/components/autopilot/autopilot.component.html
@@ -139,6 +139,7 @@ <h1>
                     [currentProjection]="projectedViewModel"
                     [disableFinished]="disabledContentElements['poll-finished'] === true"
                     [disableRunning]="disabledContentElements['poll-running'] === true"
+                    [displayInAutopilot]="true"
                 ></os-poll-collection>
             }
 

diff --git a/.../pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.html b/.../pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.html
@@ -34,7 +34,10 @@
             @if (poll.isMotionPoll) {
                 <div>
                     @if (poll.canBeVotedFor() && !last) {
-                        <os-motion-poll-vote [poll]="poll"></os-motion-poll-vote>
+                        <os-motion-poll-vote
+                            [displayInAutopilot]="displayInAutopilot"
+                            [poll]="poll"
+                        ></os-motion-poll-vote>
                     }
                     @if (last) {
                         <os-motion-poll-detail-content [poll]="lastPublishedPoll"></os-motion-poll-detail-content>

diff --git a/...te/pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.ts b/...te/pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.ts
@@ -33,6 +33,9 @@ export class PollCollectionComponent<C extends PollContentObject> extends BaseCo
     @Input()
     public disableFinished = false;
 
+    @Input()
+    public displayInAutopilot = true;
+
     @Input()
     public set currentProjection(viewModel: (Partial<HasPolls<C>> & { readonly fqid: string }) | null) {
         this._currentProjection = viewModel;

diff --git a/...tings/pages/motions/modules/motion-poll/components/motion-poll/motion-poll.component.html b/...tings/pages/motions/modules/motion-poll/components/motion-poll/motion-poll.component.html
@@ -72,7 +72,7 @@
                     <os-poll-progress [poll]="poll"></os-poll-progress>
                 }
                 @if (poll.canBeVotedFor()) {
-                    <os-motion-poll-vote [poll]="poll"></os-motion-poll-vote>
+                    <os-motion-poll-vote [displayInAutopilot]="false" [poll]="poll"></os-motion-poll-vote>
                 }
                 <os-motion-poll-meta-information [poll]="poll"></os-motion-poll-meta-information>
             } @else {