Update poll form

client/src/app/domain/models/meetings/meeting.ts

@@ -172,11 +172,14 @@ export class Settings {
     public topic_poll_config_id: Id;
 
     // General poll settings
+    public poll_enable_max_yes_votes: boolean;
+    public poll_default_required_majority: `no_majority` | `two_third_majority` | `absolute_majority`;
     public poll_default_live_voting_enabled: boolean;
     public poll_enable_max_votes_per_option: boolean;
     public poll_default_allow_invalid: boolean;
     public poll_default_allow_vote_split: boolean;
     public poll_projection_name_order_first: `first_name` | `last_name`;
+    public poll_projection_max_columns: boolean;
 
     // SSO
     public external_id!: string;
@@ -412,11 +415,14 @@ export class Meeting extends BaseModel<Meeting> {
         `motion_poll_config_id`,
         `topic_poll_default_method`,
         `topic_poll_config_id`,
+        `poll_enable_max_yes_votes`,
         `poll_enable_max_votes_per_option`,
+        `poll_default_required_majority`,
         `poll_default_live_voting_enabled`,
         `poll_default_allow_invalid`,
         `poll_default_allow_vote_split`,
         `poll_projection_name_order_first`,
+        `poll_projection_max_columns`,
         `projector_ids`,
         `all_projection_ids`,
         `projector_message_ids`,

client/src/app/domain/translations/poll.ts

@@ -22,5 +22,8 @@ export default {
     'poll_percent_base.cast': _(`All casted ballots`),
     'poll_percent_base.entitled': _(`All entitled users`),
     'poll_percent_base.entitled_present': _(`Present entitled users`),
-    'poll_percent_base.disabled': _(`Disabled (no percents)`)
+    'poll_percent_base.disabled': _(`Disabled (no percents)`),
+    'poll_required_majority.no_majority': _(`No majority`),
+    'poll_required_majority.two_third_majority': _(`Two thirds`),
+    'poll_required_majority.absolute_majority': _(`Absolute`)
 };

client/src/app/gateways/repositories/polls/poll-repository.service/poll-repository.service.ts

@@ -136,6 +136,13 @@ export class PollRepositoryService extends BaseMeetingRelatedRepository<ViewPoll
         });
     }
 
+    public async finalizePoll(poll: Identifiable, actions: ('publish' | 'anonymize')[]): Promise<void> {
+        return this.voteApi.finalize(poll.id, {
+            anonymize: actions.indexOf('anonymize') !== -1,
+            publish: actions.indexOf('publish') !== -1
+        });
+    }
+
     public async updateOptionForPoll(poll: Poll, update: any): Promise<void> {
         if (poll.visibility !== PollVisibility.Manually) {
             throw new Error(`Cannot update an option for an electronic poll!`);

client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component.ts

@@ -1,5 +1,4 @@
-import { Directive, inject, signal, viewChild } from '@angular/core';
-import { rxResource } from '@angular/core/rxjs-interop';
+import { computed, Directive, inject, signal, viewChild } from '@angular/core';
 import { UntypedFormBuilder } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Fqid, Id } from '@app/domain/definitions/key-types';
@@ -8,7 +7,6 @@ import { PollVisibility } from '@app/domain/models/poll';
 import { PollUpdatePayload } from '@app/gateways/vote-api.service';
 import { ViewPoll } from '@app/site/pages/meetings/pages/polls';
 import { BaseUiComponent } from '@app/ui/base/base-ui-component';
-import { map } from 'rxjs';
 
 import { PollEditResultComponent } from '../components/poll-edit-result/poll-edit-result.component';
 import { PollFormComponent } from '../components/poll-form/poll-form.component';
@@ -42,21 +40,17 @@ export abstract class BasePollDialogComponent extends BaseUiComponent {
     protected pollForm = viewChild.required(PollFormComponent);
     protected pollResultForm = viewChild(PollEditResultComponent);
 
-    public get formsValid(): boolean {
+    public formsValid = computed<boolean>(() => {
         if (!this.pollForm) {
             return false;
         }
 
-        return this.pollForm().pollForm.valid;
-    }
+        return this.pollForm().isValid();
+    });
 
     public analogPollFormOpen = signal(false);
-    public isAnalogPoll = rxResource({
-        params: () => this.pollForm(),
-        defaultValue: false,
-        stream({ params }) {
-            return params.pollForm.get(`visibility`).valueChanges.pipe(map(v => v === PollVisibility.Manually));
-        }
+    public isAnalogPoll = computed(() => {
+        return this.pollForm().form.visibility().value() === PollVisibility.Manually;
     });
 
     protected formBuilder = inject(UntypedFormBuilder);

client/src/app/site/pages/meetings/modules/poll/components/poll-config-form-base.component.ts

@@ -1,4 +1,5 @@
-import { Component, computed, effect, inject, input } from '@angular/core';
+import { Component, computed, effect, inject, input, signal } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { PollState } from '@app/domain/models/poll';
 
@@ -10,16 +11,19 @@ export abstract class PollFormBaseComponent {
 
     public data = input.required<Partial<ViewPoll>>();
 
+    public formValid = signal<boolean>(false);
+
     public pollStarted = computed<boolean>(() => {
         return this.data().state && this.data().state !== PollState.Created;
     });
 
-    protected fb = inject(UntypedFormBuilder);
+    protected readonly fb = inject(UntypedFormBuilder);
 
     public constructor() {
         this.initForm();
 
         effect(this.onDataUpdated.bind(this));
+        this.form.valueChanges.pipe(takeUntilDestroyed()).subscribe(() => this.formValid.set(this.form.valid));
     }
 
     protected abstract initForm(): void;

client/src/app/site/pages/meetings/modules/poll/components/poll-edit-result/poll-edit-result.component.html

@@ -113,7 +113,7 @@ <h3>{{ option.title }}</h3>
                 [attr.aria-label]="'Update total ballots' | translate"
                 (click)="updateTotalBallots()"
             >
-                <mat-icon>calculate</mat-icon>
+                <mat-icon>functions</mat-icon>
             </button>
         }
     </div>

client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.html

@@ -1,5 +1,5 @@
 <form [formGroup]="form">
-    @if (!pollStarted()) {
+    @if (!pollStarted() && !hideMethod()) {
         <div class="margin-bottom-15 info-grid">
             <mat-form-field>
                 <mat-label>{{ 'Election method' | translate }}</mat-label>
@@ -8,19 +8,23 @@
                     <mat-option [value]="true">{{ 'Yes/No/Abstain' | translate }}</mat-option>
                 </mat-select>
             </mat-form-field>
+            <div></div>
         </div>
     }
 
-    <mat-form-field>
-        <mat-label>{{ '100% base' | translate }}</mat-label>
-        <mat-select formControlName="onehundred_percent_base" panelClass="percent-base-panel" required>
-            @for (option of validPercentBases; track option[0]) {
-                @if (option[0] !== 'yes_no_abstain' || form.get('allow_abstain').getRawValue()) {
-                    <mat-option [value]="option[0]">
-                        {{ option[1] | translate }}
-                    </mat-option>
+    <div class="info-grid">
+        <mat-form-field>
+            <mat-label>{{ '100% base' | translate }}</mat-label>
+            <mat-select formControlName="onehundred_percent_base" panelClass="percent-base-panel" required>
+                @for (option of validPercentBases; track option[0]) {
+                    @if (option[0] !== 'yes_no_abstain' || form.get('allow_abstain').getRawValue()) {
+                        <mat-option [value]="option[0]">
+                            {{ option[1] | translate }}
+                        </mat-option>
+                    }
                 }
-            }
-        </mat-select>
-    </mat-form-field>
+            </mat-select>
+        </mat-form-field>
+        <div></div>
+    </div>
 </form>

client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.scss

@@ -0,0 +1,9 @@
+.info-grid {
+    display: grid;
+    column-gap: 1em;
+    grid-template-columns: repeat(auto-fit, minmax(100px, 1fr));
+
+    > mat-checkbox {
+        padding-top: 10px;
+    }
+}

client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatFormFieldModule } from '@angular/material/form-field';
@@ -9,6 +9,11 @@ import { _, TranslatePipe } from '@ngx-translate/core';
 import { ViewPoll } from '../../../../pages/polls';
 import { PollFormBaseComponent } from '../poll-config-form-base.component';
 
+export interface PollFormApproval {
+    allow_abstain: boolean;
+    onehundred_percent_base: ApprovalOnehundredPercentBase;
+}
+
 @Component({
     selector: 'os-poll-form-approval',
     imports: [ReactiveFormsModule, MatFormFieldModule, MatSelectModule, MatCheckboxModule, TranslatePipe],
@@ -17,6 +22,8 @@ import { PollFormBaseComponent } from '../poll-config-form-base.component';
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class PollFormApprovalComponent extends PollFormBaseComponent {
+    public hideMethod = input<boolean>(false);
+
     public validPercentBases: [ApprovalOnehundredPercentBase, string][] = [
         [`yes_no`, _('Yes/No')],
         [`yes_no_abstain`, _('Yes/No/Abstain')],