Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'VM/DM-527' into 'master'

Browse Source 
DM-527 - Save Button does not save new member in Edit Dossier

Closes DM-527

See merge request redactmanager/red-ui!164
This commit is contained in:
Dan Percic 2023-10-26 10:11:17 +02:00
commit 2bb7461e5b
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html
View File

@ -14,7 +14,7 @@
<ng-container *ngIf="selectedApprovers.length"> <ng-container *ngIf="selectedApprovers.length">
<div class="all-caps-label mt-16" id="approversLabel" translate="assign-dossier-owner.dialog.approvers"></div> <div class="all-caps-label mt-16" id="approversLabel" translate="assign-dossier-owner.dialog.approvers"></div>
<redaction-team-members <redaction-team-members
(remove)="toggleSelected($event)" (remove)="!isDocumine ? toggleSelected($event) : toggleDocumineMembers($event)"
[canAdd]="false" [canAdd]="false"
[canRemove]="hasOwner && !disabled" [canRemove]="hasOwner && !disabled"
[dossierId]="dossier.id" [dossierId]="dossier.id"
@ -56,7 +56,7 @@
<div class="members-list"> <div class="members-list">
<div <div
(click)="!disabled && (!isDocumine ? toggleSelected(userId) : toggleApprover(userId))" (click)="!disabled && (!isDocumine ? toggleSelected(userId) : toggleDocumineMembers(userId))"
*ngFor="let userId of membersSelectOptions; let index = index" *ngFor="let userId of membersSelectOptions; let index = index"
[class.disabled]="disabled" [class.disabled]="disabled"
[class.selected]="!isDocumine ? isMemberSelected(userId) : isApprover(userId)" [class.selected]="!isDocumine ? isMemberSelected(userId) : isApprover(userId)"

11
apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts
View File

@ -117,6 +117,11 @@ export class EditDossierTeamComponent implements EditDossierSectionInterface, On
this.#updateLists(); this.#updateLists();
} }
toggleDocumineMembers(userId: string) {
this.toggleApprover(userId);
this.form.controls.members.patchValue(this.form.value.approvers);
}
ngOnChanges(changes: SimpleChanges): void { ngOnChanges(changes: SimpleChanges): void {
if (changes.dossier.isFirstChange()) { if (changes.dossier.isFirstChange()) {
setTimeout(() => this.#resetForm()); setTimeout(() => this.#resetForm());
@ -140,7 +145,11 @@ export class EditDossierTeamComponent implements EditDossierSectionInterface, On
onChangeOwner(ownerId: string) { onChangeOwner(ownerId: string) {
if (this.hasOwner) { if (this.hasOwner) {
if (!this.isApprover(ownerId)) { if (!this.isApprover(ownerId)) {
this.toggleApprover(ownerId); if (!this.isDocumine) {
this.toggleApprover(ownerId);
} else {
this.toggleDocumineMembers(ownerId);
}
} }
// If it is an approver, it is already a member, no need to check // If it is an approver, it is already a member, no need to check
this.#updateLists(); this.#updateLists();