From aa11fc06f7cd22a565e03287702a4f74a96f36e1 Mon Sep 17 00:00:00 2001 From: Alex ORLUC <alex.orluc@maarch.org> Date: Thu, 15 Oct 2020 14:49:33 +0200 Subject: [PATCH] FEAT #15049 TIME 1:30 add linked resources + folders --- .../send-to-record-management.component.html | 22 ++++++++++++++++++- .../send-to-record-management.component.ts | 8 +++++++ src/lang/lang-fr.json | 3 ++- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/frontend/app/actions/send-to-record-management-action/send-to-record-management.component.html b/src/frontend/app/actions/send-to-record-management-action/send-to-record-management.component.html index 8f3f1f42f9d..94a67f8dc4b 100644 --- a/src/frontend/app/actions/send-to-record-management-action/send-to-record-management.component.html +++ b/src/frontend/app/actions/send-to-record-management-action/send-to-record-management.component.html @@ -84,7 +84,27 @@ </mat-form-field> </div> </div> - <div class="row"> + <mat-form-field *ngIf="folders.length > 0"> + <mat-label>{{'lang.folder' | translate}}</mat-label> + <mat-select formControlName="folder"> + <mat-option *ngFor="let folder of folders" [value]="folder.id"> + {{folder.label}} + </mat-option> + </mat-select> + </mat-form-field> + <mat-expansion-panel *ngIf="linkedResources.length > 0"> + <mat-expansion-panel-header> + <mat-panel-title color="primary" style="font-size:14px;"> + {{'lang.linkedMails' | translate}} + </mat-panel-title> + </mat-expansion-panel-header> + <mat-list style="max-height: 350px;overflow: auto;"> + <mat-list-item *ngFor="let res of linkedResources"> + <span style="font-size: 12px;color:#666">{{res.chrono}}</span> - <span + color="primary" style="font-size: 12px;">{{res.object}}</span></mat-list-item> + </mat-list> + </mat-expansion-panel> + <div class="row" style="padding-top: 10px;"> <div class="col-md-6"> <mat-form-field appearance="outline"> <mat-label>{{'lang.archiveId' | translate}}</mat-label> diff --git a/src/frontend/app/actions/send-to-record-management-action/send-to-record-management.component.ts b/src/frontend/app/actions/send-to-record-management-action/send-to-record-management.component.ts index 00ea4fbd578..f2cc941a53c 100644 --- a/src/frontend/app/actions/send-to-record-management-action/send-to-record-management.component.ts +++ b/src/frontend/app/actions/send-to-record-management-action/send-to-record-management.component.ts @@ -67,6 +67,8 @@ export class SendToRecordManagementComponent implements OnInit { actionFormGroup: FormGroup; archives: any[] = []; + folders: any = []; + linkedResources: any = []; constructor( public translate: TranslateService, @@ -78,6 +80,7 @@ export class SendToRecordManagementComponent implements OnInit { public functions: FunctionsService ) { this.actionFormGroup = this._formBuilder.group({ + folder : [''], packageName: ['', Validators.required], slipId: [{value: '', disabled: true}, Validators.required], slipDate: [new Date(), Validators.required], @@ -110,9 +113,14 @@ export class SendToRecordManagementComponent implements OnInit { this.archives.forEach((element: any) => { element.type = this.translate.instant('lang.' + element.type); }); + + this.linkedResources = data.additionalData.linkedResources; + this.folders = data.additionalData.folders; + this.recipientArchiveEntities = data.recipientArchiveEntities; this.archivalAgreements = data.archivalAgreements; this.actionFormGroup = this._formBuilder.group({ + folder : [this.folders.length > 0 ? this.folders[0].id : null], packageName: ['', Validators.required], slipId: [{value: data.data.slipInfo.slipId, disabled: true}, Validators.required], slipDate: [new Date(), Validators.required], diff --git a/src/lang/lang-fr.json b/src/lang/lang-fr.json index c56548bb304..dcedddbd4a5 100644 --- a/src/lang/lang-fr.json +++ b/src/lang/lang-fr.json @@ -2088,5 +2088,6 @@ "onlySingleResourceAllowed": "Seule une ressource peut être traité par cette action", "showTechnicalInfo": "Afficher les informations techniques", "filename": "Nom de fichier", - "size": "Taille" + "size": "Taille", + "linkedMails": "Courrier(s) lié(s)" } -- GitLab