From 880f154ea20b89c3be29080f53b5e98033179df7 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 17 Jul 2023 17:19:55 +0100
Subject: [PATCH] fix duplicate attachment

---
 .../despacho-pr/despacho-pr.page.html           | 16 +++++++---------
 .../despacho-pr/despacho-pr.page.ts             |  9 +--------
 .../event-list/event-list.page.ts               |  4 ++++
 .../events-to-approve/events-to-approve.page.ts | 17 ++++++-----------
 version/git-version.ts                          | 12 ++++++------
 5 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
index c528f8b2e..1bc6b9bed 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
@@ -66,15 +66,13 @@
         <div class="bottom-content width-100">
           <ion-list *ngIf="fulltask.Documents">
             <h5 class="font-17-rem">Documentos Anexados</h5>
-            <ion-item *ngFor="let attachment of mergedArray"
-            class="ion-no-margin ion-no-padding cursor-pointer">
-            <ion-label
-            (click)="viewDocument(attachment.DocId, attachment, attachment.content)">
-              <p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="document-type" *ngIf="attachment.content != ''">Rascunho</span></p>
-              <p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
-              <p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
-            </ion-label>
-          </ion-item>
+            <ion-item *ngFor="let attachment of mergedArray" class="ion-no-margin ion-no-padding cursor-pointer">
+              <ion-label (click)="viewDocument(attachment.DocId, attachment, attachment.content)">
+                <p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="document-type" *ngIf="attachment.content != ''">Rascunho</span></p>
+                <p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"></span></p>
+                <p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
+              </ion-label>
+            </ion-item>
           </ion-list>
         </div>
       </div>
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
index df1ca63a5..f91363f53 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
@@ -76,14 +76,6 @@ export class DespachoPrPage implements OnInit {
     this.profile = "mdgpr";
     
 
-    this.activateRoute.paramMap.subscribe(paramMap => {
-      if (!paramMap.has('SerialNumber')) {
-        return;
-      }
-      /* this.serialNumber = paramMap.get('SerialNumber'); */
-      this.LoadTaskDetail(this.serialNumber);
-      // this.LoadRelatedEvents(this.serialNumber);
-    });
     this.LoadTaskDetail(this.serialNumber);
     // this.LoadRelatedEvents(this.serialNumber);
 
@@ -610,6 +602,7 @@ export class DespachoPrPage implements OnInit {
   }
 
   getDocumentPdf(Documents: any) {
+    this.mergedArray = []
     Documents.forEach(element => {
       let docObject = {
         "ApplicationId": element.ApplicationId,
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index 85c87164a..7c72d8c43 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -79,6 +79,10 @@ export class EventListPage implements OnInit {
         if(pr) {
           this.segment = pr.OwnerUserId
         }
+
+        this.dynamicSearch()
+      } else {
+        this.dynamicSearch()
       }
     })
 
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index e1baa15b5..c42856866 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -21,8 +21,6 @@ import { ThemeService } from 'src/app/services/theme.service'
 export class EventsToApprovePage implements OnInit {
 
   showLoader: boolean;
-  eventsPRList: any = [];
-  eventsMDGPRList: any = [];
   eventPerson: EventPerson;
   eventBody: EventBody;
   categories: string[];
@@ -76,7 +74,12 @@ export class EventsToApprovePage implements OnInit {
         if(pr) {
           this.segment = pr.OwnerUserId
         }
+
+        this.dynamicSearch();
+      } else {
+        this.dynamicSearch();
       }
+      
     })
 
     this.LoadToApproveEvents()
@@ -210,15 +213,7 @@ export class EventsToApprovePage implements OnInit {
   }
 
 
-  getFromDB() {
-    this.storage.get('event-to-aproveMD').then((events =  []) => {
-      this.eventsMDGPRList = events
-    })
-
-    this.storage.get('event-to-aprovePR').then((events) => {
-      this.eventsPRList = events
-    })
-  }
+  getFromDB() {}
 
 
   toDateString(e) {
diff --git a/version/git-version.ts b/version/git-version.ts
index 8c1aa1533..25a39cedf 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "6812e4395",
-  "SHA": "6812e43958c64ad6ed0f86944995b90c08142a45",
+  "shortSHA": "c7d58f46a",
+  "SHA": "c7d58f46a9937d575b05904888447b5dcd5a4ee0",
   "branch": "developer-catch-merge",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Jul 17 11:29:37 2023 +0100'",
-  "lastCommitMessage": "fix chat",
-  "lastCommitNumber": "5084",
+  "lastCommitTime": "'Mon Jul 17 15:07:08 2023 +0100'",
+  "lastCommitMessage": "fix evento",
+  "lastCommitNumber": "5085",
   "change": "",
-  "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html",
+  "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file