diff --git a/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.html b/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.html index e8b0b12b0b0e60d3bb7b51f76b5e43b8e6e6a94d..01464d2cf764e1e60952a26f2f890bc0fcdb1c14 100755 --- a/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.html +++ b/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.html @@ -10,7 +10,7 @@ <b *ngIf="data.resIds.length == 1" color="primary" class="highlight">{{data.resource.chrono}}</b> <b *ngIf="data.resIds.length > 1" color="primary" class="highlight">{{data.resIds.length}} {{lang.elements}}</b> ? - <div *ngIf="arMode !== 'manual' && arMode !== 'auto'"> + <div *ngIf="arMode !== 'manual' && arMode !== 'auto' && realResSelected.length > 0"> <mat-slide-toggle [(ngModel)]="manualAR" color="primary" (change)="toggleArManual($event.checked)"> {{lang.editAcknowledgementReceipt}}</mat-slide-toggle> </div> diff --git a/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.ts b/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.ts index d71abb104154b9f38b59a127b3a3003bba0ebfd7..e2e2c3766643bb5a3d9ce3ab76eec71141a8da9f 100644 --- a/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.ts +++ b/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.ts @@ -37,6 +37,8 @@ export class CreateAcknowledgementReceiptActionComponent implements OnInit, OnDe sendList: [] }; + realResSelected: number[]= []; + manualAR: boolean = false; arMode: 'auto' | 'manual' | 'both' = 'auto'; @@ -55,6 +57,7 @@ export class CreateAcknowledgementReceiptActionComponent implements OnInit, OnDe this.http.post('../../rest/resourcesList/users/' + this.data.userId + '/groups/' + this.data.groupId + '/baskets/' + this.data.basketId + '/actions/' + this.data.action.id + '/checkAcknowledgementReceipt', { resources: this.data.resIds }) .subscribe((data: any) => { this.acknowledgement = data; + this.realResSelected = data.sendList; this.loadingInit = false; this.arMode = data.mode; this.arModeInit(this.arMode); @@ -67,10 +70,7 @@ export class CreateAcknowledgementReceiptActionComponent implements OnInit, OnDe arModeInit(mode : string) { if (mode === 'manual') { - this.manualAR = true; - setTimeout(() => { - this.initMce(); - }, 0); + this.toggleArManual(true); } } @@ -93,7 +93,7 @@ export class CreateAcknowledgementReceiptActionComponent implements OnInit, OnDe content : tinymce.get('emailSignature').getContent() } } - this.http.put(this.data.processActionRoute, { resources: this.data.resIds, note: this.noteEditor.getNote(), data }).pipe( + this.http.put(this.data.processActionRoute, { resources: this.realResSelected, note: this.noteEditor.getNote(), data }).pipe( tap((data: any) => { if (data && data.data != null) { this.downloadAcknowledgementReceipt(data.data); @@ -102,7 +102,7 @@ export class CreateAcknowledgementReceiptActionComponent implements OnInit, OnDe this.notify.error(data.errors); console.log(data.errors); } - this.dialogRef.close(this.data.resIds); + this.dialogRef.close(this.realResSelected); }), finalize(() => this.loading = false), catchError((err: any) => { @@ -147,9 +147,11 @@ export class CreateAcknowledgementReceiptActionComponent implements OnInit, OnDe toggleArManual(state: boolean) { if (state) { this.manualAR = true; - - this.emailsubject = this.data.resource.subject; - this.emailsubject = this.emailsubject.substring(0, 100) + if (this.data.resIds.length === 1) { + this.emailsubject = this.data.resource.subject; + this.emailsubject = this.emailsubject.substring(0, 100); + } + this.initEmailModelsList(); this.initSignEmailModelsList(); setTimeout(() => {