From 7f2fd689402299c7897e695a369abf2c8055bab5 Mon Sep 17 00:00:00 2001
From: Shefki Esadi <shralsheki@gmail.com>
Date: Fri, 31 May 2024 11:17:10 +0200
Subject: [PATCH] UI: Navigation filter: move patient id filter in to issuer of
 patient widget #4507

---
 .../src/app/constants/globalvar.ts            | 24 -------------------
 .../widgets/messaging/messaging.component.ts  | 12 ++++++----
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/dcm4chee-arc-ui2/src/app/constants/globalvar.ts b/dcm4chee-arc-ui2/src/app/constants/globalvar.ts
index 77aa3be17d..3a91760eee 100644
--- a/dcm4chee-arc-ui2/src/app/constants/globalvar.ts
+++ b/dcm4chee-arc-ui2/src/app/constants/globalvar.ts
@@ -4064,12 +4064,6 @@ export class Globalvar {
                     filterKey:"fuzzymatching",
                     text:$localize `:@@fuzzy_matching:Fuzzy Matching`,
                     description:$localize `:@@fuzzy_matching_desc:Fuzzy semantic matching of person names`
-                }, {
-                    tag:"input",
-                    type:"text",
-                    filterKey:"PatientID",
-                    description:$localize `:@@patient_id:Patient ID`,
-                    placeholder:$localize `:@@patient_id:Patient ID`
                 }, {
                     tag:"issuer-selector",
                     issuers:[
@@ -4302,12 +4296,6 @@ export class Globalvar {
                     filterKey:"fuzzymatching",
                     text:$localize `:@@fuzzy_matching:Fuzzy Matching`,
                     description:$localize `:@@fuzzy_matching_desc:Fuzzy semantic matching of person names`
-                }, {
-                    tag:"input",
-                    type:"text",
-                    filterKey:"PatientID",
-                    description:$localize `:@@patient_id:Patient ID`,
-                    placeholder:$localize `:@@patient_id:Patient ID`
                 }, {
                     tag:"issuer-selector",
                     issuers:[
@@ -4520,12 +4508,6 @@ export class Globalvar {
                     filterKey:"fuzzymatching",
                     text:$localize `:@@fuzzy_matching:Fuzzy Matching`,
                     description:$localize `:@@fuzzy_matching_desc:Fuzzy semantic matching of person names`
-                }, {
-                    tag:"input",
-                    type:"text",
-                    filterKey:"PatientID",
-                    description:$localize `:@@patient_id:Patient ID`,
-                    placeholder:$localize `:@@patient_id:Patient ID`
                 }, {
                     tag:"issuer-selector",
                     issuers:[
@@ -6040,12 +6022,6 @@ export class Globalvar {
                 filterKey:"InstitutionalDepartmentName",
                 description:"Institutional Department Name",
                 placeholder:"Institutional Department Name"
-            }, {
-                tag:"input",
-                type:"text",
-                filterKey:"PatientID",
-                description:"Patient ID",
-                placeholder:"Patient ID"
             }, {
                 tag:"input",
                 type:"text",
diff --git a/dcm4chee-arc-ui2/src/app/widgets/messaging/messaging.component.ts b/dcm4chee-arc-ui2/src/app/widgets/messaging/messaging.component.ts
index cd612641cf..216dcea6f6 100644
--- a/dcm4chee-arc-ui2/src/app/widgets/messaging/messaging.component.ts
+++ b/dcm4chee-arc-ui2/src/app/widgets/messaging/messaging.component.ts
@@ -73,11 +73,13 @@ export class MessagingComponent implements OnDestroy{
         }
         if (isInArray) { //If the same message is already in the array, then just put the class pulse (To simulate a pulse) and remove it again
             let element = WindowRefService.nativeWindow.document.getElementsByClassName('msg_' + presentId)[0];
-            element.classList.remove("slideInRight");
-            element.classList.add("pulse");
-            setTimeout(function() {
-                element.classList.remove('pulse')
-            }, 500);
+            if(element){
+                element.classList.remove("slideInRight");
+                element.classList.add("pulse");
+                setTimeout(function() {
+                    element.classList.remove('pulse')
+                }, 500);
+            }
         } else {
             let id = this.getUniqueRandomId();
             msg.id = id;