From 68d03492f88b42cc6a753d356077340395050059 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 15 Jun 2021 15:45:34 +0100
Subject: [PATCH] Improve attendees components

---
 .../pages/events/attendees/attendees.page.ts  | 28 ++++++-------------
 .../attendee-modal/attendee-modal.page.ts     |  4 +--
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/app/pages/events/attendees/attendees.page.ts b/src/app/pages/events/attendees/attendees.page.ts
index d79630879..3c26142f7 100644
--- a/src/app/pages/events/attendees/attendees.page.ts
+++ b/src/app/pages/events/attendees/attendees.page.ts
@@ -66,28 +66,16 @@ export class AttendeesPageModal implements OnInit {
 
   filterSearchList(itm: EventPerson): boolean {
 
-    if(this.adding == "intervenient"){
-      const result = this.taskParticipants.find((contact, index)=>{
-        
-        if(contact.Name == itm.Name && contact.EmailAddress == itm.EmailAddress){
-          index = index;
-          return contact;
-        }
-      });
-      return undefined == result;
-
-    } else if (this.adding == "CC") {
-
-      const result = this.taskParticipantsCc.find((contact, index)=>{
-        
+    const result =  this.taskParticipants.concat( this.taskParticipantsCc).find((contact, index)=>{
+      
       if(contact.Name == itm.Name && contact.EmailAddress == itm.EmailAddress){
-          index = index;
-          return contact;
-        }
-      });
+        index = index;
+        return contact;
+      }
 
-      return undefined == result;
-    }
+    })
+    
+    return undefined == result;
     
   }
 
diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.ts b/src/app/shared/event/attendee-modal/attendee-modal.page.ts
index 0ad3d1275..e6011df58 100644
--- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts
+++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts
@@ -118,7 +118,7 @@ export class AttendeePage implements OnInit {
 
   filterSearchList(itm: EventPerson): boolean {
 
-    const result1 = this.LtaskParticipants.find((contact, index)=>{
+    const result = this.LtaskParticipants.concat(this.LtaskParticipantsCc).find((contact, index)=>{
       
       if(contact.Name == itm.Name && contact.EmailAddress == itm.EmailAddress){
         index = index;
@@ -127,7 +127,7 @@ export class AttendeePage implements OnInit {
     });
 
     // if to show
-    if(undefined != result1){
+    if(undefined != result){
       return false;
     }