Motion/election: required majority

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

@@ -4,7 +4,13 @@ import { HasProperties } from '../../interfaces/has-properties';
 import { AgendaItemCreation, AgendaItemType } from '../agenda/agenda-item';
 import { BaseModel } from '../base/base-model';
 import { ChangeRecoMode, LineNumberingMode } from '../motions/motions.constants';
-import { PollBackendDurationType, PollMethod, PollPercentBase, PollType } from '../poll/poll-constants';
+import {
+    PollBackendDurationType,
+    PollMethod,
+    PollPercentBase,
+    PollType,
+    RequiredMajorityBase
+} from '../poll/poll-constants';
 import { ApplauseType } from './applause';
 import {
     BallotPaperSelection,
@@ -148,6 +154,7 @@ export class Settings {
     public motion_poll_ballot_paper_number!: number;
     public motion_poll_default_type!: PollType;
     public motion_poll_default_onehundred_percent_base!: PollPercentBase;
+    public motion_poll_default_required_majority!: RequiredMajorityBase;
     public motion_poll_default_group_ids!: Id[]; // (group/used_as_motion_poll_default_id)[];
     public motion_poll_default_backend!: PollBackendDurationType;
     public motion_poll_default_method!: PollMethod;
@@ -185,6 +192,7 @@ export class Settings {
     public assignment_poll_default_type!: PollType;
     public assignment_poll_default_method!: PollMethod;
     public assignment_poll_default_onehundred_percent_base!: PollPercentBase;
+    public assignment_poll_default_required_majority!: RequiredMajorityBase;
     public assignment_poll_default_group_ids!: Id[]; // (group/used_as_assignment_poll_default_id)[];
     public assignment_poll_default_backend!: PollBackendDurationType;
 
@@ -414,6 +422,7 @@ export class Meeting extends BaseModel<Meeting> {
         `motion_poll_default_type`,
         `motion_poll_default_method`,
         `motion_poll_default_onehundred_percent_base`,
+        `motion_poll_default_required_majority`,
         `motion_poll_default_group_ids`,
         `motion_poll_default_backend`,
         `motion_poll_projection_name_order_first`,
@@ -448,6 +457,7 @@ export class Meeting extends BaseModel<Meeting> {
         `assignment_poll_default_type`,
         `assignment_poll_default_method`,
         `assignment_poll_default_onehundred_percent_base`,
+        `assignment_poll_default_required_majority`,
         `assignment_poll_default_group_ids`,
         `assignment_poll_default_backend`,
         `poll_ballot_paper_selection`,

client/src/app/domain/models/poll/generic-poll.ts

@@ -5,7 +5,15 @@ import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions';
 import { ViewPollCandidateList } from 'src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list';
 import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
 
-import { EntitledUsersEntry, PollClassType, PollMethod, PollPercentBase, PollState, PollType } from './poll-constants';
+import {
+    EntitledUsersEntry,
+    PollClassType,
+    PollMethod,
+    PollPercentBase,
+    PollState,
+    PollType,
+    RequiredMajorityBase
+} from './poll-constants';
 
 export type PollContentObject = ViewAssignment | ViewMotion | ViewTopic;
 
@@ -19,6 +27,7 @@ export interface PollData {
     pollmethod: PollMethod;
     state: PollState;
     onehundred_percent_base: PollPercentBase;
+    required_majority?: RequiredMajorityBase;
     votesvalid: number;
     votesinvalid: number;
     votescast: number;

client/src/app/domain/models/poll/poll-constants.ts

@@ -91,6 +91,12 @@ export enum PollPercentBase {
     Disabled = `disabled`
 }
 
+export enum RequiredMajorityBase {
+    no_majority = `no_majority`,
+    two_third_majority = `two_third_majority`,
+    absolute_majority = `absolute_majority`
+}
+
 export interface EntitledUsersEntry {
     user_id: number;
     present: boolean;
@@ -204,6 +210,12 @@ export const VoteValuesVerbose = {
     A: `Abstain`
 };
 
+export const RequiredMajorityBaseVerbose = {
+    no_majority: _('No majority'),
+    absolute_majority: _('Absolute majority'),
+    two_third_majority: _('Two-third majority')
+};
+
 /**
  * Interface describes the possible data for the result-table.
  */

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

@@ -11,7 +11,8 @@ import {
     PollMethod,
     PollPercentBase,
     PollState,
-    PollType
+    PollType,
+    RequiredMajorityBase
 } from './poll-constants';
 
 export class Poll extends BaseDecimalModel<Poll> {
@@ -29,6 +30,7 @@ export class Poll extends BaseDecimalModel<Poll> {
     public live_votes: Record<number, any>;
     public live_voting_enabled: number[];
     public onehundred_percent_base!: PollPercentBase;
+    public required_majority!: RequiredMajorityBase;
 
     /**
      * TODO:
@@ -166,6 +168,7 @@ export class Poll extends BaseDecimalModel<Poll> {
         `global_no`,
         `global_abstain`,
         `onehundred_percent_base`,
+        `required_majority`,
         `votesvalid`,
         `votesinvalid`,
         `votescast`,

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

@@ -50,6 +50,7 @@ export class PollRepositoryService extends BaseMeetingRelatedRepository<ViewPoll
             `type`,
             `pollmethod`,
             `onehundred_percent_base`,
+            `required_majority`,
             `backend`,
             `content_object_id`,
             `is_pseudoanonymized`
@@ -91,6 +92,7 @@ export class PollRepositoryService extends BaseMeetingRelatedRepository<ViewPoll
             meeting_id: this.activeMeetingId,
             title: poll.title,
             onehundred_percent_base: poll.onehundred_percent_base,
+            required_majority: poll.required_majority,
             pollmethod: poll.pollmethod,
             publish_immediately: poll.publish_immediately,
             type: poll.type,
@@ -114,6 +116,7 @@ export class PollRepositoryService extends BaseMeetingRelatedRepository<ViewPoll
             meeting_id: this.activeMeetingId,
             title: poll.title,
             onehundred_percent_base: poll.onehundred_percent_base,
+            required_majority: poll.required_majority,
             pollmethod: poll.pollmethod,
             type: poll.type,
             global_abstain: poll.global_abstain,
@@ -167,7 +170,8 @@ export class PollRepositoryService extends BaseMeetingRelatedRepository<ViewPoll
         if (poll.state !== PollState.Created) {
             update = {
                 title: update.title,
-                onehundred_percent_base: update.onehundred_percent_base
+                onehundred_percent_base: update.onehundred_percent_base,
+                required_majority: update.required_majority
             };
         }
         return this.updateCreatedElectronicPoll(update, poll);
@@ -188,6 +192,7 @@ export class PollRepositoryService extends BaseMeetingRelatedRepository<ViewPoll
             min_votes_amount: update.min_votes_amount,
             max_votes_per_option: update.max_votes_per_option,
             onehundred_percent_base: update.onehundred_percent_base,
+            required_majority: update.required_majority,
             pollmethod: update.pollmethod,
             title: update.title,
             ...this.getAnalogPollVotesValues(update)
@@ -201,6 +206,7 @@ export class PollRepositoryService extends BaseMeetingRelatedRepository<ViewPoll
             publish_immediately: update.publish_immediately,
             description: update.description,
             onehundred_percent_base: update.onehundred_percent_base,
+            required_majority: update.required_majority,
             title: update.title,
             ...this.getAnalogPollVotesValues(update)
         };
@@ -217,6 +223,7 @@ export class PollRepositoryService extends BaseMeetingRelatedRepository<ViewPoll
             min_votes_amount: update.min_votes_amount,
             max_votes_per_option: update.max_votes_per_option,
             onehundred_percent_base: update.onehundred_percent_base,
+            required_majority: update.required_majority,
             pollmethod: update.pollmethod,
             title: update.title,
             backend: update.backend,

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

@@ -1,5 +1,5 @@
 import { Directive, Input } from '@angular/core';
-import { PollBackendDurationChoices } from 'src/app/domain/models/poll/poll-constants';
+import { PollBackendDurationChoices, RequiredMajorityBaseVerbose } from 'src/app/domain/models/poll/poll-constants';
 import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
 
 @Directive()
@@ -8,4 +8,8 @@ export abstract class BasePollMetaInformationComponent {
 
     @Input()
     public poll!: ViewPoll;
+
+    public get requiredMajorityVerbose(): string {
+        return RequiredMajorityBaseVerbose[this.poll.required_majority];
+    }
 }

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

@@ -171,6 +171,38 @@ <h2 class="poll-preview-title">
                     </mat-form-field>
                 }
             </div>
+            <div>
+                @if (!hideSelects.requiredMajority) {
+                    <mat-form-field subscriptSizing="dynamic">
+                        <mat-label>{{ 'Required majority' | translate }}</mat-label>
+                        <mat-select formControlName="required_majority" panelClass="required_majority" required>
+                            @for (option of requiredMajorityBaseVerbose | keyvalue: keepEntryOrder; track option.key) {
+                                <mat-option [value]="option.key">
+                                    {{ option.value }}
+                                </mat-option>
+                            }
+                        </mat-select>
+                        @if (contentForm.get('required_majority').value === 'absolute_majority') {
+                            <mat-hint
+                                [innerText]="
+                                    'Indicates if a majority of more than 50% was reached, dependents on the 100%-base'
+                                        | translate
+                                "
+                            ></mat-hint>
+                        } @else if (contentForm.get('required_majority').value === 'two_third_majority') {
+                            <mat-hint
+                                [innerText]="
+                                    'Indicates if a majority of two-thirds or more was reached, dependents on the 100%-base'
+                                        | translate
+                                "
+                            ></mat-hint>
+                        }
+                    </mat-form-field>
+                }
+            </div>
+        </div>
+        <div class="info-grid">
+            <div></div>
             <div>
                 @if (isEVotingSelected && isCreated && !hideSelects.backendDuration) {
                     <mat-form-field subscriptSizing="dynamic">

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

@@ -18,7 +18,8 @@ import {
     PollPropertyVerbose,
     PollPropertyVerboseKey,
     PollType,
-    PollTypeVerbose
+    PollTypeVerbose,
+    RequiredMajorityBaseVerbose
 } from 'src/app/domain/models/poll';
 import { isNumberRange } from 'src/app/infrastructure/utils/validators';
 import { BaseComponent } from 'src/app/site/base/base.component';
@@ -41,6 +42,7 @@ export interface PollFormHideSelectsData {
     globalOptions?: boolean;
     hundredPercentBase?: boolean;
     backendDuration?: boolean;
+    requiredMajority?: boolean;
 }
 
 @Directive()
@@ -68,6 +70,7 @@ export abstract class BasePollFormComponent extends BaseComponent implements OnI
     public percentBases: Record<string, string>;
 
     public alternativePercentBases = PollPercentBaseVerbose;
+    public requiredMajorityBaseVerbose = RequiredMajorityBaseVerbose;
 
     @Input()
     public set data(data: Partial<ViewPoll>) {
@@ -188,6 +191,10 @@ export abstract class BasePollFormComponent extends BaseComponent implements OnI
         return this.contentForm.get(`onehundred_percent_base`);
     }
 
+    private get requiredMajority(): AbstractControl {
+        return this.contentForm.get(`required_majority`);
+    }
+
     public abstract get hideSelects(): PollFormHideSelectsData;
 
     public get pollMethodChangedToListObservable(): Observable<boolean> {
@@ -526,6 +533,7 @@ export abstract class BasePollFormComponent extends BaseComponent implements OnI
             type: [``, Validators.required],
             pollmethod: [``, Validators.required],
             onehundred_percent_base: [``, Validators.required],
+            required_majority: [``, Validators.required],
             votes_amount: this.getVotesAmountControl(),
             entitled_group_ids: [],
             backend: [],

client/src/app/site/pages/meetings/modules/poll/components/chart/chart.component.html

@@ -9,5 +9,14 @@
             [options]="chartOptions"
             [type]="type"
         ></canvas>
+        @if (chartIcon) {
+            <div
+                class="chart-icon"
+                [class.color-green]="chartIcon === 'check'"
+                [class.color-red]="chartIcon === 'close'"
+            >
+                <mat-icon>{{ chartIcon }}</mat-icon>
+            </div>
+        }
     }
 </div>

client/src/app/site/pages/meetings/modules/poll/components/chart/chart.component.scss

@@ -4,3 +4,21 @@
     height: 100%;
     margin: auto;
 }
+.chart-icon {
+    position: absolute;
+    left: 60px;
+    top: 90px;
+    & mat-icon {
+        font-size: 80px;
+        width: 80px;
+        min-width: 80px;
+        height: 80px;
+        margin-top: 0 !important;
+    }
+    &.color-green {
+        color: var(--theme-yes);
+    }
+    &.color-red {
+        color: var(--theme-no);
+    }
+}

client/src/app/site/pages/meetings/modules/poll/components/chart/chart.component.ts

@@ -54,6 +54,9 @@ export class ChartComponent {
         this._circleColors = colors;
     }
 
+    @Input()
+    public chartIcon: string | undefined;
+
     private _circleColors: { backgroundColor?: string[]; hoverBackgroundColor?: string[] }[];
 
     public colors: { backgroundColor?: string[]; hoverBackgroundColor?: string[] }[];

client/src/app/site/pages/meetings/modules/poll/components/single-option-chart-table/single-option-chart-table.component.html

@@ -142,7 +142,7 @@
         <!-- Chart -->
         @if (shouldShowChart) {
             <div [class.doughnut-chart-normal]="!inSlide" [class.doughnut-chart-slide]="inSlide">
-                <os-chart type="doughnut" [data]="chartData"></os-chart>
+                <os-chart type="doughnut" [chartIcon]="shouldShowChartIcon" [data]="chartData"></os-chart>
             </div>
         }
     </div>

client/src/app/site/pages/meetings/modules/poll/components/single-option-chart-table/single-option-chart-table.component.ts

@@ -73,6 +73,9 @@ export class SingleOptionChartTableComponent {
     @Input()
     public shouldShowEntitledPresent = false;
 
+    @Input()
+    public shouldShowChartIcon: string | undefined;
+
     @Input()
     public title = ``;
 

client/src/app/site/pages/meetings/modules/poll/services/poll.service/poll.service.ts

@@ -18,6 +18,7 @@ import {
     PollTypeVerbose,
     PollTypeVerboseKey,
     PollValues,
+    RequiredMajorityBase,
     VOTE_MAJORITY,
     VOTE_UNDOCUMENTED,
     VotingResult,
@@ -279,6 +280,32 @@ export abstract class PollService {
         return ``;
     }
 
+    public getRequiredMajorityBase(poll: PollData, row?: OptionData | PollTableData): number | null {
+        const option: OptionData | undefined = isPollTableData(row) ? this.transformToOptionData(row) : row;
+        const totalByBase = this.getPercentBase(poll, option);
+        if (!totalByBase) {
+            return null;
+        }
+        switch (poll.required_majority) {
+            case RequiredMajorityBase.absolute_majority:
+                return totalByBase / 2;
+            case RequiredMajorityBase.two_third_majority:
+                return (totalByBase * 2) / 3;
+            default:
+                return null;
+        }
+    }
+
+    public isRequiredMajority(value: number, poll: PollData, row?: OptionData | PollTableData): boolean {
+        const requiredMajorityBase = this.getRequiredMajorityBase(poll, row);
+        return (
+            requiredMajorityBase !== null &&
+            (poll.required_majority === RequiredMajorityBase.absolute_majority
+                ? value > requiredMajorityBase
+                : value >= requiredMajorityBase)
+        );
+    }
+
     /**
      * @deprecated Please rewrite this function
      *

client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-form/topic-poll-form.component.ts

@@ -19,7 +19,8 @@ export class TopicPollFormComponent extends BasePollFormComponent {
             pollMethod: true,
             globalOptions: true,
             hundredPercentBase: true,
-            backendDuration: true
+            backendDuration: true,
+            requiredMajority: true
         };
     }
 }