From 17a5742d070a9a36d471e27d29c2701db39b43a9 Mon Sep 17 00:00:00 2001
From: Javier Borrego <javier.borrego@intevation.de>
Date: Thu, 30 Apr 2026 17:13:00 +0200
Subject: [PATCH 1/4] Add option to account button

---
 .../account-button.component.html             |  4 ++
 .../account-button.component.ts               | 13 +++++
 .../participant-list.component.html           |  9 +---
 ...articipant-list-info-dialog.component.html | 54 +++++--------------
 .../participant-list-info-dialog.service.ts   | 33 ++++++++++--
 5 files changed, 60 insertions(+), 53 deletions(-)

diff --git a/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.html b/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.html
index 378314685a..f4a2f85409 100644
--- a/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.html
+++ b/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.html
@@ -94,6 +94,10 @@
                         }
                     }
                 </div>
+                <button mat-menu-item (click)="openDialogEditInfo(user)">
+                    <mat-icon>edit</mat-icon>
+                    <span>{{ 'Change your delegation' | translate }}</span>
+                </button>
             }
         </div>
         <mat-divider />
diff --git a/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts b/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts
index e675251346..e0c2ed20d3 100644
--- a/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts
+++ b/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts
@@ -9,6 +9,7 @@ import { allAvailableTranslations, availableTranslations } from 'src/app/domain/
 import { getOmlVerboseName } from 'src/app/domain/definitions/organization-permission';
 import { largeDialogSettings } from 'src/app/infrastructure/utils/dialog-settings';
 import { mediumDialogSettings } from 'src/app/infrastructure/utils/dialog-settings';
+import { ParticipantListInfoDialogService } from 'src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog';
 import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service';
 import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service';
 import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
@@ -88,6 +89,7 @@ export class AccountButtonComponent extends BaseUiComponent implements OnInit {
         private userRepo: UserControllerService,
         private authService: AuthService,
         private dialog: MatDialog,
+        private ParticipantListDialog: ParticipantListInfoDialogService,
         private router: Router,
         private theme: ThemeService,
         private meetingSettingsService: MeetingSettingsService,
@@ -226,4 +228,15 @@ export class AccountButtonComponent extends BaseUiComponent implements OnInit {
         }
         return stringForUserPresent.replace(`{}`, this.user.short_name);
     }
+
+    public async openDialogEditInfo(user: ViewUser) {
+        await this.ParticipantListDialog.open({
+            id: user.id,
+            name: user.getName(),
+            number: user.number(),
+            structure_level_ids: this.user.structure_level_ids(),
+            vote_delegations_from_ids: this.user.vote_delegations_from_meeting_user_ids(),
+            vote_delegated_to_id: this.user.vote_delegated_to_meeting_user_id()
+        });
+    }
 }
diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-list/participant-list.component.html b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-list/participant-list.component.html
index 34658da893..62eea91151 100644
--- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-list/participant-list.component.html
+++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-list/participant-list.component.html
@@ -341,14 +341,7 @@ <h1 class="mock-h2" translate>Participants</h1>
                 <mat-icon>record_voice_over</mat-icon>
                 <span translate>Contributions</span>
             </button>
-            <button
-                *osPerms="permission.userCanUpdate; or: canEditOwnDelegation(operator.user)"
-                mat-menu-item
-                (click)="openEditInfo(operator.user)"
-            >
-                <mat-icon>edit</mat-icon>
-                <span>{{ 'Change your delegation' | translate }}</span>
-            </button>
+
             <button mat-menu-item (click)="pdfExportUserList()">
                 <mat-icon>picture_as_pdf</mat-icon>
                 <span>{{ 'List of participants (PDF)' | translate }}</span>
diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html
index 8f11c9fc58..99440774b8 100644
--- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html
+++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html
@@ -1,54 +1,28 @@
 <h1 mat-dialog-title>
-    <span>{{ 'Edit details for' | translate }} {{ infoDialog.name }}</span>
+    <span>{{ 'Edit your own delegation' | translate }}</span>
 </h1>
 <mat-dialog-content class="os-form-card-mobile">
     <mat-form-field>
-        <mat-label>{{ 'Groups' | translate }}</mat-label>
-        <mat-select multiple [disabled]="canOnlyEditOwnDelegation" [(ngModel)]="infoDialog.group_ids">
-            @for (group of groupsObservable | async; track group) {
-                <mat-option [value]="group.id">
-                    {{ group.getTitle() }}
-                </mat-option>
-            }
-        </mat-select>
+        <mat-label>{{ 'Voting right received from (principals)' | translate }}</mat-label>
+        <os-list-search-selector
+            [disableOptionWhenFn]="getDisableOptionFn(infoDialog.vote_delegations_from_ids)"
+            [inputListValues]="otherParticipantsObservable"
+            [multiple]="true"
+            [sortFn]="false"
+            [(ngModel)]="infoDialog.vote_delegations_from_ids"
+        />
     </mat-form-field>
-    @if (showVoteDelegations) {
-        <mat-form-field>
-            <mat-label>{{ 'Voting right received from (principals)' | translate }}</mat-label>
-            <os-list-search-selector
-                [disableOptionWhenFn]="getDisableOptionFn(infoDialog.vote_delegations_from_ids)"
-                [inputListValues]="otherParticipantsObservable"
-                [multiple]="true"
-                [sortFn]="false"
-                [(ngModel)]="infoDialog.vote_delegations_from_ids"
-            />
-        </mat-form-field>
 
-        <mat-form-field>
-            <mat-label>{{ 'Voting right delegated to (proxy)' | translate }}</mat-label>
-            <os-list-search-selector
-                [includeNone]="true"
-                [inputListValues]="otherParticipantsObservable"
-                [multiple]="false"
-                [sortFn]="false"
-                [(ngModel)]="infoDialog.vote_delegated_to_id"
-            />
-        </mat-form-field>
-    }
     <mat-form-field>
-        <mat-label>{{ 'Structure level' | translate }}</mat-label>
+        <mat-label>{{ 'Voting right delegated to (proxy)' | translate }}</mat-label>
         <os-list-search-selector
-            [disabled]="canOnlyEditOwnDelegation"
             [includeNone]="true"
-            [inputListValues]="structureLevelObservable"
-            [multiple]="true"
-            [(ngModel)]="infoDialog.structure_level_ids"
+            [inputListValues]="otherParticipantsObservable"
+            [multiple]="false"
+            [sortFn]="false"
+            [(ngModel)]="infoDialog.vote_delegated_to_id"
         />
     </mat-form-field>
-    <mat-form-field>
-        <mat-label>{{ 'Participant number' | translate }}</mat-label>
-        <input matInput type="text" [disabled]="canOnlyEditOwnDelegation" [(ngModel)]="infoDialog.number" />
-    </mat-form-field>
 </mat-dialog-content>
 <mat-dialog-actions>
     <button
diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts
index 574faacc29..9b6489e376 100644
--- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts
+++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts
@@ -1,10 +1,12 @@
 import { Injectable } from '@angular/core';
-import { MatDialogRef } from '@angular/material/dialog';
+import { firstValueFrom } from 'rxjs';
 import { Id } from 'src/app/domain/definitions/key-types';
 import { Identifiable } from 'src/app/domain/interfaces';
 import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings';
+import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
 import { BaseDialogService } from 'src/app/ui/base/base-dialog-service';
 
+import { ParticipantControllerService } from '../../../../../services/common/participant-controller.service';
 import { ParticipantListInfoDialogComponent } from '../components/participant-list-info-dialog/participant-list-info-dialog.component';
 
 /**
@@ -52,9 +54,11 @@ export class ParticipantListInfoDialogService extends BaseDialogService<
     Partial<InfoDialog>,
     InfoDialog
 > {
-    public async open(
-        data: Partial<InfoDialog> & Identifiable
-    ): Promise<MatDialogRef<ParticipantListInfoDialogComponent, InfoDialog>> {
+    public constructor(private controller: ParticipantControllerService) {
+        super();
+    }
+
+    public async open(data: Partial<InfoDialog> & Identifiable): Promise<any> {
         const module = await import(`../participant-list-info-dialog.module`).then(
             m => m.ParticipantListInfoDialogModule
         );
@@ -64,6 +68,25 @@ export class ParticipantListInfoDialogService extends BaseDialogService<
                 dialogRef.close(data);
             }
         });
-        return dialogRef;
+        const result = await firstValueFrom(dialogRef.afterClosed());
+        console.log(data.id, result, result.id, data);
+
+        if (result) {
+            if (data instanceof ViewUser) {
+                console.log('it is');
+                this.update(result, data);
+            } else {
+                console.log('something else');
+                this.create(result);
+            }
+        }
+    }
+
+    protected async create(payload: any): Promise<void> {
+        await this.controller.create(payload);
+    }
+
+    protected async update(payload: any, user: ViewUser): Promise<void> {
+        await this.controller.update(payload, user);
     }
 }

From 3e3d1df360409946e9d0321361a1a0d2ec2c7d5b Mon Sep 17 00:00:00 2001
From: Javier Borrego <javier.borrego@intevation.de>
Date: Mon, 4 May 2026 17:30:03 +0200
Subject: [PATCH 2/4] Permissions updated and advances in data display

---
 .../account-button.component.html             | 10 +++--
 .../account-button.component.ts               | 38 +++++++++++++++++--
 ...articipant-list-info-dialog.component.html |  2 +-
 .../participant-list-info-dialog.component.ts | 38 +++++++++++++------
 .../participant-list-info-dialog.service.ts   |  4 --
 5 files changed, 69 insertions(+), 23 deletions(-)

diff --git a/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.html b/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.html
index f4a2f85409..22b81d3140 100644
--- a/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.html
+++ b/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.html
@@ -94,10 +94,12 @@
                         }
                     }
                 </div>
-                <button mat-menu-item (click)="openDialogEditInfo(user)">
-                    <mat-icon>edit</mat-icon>
-                    <span>{{ 'Change your delegation' | translate }}</span>
-                </button>
+                @if (activeMeetingSetting) {
+                    <button mat-menu-item (click)="openDialogEditInfo(user)">
+                        <mat-icon>edit</mat-icon>
+                        <span>{{ 'Change your delegation' | translate }}</span>
+                    </button>
+                }
             }
         </div>
         <mat-divider />
diff --git a/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts b/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts
index e0c2ed20d3..4f395cb916 100644
--- a/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts
+++ b/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts
@@ -7,6 +7,7 @@ import { Observable, Subscription } from 'rxjs';
 import { Id } from 'src/app/domain/definitions/key-types';
 import { allAvailableTranslations, availableTranslations } from 'src/app/domain/definitions/languages';
 import { getOmlVerboseName } from 'src/app/domain/definitions/organization-permission';
+import { Permission } from 'src/app/domain/definitions/permission';
 import { largeDialogSettings } from 'src/app/infrastructure/utils/dialog-settings';
 import { mediumDialogSettings } from 'src/app/infrastructure/utils/dialog-settings';
 import { ParticipantListInfoDialogService } from 'src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog';
@@ -71,6 +72,7 @@ export class AccountButtonComponent extends BaseUiComponent implements OnInit {
 
     public username = ``;
     public isLoggedIn = false;
+    private _voteDelegationEnabled = false;
 
     public show1337 = -20;
 
@@ -78,6 +80,13 @@ export class AccountButtonComponent extends BaseUiComponent implements OnInit {
         return this.activeMeetingIdService.meetingId;
     }
 
+    public get activeMeetingSetting(): boolean {
+        this.meetingSettingsService
+            .get(`users_enable_vote_delegations`)
+            .subscribe(enabled => (this._voteDelegationEnabled = enabled));
+        return this._voteDelegationEnabled;
+    }
+
     private _isAllowedSelfSetPresent = false;
     private _languageTrigger: MatMenuTrigger | undefined = undefined;
     private clickCounter = 0;
@@ -89,7 +98,7 @@ export class AccountButtonComponent extends BaseUiComponent implements OnInit {
         private userRepo: UserControllerService,
         private authService: AuthService,
         private dialog: MatDialog,
-        private ParticipantListDialog: ParticipantListInfoDialogService,
+        private participantListDialog: ParticipantListInfoDialogService,
         private router: Router,
         private theme: ThemeService,
         private meetingSettingsService: MeetingSettingsService,
@@ -229,8 +238,30 @@ export class AccountButtonComponent extends BaseUiComponent implements OnInit {
         return stringForUserPresent.replace(`{}`, this.user.short_name);
     }
 
-    public async openDialogEditInfo(user: ViewUser) {
-        await this.ParticipantListDialog.open({
+    public canEditOwnDelegation(user: ViewUser): boolean {
+        if (
+            this.operator.hasPerms(Permission.userCanEditOwnDelegation) &&
+            !this.operator.hasPerms(Permission.userCanManage) &&
+            !this.operator.hasPerms(Permission.userCanUpdate)
+        ) {
+            return this.operator.operatorId === user.id;
+        } else if (
+            this.operator.hasPerms(Permission.userCanManage) ||
+            this.operator.hasPerms(Permission.userCanUpdate)
+        ) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public async openDialogEditInfo(user: ViewUser): Promise<void> {
+        console.log(
+            this.user,
+            this.user.vote_delegations_from_meeting_user_ids(),
+            this.user.vote_delegated_to_meeting_user_id()
+        );
+        await this.participantListDialog.open({
             id: user.id,
             name: user.getName(),
             number: user.number(),
@@ -238,5 +269,6 @@ export class AccountButtonComponent extends BaseUiComponent implements OnInit {
             vote_delegations_from_ids: this.user.vote_delegations_from_meeting_user_ids(),
             vote_delegated_to_id: this.user.vote_delegated_to_meeting_user_id()
         });
+        // *osPerms="permission.userCanUpdate; or: canEditOwnDelegation(user)"
     }
 }
diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html
index 99440774b8..6312addd51 100644
--- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html
+++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html
@@ -17,7 +17,7 @@ <h1 mat-dialog-title>
         <mat-label>{{ 'Voting right delegated to (proxy)' | translate }}</mat-label>
         <os-list-search-selector
             [includeNone]="true"
-            [inputListValues]="otherParticipantsObservable"
+            [inputListValues]="userList"
             [multiple]="false"
             [sortFn]="false"
             [(ngModel)]="infoDialog.vote_delegated_to_id"
diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.ts
index 434d1a3393..8558fd59ff 100644
--- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.ts
+++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.ts
@@ -1,18 +1,22 @@
-import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
+import { Component, Inject, inject, OnDestroy, OnInit } from '@angular/core';
 import { MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { Permission } from 'src/app/domain/definitions/permission';
 import { Selectable } from 'src/app/domain/interfaces/selectable';
 import { GENDERS } from 'src/app/domain/models/users/user';
+import { UserRepositoryService } from 'src/app/gateways/repositories/users';
 import { ViewGroup } from 'src/app/site/pages/meetings/pages/participants';
 import { GroupControllerService } from 'src/app/site/pages/meetings/pages/participants/modules';
 import { ParticipantControllerService } from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service';
+import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service';
 import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service';
 import { ViewMeetingUser } from 'src/app/site/pages/meetings/view-models/view-meeting-user';
 import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
+import { ModelRequestService, SubscribeToConfig } from 'src/app/site/services/model-request.service';
 import { OperatorService } from 'src/app/site/services/operator.service';
 import { BaseUiComponent } from 'src/app/ui/base/base-ui-component';
 
+import { getParticipantListSubscriptionConfig } from '../../../../../../participants.subscription';
 import { StructureLevelControllerService } from '../../../../../structure-levels/services/structure-level-controller.service';
 import { ViewStructureLevel } from '../../../../../structure-levels/view-models';
 import { ParticipantListSortService } from '../../../../services/participant-list-sort/participant-list-sort.service';
@@ -52,6 +56,9 @@ export class ParticipantListInfoDialogComponent extends BaseUiComponent implemen
     private readonly _otherParticipantsSubject = new BehaviorSubject<ViewMeetingUser[]>([]);
     private _currentUser: ViewUser | null = null;
     private _voteDelegationEnabled = false;
+    private participantSubscriptionConfig: SubscribeToConfig;
+    public userList = this.participantRepo.getViewModelListObservable();
+    private modelRequest = inject(ModelRequestService);
 
     public constructor(
         @Inject(MAT_DIALOG_DATA) public readonly infoDialog: InfoDialog,
@@ -60,25 +67,33 @@ export class ParticipantListInfoDialogComponent extends BaseUiComponent implemen
         private groupRepo: GroupControllerService,
         private structureLevelRepo: StructureLevelControllerService,
         private meetingSettings: MeetingSettingsService,
-        private operator: OperatorService
+        private activeMeetingIdService: ActiveMeetingIdService,
+        private operator: OperatorService,
+        protected userRepo: UserRepositoryService = inject(UserRepositoryService)
     ) {
         super();
     }
 
     public ngOnInit(): void {
         this.userSortService.initSorting();
+        this.participantSubscriptionConfig = getParticipantListSubscriptionConfig(
+            this.activeMeetingIdService.meetingId
+        );
+        this.modelRequest.subscribeTo({
+            ...this.participantSubscriptionConfig,
+            subscriptionName: 'participant_minimal_delegation_dialog:subscription'
+        });
+        console.log(this.userRepo);
         this._currentUser = this.participantRepo.getViewModel(this.infoDialog.id);
         this.structureLevelObservable = this.structureLevelRepo.getViewModelListObservable();
         this.subscriptions.push(
-            this.participantRepo
-                .getSortedViewModelListObservable(this.userSortService.repositorySortingKey)
-                .subscribe(participants =>
-                    this._otherParticipantsSubject.next(
-                        participants
-                            .filter(participant => participant.id !== this._currentUser.id)
-                            .map(participant => participant.getMeetingUser())
-                    )
-                ),
+            this.userList.subscribe(participants =>
+                this._otherParticipantsSubject.next(
+                    participants
+                        .filter(participant => participant.id !== this._currentUser.id)
+                        .map(participant => participant.getMeetingUser())
+                )
+            ),
             this.meetingSettings
                 .get(`users_enable_vote_delegations`)
                 .subscribe(enabled => (this._voteDelegationEnabled = enabled))
@@ -87,6 +102,7 @@ export class ParticipantListInfoDialogComponent extends BaseUiComponent implemen
 
     public override ngOnDestroy(): void {
         this.userSortService.exitSortService();
+        this.modelRequest.closeSubscription('participant_minimal_delegation_dialog:subscription');
         super.ngOnDestroy();
     }
 
diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts
index 9b6489e376..b9d291a606 100644
--- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts
+++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts
@@ -69,14 +69,10 @@ export class ParticipantListInfoDialogService extends BaseDialogService<
             }
         });
         const result = await firstValueFrom(dialogRef.afterClosed());
-        console.log(data.id, result, result.id, data);
-
         if (result) {
             if (data instanceof ViewUser) {
-                console.log('it is');
                 this.update(result, data);
             } else {
-                console.log('something else');
                 this.create(result);
             }
         }

From b0d7c97bf8ea6ca77bdd79dee7a317ff50219621 Mon Sep 17 00:00:00 2001
From: Javier Borrego <javier.borrego@intevation.de>
Date: Wed, 6 May 2026 11:44:37 +0200
Subject: [PATCH 3/4] Removed current user from selectable, update user data,
 able to remove delegation

---
 .../account-button.component.html             |  2 +-
 .../account-button.component.ts               |  7 +---
 .../participant-list.component.ts             | 11 +----
 ...articipant-list-info-dialog.component.html | 11 ++---
 .../participant-list-info-dialog.component.ts | 40 +++++++------------
 .../participant-list-info-dialog.service.ts   | 20 +++-------
 6 files changed, 30 insertions(+), 61 deletions(-)

diff --git a/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.html b/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.html
index 22b81d3140..3668d5ec33 100644
--- a/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.html
+++ b/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.html
@@ -94,7 +94,7 @@
                         }
                     }
                 </div>
-                @if (activeMeetingSetting) {
+                @if (activeMeetingSetting && canEditOwnDelegation(user)) {
                     <button mat-menu-item (click)="openDialogEditInfo(user)">
                         <mat-icon>edit</mat-icon>
                         <span>{{ 'Change your delegation' | translate }}</span>
diff --git a/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts b/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts
index 4f395cb916..cdfb321251 100644
--- a/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts
+++ b/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts
@@ -256,12 +256,8 @@ export class AccountButtonComponent extends BaseUiComponent implements OnInit {
     }
 
     public async openDialogEditInfo(user: ViewUser): Promise<void> {
-        console.log(
-            this.user,
-            this.user.vote_delegations_from_meeting_user_ids(),
-            this.user.vote_delegated_to_meeting_user_id()
-        );
         await this.participantListDialog.open({
+            user,
             id: user.id,
             name: user.getName(),
             number: user.number(),
@@ -269,6 +265,5 @@ export class AccountButtonComponent extends BaseUiComponent implements OnInit {
             vote_delegations_from_ids: this.user.vote_delegations_from_meeting_user_ids(),
             vote_delegated_to_id: this.user.vote_delegated_to_meeting_user_id()
         });
-        // *osPerms="permission.userCanUpdate; or: canEditOwnDelegation(user)"
     }
 }
diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-list/participant-list.component.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-list/participant-list.component.ts
index 4a65ed1c9c..d2e0d0a484 100644
--- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-list/participant-list.component.ts
+++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-list/participant-list.component.ts
@@ -350,8 +350,7 @@ export class ParticipantListComponent extends BaseMeetingListViewComponent<ViewU
 
     /**
      * This function opens the dialog,
-     * where the user can quick change the groups,
-     * the gender and the participant number.
+     * where the user can quick change the delegations.
      *
      * @param user is an instance of ViewUser. This is the given user, who will be modified.
      */
@@ -364,13 +363,7 @@ export class ParticipantListComponent extends BaseMeetingListViewComponent<ViewU
         }
         ev?.stopPropagation();
         const dialogRef = await this.infoDialog.open({
-            id: user.id,
-            name: user.short_name,
-            group_ids: user.group_ids(),
-            number: user.number(),
-            structure_level_ids: user.structure_level_ids(),
-            vote_delegations_from_ids: user.vote_delegations_from_meeting_user_ids(),
-            vote_delegated_to_id: user.vote_delegated_to_meeting_user_id()
+            user
         });
 
         dialogRef.afterClosed().subscribe(async result => {
diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html
index 6312addd51..4c862a60b0 100644
--- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html
+++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html
@@ -4,21 +4,22 @@ <h1 mat-dialog-title>
 <mat-dialog-content class="os-form-card-mobile">
     <mat-form-field>
         <mat-label>{{ 'Voting right received from (principals)' | translate }}</mat-label>
-        <os-list-search-selector
+        <os-repo-search-selector
             [disableOptionWhenFn]="getDisableOptionFn(infoDialog.vote_delegations_from_ids)"
-            [inputListValues]="otherParticipantsObservable"
             [multiple]="true"
+            [pipeFn]="excludeCurrentUserFn"
+            [repo]="userRepo"
             [sortFn]="false"
             [(ngModel)]="infoDialog.vote_delegations_from_ids"
         />
     </mat-form-field>
-
     <mat-form-field>
         <mat-label>{{ 'Voting right delegated to (proxy)' | translate }}</mat-label>
-        <os-list-search-selector
+        <os-repo-search-selector
             [includeNone]="true"
-            [inputListValues]="userList"
             [multiple]="false"
+            [pipeFn]="excludeCurrentUserFn"
+            [repo]="userRepo"
             [sortFn]="false"
             [(ngModel)]="infoDialog.vote_delegated_to_id"
         />
diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.ts
index 8558fd59ff..26241f021a 100644
--- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.ts
+++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.ts
@@ -1,6 +1,6 @@
-import { Component, Inject, inject, OnDestroy, OnInit } from '@angular/core';
+import { Component, Inject, inject, Input, OnDestroy, OnInit } from '@angular/core';
 import { MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { BehaviorSubject, filter, map, Observable } from 'rxjs';
 import { Permission } from 'src/app/domain/definitions/permission';
 import { Selectable } from 'src/app/domain/interfaces/selectable';
 import { GENDERS } from 'src/app/domain/models/users/user';
@@ -8,15 +8,13 @@ import { UserRepositoryService } from 'src/app/gateways/repositories/users';
 import { ViewGroup } from 'src/app/site/pages/meetings/pages/participants';
 import { GroupControllerService } from 'src/app/site/pages/meetings/pages/participants/modules';
 import { ParticipantControllerService } from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service';
-import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service';
 import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service';
+import { SettingsInput } from 'src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions';
 import { ViewMeetingUser } from 'src/app/site/pages/meetings/view-models/view-meeting-user';
 import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
-import { ModelRequestService, SubscribeToConfig } from 'src/app/site/services/model-request.service';
 import { OperatorService } from 'src/app/site/services/operator.service';
 import { BaseUiComponent } from 'src/app/ui/base/base-ui-component';
 
-import { getParticipantListSubscriptionConfig } from '../../../../../../participants.subscription';
 import { StructureLevelControllerService } from '../../../../../structure-levels/services/structure-level-controller.service';
 import { ViewStructureLevel } from '../../../../../structure-levels/view-models';
 import { ParticipantListSortService } from '../../../../services/participant-list-sort/participant-list-sort.service';
@@ -56,9 +54,10 @@ export class ParticipantListInfoDialogComponent extends BaseUiComponent implemen
     private readonly _otherParticipantsSubject = new BehaviorSubject<ViewMeetingUser[]>([]);
     private _currentUser: ViewUser | null = null;
     private _voteDelegationEnabled = false;
-    private participantSubscriptionConfig: SubscribeToConfig;
     public userList = this.participantRepo.getViewModelListObservable();
-    private modelRequest = inject(ModelRequestService);
+
+    @Input()
+    protected setting: SettingsInput;
 
     public constructor(
         @Inject(MAT_DIALOG_DATA) public readonly infoDialog: InfoDialog,
@@ -67,7 +66,6 @@ export class ParticipantListInfoDialogComponent extends BaseUiComponent implemen
         private groupRepo: GroupControllerService,
         private structureLevelRepo: StructureLevelControllerService,
         private meetingSettings: MeetingSettingsService,
-        private activeMeetingIdService: ActiveMeetingIdService,
         private operator: OperatorService,
         protected userRepo: UserRepositoryService = inject(UserRepositoryService)
     ) {
@@ -76,33 +74,22 @@ export class ParticipantListInfoDialogComponent extends BaseUiComponent implemen
 
     public ngOnInit(): void {
         this.userSortService.initSorting();
-        this.participantSubscriptionConfig = getParticipantListSubscriptionConfig(
-            this.activeMeetingIdService.meetingId
-        );
-        this.modelRequest.subscribeTo({
-            ...this.participantSubscriptionConfig,
-            subscriptionName: 'participant_minimal_delegation_dialog:subscription'
-        });
-        console.log(this.userRepo);
         this._currentUser = this.participantRepo.getViewModel(this.infoDialog.id);
-        this.structureLevelObservable = this.structureLevelRepo.getViewModelListObservable();
         this.subscriptions.push(
-            this.userList.subscribe(participants =>
-                this._otherParticipantsSubject.next(
-                    participants
-                        .filter(participant => participant.id !== this._currentUser.id)
-                        .map(participant => participant.getMeetingUser())
-                )
-            ),
+            this.userRepo
+                .getGeneralViewModelObservable()
+                .pipe(filter((participant: ViewUser) => participant.id !== this._currentUser.id))
+                .subscribe((participant: ViewUser) => participant.getMeetingUser()),
             this.meetingSettings
                 .get(`users_enable_vote_delegations`)
                 .subscribe(enabled => (this._voteDelegationEnabled = enabled))
         );
+
+        this.structureLevelObservable = this.structureLevelRepo.getViewModelListObservable();
     }
 
     public override ngOnDestroy(): void {
         this.userSortService.exitSortService();
-        this.modelRequest.closeSubscription('participant_minimal_delegation_dialog:subscription');
         super.ngOnDestroy();
     }
 
@@ -115,4 +102,7 @@ export class ParticipantListInfoDialogComponent extends BaseUiComponent implemen
             return _ => false;
         }
     }
+
+    public excludeCurrentUserFn: any = observable$ =>
+        observable$.pipe(map((users: ViewUser[]) => users.filter(user => user.id !== this._currentUser?.id)));
 }
diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts
index b9d291a606..ccd5e57b08 100644
--- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts
+++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import { firstValueFrom } from 'rxjs';
 import { Id } from 'src/app/domain/definitions/key-types';
-import { Identifiable } from 'src/app/domain/interfaces';
 import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings';
 import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
 import { BaseDialogService } from 'src/app/ui/base/base-dialog-service';
@@ -58,7 +57,7 @@ export class ParticipantListInfoDialogService extends BaseDialogService<
         super();
     }
 
-    public async open(data: Partial<InfoDialog> & Identifiable): Promise<any> {
+    public async open(data: Partial<InfoDialog> & { user: ViewUser }): Promise<any> {
         const module = await import(`../participant-list-info-dialog.module`).then(
             m => m.ParticipantListInfoDialogModule
         );
@@ -69,20 +68,11 @@ export class ParticipantListInfoDialogService extends BaseDialogService<
             }
         });
         const result = await firstValueFrom(dialogRef.afterClosed());
-        if (result) {
-            if (data instanceof ViewUser) {
-                this.update(result, data);
-            } else {
-                this.create(result);
-            }
-        }
-    }
-
-    protected async create(payload: any): Promise<void> {
-        await this.controller.create(payload);
+        result.vote_delegated_to_id = result.vote_delegated_to_id === 0 ? null : result.vote_delegated_to_id;
+        this.update(result, data.user);
     }
 
-    protected async update(payload: any, user: ViewUser): Promise<void> {
-        await this.controller.update(payload, user);
+    protected async update(payload: any, user: ViewUser | undefined): Promise<void> {
+        await this.controller.update(payload, user).resolve();
     }
 }

From ca26d291cbecc94aebe59003d4bcf79123824fc4 Mon Sep 17 00:00:00 2001
From: Javier Borrego <javier.borrego@intevation.de>
Date: Wed, 6 May 2026 14:16:00 +0200
Subject: [PATCH 4/4] Added helptext

---
 .../participant-list-info-dialog.component.html    |  6 +++++-
 .../participant-list-info-dialog.component.scss    |  3 +++
 .../participant-list-info-dialog.component.ts      | 14 +++++++++++---
 .../participant-list-info-dialog.service.ts        |  2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html
index 4c862a60b0..c0da6daf5a 100644
--- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html
+++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html
@@ -12,8 +12,11 @@ <h1 mat-dialog-title>
             [sortFn]="false"
             [(ngModel)]="infoDialog.vote_delegations_from_ids"
         />
+        @if (setting?.helpText) {
+            <mat-hint>{{ setting.helpText | translate }}</mat-hint>
+        }
     </mat-form-field>
-    <mat-form-field>
+    <mat-form-field class="margin">
         <mat-label>{{ 'Voting right delegated to (proxy)' | translate }}</mat-label>
         <os-repo-search-selector
             [includeNone]="true"
@@ -21,6 +24,7 @@ <h1 mat-dialog-title>
             [pipeFn]="excludeCurrentUserFn"
             [repo]="userRepo"
             [sortFn]="false"
+            [subscriptionConfig]="participantSubscriptionConfig"
             [(ngModel)]="infoDialog.vote_delegated_to_id"
         />
     </mat-form-field>
diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.scss b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.scss
index e69de29bb2..ee9b442f55 100644
--- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.scss
+++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.scss
@@ -0,0 +1,3 @@
+.margin {
+    margin-top: 12px;
+}
diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.ts
index 26241f021a..076f840e7e 100644
--- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.ts
+++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.ts
@@ -1,13 +1,15 @@
-import { Component, Inject, inject, Input, OnDestroy, OnInit } from '@angular/core';
+import { Component, Inject, inject, OnDestroy, OnInit } from '@angular/core';
 import { MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { BehaviorSubject, filter, map, Observable } from 'rxjs';
 import { Permission } from 'src/app/domain/definitions/permission';
 import { Selectable } from 'src/app/domain/interfaces/selectable';
+import { SubscriptionConfig } from 'src/app/domain/interfaces/subscription-config';
 import { GENDERS } from 'src/app/domain/models/users/user';
 import { UserRepositoryService } from 'src/app/gateways/repositories/users';
 import { ViewGroup } from 'src/app/site/pages/meetings/pages/participants';
 import { GroupControllerService } from 'src/app/site/pages/meetings/pages/participants/modules';
 import { ParticipantControllerService } from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service';
+import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service';
 import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service';
 import { SettingsInput } from 'src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions';
 import { ViewMeetingUser } from 'src/app/site/pages/meetings/view-models/view-meeting-user';
@@ -15,6 +17,7 @@ import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
 import { OperatorService } from 'src/app/site/services/operator.service';
 import { BaseUiComponent } from 'src/app/ui/base/base-ui-component';
 
+import { getParticipantListSubscriptionConfig } from '../../../../../../participants.subscription';
 import { StructureLevelControllerService } from '../../../../../structure-levels/services/structure-level-controller.service';
 import { ViewStructureLevel } from '../../../../../structure-levels/view-models';
 import { ParticipantListSortService } from '../../../../services/participant-list-sort/participant-list-sort.service';
@@ -55,9 +58,9 @@ export class ParticipantListInfoDialogComponent extends BaseUiComponent implemen
     private _currentUser: ViewUser | null = null;
     private _voteDelegationEnabled = false;
     public userList = this.participantRepo.getViewModelListObservable();
+    protected participantSubscriptionConfig: SubscriptionConfig<any>;
 
-    @Input()
-    protected setting: SettingsInput;
+    protected setting: SettingsInput = {} as SettingsInput;
 
     public constructor(
         @Inject(MAT_DIALOG_DATA) public readonly infoDialog: InfoDialog,
@@ -65,6 +68,7 @@ export class ParticipantListInfoDialogComponent extends BaseUiComponent implemen
         private userSortService: ParticipantListSortService,
         private groupRepo: GroupControllerService,
         private structureLevelRepo: StructureLevelControllerService,
+        private activeMeetingIdService: ActiveMeetingIdService,
         private meetingSettings: MeetingSettingsService,
         private operator: OperatorService,
         protected userRepo: UserRepositoryService = inject(UserRepositoryService)
@@ -74,6 +78,10 @@ export class ParticipantListInfoDialogComponent extends BaseUiComponent implemen
 
     public ngOnInit(): void {
         this.userSortService.initSorting();
+        this.participantSubscriptionConfig = getParticipantListSubscriptionConfig(
+            this.activeMeetingIdService.meetingId
+        );
+        this.setting.helpText = 'You can only delete delegations you have received';
         this._currentUser = this.participantRepo.getViewModel(this.infoDialog.id);
         this.subscriptions.push(
             this.userRepo
diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts
index ccd5e57b08..d601c92665 100644
--- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts
+++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts
@@ -72,7 +72,7 @@ export class ParticipantListInfoDialogService extends BaseDialogService<
         this.update(result, data.user);
     }
 
-    protected async update(payload: any, user: ViewUser | undefined): Promise<void> {
+    protected async update(payload: any, user: ViewUser): Promise<void> {
         await this.controller.update(payload, user).resolve();
     }
 }