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 bd040ace6a296393ebe7226727e3bbe660f243f5..3fc97e1cfa976a7a9413fae96c9c2f7002932880 100644 --- 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 @@ -5,7 +5,7 @@ </div> <div class="row"> <div class="col-md-12"> - <p *ngIf="acknowledgement.sendEmail || acknowledgement.sendPaper">{{lang.makeActionOn}} + <p *ngIf="acknowledgement.sendEmail.number || acknowledgement.sendPaper.number">{{lang.makeActionOn}} <b *ngIf="data.contextMode" color="primary" class="highlight">{{data.contextChrono}}</b> <b *ngIf="!data.contextMode" color="primary" class="highlight">{{data.selectedRes.length}} {{lang.elements}}</b> ?</p> @@ -44,24 +44,24 @@ </div> </div> - <div *ngIf="acknowledgement.sendEmail || acknowledgement.sendPaper" class="alert-message alert-message-success acknowledgementList" role="alert" style="padding: 10px;"> - <div *ngIf="acknowledgement.sendEmail"> - <b>{{acknowledgement.sendEmail}}</b> + <div *ngIf="acknowledgement.sendEmail.number || acknowledgement.sendPaper.number" class="alert-message alert-message-success acknowledgementList" role="alert" style="padding: 10px;"> + <div *ngIf="acknowledgement.sendEmail.number"> + <b>{{acknowledgement.sendEmail.number}}</b> {{lang.readyToSendElectronicAr}} </div> - <div *ngIf="acknowledgement.sendPaper"> - <b>{{acknowledgement.sendPaper}}</b> + <div *ngIf="acknowledgement.sendPaper.number"> + <b>{{acknowledgement.sendPaper.number}}</b> {{lang.readyToGeneratePaperAr}} </div> </div> </div> - <div class="col-md-12" *ngIf="acknowledgement.sendEmail || acknowledgement.sendPaper"> + <div class="col-md-12" *ngIf="acknowledgement.sendEmail.number || acknowledgement.sendPaper.number"> <app-note-editor #noteEditor [resIds]="data.selectedRes"></app-note-editor> </div> </div> </div> <div mat-dialog-actions class="actions"> - <button mat-raised-button mat-button color="primary" [disabled]="loading || (!acknowledgement.sendEmail && !acknowledgement.sendPaper)" + <button mat-raised-button mat-button color="primary" [disabled]="loading || (!acknowledgement.sendEmail.number && !acknowledgement.sendPaper.number)" (click)="onSubmit()">{{lang.validate}}</button> <button mat-raised-button mat-button [disabled]="loading" [mat-dialog-close]="">{{lang.cancel}}</button> </div> \ No newline at end of file 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 1032f584c26d5e1a5f57be54d2129f44ea2059bb..a9d3126023720a6ac6d7ebbeb460a7cc6dcbce20 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 @@ -19,8 +19,8 @@ export class CreateAcknowledgementReceiptActionComponent implements OnInit { alReadyGenerated : {}, alReadySend : {}, noSendAR : {}, - sendEmail : 0, - sendPaper : 0 + sendEmail : {list: [], number: 0}, + sendPaper : {list: [], number: 0} }; @ViewChild('noteEditor') noteEditor: NoteEditorComponent; @@ -42,7 +42,9 @@ export class CreateAcknowledgementReceiptActionComponent implements OnInit { onSubmit(): void { this.loading = true; - this.http.put('../../rest/resourcesList/users/' + this.data.currentBasketInfo.ownerId + '/groups/' + this.data.currentBasketInfo.groupId + '/baskets/' + this.data.currentBasketInfo.basketId + '/actions/' + this.data.action.id, {resources : this.data.selectedRes, note : this.noteEditor.getNoteContent()}) + let sendElements: any; + sendElements = this.acknowledgement.sendEmail.list.concat(this.acknowledgement.sendPaper.list); + this.http.put('../../rest/resourcesList/users/' + this.data.currentBasketInfo.ownerId + '/groups/' + this.data.currentBasketInfo.groupId + '/baskets/' + this.data.currentBasketInfo.basketId + '/actions/' + this.data.action.id, {resources : sendElements, note : this.noteEditor.getNoteContent()}) .subscribe((data: any) => { if(data.data != null){ this.downloadAcknowledgementReceipt(data.data);