From b9b4d98500ecd19c1cab3acec5238f4b1fa7674a Mon Sep 17 00:00:00 2001
From: Chaitrali R <chaitrali_r@tekditechnologies.com>
Date: Wed, 12 Jul 2023 14:56:22 +0530
Subject: [PATCH] Abha changes

---
 .../forms/types/verify-identity-no.type.html  | 54 ++++++++++---------
 .../forms/types/verify-identity-no.type.ts    | 14 +++--
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/donor-registry/src/app/forms/types/verify-identity-no.type.html b/donor-registry/src/app/forms/types/verify-identity-no.type.html
index 896f9aeb..7aa29e72 100644
--- a/donor-registry/src/app/forms/types/verify-identity-no.type.html
+++ b/donor-registry/src/app/forms/types/verify-identity-no.type.html
@@ -40,7 +40,7 @@ <h3 class="fw-bold mb-3">Thank you for your enthusiasm. </h3>
                 </div>
             </div>
         </div>
-        <div *ngIf="isGotErr && !err401 && canRegister" class="modal-dialog" role="document">
+        <div *ngIf="isGotErr && !err401 && canRegister && !err409" class="modal-dialog" role="document">
             <div class="p-4 modal-content">
                 <div class="modal-body text-center">
                     <div class="d-flex flex-column justify-content-center align-items-center">
@@ -77,6 +77,31 @@ <h3 class="fw-bold mb-3">Thank you for your enthusiasm. </h3>
             </div>
         </div>
   
+        <div *ngIf="isGotErr && err409" class="modal-dialog" role="document">
+          <div class="p-4 modal-content">
+              <div class="modal-body text-center">
+                  <div class="d-flex flex-column justify-content-center align-items-center">
+                     
+                      <div>
+                          <span class="p24 mb-2 mt-2 mb-2 fw-bold">Already Registered</span>
+                       
+                          <br>
+
+                          <br>
+                          <span *ngIf="errorMessage" class="p16 mb-2 mt-2 mb-2 fw-bold">{{errorMessage}}</span>
+                          <br />
+                          <br />
+
+                      </div>
+                      <div class="container-fluid mt-3">
+                      <button type="button" class="btn btn-primary-notto btn-style w-100 submit-button mb-2"
+                      data-toggle="modal"  data-dismiss="modal" aria-label="Close">OK</button>
+                  </div>
+                  </div>
+              </div>
+          </div>
+      </div>
+
         <div *ngIf="(!isGotErr || err401) && showConfirmPopup" class="modal-dialog" role="document">
             <div class="p-4 modal-content">
                 <div class="close float-end" data-dismiss="modal" aria-label="Close">
@@ -127,30 +152,7 @@ <h5 class="modal-title">Modal title</h5>
       </div>
     </div>
 
-     <!-- Error message handled -->
- <div  class="modal fade hide" id="errorMessagePop" tabindex="-1" role="dialog"
- aria-labelledby="errorMessagePop" aria-hidden="true" data-keyboard="false" data-backdrop="static">
- <div class="modal-dialog" role="document">
-   <div class="p-4 modal-content text-center">
-     <div class="modal-body">
-      <!-- ------------------------ -->
-      <span  class="p24 mb-2 mt-2 mb-2 fw-bold">{{errHeading}}</span>
-      <br /><br />
-      <span  class="p12 lh-32">{{errorMessage}}</span> <br /><br />
-       <div class="d-flex justify-content-center">
-         <button [hidden]="err409" type="button"  data-dismiss="modal" 
-           class="btn btn-primary-notto btn-style w-50 submit-button mb-2">
-           {{'OK' | translate}}
-         </button>
-         <a [hidden]="!err409" href="/login"> <button type="button" 
-         class="btn btn-primary-notto btn-style w-100 submit-button mb-2">
-         {{'LOGIN' | translate}}
-       </button></a>
-       </div>
-     </div>
-   </div>
- </div>
-</div>
+
 
   </div>
-  
\ No newline at end of file
+  
diff --git a/donor-registry/src/app/forms/types/verify-identity-no.type.ts b/donor-registry/src/app/forms/types/verify-identity-no.type.ts
index d52bcd18..d7e425f9 100644
--- a/donor-registry/src/app/forms/types/verify-identity-no.type.ts
+++ b/donor-registry/src/app/forms/types/verify-identity-no.type.ts
@@ -36,13 +36,15 @@ export class VerifyIndentityCode extends FieldType {
   showConfirmPopup:boolean = false;
   err409: boolean;
   errHeading: string;
+  errorCode: any;
+  
 
   constructor(private http: HttpClient, public generalService: GeneralService,public router: Router,) {
     super();
   }
 
   ngOnInit(): void {
-    if(this.router.url == "/form/signup"){
+      if(this.router.url == "/form/signup"){
       this.signupForm = true;
      }
     localStorage.removeItem('form_value');
@@ -181,6 +183,7 @@ export class VerifyIndentityCode extends FieldType {
           },
           error: (error) => {
             this.errorMessage = error?.error['message'];
+            this.closeAllModal();
             this.customErrCode = (error?.error['status'])? error?.error['status'] : "";
             if( error?.error['status'] == '401')
             {
@@ -201,12 +204,13 @@ export class VerifyIndentityCode extends FieldType {
 
             }
             if (error?.error['status'] == '409') {
+              this.isGotErr = true;
+              console.log(error);
+              this.errorCode = error?.error['code'];
               this.err409 = true;
               this.errHeading = 'Already Pledged';
               this.errorMessage = error?.error['message'];
-              //this.closePops('verifyOtpModal');
-              this.closeAllModal();
-              this.openPopup('errorMessagePop');
+             
             }
          
             console.error('There was an error!', error);
@@ -215,6 +219,7 @@ export class VerifyIndentityCode extends FieldType {
     }
   }
   openPopup(id) {
+    console.log(id);
     var button = document.createElement("button");
     button.setAttribute('data-toggle', 'modal');
     button.setAttribute('data-target', `#${id}`);
@@ -238,6 +243,7 @@ export class VerifyIndentityCode extends FieldType {
     }
 
   }
+  
   closePops(id) {
   $(id).modal('hide');
   Array.from(document.querySelectorAll('.modal-backdrop')).forEach((el) => el.classList.remove('modal-backdrop'));