From 3ba26bee3397d65c83bc247ca96451e37843d19e Mon Sep 17 00:00:00 2001
From: "kham.vilaythong" <kham.vilaythong@gmail.com>
Date: Sat, 28 Mar 2026 16:54:41 +1100
Subject: [PATCH] fixed photo is not save the correct if new person and partner
 also the change name

---
 UI/src/app/attachphoto/add.photo.html |  2 +-
 UI/src/app/attachphoto/add.photo.ts   | 11 +++++++++--
 UI/src/app/person/person.edit.ts      |  5 +++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/UI/src/app/attachphoto/add.photo.html b/UI/src/app/attachphoto/add.photo.html
index 8e34464..867802f 100644
--- a/UI/src/app/attachphoto/add.photo.html
+++ b/UI/src/app/attachphoto/add.photo.html
@@ -10,7 +10,7 @@
                <div class="flex items-end justify-end mt-4">
                 @if (files)
                 {
-                <button pButton pRipple type="button" icon="pi pi-upload" label="Add Photo" class="p-button-sm mr-2"
+                <button pButton pRipple type="button" icon="pi pi-upload" label="Save" class="p-button-sm mr-2"
                     (click)="upload($event)"></button>
                 }
             <button pButton pRipple type="button" icon="pi pi-times" label="Cancel" class="p-button-sm"
diff --git a/UI/src/app/attachphoto/add.photo.ts b/UI/src/app/attachphoto/add.photo.ts
index c0ebe09..519b50c 100644
--- a/UI/src/app/attachphoto/add.photo.ts
+++ b/UI/src/app/attachphoto/add.photo.ts
@@ -67,9 +67,9 @@ export class AddPhoto implements OnInit, OnDestroy {
       });
     }
     else {
-      //new cleaner
+      //new photo
       const ward:LookupEdit = {
-        id: -1, description: '', codeId: maxcodeId, type: this.selType, active: true,
+        id, description: '', codeId: maxcodeId, type: this.selType, active: true,
        
       };
       this.assignValue(ward);
@@ -157,7 +157,14 @@ export class AddPhoto implements OnInit, OnDestroy {
   }
 upload(e: Event): void {
   e.preventDefault();
+  if (this.files.length > 0)
+  {
     this.ref.close(this.files);
+  }
+  else
+  {
+    this.messageService.add({severity: 'error', summary: 'No File to upload file', detail: 'select file first then upload file'});
+  }
 }
 
   cancel(e: Event): void {
diff --git a/UI/src/app/person/person.edit.ts b/UI/src/app/person/person.edit.ts
index ec9d4f2..13b71eb 100644
--- a/UI/src/app/person/person.edit.ts
+++ b/UI/src/app/person/person.edit.ts
@@ -493,6 +493,7 @@ assignValue(item:Person): void {
 							if (x.statusCode >= 1)
 							{
 								item.id = x.data;
+								this._id = item.id;
 							//	this.messageService.add({severity:'success', summary: 'Save user', detail: item.firstName + " " + item.lastName });
 								//this.router.navigate([this.returnUrl]);
 								console.log("the person after save", item);
@@ -715,7 +716,7 @@ getPhotoListforSave(): PersonPhotoDto[] {
 	let result: PersonPhotoDto[] =[];
 	for (let i = 0; i < this.photoList.length; i++)
 	{
-		if (this.photoList[i].id < 0)	
+		if (this.photoList[i].id < 1)	
 		{
 			result.push(this.photoList[i]);
 		}
@@ -732,7 +733,7 @@ savePhotoList(list: PersonPhotoDto[], item:Person): void {
 			if (file)
 				formData.append("files", file, file.name);
 		}
-		formData.append('personId', this._id.toString());
+		formData.append('personId', item.id.toString());
 
 		const personPhoto$ = this.personService.savePersonPhotoList(formData);
 		this.subscription.add(personPhoto$.subscribe(