diff --git a/src/frontend/app/administration/shipping/shipping-administration.component.ts b/src/frontend/app/administration/shipping/shipping-administration.component.ts index 8dc2fbf87ca4970f5d56507c7f7cc9e3c33f00b9..6d3c7cc676f91c5492dc29b5e2e3d3bf9da50b1a 100644 --- a/src/frontend/app/administration/shipping/shipping-administration.component.ts +++ b/src/frontend/app/administration/shipping/shipping-administration.component.ts @@ -10,8 +10,6 @@ import { catchError, tap } from 'rxjs/operators'; import { of } from 'rxjs'; import { MaarchFlatTreeComponent } from '../../../plugins/tree/maarch-flat-tree.component'; -declare var $: any; - @Component({ templateUrl: 'shipping-administration.component.html', styleUrls: ['shipping-administration.component.scss'] @@ -21,8 +19,6 @@ export class ShippingAdministrationComponent implements OnInit { @ViewChild('snav2', { static: true }) public sidenavRight: MatSidenav; @ViewChild('maarchTree', { static: true }) maarchTree: MaarchFlatTreeComponent; - - loading: boolean = false; creationMode: boolean = true; @@ -56,10 +52,9 @@ export class ShippingAdministrationComponent implements OnInit { ]; sendModes: string[] = [ + 'digital_registered_mail', 'fast', 'economic' - // 'registered_mail', - // 'registered_mail_ar' ]; hidePassword: boolean = true; diff --git a/src/frontend/app/sentResource/sent-resource-list.component.ts b/src/frontend/app/sentResource/sent-resource-list.component.ts index 424ca6c75c3a22596bb623b176d900e6ee8f91bb..94b2b23fb429a2932c7fa8123c343abbca3a1ed6 100644 --- a/src/frontend/app/sentResource/sent-resource-list.component.ts +++ b/src/frontend/app/sentResource/sent-resource-list.component.ts @@ -206,12 +206,12 @@ export class SentResourceListComponent implements OnInit { return { id: item.id, sender: item.userLabel, - recipients: item.recipients.map((item: any) => item.contactLabel), + recipients: item.recipients.map((recip: any) => recip.contactLabel), creationDate: item.creationDate, sendDate: item.creationDate, type: 'shipping', typeColor: '#9440D5', - desc: this.translate.instant('lang.shipping'), + desc: this.functions.empty(item.chrono) ? this.translate.instant('lang.shipping') : `[${item.chrono}] ` + this.translate.instant('lang.shipping'), status: 'SENT', hasAttach: item.creationDate === 'attachment', hasNote: false, diff --git a/src/lang/lang-fr.json b/src/lang/lang-fr.json index 7f51c4401c4c552a68e1b916121669c2886dd834..b9004a791755d60eb571c69395d566ca9fdcde19 100644 --- a/src/lang/lang-fr.json +++ b/src/lang/lang-fr.json @@ -2209,5 +2209,6 @@ "signature": "signature", "addDateBlock": "Ajouter le bloc date", "addSignaturePosition": "Ajouter la position de signature", - "basketsToRedirect": "Bannettes à rediriger" + "basketsToRedirect": "Bannettes à rediriger", + "maileva_digital_registered_mail": "Lettre recommandée en ligne" }