From ac8c10410496a1e4e0f2b1fd0bc9e4bceb42e44e Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Tue, 1 Sep 2020 15:48:25 +0100
Subject: [PATCH 1/4] Added show attendees and show attachments at event-detal
 + style at new-event modal

---
 src/app/home/home-routing.module.ts           |  4 -
 src/app/pages/cal-modal/cal-modal.page.html   | 14 ++--
 .../event-detail/event-detail.page.html       | 73 ++++++++++++-------
 .../event-detail/event-detail.page.scss       | 12 ++-
 .../events/event-detail/event-detail.page.ts  | 32 +++++++-
 src/app/pages/events/events.page.ts           |  2 +-
 src/environments/environment.ts               |  2 +-
 7 files changed, 95 insertions(+), 44 deletions(-)

diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index 5ab2ba87a..55538835b 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -25,10 +25,6 @@ const routes: Routes = [
       {
         path: 'attachments',
         children: [
-          {
-            path:'',
-          loadChildren: ()=> import('../pages/events/attachments/attachments.module').then(m => m.AttachmentsPageModule)
-          },
           {
             path:':eventId',
           loadChildren: ()=> import('../pages/events/attachments/attachments.module').then(m => m.AttachmentsPageModule)
diff --git a/src/app/pages/cal-modal/cal-modal.page.html b/src/app/pages/cal-modal/cal-modal.page.html
index 1f377bb00..27239a3a6 100644
--- a/src/app/pages/cal-modal/cal-modal.page.html
+++ b/src/app/pages/cal-modal/cal-modal.page.html
@@ -12,7 +12,7 @@
 <ion-content>
   <div class="div-ion-content">
   <ion-item>
-    <ion-label>Assunto</ion-label>
+    <ion-label position="stacked">Assunto</ion-label>
     <ion-input type="text" [(ngModel)]="postEvent.Subject"></ion-input>
   </ion-item>
   <!-- <ion-item>
@@ -20,11 +20,11 @@
     <ion-input type="text" [(ngModel)]="postEvent.Body.Text"></ion-input>
   </ion-item> -->
   <ion-item>
-    <ion-label>Descrição</ion-label>
+    <ion-label position="stacked">Descrição</ion-label>
     <ion-textarea [(ngModel)]="postEvent.Body.Text" placeholder=""></ion-textarea>
   </ion-item>
   <ion-item>
-    <ion-label>Localização</ion-label>
+    <ion-label position="stacked">Localização</ion-label>
     <ion-input type="text" [(ngModel)]="postEvent.Location"></ion-input>
   </ion-item>
   <!-- <ion-item>
@@ -45,14 +45,14 @@
     </ion-radio-group>
   </ion-list> -->
   <ion-item>
-    <ion-label>Selecione a Agenda</ion-label>
+    <ion-label position="stacked">Selecione a Agenda</ion-label>
     <ion-select  [(ngModel)]="postEvent.CalendarName" interface="action-sheet" class="custom-options" Cancel-text="Cancelar">
       <ion-select-option Pessoal="Reunião">Pessoal</ion-select-option>
       <ion-select-option Oficial="Viagem">Oficial</ion-select-option>
     </ion-select>
   </ion-item>
   <ion-item>
-    <ion-label>Tipo de evento</ion-label>
+    <ion-label position="stacked">Tipo de evento</ion-label>
     <ion-select  [(ngModel)]="postEvent.EventType" interface="action-sheet" class="custom-options" Cancel-text="Cancelar">
       <ion-select-option value="Reunião">Reunião</ion-select-option>
       <ion-select-option value="Viagem">Viagem</ion-select-option>
@@ -61,13 +61,13 @@
     </ion-select>
   </ion-item>
   <ion-item>
-    <ion-label>Data Início</ion-label>
+    <ion-label position="stacked">Data Início</ion-label>
     <ion-datetime [(ngModel)]="postEvent.StartDate" min="2020" max="2100"
       displayFormat="D MMM YYYY H:mm"
       monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"></ion-datetime>
   </ion-item>
   <ion-item>
-    <ion-label>Data Fim</ion-label>
+    <ion-label position="stacked">Data Fim</ion-label>
     <ion-datetime [(ngModel)]="postEvent.EndDate" min="2020" max="2100"
       displayFormat="D MMM YYYY H:mm"
       monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"></ion-datetime>
diff --git a/src/app/pages/events/event-detail/event-detail.page.html b/src/app/pages/events/event-detail/event-detail.page.html
index f033611aa..3b202744a 100644
--- a/src/app/pages/events/event-detail/event-detail.page.html
+++ b/src/app/pages/events/event-detail/event-detail.page.html
@@ -45,7 +45,7 @@
       </ion-select>
     </ion-item>
     <ion-item>
-      <ion-label>Data Início</ion-label>
+      <ion-label position="stacked">Data Início</ion-label>
       <ion-datetime value="{{loadedEvent.StartDate}}" [(ngModel)]="loadedEvent.StartDate" min="2020" max="2100"
         displayFormat="D MMM YYYY H:mm"
         monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"></ion-datetime>
@@ -55,12 +55,12 @@
       <ion-input [(ngModel)]='loadedEvent.StartDate'></ion-input>
     </ion-item> -->
     <ion-item>
-        <ion-label>Data Fim</ion-label>
+        <ion-label position="stacked">Data Fim</ion-label>
         <ion-datetime value="{{loadedEvent.EndDate}}" [(ngModel)]="loadedEvent.EndDate" min="2020" max="2100"
           displayFormat="D MMM YYYY H:mm"
           monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"></ion-datetime>
     </ion-item>
-    <div class="div-card-button">
+    <!-- <div class="div-card-button">
       <ion-card (click)="openAttendees()">
         <ion-card-header>
           <ion-card-title center>
@@ -72,8 +72,8 @@
         <ion-card-content class="center">
           Intervenientes
         </ion-card-content>
-      </ion-card>
-      <ion-card [routerLink]="['/home/attachments', loadedEvent.EventId]">
+      </ion-card>-->
+      <!-- <ion-card [routerLink]="['/home/attachments', loadedEvent.EventId]">
         <ion-card-header>
           <ion-card-title center>
             <div class="center">
@@ -84,36 +84,53 @@
         <ion-card-content class="center">
           Anexos
         </ion-card-content>
-      </ion-card>
-    </div>
-    <!-- <div class="div-attach">
+      </ion-card> -->
+   <!--  </div>  -->
+
+    
+    <div class="div-attach" >
       <ion-item>
-        <ion-icon name="add" slot="end"></ion-icon>
+        <ion-buttons slot="end" (click)="openAttendees()">
+          <ion-icon  name="eye" slot="start" ></ion-icon>
+          <ion-label>Ver mais</ion-label>
+        </ion-buttons>
         <ion-label class="attach-label">Intervenientes</ion-label>
       </ion-item>
       <div id="AttachFiles"></div>
-      <ion-list [(ngModel)]="loadedEvent.EventType">
-        <ion-item lines="none">
-          <ion-icon name="attach"></ion-icon>
-          <ion-label color="secondary">Lei do orçamento geral do Estado</ion-label> 
-          <ion-icon name="trash" slot="end"></ion-icon>
+      <ion-list>
+        <ion-item class="attendees" lines="none" *ngFor="let attendee of loadedEvent.Attendees.slice(0, 2)">
+          <ion-icon class="attendees-icon" name="person" slot="start"></ion-icon>
+          <ion-label color="secondary" class="attendees-list">{{attendee.Name}}</ion-label> 
+          <!-- <ion-icon name="trash" slot="end"></ion-icon> -->
+        </ion-item>
+      </ion-list>
+      <!-- <ion-button (click)="openAttendees()">Ver mais</ion-button> -->
+    </div>
+
+
+    <div class="div-attach">
+      <ion-item>
+        <ion-icon (click)="showAlert()" name="add" slot="end"></ion-icon>
+        <ion-label class="attach-label">Anexos</ion-label>
+      </ion-item>
+      <!-- <div id="AttachFiles"></div> -->
+      <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
+      <ion-list *ngIf="loadedEventAttachments">
+        <ion-item lines="none" *ngFor="let att of loadedEventAttachments.slice(0, 2)">
+          <ion-icon name="attach" slot="start"></ion-icon>
+          <ion-label color="secondary">
+              <p>{{ att.Description }}</p>
+              <p>{{ att.CreateDate }}</p>
+          </ion-label> 
+          <!-- <ion-icon name="trash" slot="end"></ion-icon> -->
+        </ion-item>
+        <ion-item lines="none" *ngIf="!loadedEvent.HasAttachments">
+          <ion-label>
+            Sem anexos
+          </ion-label>
         </ion-item>
       </ion-list>
     </div>
-    <div class="div-attach">
-      <ion-item>
-        <ion-icon name="add" slot="end"></ion-icon>
-        <ion-label class="attach-label">Anexos</ion-label>
-      </ion-item>
-      <div id="AttachFiles"></div>
-      <ion-list [(ngModel)]="loadedEvent.EventType">
-        <ion-item lines="none">
-          <ion-icon name="attach"></ion-icon>
-          <ion-label color="secondary">Lei do orçamento geral do Estado</ion-label> 
-          <ion-icon name="trash" slot="end"></ion-icon>
-        </ion-item>
-      </ion-list>
-    </div> -->
   </ion-item-sliding>
   </ion-item-group>
 </div>
diff --git a/src/app/pages/events/event-detail/event-detail.page.scss b/src/app/pages/events/event-detail/event-detail.page.scss
index ea56dd1bc..9d55e16af 100644
--- a/src/app/pages/events/event-detail/event-detail.page.scss
+++ b/src/app/pages/events/event-detail/event-detail.page.scss
@@ -74,4 +74,14 @@ ion-card{
   color: red;
   background-color: white;
   padding-right: 5px;
-}
\ No newline at end of file
+}
+/* .attendees{
+  margin:0 !important;
+  padding: 0 !important;
+}
+.attendees-icon{
+  font-size: 14px;
+}
+.attendees-list{
+  font-size: 14px;
+} */
\ No newline at end of file
diff --git a/src/app/pages/events/event-detail/event-detail.page.ts b/src/app/pages/events/event-detail/event-detail.page.ts
index 6b8deca1b..b852498f9 100644
--- a/src/app/pages/events/event-detail/event-detail.page.ts
+++ b/src/app/pages/events/event-detail/event-detail.page.ts
@@ -7,6 +7,9 @@ import { EventBody } from 'src/app/models/eventbody.model';
 import { AlertController, ModalController } from '@ionic/angular';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page';
+import { AlertService } from 'src/app/services/alert.service';
+import { Attachment } from 'src/app/models/attachment.model';
+import { AttachmentsService } from 'src/app/services/attachments.service';
 
 @Component({
   selector: 'app-event-detail',
@@ -16,14 +19,23 @@ import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page';
 export class EventDetailPage implements OnInit {
 
   loadedEvent: Event;
+  loadedEventAttachments: Attachment[];
+  pageId: string;
+  showLoader: boolean;
 
-  constructor(public alertController: AlertController, private router: Router, private activatedRoute: ActivatedRoute, private eventsService: EventsService, private modalCtrl: ModalController) { 
+
+  constructor(public alertController: AlertController, 
+    private router: Router, private activatedRoute: ActivatedRoute, 
+    private eventsService: EventsService, private modalCtrl: ModalController,
+    private alertService: AlertService,
+    private attachamentsService: AttachmentsService) { 
     this.loadedEvent = new Event();
     this.loadedEvent.Body = new EventBody();
   }
 
   ngOnInit() {
     this.loadEvent();
+    this.loadAttachments();
   }
 
   loadEvent()
@@ -34,7 +46,7 @@ export class EventDetailPage implements OnInit {
         {
           return;
         }
-
+        this.pageId = paramMap.get('eventId');
         this.eventsService.getEvent(paramMap.get('eventId')).subscribe(response => 
           {
             this.loadedEvent = response;
@@ -132,4 +144,20 @@ export class EventDetailPage implements OnInit {
       });  
   }
 
+  showAlert(){
+    this.alertService.presentAlert("Funcionalidade em desenvolvimento");
+  }
+
+  loadAttachments()
+  {
+    console.log(this.pageId);   
+    this.attachamentsService.getEventAttachments(this.pageId).subscribe(attachments => {
+      this.loadedEventAttachments = attachments;
+      console.log(attachments);
+    });
+  }
+
+  
+
+
 }
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 6e4c71c64..168044649 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -77,7 +77,7 @@ export class EventsPage implements OnInit {
         .subscribe(response => {
             this.eventsList = response;
             this.showLoader = false;
-            console.log(response[0].HasAttachments)
+            console.log(response[0].HasAttachments);
           }
         );
         break;
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 4fb899a73..dd2e51b11 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -6,7 +6,7 @@ export const environment = {
   production: false,
   apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/v2/api/',
   domain: 'gabinetedigital.local',
-  defaultuser: 'tiago.kayaya',
+  defaultuser: 'paulo.pinto',
   defaultuserpwd: 'tabteste@006'
 };
 

From 74000a5221f0a9c809e4c43b9ea94e709bfbc590 Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Tue, 1 Sep 2020 16:10:48 +0100
Subject: [PATCH 2/4] save

---
 src/app/pages/events/event-detail/event-detail.page.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/pages/events/event-detail/event-detail.page.html b/src/app/pages/events/event-detail/event-detail.page.html
index b2b9047be..69d116abe 100644
--- a/src/app/pages/events/event-detail/event-detail.page.html
+++ b/src/app/pages/events/event-detail/event-detail.page.html
@@ -113,7 +113,6 @@
         <ion-icon (click)="showAlert()" name="add" slot="end"></ion-icon>
         <ion-label class="attach-label">Anexos</ion-label>
       </ion-item>
-      <!-- <div id="AttachFiles"></div> -->
       <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
       <ion-list *ngIf="loadedEventAttachments">
         <ion-item lines="none" *ngFor="let att of loadedEventAttachments.slice(0, 2)">

From 58e1d9a7dcafabe350ca2a655ccc86ed50275905 Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Tue, 1 Sep 2020 16:32:28 +0100
Subject: [PATCH 3/4] Save

---
 src/app/pages/events/event-detail/event-detail.page.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/pages/events/event-detail/event-detail.page.html b/src/app/pages/events/event-detail/event-detail.page.html
index 69d116abe..c9ef403d4 100644
--- a/src/app/pages/events/event-detail/event-detail.page.html
+++ b/src/app/pages/events/event-detail/event-detail.page.html
@@ -114,7 +114,7 @@
         <ion-label class="attach-label">Anexos</ion-label>
       </ion-item>
       <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
-      <ion-list *ngIf="loadedEventAttachments">
+      <ion-list *ngIf="loadedEvent.HasAttachments">
         <ion-item lines="none" *ngFor="let att of loadedEventAttachments.slice(0, 2)">
           <ion-icon name="attach" slot="start"></ion-icon>
           <ion-label color="secondary">

From c9838bf1030ad15fa45540ed26ad9dc56df746bf Mon Sep 17 00:00:00 2001
From: Tiago Kayaya <tiago.kayaya@equilibrium.local>
Date: Tue, 1 Sep 2020 17:13:37 +0100
Subject: [PATCH 4/4] Save

---
 .../event-detail/event-detail.page.html       | 24 +++++++++----------
 .../events/event-detail/event-detail.page.ts  |  8 +++++++
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/app/pages/events/event-detail/event-detail.page.html b/src/app/pages/events/event-detail/event-detail.page.html
index c9ef403d4..80fc7ac62 100644
--- a/src/app/pages/events/event-detail/event-detail.page.html
+++ b/src/app/pages/events/event-detail/event-detail.page.html
@@ -50,10 +50,6 @@
         displayFormat="D MMM YYYY H:mm"
         monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"></ion-datetime>
     </ion-item>
-    <!-- <ion-item>
-      <ion-label position="stacked">Data Início: </ion-label>
-      <ion-input [(ngModel)]='loadedEvent.StartDate'></ion-input>
-    </ion-item> -->
     <ion-item>
         <ion-label position="stacked">Data Fim</ion-label>
         <ion-datetime value="{{loadedEvent.EndDate}}" [(ngModel)]="loadedEvent.EndDate" min="2020" max="2100"
@@ -85,13 +81,11 @@
           Anexos
         </ion-card-content>
       </ion-card> -->
-   <!--  </div>  -->
-
-    
+   <!--  </div>  -->  
     <div class="div-attach" >
       <ion-item>
         <ion-buttons slot="end" (click)="openAttendees()">
-          <ion-icon  name="eye" slot="start" ></ion-icon>
+          <ion-icon  name="people" slot="start" ></ion-icon>
           <ion-label>Ver mais</ion-label>
         </ion-buttons>
         <ion-label class="attach-label">Intervenientes</ion-label>
@@ -101,20 +95,26 @@
         <ion-item class="attendees" lines="none" *ngFor="let attendee of loadedEvent.Attendees.slice(0, 2)">
           <ion-icon class="attendees-icon" name="person" slot="start"></ion-icon>
           <ion-label color="secondary" class="attendees-list">{{attendee.Name}}</ion-label> 
-          <!-- <ion-icon name="trash" slot="end"></ion-icon> -->
         </ion-item>
       </ion-list>
-      <!-- <ion-button (click)="openAttendees()">Ver mais</ion-button> -->
     </div>
 
 
     <div class="div-attach">
       <ion-item>
-        <ion-icon (click)="showAlert()" name="add" slot="end"></ion-icon>
+        
+        <ion-buttons slot="end" (click)="showAlert()">
+          <ion-icon name="documents" slot="start"></ion-icon>
+          <ion-label>Ver mais</ion-label>
+        </ion-buttons>
         <ion-label class="attach-label">Anexos</ion-label>
       </ion-item>
-      <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
       <ion-list *ngIf="loadedEvent.HasAttachments">
+        <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+          <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
+           <ion-refresher-content>
+          </ion-refresher-content>
+        </ion-refresher>
         <ion-item lines="none" *ngFor="let att of loadedEventAttachments.slice(0, 2)">
           <ion-icon name="attach" slot="start"></ion-icon>
           <ion-label color="secondary">
diff --git a/src/app/pages/events/event-detail/event-detail.page.ts b/src/app/pages/events/event-detail/event-detail.page.ts
index 1c359ebc6..d7554ff8f 100644
--- a/src/app/pages/events/event-detail/event-detail.page.ts
+++ b/src/app/pages/events/event-detail/event-detail.page.ts
@@ -176,4 +176,12 @@ export class EventDetailPage implements OnInit {
   {
     //this.back();
   }
+  doRefresh(event){
+    /* this.RefreshEvents(); */
+    event.target.complete();
+     setTimeout(() => {
+       event.target.complete();
+     }, 2000);
+
+  }
 }