New vote service (#5534)

client/cli/generate-permissions.ts

@@ -7,7 +7,7 @@ import { overloadJsFunctions } from '@app/infrastructure/utils/overload-js-funct
 
 overloadJsFunctions();
 
-const SOURCE = path.resolve(path.join(__dirname, '../meta/permission.yml'));
+const SOURCE = path.resolve(path.join(__dirname, '../../meta/permission.yml'));
 
 const BASE_PATH = path.resolve(path.join(__dirname, `..`));
 const DOMAIN_DEFINITIONS_PATH = `src/app/domain/definitions`;
@@ -33,21 +33,21 @@ const FILE_TEMPLATE_PERMISSION_RELATIONS = dedent`
     import { PermissionsMap } from './permission.config';
 `;
 
-const permissionMap: { [permission: string]: PermissionNode } = {};
+const permissionMap: Record<string, PermissionNode> = {};
 
 /**
  * Helper class to generate the permission graph. Holds information about its permission as well as
  * its parents and children.
  */
 class PermissionNode {
-    parents: PermissionNode[] = [];
-    children: PermissionNode[] = [];
-    permission: string;
-    enumKey: string;
+    public parents: PermissionNode[] = [];
+    public children: PermissionNode[] = [];
+    public permission: string;
+    public enumKey: string;
 
     public constructor(permission: string) {
         this.permission = permission;
-        this.enumKey = permission.replace(/[_\.]([a-z])/g, (_, c) => c.toUpperCase());
+        this.enumKey = permission.replace(/[_.]([a-z])/g, (_, c) => c.toUpperCase());
     }
 }
 
@@ -137,7 +137,7 @@ function writePermissionRelations(nodes: PermissionNode[]): void {
  * @returns a set of all relatives of the given node in the given direction
  */
 function getPermissionRelatives(node: PermissionNode, field: PermissionNodeRelativesField): Set<PermissionNode> {
-    let relatives = new Set<PermissionNode>();
+    const relatives = new Set<PermissionNode>();
     for (const relative of node[field]) {
         relatives.add(relative);
         relatives.update(getPermissionRelatives(relative, field));

client/package.json

@@ -74,6 +74,7 @@
     "@tsparticles/plugin-emitters": "^3.9.1",
     "@tsparticles/shape-text": "^3.9.1",
     "@tsparticles/slim": "^3.9.1",
+    "big.js": "^7.0.1",
     "chart.js": "^4.5.1",
     "cm-chess": "^3.6.3",
     "cm-chessboard": "^8.12.12",
@@ -108,6 +109,7 @@
     "@angular/compiler-cli": "^22.0.6",
     "@angular/language-server": "^22.0.6",
     "@stylistic/eslint-plugin": "^5.10.0",
+    "@types/big.js": "^7.0.0",
     "@types/file-saver": "^2.0.7",
     "@types/jasmine": "~5.1.15",
     "@types/js-yaml": "^4.0.9",

client/src/app/domain/definitions/permission-relations.ts

@@ -4,13 +4,20 @@ import { PermissionsMap } from './permission.config';
 
 export const permissionChildren: PermissionsMap = {
     'agenda_item.can_manage': [Permission.agendaItemCanSeeInternal, Permission.agendaItemCanSee],
+    'agenda_item.can_manage_polls': [
+        Permission.agendaItemCanSeePolls,
+        Permission.agendaItemCanSeeInternal,
+        Permission.agendaItemCanSee
+    ],
     'agenda_item.can_see': [],
     'agenda_item.can_see_internal': [Permission.agendaItemCanSee],
+    'agenda_item.can_see_polls': [Permission.agendaItemCanSeeInternal, Permission.agendaItemCanSee],
     'assignment.can_manage': [Permission.assignmentCanNominateOther, Permission.assignmentCanSee],
-    'assignment.can_manage_polls': [Permission.assignmentCanSee],
+    'assignment.can_manage_polls': [Permission.assignmentCanSeePolls, Permission.assignmentCanSee],
     'assignment.can_nominate_other': [Permission.assignmentCanSee],
     'assignment.can_nominate_self': [Permission.assignmentCanSee],
     'assignment.can_see': [],
+    'assignment.can_see_polls': [Permission.assignmentCanSee],
     'chat.can_manage': [],
     'list_of_speakers.can_be_speaker': [],
     'list_of_speakers.can_manage': [Permission.listOfSpeakersCanSee],
@@ -37,12 +44,12 @@ export const permissionChildren: PermissionsMap = {
         Permission.motionCanForward
     ],
     'motion.can_manage_metadata': [Permission.motionCanSee],
-    'motion.can_manage_polls': [Permission.motionCanSee],
+    'motion.can_manage_polls': [Permission.motionCanSeePolls, Permission.motionCanSee],
     'motion.can_see': [],
     'motion.can_see_internal': [Permission.motionCanSee],
     'motion.can_see_origin': [Permission.motionCanSee],
+    'motion.can_see_polls': [Permission.motionCanSee],
     'motion.can_support': [Permission.motionCanSee],
-    'poll.can_manage': [Permission.pollCanSeeProgress],
     'poll.can_see_progress': [],
     'projector.can_manage': [Permission.projectorCanSee],
     'projector.can_see': [],
@@ -62,18 +69,31 @@ export const permissionChildren: PermissionsMap = {
 
 export const permissionParents: PermissionsMap = {
     'agenda_item.can_manage': [],
-    'agenda_item.can_see': [Permission.agendaItemCanSeeInternal, Permission.agendaItemCanManage],
-    'agenda_item.can_see_internal': [Permission.agendaItemCanManage],
+    'agenda_item.can_manage_polls': [],
+    'agenda_item.can_see': [
+        Permission.agendaItemCanSeeInternal,
+        Permission.agendaItemCanManage,
+        Permission.agendaItemCanSeePolls,
+        Permission.agendaItemCanManagePolls
+    ],
+    'agenda_item.can_see_internal': [
+        Permission.agendaItemCanManage,
+        Permission.agendaItemCanSeePolls,
+        Permission.agendaItemCanManagePolls
+    ],
+    'agenda_item.can_see_polls': [Permission.agendaItemCanManagePolls],
     'assignment.can_manage': [],
     'assignment.can_manage_polls': [],
     'assignment.can_nominate_other': [Permission.assignmentCanManage],
     'assignment.can_nominate_self': [],
     'assignment.can_see': [
         Permission.assignmentCanNominateOther,
         Permission.assignmentCanManage,
+        Permission.assignmentCanSeePolls,
         Permission.assignmentCanManagePolls,
         Permission.assignmentCanNominateSelf
     ],
+    'assignment.can_see_polls': [Permission.assignmentCanManagePolls],
     'chat.can_manage': [],
     'list_of_speakers.can_be_speaker': [],
     'list_of_speakers.can_manage': [],
@@ -101,15 +121,16 @@ export const permissionParents: PermissionsMap = {
         Permission.motionCanCreate,
         Permission.motionCanCreateAmendments,
         Permission.motionCanForward,
+        Permission.motionCanSeePolls,
         Permission.motionCanManagePolls,
         Permission.motionCanSupport,
         Permission.motionCanSeeOrigin
     ],
     'motion.can_see_internal': [Permission.motionCanManage],
     'motion.can_see_origin': [],
+    'motion.can_see_polls': [Permission.motionCanManagePolls],
     'motion.can_support': [],
-    'poll.can_manage': [],
-    'poll.can_see_progress': [Permission.pollCanManage],
+    'poll.can_see_progress': [],
     'projector.can_manage': [],
     'projector.can_see': [Permission.projectorCanManage],
     'tag.can_manage': [],

client/src/app/domain/definitions/permission.config.ts

@@ -89,7 +89,12 @@ Optional combination of requests to speak with presence status is possible. ( >
             {
                 display_name: _(`Can manage polls`),
                 help_text: _(`Can create, change, start/stop and delete polls.`),
-                value: Permission.pollCanManage
+                value: Permission.agendaItemCanManagePolls
+            },
+            {
+                display_name: _(`Can see ballot results`),
+                help_text: _(`Can see unpublished ballot results.`),
+                value: Permission.agendaItemCanSeePolls
             },
             {
                 display_name: _(`Can see moderation notes`),
@@ -180,6 +185,11 @@ Further requirements:
                 display_name: _(`Can manage motion polls`),
                 help_text: _(`Can create, modify, start/stop and delete votings.`),
                 value: Permission.motionCanManagePolls
+            },
+            {
+                display_name: _(`Can see ballot results`),
+                help_text: _(`Can see unpublished ballot results.`),
+                value: Permission.motionCanSeePolls
             }
         ]
     },
@@ -208,6 +218,11 @@ Note: The right to vote is defined directly in the ballot.`
                 help_text: _(`Can create, modify, start/stop and delete ballots.`),
                 value: Permission.assignmentCanManagePolls
             },
+            {
+                display_name: _(`Can see ballot results`),
+                help_text: _(`Can see unpublished ballot results.`),
+                value: Permission.assignmentCanSeePolls
+            },
             {
                 display_name: _(`Can nominate another participant`),
                 help_text: _(`Can nominate other participants as candidates.
@@ -335,6 +350,11 @@ Note: For privacy reasons, it is recommended to limit the rights to view the His
 
 Note: The chat menu item becomes visible to all participants, except admins, as soon as a chat has been created.`),
                 value: Permission.chatCanManage
+            },
+            {
+                display_name: _(`Can see poll progress`),
+                help_text: _(`Can see the progress bar of a running poll.`),
+                value: Permission.pollCanSeeProgress
             }
         ]
     }

client/src/app/domain/definitions/permission.ts

@@ -5,13 +5,16 @@
  */
 export enum Permission {
     agendaItemCanManage = `agenda_item.can_manage`,
+    agendaItemCanManagePolls = `agenda_item.can_manage_polls`,
     agendaItemCanSee = `agenda_item.can_see`,
     agendaItemCanSeeInternal = `agenda_item.can_see_internal`,
+    agendaItemCanSeePolls = `agenda_item.can_see_polls`,
     assignmentCanManage = `assignment.can_manage`,
     assignmentCanManagePolls = `assignment.can_manage_polls`,
     assignmentCanNominateOther = `assignment.can_nominate_other`,
     assignmentCanNominateSelf = `assignment.can_nominate_self`,
     assignmentCanSee = `assignment.can_see`,
+    assignmentCanSeePolls = `assignment.can_see_polls`,
     chatCanManage = `chat.can_manage`,
     listOfSpeakersCanBeSpeaker = `list_of_speakers.can_be_speaker`,
     listOfSpeakersCanManage = `list_of_speakers.can_manage`,
@@ -35,8 +38,8 @@ export enum Permission {
     motionCanSee = `motion.can_see`,
     motionCanSeeInternal = `motion.can_see_internal`,
     motionCanSeeOrigin = `motion.can_see_origin`,
+    motionCanSeePolls = `motion.can_see_polls`,
     motionCanSupport = `motion.can_support`,
-    pollCanManage = `poll.can_manage`,
     pollCanSeeProgress = `poll.can_see_progress`,
     projectorCanManage = `projector.can_manage`,
     projectorCanSee = `projector.can_see`,

client/src/app/domain/models/meeting-users/meeting-user.ts

@@ -24,8 +24,9 @@ export class MeetingUser extends BaseDecimalModel<MeetingUser> {
     public motion_supporter_ids!: Id[]; // (motion_supporter/meeting_user_id);
     public submitted_motion_ids!: Id[]; // (motion_submitter/meeting_user_id)[];
     public assignment_candidate_ids!: Id[]; // (assignment_candidate/meeting_user_id)[];
-    public vote_delegated_vote_ids!: Id[];
     public vote_delegations_from_ids!: Id[]; // meeting_user/vote_delegated_to_id;
+    public acting_ballot_ids: Id[];
+    public represented_ballot_ids: Id[];
     public chat_message_ids!: Id[]; // (chat_message/meeting_user_id)[];
     public structure_level_ids!: Id[]; // structure_level/meeting_user_ids
 
@@ -52,6 +53,8 @@ export class MeetingUser extends BaseDecimalModel<MeetingUser> {
         `assignment_candidate_ids`,
         `vote_delegated_to_id`,
         `vote_delegations_from_ids`,
+        `acting_ballot_ids`,
+        `represented_ballot_ids`,
         `chat_message_ids`,
         `group_ids`,
         `structure_level_ids`

client/src/app/domain/models/meetings/meeting-poll-default.ts

@@ -0,0 +1,37 @@
+import { HasMeetingId } from '../../interfaces';
+import { BaseModel } from '../base/base-model';
+import { PollVisibility } from '../poll';
+import { BaseOnehundredPercentBase } from '../poll/poll-config-types';
+
+export class MeetingPollDefault extends BaseModel<MeetingPollDefault> {
+    public static COLLECTION = `meeting_poll_default`;
+
+    public sort_result_by_votes: boolean;
+
+    public allow_abstain!: boolean;
+    public allow_nota: boolean;
+    public visibility: PollVisibility;
+    public strike_out: boolean;
+    public onehundred_percent_base: BaseOnehundredPercentBase;
+    public group_ids: number[];
+    public display_chart: string;
+
+    public constructor(input?: Partial<MeetingPollDefault>) {
+        super(MeetingPollDefault.COLLECTION, input);
+    }
+
+    public static readonly REQUESTABLE_FIELDS: (keyof MeetingPollDefault)[] = [
+        `id`,
+        `sort_result_by_votes`,
+        `visibility`,
+        `allow_abstain`,
+        `allow_nota`,
+        `strike_out`,
+        `onehundred_percent_base`,
+        `group_ids`,
+        `display_chart`,
+        `meeting_id`
+    ];
+}
+
+export interface MeetingPollDefault extends HasMeetingId {}

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

@@ -3,16 +3,6 @@ import { PROJECTIONDEFAULTS, ProjectiondefaultValue } from '../projector/project
 
 export type ExportCsvEncoding = `utf-8` | `iso-8859-15`;
 
-/**
- * Server side ballot choice definitions.
- * Server-defined methods to determine the number of ballots to print
- * Options are:
- * - NUMBER_OF_DELEGATES Amount of users belonging to the predefined 'delegates' group (group id 2)
- * - NUMBER_OF_ALL_PARTICIPANTS The amount of all registered users
- * - CUSTOM_NUMBER a given number of ballots
- */
-export type BallotPaperSelection = `NUMBER_OF_DELEGATES` | `NUMBER_OF_ALL_PARTICIPANTS` | `CUSTOM_NUMBER`;
-
 export type ViewMeetingMediafileUsageKey = `logo_${LogoPlace}` | `font_${FontPlace}`;
 
 export type MeetingMediafileUsageIdKey = `${ViewMeetingMediafileUsageKey}_id`;