From 027e3e252f450b34b3ae9721419591b1c45f745a Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 3 Sep 2020 16:12:17 +0200
Subject: [PATCH] FIX #13998 TIME 0:15 fix id issuing site input
---
.../controllers/RegisteredMailController.php | 2 +-
.../save-registered-mail-action.component.ts | 27 ++++++++++---------
.../indexing/issuing-site-input.component.ts | 6 ++---
3 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/src/app/registeredMail/controllers/RegisteredMailController.php b/src/app/registeredMail/controllers/RegisteredMailController.php
index 6e1d9688e5b..91c1caa1896 100644
--- a/src/app/registeredMail/controllers/RegisteredMailController.php
+++ b/src/app/registeredMail/controllers/RegisteredMailController.php
@@ -889,7 +889,7 @@ class RegisteredMailController
if (!empty($registeredMail)) {
$registeredMail['recipient'] = json_decode($registeredMail['recipient'], true);
$registeredMail['number'] = RegisteredMailController::getRegisteredMailNumber(['type' => $registeredMail['type'], 'rawNumber' => $registeredMail['number']]);
- $registeredMail['issuingSite'] = 'issuingSite#'.$registeredMail['issuing_site'];
+ $registeredMail['issuingSite'] = $registeredMail['issuing_site'];
unset($registeredMail['issuing_site']);
}
diff --git a/src/frontend/app/actions/save-registered-mail-action/save-registered-mail-action.component.ts b/src/frontend/app/actions/save-registered-mail-action/save-registered-mail-action.component.ts
index 8965f11a7a0..ffd984e50c4 100644
--- a/src/frontend/app/actions/save-registered-mail-action/save-registered-mail-action.component.ts
+++ b/src/frontend/app/actions/save-registered-mail-action/save-registered-mail-action.component.ts
@@ -8,12 +8,12 @@ import { tap, exhaustMap, catchError, finalize } from 'rxjs/operators';
import { of } from 'rxjs';
@Component({
- templateUrl: "save-registered-mail-action.component.html",
+ templateUrl: 'save-registered-mail-action.component.html',
styleUrls: ['save-registered-mail-action.component.scss'],
})
export class SaveRegisteredMailActionComponent implements OnInit {
-
+
loading: boolean = false;
@ViewChild('noteEditor', { static: true }) noteEditor: NoteEditorComponent;
@@ -42,17 +42,18 @@ export class SaveRegisteredMailActionComponent implements OnInit {
tap((data: any) => {
this.data.resIds = [data.resId];
}),
- exhaustMap(() => this.http.put(this.data.indexActionRoute, { resource: this.data.resIds[0], note: this.noteEditor.getNote(),
- data: {
- type: this.data.resource.registeredMail_type,
- warranty: this.data.resource.registeredMail_warranty,
- issuingSiteId: this.data.resource.registeredMail_issuingSite.split('#').slice(-1)[0],
- letter: this.data.resource.registeredMail_letter,
- recipient: this.data.resource.registeredMail_recipient,
- reference: this.data.resource.registeredMail_reference,
- generated: false
- }
- })
+ exhaustMap(() => this.http.put(this.data.indexActionRoute, {
+ resource: this.data.resIds[0], note: this.noteEditor.getNote(),
+ data: {
+ type: this.data.resource.registeredMail_type,
+ warranty: this.data.resource.registeredMail_warranty,
+ issuingSiteId: this.data.resource.registeredMail_issuingSite,
+ letter: this.data.resource.registeredMail_letter,
+ recipient: this.data.resource.registeredMail_recipient,
+ reference: this.data.resource.registeredMail_reference,
+ generated: false
+ }
+ })
),
tap(() => {
this.dialogRef.close(this.data.resIds);
diff --git a/src/frontend/app/administration/registered-mail/issuing-site/indexing/issuing-site-input.component.ts b/src/frontend/app/administration/registered-mail/issuing-site/indexing/issuing-site-input.component.ts
index 9fdbca33f41..276e031981d 100644
--- a/src/frontend/app/administration/registered-mail/issuing-site/indexing/issuing-site-input.component.ts
+++ b/src/frontend/app/administration/registered-mail/issuing-site/indexing/issuing-site-input.component.ts
@@ -62,7 +62,7 @@ export class IssuingSiteInputComponent implements OnInit {
this.issuingSiteList = data['ranges'].filter((item: any) => item.registeredMailType === registeredMailType && item.status === 'OK' && item.entities.indexOf(this.headerService.user.entities[0].id) > -1).map((item: any) => {
return {
...item,
- id : `issuingSite#${item.siteId}`,
+ id : item.siteId,
label: `${item.label} (${item.customerAccountNumber})`,
disabled: item.fullness === 100,
};
@@ -77,9 +77,7 @@ export class IssuingSiteInputComponent implements OnInit {
}
setAddress(id: any) {
- const siteId = id.split('#').slice(-1)[0];
-
- this.http.get(`../rest/registeredMail/sites/${siteId}`).pipe(
+ this.http.get(`../rest/registeredMail/sites/${id}`).pipe(
tap((data: any) => {
this.issuingSiteAddress = data['site'];
}),
--
GitLab