From 535c70f5bb4488668145b9c2eda3a2fa4dcc39f9 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 31 Jul 2023 16:34:12 +0100
Subject: [PATCH] fix

---
 .../approve-event/approve-event.page.html     | 11 +++---
 .../approve-event/approve-event.page.scss     | 38 +++++++++++++++++++
 .../approve-event/approve-event.page.ts       | 18 ++++++++-
 .../approve-event/approve-event.page.html     | 11 +++---
 version/git-version.ts                        | 12 +++---
 5 files changed, 70 insertions(+), 20 deletions(-)

diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
index 2ed233311..999230d1d 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
@@ -87,16 +87,15 @@
               <div class="line"></div>
             </div>
           </div>
-          <div *ngIf="loadedEvent.Documents" class="bottom-content width-100">
+          <div *ngIf="loadedAttachments" class="bottom-content width-100">
             <ion-list>
               <h5 class="font-17-rem">Documentos Anexados</h5>
               <ion-item class="ion-no-margin ion-no-padding cursor-pointer"
-              *ngFor="let attachment of loadedEvent.Documents"
+              *ngFor="let attachment of loadedAttachments"
               (click)="viewDocument(attachment.DocId, attachment)">
               <ion-label>
-                <p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></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>
+                <p class="attach-title-item d-block">{{attachment.Description}}</p>
+                <p><span class="span-left">{{attachment.Stakeholders}}</span><span class="span-right">{{ attachment.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</span></p>
               </ion-label>
             </ion-item>
             </ion-list>
@@ -104,7 +103,7 @@
         </div>
       </div>
 
-    <div *ngIf="loadedEvent" class="aside-right flex-column height-100">
+    <div *ngIf="loadedAttachments" class="aside-right flex-column height-100">
       <div class="aside-buttons" >
         <button (click)="editar(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Editar evento</button>
         <button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Aprovar</button>
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss
index f6196d326..468f00472 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss
@@ -228,3 +228,41 @@ ion-menu{
     width: 25%;
   }
 }
+
+
+
+.bottom-content{
+  margin: 0 auto;
+
+  .bottom-content h3{
+    font-size: rem(16);
+    margin: 0 0 0 10px;
+  }
+  .attach-document{
+    font-size: rem(15);
+    color: var(--title-text-color);
+    margin: 5px 5px 5px 10px;
+    padding: 5px;
+    float: left;
+  }
+  .attach-icon{
+    width: 37px;
+    font-size: rem(35);
+    float: left;
+  }
+  .attach-title-item{
+    width: 100%;
+    font-size: rem(15);
+    color:#0d89d1 !important;
+  }
+  /* SPAN */
+  .span-left{
+    float: left;
+    font-size: rem(15);
+  }
+  .span-right{
+  text-align: right;
+  float: right;
+  font-size: rem(13);
+  }
+}
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
index 6607ba2fc..47000994b 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
@@ -14,7 +14,8 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { OfflineManagerService } from 'src/app/services/offline-manager.service';
 import { RouteService } from 'src/app/services/route.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
-import { TaskService } from 'src/app/services/task.service'
+import { TaskService } from 'src/app/services/task.service';
+import { AttachmentsService } from 'src/app/services/attachments.service';
 
 
 @Component({
@@ -56,7 +57,8 @@ export class ApproveEventPage implements OnInit {
     public ThemeService: ThemeService,
     private offlineManager: OfflineManagerService,
     private httpErrorHandle: HttpErrorHandle,
-    public TaskService: TaskService
+    public TaskService: TaskService,
+    private attachmentsService: AttachmentsService,
   ) {
     this.activatedRoute.paramMap.subscribe(params => {
       // 
@@ -129,6 +131,7 @@ export class ApproveEventPage implements OnInit {
     this.processes.GetTask(this.serialNumber).subscribe(async res => {
 
       this.loadedEvent = res
+      this.getAttachments();
       this.addProcessToDB(this.loadedEvent)
       
       try {
@@ -375,4 +378,15 @@ export class ApproveEventPage implements OnInit {
     await modal.present();
   }
 
+  async getAttachments() {
+
+    try {
+      this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.loadedEvent.workflowInstanceDataFields.InstanceId).toPromise();
+    } catch (error) {
+      console.error('getAttchaments',error)
+    }
+    
+
+  }
+
 }
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html
index 47e54b1f9..d5ee21d9c 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.html
+++ b/src/app/shared/agenda/approve-event/approve-event.page.html
@@ -46,7 +46,7 @@
               <span class="location">{{loadedEvent.workflowInstanceDataFields.Location}}</span>
   
               <span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Oficial MDGPR' " style="background-color: #ffb703;">
-              {{loadedEvent.workflowInstanceDataFields.Agenda}}
+                {{loadedEvent.workflowInstanceDataFields.Agenda}}
               </span>
               <span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Pessoal MDGPR' " style="background-color: #f05d5e;">
                 {{loadedEvent.workflowInstanceDataFields.Agenda}}
@@ -98,22 +98,21 @@
             </div>
           </div>
   
-          <div *ngIf="loadedEvent.Documents" class="bottom-content width-100">
+          <div *ngIf="loadedAttachments" class="bottom-content width-100">
             <ion-list>
               <h5 class="font-17-rem">Documentos Anexados </h5>
               <ion-item class="ion-no-margin ion-no-padding cursor-pointer"
-              *ngFor="let attachment of loadedEvent.Documents"
+              *ngFor="let attachment of loadedAttachments"
               (click)="viewDocument(attachment.DocId, attachment)">
               <ion-label>
-                <p class="attach-title-item d-block">{{attachment.Assunto}}</p>
-                <p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd-MM-yyyy HH:mm' }}</span></p>
+                <p class="attach-title-item d-block">{{attachment.Description}}</p>
+                <p><span class="span-left">{{attachment.Stakeholders}}</span><span class="span-right">{{ attachment.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</span></p>
               </ion-label>
             </ion-item>
             </ion-list>
           </div>
         </div>
       </div>
-
       <div *ngIf="showAside" class="aside-right flex-column height-100 cursor-pointer">
         <div class="aside-buttons">
           <button full class="btn-ok" shape="round" >Editar evento</button>
diff --git a/version/git-version.ts b/version/git-version.ts
index aaa6f3fd2..ef7611ac6 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "64857d043",
-  "SHA": "64857d043f55c9794a491192819bfe6e1f034caf",
-  "branch": "developer-catch-merge",
+  "shortSHA": "9d1d4783d",
+  "SHA": "9d1d4783dbfd793c980170a4ab4e0c0e00686d00",
+  "branch": "developer",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Jul 31 14:35:51 2023 +0100'",
+  "lastCommitTime": "'Mon Jul 31 14:54:10 2023 +0100'",
   "lastCommitMessage": "fix",
-  "lastCommitNumber": "5123",
+  "lastCommitNumber": "5124",
   "change": "",
-  "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.ts",
+  "changeStatus": "On branch developer\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified:   src/app/shared/agenda/approve-event/approve-event.page.html",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file